forked from pool/util-linux
update to 2.20.1
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=99
This commit is contained in:
Petr Uzel
Git OBS Bridge
parent
547b28ab26
commit
e11af64b64
@ -1,32 +0,0 @@
|
||||
From 8176a344041c7a2b7bf6f05353bf9414c9d3b254 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Wed, 12 Oct 2011 10:15:58 +0200
|
||||
Subject: [PATCH] fdisk: don't shorten long path to disk device
|
||||
|
||||
Reported-by: Petr Uzel <petr.uzel@suse.cz>
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|
||||
---
|
||||
fdisk/partname.c | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
Index: util-linux-2.20/fdisk/partname.c
|
||||
===================================================================
|
||||
--- util-linux-2.20.orig/fdisk/partname.c
|
||||
+++ util-linux-2.20/fdisk/partname.c
|
||||
@@ -5,13 +5,14 @@
|
||||
#include "blkdev.h"
|
||||
#include "pathnames.h"
|
||||
#include "common.h"
|
||||
+#include "c.h"
|
||||
|
||||
/*
|
||||
* return partition name - uses static storage unless buf is supplied
|
||||
*/
|
||||
char *
|
||||
partname(char *dev, int pno, int lth) {
|
||||
- static char bufp[80];
|
||||
+ static char bufp[PATH_MAX];
|
||||
char *p;
|
||||
int w, wp;
|
||||
|
||||
BIN
util-linux-2.20.1.tar.bz2
(Stored with Git LFS)
Normal file
BIN
util-linux-2.20.1.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
util-linux-2.20.tar.bz2
(Stored with Git LFS)
BIN
util-linux-2.20.tar.bz2
(Stored with Git LFS)
Binary file not shown.
@ -1,29 +0,0 @@
|
||||
From cf06399d6aeb1e558baf2b46b617496ed7aac81c Mon Sep 17 00:00:00 2001
|
||||
From: Petr Uzel <petr.uzel@suse.cz>
|
||||
Date: Mon, 12 Sep 2011 16:11:41 +0200
|
||||
Subject: [PATCH] lib: do not attempt to close(0) in sysfs_deinit()
|
||||
|
||||
If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt'
|
||||
which hasn't been fully initialised. The 'dir_fd' is still 0, so
|
||||
sysfs_deinit calls "close(0)".
|
||||
|
||||
Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151
|
||||
Reported-by: Diego Ercolani <diego.ercolani@gmail.com>
|
||||
Analysed-by: Neil Brown <nfbrown@suse.com>
|
||||
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|
||||
---
|
||||
lib/sysfs.c | 1 +
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
|
||||
Index: util-linux-2.20/lib/sysfs.c
|
||||
===================================================================
|
||||
--- util-linux-2.20.orig/lib/sysfs.c
|
||||
+++ util-linux-2.20/lib/sysfs.c
|
||||
@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, de
|
||||
int fd, rc = 0;
|
||||
|
||||
memset(cxt, 0, sizeof(*cxt));
|
||||
+ cxt->dir_fd = -1;
|
||||
|
||||
if (!sysfs_devno_path(devno, path, sizeof(path)))
|
||||
goto err;
|
||||
@ -1,24 +0,0 @@
|
||||
From 398e8b40dbca3a5f172485d4701554c2a08e04d6 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Uzel <petr.uzel@suse.cz>
|
||||
Date: Tue, 30 Aug 2011 10:16:19 +0200
|
||||
Subject: [PATCH] sfdisk.8: fix formatting
|
||||
|
||||
|
||||
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|
||||
---
|
||||
fdisk/sfdisk.8 | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
Index: util-linux-2.20/fdisk/sfdisk.8
|
||||
===================================================================
|
||||
--- util-linux-2.20.orig/fdisk/sfdisk.8
|
||||
+++ util-linux-2.20/fdisk/sfdisk.8
|
||||
@@ -237,7 +237,7 @@ For example:
|
||||
.fi
|
||||
first reports that /dev/hdb5 has Id 6, and then changes that into 83.
|
||||
.TP
|
||||
-.BR \-u ", " \-\-unit " \fI\letter\fR"
|
||||
+.BR \-u ", " \-\-unit " \fIletter\fR"
|
||||
Interpret the input and show the output in the units specified by
|
||||
.IR letter .
|
||||
This \fIletter\fR can be one of S, C, B or M, meaning Sectors, Cylinders,
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 20 13:01:22 UTC 2011 - puzel@suse.com
|
||||
|
||||
- update to util-linux-2.20.1
|
||||
- bugfix release
|
||||
- drop patches (in upstream):
|
||||
- util-linux-sfdisk-manpage-fix.patch
|
||||
- util-linux-lib-sysfs-deinit.patch
|
||||
- fdisk-dont-shorten-long-path-to-disk.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 12 09:26:40 UTC 2011 - puzel@suse.com
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@ BuildRequires: pam-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: zlib-devel
|
||||
Version: 2.20
|
||||
Version: 2.20.1
|
||||
Release: 4
|
||||
# util-linux is a base package and uuidd pre-requiring pwdutils pulls
|
||||
# that into the core build cycle. pwdutils also pulls in the whole
|
||||
@ -86,10 +86,7 @@ Source51: blkid.conf
|
||||
Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch
|
||||
# crypto patch
|
||||
Patch2: util-linux-2.17.1-mount_losetup_crypto.patch
|
||||
Patch3: util-linux-sfdisk-manpage-fix.patch
|
||||
Patch4: util-linux-lib-sysfs-deinit.patch
|
||||
Patch5: util-linux-2.20-libmount-deps.patch
|
||||
Patch6: fdisk-dont-shorten-long-path-to-disk.patch
|
||||
|
||||
##
|
||||
## adjtimex
|
||||
@ -191,10 +188,7 @@ Files to develop applications using the libmount library.
|
||||
%setup -q -a 9 -b 11 -b 12 -b 13
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
#
|
||||
cd adjtimex-*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user