From 4b9855b405c638728b82a9c1f6c3555c39fd2994396fd1a888d9a7c5049a6cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 21 Aug 2014 09:54:57 +0000 Subject: [PATCH 1/2] Accepting request 244468 from home:sbrabec:branches:Base:System This update needs a special care: 1) After first successful build on all platforms, "osc meta prjconf Base:System" must include: %if 0%{?suse_version} > 1310 Preinstall: libsmartcols1 %endif 2) You also need to make symlinks to util-linux-systemd and python-libmount. And finally, this package is intended only for > 1310 (i. e. Factory). 3) The spec file can have problems with (buggy) Factory check-in check: ERROR: python-libmount: group for main package not set There is false error and I have no work-around for this just now. (If you want, please ping me (by mail) after package review, and I'll do all needed changes.) - Update to version 2.25 (using work of Ruediger Meier ): * based on the git master branch of util-linux * many fixes (including bnc#869355, bnc#871951 and bnc#871698#c49) * new Python binding sub-package for libmount: python-libmount * new library: libsmartcols * new commands: lslogins, setpriv * add fstrim systemd timer * better systemd integration * DROPPED command: * cytune: Upstream decided to remove tool untested for years that supports this old hardware. - Dropped patches included in the upstream: (*git) Included with no changes (+git) Included with improvements (!git) Included with differences * support-other-tty-lines-not-vconsole.patch (*b9c7390) * agetty-fooled-on-serial-line-due-plymouth.patch, * sulogin-fooled-on-tty-line-due-plymouth.patch (*bb280f7) * agetty-on-s390-on-dev-3270-tty1-line.patch (*f2bcda5) * sulogin-does-not-find-any-console.patch (*624b204) * util-linux-setarch-uname26.patch (*f6eb160) * util-linux-ng-2.16-squashfs3-detect.patch (*11402f5) * util-linux-lscpu-improve-hypervisor-detection.patch (!b774473, b32488c, 5bd31c6, 0f0c558, 96ce475) WARNING, INCOMPATIBLE CHANGE: "lscpu -p" no more reports hypervisor, as it breaks standard behavior. Use standard output instead! (FATE#310255) * blkid-stop-scanning-on-I-O-error.patch (+296d96e) * blkid-convert-superblocks-to-new-calling-convention.patch (+37f4060) * util-linux-libblkid-ext-probe.patch (*a1ca32f) * util-linux-hwclock-drift-check.patch (*f196fd1) * util-linux-hwclock-adjtime-check.patch (*db8fc5f) - Dropped obsolete patch: * util-linux-2.23.1-eject-fpie.patch (eject is no more SUID) * util-linux-2.24-fdisk_remove_bogus_warnings.patch (upstream fixed it in a different way) * util-linux-HACK-boot.localfs.diff (MOUNT_PRINT_SOURCE is no more referenced) - Ported and renamed: * util-linux-2.23.1-noenc-suse.diff -> util-linux-noenc-suse.patch - Split spec file to three stages: * util-linux.spec: Everything that do not need python or systemd. * util-linux-systemd.spec: Stuff that needs systemd: util-linux-systemd and uuidd NOTE: Not building systemd-less variants of utilities. * python-libmount.spec: Just python-libmount - Move bash-completion files to correct packages. - Add patch util-linux-bash-completion-blockdev.patch. - Add hacks to prevent damaging of spec files by format_spec_file (bnc#891152, also edited util-linux-rpmlintrc). - use nologin from upstream (was added in 2.24) OBS-URL: https://build.opensuse.org/request/show/244468 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=248 --- ...y-fooled-on-serial-line-due-plymouth.patch | 153 - agetty-on-s390-on-dev-3270-tty1-line.patch | 78 - ...uperblocks-to-new-calling-convention.patch | 2269 ---------- blkid-stop-scanning-on-I-O-error.patch | 138 - pre_checkin.sh | 35 + python-libmount.changes | 3997 +++++++++++++++++ python-libmount.spec | 1328 ++++++ sulogin-does-not-find-any-console.patch | 32 - sulogin-fooled-on-tty-line-due-plymouth.patch | 72 - support-other-tty-lines-not-vconsole.patch | 104 - util-linux-2.23.1-eject-fpie.patch | 13 - ...nux-2.24-fdisk_remove_bogus_warnings.patch | 18 - util-linux-2.24.2.tar.sign | 17 - util-linux-2.24.2.tar.xz | 3 - util-linux-2.25.tar.sign | 17 + util-linux-2.25.tar.xz | 3 + util-linux-HACK-boot.localfs.diff | 27 - util-linux-bash-completion-blockdev.patch | 13 + util-linux-libblkid-ext-probe.patch | 274 -- ...x-lscpu-improve-hypervisor-detection.patch | 206 - util-linux-ng-2.16-squashfs3-detect.patch | 118 - ...c-suse.diff => util-linux-noenc-suse.patch | 10 +- ...t-excessive-clock-drift-calculations.patch | 162 - util-linux-rpmlintrc | 3 +- util-linux-setarch-uname26.patch | 25 - util-linux-systemd.changes | 3997 +++++++++++++++++ util-linux-systemd.spec | 1328 ++++++ util-linux.changes | 60 +- util-linux.group | 1 + util-linux.license | 1 + util-linux.preamble | 1 + util-linux.python-libmount | 2 + util-linux.spec | 707 ++- util-linux.util-linux | 2 + 34 files changed, 11312 insertions(+), 3902 deletions(-) delete mode 100644 agetty-fooled-on-serial-line-due-plymouth.patch delete mode 100644 agetty-on-s390-on-dev-3270-tty1-line.patch delete mode 100644 blkid-convert-superblocks-to-new-calling-convention.patch delete mode 100644 blkid-stop-scanning-on-I-O-error.patch create mode 100644 pre_checkin.sh create mode 100644 python-libmount.changes create mode 100644 python-libmount.spec delete mode 100644 sulogin-does-not-find-any-console.patch delete mode 100644 sulogin-fooled-on-tty-line-due-plymouth.patch delete mode 100644 support-other-tty-lines-not-vconsole.patch delete mode 100644 util-linux-2.23.1-eject-fpie.patch delete mode 100644 util-linux-2.24-fdisk_remove_bogus_warnings.patch delete mode 100644 util-linux-2.24.2.tar.sign delete mode 100644 util-linux-2.24.2.tar.xz create mode 100644 util-linux-2.25.tar.sign create mode 100644 util-linux-2.25.tar.xz delete mode 100644 util-linux-HACK-boot.localfs.diff create mode 100644 util-linux-bash-completion-blockdev.patch delete mode 100644 util-linux-libblkid-ext-probe.patch delete mode 100644 util-linux-lscpu-improve-hypervisor-detection.patch delete mode 100644 util-linux-ng-2.16-squashfs3-detect.patch rename util-linux-2.23.1-noenc-suse.diff => util-linux-noenc-suse.patch (52%) delete mode 100644 util-linux-prevent-excessive-clock-drift-calculations.patch delete mode 100644 util-linux-setarch-uname26.patch create mode 100644 util-linux-systemd.changes create mode 100644 util-linux-systemd.spec create mode 100644 util-linux.group create mode 100644 util-linux.license create mode 100644 util-linux.preamble create mode 100644 util-linux.python-libmount create mode 100644 util-linux.util-linux diff --git a/agetty-fooled-on-serial-line-due-plymouth.patch b/agetty-fooled-on-serial-line-due-plymouth.patch deleted file mode 100644 index 2612439..0000000 --- a/agetty-fooled-on-serial-line-due-plymouth.patch +++ /dev/null @@ -1,153 +0,0 @@ -Even with TTYReset=no it seems with systemd or plymouth the termios -flags become changed from under the first agetty on a serial system -console as the flags are locked. - ---- - agetty.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 68 insertions(+), 7 deletions(-) - ---- term-utils/agetty.c -+++ term-utils/agetty.c 2014-03-05 17:52:32.574235616 +0000 -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -276,13 +277,15 @@ static void log_warn (const char *, ...) - static ssize_t append(char *dest, size_t len, const char *sep, const char *src); - static void check_username (const char* nm); - static void login_options_to_argv(char *argv[], int *argc, char *str, char *username); -+static int plymouth_command(const char* arg); - - /* Fake hostname for ut_host specified on command line. */ - static char *fakehost; - - #ifdef DEBUGGING -+# include "closestream.h" - # ifndef DEBUG_OUTPUT --# define DEBUG_OUTPUT "/dev/ttyp0" -+# define DEBUG_OUTPUT "/dev/tty10" - # endif - # define debug(s) do { fprintf(dbf,s); fflush(dbf); } while (0) - FILE *dbf; -@@ -320,8 +323,12 @@ int main(int argc, char **argv) - - #ifdef DEBUGGING - dbf = fopen(DEBUG_OUTPUT, "w"); -- for (int i = 1; i < argc; i++) -+ for (int i = 1; i < argc; i++) { -+ if (i > 1) -+ debug(" "); - debug(argv[i]); -+ } -+ debug("\n"); - #endif /* DEBUGGING */ - - /* Parse command-line arguments. */ -@@ -473,7 +480,6 @@ int main(int argc, char **argv) - if (options.osrelease) - free(options.osrelease); - #ifdef DEBUGGING -- fprintf(dbf, "read %c\n", ch); - if (close_stream(dbf) != 0) - log_err("write failed: %s", DEBUG_OUTPUT); - #endif -@@ -1104,6 +1110,27 @@ static void termio_init(struct options * - { - speed_t ispeed, ospeed; - struct winsize ws; -+ struct termios lock; -+ int i = (plymouth_command("--ping") == 0) ? 30 : 0; -+ -+ while (i-- > 0) { -+ /* -+ * Even with TTYReset=no it seems with systemd or plymouth -+ * the termios flags become changed from under the first -+ * agetty on a serial system console as the flags are locked. -+ */ -+ memset(&lock, 0, sizeof(struct termios)); -+ if (ioctl(STDIN_FILENO, TIOCGLCKTRMIOS, &lock) < 0) -+ break; -+ if (!lock.c_iflag && !lock.c_oflag && !lock.c_cflag && !lock.c_lflag) -+ break; -+ debug("termios locked\n"); -+ if (i == 15 && plymouth_command("quit") != 0) -+ break; -+ sleep(1); -+ } -+ memset(&lock, 0, sizeof(struct termios)); -+ ioctl(STDIN_FILENO, TIOCSLCKTRMIOS, &lock); - - if (op->flags & F_VCONSOLE) { - #if defined(IUTF8) && defined(KDGKBMODE) -@@ -1168,9 +1195,6 @@ static void termio_init(struct options * - * later on. - */ - -- /* Flush input and output queues, important for modems! */ -- tcflush(STDIN_FILENO, TCIOFLUSH); -- - #ifdef IUTF8 - tp->c_iflag = tp->c_iflag & IUTF8; - if (tp->c_iflag & IUTF8) -@@ -1230,8 +1254,11 @@ static void termio_init(struct options * - if (op->flags & F_RTSCTS) - tp->c_cflag |= CRTSCTS; - #endif -+ /* Flush input and output queues, important for modems! */ -+ tcflush(STDIN_FILENO, TCIOFLUSH); - -- tcsetattr(STDIN_FILENO, TCSANOW, tp); -+ if (tcsetattr(STDIN_FILENO, TCSANOW, tp)) -+ log_warn(_("setting terminal attributes failed: %m")); - - /* Go to blocking input even in local mode. */ - fcntl(STDIN_FILENO, F_SETFL, -@@ -1252,6 +1279,10 @@ static void reset_vc(const struct option - - if (tcsetattr(STDIN_FILENO, TCSADRAIN, tp)) - log_warn(_("setting terminal attributes failed: %m")); -+ -+ /* Go to blocking input even in local mode. */ -+ fcntl(STDIN_FILENO, F_SETFL, -+ fcntl(STDIN_FILENO, F_GETFL, 0) & ~O_NONBLOCK); - } - - /* Extract baud rate from modem status message. */ -@@ -2273,3 +2304,33 @@ err: - log_err(_("checkname failed: %m")); - } - -+/* -+ * For the case plymouth is found on this system -+ */ -+static int plymouth_command(const char* arg) -+{ -+ const char *cmd = "/usr/bin/plymouth"; -+ static int has_plymouth = 1; -+ pid_t pid; -+ -+ if (!has_plymouth) -+ return 127; -+ -+ pid = fork(); -+ if (!pid) { -+ int fd = open("/dev/null", O_RDWR); -+ dup2(fd, 0); -+ dup2(fd, 1); -+ dup2(fd, 2); -+ close(fd); -+ execl(cmd, cmd, arg, (char *) NULL); -+ exit(127); -+ } else if (pid > 0) { -+ int status; -+ waitpid(pid, &status, 0); -+ if (status == 127) -+ has_plymouth = 0; -+ return status; -+ } -+ return 1; -+} diff --git a/agetty-on-s390-on-dev-3270-tty1-line.patch b/agetty-on-s390-on-dev-3270-tty1-line.patch deleted file mode 100644 index 36b85e6..0000000 --- a/agetty-on-s390-on-dev-3270-tty1-line.patch +++ /dev/null @@ -1,78 +0,0 @@ ---- - login-utils/sulogin.c | 8 +++++++- - term-utils/agetty.c | 15 ++++++++++----- - 2 files changed, 17 insertions(+), 6 deletions(-) - ---- term-utils/agetty.c -+++ term-utils/agetty.c 2014-05-08 08:08:26.384484940 +0000 -@@ -51,7 +51,8 @@ - # define DEFAULT_VCTERM "linux" - # endif - # if defined (__s390__) || defined (__s390x__) --# define DEFAULT_TTYS0 "ibm327x" -+# define DEFAULT_TTYS0 "dumb" -+# define DEFAULT_TTY32 "ibm327x" - # define DEFAULT_TTYS1 "vt220" - # endif - # ifndef DEFAULT_STERM -@@ -571,6 +572,8 @@ static void login_options_to_argv(char * - *argc = i; - } - -+#define is_speed(str) (strlen((str)) == strspn((str), "0123456789,")) -+ - /* Parse command-line arguments. */ - static void parse_args(int argc, char **argv, struct options *op) - { -@@ -749,7 +752,7 @@ static void parse_args(int argc, char ** - } - - /* Accept "tty", "baudrate tty", and "tty baudrate". */ -- if ('0' <= argv[optind][0] && argv[optind][0] <= '9') { -+ if (is_speed(argv[optind])) { - /* Assume BSD style speed. */ - parse_speeds(op, argv[optind++]); - if (argc < optind + 1) { -@@ -761,7 +764,7 @@ static void parse_args(int argc, char ** - op->tty = argv[optind++]; - if (argc > optind) { - char *v = argv[optind++]; -- if ('0' <= *v && *v <= '9') -+ if (is_speed(v)) - parse_speeds(op, v); - else - op->speeds[op->numspeed++] = bcode("9600"); -@@ -1071,9 +1074,11 @@ static void open_tty(char *tty, struct t - * higher. Whereas the second serial line on a S/390(x) is - * a real character terminal which is compatible with VT220. - */ -- if (strcmp(op->tty, "ttyS0") == 0) -+ if (strcmp(op->tty, "ttyS0") == 0) /* linux/drivers/s390/char/con3215.c */ - op->term = DEFAULT_TTYS0; -- else if (strcmp(op->tty, "ttyS1") == 0) -+ else if (strncmp(op->tty, "3270/tty", 8) == 0) /* linux/drivers/s390/char/con3270.c */ -+ op->term = DEFAULT_TTY32; -+ else if (strcmp(op->tty, "ttyS1") == 0) /* linux/drivers/s390/char/sclp_vt220.c */ - op->term = DEFAULT_TTYS1; - } - #endif ---- login-utils/sulogin.c -+++ login-utils/sulogin.c 2014-05-08 08:22:38.572781002 +0000 -@@ -189,10 +189,16 @@ static void tcfinal(struct console *con) - setenv("TERM", "linux", 1); - return; - } -- if (con->flags & CON_NOTTY) -+ if (con->flags & CON_NOTTY) { -+ setenv("TERM", "dumb", 1); - return; -+ } - -+#if defined (__s390__) || defined (__s390x__) -+ setenv("TERM", "dumb", 1); -+#else - setenv("TERM", "vt102", 1); -+#endif - tio = &con->tio; - fd = con->fd; - diff --git a/blkid-convert-superblocks-to-new-calling-convention.patch b/blkid-convert-superblocks-to-new-calling-convention.patch deleted file mode 100644 index a0253c3..0000000 --- a/blkid-convert-superblocks-to-new-calling-convention.patch +++ /dev/null @@ -1,2269 +0,0 @@ -From 9d3bb346fb30f5e03f919b4f68dc8e7e59499bc7 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke -Date: Tue, 21 Jan 2014 10:10:19 +0100 -Subject: [PATCH] blkid: convert superblocks to new calling convention - -With the previous patch the scanning functions were -modified to return a differentiated return code. -To correctly abort scanning when an I/O error occurs -we need to differentiate between 'error' (= -1) and -'not found' (= 1) in the probe functions. -This patch updates all superblock scanning functions -to the new calling convention. - -Signed-off-by: Hannes Reinecke -Signed-off-by: Ruediger Meier ---- - libblkid/src/partitions/aix.c | 2 +- - libblkid/src/partitions/bsd.c | 14 ++++++--- - libblkid/src/partitions/dos.c | 24 ++++++++++----- - libblkid/src/partitions/gpt.c | 26 +++++++++++----- - libblkid/src/partitions/mac.c | 19 ++++++++---- - libblkid/src/partitions/minix.c | 14 ++++++--- - libblkid/src/partitions/sgi.c | 14 ++++++--- - libblkid/src/partitions/solaris_x86.c | 14 ++++++--- - libblkid/src/partitions/sun.c | 14 ++++++--- - libblkid/src/partitions/ultrix.c | 16 ++++++---- - libblkid/src/partitions/unixware.c | 14 ++++++--- - libblkid/src/superblocks/adaptec_raid.c | 15 ++++----- - libblkid/src/superblocks/bcache.c | 4 +-- - libblkid/src/superblocks/befs.c | 24 +++++++-------- - libblkid/src/superblocks/btrfs.c | 2 +- - libblkid/src/superblocks/cramfs.c | 2 +- - libblkid/src/superblocks/ddf_raid.c | 19 +++++++----- - libblkid/src/superblocks/drbd.c | 8 ++--- - libblkid/src/superblocks/drbdproxy_datalog.c | 2 +- - libblkid/src/superblocks/exfat.c | 4 ++- - libblkid/src/superblocks/ext.c | 34 ++++++++++---------- - libblkid/src/superblocks/f2fs.c | 2 +- - libblkid/src/superblocks/gfs.c | 8 ++--- - libblkid/src/superblocks/hfs.c | 12 ++++---- - libblkid/src/superblocks/highpoint_raid.c | 12 ++++---- - libblkid/src/superblocks/hpfs.c | 8 ++--- - libblkid/src/superblocks/iso9660.c | 4 +-- - libblkid/src/superblocks/isw_raid.c | 13 ++++---- - libblkid/src/superblocks/jfs.c | 2 +- - libblkid/src/superblocks/jmicron_raid.c | 13 ++++---- - libblkid/src/superblocks/linux_raid.c | 46 ++++++++++++++++------------ - libblkid/src/superblocks/lsi_raid.c | 10 +++--- - libblkid/src/superblocks/luks.c | 2 +- - libblkid/src/superblocks/lvm.c | 6 ++-- - libblkid/src/superblocks/minix.c | 18 ++++++----- - libblkid/src/superblocks/netware.c | 2 +- - libblkid/src/superblocks/nilfs.c | 4 +-- - libblkid/src/superblocks/ntfs.c | 6 ++-- - libblkid/src/superblocks/nvidia_raid.c | 12 ++++---- - libblkid/src/superblocks/ocfs.c | 8 ++--- - libblkid/src/superblocks/promise_raid.c | 10 +++--- - libblkid/src/superblocks/reiserfs.c | 8 ++--- - libblkid/src/superblocks/romfs.c | 2 +- - libblkid/src/superblocks/silicon_raid.c | 10 +++--- - libblkid/src/superblocks/squashfs.c | 6 ++-- - libblkid/src/superblocks/swap.c | 24 +++++++-------- - libblkid/src/superblocks/sysv.c | 8 ++--- - libblkid/src/superblocks/ubifs.c | 2 +- - libblkid/src/superblocks/udf.c | 16 +++++----- - libblkid/src/superblocks/ufs.c | 4 +-- - libblkid/src/superblocks/vfat.c | 16 +++++----- - libblkid/src/superblocks/via_raid.c | 6 ++-- - libblkid/src/superblocks/vmfs.c | 4 +-- - libblkid/src/superblocks/vxfs.c | 2 +- - libblkid/src/superblocks/xfs.c | 6 ++-- - libblkid/src/superblocks/zfs.c | 6 ++-- - 56 files changed, 338 insertions(+), 265 deletions(-) - -diff --git a/libblkid/src/partitions/aix.c b/libblkid/src/partitions/aix.c -index de397bf..ded9dfd 100644 ---- a/libblkid/src/partitions/aix.c -+++ b/libblkid/src/partitions/aix.c -@@ -34,7 +34,7 @@ static int probe_aix_pt(blkid_probe pr, - - return 0; - err: -- return -1; -+ return 1; - } - - /* -diff --git a/libblkid/src/partitions/bsd.c b/libblkid/src/partitions/bsd.c -index 3de6a58..6fdb82f 100644 ---- a/libblkid/src/partitions/bsd.c -+++ b/libblkid/src/partitions/bsd.c -@@ -42,14 +42,18 @@ static int probe_bsd_pt(blkid_probe pr, const struct blkid_idmag *mag) - return 0; - - data = blkid_probe_get_sector(pr, BLKID_MAG_SECTOR(mag)); -- if (!data) -- goto nothing; -+ if (!data) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - l = (struct bsd_disklabel *) data + BLKID_MAG_LASTOFFSET(mag); - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - /* try to determine the real type of BSD system according to - * (parental) primary partition */ -@@ -76,7 +80,7 @@ static int probe_bsd_pt(blkid_probe pr, const struct blkid_idmag *mag) - - tab = blkid_partlist_new_parttable(ls, name, BLKID_MAG_OFFSET(mag)); - if (!tab) -- goto err; -+ goto nothing; - - if (le16_to_cpu(l->d_npartitions) < BSD_MAXPARTITIONS) - nparts = le16_to_cpu(l->d_npartitions); -@@ -113,7 +117,7 @@ static int probe_bsd_pt(blkid_probe pr, const struct blkid_idmag *mag) - - par = blkid_partlist_add_partition(ls, tab, start, size); - if (!par) -- goto err; -+ goto nothing; - - blkid_partition_set_type(par, p->p_fstype); - } -diff --git a/libblkid/src/partitions/dos.c b/libblkid/src/partitions/dos.c -index 14f326d..8888c0c 100644 ---- a/libblkid/src/partitions/dos.c -+++ b/libblkid/src/partitions/dos.c -@@ -54,8 +54,12 @@ static int parse_dos_extended(blkid_probe pr, blkid_parttable tab, - if (++ct_nodata > 100) - return 0; - data = blkid_probe_get_sector(pr, cur_start); -- if (!data) -- goto leave; /* malformed partition? */ -+ if (!data) { -+ if (errno) -+ goto err; -+ else -+ goto leave; /* malformed partition? */ -+ } - - if (!mbr_is_valid_magic(data)) - goto leave; -@@ -98,7 +102,7 @@ static int parse_dos_extended(blkid_probe pr, blkid_parttable tab, - - par = blkid_partlist_add_partition(ls, tab, abs_start, size); - if (!par) -- goto err; -+ goto leave; - - blkid_partition_set_type(par, p->sys_ind); - blkid_partition_set_flags(par, p->boot_ind); -@@ -142,8 +146,12 @@ static int probe_dos_pt(blkid_probe pr, - - - data = blkid_probe_get_sector(pr, 0); -- if (!data) -- goto nothing; -+ if (!data) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - /* ignore disks with AIX magic number -- for more details see aix.c */ - if (memcmp(data, BLKID_AIX_MAGIC_STRING, BLKID_AIX_MAGIC_STRLEN) == 0) -@@ -207,7 +215,7 @@ static int probe_dos_pt(blkid_probe pr, - /* allocate a new partition table */ - tab = blkid_partlist_new_parttable(ls, "dos", MBR_PT_OFFSET); - if (!tab) -- goto err; -+ goto nothing; - - if (id) - blkid_parttable_set_id(tab, (unsigned char *) idstr); -@@ -227,7 +235,7 @@ static int probe_dos_pt(blkid_probe pr, - } - par = blkid_partlist_add_partition(ls, tab, start, size); - if (!par) -- goto err; -+ goto nothing; - - blkid_partition_set_type(par, p->sys_ind); - blkid_partition_set_flags(par, p->boot_ind); -@@ -248,7 +256,7 @@ static int probe_dos_pt(blkid_probe pr, - continue; - if (is_extended(p) && - parse_dos_extended(pr, tab, start, size, ssf) == -1) -- goto err; -+ goto nothing; - } - - /* Parse subtypes (nested partitions) on large disks */ -diff --git a/libblkid/src/partitions/gpt.c b/libblkid/src/partitions/gpt.c -index 14a255a..79a4053 100644 ---- a/libblkid/src/partitions/gpt.c -+++ b/libblkid/src/partitions/gpt.c -@@ -168,8 +168,11 @@ static int is_pmbr_valid(blkid_probe pr, int *has) - goto ok; /* skip PMBR check */ - - data = blkid_probe_get_sector(pr, 0); -- if (!data) -+ if (!data) { -+ if (errno) -+ return -1; - goto failed; -+ } - - if (!mbr_is_valid_magic(data)) - goto failed; -@@ -302,26 +305,33 @@ static int probe_gpt_pt(blkid_probe pr, - uint64_t fu, lu; - uint32_t ssf, i; - efi_guid_t guid; -+ int ret; - - if (last_lba(pr, &lastlba)) - goto nothing; - -- if (!is_pmbr_valid(pr, NULL)) -+ ret = is_pmbr_valid(pr, NULL); -+ if (ret < 0) -+ goto err; -+ else if (ret == 0) - goto nothing; - - h = get_gpt_header(pr, &hdr, &e, (lba = GPT_PRIMARY_LBA), lastlba); -- if (!h) -+ if (!h && !errno) - h = get_gpt_header(pr, &hdr, &e, (lba = lastlba), lastlba); - -- if (!h) -+ if (!h) { -+ if (errno) -+ goto err; - goto nothing; -+ } - - blkid_probe_use_wiper(pr, lba * blkid_probe_get_size(pr), 8); - - if (blkid_probe_set_magic(pr, lba << 9, - sizeof(GPT_HEADER_SIGNATURE_STR) - 1, - (unsigned char *) GPT_HEADER_SIGNATURE_STR)) -- goto err; -+ goto nothing; - - guid = h->disk_guid; - swap_efi_guid(&guid); -@@ -335,11 +345,11 @@ static int probe_gpt_pt(blkid_probe pr, - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - tab = blkid_partlist_new_parttable(ls, "gpt", lba << 9); - if (!tab) -- goto err; -+ goto nothing; - - blkid_parttable_set_uuid(tab, (const unsigned char *) &guid); - -@@ -372,7 +382,7 @@ static int probe_gpt_pt(blkid_probe pr, - par = blkid_partlist_add_partition(ls, tab, - start * ssf, size * ssf); - if (!par) -- goto err; -+ goto nothing; - - blkid_partition_set_utf8name(par, - (unsigned char *) e->partition_name, -diff --git a/libblkid/src/partitions/mac.c b/libblkid/src/partitions/mac.c -index 7f8bb75..e64bde2 100644 ---- a/libblkid/src/partitions/mac.c -+++ b/libblkid/src/partitions/mac.c -@@ -87,8 +87,12 @@ static int probe_mac_pt(blkid_probe pr, - * the first block on the disk. - */ - md = (struct mac_driver_desc *) blkid_probe_get_sector(pr, 0); -- if (!md) -- goto nothing; -+ if (!md) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - block_size = be16_to_cpu(md->block_size); - -@@ -96,8 +100,11 @@ static int probe_mac_pt(blkid_probe pr, - * the second block on the disk. - */ - p = (struct mac_partition *) get_mac_block(pr, block_size, 1); -- if (!p) -+ if (!p) { -+ if (errno) -+ goto err; - goto nothing; -+ } - - /* check the first partition signature */ - if (!has_part_signature(p)) -@@ -109,11 +116,11 @@ static int probe_mac_pt(blkid_probe pr, - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - tab = blkid_partlist_new_parttable(ls, "mac", 0); - if (!tab) -- goto err; -+ goto nothing; - - ssf = block_size / 512; - nblks = be32_to_cpu(p->map_count); -@@ -148,7 +155,7 @@ static int probe_mac_pt(blkid_probe pr, - - par = blkid_partlist_add_partition(ls, tab, start, size); - if (!par) -- goto err; -+ goto nothing; - - blkid_partition_set_name(par, (unsigned char *) p->name, - sizeof(p->name)); -diff --git a/libblkid/src/partitions/minix.c b/libblkid/src/partitions/minix.c -index 0a597fb..2f6f513 100644 ---- a/libblkid/src/partitions/minix.c -+++ b/libblkid/src/partitions/minix.c -@@ -25,12 +25,16 @@ static int probe_minix_pt(blkid_probe pr, - int i; - - data = blkid_probe_get_sector(pr, 0); -- if (!data) -- goto nothing; -+ if (!data) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - /* Parent is required, because Minix uses the same PT as DOS and - * difference is only in primary partition (parent) type. -@@ -48,7 +52,7 @@ static int probe_minix_pt(blkid_probe pr, - - tab = blkid_partlist_new_parttable(ls, "minix", MBR_PT_OFFSET); - if (!tab) -- goto err; -+ goto nothing; - - for (i = 0, p = mbr_get_partition(data, 0); - i < MINIX_MAXPARTITIONS; i++, p++) { -@@ -71,7 +75,7 @@ static int probe_minix_pt(blkid_probe pr, - - par = blkid_partlist_add_partition(ls, tab, start, size); - if (!par) -- goto err; -+ goto nothing; - - blkid_partition_set_type(par, p->sys_ind); - blkid_partition_set_flags(par, p->boot_ind); -diff --git a/libblkid/src/partitions/sgi.c b/libblkid/src/partitions/sgi.c -index bcde84f..b216340 100644 ---- a/libblkid/src/partitions/sgi.c -+++ b/libblkid/src/partitions/sgi.c -@@ -25,8 +25,12 @@ static int probe_sgi_pt(blkid_probe pr, - int i; - - l = (struct sgi_disklabel *) blkid_probe_get_sector(pr, 0); -- if (!l) -- goto nothing; -+ if (!l) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - if (sgi_pt_checksum(l)) { - DBG(LOWPROBE, blkid_debug( -@@ -40,7 +44,7 @@ static int probe_sgi_pt(blkid_probe pr, - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - tab = blkid_partlist_new_parttable(ls, "sgi", 0); - if (!tab) -@@ -53,13 +57,13 @@ static int probe_sgi_pt(blkid_probe pr, - blkid_partition par; - - if (size == 0 || type == SGI_TYPE_ENTIRE_DISK || -- type == SGI_TYPE_VOLHDR) { -+ type == SGI_TYPE_VOLHDR) { - blkid_partlist_increment_partno(ls); - continue; - } - par = blkid_partlist_add_partition(ls, tab, start, size); - if (!par) -- goto err; -+ goto nothing; - - blkid_partition_set_type(par, type); - } -diff --git a/libblkid/src/partitions/solaris_x86.c b/libblkid/src/partitions/solaris_x86.c -index 4e08caf..d8fe859 100644 ---- a/libblkid/src/partitions/solaris_x86.c -+++ b/libblkid/src/partitions/solaris_x86.c -@@ -69,8 +69,12 @@ static int probe_solaris_pt(blkid_probe pr, - uint16_t nparts; - - l = (struct solaris_vtoc *) blkid_probe_get_sector(pr, SOLARIS_SECTOR); -- if (!l) -- goto nothing; -+ if (!l) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - if (le32_to_cpu(l->v_version) != 1) { - DBG(LOWPROBE, blkid_debug( -@@ -85,13 +89,13 @@ static int probe_solaris_pt(blkid_probe pr, - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - parent = blkid_partlist_get_parent(ls); - - tab = blkid_partlist_new_parttable(ls, "solaris", SOLARIS_OFFSET); - if (!tab) -- goto err; -+ goto nothing; - - nparts = le16_to_cpu(l->v_nparts); - if (nparts > SOLARIS_MAXPARTITIONS) -@@ -120,7 +124,7 @@ static int probe_solaris_pt(blkid_probe pr, - - par = blkid_partlist_add_partition(ls, tab, start, size); - if (!par) -- goto err; -+ goto nothing; - - blkid_partition_set_type(par, le16_to_cpu(p->s_tag)); - blkid_partition_set_flags(par, le16_to_cpu(p->s_flag)); -diff --git a/libblkid/src/partitions/sun.c b/libblkid/src/partitions/sun.c -index ba7ca3a..83adf83 100644 ---- a/libblkid/src/partitions/sun.c -+++ b/libblkid/src/partitions/sun.c -@@ -27,8 +27,12 @@ static int probe_sun_pt(blkid_probe pr, - int i, use_vtoc; - - l = (struct sun_disklabel *) blkid_probe_get_sector(pr, 0); -- if (!l) -- goto nothing; -+ if (!l) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - if (sun_pt_checksum(l)) { - DBG(LOWPROBE, blkid_debug( -@@ -42,11 +46,11 @@ static int probe_sun_pt(blkid_probe pr, - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - tab = blkid_partlist_new_parttable(ls, "sun", 0); - if (!tab) -- goto err; -+ goto nothing; - - /* sectors per cylinder (partition offset is in cylinders...) */ - spc = be16_to_cpu(l->nhead) * be16_to_cpu(l->nsect); -@@ -89,7 +93,7 @@ static int probe_sun_pt(blkid_probe pr, - } - par = blkid_partlist_add_partition(ls, tab, start, size); - if (!par) -- goto err; -+ goto nothing; - - if (type) - blkid_partition_set_type(par, type); -diff --git a/libblkid/src/partitions/ultrix.c b/libblkid/src/partitions/ultrix.c -index 853ae6e..fa08811 100644 ---- a/libblkid/src/partitions/ultrix.c -+++ b/libblkid/src/partitions/ultrix.c -@@ -44,8 +44,12 @@ static int probe_ultrix_pt(blkid_probe pr, - int i; - - data = blkid_probe_get_sector(pr, ULTRIX_SECTOR); -- if (!data) -- goto nothing; -+ if (!data) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - l = (struct ultrix_disklabel *) (data + ULTRIX_OFFSET); - -@@ -55,7 +59,7 @@ static int probe_ultrix_pt(blkid_probe pr, - if (blkid_probe_set_magic(pr, (ULTRIX_SECTOR << 9) + ULTRIX_OFFSET, - sizeof(ULTRIX_MAGIC_STR) - 1, - (unsigned char *) ULTRIX_MAGIC_STR)) -- goto err; -+ goto nothing; - - if (blkid_partitions_need_typeonly(pr)) - /* caller does not ask for details about partitions */ -@@ -63,11 +67,11 @@ static int probe_ultrix_pt(blkid_probe pr, - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - tab = blkid_partlist_new_parttable(ls, "ultrix", 0); - if (!tab) -- goto err; -+ goto nothing; - - for (i = 0; i < ULTRIX_MAXPARTITIONS; i++) { - if (!l->pt_part[i].pi_nblocks) -@@ -76,7 +80,7 @@ static int probe_ultrix_pt(blkid_probe pr, - if (!blkid_partlist_add_partition(ls, tab, - l->pt_part[i].pi_blkoff, - l->pt_part[i].pi_nblocks)) -- goto err; -+ goto nothing; - } - } - -diff --git a/libblkid/src/partitions/unixware.c b/libblkid/src/partitions/unixware.c -index ce176b8..8cdae31 100644 ---- a/libblkid/src/partitions/unixware.c -+++ b/libblkid/src/partitions/unixware.c -@@ -106,8 +106,12 @@ static int probe_unixware_pt(blkid_probe pr, - - l = (struct unixware_disklabel *) - blkid_probe_get_sector(pr, UNIXWARE_SECTOR); -- if (!l) -- goto nothing; -+ if (!l) { -+ if (errno) -+ goto err; -+ else -+ goto nothing; -+ } - - if (le32_to_cpu(l->vtoc.v_magic) != UNIXWARE_VTOCMAGIC) - goto nothing; -@@ -118,13 +122,13 @@ static int probe_unixware_pt(blkid_probe pr, - - ls = blkid_probe_get_partlist(pr); - if (!ls) -- goto err; -+ goto nothing; - - parent = blkid_partlist_get_parent(ls); - - tab = blkid_partlist_new_parttable(ls, "unixware", UNIXWARE_OFFSET); - if (!tab) -- goto err; -+ goto nothing; - - /* Skip the first partition that describe whole disk - */ -@@ -155,7 +159,7 @@ static int probe_unixware_pt(blkid_probe pr, - - par = blkid_partlist_add_partition(ls, tab, start, size); - if (!par) -- goto err; -+ goto nothing; - - blkid_partition_set_type(par, tag); - blkid_partition_set_flags(par, flg); -diff --git a/libblkid/src/superblocks/adaptec_raid.c b/libblkid/src/superblocks/adaptec_raid.c -index 02e900d..eedf547 100644 ---- a/libblkid/src/superblocks/adaptec_raid.c -+++ b/libblkid/src/superblocks/adaptec_raid.c -@@ -80,10 +80,10 @@ static int probe_adraid(blkid_probe pr, - struct adaptec_metadata *ad; - - if (pr->size < 0x10000) -- return -1; -+ return 1; - - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - - off = ((pr->size / 0x200)-1) * 0x200; - ad = (struct adaptec_metadata *) -@@ -91,16 +91,17 @@ static int probe_adraid(blkid_probe pr, - off, - sizeof(struct adaptec_metadata)); - if (!ad) -- return -1; -+ return errno ? -1 : 1; -+ - if (ad->smagic != be32_to_cpu(AD_SIGNATURE)) -- return -1; -+ return 1; - if (ad->b0idcode != be32_to_cpu(AD_MAGIC)) -- return -1; -+ return 1; - if (blkid_probe_sprintf_version(pr, "%u", ad->resver) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, sizeof(ad->b0idcode), - (unsigned char *) &ad->b0idcode)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/bcache.c b/libblkid/src/superblocks/bcache.c -index 303f7ee..a8f8fa6 100644 ---- a/libblkid/src/superblocks/bcache.c -+++ b/libblkid/src/superblocks/bcache.c -@@ -104,7 +104,7 @@ static int probe_bcache (blkid_probe pr, const struct blkid_idmag *mag) - - bcs = blkid_probe_get_sb(pr, mag, struct bcache_super_block); - if (!bcs) -- return -1; -+ return errno ? -1 : 1; - - if (le64_to_cpu(bcs->offset) != BCACHE_SB_OFF / 512) - return 1; -@@ -112,7 +112,7 @@ static int probe_bcache (blkid_probe pr, const struct blkid_idmag *mag) - return 1; - - if (blkid_probe_set_uuid(pr, bcs->uuid) < 0) -- return -1; -+ return 1; - - return 0; - }; -diff --git a/libblkid/src/superblocks/befs.c b/libblkid/src/superblocks/befs.c -index 452da1e..4bb260d 100644 ---- a/libblkid/src/superblocks/befs.c -+++ b/libblkid/src/superblocks/befs.c -@@ -264,7 +264,7 @@ static int64_t get_key_value(blkid_probe pr, const struct befs_super_block *bs, - bh = (struct bplustree_header *) get_tree_node(pr, bs, &bi->data, 0, - sizeof(struct bplustree_header), fs_le); - if (!bh) -- return -1; -+ return errno ? -1 : 1; - - if ((int32_t) FS32_TO_CPU(bh->magic, fs_le) != BPLUSTREE_MAGIC) - return -1; -@@ -275,7 +275,7 @@ static int64_t get_key_value(blkid_probe pr, const struct befs_super_block *bs, - bn = (struct bplustree_node *) get_tree_node(pr, bs, &bi->data, - node_pointer, FS32_TO_CPU(bh->node_size, fs_le), fs_le); - if (!bn) -- return -1; -+ return errno ? -1 : 1; - - keylengths = (uint16_t *) ((uint8_t *) bn - + ((sizeof(struct bplustree_node) -@@ -336,10 +336,10 @@ static int get_uuid(blkid_probe pr, const struct befs_super_block *bs, - - bi = (struct befs_inode *) get_block_run(pr, bs, &bs->root_dir, fs_le); - if (!bi) -- return -1; -+ return errno ? -1 : 1; - - if (FS32_TO_CPU(bi->magic1, fs_le) != INODE_MAGIC1) -- return -1; -+ return 1; - - sd = (struct small_data *) bi->small_data; - -@@ -376,10 +376,10 @@ static int get_uuid(blkid_probe pr, const struct befs_super_block *bs, - bi = (struct befs_inode *) get_block_run(pr, bs, - &bi->attributes, fs_le); - if (!bi) -- return -1; -+ return errno ? -1 : 1; - - if (FS32_TO_CPU(bi->magic1, fs_le) != INODE_MAGIC1) -- return -1; -+ return 1; - - value = get_key_value(pr, bs, bi, KEY_NAME, fs_le); - -@@ -390,10 +390,10 @@ static int get_uuid(blkid_probe pr, const struct befs_super_block *bs, - value << FS32_TO_CPU(bs->block_shift, fs_le), - FS32_TO_CPU(bs->block_size, fs_le)); - if (!bi) -- return -1; -+ return errno ? -1 : 1; - - if (FS32_TO_CPU(bi->magic1, fs_le) != INODE_MAGIC1) -- return -1; -+ return 1; - - if (FS32_TO_CPU(bi->type, fs_le) == B_UINT64_TYPE - && FS64_TO_CPU(bi->data.size, fs_le) == KEY_SIZE -@@ -404,7 +404,7 @@ static int get_uuid(blkid_probe pr, const struct befs_super_block *bs, - attr_data = (uint64_t *) get_block_run(pr, bs, - &bi->data.direct[0], fs_le); - if (!attr_data) -- return -1; -+ return errno ? -1 : 1; - - *uuid = *attr_data; - } -@@ -424,7 +424,7 @@ static int probe_befs(blkid_probe pr, const struct blkid_idmag *mag) - mag->sboff - B_OS_NAME_LENGTH, - sizeof(struct befs_super_block)); - if (!bs) -- return -1; -+ return errno ? -1 : 1; - - if (le32_to_cpu(bs->magic1) == SUPER_BLOCK_MAGIC1 - && le32_to_cpu(bs->magic2) == SUPER_BLOCK_MAGIC2 -@@ -439,11 +439,11 @@ static int probe_befs(blkid_probe pr, const struct blkid_idmag *mag) - fs_le = 0; - version = "big-endian"; - } else -- return -1; -+ return 1; - - ret = get_uuid(pr, bs, &volume_id, fs_le); - -- if (ret < 0) -+ if (ret != 0) - return ret; - - /* -diff --git a/libblkid/src/superblocks/btrfs.c b/libblkid/src/superblocks/btrfs.c -index 034683b..3c5c151 100644 ---- a/libblkid/src/superblocks/btrfs.c -+++ b/libblkid/src/superblocks/btrfs.c -@@ -70,7 +70,7 @@ static int probe_btrfs(blkid_probe pr, const struct blkid_idmag *mag) - - bfs = blkid_probe_get_sb(pr, mag, struct btrfs_super_block); - if (!bfs) -- return -1; -+ return errno ? -1 : 1; - - if (*bfs->label) - blkid_probe_set_label(pr, -diff --git a/libblkid/src/superblocks/cramfs.c b/libblkid/src/superblocks/cramfs.c -index b58ed08..cb7273f 100644 ---- a/libblkid/src/superblocks/cramfs.c -+++ b/libblkid/src/superblocks/cramfs.c -@@ -40,7 +40,7 @@ static int probe_cramfs(blkid_probe pr, const struct blkid_idmag *mag) - - cs = blkid_probe_get_sb(pr, mag, struct cramfs_super); - if (!cs) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_set_label(pr, cs->name, sizeof(cs->name)); - return 0; -diff --git a/libblkid/src/superblocks/ddf_raid.c b/libblkid/src/superblocks/ddf_raid.c -index 24df421..90820f8 100644 ---- a/libblkid/src/superblocks/ddf_raid.c -+++ b/libblkid/src/superblocks/ddf_raid.c -@@ -81,7 +81,7 @@ static int probe_ddf(blkid_probe pr, - uint64_t off, lba; - - if (pr->size < 0x30000) -- return -1; -+ return 1; - - for (i = 0; i < ARRAY_SIZE(hdrs); i++) { - off = ((pr->size / 0x200) - hdrs[i]) * 0x200; -@@ -90,8 +90,7 @@ static int probe_ddf(blkid_probe pr, - off, - sizeof(struct ddf_header)); - if (!ddf) -- return -1; -- -+ return errno ? -1 : 1; - if (ddf->signature == cpu_to_be32(DDF_MAGIC) || - ddf->signature == cpu_to_le32(DDF_MAGIC)) - break; -@@ -99,7 +98,7 @@ static int probe_ddf(blkid_probe pr, - } - - if (!ddf) -- return -1; -+ return 1; - - lba = ddf->signature == cpu_to_be32(DDF_MAGIC) ? - be64_to_cpu(ddf->primary_lba) : -@@ -111,8 +110,12 @@ static int probe_ddf(blkid_probe pr, - - buf = blkid_probe_get_buffer(pr, - lba << 9, sizeof(ddf->signature)); -- if (!buf || memcmp(buf, &ddf->signature, 4)) -- return -1; -+ if (!buf) { -+ if (errno) -+ return -1; -+ if (memcmp(buf, &ddf->signature, 4)) -+ return 1; -+ } - } - - blkid_probe_strncpy_uuid(pr, ddf->guid, sizeof(ddf->guid)); -@@ -121,11 +124,11 @@ static int probe_ddf(blkid_probe pr, - *(version + sizeof(ddf->ddf_rev)) = '\0'; - - if (blkid_probe_set_version(pr, version) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, - sizeof(ddf->signature), - (unsigned char *) &ddf->signature)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c -index 43e544e..d8309da 100644 ---- a/libblkid/src/superblocks/drbd.c -+++ b/libblkid/src/superblocks/drbd.c -@@ -75,18 +75,18 @@ static int probe_drbd(blkid_probe pr, - - /* Small devices cannot be drbd (?) */ - if (pr->size < 0x10000) -- return -1; -+ return 1; - - md = (struct md_on_disk_08 *) - blkid_probe_get_buffer(pr, - off, - sizeof(struct md_on_disk_08)); - if (!md) -- return -1; -+ return errno ? -1 : 1; - - if (be32_to_cpu(md->magic) != DRBD_MD_MAGIC_08 && - be32_to_cpu(md->magic) != DRBD_MD_MAGIC_84_UNCLEAN) -- return -1; -+ return 1; - - /* - * DRBD does not have "real" uuids; the following resembles DRBD's -@@ -102,7 +102,7 @@ static int probe_drbd(blkid_probe pr, - off + offsetof(struct md_on_disk_08, magic), - sizeof(md->magic), - (unsigned char *) &md->magic)) -- return -1; -+ return 1; - - return 0; - } -diff --git a/libblkid/src/superblocks/drbdproxy_datalog.c b/libblkid/src/superblocks/drbdproxy_datalog.c -index afe4725..2b76fe4 100644 ---- a/libblkid/src/superblocks/drbdproxy_datalog.c -+++ b/libblkid/src/superblocks/drbdproxy_datalog.c -@@ -33,7 +33,7 @@ static int probe_drbdproxy_datalog(blkid_probe pr, - - lh = (struct log_header_t *) blkid_probe_get_buffer(pr, 0, sizeof(*lh)); - if (!lh) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_set_uuid(pr, lh->uuid); - blkid_probe_sprintf_version(pr, "v%jd", le64_to_cpu(lh->version)); -diff --git a/libblkid/src/superblocks/exfat.c b/libblkid/src/superblocks/exfat.c -index 215c671..e684875 100644 ---- a/libblkid/src/superblocks/exfat.c -+++ b/libblkid/src/superblocks/exfat.c -@@ -115,12 +115,14 @@ static int probe_exfat(blkid_probe pr, const struct blkid_idmag *mag) - - sb = blkid_probe_get_sb(pr, mag, struct exfat_super_block); - if (!sb) -- return -1; -+ return errno ? -1 : 1; - - label = find_label(pr, sb); - if (label) - blkid_probe_set_utf8label(pr, label->name, - min(label->length * 2, 30), BLKID_ENC_UTF16LE); -+ else if (errno) -+ return -1; - - blkid_probe_sprintf_uuid(pr, sb->volume_serial, 4, - "%02hhX%02hhX-%02hhX%02hhX", -diff --git a/libblkid/src/superblocks/ext.c b/libblkid/src/superblocks/ext.c -index 8d57cb5..0b391c7 100644 ---- a/libblkid/src/superblocks/ext.c -+++ b/libblkid/src/superblocks/ext.c -@@ -328,9 +328,9 @@ static int probe_jbd(blkid_probe pr, - - es = ext_get_super(pr, NULL, &fi, NULL); - if (!es) -- return -BLKID_ERR_PARAM; -+ return errno ? -1 : 1; - if (!(fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) -- return -BLKID_ERR_PARAM; -+ return 1; - - ext_get_info(pr, 2, es); - blkid_probe_set_uuid_as(pr, es->s_uuid, "LOGUUID"); -@@ -346,16 +346,16 @@ static int probe_ext2(blkid_probe pr, - - es = ext_get_super(pr, &fc, &fi, &frc); - if (!es) -- return -BLKID_ERR_PARAM; -+ return errno ? -1 : 1; - - /* Distinguish between ext3 and ext2 */ - if (fc & EXT3_FEATURE_COMPAT_HAS_JOURNAL) -- return -BLKID_ERR_PARAM; -+ return 1; - - /* Any features which ext2 doesn't understand */ - if ((frc & EXT2_FEATURE_RO_COMPAT_UNSUPPORTED) || - (fi & EXT2_FEATURE_INCOMPAT_UNSUPPORTED)) -- return -BLKID_ERR_PARAM; -+ return 1; - - /* - * If ext2 is not present, but ext4 or ext4dev are, then -@@ -364,7 +364,7 @@ static int probe_ext2(blkid_probe pr, - if (!system_supports_ext2() && - (system_supports_ext4() || system_supports_ext4dev()) && - system_supports_ext4_ext2()) -- return -BLKID_ERR_PARAM; -+ return 1; - - ext_get_info(pr, 2, es); - return 0; -@@ -378,16 +378,16 @@ static int probe_ext3(blkid_probe pr, - - es = ext_get_super(pr, &fc, &fi, &frc); - if (!es) -- return -BLKID_ERR_PARAM; -+ return errno ? -1 : 1; - - /* ext3 requires journal */ - if (!(fc & EXT3_FEATURE_COMPAT_HAS_JOURNAL)) -- return -BLKID_ERR_PARAM; -+ return 1; - - /* Any features which ext3 doesn't understand */ - if ((frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) || - (fi & EXT3_FEATURE_INCOMPAT_UNSUPPORTED)) -- return -BLKID_ERR_PARAM; -+ return 1; - - ext_get_info(pr, 3, es); - return 0; -@@ -402,11 +402,11 @@ static int probe_ext4dev(blkid_probe pr, - - es = ext_get_super(pr, &fc, &fi, &frc); - if (!es) -- return -BLKID_ERR_PARAM; -+ return errno ? -1 : 1; - - /* Distinguish from jbd */ - if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) -- return -BLKID_ERR_PARAM; -+ return 1; - - /* - * If the filesystem does not have a journal and ext2 and ext4 -@@ -431,9 +431,9 @@ static int probe_ext4dev(blkid_probe pr, - */ - if (le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS) { - if (!system_supports_ext4dev() && system_supports_ext4()) -- return -BLKID_ERR_PARAM; -+ return 1; - } else -- return -BLKID_ERR_PARAM; -+ return 1; - - force_ext4dev: - ext_get_info(pr, 4, es); -@@ -448,11 +448,11 @@ static int probe_ext4(blkid_probe pr, - - es = ext_get_super(pr, &fc, &fi, &frc); - if (!es) -- return -1; -+ return errno ? -1 : 1; - - /* Distinguish from jbd */ - if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) -- return -BLKID_ERR_PARAM; -+ return 1; - - /* - * If the filesystem does not have a journal and ext2 is not -@@ -467,7 +467,7 @@ static int probe_ext4(blkid_probe pr, - /* Ext4 has at least one feature which ext3 doesn't understand */ - if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) && - !(fi & EXT3_FEATURE_INCOMPAT_UNSUPPORTED)) -- return -BLKID_ERR_PARAM; -+ return 1; - - force_ext4: - /* -@@ -482,7 +482,7 @@ force_ext4: - */ - if (le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS) { - if (system_supports_ext4dev() || !system_supports_ext4()) -- return -BLKID_ERR_PARAM; -+ return 1; - } - - ext_get_info(pr, 4, es); -diff --git a/libblkid/src/superblocks/f2fs.c b/libblkid/src/superblocks/f2fs.c -index 1543a7a..e798952 100644 ---- a/libblkid/src/superblocks/f2fs.c -+++ b/libblkid/src/superblocks/f2fs.c -@@ -62,7 +62,7 @@ static int probe_f2fs(blkid_probe pr, const struct blkid_idmag *mag) - - sb = blkid_probe_get_sb(pr, mag, struct f2fs_super_block); - if (!sb) -- return -1; -+ return errno ? -1 : 1; - - major = le16_to_cpu(sb->major_ver); - minor = le16_to_cpu(sb->minor_ver); -diff --git a/libblkid/src/superblocks/gfs.c b/libblkid/src/superblocks/gfs.c -index b2c0163..1ca74a5 100644 ---- a/libblkid/src/superblocks/gfs.c -+++ b/libblkid/src/superblocks/gfs.c -@@ -64,7 +64,7 @@ static int probe_gfs(blkid_probe pr, const struct blkid_idmag *mag) - - sbd = blkid_probe_get_sb(pr, mag, struct gfs2_sb); - if (!sbd) -- return -1; -+ return errno ? -1 : 1; - - if (be32_to_cpu(sbd->sb_fs_format) == GFS_FORMAT_FS && - be32_to_cpu(sbd->sb_multihost_format) == GFS_FORMAT_MULTI) -@@ -78,7 +78,7 @@ static int probe_gfs(blkid_probe pr, const struct blkid_idmag *mag) - return 0; - } - -- return -1; -+ return 1; - } - - static int probe_gfs2(blkid_probe pr, const struct blkid_idmag *mag) -@@ -87,7 +87,7 @@ static int probe_gfs2(blkid_probe pr, const struct blkid_idmag *mag) - - sbd = blkid_probe_get_sb(pr, mag, struct gfs2_sb); - if (!sbd) -- return -1; -+ return errno ? -1 : 1; - - if (be32_to_cpu(sbd->sb_fs_format) == GFS2_FORMAT_FS && - be32_to_cpu(sbd->sb_multihost_format) == GFS2_FORMAT_MULTI) -@@ -100,7 +100,7 @@ static int probe_gfs2(blkid_probe pr, const struct blkid_idmag *mag) - blkid_probe_set_version(pr, "1"); - return 0; - } -- return -1; -+ return 1; - } - - const struct blkid_idinfo gfs_idinfo = -diff --git a/libblkid/src/superblocks/hfs.c b/libblkid/src/superblocks/hfs.c -index 6d960e9..c04b176 100644 ---- a/libblkid/src/superblocks/hfs.c -+++ b/libblkid/src/superblocks/hfs.c -@@ -154,7 +154,7 @@ static int probe_hfs(blkid_probe pr, const struct blkid_idmag *mag) - - hfs = blkid_probe_get_sb(pr, mag, struct hfs_mdb); - if (!hfs) -- return -1; -+ return errno ? -1 : 1; - - if ((memcmp(hfs->embed_sig, "H+", 2) == 0) || - (memcmp(hfs->embed_sig, "HX", 2) == 0)) -@@ -193,7 +193,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) - - sbd = blkid_probe_get_sb(pr, mag, struct hfs_mdb); - if (!sbd) -- return -1; -+ return errno ? -1 : 1; - - /* Check for a HFS+ volume embedded in a HFS volume */ - if (memcmp(sbd->signature, "BD", 2) == 0) { -@@ -218,7 +218,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) - struct hfsplus_vol_header); - - if (!hfsplus) -- return -1; -+ return errno ? -1 : 1; - - if ((memcmp(hfsplus->signature, "H+", 2) != 0) && - (memcmp(hfsplus->signature, "HX", 2) != 0)) -@@ -228,7 +228,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) - - blocksize = be32_to_cpu(hfsplus->blocksize); - if (blocksize < HFSPLUS_SECTOR_SIZE) -- return -1; -+ return 1; - - memcpy(extents, hfsplus->cat_file.extents, sizeof(extents)); - cat_block = be32_to_cpu(extents[0].start_block); -@@ -236,7 +236,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) - buf = blkid_probe_get_buffer(pr, - off + ((blkid_loff_t) cat_block * blocksize), 0x2000); - if (!buf) -- return 0; -+ return errno ? -1 : 0; - - bnode = (struct hfsplus_bheader_record *) - &buf[sizeof(struct hfsplus_bnode_descriptor)]; -@@ -271,7 +271,7 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) - (blkid_loff_t) off + leaf_off, - leaf_node_size); - if (!buf) -- return 0; -+ return errno ? -1 : 0; - - descr = (struct hfsplus_bnode_descriptor *) buf; - record_count = be16_to_cpu(descr->num_recs); -diff --git a/libblkid/src/superblocks/highpoint_raid.c b/libblkid/src/superblocks/highpoint_raid.c -index 0b41344..1e242d8 100644 ---- a/libblkid/src/superblocks/highpoint_raid.c -+++ b/libblkid/src/superblocks/highpoint_raid.c -@@ -30,9 +30,9 @@ static int probe_highpoint45x(blkid_probe pr, - uint32_t magic; - - if (pr->size < 0x10000) -- return -1; -+ return 1; - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - - off = ((pr->size / 0x200) - 11) * 0x200; - hpt = (struct hpt45x_metadata *) -@@ -40,13 +40,13 @@ static int probe_highpoint45x(blkid_probe pr, - off, - sizeof(struct hpt45x_metadata)); - if (!hpt) -- return -1; -+ return errno ? -1 : 1; - magic = le32_to_cpu(hpt->magic); - if (magic != HPT45X_MAGIC_OK && magic != HPT45X_MAGIC_BAD) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, sizeof(hpt->magic), - (unsigned char *) &hpt->magic)) -- return -1; -+ return 1; - return 0; - } - -@@ -54,7 +54,7 @@ static int probe_highpoint37x(blkid_probe pr, - const struct blkid_idmag *mag __attribute__((__unused__))) - { - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/hpfs.c b/libblkid/src/superblocks/hpfs.c -index f9b851a..48a0192 100644 ---- a/libblkid/src/superblocks/hpfs.c -+++ b/libblkid/src/superblocks/hpfs.c -@@ -68,7 +68,7 @@ static int probe_hpfs(blkid_probe pr, const struct blkid_idmag *mag) - /* super block */ - hs = blkid_probe_get_sb(pr, mag, struct hpfs_super_block); - if (!hs) -- return -1; -+ return errno ? -1 : 1; - version = hs->version; - - /* spare super block */ -@@ -77,9 +77,9 @@ static int probe_hpfs(blkid_probe pr, const struct blkid_idmag *mag) - HPFS_SBSPARE_OFFSET, - sizeof(struct hpfs_spare_super)); - if (!hss) -- return -1; -+ return errno ? -1 : 1; - if (memcmp(hss->magic, "\x49\x18\x91\xf9", 4) != 0) -- return -1; -+ return 1; - - /* boot block (with UUID and LABEL) */ - hbb = (struct hpfs_boot_block *) -@@ -87,7 +87,7 @@ static int probe_hpfs(blkid_probe pr, const struct blkid_idmag *mag) - 0, - sizeof(struct hpfs_boot_block)); - if (!hbb) -- return -1; -+ return errno ? -1 : 1; - if (memcmp(hbb->magic, "\x55\xaa", 2) == 0 && - memcmp(hbb->sig_hpfs, "HPFS", 4) == 0 && - hbb->sig_28h == 0x28) { -diff --git a/libblkid/src/superblocks/iso9660.c b/libblkid/src/superblocks/iso9660.c -index 148587b..911fcc0 100644 ---- a/libblkid/src/superblocks/iso9660.c -+++ b/libblkid/src/superblocks/iso9660.c -@@ -100,7 +100,7 @@ static int probe_iso9660_hsfs(blkid_probe pr, const struct blkid_idmag *mag) - - iso = blkid_probe_get_sb(pr, mag, struct high_sierra_volume_descriptor); - if (!iso) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_set_version(pr, "High Sierra"); - blkid_probe_set_label(pr, iso->volume_id, sizeof(iso->volume_id)); -@@ -178,7 +178,7 @@ int probe_iso9660(blkid_probe pr, const struct blkid_idmag *mag) - - iso = blkid_probe_get_sb(pr, mag, struct iso_volume_descriptor); - if (!iso) -- return -1; -+ return errno ? -1 : 1; - - memcpy(label, iso->volume_id, sizeof(label)); - -diff --git a/libblkid/src/superblocks/isw_raid.c b/libblkid/src/superblocks/isw_raid.c -index 755c1b6..4491cda 100644 ---- a/libblkid/src/superblocks/isw_raid.c -+++ b/libblkid/src/superblocks/isw_raid.c -@@ -33,9 +33,9 @@ static int probe_iswraid(blkid_probe pr, - struct isw_metadata *isw; - - if (pr->size < 0x10000) -- return -1; -+ return 1; - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - - off = ((pr->size / 0x200) - 2) * 0x200; - isw = (struct isw_metadata *) -@@ -43,15 +43,16 @@ static int probe_iswraid(blkid_probe pr, - off, - sizeof(struct isw_metadata)); - if (!isw) -- return -1; -+ return errno ? -1 : 1; -+ - if (memcmp(isw->sig, ISW_SIGNATURE, sizeof(ISW_SIGNATURE)-1) != 0) -- return -1; -+ return 1; - if (blkid_probe_sprintf_version(pr, "%6s", - &isw->sig[sizeof(ISW_SIGNATURE)-1]) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, sizeof(isw->sig), - (unsigned char *) isw->sig)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/jfs.c b/libblkid/src/superblocks/jfs.c -index 78c018c..6f1bf1c 100644 ---- a/libblkid/src/superblocks/jfs.c -+++ b/libblkid/src/superblocks/jfs.c -@@ -40,7 +40,7 @@ static int probe_jfs(blkid_probe pr, const struct blkid_idmag *mag) - - js = blkid_probe_get_sb(pr, mag, struct jfs_super_block); - if (!js) -- return -1; -+ return errno ? -1 : 1; - if (le32_to_cpu(js->js_bsize) != (1U << le16_to_cpu(js->js_l2bsize))) - return 1; - if (le32_to_cpu(js->js_pbsize) != (1U << le16_to_cpu(js->js_l2pbsize))) -diff --git a/libblkid/src/superblocks/jmicron_raid.c b/libblkid/src/superblocks/jmicron_raid.c -index c708078..60ee187 100644 ---- a/libblkid/src/superblocks/jmicron_raid.c -+++ b/libblkid/src/superblocks/jmicron_raid.c -@@ -32,9 +32,9 @@ static int probe_jmraid(blkid_probe pr, - struct jm_metadata *jm; - - if (pr->size < 0x10000) -- return -1; -+ return 1; - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - - off = ((pr->size / 0x200) - 1) * 0x200; - jm = (struct jm_metadata *) -@@ -42,15 +42,16 @@ static int probe_jmraid(blkid_probe pr, - off, - sizeof(struct jm_metadata)); - if (!jm) -- return -1; -+ return errno ? -1 : 1; -+ - if (memcmp(jm->signature, JM_SIGNATURE, sizeof(JM_SIGNATURE) - 1) != 0) -- return -1; -+ return 1; - if (blkid_probe_sprintf_version(pr, "%u.%u", - jm->major_version, jm->minor_version) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, sizeof(jm->signature), - (unsigned char *) jm->signature)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/linux_raid.c b/libblkid/src/superblocks/linux_raid.c -index a3f9d67..2c36b6e 100644 ---- a/libblkid/src/superblocks/linux_raid.c -+++ b/libblkid/src/superblocks/linux_raid.c -@@ -110,13 +110,13 @@ static int probe_raid0(blkid_probe pr, blkid_loff_t off) - uint64_t size; - - if (pr->size < MD_RESERVED_BYTES) -- return -1; -+ return 1; - mdp0 = (struct mdp0_super_block *) - blkid_probe_get_buffer(pr, - off, - sizeof(struct mdp0_super_block)); - if (!mdp0) -- return -1; -+ return errno ? -1 : 1; - - memset(uuid.ints, 0, sizeof(uuid.ints)); - -@@ -173,12 +173,12 @@ static int probe_raid0(blkid_probe pr, blkid_loff_t off) - } - - if (blkid_probe_sprintf_version(pr, "%u.%u.%u", ma, mi, pa) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_uuid(pr, (unsigned char *) uuid.bytes) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, sizeof(mdp0->md_magic), - (unsigned char *) &mdp0->md_magic)) -- return -1; -+ return 1; - return 0; - } - -@@ -191,24 +191,24 @@ static int probe_raid1(blkid_probe pr, off_t off) - off, - sizeof(struct mdp1_super_block)); - if (!mdp1) -- return -1; -+ return errno ? -1 : 1; - if (le32_to_cpu(mdp1->magic) != MD_SB_MAGIC) -- return -1; -+ return 1; - if (le32_to_cpu(mdp1->major_version) != 1U) -- return -1; -+ return 1; - if (le64_to_cpu(mdp1->super_offset) != (uint64_t) off >> 9) -- return -1; -+ return 1; - if (blkid_probe_set_uuid(pr, (unsigned char *) mdp1->set_uuid) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_uuid_as(pr, - (unsigned char *) mdp1->device_uuid, "UUID_SUB") != 0) -- return -1; -+ return 1; - if (blkid_probe_set_label(pr, mdp1->set_name, - sizeof(mdp1->set_name)) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, sizeof(mdp1->magic), - (unsigned char *) &mdp1->magic)) -- return -1; -+ return 1; - return 0; - } - -@@ -216,23 +216,31 @@ int probe_raid(blkid_probe pr, - const struct blkid_idmag *mag __attribute__((__unused__))) - { - const char *ver = NULL; -+ int ret; - - if (pr->size > MD_RESERVED_BYTES) { - /* version 0 at the end of the device */ - uint64_t sboff = (pr->size & ~(MD_RESERVED_BYTES - 1)) -- - MD_RESERVED_BYTES; -- if (probe_raid0(pr, sboff) == 0) -- return 0; -+ - MD_RESERVED_BYTES; -+ ret = probe_raid0(pr, sboff); -+ if (ret < 1) -+ return ret; - - /* version 1.0 at the end of the device */ - sboff = (pr->size & ~(0x1000 - 1)) - 0x2000; -- if (probe_raid1(pr, sboff) == 0) -+ ret = probe_raid1(pr, sboff); -+ if (ret < 0) -+ return ret; -+ if (ret == 0) - ver = "1.0"; - } - - if (!ver) { - /* version 1.1 at the start of the device */ -- if (probe_raid1(pr, 0) == 0) -+ ret = probe_raid1(pr, 0); -+ if (ret < 0) -+ return ret; -+ if (ret == 0) - ver = "1.1"; - - /* version 1.2 at 4k offset from the start */ -@@ -244,7 +252,7 @@ int probe_raid(blkid_probe pr, - blkid_probe_set_version(pr, ver); - return 0; - } -- return -1; -+ return 1; - } - - -diff --git a/libblkid/src/superblocks/lsi_raid.c b/libblkid/src/superblocks/lsi_raid.c -index 56721dd..5bfbe15 100644 ---- a/libblkid/src/superblocks/lsi_raid.c -+++ b/libblkid/src/superblocks/lsi_raid.c -@@ -30,9 +30,9 @@ static int probe_lsiraid(blkid_probe pr, - struct lsi_metadata *lsi; - - if (pr->size < 0x10000) -- return -1; -+ return 1; - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - - off = ((pr->size / 0x200) - 1) * 0x200; - lsi = (struct lsi_metadata *) -@@ -40,13 +40,13 @@ static int probe_lsiraid(blkid_probe pr, - off, - sizeof(struct lsi_metadata)); - if (!lsi) -- return -1; -+ return errno ? -1 : 1; - - if (memcmp(lsi->sig, LSI_SIGNATURE, sizeof(LSI_SIGNATURE)-1) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, sizeof(lsi->sig), - (unsigned char *) lsi->sig)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/luks.c b/libblkid/src/superblocks/luks.c -index f716e31..420eaa0 100644 ---- a/libblkid/src/superblocks/luks.c -+++ b/libblkid/src/superblocks/luks.c -@@ -45,7 +45,7 @@ static int probe_luks(blkid_probe pr, const struct blkid_idmag *mag) - - header = blkid_probe_get_sb(pr, mag, struct luks_phdr); - if (header == NULL) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_strncpy_uuid(pr, (unsigned char *) header->uuid, - sizeof(header->uuid)); -diff --git a/libblkid/src/superblocks/lvm.c b/libblkid/src/superblocks/lvm.c -index 65c7c35..d956beb 100644 ---- a/libblkid/src/superblocks/lvm.c -+++ b/libblkid/src/superblocks/lvm.c -@@ -82,7 +82,7 @@ static int probe_lvm2(blkid_probe pr, const struct blkid_idmag *mag) - mag->kboff << 10, - 512 + sizeof(struct lvm2_pv_label_header)); - if (!buf) -- return -1; -+ return errno ? -1 : 1; - - /* buf is at 0k or 1k offset; find label inside */ - if (memcmp(buf, "LABELONE", 8) == 0) { -@@ -128,7 +128,7 @@ static int probe_lvm1(blkid_probe pr, const struct blkid_idmag *mag) - - label = blkid_probe_get_sb(pr, mag, struct lvm1_pv_label_header); - if (!label) -- return -1; -+ return errno ? -1 : 1; - - version = le16_to_cpu(label->version); - if (version != 1 && version != 2) -@@ -163,7 +163,7 @@ static int probe_verity(blkid_probe pr, const struct blkid_idmag *mag) - - sb = blkid_probe_get_sb(pr, mag, struct verity_sb); - if (sb == NULL) -- return -1; -+ return errno ? -1 : 1; - - version = le32_to_cpu(sb->version); - if (version != 1) -diff --git a/libblkid/src/superblocks/minix.c b/libblkid/src/superblocks/minix.c -index 0e7cd93..3aa236a 100644 ---- a/libblkid/src/superblocks/minix.c -+++ b/libblkid/src/superblocks/minix.c -@@ -80,17 +80,17 @@ static int probe_minix(blkid_probe pr, const struct blkid_idmag *mag) - max(sizeof(struct minix_super_block), - sizeof(struct minix3_super_block))); - if (!data) -- return -1; -+ return errno ? -1 : 1; - version = get_minix_version(data, &swabme); - if (version < 1) -- return -1; -+ return 1; - - if (version <= 2) { - struct minix_super_block *sb = (struct minix_super_block *) data; - int zones, ninodes, imaps, zmaps, firstz; - - if (sb->s_imap_blocks == 0 || sb->s_zmap_blocks == 0) -- return -1; -+ return 1; - - zones = version == 2 ? minix_swab32(swabme, sb->s_zones) : - minix_swab16(swabme, sb->s_nzones); -@@ -101,15 +101,15 @@ static int probe_minix(blkid_probe pr, const struct blkid_idmag *mag) - - /* sanity checks to be sure that the FS is really minix */ - if (imaps * MINIX_BLOCK_SIZE * 8 < ninodes + 1) -- return -1; -+ return 1; - if (zmaps * MINIX_BLOCK_SIZE * 8 < zones - firstz + 1) -- return -1; -+ return 1; - - } else if (version == 3) { - struct minix3_super_block *sb = (struct minix3_super_block *) data; - - if (sb->s_imap_blocks == 0 || sb->s_zmap_blocks == 0) -- return -1; -+ return 1; - } - - /* unfortunately, some parts of ext3 is sometimes possible to -@@ -117,8 +117,10 @@ static int probe_minix(blkid_probe pr, const struct blkid_idmag *mag) - * string. (For extN magic string and offsets see ext.c.) - */ - ext = blkid_probe_get_buffer(pr, 0x400 + 0x38, 2); -- if (ext && memcmp(ext, "\123\357", 2) == 0) -- return -1; -+ if (!ext) -+ return errno ? -1 : 1; -+ else if (memcmp(ext, "\123\357", 2) == 0) -+ return 1; - - blkid_probe_sprintf_version(pr, "%d", version); - return 0; -diff --git a/libblkid/src/superblocks/netware.c b/libblkid/src/superblocks/netware.c -index 7ef2162..9e2801b 100644 ---- a/libblkid/src/superblocks/netware.c -+++ b/libblkid/src/superblocks/netware.c -@@ -71,7 +71,7 @@ static int probe_netware(blkid_probe pr, const struct blkid_idmag *mag) - - nw = blkid_probe_get_sb(pr, mag, struct netware_super_block); - if (!nw) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_set_uuid(pr, nw->SBH_PoolID); - -diff --git a/libblkid/src/superblocks/nilfs.c b/libblkid/src/superblocks/nilfs.c -index 24ccf63..41c5066 100644 ---- a/libblkid/src/superblocks/nilfs.c -+++ b/libblkid/src/superblocks/nilfs.c -@@ -93,12 +93,12 @@ static int probe_nilfs2(blkid_probe pr, const struct blkid_idmag *mag) - sbp = (struct nilfs_super_block *) blkid_probe_get_buffer( - pr, NILFS_SB_OFFSET, sizeof(struct nilfs_super_block)); - if (!sbp) -- return -1; -+ return errno ? -1 : 1; - /* backup */ - sbb = (struct nilfs_super_block *) blkid_probe_get_buffer( - pr, ((pr->size / 0x200) - 8) * 0x200, sizeof(struct nilfs_super_block)); - if (!sbp) -- return -1; -+ return errno ? -1 : 1; - - /* - * Compare two super blocks and set 1 in swp if the secondary -diff --git a/libblkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c -index d767cb4..3f62bbc 100644 ---- a/libblkid/src/superblocks/ntfs.c -+++ b/libblkid/src/superblocks/ntfs.c -@@ -91,7 +91,7 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag) - - ns = blkid_probe_get_sb(pr, mag, struct ntfs_super_block); - if (!ns) -- return -1; -+ return errno ? -1 : 1; - - /* - * Check bios parameters block -@@ -158,7 +158,7 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag) - - buf_mft = blkid_probe_get_buffer(pr, off, mft_record_size); - if (!buf_mft) -- return 1; -+ return errno ? -1 : 1; - - if (memcmp(buf_mft, "FILE", 4)) - return 1; -@@ -167,7 +167,7 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag) - - buf_mft = blkid_probe_get_buffer(pr, off, mft_record_size); - if (!buf_mft) -- return 1; -+ return errno ? -1 : 1; - - if (memcmp(buf_mft, "FILE", 4)) - return 1; -diff --git a/libblkid/src/superblocks/nvidia_raid.c b/libblkid/src/superblocks/nvidia_raid.c -index dd86cdc..54038e7 100644 ---- a/libblkid/src/superblocks/nvidia_raid.c -+++ b/libblkid/src/superblocks/nvidia_raid.c -@@ -32,9 +32,9 @@ static int probe_nvraid(blkid_probe pr, - struct nv_metadata *nv; - - if (pr->size < 0x10000) -- return -1; -+ return 1; - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - - off = ((pr->size / 0x200) - 2) * 0x200; - nv = (struct nv_metadata *) -@@ -42,15 +42,15 @@ static int probe_nvraid(blkid_probe pr, - off, - sizeof(struct nv_metadata)); - if (!nv) -- return -1; -+ return errno ? -1 : 1; - - if (memcmp(nv->vendor, NVIDIA_SIGNATURE, sizeof(NVIDIA_SIGNATURE)-1) != 0) -- return -1; -+ return 1; - if (blkid_probe_sprintf_version(pr, "%u", le16_to_cpu(nv->version)) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, sizeof(nv->vendor), - (unsigned char *) nv->vendor)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/ocfs.c b/libblkid/src/superblocks/ocfs.c -index 82170ac..f537db4 100644 ---- a/libblkid/src/superblocks/ocfs.c -+++ b/libblkid/src/superblocks/ocfs.c -@@ -109,14 +109,14 @@ static int probe_ocfs(blkid_probe pr, const struct blkid_idmag *mag) - buf = blkid_probe_get_buffer(pr, mag->kboff << 10, - sizeof(struct ocfs_volume_header)); - if (!buf) -- return -1; -+ return errno ? -1 : 1; - memcpy(&ovh, buf, sizeof(ovh)); - - /* label */ - buf = blkid_probe_get_buffer(pr, (mag->kboff << 10) + 512, - sizeof(struct ocfs_volume_label)); - if (!buf) -- return -1; -+ return errno ? -1 : 1; - memcpy(&ovl, buf, sizeof(ovl)); - - maj = ocfsmajor(ovh); -@@ -144,7 +144,7 @@ static int probe_ocfs2(blkid_probe pr, const struct blkid_idmag *mag) - - osb = blkid_probe_get_sb(pr, mag, struct ocfs2_super_block); - if (!osb) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_set_label(pr, (unsigned char *) osb->s_label, sizeof(osb->s_label)); - blkid_probe_set_uuid(pr, osb->s_uuid); -@@ -162,7 +162,7 @@ static int probe_oracleasm(blkid_probe pr, const struct blkid_idmag *mag) - - dl = blkid_probe_get_sb(pr, mag, struct oracle_asm_disk_label); - if (!dl) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_set_label(pr, (unsigned char *) dl->dl_id, sizeof(dl->dl_id)); - return 0; -diff --git a/libblkid/src/superblocks/promise_raid.c b/libblkid/src/superblocks/promise_raid.c -index 01e4e37..d56560c 100644 ---- a/libblkid/src/superblocks/promise_raid.c -+++ b/libblkid/src/superblocks/promise_raid.c -@@ -33,9 +33,9 @@ static int probe_pdcraid(blkid_probe pr, - }; - - if (pr->size < 0x40000) -- return -1; -+ return 1; - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - - for (i = 0; sectors[i] != 0; i++) { - uint64_t off; -@@ -47,18 +47,18 @@ static int probe_pdcraid(blkid_probe pr, - off, - sizeof(struct promise_metadata)); - if (!pdc) -- return -1; -+ return errno ? -1 : 1; - - if (memcmp(pdc->sig, PDC_SIGNATURE, - sizeof(PDC_SIGNATURE) - 1) == 0) { - - if (blkid_probe_set_magic(pr, off, sizeof(pdc->sig), - (unsigned char *) pdc->sig)) -- return -1; -+ return 1; - return 0; - } - } -- return -1; -+ return 1; - } - - const struct blkid_idinfo pdcraid_idinfo = { -diff --git a/libblkid/src/superblocks/reiserfs.c b/libblkid/src/superblocks/reiserfs.c -index 152571f..247891a 100644 ---- a/libblkid/src/superblocks/reiserfs.c -+++ b/libblkid/src/superblocks/reiserfs.c -@@ -45,17 +45,17 @@ static int probe_reiser(blkid_probe pr, const struct blkid_idmag *mag) - - rs = blkid_probe_get_sb(pr, mag, struct reiserfs_super_block); - if (!rs) -- return -1; -+ return errno ? -1 : 1; - - blocksize = le16_to_cpu(rs->rs_blocksize); - - /* The blocksize must be at least 512B */ - if ((blocksize >> 9) == 0) -- return -BLKID_ERR_PARAM; -+ return 1; - - /* If the superblock is inside the journal, we have the wrong one */ - if (mag->kboff / (blocksize >> 9) > le32_to_cpu(rs->rs_journal_block) / 2) -- return -BLKID_ERR_BIG; -+ return 1; - - /* LABEL/UUID are only valid for later versions of Reiserfs v3.6. */ - if (mag->magic[6] == '2' || mag->magic[6] == '3') { -@@ -82,7 +82,7 @@ static int probe_reiser4(blkid_probe pr, const struct blkid_idmag *mag) - - rs4 = blkid_probe_get_sb(pr, mag, struct reiser4_super_block); - if (!rs4) -- return -1; -+ return errno ? -1 : 1; - - if (*rs4->rs4_label) - blkid_probe_set_label(pr, rs4->rs4_label, sizeof(rs4->rs4_label)); -diff --git a/libblkid/src/superblocks/romfs.c b/libblkid/src/superblocks/romfs.c -index 91ef996..6f339c0 100644 ---- a/libblkid/src/superblocks/romfs.c -+++ b/libblkid/src/superblocks/romfs.c -@@ -29,7 +29,7 @@ static int probe_romfs(blkid_probe pr, const struct blkid_idmag *mag) - - ros = blkid_probe_get_sb(pr, mag, struct romfs_super_block); - if (!ros) -- return -1; -+ return errno ? -1 : 1; - - if (strlen((char *) ros->ros_volume)) - blkid_probe_set_label(pr, ros->ros_volume, -diff --git a/libblkid/src/superblocks/silicon_raid.c b/libblkid/src/superblocks/silicon_raid.c -index 10a3023..e38606c 100644 ---- a/libblkid/src/superblocks/silicon_raid.c -+++ b/libblkid/src/superblocks/silicon_raid.c -@@ -88,9 +88,9 @@ static int probe_silraid(blkid_probe pr, - struct silicon_metadata *sil; - - if (pr->size < 0x10000) -- return -1; -+ return 1; - if (!S_ISREG(pr->mode) && !blkid_probe_is_wholedisk(pr)) -- return -1; -+ return 1; - - off = ((pr->size / 0x200) - 1) * 0x200; - -@@ -98,7 +98,7 @@ static int probe_silraid(blkid_probe pr, - blkid_probe_get_buffer(pr, off, - sizeof(struct silicon_metadata)); - if (!sil) -- return -1; -+ return errno ? -1 : 1; - - if (le32_to_cpu(sil->magic) != SILICON_MAGIC) - return 1; -@@ -110,13 +110,13 @@ static int probe_silraid(blkid_probe pr, - if (blkid_probe_sprintf_version(pr, "%u.%u", - le16_to_cpu(sil->major_ver), - le16_to_cpu(sil->minor_ver)) != 0) -- return -1; -+ return 1; - - if (blkid_probe_set_magic(pr, - off + offsetof(struct silicon_metadata, magic), - sizeof(sil->magic), - (unsigned char *) &sil->magic)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/squashfs.c b/libblkid/src/superblocks/squashfs.c -index f8ac95e..6b2f1b1 100644 ---- a/libblkid/src/superblocks/squashfs.c -+++ b/libblkid/src/superblocks/squashfs.c -@@ -36,7 +36,7 @@ static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag) - - sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block); - if (!sq) -- return -1; -+ return errno ? -1 : 1; - - major = le16_to_cpu(sq->s_major); - minor = le16_to_cpu(sq->s_minor); -@@ -56,7 +56,7 @@ static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag) - - sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block); - if (!sq) -- return -1; -+ return errno ? -1 : 1; - - if (strcmp(mag->magic, "sqsh") == 0) { - major = be16_to_cpu(sq->s_major); -@@ -67,7 +67,7 @@ static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag) - } - - if (major > 3) -- return -1; -+ return 1; - - blkid_probe_sprintf_version(pr, "%u.%u", major, minor); - -diff --git a/libblkid/src/superblocks/swap.c b/libblkid/src/superblocks/swap.c -index 4297a9c..2ea94d2 100644 ---- a/libblkid/src/superblocks/swap.c -+++ b/libblkid/src/superblocks/swap.c -@@ -44,27 +44,27 @@ static int swap_set_info(blkid_probe pr, const char *version) - hdr = (struct swap_header_v1_2 *) blkid_probe_get_buffer(pr, 1024, - sizeof(struct swap_header_v1_2)); - if (!hdr) -- return -1; -+ return errno ? -1 : 1; - - /* SWAPSPACE2 - check for wrong version or zeroed pagecount */ -- if (strcmp(version, "1") == 0) { -+ if (strcmp(version, "2") == 0) { - if (hdr->version != 1 && swab32(hdr->version) != 1) { - DBG(LOWPROBE, blkid_debug("incorrect swap version")); -- return -1; -+ return 1; - } - if (hdr->lastpage == 0) { - DBG(LOWPROBE, blkid_debug("not set last swap page")); -- return -1; -+ return 1; - } -- } -+ } - - /* arbitrary sanity check.. is there any garbage down there? */ - if (hdr->padding[32] == 0 && hdr->padding[33] == 0) { - if (hdr->volume[0] && blkid_probe_set_label(pr, hdr->volume, - sizeof(hdr->volume)) < 0) -- return -1; -+ return 1; - if (blkid_probe_set_uuid(pr, hdr->uuid) < 0) -- return -1; -+ return 1; - } - - blkid_probe_set_version(pr, version); -@@ -76,12 +76,12 @@ static int probe_swap(blkid_probe pr, const struct blkid_idmag *mag) - unsigned char *buf; - - if (!mag) -- return -1; -+ return 1; - - /* TuxOnIce keeps valid swap header at the end of the 1st page */ - buf = blkid_probe_get_buffer(pr, 0, TOI_MAGIC_STRLEN); - if (!buf) -- return -1; -+ return errno ? -1 : 1; - - if (memcmp(buf, TOI_MAGIC_STRING, TOI_MAGIC_STRLEN) == 0) - return 1; /* Ignore swap signature, it's TuxOnIce */ -@@ -94,13 +94,13 @@ static int probe_swap(blkid_probe pr, const struct blkid_idmag *mag) - } else if (!memcmp(mag->magic, "SWAPSPACE2", mag->len)) - return swap_set_info(pr, "1"); - -- return -1; -+ return 1; - } - - static int probe_swsuspend(blkid_probe pr, const struct blkid_idmag *mag) - { - if (!mag) -- return -1; -+ return 1; - if (!memcmp(mag->magic, "S1SUSPEND", mag->len)) - return swap_set_info(pr, "s1suspend"); - if (!memcmp(mag->magic, "S2SUSPEND", mag->len)) -@@ -112,7 +112,7 @@ static int probe_swsuspend(blkid_probe pr, const struct blkid_idmag *mag) - if (!memcmp(mag->magic, "LINHIB0001", mag->len)) - return swap_set_info(pr, "linhib0001"); - -- return -1; /* no signature detected */ -+ return 1; /* no signature detected */ - } - - const struct blkid_idinfo swap_idinfo = -diff --git a/libblkid/src/superblocks/sysv.c b/libblkid/src/superblocks/sysv.c -index 80b0cc5..528e8f9 100644 ---- a/libblkid/src/superblocks/sysv.c -+++ b/libblkid/src/superblocks/sysv.c -@@ -80,7 +80,7 @@ static int probe_xenix(blkid_probe pr, const struct blkid_idmag *mag) - - sb = blkid_probe_get_sb(pr, mag, struct xenix_super_block); - if (!sb) -- return -1; -+ return errno ? -1 : 1; - blkid_probe_set_label(pr, sb->s_fname, sizeof(sb->s_fname)); - return 0; - } -@@ -105,21 +105,21 @@ static int probe_sysv(blkid_probe pr, - off, - sizeof(struct sysv_super_block)); - if (!sb) -- return -1; -+ return errno ? -1 : 1; - - if (sb->s_magic == cpu_to_le32(0xfd187e20) || - sb->s_magic == cpu_to_be32(0xfd187e20)) { - - if (blkid_probe_set_label(pr, sb->s_fname, - sizeof(sb->s_fname))) -- return -1; -+ return 1; - - if (blkid_probe_set_magic(pr, - off + offsetof(struct sysv_super_block, - s_magic), - sizeof(sb->s_magic), - (unsigned char *) &sb->s_magic)) -- return -1; -+ return 1; - - return 0; - } -diff --git a/libblkid/src/superblocks/ubifs.c b/libblkid/src/superblocks/ubifs.c -index ef84f53..761f3db 100644 ---- a/libblkid/src/superblocks/ubifs.c -+++ b/libblkid/src/superblocks/ubifs.c -@@ -99,7 +99,7 @@ static int probe_ubifs(blkid_probe pr, const struct blkid_idmag *mag) - - sb = blkid_probe_get_sb(pr, mag, struct ubifs_sb_node); - if (!sb) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_set_uuid(pr, sb->uuid); - blkid_probe_sprintf_version(pr, "w%dr%d", -diff --git a/libblkid/src/superblocks/udf.c b/libblkid/src/superblocks/udf.c -index 8702dd0..e3b38c2 100644 ---- a/libblkid/src/superblocks/udf.c -+++ b/libblkid/src/superblocks/udf.c -@@ -85,11 +85,11 @@ static int probe_udf(blkid_probe pr, - UDF_VSD_OFFSET + b, - sizeof(*vsd)); - if (!vsd) -- return 1; -+ return errno ? -1 : 1; - if (vsd->id[0] != '\0') - goto nsr; - } -- return -1; -+ return 1; - - nsr: - /* search the list of VSDs for a NSR descriptor */ -@@ -99,15 +99,15 @@ nsr: - UDF_VSD_OFFSET + ((blkid_loff_t) b * 0x800), - sizeof(*vsd)); - if (!vsd) -- return -1; -+ return errno ? -1 : 1; - if (vsd->id[0] == '\0') -- return -1; -+ return 1; - if (memcmp(vsd->id, "NSR02", 5) == 0) - goto anchor; - if (memcmp(vsd->id, "NSR03", 5) == 0) - goto anchor; - } -- return -1; -+ return 1; - - anchor: - /* read Anchor Volume Descriptor (AVDP), checking block size */ -@@ -115,7 +115,7 @@ anchor: - vd = (struct volume_descriptor *) - blkid_probe_get_buffer(pr, 256 * pbs[i], sizeof(*vd)); - if (!vd) -- return -1; -+ return errno ? -1 : 1; - - type = le16_to_cpu(vd->tag.id); - if (type == 2) /* TAG_ID_AVDP */ -@@ -138,7 +138,7 @@ real_blksz: - (blkid_loff_t) (loc + b) * bs, - sizeof(*vd)); - if (!vd) -- return -1; -+ return errno ? -1 : 1; - } - - /* Try extract all possible ISO9660 information -- if there is -@@ -155,7 +155,7 @@ real_blksz: - (blkid_loff_t) (loc + b) * bs, - sizeof(*vd)); - if (!vd) -- return -1; -+ return errno ? -1 : 1; - type = le16_to_cpu(vd->tag.id); - if (type == 0) - break; -diff --git a/libblkid/src/superblocks/ufs.c b/libblkid/src/superblocks/ufs.c -index 673a528..999fd90 100644 ---- a/libblkid/src/superblocks/ufs.c -+++ b/libblkid/src/superblocks/ufs.c -@@ -185,7 +185,7 @@ static int probe_ufs(blkid_probe pr, - offsets[i] * 1024, - sizeof(struct ufs_super_block)); - if (!ufs) -- return -1; -+ return errno ? -1 : 1; - - magBE = be32_to_cpu(ufs->fs_magic); - magLE = le32_to_cpu(ufs->fs_magic); -@@ -231,7 +231,7 @@ found: - offsetof(struct ufs_super_block, fs_magic), - sizeof(ufs->fs_magic), - (unsigned char *) &ufs->fs_magic)) -- return -1; -+ return 1; - - return 0; - } -diff --git a/libblkid/src/superblocks/vfat.c b/libblkid/src/superblocks/vfat.c -index 8ff241b..3e278e7 100644 ---- a/libblkid/src/superblocks/vfat.c -+++ b/libblkid/src/superblocks/vfat.c -@@ -261,10 +261,10 @@ int blkid_probe_is_vfat(blkid_probe pr) - - ms = blkid_probe_get_sb(pr, mag, struct msdos_super_block); - if (!ms) -- return 0; -+ return errno ? -1 : 0; - vs = blkid_probe_get_sb(pr, mag, struct vfat_super_block); - if (!vs) -- return 0; -+ return errno ? -1 : 0; - - return fat_valid_superblock(mag, ms, vs, NULL, NULL); - } -@@ -283,10 +283,12 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag) - - ms = blkid_probe_get_sb(pr, mag, struct msdos_super_block); - if (!ms) -- return 0; -+ return errno ? -1 : 1; -+ - vs = blkid_probe_get_sb(pr, mag, struct vfat_super_block); - if (!vs) -- return 0; -+ return errno ? -1 : 1; -+ - if (!fat_valid_superblock(mag, ms, vs, &cluster_count, &fat_size)) - return 1; - -@@ -376,16 +378,16 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag) - (blkid_loff_t) fsinfo_sect * sector_size, - sizeof(struct fat32_fsinfo)); - if (buf == NULL) -- return -1; -+ return errno ? -1 : 1; - - fsinfo = (struct fat32_fsinfo *) buf; - if (memcmp(fsinfo->signature1, "\x52\x52\x61\x41", 4) != 0 && - memcmp(fsinfo->signature1, "\x52\x52\x64\x41", 4) != 0 && - memcmp(fsinfo->signature1, "\x00\x00\x00\x00", 4) != 0) -- return -1; -+ return 1; - if (memcmp(fsinfo->signature2, "\x72\x72\x41\x61", 4) != 0 && - memcmp(fsinfo->signature2, "\x00\x00\x00\x00", 4) != 0) -- return -1; -+ return 1; - } - } - -diff --git a/libblkid/src/superblocks/via_raid.c b/libblkid/src/superblocks/via_raid.c -index 5c15167..ff7a965 100644 ---- a/libblkid/src/superblocks/via_raid.c -+++ b/libblkid/src/superblocks/via_raid.c -@@ -63,7 +63,7 @@ static int probe_viaraid(blkid_probe pr, - off, - sizeof(struct via_metadata)); - if (!v) -- return -1; -+ return errno ? -1 : 1; - - if (le16_to_cpu(v->signature) != VIA_SIGNATURE) - return 1; -@@ -73,11 +73,11 @@ static int probe_viaraid(blkid_probe pr, - return 1; - - if (blkid_probe_sprintf_version(pr, "%u", v->version_number) != 0) -- return -1; -+ return 1; - if (blkid_probe_set_magic(pr, off, - sizeof(v->signature), - (unsigned char *) &v->signature)) -- return -1; -+ return 1; - return 0; - } - -diff --git a/libblkid/src/superblocks/vmfs.c b/libblkid/src/superblocks/vmfs.c -index ead09a8..27d0888 100644 ---- a/libblkid/src/superblocks/vmfs.c -+++ b/libblkid/src/superblocks/vmfs.c -@@ -28,7 +28,7 @@ static int probe_vmfs_fs(blkid_probe pr, const struct blkid_idmag *mag) - - header = blkid_probe_get_sb(pr, mag, struct vmfs_fs_info); - if (header == NULL) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_sprintf_uuid(pr, (unsigned char *) header->uuid, 16, - "%02x%02x%02x%02x-%02x%02x%02x%02x-" -@@ -53,7 +53,7 @@ static int probe_vmfs_volume(blkid_probe pr, const struct blkid_idmag *mag) - - header = blkid_probe_get_sb(pr, mag, struct vmfs_volume_info); - if (header == NULL) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_sprintf_value(pr, "UUID_SUB", - "%02x%02x%02x%02x-%02x%02x%02x%02x-" -diff --git a/libblkid/src/superblocks/vxfs.c b/libblkid/src/superblocks/vxfs.c -index fdab85a..4537560 100644 ---- a/libblkid/src/superblocks/vxfs.c -+++ b/libblkid/src/superblocks/vxfs.c -@@ -20,7 +20,7 @@ static int probe_vxfs(blkid_probe pr, const struct blkid_idmag *mag) - - vxs = blkid_probe_get_sb(pr, mag, struct vxfs_super_block); - if (!vxs) -- return -1; -+ return errno ? -1 : 1; - - blkid_probe_sprintf_version(pr, "%u", (unsigned int) vxs->vs_version); - return 0; -diff --git a/libblkid/src/superblocks/xfs.c b/libblkid/src/superblocks/xfs.c -index f4bb721..58a985d 100644 ---- a/libblkid/src/superblocks/xfs.c -+++ b/libblkid/src/superblocks/xfs.c -@@ -164,7 +164,7 @@ static int probe_xfs(blkid_probe pr, const struct blkid_idmag *mag) - - xs = blkid_probe_get_sb(pr, mag, struct xfs_super_block); - if (!xs) -- return -1; -+ return errno ? -1 : 1; - - if (!xfs_verify_sb(xs)) - return 1; -@@ -249,7 +249,7 @@ static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag) - - buf = blkid_probe_get_buffer(pr, 0, 256*1024); - if (!buf) -- return -1; -+ return errno ? -1 : 1; - - if (memcmp(buf, "XFSB", 4) == 0) - return 1; /* this is regular XFS, ignore */ -@@ -264,7 +264,7 @@ static int probe_xfs_log(blkid_probe pr, const struct blkid_idmag *mag) - } - } - -- return -1; -+ return 1; - } - - const struct blkid_idinfo xfs_log_idinfo = -diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c -index fb86aec..d28786b 100644 ---- a/libblkid/src/superblocks/zfs.c -+++ b/libblkid/src/superblocks/zfs.c -@@ -185,7 +185,7 @@ static int probe_zfs(blkid_probe pr, - blkid_probe_get_buffer(pr, offset, - sizeof(struct zfs_uberblock)); - if (ub == NULL) -- return -1; -+ return errno ? -1 : 1; - - if (ub->ub_magic == UBERBLOCK_MAGIC) { - ub_offset = offset; -@@ -202,7 +202,7 @@ static int probe_zfs(blkid_probe pr, - } - - if (found < 4) -- return -1; -+ return 1; - - /* If we found the 4th uberblock, then we will have exited from the - * scanning loop immediately, and ub will be a valid uberblock. */ -@@ -214,7 +214,7 @@ static int probe_zfs(blkid_probe pr, - if (blkid_probe_set_magic(pr, ub_offset, - sizeof(ub->ub_magic), - (unsigned char *) &ub->ub_magic)) -- return -1; -+ return 1; - - return 0; - } --- -1.8.4.5 - diff --git a/blkid-stop-scanning-on-I-O-error.patch b/blkid-stop-scanning-on-I-O-error.patch deleted file mode 100644 index f34927a..0000000 --- a/blkid-stop-scanning-on-I-O-error.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 65245d440656a8df4352f9a5b9ec047bf4b6a663 Mon Sep 17 00:00:00 2001 -From: Hannes Reinecke -Date: Tue, 21 Jan 2014 09:16:46 +0100 -Subject: [PATCH] blkid: stop scanning on I/O error - -Whenever we fail to read from a device it's pointless to -continue with probing; we should be failing immediately. -Otherwise the system will continue logging I/O errors. - -This patch updates the probe functions to return -1 -on error and 1 if not found. - -Signed-off-by: Hannes Reinecke ---- - libblkid/src/partitions/partitions.c | 13 +++++++++---- - libblkid/src/probe.c | 13 +++++++++++-- - libblkid/src/superblocks/superblocks.c | 13 ++++++++++--- - 3 files changed, 30 insertions(+), 9 deletions(-) - -diff --git a/libblkid/src/partitions/partitions.c b/libblkid/src/partitions/partitions.c -index 6c915d9..98baece 100644 ---- a/libblkid/src/partitions/partitions.c -+++ b/libblkid/src/partitions/partitions.c -@@ -540,7 +540,8 @@ static int idinfo_probe(blkid_probe pr, const struct blkid_idinfo *id, - if (pr->size <= 0 || (id->minsz && id->minsz > pr->size)) - goto nothing; /* the device is too small */ - -- if (blkid_probe_get_idmag(pr, id, &off, &mag)) -+ rc = blkid_probe_get_idmag(pr, id, &off, &mag); -+ if (rc != 0) - goto nothing; - - /* final check by probing function */ -@@ -548,12 +549,13 @@ static int idinfo_probe(blkid_probe pr, const struct blkid_idinfo *id, - DBG(LOWPROBE, blkid_debug( - "%s: ---> call probefunc()", id->name)); - rc = id->probefunc(pr, mag); -- if (rc == -1) { -+ if (rc != 0) { - /* reset after error */ - reset_partlist(blkid_probe_get_partlist(pr)); - if (chn && !chn->binary) - blkid_probe_chain_reset_vals(pr, chn); -- DBG(LOWPROBE, blkid_debug("%s probefunc failed", id->name)); -+ DBG(LOWPROBE, blkid_debug("%s probefunc failed, rc %d", -+ id->name, rc)); - } - if (rc == 0 && mag && chn && !chn->binary) - rc = blkid_probe_set_magic(pr, off, mag->len, -@@ -599,7 +601,10 @@ static int partitions_probe(blkid_probe pr, struct blkid_chain *chn) - continue; - - /* apply checks from idinfo */ -- if (idinfo_probe(pr, idinfos[i], chn) != 0) -+ rc = idinfo_probe(pr, idinfos[i], chn); -+ if (rc < 0) -+ return rc; -+ if (rc > 0) - continue; - - name = idinfos[i]->name; -diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c -index 4b0c997..452c743 100644 ---- a/libblkid/src/probe.c -+++ b/libblkid/src/probe.c -@@ -569,13 +569,17 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, - if (!bf) { - ssize_t ret; - -- if (blkid_llseek(pr->fd, pr->off + off, SEEK_SET) < 0) -+ if (blkid_llseek(pr->fd, pr->off + off, SEEK_SET) < 0) { -+ errno = 0; - return NULL; -+ } - - /* allocate info and space for data by why call */ - bf = calloc(1, sizeof(struct blkid_bufinfo) + len); -- if (!bf) -+ if (!bf) { -+ errno = 0; - return NULL; -+ } - - bf->data = ((unsigned char *) bf) + sizeof(struct blkid_bufinfo); - bf->len = len; -@@ -587,7 +591,10 @@ unsigned char *blkid_probe_get_buffer(blkid_probe pr, - - ret = read(pr->fd, bf->data, len); - if (ret != (ssize_t) len) { -+ DBG(LOWPROBE, blkid_debug("\tbuffer read: return %d error %d", ret, errno)); - free(bf); -+ if (ret >= 0 || errno != EIO) -+ errno = 0; - return NULL; - } - list_add_tail(&bf->bufs, &pr->buffers); -@@ -794,6 +801,8 @@ int blkid_probe_get_idmag(blkid_probe pr, const struct blkid_idinfo *id, - off = (mag->kboff + (mag->sboff >> 10)) << 10; - buf = blkid_probe_get_buffer(pr, off, 1024); - -+ if (!buf && errno) -+ return -1; - if (buf && !memcmp(mag->magic, - buf + (mag->sboff & 0x3ff), mag->len)) { - DBG(LOWPROBE, blkid_debug("\tmagic sboff=%u, kboff=%ld", -diff --git a/libblkid/src/superblocks/superblocks.c b/libblkid/src/superblocks/superblocks.c -index 565daf2..ad93b4e 100644 ---- a/libblkid/src/superblocks/superblocks.c -+++ b/libblkid/src/superblocks/superblocks.c -@@ -380,15 +380,22 @@ static int superblocks_probe(blkid_probe pr, struct blkid_chain *chn) - - DBG(LOWPROBE, blkid_debug("[%zd] %s:", i, id->name)); - -- if (blkid_probe_get_idmag(pr, id, &off, &mag)) -+ rc = blkid_probe_get_idmag(pr, id, &off, &mag); -+ if (rc < 0) -+ break; -+ if (rc > 0) - continue; - - /* final check by probing function */ - if (id->probefunc) { - DBG(LOWPROBE, blkid_debug("\tcall probefunc()")); -- if (id->probefunc(pr, mag) != 0) { -+ rc = id->probefunc(pr, mag); -+ if (rc != 0) { - blkid_probe_chain_reset_vals(pr, chn); -- continue; -+ if (rc < 0) -+ break; -+ else -+ continue; - } - } - --- -1.8.1.4 - diff --git a/pre_checkin.sh b/pre_checkin.sh new file mode 100644 index 0000000..4ed7c53 --- /dev/null +++ b/pre_checkin.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +if test util-linux.spec -ot python-libmount.spec ; then + echo "util-linux.spec is older than python-libmount.spec. Please merge changes manually and call pre-checkin.sh again." + exit 1 +fi +if test util-linux.changes -ot python-libmount.changes ; then + echo "util-linux.changes is older than python-libmount.changes. Please merge changes manually and call pre-checkin.sh again." + exit 1 +fi + +if test util-linux.spec -ot util-linux-systemd.spec ; then + echo "util-linux.spec is older than util-linux-systemd.spec. Please merge changes manually and call pre-checkin.sh again." + exit 1 +fi +if test util-linux.changes -ot util-linux-systemd.changes ; then + echo "util-linux.changes is older than util-linux-systemd.changes. Please merge changes manually and call pre-checkin.sh again." + exit 1 +fi + +sed ' + s/spec file for package util-linux/spec file for package python-libmount/; + /^Name:/s/util-linux/python-libmount/; +' python-libmount.spec + +sed ' + s/spec file for package util-linux/spec file for package util-linux-systemd/; + /^Name:/s/util-linux/util-linux-systemd/; +' util-linux-systemd.spec + +cp -a util-linux.changes python-libmount.changes + +cp -a util-linux.changes util-linux-systemd.changes + +touch util-linux.spec util-linux.changes diff --git a/python-libmount.changes b/python-libmount.changes new file mode 100644 index 0000000..2eaed7c --- /dev/null +++ b/python-libmount.changes @@ -0,0 +1,3997 @@ +------------------------------------------------------------------- +Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz + +- Update to version 2.25 + (using work of Ruediger Meier ): + * based on the git master branch of util-linux + * many fixes (including bnc#869355, bnc#871951 and + bnc#871698#c49) + * new Python binding sub-package for libmount: python-libmount + * new library: libsmartcols + * new commands: lslogins, setpriv + * add fstrim systemd timer + * better systemd integration + * DROPPED command: + * cytune: Upstream decided to remove tool untested for years + that supports this old hardware. +- Dropped patches included in the upstream: + (*git) Included with no changes + (+git) Included with improvements + (!git) Included with differences + * support-other-tty-lines-not-vconsole.patch (*b9c7390) + * agetty-fooled-on-serial-line-due-plymouth.patch, + * sulogin-fooled-on-tty-line-due-plymouth.patch (*bb280f7) + * agetty-on-s390-on-dev-3270-tty1-line.patch (*f2bcda5) + * sulogin-does-not-find-any-console.patch (*624b204) + * util-linux-setarch-uname26.patch (*f6eb160) + * util-linux-ng-2.16-squashfs3-detect.patch (*11402f5) + * util-linux-lscpu-improve-hypervisor-detection.patch + (!b774473, b32488c, 5bd31c6, 0f0c558, 96ce475) + WARNING, INCOMPATIBLE CHANGE: "lscpu -p" no more reports + hypervisor, as it breaks standard behavior. Use standard output + instead! (FATE#310255) + * blkid-stop-scanning-on-I-O-error.patch (+296d96e) + * blkid-convert-superblocks-to-new-calling-convention.patch + (+37f4060) + * util-linux-libblkid-ext-probe.patch (*a1ca32f) + * util-linux-hwclock-drift-check.patch (*f196fd1) + * util-linux-hwclock-adjtime-check.patch (*db8fc5f) +- Dropped obsolete patch: + * util-linux-2.23.1-eject-fpie.patch (eject is no more SUID) + * util-linux-2.24-fdisk_remove_bogus_warnings.patch + (upstream fixed it in a different way) + * util-linux-HACK-boot.localfs.diff + (MOUNT_PRINT_SOURCE is no more referenced) +- Ported and renamed: + * util-linux-2.23.1-noenc-suse.diff + -> util-linux-noenc-suse.patch +- Split spec file to three stages: + * util-linux.spec: Everything that do not need python or systemd. + * util-linux-systemd.spec: Stuff that needs systemd: + util-linux-systemd and uuidd + NOTE: Not building systemd-less variants of utilities. + * python-libmount.spec: Just python-libmount +- Move bash-completion files to correct packages. +- Add patch util-linux-bash-completion-blockdev.patch. +- Add hacks to prevent damaging of spec files by format_spec_file + (bnc#891152, also edited util-linux-rpmlintrc). + +------------------------------------------------------------------- +Sat Jul 26 11:44:57 UTC 2014 - dimstar@opensuse.org + +- Really fix devel-static requires (libblkid-devel-static). + +------------------------------------------------------------------- +Sat Jul 26 09:39:30 UTC 2014 - coolo@suse.com + +- fix requires of devel-static packages + +------------------------------------------------------------------- +Thu Jul 24 18:45:53 CEST 2014 - dsterba@suse.cz + +- enable build of libmount-devel-static, libuuid-devel-static and + libblkid-devel-static + +------------------------------------------------------------------- +Tue May 27 21:17:40 UTC 2014 - sweet_f_a@gmx.de + +- use nologin from upstream (was added in 2.24) +- remove unknown configure options +- remove unused and outdated suse READMEs +- require bc for checks + +------------------------------------------------------------------- +Fri May 16 15:10:53 UTC 2014 - sweet_f_a@gmx.de + +- Prevent excessive clock drift calculations (bnc#871698, + util-linux-prevent-excessive-clock-drift-calculations.patch), + committed by sbrabec@suse.cz + +------------------------------------------------------------------- +Thu May 8 08:15:04 UTC 2014 - werner@suse.de + +- Modify patch support-other-tty-lines-not-vconsole.patch to + make it work on virtual console +- Modify patch agetty-on-s390-on-dev-3270-tty1-line.patch + to add the missed 3270 support upstream + +------------------------------------------------------------------- +Wed May 7 14:12:32 UTC 2014 - werner@suse.de + +- Add patch support-other-tty-lines-not-vconsole.patch + to be able to support console lines like xvc and hvc + +------------------------------------------------------------------- +Thu Apr 24 11:33:36 UTC 2014 - sweet_f_a@gmx.de + +- Update to util-linux-2.24.2: + addpart: + * minor man page improvements + blockdev: + * Some minor corrections to the manual + build-sys: + * don't connect _DEPENDENCIES and _LIBADD + * fix .h.in usage in libblkid and libmount + * libmount/python/__init__.py is always a dist file + chcpu: + * cleanup return codes + * cleanup stdout/stderr usage + delpart: + * minor man page improvements + dmesg: + * -w output not line-buffered + * don't report EPIPE + docs: + * update AUTHORS file + fallocate: + * Clarify that space can also be deallocated + fdformat: + * Some minor change to the manual + fdisk: + * don't colorize "foo " prefixes + flock: + * use nfs4 fallback on EBADF too + fsck: + * Some typographical corrections to the manual + fsck.minix: + * A few typographical corrections to the manual + fstrim: + * add hint to man page + getopt: + * getopt.1 The usual doc dir is /usr/share/doc, not .../docs + hwclock: + * fix possible hang and other set_hardware_clock_exact() issues + include/closestream: + * don't wipe errno on EPIPE + ipcs: + * cleanup jumplabel stlyes + * fix ipc_msg_get_info fallback case + * fix ipc_sem_get_info fallback case + * fix ipc_shm_get_info fallback case + * fix memleak in ipc_*_get_info functions + isosize: + * A few typographical changes to the manual + last: + * fix minor typos in the man page + lib/sysfs: + * make dirent d_type usage more robust + libblkid: + * add extra checks to XFS prober + libfdisk: + * fix logical partition reorder command + * make qsort_r() optional + * properly implement read-only mode + libmount: + * FS id and parent ID could be zero + * accept (deleted) path suffix in mountinfo file + * initialize *root to NULL in mnt_table_get_root_fs + login: + * fix minor typos in the man page + losetup: + * wait for udev + lscpu: + * cleanup, use _PATH_SYS_CPU/NODE + * don't abort if cache size is unknown + * don't assume filesystem supports d_type when searching for NUMA nodes + * read_hypervisor_dmi only fallback to memory scan on x86/x86_64 + mkfs: + * Some typographical changes to the manual + mkfs.bfs: + * One typographical correction to the manual + mkfs.cramfs: + * Some typographical corrections to the manual + mkfs.minix: + * Some typographical changes in the manual + mkswap: + * Some minor typographical corrections to the manual + more: + * improve formatting and wording of man page and help text + mount: + * apply "nofail" to MNT_ERR_NOSOURCE libmount error + * fix --all and nofail return code + * mount.8 Some typographical and prefix corrections to the manual + * remove obsolete and confusing statement from mount.8 + * update mount.8 about barrier mount options defaults + nologin: + * minor man page improvements + nsenter: + * fix set{gid,uid} order,drop supplementary groups + partx: + * Improve the typesetting of the manual + * make dirent d_type usage more robust + po: + * merge changes + * update cs.po (from translationproject.org) + * update da.po (from translationproject.org) + * update de.po (from translationproject.org) + raw: + * Improve the typesetting of the manual + renice: + * correct max priority in renice man page + runuser: + * fix minor typos in the man page + script: + * Also flush writes to timing file. + * time from end of read() call partially fixes #58 + scriptreplay: + * no need to skip first time value or last bytes fixes #58 + setarch: + * Fix ppc64le architectures + setpriv: + * Fix --apparmor-profile + su: + * don't use kill(0, ...) when propagate signal + * fix minor typos in the man page + sulogin: + * minor man page improvements + swaplabel: + * Improve the typesetting of the manual + * wrong version number in check + switch_root: + * make dirent d_type usage more robust + * verify initramfs by f_type, not devno + tests: + * add fdisk 'f' command MBR test + * add lscpu dump for ppc cpu with no cache size + * clean up backport + * cleanup, remove unused lscpu output + * update Py parse mountinfo test + * update libmount tabdiff tests + * use old output format + umount: + * fix typo in usage + * more robust success message for --all + unshare: + * include libmount.h to provide missing MS_* defines + utmpdump: + * minor man page improvements + vipw: + * minor man page improvements +- remove tty3270-on-serial-line-of-s390.patch (was already upstream + since 2.24.1) +- remove barrier_documentation.patch (applied upstream) +- rebase blkid-convert-superblocks-to-new-calling-convention.patch + +------------------------------------------------------------------- +Thu Apr 17 22:43:31 CEST 2014 - sbrabec@suse.cz + +- Enable socket activation needed by systemd service (bnc#872807). + +------------------------------------------------------------------- +Fri Apr 11 16:45:03 CEST 2014 - sbrabec@suse.cz + +- libblkid: Drop the broken ext2/ext3/ext4 discrimination logic + (util-linux-libblkid-ext-probe.patch, bnc#864703). + +------------------------------------------------------------------- +Fri Apr 11 16:27:11 CEST 2014 - hare@suse.de + +- Abort blkid probing on I/O errors (bnc#859062, + blkid-stop-scanning-on-I-O-error.patch, + blkid-convert-superblocks-to-new-calling-convention.patch, + http://www.spinics.net/lists/util-linux-ng/msg08976.html) + +------------------------------------------------------------------- +Tue Apr 1 18:49:26 UTC 2014 - sweet_f_a@gmx.de + +- remove unnecessarily added patches from SLE11: + * util-linux-update-default-commit-interval.patch, openSUSE has + never changed the default and neither will SLE12 + * sfdisk-warn-about-2TB-limit.patch, fixed by upstream years ago + * umount-avoid-readlink.patch, this patch only affects unused + code and the used code does not have this bug +- edit util-linux-lscpu-improve-hypervisor-detection.patch to not + change the default behaviour of "lscpu -p" as documented in it's + man page. Now this patch only affects the summary output. + +------------------------------------------------------------------- +Mon Mar 17 22:36:58 CET 2014 - sbrabec@suse.cz + +- Merge fixes and features from SLE11 (bnc#831868): + * Detect squashfs version <= 3 as squashfs3 and version >= 4 as + squashfs. (mszeredi@suse.cz, + util-linux-ng-2.16-squashfs3-detect.patch, bnc#666893) + * add sfdisk-warn-about-2TB-limit.patch (puzel@novell.com, + bnc#495657) + * Document barrier option in mount.8 (jack@suse.cz, + hvogel@suse.de, + util-linux-ng-2.19.1-barrier_documentation.patch, bnc#489740) + * lscpu: improve hypervisor detection (puzel@novell.com, + fate#310255) + - util-linux-lscpu-improve-hypervisor-detection.patch + * umount: avoid calling readlink on mountpoints if not necessary + - add: umount-avoid-readlink.patch (puzel@suse.com, bnc#794529) + * fix file conflict between util-linux and s390-32 + (puzel@suse.com, bnc#805684) + * util-linux-update-default-commit-interval.patch: + mount(8): update default commit interval (puzel@suse.com, + bnc#809480) + * Obsolete no more packaged uuid-runtime. +- Add uname26 (util-linux-setarch-uname26.patch, FATE#313476). + +------------------------------------------------------------------- +Thu Mar 6 09:43:34 UTC 2014 - werner@suse.de + +- Modify the patches + agetty-fooled-on-serial-line-due-plymouth.patch + sulogin-fooled-on-tty-line-due-plymouth.patch + to be able to disable plymouth if not already terminated due to + a hanging network service (bnc#866860) + +------------------------------------------------------------------- +Sun Feb 9 21:20:31 UTC 2014 - andreas.stieger@gmx.de + +- util-linux 2.24.1 +- agetty: + * support the special terminal on first serial line on a S/390 +- blkdiscard: + * BLKSSZGET fills in an int, not a uint64 +- blkid: + * escape quotes in the output + * simple typo +- blockdev: + * don't use HDIO_GETGEO +- build-sys: + * add --with-smack to config-gen.d + * fstrim depends on libmount +- chsh, chfn: + * add info about non-local support to the man pages +- dmesg: + * fix --raw zero timestamp for kmsg +- docs: + * add patching process to howto-contribute.txt + * update AUTHORS file + * update links to http //git.kernel.org/ web repository views + -fdisk: + * don't care about partition type + * fix printf stuff + * fix usage(), -l [] +- flock: + * Change the 'exit status' man page section to make more sense +- fsck: + * add ext4 to list of filesystems with progress bars in fsck man page +- fstrim: + * add --all to discard all filesystem + * cleanup usage() +- lib/path: + * add path_strdup() +- libblkid: + * (nilfs2) check also backup superblock + * detect alone PMBR + * fix memory leak in blkid_parse_tag_string() + * fix swap-area version +- libfdisk: + * (dos) be more verbose when change bootable flag + * (dos) fix free part counter + * (dos) warn on type 0 + * (gpt) add /home GUID + * (gpt) improve and cleanup recovery code + * (gpt) recover from corrupted primary/backup PT + * (sgi) generate partname according to partition position + * (sun) fix end sectors with +1 error +- libmount: + * add efivarfs to the list of pseudo filesystems + * add mnt_tag_is_valid() + * cleanup fix_optstr() regards to selinux and smack + * fix typo in smack path + * remove smackfs* option when SMACK not enabled +- lsblk: + * fix -D segfault +- lscpu: + * sort NUMA nodes to keep output human readable + * support discontinuous NUMA nodes + * support non sequentially numbering of CPUs +- man: + * Syntax and spelling fixes +- mkfs.minix: + * fix fscanf() format string [coverity scan] +- mkswap: + * fix compiler warning [-Wunused-variable] + * remove cruft from the man page +- mount: + * add note about "noauto" to --all description + * correct mount man page default iso9660 permission + * fix man mount page type + * improve -s man mage info + * make NAME=value tags usable for non-root + * mount.8 fix grammar + * update man page ext3/4 mount options +- partx: + * fix --update ranges and out of order tables +- po: + * merge changes + * update da.po (from translationproject.org) + * update de.po (from translationproject.org) + * update pt_BR.po (from translationproject.org) + * update zh_CN.po (from translationproject.org) +- pylibmount: + * correctly import from pylibmount.so + * import directly from pylibmount in tests + * remove unncessary subdirectory +- script: + * don't call TIOCGWINSZ in signal handler + * restore errno in signal handler + * use poll() rather then O_NONBLOCK +- setpriv: + * simplify usage() +- setterm: + * fix -dump man page info +- sulogin: + * use dirent->d_type when scans /dev +- taskset: + * fix PERMISSIONS section of taskset man page +- tests: + * update blkid swap tests + * update build-sys tests + * update lscpu tests +- textual: + * small inprovements to usage and man page of fstrim +- umount: + * fix umount by tag for non-roots +- unshare: + * add more hints about mount namespaces to the man page +- wipefs: + * call BLKRRPART when erase partition table +- removed patches: + * blkdiscard-BLKSSZGET-fills-in-an-int.patch, applied upstream +- modified patches: + * tty3270-on-serial-line-of-s390.patch, one hunk applied + upstream + +------------------------------------------------------------------ +Fri Feb 7 15:59:20 UTC 2014 - werner@suse.de + +- Add patch sulogin-does-not-find-any-console.patch to enable sulogin + to find suitable console device even if first is not usable (bnc#862078) + +------------------------------------------------------------------- +Thu Feb 6 10:03:30 UTC 2014 - werner@suse.de + +- Avoid that hanging plymouth locks terminal lines that is + add patch sulogin-fooled-on-tty-line-due-plymouth.patch and + modify patch agetty-fooled-on-serial-line-due-plymouth.patch + to remove any lock which had been left over. + +------------------------------------------------------------------- +Tue Feb 4 10:24:02 UTC 2014 - werner@suse.de + +- Modify patch agetty-on-s390-on-dev--3270-tty1-line.patch and + patch tty3270-on-serial-line-of-s390.patch to handle 3270 + terminals +- Really do not verify /usr/bin/eject + +------------------------------------------------------------------- +Mon Feb 3 16:16:36 UTC 2014 - werner@suse.de + +- Add patch agetty-on-s390-on-dev--3270-tty1-line.patch + to let agetty detect /dev/3270/tty1 as device not as baud rate + +------------------------------------------------------------------- +Tue Jan 28 09:37:57 UTC 2014 - speilicke@suse.com + +- Don't verify /usr/bin/eject, it lost the SUID bit and was dropped + from /etc/permissions (bnc#824406) + +------------------------------------------------------------------- +Thu Jan 23 12:40:06 UTC 2014 - werner@suse.de + +- Change patch agetty-fooled-on-serial-line-due-plymouth.patch + to sleep instead of sending breaks to terminal (bnc#774126). + +------------------------------------------------------------------- +Mon Jan 13 10:45:54 CET 2014 - fcrozat@suse.com + +- Ensure localstatedir value used by configure is /run (changed to that + value upstream since 2012). + +------------------------------------------------------------------- +Fri Jan 10 13:08:45 UTC 2014 - werner@suse.de + +- Add patch + agetty-fooled-on-serial-line-due-plymouth.patch + even with TTYReset=no it seems with systemd or plymouth the termios + flags become changed from under the first agetty on a serial system + console as the flags are locked (bnc#774126). + +------------------------------------------------------------------- +Tue Dec 10 16:10:27 UTC 2013 - sweet_f_a@gmx.de + +- Update to util-linux-2.24 + + Release highlights (2.24) + fdisk(8): + * the code has been completely refactored and moved to libfdisk + (the library does not have a stable API yet) + * user interface has been unified for all label types and it + supports colors + * GPT disk UUID, partition UUID and partition name modification + is supported now + pylibmount: + * this new library provides PYTHON BINDINGS for libmount; + use --with-python[=2|3] to enable the bindings + last(1) and lastb(1): + * the NEW IMPLEMENTATION has been merged from sysvinit to + util-linux and extended; now it supports command line options + --present, --since, and --time-format + * use --enable-deprecated-last to enable the old util-linux + last(1) implementation + swapon(8): + * the option --discard= and fstab mount option discard= allow + to explicitly specify 'pages' or 'once' discard policy. If no + policy is selected, the default behavior is to enable both. + See swapon.8 man page for more details. + libblkid and blkid(8): + * supports LOGUUID= for external logs (e.g. extN and XFS) + * generates a pseudo PARTUUID= for MBR partitions (based on MBR + Id, Linux kernel supports the same concept for root= command + line option) + agetty(8): + * supportes new issue file \S escape code to read information + from /etc/os-release + * the option -L allows to completely control CLOCAL flag + dmesg(1): + * supports new command line option --time-format to specify + time format + * supports new iso-8601 time format + hexdump(1): + * supports long options now + wall(1): + * the command is compatible with sysvinit implementation now + logger(1): + * supports new command line option --prio-prefix when logging + stdin + lscpu(1): + * allows to detect more hypervisor types and provides info + about Max and Min CPU Mhz + unshare(8): + * supports new command line options --fork and --mount-proc for + pid namespaces + wipefs(8): + * now wipes superblocks with incorrect checksums too + * supports new command line option --backup to backup erased + data to $HOME/wipefs--.bak + nologin(8): + * this command has been merged into util-linux, the command + politely refuses a login. +- Removed following patches now upstream + * eject-scsi-check-host_status-and-driver_status.patch + * more-fix-buffer-overflow.patch + * more-check-for-buffer-size-when-write-multibyte-char.patch + * more-guarantee-space-for-multibyte.patch +- Removed following patch because now pkg-config does that + * fdisk-tinfo.patch +- Refreshed following patches with updating version string + * util-linux-2.23.1-fdisk_remove_bogus_warnings.patch +- Added enable_last condition in case we don't want to use the last + binary from sysvinit-tools in future +- Upstream moved getopt examples from datadir to docdir but we keep + the old location because we would need to fix the manpage first. + +------------------------------------------------------------------- +Fri Nov 29 13:46:21 UTC 2013 - werner@suse.de + +- Add patch + tty3270-on-serial-line-of-s390.patch + to better support the first and second serial line on s390/x + +------------------------------------------------------------------- +Sun Nov 3 12:53:34 UTC 2013 - schwab@linux-m68k.org + +- blkdiscard-BLKSSZGET-fills-in-an-int.patch: Fix type mismatch in + blkdiscard + +------------------------------------------------------------------- +Fri Oct 25 18:52:01 CEST 2013 - sbrabec@suse.cz + +- Drop SUID flag for eject (bnc#824406). + +------------------------------------------------------------------- +Wed Oct 9 10:00:55 UTC 2013 - schwab@suse.de + +- No *fdisk on m68k + +------------------------------------------------------------------- +Wed Oct 2 18:55:22 CEST 2013 - sbrabec@suse.cz + +- Safely migrate su config files from coreutils to util-linux + (bnc#814626#c18). + +------------------------------------------------------------------- +Fri Sep 27 21:58:03 UTC 2013 - mgorse@suse.com + +- Add more-check-for-buffer-size-when-write-multibyte-char.patch and + more-guarantee-space-for-multibyte.patch -- check for buffer space with + multi-byte chars (BNC#829720). + +------------------------------------------------------------------- +Fri Sep 27 16:58:40 UTC 2013 - mgorse@suse.com + +- Add more-fix-buffer-overflow.patch (bnc#829720). + +------------------------------------------------------------------- +Fri Sep 13 07:06:19 UTC 2013 - werner@suse.de + +- Avoid build require gpg-offline twice + +------------------------------------------------------------------- +Wed Sep 11 20:54:24 CEST 2013 - sbrabec@suse.cz + +- Update to version 2.23.2: + nsenter(1): + * this NEW COMMAND provides command line interface to setns() + Linux syscall and allows to run program with namespaces of + other processes + unshare(1): + * supports new PID and USER namespaces + fdisk(8): + * provides experimental support for GUID Partition Table (GPT), + the implementation is still not complete and some (unimportant) + features are missing. + * ~50% of fdisk code has been refactored, this task is going to + be complete in the next release. The goal is to have libfdisk + shared between all fdisks. + partx(8): + * supports new "update" command (implemented by + BLKPG_RESIZE_PARTITION ioctl) + mount(8): + * supports new userspace mount option x-mount.mkdir[=] to + create mountpoints on demand + * the support for propagation flags has been improved, now the + flags could be specified in /etc/fstab and used together with + regular mount options. It's also possible to specify more + propagation flags together. This EXPERIMENTAL feature is + implemented by additional mount(2) syscalls, because Linux does + not allow to use propagation flags with another options or more + flags together. + umount(8): + * supports new command line option --recursive to recursively + unmount all sub-mounts for the specified mountpoint * supports + new command line option --all-targets to unmount all + mountpoints in the current namespace for the specified + filesystem * the options --recursive and --all-targets could be + used together + dmesg(1): + * supports new command line options --color, --human and + --nopager, the --human option enables relative times, colors and + pager support. + su(1): + * supports new command line options --group and --supp-group to + specify primary and supplementary groups + chfn(1) and chsh(1): + * the commands could be linked with libuser to support non-local + accounts modification (e.g. LDAP, etc). + kill(1): + * the command has been improved to be compatible with procps + version, the procps version is deprecated now, the util-linux + version is enabled by default. + blkdiscard(8): + * this NEW COMMAND discard sectors on a device (for example on + SSD disks) + sulogin(8): + * provides multi-console feature from SysVinit + findmnt(8): + * provides new columns FREQ, PASSNO, ID, OPT-FIELDS, PROPAGATION + lslocks(8): + * provides new column BLOCKER and detects blocked locks + lsblk(8): + * supports new command line option --scsi and new columns HCTL, + TRANsport VENDOR and REVision + swapon(8) and losetup(8): + * the commands prints basic overview by default if no option + specified + column(1): + * supports new command line option --output-separator to specify + table output delimiter + rename(1): + * supports new command line option --symlink to rename symlink + target + hwclock(8): + * supports new command line option --compare to periodically + compare the Hardware Clock to the System Time (based on + adjtimex -c) + ipcs(1): + * supports new command line options --bytes and --human + wipefs(1): + * supports new command line option --force to force erase on used + devices +- Removed upstreamed patches (mkfs.bfs_cleanup_64bit.patch-Patch, + mkfs.bfs_cleanup_endian.patch) + +------------------------------------------------------------------- +Mon Jul 1 13:43:23 UTC 2013 - mail@bernhard-voelker.de + +- Correct condition for Conflicts of sysvinit-tools. + +------------------------------------------------------------------- +Mon Jul 1 07:08:46 UTC 2013 - werner@suse.de + +- Correct version in source URL path. + +------------------------------------------------------------------- +Fri Jun 28 17:42:14 CEST 2013 - sbrabec@suse.cz + +- Fix Provides and Obsoletes of eject. +- Conflict with old coreutils and sysvinit-tools with conflicting + files to guarantee seamless upgrade. +- Remove Provides and Obsoletes of packages that do not exist since + SuSE Linux 8. +- Include upstreamed patch from SUSE eject package: + Check eject host_status and driver_status when using SG_IO + (eject-scsi-check-host_status-and-driver_status.patch, + bnc#358033). + +------------------------------------------------------------------- +Wed Jun 19 10:58:17 UTC 2013 - coolo@suse.com + +- rely on systemd-rpm-macros instead of the full thing + +------------------------------------------------------------------- +Wed Jun 12 21:02:28 UTC 2013 - mail@bernhard-voelker.de + +- util-linux.spec: remove previously added "moving-su-trickery" again + as a su-less coreutils packet is in Base:Build and Factory now. + +------------------------------------------------------------------- +Fri Jun 7 00:13:25 UTC 2013 - mail@bernhard-voelker.de + +- util-linux.spec: work around su(1) PAM problems based on su(1) + being provided by both the coreutils and the util-linux package. + Fix macro typo in %post and %verifyscript sections related to su(1): + s/sysvinit_tools/enable_su/ + +------------------------------------------------------------------- +Thu Jun 6 08:27:43 UTC 2013 - werner@suse.de + +- Add make-sure-sbin-resp-usr-sbin-are-in-PATH.diff, that is include + the old "let `su' handle /sbin and /usr/sbin in path" +- Provide the new eject utility to avoid file conflict with old + eject package + +------------------------------------------------------------------- +Wed Jun 5 12:30:45 UTC 2013 - werner@suse.de + +- Update to util-linux-2.23.1 + + Release highlights (2.22) + su(1): + * has been merged from coreutils into util-linux + * utils-linux version uses /etc/pam.d/su-l PAM config file for --login + (e.g. "su -") session. + sulogin(8): + * has been merged from sysvinit into util-linux + utmpdump(1): + * has been merged from sysvinit into util-linux + eject(1): + * has been merged from inactive upstream from sf.net and Fedora into util-linux + * supports new options --manualeject, --force and --no-partitions-unmount + lslocks(1) + * this NEW COMMAND prints local system locks and it's replacement to very + long time unmaintained lslk(1) + wdctl(8): + * this NEW COMMAND shows hardware watchdog status + libuuid: + * does NOT EXECUTE uuidd on demand, the daemon has to be started by + init scripts / systemd + uuidd: + * supports socket activation (for systemd) + * supports new options -no-fork, --no-pid and --socket-activation + + Release highlights (2.23) + blkdiscard(8): + * this NEW COMMAND discard sectors on a device (for example on SSD disks) + sulogin(8): + * provides multi-console feature from SysVinit +- Removed following patches now upstream + * 0001-Test-for-secure_getenv-too.patch + * 0001-include-bitops.h-Use-the-operating-system-byteswappi.patch + * add-canonicalize_path_restricted.patch + * fdiskbsdlabel.patch + * libmount-add-MNT_ERR_LOOPDEV.patch + * libmount-add-special-MNT_ERR-codes.patch + * libmount-don-t-use-nosuid-noexec-nodev-for-cifs-user.patch + * login-close-tty-before-vhangup.patch + * mount-new-add-loopdev-specific-error-message.patch + * mount-new-allow-sloppy-for-non-root.patch + * mount-new-improve-error-messages.patch + * mount-new-use-MNT_ERR-for-error-messages.patch + * mount-sanitize-paths-from-non-root-users.patch + * util-linux-2.21.2-noenc.diff + * umount-sanitize-paths-from-non-root-users.patch +- Removed following patch which otherwise cause to break build + * util-linux-2.20-libmount-deps.patch +- Refreshed following patches with updating version string + * util-linux-2.23.1-fdisk_remove_bogus_warnings.patch + * util-linux-2.23.1-noenc-suse.diff +- Add util-linux-2.23.1-eject-fpie.patch to compile and link eject + with PIE + +------------------------------------------------------------------- +Wed May 29 11:45:04 UTC 2013 - ihno@suse.com + +- fixing mkfs.bfs to make it 64bit and endian clean. + adding the patches mkfs.bfs_cleanup_64bit.patch and + mkfs.bfs_cleanup_endian.patch + +------------------------------------------------------------------- +Sun Mar 17 20:39:47 UTC 2013 - jengelh@inai.de + +- Split "which", "time" and "adjtimex" off util-linux + +------------------------------------------------------------------- +Sat Feb 16 17:48:29 UTC 2013 - schwab@suse.de + +- fdiskbsdlabel.patch: + Fix fdisk compilation on aarch64 + +------------------------------------------------------------------- +Tue Feb 5 14:32:49 UTC 2013 - crrodriguez@opensuse.org + +- 0001-Test-for-secure_getenv-too.patch: + Current glibc in 12.3/factory no longer exports internal + function __secure_getenv() but has secure_getenv() instead. + +------------------------------------------------------------------- +Mon Jan 7 13:26:15 UTC 2013 - puzel@suse.com + +- add-canonicalize_path_restricted.patch, + mount-sanitize-paths-from-non-root-users.patch, + umount-sanitize-paths-from-non-root-users.patch: + prevent leaking information about existence of folders + (bnc#797002, CVE-2013-0157) + +------------------------------------------------------------------- +Fri Dec 28 04:30:58 UTC 2012 - crrodriguez@opensuse.org + +- 0001-include-bitops.h-Use-the-operating-system-byteswappi.patch + Use OS byteswapping macros, this patch is functionally identical + to the version submitted upstream with the exception it excludes + code that target non-linux systems. + +------------------------------------------------------------------- +Wed Sep 19 19:41:10 UTC 2012 - jslaby@suse.com + +- login: close tty before vhangup (bnc#778842) + login-close-tty-before-vhangup.patch + +------------------------------------------------------------------- +Fri Jun 22 09:37:20 CEST 2012 - kukuk@suse.de + +- Remove pam_lastlog from login.pamd, login is doing it itself. + [bnc#768067] + +------------------------------------------------------------------- +Wed Jun 20 09:22:50 UTC 2012 - lnussel@suse.de + +- add a hack for boot.localfs to determine the devices to wait for + +------------------------------------------------------------------- +Fri Jun 15 12:57:06 UTC 2012 - puzel@suse.com + +- improve error messages from new mount (bnc#767208) + - backport patches from upstream git: + - mount-new-add-loopdev-specific-error-message.patch + - mount-new-use-MNT_ERR-for-error-messages.patch + - libmount-add-special-MNT_ERR-codes.patch + - mount-new-improve-error-messages.patch + - libmount-add-MNT_ERR_LOOPDEV.patch + +------------------------------------------------------------------- +Fri Jun 15 10:07:26 UTC 2012 - lnussel@suse.de + +- remove encryption options completely as upstream will do that as + well in the next release (bnc#748879). + +------------------------------------------------------------------- +Thu Jun 14 13:04:40 UTC 2012 - puzel@suse.com + +- fix automount with quota (rh#825836) + - mount-new-allow-sloppy-for-non-root.patch +- fix wrong mount options for CIFS mounts (bnc#766157) + - libmount-don-t-use-nosuid-noexec-nodev-for-cifs-user.patch + +------------------------------------------------------------------- +Thu May 31 10:04:23 UTC 2012 - sweet_f_a@gmx.de + +- require binutils-devel because "which" wants to find libiberty.a +- remove which-lib64.patch because it's broken and couldn't find + libiberty.a whithin /usr/lib64 +- which doesn't need autoreconf anymore + +------------------------------------------------------------------- +Tue May 29 09:28:55 UTC 2012 - puzel@suse.com + +- switch to new libmount-based mount(8) + +------------------------------------------------------------------- +Fri May 25 12:12:09 UTC 2012 - puzel@suse.com + +- update to util-linux-2.21.2 + - bugfix release +- drop sfdisk-fix-calculation-due-to-type-mismatch.patch + (fixed upstream) + +------------------------------------------------------------------- +Fri May 25 12:03:07 UTC 2012 - puzel@suse.com + +- build with RPM_OPT_FLAGS again (removed by mistake) + +------------------------------------------------------------------- +Thu Apr 12 09:09:05 UTC 2012 - puzel@suse.com + +- fix miscalculation in sfdisk on ix86 (bnc#754789) + - add sfdisk-fix-calculation-due-to-type-mismatch.patch + +------------------------------------------------------------------- +Sat Mar 31 11:09:38 UTC 2012 - puzel@suse.com + +- update to util-linux-2.21.1 + - bugfix release + +------------------------------------------------------------------- +Fri Mar 16 09:56:21 UTC 2012 - fcrozat@suse.com + +- Fix Obsoletes / Provides for login. + +------------------------------------------------------------------- +Tue Mar 13 16:38:34 CET 2012 - kukuk@suse.de + +- Enable /bin/login and obsolete old fork now merged back + (not moved to /usr/bin until all problems are solved to + avoid that root is not able to login). + +------------------------------------------------------------------- +Tue Mar 6 21:18:56 UTC 2012 - rschweikert@suse.com + +- keep binaries in /usr tree (UsrMerge project) + +------------------------------------------------------------------- +Tue Feb 21 13:46:25 UTC 2012 - puzel@suse.com + +- update to util-linux-2.21 + chcpu(8): + - new command + prlimit(1): + - new command + losetup(8): + - the command has been rewritten, features: + * supports 64bit ioctls only + * losetup -a does not require root permissions + * uses new /dev/loop-control kernel API + * supports new command line option --partscan to enable + kernel partition table parser + agetty(8): + - supports new command line options --nohints to disable hints + about Num, Caps and Scroll Locks + - supports new command line option --remote to add a hostname + to the login(1) command line + dmesg(1): + - supports new command line options --file to read the log from + a file rather than from kernel buffer + fallocate(8): + - supports new command line options --punch-hole to punch holes + in the file + findmnt(8): + - supports alternative location of the fstab file + ipcrm(8): + - supports new command line option --all to remove all resources + lscpu(1): + - supports new command line options --all, --offline and + --online to list all, offline or online CPUs + - supports s390 topology description (polarization, books, ...) + partx(8): + - supports partitioned loop devices + wipefs(8): + - allows to zap partition tables + - supports new command line option "--type " to wipe only + specified filesystems, RAIDs or partition table types + libblkid: + - provides new function blkid_do_wipe() to remove all + signatures from the given block device. +- disable elvtune (works only with 2.4 kernel) +- drop patches which are upstream now: + - drop fsck-use-FS-blacklist-for-non-all-mode-too.patch + - drop util-linux-dmesg-fix-printing-of-multibyte-characters.patch + - libmount-ignore-tailing-slash-in-netfs-source-paths.patch + - libmount-fix-chdir-to-parent-for-restricted-user-umo.patch +- update to adjtimex-1.29 +- use fdupes to symlink duplicate manpages +- disabled make check for time (noop) +- libraries back to %{_libdir}, /usr merge project (by + crrodriguez@opensuse.org) +- drop cryptoloop support (provided by dm-crypt) + - util-linux-2.17.1-mount_losetup_crypto.patch + +------------------------------------------------------------------- +Tue Feb 7 14:48:23 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections + +------------------------------------------------------------------- +Sun Dec 25 22:19:44 UTC 2011 - coolo@suse.com + +- do not call %suse_update_config + +------------------------------------------------------------------- +Mon Nov 21 15:13:56 UTC 2011 - aj@suse.de + +- add fdisk-tinfo.patch to fix build with newer curses. + +------------------------------------------------------------------- +Tue Nov 15 13:15:19 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Wed Nov 9 08:27:17 UTC 2011 - puzel@suse.com + +- add libmount-ignore-tailing-slash-in-netfs-source-paths.patch and + libmount-fix-chdir-to-parent-for-restricted-user-umo.patch: + fix umounting network filesystems as plain user (bnc#728480) + +------------------------------------------------------------------- +Tue Nov 8 09:36:41 UTC 2011 - puzel@suse.com + +- add fsck-use-FS-blacklist-for-non-all-mode-too.patch (bnc#728645) + +------------------------------------------------------------------- +Wed Nov 2 09:37:12 UTC 2011 - puzel@suse.com + +- add util-linux-dmesg-fix-printing-of-multibyte-characters.patch + (bnc#725993) + +------------------------------------------------------------------- +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 + +- add fdisk-dont-shorten-long-path-to-disk.patch (bnc#722959) + +------------------------------------------------------------------- +Tue Oct 4 11:32:11 UTC 2011 - uli@suse.com + +- cross-build fix: use %__cc, %configure macros +- set bindir explicitly when installing +- (cross-?)build fix: disable build dependency on SELINUX_LIBS + in libmount + +------------------------------------------------------------------- +Tue Sep 13 09:10:43 UTC 2011 - puzel@suse.com + +- add util-linux-lib-sysfs-deinit.patch (bnc#714151) + +------------------------------------------------------------------- +Mon Aug 29 14:57:57 UTC 2011 - puzel@suse.com + +- update to util-linux-2.20 + - cleanups, bugfixes +- build with --enable-ddate +- add util-linux-sfdisk-manpage-fix.patch + +------------------------------------------------------------------- +Thu Aug 25 14:12:15 UTC 2011 - rguenther@novell.com + +- BuildIgnore pwdutils. + +------------------------------------------------------------------- +Wed Aug 17 10:37:20 UTC 2011 - puzel@novell.com + +- update to util-linux-2.20-rc2 + - bugfixes +- drop patches: + - util-linux-fix-manpages.patch + - util-linux-wall-build-with-pie.patch + - util-linux-2.20-rc1-agetty-fixes.patch + - util-linux-2.20-rc1-hexdump-segfault.patch + - util-linux-2.20-rc-fix-dmesg.patch + +------------------------------------------------------------------- +Wed Aug 10 13:42:33 UTC 2011 - puzel@novell.com + +- add util-linux-2.20-rc1-hexdump-segfault.patch (bnc#710877) + +------------------------------------------------------------------- +Wed Aug 10 12:20:41 UTC 2011 - puzel@novell.com + +- add util-linux-2.20-rc-fix-dmesg.patch (bnc#710417) + +------------------------------------------------------------------- +Wed Aug 10 11:06:15 UTC 2011 - puzel@novell.com + +- add util-linux-2.20-rc1-agetty-fixes.patch (bnc#711240) + +------------------------------------------------------------------- +Mon Aug 1 13:44:21 UTC 2011 - puzel@novell.com + +- update to util-linux-2.20-rc1 + - Release highlights + agetty(8): + - mingetty features have been merged to agetty + chrt(1), taskset(1): + - supports new command line option "--all-tasks" to set or + retrieve the scheduling attributes of all the tasks (threads) + for a given PID + dmesg(1): + - supports new command line options: --clear, --console-on, + --console-off, --ctime, --decode, --facility=, + --level=, --show-delta, --notime, --kernel and + --userspace + fdisk(8): + - improved dialogs to be more user-friendly + findmnt(8), partx(8), lsblk(8) + - support new command line option "--pairs" to enable + key="value" output format + findmnt(8): + - supports new command line options "--poll" and "--timeout" to + monitor /proc/self/mountinfo changes + ionice(1): + - supports human-readable scheduling class names, for example: + ionice -c best-effort $PID + kill(1): + - supports new command line option "-q " to use + sigqueue(2) + - supports real-time signals in formats RT, RTMIN+ and + RTMAX- + lsblk(8): + - supports new columns + - supports new command line option "-D" to print device discard + topology + lscpu(8): + - improved support for s390 boxes + mkfs.minix: + - supports minix version 3 + simpleinit: + - this set of deprecated utils has been REMOVED + wall(1): + - support new command line option "--timeout" to specify write + timeout to terminals in seconds. +- add util-linux-fix-manpages.patch +- add util-linux-wall-build-with-pie.patch +- package /sbin/rcuuidd + +------------------------------------------------------------------- +Tue May 3 09:39:37 UTC 2011 - puzel@novell.com + +- update to util-linux-2.19.1 + - numerous bugfixes, including (bnc#690486 and bnc#690488) +- drop umount-by-imgname.patch (merged upstream) +- cleanup: do not register ipc.info.gz (not provided by + this package) + +------------------------------------------------------------------- +Thu Apr 14 16:27:27 UTC 2011 - puzel@novell.com + +- merge util-linux-2.17.1-losetup-honor-documented-c-option and + util-linux-2.17.1-mount_losetup_crypto.patch) + +------------------------------------------------------------------- +Mon Feb 21 16:28:38 UTC 2011 - puzel@novell.com + +- add umount-by-imgname.patch (bnc#666161) + +------------------------------------------------------------------- +Thu Feb 10 11:01:40 UTC 2011 - puzel@novell.com + +- update to util-linux-2.19 + - uuid fixes + - cleanups, documentation and translation updates +- drop util-linux-2.19-rc1-loop-offset.diff (fixed in upstream, by + different patch) + +------------------------------------------------------------------- +Wed Jan 26 11:47:55 UTC 2011 - puzel@novell.com + +- update to util-linux-2.19-rc3 + - bugfixes + +------------------------------------------------------------------- +Tue Jan 25 09:29:15 UTC 2011 - lnussel@suse.de + +- don't mess with /etc/mtab in %post. aaa_base does that for us + already. + +------------------------------------------------------------------- +Fri Jan 21 12:34:35 UTC 2011 - lnussel@suse.de + +- fix parsing offset= followed by more options (bnc#666150) + +------------------------------------------------------------------- +Tue Jan 18 09:47:11 UTC 2011 - bwiedemann@novell.com + +- fix bnc#664873 + +------------------------------------------------------------------- +Thu Jan 6 16:43:46 UTC 2011 - puzel@novell.com + +- update to util-linux-2.19-rc1 +- important changes: + * lsblk(8): + - this NEW COMMAND lists information about all or selected block + devices in tree-like format. + * partx(8): + - this command has been rewritten to use libblkid for partition + tables parsing. It supports aix, bsd, dos, gpt, mac, minix, + sgi, solaris_x86, sun, ultrix and unixware now. + - supports new command line option "--show" to list partitions in + new format + - prints UUID and name for GPT and mac partitions + * findmnt(8): + - supports new command line option "--submounts" to list all + submounts for selected mountpoint(s) + * agetty(8): + - supports new command line options "-c" and "-s" to reuse + already initialized tty cflags and existing baud rate + * mount(8), umount(8): + - could be linked with libmount (--enable-libmount-mount) to + manage userspace mount options outside /etc/mtab on systems + where the file is a symlink to /proc/mounts. (EXPERIMENTAL, + enabled in openSUSE package) + * losetup(8), mount(8): + - uses /sys/dev/block//loop/backing_file rather than + loopdev ioctls (requires kernel >= 2.6.37) + * fsck(8): + - supports new command line option "-l" to lock whole-disk device + by exclusive flock(2). This option is recommended when more + fsck(8) instances are executed in the same time. + * rtcwake(8): + - supports new mode "show" to print the current RTC alarm time + * fstrim(8): + - this NEW COMMAND allows to discard unused blocks on a mounted + filesystem (wrapper for FITRIM ioctl) + * swapon(8): + - supports new options "discard" and "nofail" + +- in post, replace /etc/mtab with a symlink to /proc/mounts/self +- drop following patches (in upstream) + - util-linux-swapon-btrfs-limitations + - util-linux-agetty-s-option.patch + - util-linux-fsck-l-option.patch + - util-linux-2.18-no-canonicalize-fix.patch + - util-linux-swapon-canonicalize-swap-device.patch +- fix uuidd Summary and Description +- build with --enable-libmount-mount (new option) +- use set_permissions macros +- run spec-cleaner + +------------------------------------------------------------------- +Tue Dec 14 16:11:34 UTC 2010 - puzel@novell.com + +- add util-linux-swapon-canonicalize-swap-device.patch + (bnc#641142) + +------------------------------------------------------------------- +Thu Dec 2 17:09:08 CET 2010 - mszeredi@suse.cz + +- mount: don't canonicalize "spec" with --no-canonicalize option + [bnc#651598] + +------------------------------------------------------------------- +Thu Dec 2 15:23:36 CET 2010 - mszeredi@suse.cz + +- add Provides: util-linux(fake+no-canonicalize) [bnc#651598] + +------------------------------------------------------------------- +Tue Nov 30 12:19:53 UTC 2010 - puzel@novell.com + +- update util-linux-2.17.1-mount_losetup_crypto.patch (bnc#655804) + +------------------------------------------------------------------- +Fri Nov 26 19:10:27 CET 2010 - kay.sievers@novell.com + +- add Provides: fsck-with-dev-lock + +------------------------------------------------------------------- +Thu Nov 25 13:37:43 CET 2010 - kay.sievers@novell.com + +- add 'fsck -l' option needed for systemd + +------------------------------------------------------------------- +Tue Nov 16 16:08:48 UTC 2010 - cristian.rodriguez@opensuse.org + +- disable silent rules + +------------------------------------------------------------------- +Thu Nov 11 10:36:35 CET 2010 - kay.sievers@novell.com + +- add 'agetty' -s option needed for systemd's serial console setup + +------------------------------------------------------------------- +Tue Sep 28 11:42:46 UTC 2010 - aj@suse.de + +- uuidd rc file already creates /var/run/uuidd, mark it as %ghost + in spec file. + +------------------------------------------------------------------- +Fri Jul 9 06:23:27 UTC 2010 - puzel@novell.com + +- update to util-linux-ng-2.18 + - do not provide rdev, ramsize, vidmode and rootflags commands + anymore + - fdisk does not use cylinders as display units by default + - libmount: new library; its API is still officially unstable + - new commands: findmnt, fsfreeze, swaplabel + - blkid: new option "-i" to print I/O limits + - full release notes: + ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes +- update to adjtimex-1.28 +- update to which-2.20 +- drop util-linux-2.14.1-mount_skip_sync.patch (fixed upstream) +- drop util-linux-addpart-use-atoll.patch (fixed upstream) +- drop util-linux-mount-detect-ro-mount.patch (fixed upstream) +- drop adjtimex-1.20-nosyscall.diff (fixed upstream) +- cleanup specfile a bit + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Thu Jun 24 23:24:41 CEST 2010 - jeffm@suse.de + +- document btrfs limitation with swapfiles (bnc#616617) + +------------------------------------------------------------------- +Tue Jun 22 16:48:29 UTC 2010 - bg@novell.com + +- hppa specific binaries are parisc{,32,64} + +------------------------------------------------------------------- +Tue Jun 1 14:23:23 UTC 2010 - puzel@novell.com + +- do not run uuidd as root, but uuidd:uuidd (bnc#604168) + +------------------------------------------------------------------- +Fri May 28 13:24:43 UTC 2010 - puzel@novell.com + +- add util-linux-mount-detect-ro-mount.patch (bnc#481123) + +------------------------------------------------------------------- +Tue May 11 13:58:49 UTC 2010 - puzel@novell.com + +- add util-linux-addpart-use-atoll.patch (bnc#603328) + +------------------------------------------------------------------- +Tue Apr 6 13:22:37 UTC 2010 - hvogel@novell.com + +- update to version 2.17.2 + - fix small typo in v2.17.1-ReleaseNotes + - fix -b fdisk + - fix typo in ionice + - fix display of device size, fix infinite loop when probe chain + bails out early, more robust minix probing, remove "0x" prefix + from DRBD UUID, reset BLKID_TINY_DEV flag in + blkid_probe_set_device, support alignment_offset=-1 in libblkid + - fix cpuid opcode detection in lscpu + - more explicitly explain fstab usage in mount.8, posix option + of vfat is obsolete, properly ignore comments in + /etc/filesystems in mount + - update ja.po, pl.po, update vi.po + - remove " (deleted)" from filenames from /proc/swaps + - cleanup usage() and man page of wipefs + +------------------------------------------------------------------- +Wed Mar 10 23:11:42 CET 2010 - jeffm@suse.de + +- Properly honor documented -c option (bnc#583677) + +------------------------------------------------------------------- +Tue Mar 2 09:53:04 UTC 2010 - lnussel@suse.de + +- drop freeramdisk (bnc#584565) +- drop hostid (bnc#584562) + +------------------------------------------------------------------- +Tue Feb 23 12:46:07 UTC 2010 - lnussel@suse.de + +- new version 2.17.1 + - new commands: wipefs, unshare, fallocate + - fdisk: DOS-compatible mode marked deprecated + - honor nofail option in fsck + - libblkid overhaul + - lots of bug fixes +- fix self-obsoletes +- compile suid programs using -fpie +- drop -DCONFIG_SMP for s390 as it doesn't seem to be used anyways + +------------------------------------------------------------------- +Sun Dec 13 15:19:16 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Sun Dec 6 15:07:33 CET 2009 - jengelh@medozas.de + +- enabled parallel build + +------------------------------------------------------------------- +Mon Nov 30 17:05:38 CET 2009 - meissner@suse.de + +- exclude sparc correctly -> %sparc bnc#559180 + +------------------------------------------------------------------- +Sun Nov 15 14:04:48 CET 2009 - meissner@suse.de + +- refreshed patches with fuzz=0 + +------------------------------------------------------------------- +Mon Oct 26 17:45:53 UTC 2009 - crrodriguez@opensuse.org + +- fsck during boot up fails with Too many open files [bnc#503008] + +------------------------------------------------------------------- +Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de + +- fix typo in baselibs.conf change + +------------------------------------------------------------------- +Tue Oct 13 11:23:07 UTC 2009 - aj@suse.de + +- Fix requires of 32-bit devel packages. + +------------------------------------------------------------------- +Tue Sep 29 12:58:37 UTC 2009 - hvogel@novell.com + +- finaly remove the mount mtab locking patch: + * util-linux-2.14.1-mount_race.patch + It causes too much regressions. + +------------------------------------------------------------------- +Mon Jul 13 14:21:07 CEST 2009 - kay.sievers@novell.com + +- update to final 2.16 release + - fix libdir issues in pkgconfig files + - fix location of uuidd run directory + - improve libuuid handling if uuidd is installed but not setuid +- add blkid.conf file to: + - disable the sequential /dev scanner + - move cache to /dev/.blkid.tab to get file out of /etc + and prevent the cache file to survive a reboot + +------------------------------------------------------------------- +Wed Jul 8 13:14:42 CEST 2009 - meissner@novell.com + +- added baselibs.conf for libblkid* and libuuid* + +------------------------------------------------------------------- +Sun Jun 28 21:36:57 CEST 2009 - kay.sievers@novell.com + +- update to version 2.16 +- switch from libvolume_id to new libblkid +- provide fsck +- provide libblkid +- provide libuuid +- provide setarch +- provide separate uuidd package +- remove patches: + util-linux-2.14.1-lscpu.patch (upstream) + util-linux-2.14.1-lscpu_add_hypervisor_detection.patch (upstream) + util-linux-2.14.1-lscpu_sysroot_option.patch (upstream) + util-linux-2.14.1-sys-utils_lscpu_exit.patch (upstream) + util-linux-2.14.2-schedutils_fix_email.patch (upstream) + util-linux-2.12r-fdisk_cyl.patch (upstream) + util-linux-2.14.1-mount_swap_pagesize.patch (--fixpg option) + util-linux-2.14.2-schedutils_ionice_enosys.patch (-t option) + util-linux-2.14.1-hwclock_adjust_and_hctosys.patch (--systz) + +------------------------------------------------------------------- +Thu Apr 16 14:55:22 CEST 2009 - werner@suse.de + +- Move /usr/sbin/adjtimex to /sbin/adjtimex to be able to check the + kernel time variables even without /usr mounted + +------------------------------------------------------------------- +Mon Feb 16 12:35:00 CET 2009 - mkoenig@suse.de + +- remove util-linux-2.14.1-fdisk_cylinder.patch + fixed upstream + +------------------------------------------------------------------- +Thu Feb 12 17:12:28 CET 2009 - mkoenig@suse.de + +- update to version 2.14.2 + chrt: + * support CFS SCHED_IDLE priority and document it + fdisk: + * cannot create partition with starting beyond 1 TB + * remove obsolete information from man page + hwclock: + * remove "cli" and "sti" from i386 CMOS code + * remove x86_64-specific bogon + losetup: + * add warning about read-only mode + * missing EBUSY error hint message + more: + * minor fixes to magic() + mount: + * add i_version support + * add info about /proc/mounts to mount.1 + * add info about semantics of read-only mount to mount.8 + * add rootcontext= SELinux mount option + * clean up SPEC canonicalization + * create separate section for fs-independent options in mount.8 + * finalize support of quoted LABELs/UUIDs + * mtab created multiple times with -a option + * suggest to use blockdev --setro rather than losetup +- catch ENOSYS in ionice to allow execution in virtualized + environments which don't support ioprio_{get,set} calls [bnc#444637] +- umount: fix suid check for user mounted loop devices [bnc#461732] +- fix doc [bnc#456375] +- remove patches: + util-linux-2.13.1-fdisk_cfdisk_yesno.patch + util-linux-2.13-hwclock_rtc_wait_busy_tempfix.patch + util-linux-2.14.1-disk-utils_mkfs.minix_file_size_detection.patch + util-linux-2.14.1-fdisk_missing_include.patch + util-linux-2.14.1-mount_loop_ro_fix.patch + +------------------------------------------------------------------- +Sat Feb 7 18:28:58 CET 2009 - schwab@suse.de + +- Fix info dir entry for which. + +------------------------------------------------------------------- +Wed Jan 7 15:42:38 CET 2009 - mkoenig@suse.de + +- fix locking problem for external mount helpers when type + is not given [bnc#459839] + +------------------------------------------------------------------- +Tue Dec 2 12:23:37 CET 2008 - mkoenig@suse.de + +- raw: do not stat the raw devices when binding, since they + are created dynamically [bnc#450675] + +------------------------------------------------------------------- +Thu Nov 27 01:27:19 CET 2008 - dmueller@suse.de + +- mount: fix hang on trying to find a free loop device + if one of them has a stale nfs handle mounted (bnc#449646) + +------------------------------------------------------------------- +Mon Nov 24 15:24:11 CET 2008 - mkoenig@suse.de + +- mount: fix locking patch to not break -n [bnc#447937] + +------------------------------------------------------------------- +Thu Nov 20 18:08:33 CET 2008 - mkoenig@suse.de + +- mount: enhance mount/umount mtab locking and lock the whole + read mtab/syscall/write mtab process to avoid mtab corruption + with highly concurrent mount/umount calls [bnc#444966] +- add arch/powerpc/boot/addnote.c from kernel 2.6.27 + as /usr/bin/chrp-addnote [bnc#443859] +- umount: skip sync() in umount -a if no umount happened [bnc#447036] +- hwclock: allow --adjust and --hctosys simultaneously [bnc#441106] + +------------------------------------------------------------------- +Fri Nov 7 14:50:00 CET 2008 - mkoenig@suse.de + +- fdisk: support +cylinder notation [bnc#441871] +- check for EACCES when using ro fallback when loop mounting + a readonly image +- fix uninitialized variable in swapon pagesize detection + +------------------------------------------------------------------- +Mon Oct 27 17:33:01 CET 2008 - mkoenig@suse.de + +- fdisk: add missing includes [bnc#438670] + +------------------------------------------------------------------- +Thu Oct 23 17:58:28 CEST 2008 - mkoenig@suse.de + +- swapon: add swap pagesize detection [bnc#433028] +- lscpu: fix return code [bnc#437367] +- mkfs.minix: fix device size detection [bnc#437980] +- lscpu: update to most recent version for hypervisor detection + +------------------------------------------------------------------- +Thu Oct 2 11:10:11 CEST 2008 - mkoenig@suse.de + +- add lscpu tool from current util-linux-ng git, + needed for fate#303051 +- replace hypervisor detection tool with the solution blessed by + upstream, which adds hv detection as lscpu feature [fate#303051] + +------------------------------------------------------------------- +Wed Sep 24 11:28:07 CEST 2008 - mkoenig@suse.de + +- add new tool /bin/hypervisor for x86, x86_64 + from Ky Srinivasan + to detect the presence of a hypervisor [fate#303051] + +------------------------------------------------------------------- +Wed Sep 10 15:58:52 CEST 2008 - mkoenig@suse.de + +- update to version 2.14.1 + * fdisk: don't check for GPT when asked for disk size only + * losetup: remove unnecessary minor number check + * rtcwake: prefer RTC_WKALM_SET over RTC_ALM_SET + * scriptreplay: new implementation is out-of-sync + * selinux: is_selinux_enabled() returns 0, 1 and -1 + * umount: improve "-d" option for autoclear loops +- remove patch + util-linux-2.14-loop_autoclear.patch + +------------------------------------------------------------------- +Wed Aug 20 15:20:06 CEST 2008 - mkoenig@suse.de + +- enable SELinux support [fate#303662] + +------------------------------------------------------------------- +Mon Aug 18 18:13:10 CEST 2008 - mrueckert@suse.de + +- remove outdated options in the fillup_and_insserv call + +------------------------------------------------------------------- +Mon Aug 18 12:36:39 CEST 2008 - mkoenig@suse.de + +- raw: fix init script tags + +------------------------------------------------------------------- +Mon Jul 7 15:13:24 CEST 2008 - mkoenig@suse.de + +- update which to version 2.19 + * Upgraded code from bash to version 3.2. This DOES has influence + on how Which behaves under certain circumstances. + * When the environment variable HOME is not set, the home directory + is now read from /etc/passwd or set to '/' if no home directory + could be found (this now matches the tilde lib used in bash) + * Changed the license to GPLv3 + * Add support for shells that output '{' on the same line as the + function name in the output of 'declare -f' (ie zsh). +- fix build + +------------------------------------------------------------------- +Wed Jul 2 15:47:08 CEST 2008 - mkoenig@suse.de + +- replace util-linux-2.14-mount_ignore_ENXIO_in_del_loop.patch + with upstream version + util-linux-2.14-loop_autoclear.patch + +------------------------------------------------------------------- +Fri Jun 27 17:05:46 CEST 2008 - schwab@suse.de + +- Fix lib64 check. + +------------------------------------------------------------------- +Wed Jun 25 14:26:49 CEST 2008 - mkoenig@suse.de + +- update to version 2.14 + most important changes: + * new command ldattach + mount: + * support auto-destruction of loop devices + losetup: + * new option -j + * supports unlimited number of loop devices + * new option --sizelimit to set data end + * option -s (short form of --show) now deprecated + mkswap: + * new option -U to set UUID explicitly + fdisk: + * calculate partition size in 2^N [bnc#381270] + hwclock: + * new option --adjfile to override default /etc/adjtime +- readd scriptreplay, implemented now in C +- add retry for mount if ENOMEDIUM is returned [bnc#390204] +- ignore ENXIO in del_loop, because they might have been + auto-destructed +- removed patches: + util-linux-2.13.1-canonicalize_loopfile_name.patch + util-linux-2.13.1-mkfs.minix_add_sectorsize_check.patch + util-linux-2.13.1-mkfs.minix_device_size_cleanup.patch + util-linux-2.13.1-mount_getfs_fix.patch + util-linux-2.13.1-prevent_loop_mounting_the_same_file_twice.patch + util-linux-2.13-fdisk_cfdisk_ncursesw.patch + util-linux-mount_opt_nofail.patch + util-linux-ng-2.13-swapon-swsuspend.patch + +------------------------------------------------------------------- +Thu Apr 3 17:11:53 CEST 2008 - mkoenig@suse.de + +- cfdisk: accept english answer [bnc#369043] +- use upstream getfs fix + +------------------------------------------------------------------- +Wed Mar 26 22:05:42 CET 2008 - coolo@suse.de + +- actually require the split out package + +------------------------------------------------------------------- +Sun Mar 23 11:13:13 CET 2008 - coolo@suse.de + +- splitting out 60% of the size of the package: + creating lang subpackage + +------------------------------------------------------------------- +Wed Feb 13 10:21:42 CET 2008 - bg@suse.de + +- don't try to package parisc*.8 manual pages + +------------------------------------------------------------------- +Mon Feb 11 17:49:04 CET 2008 - mkoenig@suse.de + +- update to version 2.13.1 again +- fix broken util-linux-2.13.1-getfs_fix.patch + +------------------------------------------------------------------- +Sun Feb 10 18:11:07 CET 2008 - lrupp@suse.de + +- revert to 2.13.0.1+git20071121 + breaks current 'mount' call in Buildservice + +------------------------------------------------------------------- +Thu Feb 7 12:41:25 CET 2008 - mkoenig@suse.de + +- update to version 2.13.1: + mount: + * -L|-U segfault when label or uuid doesn't exist + * chain of symlinks to fstab causes use of pointer after free + * don't call canonicalize(SPEC) for cifs, smbfs and nfs + * improve error message when helper program not present + losetup: + * fix errno usage + mkswap: + * possible to crash with SELinux relabeling support + sfdisk: + * allow partitioning drives of over 2^31 sectors + hwclock: + * check for ENODEV +- mount: fix problem with device canonicalization when using + persistent name in fstab but call mount with real bd name +- patches merged: + util-linux-2.13-mount_fd_leak.patch + +------------------------------------------------------------------- +Tue Dec 18 15:55:19 CET 2007 - mkoenig@suse.de + +- add temporary workaround for broken RTC update interrupts + [#338419] + +------------------------------------------------------------------- +Mon Dec 3 11:03:57 CET 2007 - ro@suse.de + +- remove "arch", in coreutils now + +------------------------------------------------------------------- +Thu Nov 29 17:51:17 CET 2007 - lnussel@suse.de + +- update crypto patch + * fix mount buffer overflow when reading the passphrase (#332148) + * add loop_fish2 compatability code to losetup/mount again (#332095) + * change default hash size for 128bit keys to sha256 again + + +------------------------------------------------------------------- +Wed Nov 21 13:43:31 CET 2007 - mkoenig@suse.de + +- update to git20071121: + add sector size check for mkfs.minix [#308256] + fix canonicalization for cifs [#338375] +- provide Short-Description for raw init script +- add rpmlintrc + +------------------------------------------------------------------- +Tue Nov 20 17:49:35 CET 2007 - mkoenig@suse.de + +- fix raw path in init script + +------------------------------------------------------------------- +Tue Nov 6 16:11:02 CET 2007 - mkoenig@suse.de + +- update to 2.13.0.1+git20071106 +- prevent loop mounting the same file twice [#240653] +- merged upstream: + util-linux-2.13-mount_helper_fix.patch + util-linux-2.13-hwclock_rtc_option.patch + +------------------------------------------------------------------- +Thu Oct 4 22:24:04 CEST 2007 - bg@suse.de + +- don't use parisc, parisc32 and parisc64. + +------------------------------------------------------------------- +Mon Oct 1 17:08:06 CEST 2007 - mkoenig@suse.de + +- update to version 2.13 + merged upstream: + util-linux-2.12r-disk_utils_mkfs_open_exclusive.patch + util-linux-2.13-loop.patch + util-linux-2.13-mount_create_mtab.patch + util-linux-2.13-schedutils_error_handling.patch + util-linux-2.13-sys_utils_build_rdev_x86_64.patch +- fix hwclock --rtc option [#326106] +- fix setuid/setgid mixup and error checking [#327022] + +------------------------------------------------------------------- +Fri Sep 14 11:24:33 CEST 2007 - mkoenig@suse.de + +- link cfdisk against libncursesw instead libncurses to fix + broken utf-8 characters [#307353] + +------------------------------------------------------------------- +Wed Aug 29 12:22:21 CEST 2007 - mkoenig@suse.de + +- fix fd leaks in previous patch + +------------------------------------------------------------------- +Tue Aug 28 16:42:04 CEST 2007 - lnussel@suse.de + +- add support for specifying the key length and password hash + algorithm [#304861] + +------------------------------------------------------------------- +Fri Aug 24 14:09:19 CEST 2007 - mkoenig@suse.de + +- avoid duplicates of root fs if defined with LABEL in fstab + [#297959] +- fix ionice error handling [#301675] + +------------------------------------------------------------------- +Thu Aug 16 18:34:30 CEST 2007 - ssommer@suse.de + +- free loop devices when mount fails [#297172] + +------------------------------------------------------------------- +Wed Jul 25 18:43:42 CEST 2007 - mkoenig@suse.de + +- update to git20070725 +- removed patches (merged upstream): + util-linux-2.12r-mount_mount.8_xfs_update.patch + util-linux-2.12r-sys_utils_readprofile_mapfile.patch + util-linux-2.12r-disk_utils_mkswap_fix.patch + util-linux-2.13-schedutils_ionice_idle.patch + +------------------------------------------------------------------- +Tue Jul 17 10:44:18 CEST 2007 - mkoenig@suse.de + +- updated to version 2.13-rc2: + * add wakertc +- cleanup ionice usage [#270251] +- enable hwclock audit support [#280113] +- removed patches (merged/fixed upstream) + util-linux-login_utils_wall.patch + util-linux-mount_mount.8-acl.patch + util-linux-2.12r-mount_mtab_update.patch + util-linux-2.13-schedutils_chrt.patch + util-linux-2.13-sys_utils_arch.patch + util-linux-2.12a-mount_mountpointwithcolon.patch + util-linux-2.12a-mount_procswapcheck.patch + util-linux-2.12q-mount_umount2_not_static.patch + +------------------------------------------------------------------- +Fri Jul 13 12:31:56 CEST 2007 - mkoenig@suse.de + +- replace hotplug with nofail option and fix it to not use + syscall reserved values. +- removed patch + util-linux-2.11z-hwclock_geteuid.patch + it is intentional that suid hwclock capabilities are limited +- removed patch (fixed upstream) + util-linux-2.12q-mount_--move.patch + +------------------------------------------------------------------- +Mon Jul 9 11:34:33 CEST 2007 - mkoenig@suse.de + +- add libuuid-devel to BuildRequires to let mkswap use UUIDs + +------------------------------------------------------------------- +Thu Jul 5 16:08:58 CEST 2007 - mkoenig@suse.de + +- use %config(noreplace) for /etc/filesystems +- Keep rdev stuff for x86_64 + util-linux-2.13-sys_utils_build_rdev_x86_64.patch +- removed patches (merged upstream) + util-linux-2.12r-misc_utils_cal_formatting.patch + util-linux-2.12q-sys_utils_ionice.patch + +------------------------------------------------------------------- +Thu Jul 5 11:59:30 CEST 2007 - mkoenig@suse.de + +- update to 2.13-rc1: + * mount fixes + * agetty: add 'O' escape code to display domain name + * blockdev: add BLKFRAGET/BLKFRASET ioctls + * fdisk: many significant improvements and fixes to Sun label handling + * update po files +- removed patches (merged upstream): + util-linux-2.11q-fdisk_fs_mac.patch + util-linux-2.12r-fdisk_fdiskwrap.patch + util-linux-2.12r-mount_racy_loop.patch + util-linux-2.13-misc_utils_cal_ncurses.patch + util-linux-2.13-mount_volumeid_label.patch +- use %find_lang + +------------------------------------------------------------------- +Thu Jun 21 14:50:58 CEST 2007 - mkoenig@suse.de + +- use encoded label names with volume_id [#232929] + util-linux-2.13-mount_volumeid_label.patch + +------------------------------------------------------------------- +Thu Jun 14 10:52:25 CEST 2007 - mkoenig@suse.de + +- mkzimage_cmdline: activate commandline if used with -s [#279935] + +------------------------------------------------------------------- +Wed Jun 13 12:33:59 CEST 2007 - mkoenig@suse.de + +- schedutils: let chrt accept pid 0 for current process and + fix some documentation bugs [#266879] + util-linux-2.13-schedutils_chrt.patch + +------------------------------------------------------------------- +Wed Jun 6 16:15:43 CEST 2007 - mkoenig@suse.de + +- update to git20070530 +- removed patches + util-linux-2.13-mount_volume_id.patch + util-linux-2.12r-mount_by_uuid.patch + util-linux-2.13-build_gnu_source.patch +- fix build with ncurses + +------------------------------------------------------------------- +Tue Jun 5 17:01:48 CEST 2007 - mkoenig@suse.de + +- update to git20070509 + mount: NFS code removed (use mount.nfs{,4} from nfs-utils) +- remove sm-notify (nfs-utils) +- removed patches + util-linux-2.11u-mount_nfs_mount_acl.patch + util-linux-2.12-mount_base_nfsv4.patch + util-linux-2.12-mount_mountfallback.patch + util-linux-2.12-mount_nfs_tcp.patch + util-linux-2.12q-mount_strict_aliasing.patch + util-linux-2.12r-mount_nfs_remount_options.patch + util-linux-2.12r-mount_rpcsec_gss.patch + util-linux-2.12r-mount_sec_manpage.patch + util-linux-2.12r-mount_umount_nosysfs.patch + util-linux-2.13-mount_nfs_timeo.patch + util-linux-mount_nfs.8.patch + util-linux-mount_warn_nfsudp.patch + +------------------------------------------------------------------- +Tue Jun 5 14:34:49 CEST 2007 - pth@suse.de + +- Update to which-2.16, mainly because regenerating configure + with newer autotools works. +- Fix the patch for AC_CHECK_STATICLIB +- Our distribution doesn't install libiberty.a, so pass + --disable-iberty to configure of which to not use a libiberty from + somewhere else. + +------------------------------------------------------------------- +Mon Jun 4 17:06:47 CEST 2007 - pth@suse.de + +- Make configure of which search for static libs in lib64 subdirs. + +------------------------------------------------------------------- +Mon Apr 23 16:49:00 CEST 2007 - mkoenig@suse.de + +- update to git20070412 +- remove chkdupexe and scriptreplay to get rid of the + perl dependency [#265757] + util-linux-2.13-build_no_perl_dependency.patch +- upstream integration of umount helper support [#252089] +- merged patches: + util-linux-2.13-misc_utils_add_man_scriptreplay.patch + util-linux-2.13-tests_missing_include.patch + +------------------------------------------------------------------- +Mon Apr 16 17:20:16 CEST 2007 - mkoenig@suse.de + +- fix initialization of offset in + util-linux-2.12r-mount_racy_loop.patch [#264225] + +------------------------------------------------------------------- +Tue Apr 10 17:25:34 CEST 2007 - mkoenig@suse.de + +- update to version git20070330 of new forked development tree +- removed Suse crypto patches for losetup [FATE#302001] +- removed binaries: + /bin/guessfstype + /sbin/sln + /usr/bin/setfdprm +- removed obsolete patches: + * guessfstype2.patch + * loop-AES-v3.0a-util-linux-2.12p.diff + * mount-nfs-nonreserved + * stupid-programmer.diff + * util-linux-nodiratime.diff + * util-linux-2.12-multipleraw.diff + * util-linux-2.12-enablereplaybuild.diff + * util-linux-2.12-mount_guessfstype.diff + * util-linux-2.12h-mtablock.diff + * util-linux-2.12i-x86_64intel.diff + * util-linux-2.12q-null.diff + * util-linux-2.12r.diff + * util-linux-2.12r-fdisk_llseek.patch + * util-linux-2.12r-mount-doubleslashessourceprefix-cifs.diff + * util-linux-2.12r-mount_external_prog_on_guess.patch + * util-linux-2.12r-nonfsmountfallback.diff + * util-linux-2.12r-pagesize.patch + * util-linux-2.12r-partx_enable.patch + * util-linux-2.12r-partx_gpt_warning.patch +- add patches: + * util-linux-2.13-misc_utils_add_man_scriptreplay.patch + install man page for scriptreplay + * util-linux-2.13-tests_missing_include.patch + fix missing header in tests/mnt_test_sysinfo.c + * util-linux-2.13-sys_utils_arch.patch + keep /bin/arch + * util-linux-2.13-build_gnu_source.patch + build with _GNU_SOURCE + * util-linux-2.13-build_fix_intel_check.patch + detect also x86_64 as INTEL architecture +- rename patches to identify them clearly by subsystem +- schedutils now part of util-linux itself + +------------------------------------------------------------------- +Wed Apr 4 12:55:40 CEST 2007 - mkoenig@suse.de + +- add Supplements line [FATE#301966] + +------------------------------------------------------------------- +Mon Mar 26 15:49:09 CEST 2007 - rguenther@suse.de + +- add ncurses-devel and zlib-devel BuildRequires + +------------------------------------------------------------------- +Thu Mar 15 17:24:34 CET 2007 - mkoenig@suse.de + +- mount: Let swapon automatically reinitialize a suspended + swap partition [#254437] + +------------------------------------------------------------------- +Thu Mar 9 11:00:11 CET 2007 - mkoenig@suse.de + +- mount: fix mtablock patch to avoid mtab corruption [#226783] + +------------------------------------------------------------------- +Thu Mar 8 17:27:22 CET 2007 - mkoenig@suse.de + +- partx: fix warning for too long literal + +------------------------------------------------------------------- +Wed Mar 7 16:58:08 CET 2007 - rguenther@suse.de + +- fix changelog entry order + +------------------------------------------------------------------- +Tue Feb 27 10:58:46 CET 2007 - mkoenig@suse.de + +- fix missing return code in + util-linux-2.12r-losetup_password.patch +- mount: fix race condition in mount -o loop [#242750] + +------------------------------------------------------------------- +Mon Feb 12 17:22:45 CET 2007 - mkoenig@suse.de + +- remove legacy warnings from fdisk [#241372] + +------------------------------------------------------------------- +Fri Feb 2 13:27:31 CET 2007 - mkoenig@suse.de + +- do not use O_EXCL for mkfs.cramfs [#241466] + +------------------------------------------------------------------- +Wed Jan 31 12:06:55 CET 2007 - mkoenig@suse.de + +- let mkfs tools open with O_EXCL [#238687] + +------------------------------------------------------------------- +Tue Dec 12 11:04:07 CET 2006 - mkoenig@suse.de + +- provide different return codes for losetup with encryption + for empty and too short passwords. [#197493] + +------------------------------------------------------------------- +Tue Dec 5 18:13:32 CET 2006 - mkoenig@suse.de + +- default swap to V1 in any case [#205956] + patch: util-linux-2.12r-mkswap_fix.patch +- do not append addr option with each nfs remount [#130625] + patch: util-linux-2.12r-nfs_remount_options.patch +- add README.largedisk about fdisk partition size constraints + [#153657] + +------------------------------------------------------------------- +Tue Nov 7 13:09:45 CET 2006 - mkoenig@suse.de + +- enable partx [#214992] + +------------------------------------------------------------------- +Tue Oct 10 18:17:42 CEST 2006 - mkoenig@suse.de + +- Round up partition end LBA to a cylinder boundary during + add_partition() [#174892] +- Fix readprofile on ppc64 [#179122] +- Fix cal formatting bug [#203469] + +------------------------------------------------------------------- +Mon Oct 9 12:27:33 CEST 2006 - mkoenig@suse.de + +- Fix llseek issues. +- swapon.c: Do not use PAGE_SIZE macro. + +------------------------------------------------------------------- +Mon Aug 21 12:10:01 CEST 2006 - mkoenig@suse.de + +- Added sysfs to list of filesystems not to unmount with + umount -a, resolves #190385 + +------------------------------------------------------------------- +Mon Jun 12 14:08:25 CEST 2006 - kay.sievers@suse.de + +- use libvolume_id from provided as a rpm by udev 094 + +------------------------------------------------------------------- +Wed May 17 23:48:27 CEST 2006 - jeffm@suse.com + +- Fixed support for calling external programs w/o -t , + it would add mtab twice [#176582] + +------------------------------------------------------------------- +Mon Apr 24 14:33:20 CEST 2006 - hvogel@suse.de + +- document xfs dmapi mount options better [#158955] + +------------------------------------------------------------------- +Fri Apr 21 15:48:16 CEST 2006 - olh@suse.de + +- add mkzimage_cmdline to edit CHRP zImage kernel cmdline (168313) + +------------------------------------------------------------------- +Tue Apr 18 16:09:46 CEST 2006 - hvogel@suse.de + +- fix number of supported raw devices [#165570] + +------------------------------------------------------------------- +Wed Mar 29 13:54:32 CEST 2006 - olh@suse.de + +- clearify comments about mac disk label handling in fdisk + +------------------------------------------------------------------- +Tue Mar 28 17:53:46 CEST 2006 - hvogel@suse.de + +- more fixes for the fdiskwrap patch [#160822] + +------------------------------------------------------------------- +Tue Mar 21 11:35:26 CET 2006 - okir@suse.de + +- Update nfs(5) manpage to document security flavors [#159368] + +------------------------------------------------------------------- +Mon Mar 20 12:14:18 CET 2006 - hvogel@suse.de + +- fix numbers of supported raw devices to match the kernel + [#158203] +- make NFSv3 client support RPCSEC_GSS [#158401] +- fix that if the user doesn't specify -t + mount.fstype will never be called. [#155147] + +------------------------------------------------------------------- +Fri Mar 10 12:07:10 CET 2006 - hvogel@suse.de + +- Fix init.d/raw script to parse device names with , in them + correctly [#155653] + +------------------------------------------------------------------- +Thu Mar 9 12:28:04 CET 2006 - hare@suse.de + +- Fix potential security hole in libvolume_id (#133256) + +------------------------------------------------------------------- +Mon Mar 6 12:03:35 CET 2006 - hvogel@suse.de + +- patch fdiskmaclabel.h too + +------------------------------------------------------------------- +Thu Mar 2 15:49:06 CET 2006 - hvogel@suse.de + +- axboe made fdisk not wrap at 2TB [#153657] + +------------------------------------------------------------------- +Fri Feb 17 15:25:39 CET 2006 - lmuelle@suse.de + +- Use cifs instead of smbfs if the source starts with // and we do not set a + different fs type. + +------------------------------------------------------------------- +Sun Feb 12 12:40:21 CET 2006 - olh@suse.de + +- cosmetic fix for option_hotplug declaration + fix unininitalized string for unknown filesystems (#148855) + +------------------------------------------------------------------- +Fri Feb 10 14:00:48 CET 2006 - hvogel@suse.de + +- mount should not put / in the mtab twice if mount -f / is called + [#148409] +- fix hostid printf [#149163] + +------------------------------------------------------------------- +Wed Feb 1 03:58:58 CET 2006 - olh@suse.de + +- dont invent our own MS_FLAGS (#147132) + +------------------------------------------------------------------- +Wed Feb 1 02:20:17 CET 2006 - ro@suse.de + +- fix typo in previous change, binary negation is "~" + +------------------------------------------------------------------- +Fri Jan 27 13:02:36 CET 2006 - sscheler@suse.de + +- fixed mount hotplug option (#143352). now we don't send the + MS_HOTPLUG flag to the kernel any longer, because the kernel + doesn't know this option (EINVAL) and actually doesn't need to + know about it. + +------------------------------------------------------------------- +Fri Jan 27 12:55:29 CET 2006 - olh@suse.de + +- remove clock symlink, hwclock exists since 7 years + +------------------------------------------------------------------- +Fri Jan 27 11:46:17 CET 2006 - olh@suse.de + +- lsprop and nvsetenv moved to powerpc-utils [#144758] + +------------------------------------------------------------------- +Thu Jan 26 13:06:51 CET 2006 - hvogel@suse.de + +- Make nfsboot world readable [#145418] + +------------------------------------------------------------------- +Wed Jan 25 21:31:03 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Jan 24 17:06:22 CET 2006 - mmj@suse.de + +- Remove faulty nfs fallback code [#139019] + +------------------------------------------------------------------- +Mon Jan 16 11:25:28 CET 2006 - mmj@suse.de + +- Add patch for nsetenv to fix short reads/short writes [#142546] + +------------------------------------------------------------------- +Wed Jan 11 12:46:28 CET 2006 - mmj@suse.de + +- Update sm-notify [#141542] + +------------------------------------------------------------------- +Wed Jan 4 13:52:31 CET 2006 - mmj@suse.de + +- Update to 2.12r including since 2.12q: + o cfdisk: fix a segfault with ReiserFS partitions + o umount: disallow -r option for non-root users + +------------------------------------------------------------------- +Tue Nov 22 11:49:39 CET 2005 - mmj@suse.de + +- install proper renice manpage [#132470] + +------------------------------------------------------------------- +Tue Nov 15 17:01:34 CET 2005 - uli@suse.de + +- umount2 is not static (only fails on ARM, surprisingly) +- added ARM ionice syscalls + +------------------------------------------------------------------- +Fri Nov 11 10:42:35 CET 2005 - hare@suse.de + +- Fix reverse-mapping of by-UUID and by-LABEL mounts. + +------------------------------------------------------------------- +Thu Nov 10 09:04:17 CET 2005 - hare@suse.de + +- Fix a mishandling of by-UUID mounts. +- Use libvolume_id from udev. + +------------------------------------------------------------------- +Sat Oct 22 17:55:16 CEST 2005 - mmj@suse.de + +- Increase lsprop.c max property size to 4k [#128155] + +------------------------------------------------------------------- +Mon Oct 10 12:44:05 CEST 2005 - mmj@suse.de + +- Add -fno-strict-aliasing to nfsmount_xdr.c + +------------------------------------------------------------------- +Mon Oct 3 09:55:56 CEST 2005 - mmj@suse.de + +- Teach the mount manual page about nodiratime [#118987] + +------------------------------------------------------------------- +Thu Sep 29 12:42:03 CEST 2005 - mmj@suse.de + +- Patch from jakub007@go2.pl to make mount --move update + /etc/mtab correctly [#115129] + +------------------------------------------------------------------- +Tue Sep 13 14:16:58 CEST 2005 - mmj@suse.de + +- Only allow root to pass -r to umount [#116741] + +------------------------------------------------------------------- +Mon Sep 5 13:18:27 CEST 2005 - mmj@suse.de + +- MAC -> Mac [#104081] + +------------------------------------------------------------------- +Fri Sep 2 13:48:17 CEST 2005 - mmj@suse.de + +- Don't package manual executable [#114849] + +------------------------------------------------------------------- +Thu Sep 1 10:56:25 CEST 2005 - mmj@suse.de + +- Add patch for device-mapper mount by label support [#75966] + +------------------------------------------------------------------- +Thu Sep 1 00:12:39 CEST 2005 - ro@suse.de + +- provide and obsolete schedutils + +------------------------------------------------------------------- +Tue Aug 23 18:00:01 CEST 2005 - hvogel@suse.de + +- update ionice patch by axboe so that ionice will complain about + missing sys_ioprio_set support, but it will still + execute the process. + +------------------------------------------------------------------- +Mon Aug 22 17:06:42 CEST 2005 - hvogel@suse.de + +- Fix rpm verify output [#105807] + (ghost entry for /var/lib/nfs/state) + +------------------------------------------------------------------- +Mon Aug 22 16:27:16 CEST 2005 - schwab@suse.de + +- Fix stupid buffer overflow bug in cfdisk [#66020]. + +------------------------------------------------------------------- +Wed Aug 17 12:59:24 CEST 2005 - hare@suse.de + +- Add option 'hotplug' to mount (#104405) + +------------------------------------------------------------------- +Mon Aug 15 16:33:48 CEST 2005 - schwab@suse.de + +- Always build with RPM_OPT_FLAGS. + +------------------------------------------------------------------- +Thu Aug 11 14:41:18 CEST 2005 - mmj@suse.de + +- Patch from Patrick Kirsch to make fdisk detect MAC-fs [#104081] + +------------------------------------------------------------------- +Wed Aug 3 20:50:59 CEST 2005 - mmj@suse.de + +- Merge schedutils to here (it's happened upstream already) + +------------------------------------------------------------------- +Tue Aug 2 08:47:47 CEST 2005 - mmj@suse.de + +- Support for s390 and s390x + +------------------------------------------------------------------- +Mon Aug 1 20:04:13 CEST 2005 - mmj@suse.de + +- It's not __ppc_ and __ppc64__ but __powerpc__ and __powerpc64__ + +------------------------------------------------------------------- +Mon Aug 1 12:17:39 CEST 2005 - mmj@suse.de + +- Add ionice binary from Jens Axboe + +------------------------------------------------------------------- +Wed Jun 29 11:26:31 CEST 2005 - mmj@suse.de + +- Document load and clearly issues about NFS over UDP [#80263] +- Don't compile with -fsigned-char [#93886] + +------------------------------------------------------------------- +Tue May 31 13:26:05 CEST 2005 - okir@suse.de + +- Added NFSv4 support + +------------------------------------------------------------------- +Mon May 9 17:27:59 CEST 2005 - hvogel@suse.de + +- move hashalot and cryptsetup tools to util-linux-crypto + +------------------------------------------------------------------- +Tue Apr 12 16:13:57 CEST 2005 - mmj@suse.de + +- bump TCP timeo to 600 [#76198] + +------------------------------------------------------------------- +Tue Mar 29 13:43:31 CEST 2005 - mmj@suse.de + +- Add awareness of twofishSL92 [#74359] +- Update hashalot to version 0.3 + +------------------------------------------------------------------- +Mon Mar 14 15:30:49 CET 2005 - okir@suse.de + +- Changed sm-notify to recognize host names as well as addresses. + +------------------------------------------------------------------- +Thu Mar 10 11:28:21 CET 2005 - mmj@suse.de + +- Don't strip anything explicitly +- Don't compile with -fno-strict-aliasing [#66020] + +------------------------------------------------------------------- +Fri Feb 4 14:48:27 CET 2005 - schwab@suse.de + +- Fix stupid programmer. + +------------------------------------------------------------------- +Mon Jan 24 17:01:51 CET 2005 - meissner@suse.de + +- implicit strcmp / strerror in setctsid fixed. +- 0 -> NULL in an execl + +------------------------------------------------------------------- +Fri Jan 21 14:37:21 CET 2005 - mmj@suse.de + +- Sleep after inserting the raw module to make sure it's ready [#49807] +- Update to 2.12q including since 2.12p: + o New upstream maintainer - Adrian Bunk + o sfdisk: add -G option + o Updated translations + +------------------------------------------------------------------- +Tue Jan 18 17:04:30 CET 2005 - okir@suse.de + +- Updated sm-notify; try not to stall bootup my moving the NSM + state update after we've backgrounded (#49072). + +------------------------------------------------------------------- +Mon Jan 10 14:45:12 CET 2005 - mmj@suse.de + +- Update adjtimex to 1.20 +- Update to util-linux-2.12p including since 2.12i: + o cfdisk: fix number of new partition when partitions not in disk order + o fdisk: fix Sun label handling in sector mode + o mkfs: never truncate filename (not that that ever happened) + o more: fix redraw flaw + o lomount: revert patch from 2.12j + o lptune.8: -T option is obsolete + o mkswap, mkswap.8, swapon: support labels + o umount: allow user unmounting repeatedly mounted nfs mounts + o cfdisk: recognize JFS, support reiserfs labels + o mount: fix option parsing bug + o mount.8: several updates + o swapon.8: document -v option + o Makefile: remove cat-id-tbl.c upon make clean + o fdisk: fixed a bug that would cause a non-update of a sun disklabel + o fdisk: use sectorsize instead of 512 for SGI + o hwclock: actually use HAVE_tm_gmtoff + o swapon: fix priority handling + o umount: refuse to unmount an empty string + o configure, MCONFIG: detect gcc 3.4.0 and use -mtune option + o configure: do not run ./conftest (for cross compilation) + o fsck.cramfs: try to get correct PAGE_CACHE_SIZE + o losetup: try to give better error messages + o readprofile: default map file is /boot/System.map + o rdev.8: added historical info on ramdisk + o cal: highlight today + o lomount: stop reading passwd at NUL, fix lo_encrypt key_size + o losetup: add -f option to find an unused loop device + o more: code cleanup + o mount: add "group" mount option + o sfdisk: fix 2.6.8 BLKRRPART ioctl damage + o swapon: let swapon -a skip the swapfiles marked "noauto" + o umount: fix problem with empty mtab + o umount: use special umount program if it exists + o new flock binary + o New messages + +------------------------------------------------------------------- +Tue Nov 30 11:02:32 CET 2004 - mmj@suse.de + +- Install ramsize, rdev, rootflags and vidmode on x86-64 [#48633] + +------------------------------------------------------------------- +Fri Nov 12 15:01:36 CET 2004 - schwab@suse.de + +- Don't install *fdisk on ia64. + +------------------------------------------------------------------- +Fri Nov 12 14:50:24 CET 2004 - ro@suse.de + +- correct permissions handling for wall and write + +------------------------------------------------------------------- +Tue Nov 9 16:00:23 CET 2004 - mmj@suse.de + +- Fix segfault with mount -l [#48029] + +------------------------------------------------------------------- +Fri Nov 5 11:36:16 CET 2004 - mmj@suse.de + +- Update to util-linux-2.12i including: + o MCONFIG: fix build conditions + o chfn, chsh: add error checking + o cytune: use local header cyclades.h + o fdisk: fix default SGI volume header size + o fstab.c: use strsignal() instead of sys_siglist[] + o hwclock: use when available on i386 + o hwclock: dont try KDGHWCLK on archs other than __m68k__ + o sfdisk: correct typo in __attribute__used nonsense + o sfdisk: use PACKED on __arm__ + o sfdisk: fix warning printout + +------------------------------------------------------------------- +Thu Nov 4 08:37:19 CET 2004 - mmj@suse.de + +- Update to util-linux-2.12h including: + o cfdisk: avoid crash if no partition table + o elvtune: tell user that this only works on 2.4 kernels + o lomount: clear passwords after use + o mount: accept comments (specified by comment=) in fstab + o mount: support ocfs, ocfs2 + o [u]mount: be more careful with malloc, try to avoid OOM with + many mounts + o sfdisk: __attribute__used nonsense to support gcc 3.4 + o shutdown: do not unmount various virtual filesystems + o mount.8: added recent ext2 mount options + o mount: support jfs mount-by-label, improve reiserfs support + o sfdisk: remove strange "ends in a digit" heuristic + o *fdisk: use common disksize() routine + +------------------------------------------------------------------- +Tue Oct 19 10:24:13 CEST 2004 - mmj@suse.de + +- Add patch from SGI for fdisk label [#47368] + +------------------------------------------------------------------- +Tue Sep 28 11:18:50 CEST 2004 - mmj@suse.de + +- And another one [#46201] + +------------------------------------------------------------------- +Wed Sep 15 23:11:56 CEST 2004 - mmj@suse.de + +- Add patch from Andries to fix cfdisk [#44996] + +------------------------------------------------------------------- +Tue Sep 7 07:32:39 CEST 2004 - mmj@suse.de + +- Update to util-linux-2.12c including: + o mount.8: added recent ext2 mount options + o mount: support jfs mount-by-label, improve reiserfs support + o sfdisk: remove strange "ends in a digit" heuristic + o *fdisk: use common disksize() routine [#44678] + +------------------------------------------------------------------- +Wed Aug 25 12:54:00 CEST 2004 - mmj@suse.de + +- Update to util-linux-2.12b including: + o chsh: improved error message + o dmesg: ask kernel proper buffer size + o losetup: handle 64-bit offsets + o blockdev: also report BLKGETSIZE64 result [#43464] + o blockdev, elvtune, fdisk: handle new kernel _IOR,_IOW defines + o fdisk: remove strange "ends in a digit" heuristic + o fdisk: also list Solaris as possible type for 0x82 + o mount: added --rbind option + o mount: use blkid library + o mount: support reiserfs mount by label + o mount: attempt to use the right definition of dev_t in struct + loopinfo + o mount.8: jfs mount options added + o readprofile: new -s option + o rename.1: added ref to mmv.1 + o replay: renamed to scriptreplay; correct typos + o script: do not use locale for time delay floating point number + format + o sfdisk: error messages to stderr + o New Catalan, Dutch, Finnish, French, German, Spanish, Swedish, + Turkish, Ukrainian messages +- Update the loop-AES patch, thanks to Sumit Bose +- Change the minimum password length to 8 chars + +------------------------------------------------------------------- +Tue Aug 24 08:03:24 CEST 2004 - mmj@suse.de + +- Fix signed/unsigned bug in lsprop [#44048] + +------------------------------------------------------------------- +Wed Aug 18 15:56:01 CEST 2004 - mmj@suse.de + +- Readd patch that got lost to make fdisk -l work better with + RAID controllers [#43485] + +------------------------------------------------------------------- +Mon Aug 9 11:06:34 CEST 2004 - mmj@suse.de + +- Add an improved version of the dmesg bufsize patch. + +------------------------------------------------------------------- +Tue Jun 22 15:50:05 CEST 2004 - mmj@suse.de + +- Add patch to try and guess a filesystem type before blindly + assuming it's nfs because of the colon [#42097] + +------------------------------------------------------------------- +Mon Jun 14 19:21:08 CEST 2004 - agruen@suse.de + +- Formatting error in mount.8 manual page. + +------------------------------------------------------------------- +Wed Jun 9 15:17:47 CEST 2004 - mmj@suse.de + +- Add patch from Olaf Kirch to make protocol selection for mount + independent of protocol selection for NFS, and picks what is + available (preferring TCP over UDP) [#41735] + +------------------------------------------------------------------- +Wed Jun 9 12:10:03 CEST 2004 - mls@suse.de + +- add '-f' option to setctsid + +------------------------------------------------------------------- +Thu May 27 15:07:13 CEST 2004 - okir@suse.de + +- sm-notify now binds to a reserved port + +------------------------------------------------------------------- +Sat May 15 16:15:00 CEST 2004 - mmj@suse.de + +- Add documentation about raw device handling [#39037] + +------------------------------------------------------------------- +Mon May 10 14:40:43 CEST 2004 - mmj@suse.de + +- Make dmesg dump entire buffer. Patch from Andries/odabrunz [#39761] + +------------------------------------------------------------------- +Wed May 6 10:05:16 CEST 2004 - mmj@suse.de + +- Also check if the device is the same when doing swapon. Could be + the same block device with 2 different names [#39436] + +------------------------------------------------------------------- +Wed May 5 11:12:47 CEST 2004 - mmj@suse.de + +- Do a /sbin/modprobe raw when invoking raw devices [#39037] + +------------------------------------------------------------------- +Tue Apr 20 09:28:09 CEST 2004 - mmj@suse.de + +- Update to 2.12a including: + o fdisk: fix for kernels 2.4.15-2.4.17 + o fdisk: fix when all partitions are in use + o hwclock: add a timeout when waiting for a clock update + o ipcs: compilation fix + o ipcs: shminfo.shmall gives pages + o mount: efs support + o partx: bigendian fix + o readprofile: support for 64-bit addresses + o setterm: fix klogctl error message + o setterm.1: clarification + o sfdisk: fix check for is_ide_cdrom_or_tape + o umount: skip proc, devfs, devpts on umount -a + +------------------------------------------------------------------- +Mon Apr 19 11:52:54 CEST 2004 - mmj@suse.de + +- Add patch for unlimited raw devices [#39037] + +------------------------------------------------------------------- +Thu Apr 15 11:08:50 CEST 2004 - mmj@suse.de + +- Make sm-notify be more quiet when nothing wrong, and log to sys- + log when something is. + +------------------------------------------------------------------- +Tue Apr 6 14:45:36 CEST 2004 - mmj@suse.de + +- Don't use startproc for sm-notify [#38481] + +------------------------------------------------------------------- +Mon Apr 5 14:55:39 CEST 2004 - mmj@suse.de + +- Removing elvtune alltogether was a bit drastic, since it of + course works fine with 2.4 kernels. So print a warning in case + the BLKELVGET ioctl returns something indicating 2.6 kernels. + +------------------------------------------------------------------- +Thu Apr 1 19:50:47 CEST 2004 - mmj@suse.de + +- Don't package elvtune anymore since it's obsolete now that io + scheduler can be tuned in /sys/block/hdX/queue/iosched/* [#37869] + +------------------------------------------------------------------- +Wed Mar 31 11:19:28 CEST 2004 - mmj@suse.de + +- Apply util-linux-2.12a fixes for hwclock and readprofile. The + hwclock bit is a timout fix which hopefully fixes [#35877] +- Move sm-notify to here from nfs-utils [#36737] + +------------------------------------------------------------------- +Mon Mar 29 13:26:20 CEST 2004 - mmj@suse.de + +- Adjust warnings about Crypto-API + +------------------------------------------------------------------- +Sun Mar 28 11:00:24 CEST 2004 - mmj@suse.de + +- Add patch to make script allways use the same LC_NUMERIC [#35476] + +------------------------------------------------------------------- +Fri Mar 26 21:38:27 CET 2004 - od@suse.de + +- Add setctsid by Werner Fink [#37177] + +------------------------------------------------------------------- +Fri Mar 26 15:07:00 CET 2004 - mmj@suse.de + +- Mount option "code" is now "codepage" so update /etc/fstab in + postinstall [#36950] + +------------------------------------------------------------------- +Fri Mar 26 11:49:01 CET 2004 - mmj@suse.de + +- Remove false statement in nfs.5 about the linux kernel not + supporting nfs over tcp [#37060] + +------------------------------------------------------------------- +Wed Mar 17 21:41:17 CET 2004 - mmj@suse.de + +- Use correct permissions for README.hashalot [#36303] + +------------------------------------------------------------------- +Mon Mar 8 10:51:46 CET 2004 - mmj@suse.de + +- Enable build of replay [#35434] + +------------------------------------------------------------------- +Wed Feb 25 14:07:15 CET 2004 - mmj@suse.de + +- Use loop-AES-v2.0f-util-linux-2.12.diff instead of losetup patch + added earlier. Thanks Sumit Bose! + +------------------------------------------------------------------- +Thu Feb 19 09:54:03 CET 2004 - mmj@suse.de + +- Add cryptsetup script from Christophe Saout, for usage with the + new dm-crypt. + +------------------------------------------------------------------- +Mon Feb 16 15:32:57 CET 2004 - mmj@suse.de + +- Add losetup patch and hashalot program from Ben Slusky + +------------------------------------------------------------------- +Sun Feb 1 14:11:51 CET 2004 - kukuk@suse.de + +- Remove newgrp again (will use POSIX conform version) + +------------------------------------------------------------------- +Fri Jan 16 13:26:55 CET 2004 - kukuk@suse.de + +- Add pam-devel to neededforbuild + +------------------------------------------------------------------- +Mon Jan 12 11:31:47 CET 2004 - mmj@suse.de + +- Adjust the nfs.5 manual page to reflect we're mounting nfs over + tcp pr. default. +- Collapse two similar patches 2 one. + +------------------------------------------------------------------- +Fri Dec 19 16:43:39 CET 2003 - garloff@suse.de + +- Fix by okir for previous patch. + +------------------------------------------------------------------- +Fri Dec 19 11:19:43 CET 2003 - garloff@suse.de + +- Add patch to fallback to UDP if TCP NFS mount fails. + +------------------------------------------------------------------- +Tue Dec 2 09:03:32 CET 2003 - mmj@suse.de + +- Make patch to guess if a CD is a CD-Extra [#30316] +- Adjust patch that moves ext2/3 in front of vfat +- Regenerate patches (filename still tells when they were added) + +------------------------------------------------------------------- +Tue Nov 18 13:57:28 CET 2003 - mmj@suse.de + +- Mount NFS over TCP pr. default [#33018] + +------------------------------------------------------------------- +Thu Nov 13 14:43:39 CET 2003 - mmj@suse.de + +- Update to util-linux-2.12 including: + o losetup: -p option specifies fd for passphrase + o fdisk: sgi layout fix + o mount: -p option specifies fd for passphrase + o mount: recognize some PCDOS floppies + o umount: in "umount name", first try to interpret "name" as a mount point + o translations updates for several languages + o cfdisk: localize the Y/N answer, improve printing localized messages + o cfdisk: make various variables long long - some disks are close to 2 TB + o cfdisk: use BLKGETSIZE64 + o fdisk: make various variables unsigned to lengthen the life of 32-bit vars + o fdisk: some sgi fixes + o fdisk: k=1000, K=1024 + o fdisk: removed last occurrences of HDIO_REQ + o fdisk: use BLKGETSIZE64 + o hwclock: fix rtc test + o login: set a timeout on printing the timeout message + o md5: x86_64 fix + o more: POSIX fixes + o mount: do not supply MS_MGC_VAL when there are conflicting flags + o mount: ncp and smb are called smbfs and ncpfs - global change + o mount: add support for xvm mount by label + o mount: correct hfs magic recognition + o mount: keep original umask - it influences the mount call + o raw.8: documented unbinding of raw devices + o readprofile: fixed off-by eight error + o script: add -c option + o sfdisk.8: added an example of partitioning with logical partitions + o sfdisk: only add a AA55 signature for DOS-type partition tables + o tailf: new + +------------------------------------------------------------------- +Tue Oct 21 15:49:01 CEST 2003 - mmj@suse.de + +- Correct permissions + +------------------------------------------------------------------- +Tue Oct 21 14:53:54 CEST 2003 - ja@suse.cz + +- added support for cryptoloop in 2.6.x kernels. + +------------------------------------------------------------------- +Wed Oct 15 13:20:54 CEST 2003 - mmj@suse.de + +- Don't build as root + +------------------------------------------------------------------- +Mon Oct 13 21:44:43 CEST 2003 - kukuk@suse.de + +- Enable newgrp + +------------------------------------------------------------------- +Thu Oct 2 11:31:14 CEST 2003 - kukuk@suse.de + +- Fix compiling with kernel 2.6.0-test6 header files + +------------------------------------------------------------------- +Tue Aug 12 15:27:20 CEST 2003 - mmj@suse.de + +- Update to pmac-utils-2.1 sources and only include nvsetenv + +------------------------------------------------------------------- +Tue Aug 12 12:38:18 CEST 2003 - mmj@suse.de + +- Add mount_guessfstype support for PCDOS [#27814] + +------------------------------------------------------------------- +Wed Jun 18 16:16:15 CEST 2003 - ak@suse.de + +- support noreserved option for NFS (#27428) + +------------------------------------------------------------------- +Thu Jun 5 14:06:51 CEST 2003 - mmj@suse.de + +- Rearrange the specfile wrt. archs + +------------------------------------------------------------------- +Tue May 13 11:20:26 CEST 2003 - mmj@suse.de + +- Use %defattr +- Remove files we don't package + +------------------------------------------------------------------- +Wed May 7 15:38:56 CEST 2003 - mmj@suse.de + +- Rearrange the do_guess_fstype() code to look for ext2/3 before + vfat [#26581] + +------------------------------------------------------------------- +Thu Apr 24 12:20:23 CEST 2003 - ro@suse.de + +- fix install_info --delete call and move from preun to postun + +------------------------------------------------------------------- +Mon Apr 14 15:12:27 CEST 2003 - pthomas@suse.de + +- Get rid of the syscall for adjtimex in selective cases and + just call the glibc wrapper. Fixes build on s390. + +------------------------------------------------------------------- +Mon Apr 14 10:35:38 CEST 2003 - pthomas@suse.de + +- Use geteuid instead of getuid in hwclock to enable making + hwclock suid root. + +------------------------------------------------------------------- +Mon Apr 7 15:40:54 CEST 2003 - mmj@suse.de + +- Only delete info entries when removing last version. + +------------------------------------------------------------------- +Thu Mar 13 11:29:54 CET 2003 - mmj@suse.de + +- Apply patch to make sfdisk not destroy BSD slices [#25093] + +------------------------------------------------------------------- +Mon Mar 3 16:19:04 CET 2003 - mmj@suse.de + +- Remove superflous umask(033); calls [#23292] + +------------------------------------------------------------------- +Mon Mar 3 12:27:01 CET 2003 - ro@suse.de + +- add missing info dir entries + +------------------------------------------------------------------- +Tue Feb 18 14:29:45 CET 2003 - agruen@suse.de + +- Add description of the effect of `mount -t nfs -o noacl' on + the use of the GETACL and SETACL remote procedure calls to + the nfs(5) manual page. + +------------------------------------------------------------------- +Mon Feb 17 15:44:28 CET 2003 - mmj@suse.de + +- It's called smbfs not smb [#23697] + +------------------------------------------------------------------- +Thu Feb 13 06:17:02 CET 2003 - mmj@suse.de + +- Readd patch for passphrase timeout that got lost [#23527] + +------------------------------------------------------------------- +Fri Feb 7 12:24:12 CET 2003 - mmj@suse.de + +- The install_info macros need PreReq: %install_info_prereq + +------------------------------------------------------------------- +Fri Feb 7 01:30:53 CET 2003 - ro@suse.de + +- added install_info macros + +------------------------------------------------------------------- +Tue Feb 4 22:34:10 CET 2003 - ro@suse.de + +- don't package /bin/kill (part of coreutils now) + +------------------------------------------------------------------- +Tue Feb 4 12:40:00 CET 2003 - meissner@suse.de + +- Include tarball with pmac-utils manpages, so we do not need + sgmltool and all its dependents. + +------------------------------------------------------------------- +Wed Jan 29 11:52:19 CET 2003 - mmj@suse.de + +- Update to util-linux-2.11z including: + Translation updates + mount: fix LABEL= handling for user umount, don't abort on read + error with photocds and add dmask and fmask vfat mount options + setterm: accept devfs name + simpleinit: security: refuse initctl_fd if FD_CLOEXEC fails + umount: allow user umount after mount by label or uuid + +------------------------------------------------------------------- +Wed Jan 22 15:10:24 CET 2003 - sf@suse.de + +- removed last patch, added new (correct) patch + +------------------------------------------------------------------- +Wed Jan 22 12:48:30 CET 2003 - sf@suse.de + +- removed eliminate_doubles() from mkfs.cramfs.c + for x86_64, as it segfaults. + (makes the images slightly larger, about 10%) + +------------------------------------------------------------------- +Tue Jan 21 14:51:29 CET 2003 - mmj@suse.de + +- Added description of ISO mount options to mount.8 [#22915] + +------------------------------------------------------------------- +Mon Dec 2 12:21:38 CET 2002 - mmj@suse.de + +- Update the ReiserFS patch from Chris Mason + +------------------------------------------------------------------- +Fri Nov 29 10:38:02 CET 2002 - mmj@suse.de + +- Fix missing #include + +------------------------------------------------------------------- +Thu Nov 28 15:03:05 CET 2002 - mmj@suse.de + +- Make readprofile also try to locate the System.map in + /boot/System.map-`uname -r` [#22168] + +------------------------------------------------------------------- +Wed Nov 27 11:01:52 CET 2002 - mmj@suse.de + +- Update to util-linux-2.11y including: + o Translation updates + o fdisk,cfdisk: cosmetic fixes + o mount,umount: fix LABEL= handling for non-root [#17322] + o more: kill external help file + o simpleinit: security: refuse initctl_fd if setting FD_CLOEXEC + fails (patch we had, now folded upstream) + +------------------------------------------------------------------- +Wed Nov 20 12:19:33 CET 2002 - mmj@suse.de + +- Update to util-linux-2.11x including: + o Translation updates for several languages + o cfdisk: correct error printout + o fdisk: allow addition of a new partition when logicals all used + but primary free + o hwclock: detect systime jumps backward during setting hwclock + o Merge of the cramfs bloksize patch + o mount: new --rbind flag, for recursive loopback mounts + o mount, umount: new -O option + o setpwnam.c: open temp pw file with O_EXCL + o simpleinit: fix for "spawn too fast" + o swapon: new -e option + +------------------------------------------------------------------- +Tue Nov 19 20:12:02 CET 2002 - mmj@suse.de + +- Fix multistring assignment in adjtimex + +------------------------------------------------------------------- +Mon Nov 11 11:26:14 CET 2002 - ro@suse.de + +- changed neededforbuild to +- changed neededforbuild to <> + +------------------------------------------------------------------- +Thu Oct 31 14:59:11 CET 2002 - mmj@suse.de + +- Add -b option to mkfs.cramfs (needed for biarch architectures) + +------------------------------------------------------------------- +Thu Oct 31 00:40:09 CET 2002 - ro@suse.de + +- hack time to build on alpha + +------------------------------------------------------------------- +Tue Oct 22 16:13:36 CEST 2002 - mmj@suse.de + +- Add correction to the ReiserFS patch that fixes the case where it + was possible but unlikely to detect a logged copy of a super on a + dedicated logging device as the real thing. From Chris Mason. + +------------------------------------------------------------------- +Tue Oct 22 14:13:30 CEST 2002 - mmj@suse.de + +- Update to util-linux-2.11w including: + o fdisk and cfdisk fixes + o more bigendian fix + o translation updates + o > 2GB swapspace + o mount umask, cramfs and ocfs stuff + +------------------------------------------------------------------- +Tue Oct 8 17:13:18 CEST 2002 - mmj@suse.de + +- Only enable below patch on ix86 and x86_64 + +------------------------------------------------------------------- +Mon Oct 7 16:35:24 CEST 2002 - mmj@suse.de + +- Make small bugfix to below patch + +------------------------------------------------------------------- +Sat Oct 5 01:27:51 CEST 2002 - mmj@suse.de + +- Apply patch to enable > 2GB swap (redhat) [#20533] + +------------------------------------------------------------------- +Wed Oct 2 15:27:47 CEST 2002 - mmj@suse.de + +- Add one-liner security fix to mount and umount. + +------------------------------------------------------------------- +Mon Sep 23 09:47:33 CEST 2002 - mmj@suse.de + +- Readd fix for klogconsole that got lost [#19834] + +------------------------------------------------------------------- +Fri Sep 13 12:55:24 CEST 2002 - mmj@suse.de + +- Added patch from Oracle to mount ocfs by label [#19262] + +------------------------------------------------------------------- +Thu Sep 12 18:06:21 CEST 2002 - mmj@suse.de + +- more: Do not cast char * to int and back [#18896] + +------------------------------------------------------------------- +Sat Aug 31 17:58:26 CEST 2002 - olh@suse.de + +- add mount_cramfs_be.diff to allow mount -oloop cramfsfile loopdir + +------------------------------------------------------------------- +Mon Aug 26 16:56:52 CEST 2002 - mmj@suse.de + +- Make mode not 666 when writing /etc/mtab [#18342] + +------------------------------------------------------------------- +Mon Aug 26 13:21:30 CEST 2002 - meissner@suse.de + +- quieten klogconsole if the console does not support TIOCLINUX [#12516] + +------------------------------------------------------------------- +Thu Aug 22 15:05:32 CEST 2002 - mmj@suse.de + +- Added patch from Andreas Gruenbacher for nfs-access-acl [#18183] + +------------------------------------------------------------------- +Wed Aug 21 10:33:05 CEST 2002 - mmj@suse.de + +- Fixed an mtab locking bug with patch from Olaf Kirch [#17637] + +------------------------------------------------------------------- +Mon Aug 19 16:46:54 CEST 2002 - mmj@suse.de + +- Updated reiserfs patch from Chris Mason +- Added patch for mount.8, thanks Andreas Gruenbacher + +------------------------------------------------------------------- +Thu Aug 15 19:56:31 CEST 2002 - mmj@suse.de + +- Correct PreReq: + +------------------------------------------------------------------- +Mon Aug 5 10:45:05 CEST 2002 - mmj@suse.de + +- Update to 2.11u which includes: + o Danish, German, Spanish, Swedish and Turkish updates. + o configure: for fsck.cramfs, mkfs.cramfs: add test for libz + o text-utils/Makefile: pg fix + o agetty: use same test as login does to find utmp entry + o fdisk: fix for fdisk on empty disk + o mount updates + +------------------------------------------------------------------- +Tue Jul 23 21:10:27 CEST 2002 - schwab@suse.de + +- Fix mkfs.cramfs for architectures with non-4k pages. + +------------------------------------------------------------------- +Wed Jul 17 00:34:49 CEST 2002 - mmj@suse.de + +- Merged base into util-linux + +------------------------------------------------------------------- +Mon Jul 15 10:23:51 CEST 2002 - mmj@suse.de + +- Added JFSv2 patch from Christoph Hellwig for volume label. Does + for JFS, what below patch does for ReiserFS. + +------------------------------------------------------------------- +Sun Jul 14 19:04:16 CEST 2002 - adrian@suse.de + +- fix ul-2.10m-sgi-fdisk.diff patch to apply again + +------------------------------------------------------------------- +Thu Jul 11 10:36:16 CEST 2002 - mmj@suse.de + +- Added patch from Chris Mason for volume label on reiserfs + +------------------------------------------------------------------- +Wed Jul 10 15:31:53 CEST 2002 - olh@suse.de + +- add mkfs.cramfs and fsck.cramfs to file list + +------------------------------------------------------------------- +Wed Jul 10 15:12:48 CEST 2002 - mmj@suse.de + +- Fixed nfs.5 to tell nfsver defaults to 3 [#16815] + +------------------------------------------------------------------- +Mon Jul 8 21:16:07 CEST 2002 - mmj@suse.de + +- Update to 2.11t which includes + * fdformat: remove test on major + * fdisk, hwclock and swap polishing + * Lots of translations + * cramfs tools includes from the kernel + * swap{on,off} honours /proc/swaps + * mount small fixups + +------------------------------------------------------------------- +Fri Jul 5 11:10:06 CEST 2002 - kukuk@suse.de + +- Use %ix86 macro + +------------------------------------------------------------------- +Mon Jul 1 14:23:38 CEST 2002 - bk@suse.de + +- get raw built on s390 and s390x +- remove %ifarchs s390 s390x for fdisk(needed for SCSI disks) + +------------------------------------------------------------------- +Mon Jun 17 10:52:49 CEST 2002 - mmj@suse.de + +- Added a fix for simpleinit exploit. + +------------------------------------------------------------------- +Thu Jun 13 17:01:38 CEST 2002 - olh@suse.de + +- disable hwclock ppc patch, maybe obsolete with recent kernels + +------------------------------------------------------------------- +Thu May 16 12:57:53 CEST 2002 - mmj@suse.de + +- Added manpage guessfstype(8) + +------------------------------------------------------------------- +Thu May 9 19:07:21 CEST 2002 - mmj@suse.de + +- Updated to util-linux-2.11r, including translations, x86-64 sup- + port and small bugfixes. + +------------------------------------------------------------------- +Sat Apr 13 14:19:46 CEST 2002 - mmj@suse.de + +- Updated to util-linux-2.11q, includes bugfixes. +- util-linux-mkswap.patch for ia64 was folded into mainline + +------------------------------------------------------------------- +Fri Apr 12 16:49:38 CEST 2002 - stepan@suse.de + +- added x86-64 support. + +------------------------------------------------------------------- +Thu Apr 4 20:06:09 CEST 2002 - ihno@suse.de + +- corrected printf to report shared memories sizes bigger than + 2 GByte correct (Bug #15585). It was reportet on s390x, but + should effect other 64-Bit systems as well. + +------------------------------------------------------------------- +Tue Mar 19 13:41:04 MET 2002 - mmj@suse.de + +- Updated to 2.11o. The hexdump patch have been dropped since it + was folded to mainline util-linux. + +------------------------------------------------------------------- +Fri Mar 15 12:08:15 CET 2002 - schwab@suse.de + +- Fix mkswap for ia64. + +------------------------------------------------------------------- +Mon Mar 4 16:21:41 MET 2002 - draht@suse.de + +- permissions fixes for write(1) and wall(1) + +------------------------------------------------------------------- +Fri Feb 1 14:46:45 CET 2002 - mmj@suse.de + +- Moved /usr/bin/logger to /bin/logger (needed by sysconfig) + +------------------------------------------------------------------- +Mon Jan 28 13:59:26 CET 2002 - mmj@suse.de + +- Added the guessfstype binary from msvec/fehr + +------------------------------------------------------------------- +Thu Jan 24 10:16:37 CET 2002 - ro@suse.de + +- modified fillup_and_insserv call (perl-hack not needed here) + +------------------------------------------------------------------- +Mon Jan 21 17:08:17 CET 2002 - mmj@suse.de + +- Merge NetBSD hexdump changes, fixes bugzilla #12801 + +------------------------------------------------------------------- +Thu Jan 10 14:18:21 CET 2002 - ro@suse.de + +- removed ACTIVATE_RAW_DEV + +------------------------------------------------------------------- +Mon Dec 31 19:05:45 UTC 2001 - adrian@suse.de + +- add patch for mips to create SGI partition tables with fdisk + +------------------------------------------------------------------- +Tue Dec 18 16:50:34 CET 2001 - bjacke@suse.de + +- add adjtimex + +------------------------------------------------------------------- +Mon Dec 10 18:22:06 CET 2001 - mmj@suse.de + +- Update to util-linux-2.11n + +------------------------------------------------------------------- +Tue Nov 20 14:48:25 CET 2001 - mmj@suse.de + +- Added a patch to 'wall' to remove unwanted newline (#12181) + +------------------------------------------------------------------- +Wed Nov 7 14:15:51 CET 2001 - kukuk@suse.de + +- Remove unneeded SPARC patch for hwclock + +------------------------------------------------------------------- +Sat Oct 13 20:59:29 CEST 2001 - kukuk@suse.de + +- Update to util-linux 2.11l + +------------------------------------------------------------------- +Wed Sep 12 00:13:22 MEST 2001 - garloff@suse.de + +- Fixed some dutch translations. (bug #10276) + +------------------------------------------------------------------- +Mon Sep 10 19:31:57 CEST 2001 - olh@suse.de + +- marry fdisk and AIX label again... + add lsprop for ppc + dumps the device tree in a human readable format + +------------------------------------------------------------------- +Mon Sep 3 09:50:11 CEST 2001 - kukuk@suse.de + +- Update to version 2.11i: + - blockdev: corrected ioctl numbers + - cal: fixed for multibyte locales + - line: new + - mount: added vxfs magic + +------------------------------------------------------------------- +Sat Sep 1 19:08:46 CEST 2001 - kukuk@suse.de + +- Let mount follow symlinks again + +------------------------------------------------------------------- +Wed Aug 29 16:00:18 CEST 2001 - kukuk@suse.de + +- Add new option to losetup manual page + +------------------------------------------------------------------- +Tue Aug 28 18:24:14 MEST 2001 - draht@suse.de + +- added timeout support for losetup (-t ) + +------------------------------------------------------------------- +Mon Aug 27 15:24:25 CEST 2001 - kukuk@suse.de + +- Add raw rc scripts, too + +------------------------------------------------------------------- +Sun Aug 26 08:51:29 CEST 2001 - bjacke@suse.de + +- added raw binary and put rawio into obsoletes and provides + +------------------------------------------------------------------- +Sat Aug 25 20:22:58 CEST 2001 - kukuk@suse.de + +- Fix path in getopt.1 manual page to example directory [Bug #9831] + +------------------------------------------------------------------- +Fri Aug 24 16:00:13 CEST 2001 - kukuk@suse.de + +- Small fix for hwclock on newer SPARCs + +------------------------------------------------------------------- +Mon Aug 13 15:51:59 CEST 2001 - ro@suse.de + +- changed neededforbuild to + +------------------------------------------------------------------- +Mon Jul 30 10:59:46 CEST 2001 - kukuk@suse.de + +- Update to util-linux-2.11h +- Add nologin program + +------------------------------------------------------------------- +Tue Jul 10 16:44:35 CEST 2001 - kukuk@suse.de + +- Remove swapdev from filelist + +------------------------------------------------------------------- +Tue Jul 10 13:10:23 CEST 2001 - kukuk@suse.de + +- Update to util-linux-2.11g + +------------------------------------------------------------------- +Wed Jun 6 17:25:33 EDT 2001 - bk@suse.de + +- added s390x to all ifnarch s390 + +------------------------------------------------------------------- +Fri Apr 20 12:09:40 CEST 2001 - kukuk@suse.de + +- Fix wall bug (character 80, 160, 240, are missing) [Bug #6962] + +------------------------------------------------------------------- +Mon Mar 26 10:24:40 CEST 2001 - kukuk@suse.de + +- Add exception for broken i2o disk device numbering scheme, kernel + hacker are not able to fix this and make it right [Bug #5881]. + +------------------------------------------------------------------- +Sat Mar 24 15:27:56 CET 2001 - kukuk@suse.de + +- Update to util-linux 2.11b + +------------------------------------------------------------------- +Thu Mar 15 15:47:34 CET 2001 - kukuk@suse.de + +- Fix changing of partitions with ID 0 on SPARC +- Remove duplicate mount patch + +------------------------------------------------------------------- +Wed Mar 14 21:29:23 CET 2001 - schwab@suse.de + +- Don't use _syscallX on ia64. +- Fix missing includes. + +------------------------------------------------------------------- +Wed Mar 14 11:05:22 CET 2001 - kukuk@suse.de + +- Update to version 2.11a + +------------------------------------------------------------------- +Fri Mar 2 17:05:01 CET 2001 - kukuk@suse.de + +- enable write again + +------------------------------------------------------------------- +Mon Feb 12 15:23:14 CET 2001 - kukuk@suse.de + +- cmos.c: Use sys/io.h, fix PowerPC hack + +------------------------------------------------------------------- +Tue Feb 6 11:54:34 CET 2001 - ro@suse.de + +- wall.c: include time.h + +------------------------------------------------------------------- +Mon Feb 5 11:13:56 CET 2001 - kukuk@suse.de + +- Split hex to extra package +- Update to util-linux-2.10s + +------------------------------------------------------------------- +Fri Feb 2 12:18:56 CET 2001 - werner@suse.de + +- Make swapon/swapoff more handy: + * Ignore swap files on ro mounted file systems + * If -a is given ignore already active devices at swapon + * If -a is given ignore not active devices at swapoff + +------------------------------------------------------------------- +Thu Jan 25 00:37:22 CET 2001 - ro@suse.de + +- added Provides: util + +------------------------------------------------------------------- +Fri Jan 12 10:08:29 MET 2001 - garloff@suse.de + +- Apply patch to lomount to allow all kerneli crypt algos to be + passed and allow to pass passwd with -k. +- losetup seems to support >2GB files just fine (#5433) + +------------------------------------------------------------------- +Tue Jan 2 12:04:33 CET 2001 - kukuk@suse.de + +- Save permissions of /etc/mtab [Bug #5027] + +------------------------------------------------------------------- +Tue Dec 5 15:25:45 CET 2000 - kukuk@suse.de + +- Search first in /etc/filesystems, then in /proc/filesystems + +------------------------------------------------------------------- +Tue Dec 5 11:24:34 CET 2000 - kukuk@suse.de + +- Use AIX/fdisk patch from util-linux-2.10r +- Backport "guess filesystems" from util-linux-2.10r + +------------------------------------------------------------------- +Tue Dec 5 11:10:10 CET 2000 - schwab@suse.de + +- Don't use _syscallX on ia64. + + +------------------------------------------------------------------- +Mon Dec 4 09:27:28 CET 2000 - olh@suse.de + +- fix diff again + +------------------------------------------------------------------- +Sun Dec 3 00:09:16 CET 2000 - olh@suse.de + +- no segfaults with AIX disklabels + +------------------------------------------------------------------- +Wed Nov 29 18:21:25 CET 2000 - uli@suse.de + +- fixed to build on PPC + +------------------------------------------------------------------- +Mon Nov 27 19:03:20 CET 2000 - schwab@suse.de + +- Fix broken casts in hwclock. + +------------------------------------------------------------------- +Thu Nov 23 15:48:35 CET 2000 - bk@suse.de + +- temporary disable pivot_root on s390(2.4 kernel is not yet built) + +------------------------------------------------------------------- +Wed Nov 22 13:28:06 CET 2000 - schwab@suse.de + +- Add pivot_root to file list. + +------------------------------------------------------------------- +Mon Nov 20 11:37:35 CET 2000 - kukuk@suse.de + +- Fix pmac-utils to compile with new kernel + +------------------------------------------------------------------- +Fri Nov 17 19:40:20 CET 2000 - kukuk@suse.de + +- Fix hwclock to compile on PPC + +------------------------------------------------------------------- +Wed Nov 15 12:39:13 CET 2000 - kukuk@suse.de + +- Update util-linux to 2.10q, merge flushb.diff + +------------------------------------------------------------------- +Thu Nov 2 10:21:12 CET 2000 - kukuk@suse.de + +- Remove some of the last specfile changes + +------------------------------------------------------------------- +Wed Nov 1 14:17:07 CET 2000 - olh@suse.de + +- update pmac-utils for new powermacs, cleanup specfile + +------------------------------------------------------------------- +Fri Oct 20 14:58:09 CEST 2000 - kukuk@suse.de + +- Update util-linux to 2.10p +- Rename package from util to util-linux + +------------------------------------------------------------------- +Wed Sep 27 11:30:21 CEST 2000 - kukuk@suse.de + +- Allow NFS v3 with 2.2.17.SuSE + +------------------------------------------------------------------- +Tue Sep 26 17:54:23 CEST 2000 - kukuk@suse.de + +- Fix mount for new NFS kernel patch + +------------------------------------------------------------------- +Sat Sep 9 17:36:24 CEST 2000 - kukuk@suse.de + +- Remove tcsh dependency +- Update to util-linux 2.10o, use of /etc/filesystems is still broken + +------------------------------------------------------------------- +Fri Aug 25 17:05:50 MEST 2000 - pthomas@suse.de + +- use %{_mandir} and %{_infodir} exclusively. This allows building + from source rpm on platforms other than 7.0. + +------------------------------------------------------------------- +Wed Jul 19 00:50:48 CEST 2000 - bk@suse.de + +- s390: removed dasdfmt and silo, %ifnarch s390 for some non-s390 things. + +------------------------------------------------------------------- +Tue May 30 18:45:56 CEST 2000 - bk@suse.de + +- added dasdfmt and silo on s390 + +------------------------------------------------------------------- +Mon May 15 18:15:05 CEST 2000 - kukuk@suse.de + +- util-linux: Update to 2.10m + +------------------------------------------------------------------- +Wed Apr 26 11:22:54 CEST 2000 - kukuk@suse.de + +- flusb: Don't use kernel headers, even if we don't need them! + +------------------------------------------------------------------- +Wed Apr 19 13:56:28 CEST 2000 - kukuk@suse.de + +- util-linux: Update to 2.10l + +------------------------------------------------------------------- +Mon Apr 17 15:06:51 CEST 2000 - kukuk@suse.de + +- util-linux: Update to 2.10k + +------------------------------------------------------------------- +Thu Apr 13 15:57:45 CEST 2000 - kukuk@suse.de + +- Move /sbin/setserial to /bin/setserial, add compat link to + /sbin. This fixes [Bug 1084] and is necessary for FHS 2.1 + +------------------------------------------------------------------- +Wed Apr 12 15:43:05 CEST 2000 - kukuk@suse.de + +- Fix util-linux for Alpha + +------------------------------------------------------------------- +Wed Apr 12 14:36:41 CEST 2000 - kukuk@suse.de + +- util-linux: Update to 2.10j + +------------------------------------------------------------------- +Sun Apr 2 01:08:05 CEST 2000 - bk@suse.de + +- suse s390 team added support for s390 + +------------------------------------------------------------------- +Thu Mar 30 21:31:15 CEST 2000 - uli@suse.de + +- hwclock/PPC: added support for MK48T559 RTC chip used in MTX+ boards + +------------------------------------------------------------------- +Fri Mar 24 11:49:25 CET 2000 - kukuk@suse.de + +- Add Linux LVM partition tag to fdisk +- Fix a lot of more possible buffer overruns +- Fix some fdisk sunlabel bugs +- added BuildRoot fixes from nadvorni@suse.cz + +------------------------------------------------------------------- +Wed Mar 22 14:28:27 CET 2000 - kukuk@suse.de + +- Update util-linux to 2.10h +- Add clock again for non PPC platforms + +------------------------------------------------------------------- +Fri Mar 17 15:10:50 CET 2000 - uli@suse.de + +- now contains both hwclock and clock on PPC (/sbin/init.d/boot + chooses what to run at runtime) + +------------------------------------------------------------------- +Tue Mar 14 19:23:26 CET 2000 - schwab@suse.de + +- Add support for ia64. + +------------------------------------------------------------------- +Thu Mar 9 21:25:15 CET 2000 - kukuk@suse.de + +- fdisk: Fix -l for Mylex RAID controller + +------------------------------------------------------------------- +Tue Mar 7 17:23:57 CET 2000 - kukuk@suse.de + +- etc/filesystems: Add minix and reiserfs + +------------------------------------------------------------------- +Tue Mar 7 11:49:23 CET 2000 - kukuk@suse.de + +- mount: fix endian problem with minix fs + +------------------------------------------------------------------- +Tue Feb 15 12:11:50 CET 2000 - kukuk@suse.de + +- mount: Add hack for PPC/syscall mount problem + +------------------------------------------------------------------- +Sun Feb 13 05:16:13 CET 2000 - bk@suse.de + +- let rdev continue in case it stubles over a bad file in /dev (/dev/snd fix) + +------------------------------------------------------------------- +Fri Feb 4 17:14:07 CET 2000 - kukuk@suse.de + +- Make PPC clock parameter compatible to hwclock + +------------------------------------------------------------------- +Thu Feb 3 14:42:23 CET 2000 - kukuk@suse.de + +- Fix filelist for SPARC + +------------------------------------------------------------------- +Thu Feb 3 11:14:29 CET 2000 - kukuk@suse.de + +- util-linux: Update to 2.10f (mount security fix) + +------------------------------------------------------------------- +Sun Jan 23 15:45:08 CET 2000 - kukuk@suse.de + +- util-linux: Update to 2.10e + +------------------------------------------------------------------- +Tue Jan 18 19:18:08 CET 2000 - kukuk@suse.de + +- mount now looks at first in /etc/filesystems and then in + /proc/filesystems + +------------------------------------------------------------------- +Tue Jan 18 16:32:05 CET 2000 - ro@suse.de + +- fixed pmac-utils to build with 2.3 as well + +------------------------------------------------------------------- +Tue Jan 18 14:56:22 CET 2000 - kukuk@suse.de + +- Fix a lot of fdisk buffer overruns [Bug 1642] + +------------------------------------------------------------------- +Mon Jan 17 18:23:56 CET 2000 - kukuk@suse.de + +- Fix setserial for Linux 2.3.40 +- Remove write, is now in nkitb +- Build minix and bfs tools for SPARC +- Fix some buffer overflows in fdisk + +------------------------------------------------------------------- +Fri Dec 17 15:00:19 MET 1999 - kukuk@suse.de + +- util-linux: Update to 2.10d +- hex: Update to 1.2 +- Move manual pages to /usr/share/man + +------------------------------------------------------------------- +Tue Nov 30 18:28:14 CET 1999 - uli@suse.de + +- re-added hwclock link for PPC (2nd try) + +------------------------------------------------------------------- +Tue Nov 30 17:49:27 MET 1999 - uli@suse.de + +- re-added hwclock link for PPC + +------------------------------------------------------------------- +Mon Nov 15 12:39:41 MET 1999 - kukuk@suse.de + +- util-linux: Update to 2.10b + +------------------------------------------------------------------- +Sat Nov 13 15:36:37 MET 1999 - kukuk@suse.de + +- setserial: Add Patch for Sparc +- Fix filelist for Sparc + +------------------------------------------------------------------- +Wed Oct 27 04:03:42 CEST 1999 - garloff@suse.de + +- added flushb (moved here from ddrescue). +- fix bug in logger (remove trailing newlines). + +------------------------------------------------------------------- +Fri Oct 22 11:29:51 MEST 1999 - kukuk@suse.de + +- util-linux: Remove old patches for mk_loop_h + +------------------------------------------------------------------- +Sat Oct 16 16:40:13 MEST 1999 - kukuk@suse.de + +- util-linux: Update to 2.9z + +------------------------------------------------------------------- +Fri Oct 8 10:58:48 MEST 1999 - kukuk@suse.de + +- Update to util-linux-2.9y (execpt fdisk) + +------------------------------------------------------------------- +Tue Sep 14 18:14:53 CEST 1999 - uli@suse.de + +- added PMac-specific utils for PPC + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Thu Aug 26 15:05:03 CEST 1999 - uli@suse.de + +- disabled hayesesp for PPC + +------------------------------------------------------------------- +Wed Aug 25 18:04:35 MEST 1999 - kukuk@suse.de + +- Don?t install tsort, its now in textutils 2.0 + +------------------------------------------------------------------- +Tue Aug 24 10:11:06 MEST 1999 - kukuk@suse.de + +- Update to util-linux-2.9w (execpt fdisk) + +------------------------------------------------------------------- +Mon Aug 9 10:55:48 MEST 1999 - kukuk@suse.de + +- Update to util-linux-2.9v (execpt fdisk) + +------------------------------------------------------------------- +Tue Jul 20 18:01:29 CEST 1999 - garloff@suse.de + +- Added hex from Erich S. Raymond + +------------------------------------------------------------------- +Mon Jul 12 12:11:45 MEST 1999 - kukuk@suse.de + +- Add fdisk patch from Klaus G. Wagner +- Add mount patch from util-linux 2.9u + +------------------------------------------------------------------- +Tue Jul 6 12:23:47 MEST 1999 - kukuk@suse.de + +- update to util-linux-2.9t + +------------------------------------------------------------------- +Fri Jun 25 14:44:30 MEST 1999 - kukuk@suse.de + +- update to util-linux-2.9s + +------------------------------------------------------------------- +Wed Mar 3 11:25:50 MET 1999 - ro@suse.de + +- hwclock.c: always use busywait to get rtctime + (it's hard to find out at runtime if we will get an irq) + +------------------------------------------------------------------- +Tue Mar 2 00:42:15 MET 1999 - ro@suse.de + +- update to util-linux-2.9i +- update to setserial-2.15 +- using diffs from jurix and add-ons from kgw for compaq smart raid + +------------------------------------------------------------------- +Mon Feb 1 10:22:10 MET 1999 - ro@suse.de + +- rdev is not built on alpha + +------------------------------------------------------------------- +Mon Jan 18 21:29:36 MET 1999 - florian@suse.de + +- fixed one broken case to delete a partition in fdisk + +------------------------------------------------------------------- +Sun Dec 13 22:20:16 MET 1998 - bs@suse.de + +- fixed file list + +------------------------------------------------------------------- +Thu Dec 10 16:38:08 MET 1998 - fehr@suse.de + +- fix bug in fdisk + +------------------------------------------------------------------- +Tue Dec 8 15:43:23 MET 1998 - ro@suse.de + +- removed last from filelist +- added link /sbin/clock -> hwclock + +------------------------------------------------------------------- +Wed Nov 4 00:23:02 MET 1998 - ro@suse.de + +- fdisksunlabel: don't include scsi/scsi.h for glibc-2.0 + +------------------------------------------------------------------- +Fri Oct 30 11:46:38 MET 1998 - ro@suse.de + +- update to 2.9 / added hostid from previous diff +- copied some glibc changes from previous diff (strcpy..) + +------------------------------------------------------------------- +Thu Sep 17 13:04:14 MEST 1998 - ro@suse.de + +- define _GNU_SOURCE when using getopt + +------------------------------------------------------------------- +Mon Aug 31 16:12:36 MEST 1998 - ro@suse.de + +- full switch to util-linux 2.8 +-- sync has moved to pkg fileutils +-- chroot has moved to pkg sh_utils (has been there for a while) +-- adopted hostid from previous suse-pkg + +------------------------------------------------------------------- +Mon Aug 24 10:46:33 MEST 1998 - ro@suse.de + +- switched to use mount from util-linux-2.8 + +------------------------------------------------------------------- +Tue Jun 23 10:46:45 MEST 1998 - ro@suse.de + +- added fdisk, sfdisk, cfdisk from util-linux-2.8 + (including man-pages,readmes) + +------------------------------------------------------------------- +Mon Nov 17 14:14:47 MET 1997 - ro@suse.de + +- changed /local/bin/perl5 in chkdupexe to /usr/bin/perl + +------------------------------------------------------------------- +Fri Oct 31 13:38:58 MET 1997 - ro@suse.de + +- temporarily removed mount-hacker + +------------------------------------------------------------------- +Wed Oct 29 23:44:37 MET 1997 - florian@suse.de + +- add changes from ms@suse.de for hostid.c + + +------------------------------------------------------------------- +Tue May 20 14:10:37 MEST 1997 - florian@suse.de + + +- only support kernel 2.0.x for nfs mounts, please use /bin/mount-hacker + for kernel 2.1.x + + +------------------------------------------------------------------- +Wed Apr 30 15:57:14 CEST 1997 - florian@suse.de + + +- update to mount 2.6g + + +------------------------------------------------------------------- +Sun Apr 13 23:04:29 MEST 1997 - florian@suse.de + + +- update to new version util-linux 2.6 + +- update to new version mount 2.6e + + + +------------------------------------------------------------------- +Sat Nov 2 17:35:11 CET 1996 - florian@suse.de + + +- update to mount 2.5p + + +------------------------------------------------------------------- +Thu Oct 17 16:05:09 CEST 1996 - florian@suse.de + + +- Update auf neue Version von mount 2.5o. + + +------------------------------------------------------------------- +Tue Sep 3 17:01:45 MET DST 1996 - florian@suse.de + + +- updated to new version mount 2.5m +- (u)mount now gives much better error messages + + +------------------------------------------------------------------- +Sun Aug 25 19:28:50 MET DST 1996 - bs@suse.de + +compile setterm with libtermcap and not libncurses +use newer mount instead of the old version in util-linux +(security fix) diff --git a/python-libmount.spec b/python-libmount.spec new file mode 100644 index 0000000..d6c54fa --- /dev/null +++ b/python-libmount.spec @@ -0,0 +1,1328 @@ +# +# spec file for package python-libmount +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%bcond_without sysvinit_tools +%bcond_without enable_su +%bcond_without enable_eject +%bcond_with enable_last + +Name: python-libmount +%define _name util-linux +# WARNING: After editing this file please call pre_checkin.sh to update spec files: +%define _name util-linux +# To prevent dependency loop in automatic build systems, we want to +# build util-linux in parts. To build all at once, set build_all to 1. +# +# build_util_linux: First stage build builds all except: +# build_util_linux_systemd: Builds util-linux-systemd and uuidd. +# build_python_libmount: Builds python-libmount. +%define build_all 0 +%if "%{name}" == "python-libmount" +%define build_util_linux 0 +%define build_util_linux_systemd 0 +%define build_python_libmount 1 +# To prevent dependency loops, verify signature only in third stage. +%define verify_sig 1 +%else +%if "%{name}" == "util-linux-systemd" +%define build_util_linux 0 +%define build_util_linux_systemd 1 +%define build_python_libmount 0 +%define verify_sig 0 +%else +%if %build_all +%define build_util_linux 1 +%define build_util_linux_systemd 1 +%define build_python_libmount 1 +%define verify_sig 1 +%else +%define build_util_linux 1 +%define build_util_linux_systemd 0 +%define build_python_libmount 0 +%define verify_sig 0 +%endif +%endif +%endif +BuildRequires: audit-devel +BuildRequires: bc +BuildRequires: binutils-devel +BuildRequires: fdupes +BuildRequires: gettext-devel +BuildRequires: libcap-ng-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: pam-devel +BuildRequires: pkg-config +BuildRequires: readline-devel +BuildRequires: utempter-devel +BuildRequires: zlib-devel +%if %verify_sig +BuildRequires: gpg-offline +%endif +%if %build_util_linux_systemd +%if 0%{?suse_version} <= 1230 +BuildRequires: pkgconfig(systemd) +%else +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-journal) +%endif +%endif +%if %build_python_libmount +BuildRequires: python-devel +%endif +#BEGIN SECOND STAGE DEPENDENCIES +%if !%build_util_linux +%if %build_util_linux_systemd +BuildRequires: libblkid-devel +BuildRequires: libmount-devel +BuildRequires: libsmartcols-devel +BuildRequires: libuuid-devel +%endif +%if %build_python_libmount +BuildRequires: libmount-devel +%endif +%endif +#END SECOND STAGE DEPENDENCIES +Version: 2.25 +Release: 0 +# util-linux is a base package and uuidd pre-requiring pwdutils pulls +# that into the core build cycle. pwdutils also pulls in the whole +# ldap stack into it. Avoid this whole mess which is done only to +# make the rpm install check of uuidd happy which has support to work without +# these tools as well +#!BuildIgnore: pwdutils +Url: https://www.kernel.org/pub/linux/utils/util-linux/ +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP +License: GPL-2.0+ +Group: System/Filesystems +%endif +# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.preamble +#END UGLY HACK +Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz +Source1: util-linux-rpmlintrc +Source4: raw.init +Source5: etc.raw +Source6: etc_filesystems +Source7: baselibs.conf +Source8: login.pamd +Source9: remote.pamd +Source10: su.pamd +Source11: su.default +Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign +Source13: %{_name}.keyring +# TODO: split to separate package +Source40: klogconsole.tar.bz2 +# XXX: Run a program in a new session and with controlling tty +Source22: setctsid.c +Source23: setctsid.8 +# XXX: ppc specific, still needed? +Source28: mkzimage_cmdline.8 +Source29: mkzimage_cmdline.c +Source31: addnote.c +# +Source50: uuidd.rc +Source51: blkid.conf +# detachec parts of spec file +Source100: util-linux.preamble +Source101: util-linux.util-linux +Source102: util-linux.python-libmount +## +## util-linux patches +## +# PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path +Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +# PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. +Patch12: util-linux-noenc-suse.patch +# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. +Patch13: util-linux-bash-completion-blockdev.patch +## +## klogconsole +## +Patch55: klogconsole-quiet.patch +Patch56: klogconsole.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# +%if %build_util_linux +Supplements: filesystem(minix) +Provides: fsck-with-dev-lock = %{version} +# bnc#651598: +Provides: util-linux(fake+no-canonicalize) +PreReq: %install_info_prereq permissions +PreReq: %insserv_prereq %fillup_prereq /bin/sed +Recommends: %{name}-lang = %{version} +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP +Group: System/Filesystems +%endif +# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.util-linux +#END UGLY HACK +%if %{with enable_eject} +Provides: eject = 2.1.0-166.8 +%endif +Provides: login = 4.0-33.7 +%if %{with enable_eject} +# File conflict of eject (up to 12.3 and SLE11). +Obsoletes: eject < 2.1.0-166.8 +%endif +# File conflict of login (up to 12.1 and SLE11). +Obsoletes: login < 4.0-33.7 +%if %{with enable_su} +# File conflict of su and kill (up to 12.3 and SLE11). +# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. +Conflicts: coreutils < 8.21 +%endif +%if %{with sysvinit_tools} +# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). +Conflicts: sysvinit-tools < 2.88+-87 +%endif +# bnc#805684: +%ifarch s390x +Obsoletes: s390-32 +Provides: s390-32 +%endif +# uuid-runtime appeared in SLE11 SP1 to SLE11 SP3 +Provides: uuid-runtime = %{version}-%{release} +Obsoletes: uuid-runtime < %{version}-%{release} +# +# Using "Requires" here would lend itself to help upgrading, but since +# util-linux is in the initial bootstrap, that is not a good thing to do: +# +Recommends: adjtimex +Recommends: time +Recommends: which +%else +# Exact copy of headers below is needed for spec cleaner that does not support +# if condition across preamble and subsequent sections. +%if %build_python_libmount +# Exact copy of the %%package tag from python-libmount section below: +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP +Group: System/Filesystems +%endif +# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.python-libmount +#END UGLY HACK +%else +%if %build_util_linux_systemd +# Exact copy of the %%package tag from systemd section below: +Summary: A collection of basic systemd utilities +Group: System/Filesystems +Supplements: packageand(util-linux:systemd) +# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 +Provides: util-linux:/usr/lib/systemd/system/fstrim.service +# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 +Conflicts: util-linux < 2.25 +%else +# ERROR: No build_* variables are set. +%endif +%endif +%endif + +%if %build_util_linux +%description +This package contains a large variety of low-level system utilities +that are necessary for a Linux system to function. It contains the +mount program, the fdisk configuration tool, and more. + +%package -n libblkid1 +Summary: Filesystem detection library +Group: System/Filesystems + +%description -n libblkid1 +Library for filesystem detection. + +%package -n libblkid-devel +Summary: Development files for the filesystem detection library +Group: Development/Libraries/C and C++ +Requires: libblkid1 = %{version} + +%description -n libblkid-devel +Files needed to develop applications using the library for filesystem +detection. + +%package -n libblkid-devel-static +Summary: Development files for the filesystem detection library +Group: Development/Libraries/C and C++ +Requires: libblkid-devel = %{version} + +%description -n libblkid-devel-static +Files needed to develop applications using the library for filesystem +detection. + +%package -n libuuid1 +Summary: Library to generate UUIDs +Group: System/Filesystems + +%description -n libuuid1 +A library to generate universally unique IDs (UUIDs). + +%package -n libuuid-devel +Summary: Development files for libuuid1 +Group: Development/Libraries/C and C++ +Requires: libuuid1 = %{version} + +%description -n libuuid-devel +Files to develop applications using the library to generate universally +unique IDs (UUIDs). + +%package -n libuuid-devel-static +Summary: Development files for libuuid1 +Group: Development/Libraries/C and C++ +Requires: libuuid-devel = %{version} + +%description -n libuuid-devel-static +Files to develop applications using the library to generate universally +unique IDs (UUIDs). + +%package -n libmount1 +Summary: Device mount library +Group: System/Filesystems + +%description -n libmount1 +Library designed to be used in low-level utils like +mount(8) and /usr/sbin/mount. helpers. + +%package -n libmount-devel +Summary: Development files for libmount1 +Group: Development/Libraries/C and C++ +Requires: libmount1 = %{version} + +%package -n libmount-devel-static +Summary: Development files for libmount1 +Group: Development/Libraries/C and C++ +Requires: libmount-devel = %{version} + +%description -n libmount-devel-static +Files to develop applications using the libmount library. + +%description -n libmount-devel +Files to develop applications using the libmount library. + +%package -n libsmartcols1 +Summary: Column-based text sort engine +Group: System/Libraries + +%description -n libsmartcols1 +Library to sort human readable column-based text output. + +%package -n libsmartcols-devel +Summary: Development files for libsmartcols1 +Group: Development/Libraries/C and C++ +Requires: libsmartcols1 = %{version} + +%description -n libsmartcols-devel +Files to develop applications using the libsmartcols library. + +%package -n libsmartcols-devel-static +Summary: Development files for libsmartcols1 +Group: Development/Libraries/C and C++ +Requires: libsmartcols-devel = %{version} + +%description -n libsmartcols-devel-static +Files to develop applications using the libsmartcols library. + +%lang_package +%endif +%if %build_util_linux_systemd +%if %build_util_linux +%package systemd +# Do not forget to copy duplicate of this section to the preamble: +Summary: A collection of basic systemd utilities +Group: System/Base +Supplements: packageand(util-linux:systemd) +# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 +Provides: util-linux:/usr/lib/systemd/system/fstrim.service +# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 +Conflicts: util-linux < 2.25 + +%description systemd +%else +%description +%endif +This package contains low-level util-linux utilities that use systemd. + +%package -n uuidd +Summary: Helper daemon to guarantee uniqueness of time-based UUIDs +Group: System/Filesystems +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: permissions +PreReq: pwdutils +# uuidd bash-completion moved to a correct package +Conflicts: util-linux < 2.25 + +%description -n uuidd +The uuidd package contains a userspace daemon (uuidd) which guarantees +uniqueness of time-based UUID generation even at very high rates on +SMP systems. + +%endif +%if %build_python_libmount +%if %build_util_linux +%package -n python-libmount +# Do not forget to copy duplicate of this section to the preamble: +Summary: Python bindings for the libmount library +Group: System/Filesystems + +%description -n python-libmount +%else +%description +%endif +This package contains the python bindings for util-linux libmount +library. + +%endif +%prep +%if %verify_sig +xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - +%endif +%setup -q -n %{_name}-%{version} -b 40 +%patch4 -p1 +%patch12 -p1 +%patch13 -p1 +# +# setctsid +cp -p %{S:22} %{S:23} . + +pushd ../klogconsole +%patch55 -p1 +%patch56 -p1 +popd + +%build +%if %build_util_linux +pushd ../klogconsole +# klogconsole build +make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}" +popd +# setctsid build +rm -f setctsid +make %{?_smp_mflags} setctsid CFLAGS="%{optflags}" CC="%{__cc}" +# +#BEGIN SYSTEMD SAFETY CHECK +# With systemd, some utilities are built differently. Keep track of these +# sources to prevent building of systemd-less versions. +# +# WARNING: Never edit following line without doing all suggested in the echo below! +UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/logger.c ./misc-utils/uuidd.c ' +UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIBSYSTEMD' . | fgrep '.c' | LC_ALL=C sort | tr '\n' ' ') +if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ; then + echo "List of utilities depending on systemd have changed. +Please check the new util-linux-systemd file list, file removal and update of Conflicts for safe update! +Then update configure options to build what needed. +Only then you can safely update following spec file line: +UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'" + exit 1 +fi +#END SYSTEMD SAFETY CHECK +#BEGIN FIRST STAGE MODIFICATIONS +%if !%build_util_linux_systemd +sed -i 's/BUILD_LSLOGINS/FALSE/ + s/BUILD_LOGGER/FALSE/ + ' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am +autoreconf -f -i +%endif +#END FIRST STAGE MODIFICATIONS +%else +#BEGIN SECOND STAGE MODIFICATIONS +# delete all make modules except wanted ones +sed -i '/^include/{ +%if %build_python_libmount + /libmount\/Makemodule.am/b 1 +%endif +%if %build_util_linux_systemd +# for lslogins + /login-utils/b 1 +# for logger and uuidd + /misc-utils/b 1 +# for fstrim.service and fstrim.timer + /sys-utils/b 1 +# for uninstalled libcommon required by uuidd + / lib\//b 1 +# for bash completions + /bash-completion/b 1 +# we always want tests (they are smart enough to skip irrelevant parts) + /tests/b 1 +%endif +%if %build_python_libmount + /libmount\/python/b 1 +%endif + d + :1 + }' Makefile.am libmount/Makemodule.am +%if %build_python_libmount +# trick: we do not want to build libmount, but include subdirs +# We close prefious if FALSE and open new pairing with endif +sed -i '/^if BUILD_LIBMOUNT/d +/^if ENABLE_GTK_DOC/i \ +if BUILD_LIBMOUNT +' libmount/Makemodule.am +# Do not install terminal-colors.d.5 +sed -i '/dist_man_MANS/d' lib/Makemodule.am +%endif +# disable all make modules except wanted ones +sed -i '/^if BUILD_/{ +%if %build_util_linux_systemd + /LSLOGINS/b 1 + /LOGGER/b 1 + /UUIDD/b 1 + /BASH_COMPLETION/b 1 +%endif + s/BUILD_.*/FALSE/ + :1 + } + ' libmount/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am sys-utils/Makemodule.am bash-completion/Makemodule.am +%if %build_util_linux_systemd +# trick: we do not want to build fstrim, but we want to install fstrim systemd connectors +# We close prefious if FALSE and open new pairing with endif +sed -i '/^if HAVE_SYSTEMD/i \ +endif\ +if TRUE +' sys-utils/Makemodule.am +# Do not install terminal-colors.d.5 +sed -i '/dist_man_MANS/d' lib/Makemodule.am +%endif +# Use installed first stage libraries +sed -i ' +# extra space to not replace pylibmount.la + s/ libmount\.la/ -lmount/g + s/libuuid\.la/-luuid/g + s/libblkid\.la/-lblkid/g + s/libsmartcols\.la/-lsmartcols/g + ' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am +# Ignore dependencies on optional (and not built in second stage) libraries +sed -i ' + /AM_GNU_GETTEXT/d + s/UL_REQUIRES_BUILD(\[.*\], \[libuuid\])/dnl &/ + s/UL_REQUIRES_BUILD(\[.*\], \[libsmartcols\])/dnl &/ + ' configure.ac +sed -i ' + /SUBDIRS =/s/ po// + ' Makefile.am +autoreconf -f -i +#END SECOND STAGE MODIFICATIONS +%endif +# +# util-linux itself +# +# Version check for libutempter +# +uhead=$(find %_includedir -name utempter.h 2>/dev/null) +if test -n "$uhead" && grep -q utempter_add_record "$uhead" +then + uhead=--with-utempter +else + uhead=--without-utempter +fi +export SUID_CFLAGS="-fpie" +export SUID_LDFLAGS="-pie" +# override default localstatedir to /run +# only used for volatile data +# +# SUSE now supports only systemd based system. We do not build +# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. +%configure \ + --localstatedir=/run \ + --docdir=%{_docdir}/%{_name} \ + --with-audit \ + --with-gnu-ld \ + --with-ncurses \ + --with-selinux \ + $uhead \ + --with-bashcompletiondir=%{_datadir}/bash-completion \ + --enable-all-programs \ + --disable-reset \ + --disable-use-tty-group \ + --disable-silent-rules \ + --enable-static \ + --disable-rpath \ +%if %{without enable_last} + --disable-last \ +%endif +%if %{without enable_eject} + --disable-eject \ +%endif +%if %{with sysvinit_tools} + --enable-sulogin-emergency-mount \ +%else + --disable-sulogin \ + --disable-mountpoint \ +%endif +%if %{without enable_su} + --disable-su \ + --disable-kill \ +%endif +%if %build_util_linux_systemd + --enable-uuidd \ + --with-systemd \ + --with-systemdsystemunitdir=%{_unitdir} \ +%else + --disable-uuidd \ + --without-systemd \ +%endif +%if %build_python_libmount + --with-python \ +%else + --without-python \ +%endif +# +make %{?_smp_mflags} +# +%if %build_util_linux +%{__cc} -fwhole-program %{optflags} -o mkzimage_cmdline %{S:29} +%{__cc} -fwhole-program %{optflags} -o chrp-addnote %{SOURCE31} +%endif + +%check +# mark some tests "known_fail" +%ifarch ppc ppc64 ppc64le s390 s390x +export TS_OPT_fdisk_bsd_known_fail="yes" +%endif +%ifarch %{ix86} +export TS_OPT_misc_setarch_known_fail="yes" +%endif +# +%ifarch armv7l armv7hl aarch64 +%if 0%{?suse_version} > 1310 +export TS_OPT_misc_setarch_known_fail="yes" +%endif +%endif +# +%ifarch armv6l armv6hl aarch64 +export TS_OPT_fdisk_gpt_known_fail="yes" +export TS_OPT_fdisk_oddinput_known_fail="yes" +export TS_OPT_fdisk_sunlabel_known_fail="yes" +export TS_OPT_misc_ionice_known_fail="yes" +export TS_OPT_misc_swaplabel_known_fail="yes" +export TS_OPT_kill_name_to_number_known_fail="yes" +export TS_OPT_kill_print_pid_known_fail="yes" +export TS_OPT_kill_queue_known_fail="yes" +%endif +%ifarch aarch64 s390 s390x +export TS_OPT_utmpdump_known_fail="yes" +%endif +# FIXME: These sometimes fails: +export TS_OPT_libmount_lock_known_fail="yes" +%ifarch x86_64 +# FIXME: Something is wrong here. This test never fails in SLE12: +export TS_OPT_ipcs_limits2_known_fail="yes" +%endif +# +# hacks +export PATH="$PATH:/sbin:/usr/sbin" +# +# do the check but don't abort yet +result="0" +make %{?_smp_mflags} check || result="1" +# +# always show test diffs (inclusive known_fail) and exit result +diffs_files="$(find tests/diff -type f | sort)" +echo "$diffs_files" | xargs -r cat +exit "$result" + +%install +%if %build_util_linux +mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} +install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf +install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login +install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote +%if %{with enable_su} +install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su +install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l +install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su +%endif +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +pushd ../klogconsole +# klogconsole install +make install DEST=%{buildroot} +popd +%endif +# +# util-linux install +# +%make_install +rm -f %{buildroot}%{python_sitearch}/libmount/*.*a +%if %build_util_linux +#UsrMerge +%if %{with enable_su} +ln -s %{_bindir}/kill %{buildroot}/bin +ln -s %{_bindir}/su %{buildroot}/bin +%endif +ln -s %{_bindir}/dmesg %{buildroot}/bin +ln -s %{_bindir}/more %{buildroot}/bin +ln -s %{_bindir}/mount %{buildroot}/bin +ln -s %{_bindir}/umount %{buildroot}/bin +ln -s %{_bindir}/findmnt %{buildroot}/bin +ln -s %{_bindir}/lsblk %{buildroot}/bin +ln -s %{_sbindir}/agetty %{buildroot}/sbin +ln -s %{_sbindir}/blockdev %{buildroot}/sbin +ln -s %{_sbindir}/cfdisk %{buildroot}/sbin +ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin +ln -s %{_sbindir}/fdisk %{buildroot}/sbin +ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin +ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin +ln -s %{_sbindir}/hwclock %{buildroot}/sbin +ln -s %{_sbindir}/losetup %{buildroot}/sbin +ln -s %{_sbindir}/mkfs %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin +ln -s %{_sbindir}/mkswap %{buildroot}/sbin +ln -s %{_sbindir}/nologin %{buildroot}/sbin +ln -s %{_sbindir}/pivot_root %{buildroot}/sbin +ln -s %{_sbindir}/raw %{buildroot}/sbin +ln -s %{_sbindir}/sfdisk %{buildroot}/sbin +ln -s %{_sbindir}/swapoff %{buildroot}/sbin +ln -s %{_sbindir}/swapon %{buildroot}/sbin +ln -s %{_sbindir}/blkid %{buildroot}/sbin +ln -s %{_sbindir}/findfs %{buildroot}/sbin +ln -s %{_sbindir}/fsck %{buildroot}/sbin +ln -s %{_sbindir}/switch_root %{buildroot}/sbin +ln -s %{_sbindir}/wipefs %{buildroot}/sbin +ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin +ln -s %{_sbindir}/swaplabel %{buildroot}/sbin +ln -s %{_sbindir}/fstrim %{buildroot}/sbin +ln -s %{_sbindir}/chcpu %{buildroot}/sbin +#EndUsrMerge +install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems +%ifnarch ppc ppc64 +install -m 755 mkzimage_cmdline %{buildroot}%{_bindir} +install -m 644 %{S:28} %{buildroot}%{_mandir}/man8 +install -m 755 chrp-addnote %{buildroot}%{_bindir} +%endif +# setctsid install +install -m 755 setctsid %{buildroot}%{_sbindir} +install -m 444 setctsid.8 %{buildroot}%{_mandir}/man8/ +echo -e "#! /bin/bash\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb +chmod 755 %{buildroot}%{_sbindir}/flushb +# Install scripts to configure raw devices at boot time +install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw +install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw +ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw +# upstream moved getopt examples from datadir to docdir but we keep +# the old location because we would need to fix the manpage first +mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ +# Stupid hack so we don't have a tcsh dependency +chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh +# Following files we don't want to package, so remove them +rm -f %{buildroot}%{_bindir}/pg +rm -f %{buildroot}%{_mandir}/man1/pg.1* +# Do not package these files to get rid of the perl dependency +rm -f %{buildroot}%{_bindir}/chkdupexe +rm -f %{buildroot}%{_mandir}/man1/chkdupexe.1 +# we use this tools from pwdutils +rm -f %{buildroot}%{_bindir}/{chfn,chsh,newgrp} +rm -f %{buildroot}%{_sbindir}/{vigr,vipw} +rm -f %{buildroot}%{_mandir}/man1/{chfn.1*,chsh.1*,newgrp.1*} +rm -f %{buildroot}%{_mandir}/man8/{vigr.8*,vipw.8*} +# login is always and only in /bin +mv %{buildroot}%{_bindir}/login %{buildroot}/bin/ +# arch dependent +%ifarch s390 s390x +rm -f %{buildroot}%{_sysconfdir}/fdprm +rm -f %{buildroot}%{_sbindir}/fdformat +rm -f %{buildroot}%{_sbindir}/hwclock +#UsrMerge +rm -f %{buildroot}/sbin/hwclock +#EndUsrMerge +rm -f %{buildroot}%{_sbindir}/klogconsole +rm -f %{buildroot}%{_bindir}/setterm +rm -f %{buildroot}%{_sbindir}/tunelp +rm -f %{buildroot}%{_mandir}/man8/fdformat.8* +rm -f %{buildroot}%{_mandir}/man8/hwclock.8* +rm -f %{buildroot}%{_mandir}/man8/klogconsole.8* +rm -f %{buildroot}%{_mandir}/man8/tunelp.8* +%endif +%ifarch ia64 %sparc m68k +rm -f %{buildroot}%{_mandir}/man8/cfdisk.8* +rm -f %{buildroot}%{_mandir}/man8/sfdisk.8* +rm -f %{buildroot}%{_sbindir}/cfdisk +#UsrMerge +rm -f %{buildroot}/sbin/cfdisk +#EndUsrMerge +rm -f %{buildroot}%{_sbindir}/sfdisk +#UsrMerge +rm -f %{buildroot}/sbin/sfdisk +#EndUsrMerge +%endif +%ifarch ia64 m68k +rm -f %{buildroot}%{_sbindir}/fdisk +#UsrMerge +rm -f %{buildroot}/sbin/fdisk +#EndUsrMerge +rm -f %{buildroot}%{_mandir}/man8/fdisk.8* +%endif +%find_lang %{name} %{name}.lang +# create list of setarch(8) symlinks +find %{buildroot}%{_bindir}/ -regextype posix-egrep -type l \ + -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)$" \ + -printf "%{_bindir}/%f\n" >> %{name}.files +find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \ + -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)\.8.*" \ + -printf "%{_mandir}/man8/%f*\n" >> %{name}.files +%else +# install systemd files manually, don't use Makefile that expect build of utilities and its dependencies. +%endif +%if %build_util_linux_systemd +mkdir -p %{buildroot}%{_sysconfdir}/init.d +mkdir -p %{buildroot}/bin +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid +mkdir -p %{buildroot}/run/uuidd +install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd +ln -s %{_bindir}/logger %{buildroot}/bin +# clock.txt from uuidd is a ghost file +touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt +# rcuuidd helper +ln -sf ../..%{_sysconfdir}/init.d/uuidd %{buildroot}%{_sbindir}/rcuuidd +%if !%build_util_linux +%make_install +%endif +%endif +# link duplicate manpages and python bindings +%fdupes -s %{buildroot}%{_prefix} + +%if %build_util_linux +%post +%{fillup_and_insserv raw} +%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount +%if %{with enable_su} +%set_permissions %{_bindir}/su +# Safely migrate PAM files from coreutils to util-linux +# (openSUSE 12.3->13.1, SLE11->SLE12) +# +# coreutils with su were upgraded (and su removed) before util-linux +# with su was installed (see the Conflicts above). If the admin edited +# the PAM file, the seemingly no more used modified file was saved as +# .rpmsave and the new clean file was installed. As we want +# "noreplace" upgrade, and the contents of the clean file contents has +# no changes, we should restore admin modification, and rename the +# clean file to .rpmnew, as it would happen if the file was not moved +# from one package to another. +for PAM_FILE in default/su pam.d/su pam.d/su-l ; do + if test -f %{_sysconfdir}/$PAM_FILE.rpmsave ; then + mv %{_sysconfdir}/$PAM_FILE %{_sysconfdir}/$PAM_FILE.rpmnew + mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE + fi +done +%endif + +# mount option 'code=' is now called 'codepage=' so change fstab +if [ -f etc/fstab ]; then + sed -i 's:code=:codepage=:' etc/fstab +fi + +%postun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz +%{insserv_cleanup} + +%verifyscript +%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount +%if %{with enable_su} +%verify_permissions -e %{_bindir}/su +%endif + +%post -n libblkid1 -p /sbin/ldconfig + +%postun -n libblkid1 -p /sbin/ldconfig + +%post -n libmount1 -p /sbin/ldconfig + +%postun -n libmount1 -p /sbin/ldconfig + +%post -n libsmartcols1 -p /sbin/ldconfig + +%postun -n libsmartcols1 -p /sbin/ldconfig + +%post -n libuuid1 -p /sbin/ldconfig + +%postun -n libuuid1 -p /sbin/ldconfig + +%files lang -f %{name}.lang +%endif + +%if %build_util_linux_systemd +%pre -n uuidd +%{_sbindir}/groupadd -r uuidd 2>/dev/null || : +%{_sbindir}/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd 2>/dev/null || : + +%preun -n uuidd +%{stop_on_removal uuidd} + +%post -n uuidd +%{fillup_and_insserv -n uuidd} +%set_permissions %{_sbindir}/uuidd + +%postun -n uuidd +%{restart_on_update uuidd} +%{insserv_cleanup} + +%verifyscript -n uuidd +%verify_permissions -e %{_sbindir}/uuidd +%endif + +%if %build_util_linux +%files -f %{name}.files +# Common files for all archs +%defattr(-,root,root) +# util-linux documentation files +%doc Documentation/blkid.txt +%doc Documentation/cal.txt +%doc Documentation/col.txt +%doc Documentation/deprecated.txt +%doc Documentation/fdisk.txt +%doc Documentation/getopt.txt +%doc Documentation/howto-debug.txt +%doc Documentation/hwclock.txt +%doc Documentation/modems-with-agetty.txt +%doc Documentation/mount.txt +%doc Documentation/pg.txt +%doc Documentation/sfdisk.txt +%config %attr(744,root,root) %{_sysconfdir}/init.d/raw +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw +%config(noreplace) %{_sysconfdir}/filesystems +%config(noreplace) %{_sysconfdir}/blkid.conf +%config(noreplace) %{_sysconfdir}/pam.d/login +%config(noreplace) %{_sysconfdir}/pam.d/remote +%if %{with enable_su} +%config(noreplace) %{_sysconfdir}/pam.d/su +%config(noreplace) %{_sysconfdir}/pam.d/su-l +%config(noreplace) %{_sysconfdir}/default/su +%endif +#UsrMerge +%if %{with enable_su} +/bin/kill +/bin/su +%endif +/bin/dmesg +/bin/more +/bin/mount +/bin/umount +/bin/findmnt +/bin/login +/bin/lsblk +/sbin/agetty +/sbin/blockdev +/sbin/ctrlaltdel +/sbin/fsck.minix +/sbin/fsck.cramfs +/sbin/losetup +/sbin/mkfs +/sbin/mkfs.bfs +/sbin/mkfs.minix +/sbin/mkfs.cramfs +/sbin/mkswap +/sbin/nologin +/sbin/pivot_root +/sbin/raw +/sbin/swapoff +/sbin/swapon +/sbin/blkid +/sbin/findfs +/sbin/fsck +/sbin/switch_root +/sbin/wipefs +/sbin/fsfreeze +/sbin/swaplabel +/sbin/fstrim +/sbin/chcpu +#EndUsrMerge +%if %{with enable_su} +%{_bindir}/kill +%{_bindir}/su +%endif +%if %{with enable_eject} +%if 0%{?suse_version} <= 1310 +%verify(not mode) %attr(4750,root,audio) %{_bindir}/eject +%else +%{_bindir}/eject +%endif +%endif +%{_bindir}/cal +%{_bindir}/chrt +%{_bindir}/col +%{_bindir}/colcrt +%{_bindir}/colrm +%{_bindir}/column +%{_bindir}/dmesg +%{_bindir}/fallocate +%{_bindir}/findmnt +%{_bindir}/flock +%{_bindir}/getopt +%{_bindir}/hexdump +%{_bindir}/ionice +%{_bindir}/ipcmk +%{_bindir}/ipcrm +%{_bindir}/ipcs +%{_bindir}/isosize +%if %{with enable_last} +%{_bindir}/last +%{_bindir}/lastb +%endif +%{_bindir}/line +%{_bindir}/look +%{_bindir}/lsblk +%{_bindir}/lscpu +%{_bindir}/lslocks +%{_bindir}/mcookie +%{_bindir}/mesg +%{_bindir}/more +%{_bindir}/mount +%{_bindir}/namei +%{_bindir}/nsenter +%{_bindir}/prlimit +%{_bindir}/rename +%{_bindir}/renice +%{_bindir}/rev +%{_bindir}/script +%{_bindir}/scriptreplay +%{_bindir}/setarch +%{_bindir}/setpriv +%{_bindir}/setsid +%{_bindir}/tailf +%{_bindir}/taskset +%{_bindir}/ul +%{_bindir}/umount +%{_bindir}/unshare +%if %{with sysvinit_tools} +%{_bindir}/mountpoint +%{_bindir}/utmpdump +%endif +%{_bindir}/uuidgen +%{_bindir}/uname26 +%ifnarch ppc ppc64 +%{_bindir}/chrp-addnote +%{_bindir}/mkzimage_cmdline +%endif +%{_bindir}/wdctl +%{_sbindir}/addpart +%{_sbindir}/agetty +%{_sbindir}/blkid +%{_sbindir}/blkdiscard +%{_sbindir}/blockdev +%{_sbindir}/chcpu +%{_sbindir}/ctrlaltdel +%{_sbindir}/delpart +%{_sbindir}/findfs +%{_sbindir}/fsck +%{_sbindir}/fsck.minix +%{_sbindir}/fsck.cramfs +%{_sbindir}/fsfreeze +%{_sbindir}/fstrim +%{_sbindir}/ldattach +%{_sbindir}/losetup +%{_sbindir}/mkfs +%{_sbindir}/mkfs.bfs +%{_sbindir}/mkfs.minix +%{_sbindir}/mkfs.cramfs +%{_sbindir}/mkswap +%{_sbindir}/nologin +%{_sbindir}/partx +%{_sbindir}/pivot_root +%{_sbindir}/raw +%{_sbindir}/rcraw +%{_sbindir}/resizepart +%{_sbindir}/rtcwake +%{_sbindir}/runuser +%{_sbindir}/setctsid +%if %{with sysvinit_tools} +%{_sbindir}/sulogin +%endif +%{_sbindir}/swaplabel +%{_sbindir}/swapoff +%{_sbindir}/swapon +%{_sbindir}/switch_root +%{_sbindir}/wipefs +%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall +%{_bindir}/whereis +%verify(not mode) %attr(0755,root,tty) %{_bindir}/write +%if %{with enable_su} +%{_mandir}/man1/kill.1.gz +%{_mandir}/man1/su.1.gz +%endif +%{_mandir}/man1/cal.1.gz +%{_mandir}/man1/chrt.1.gz +%{_mandir}/man1/col.1.gz +%{_mandir}/man1/colcrt.1.gz +%{_mandir}/man1/colrm.1.gz +%{_mandir}/man1/column.1.gz +%{_mandir}/man1/dmesg.1.gz +%if %{with enable_eject} +%{_mandir}/man1/eject.1.gz +%endif +%{_mandir}/man1/fallocate.1.gz +%{_mandir}/man1/flock.1.gz +%{_mandir}/man1/getopt.1.gz +%{_mandir}/man1/hexdump.1.gz +%{_mandir}/man1/ipcrm.1.gz +%{_mandir}/man1/ipcs.1.gz +%if %{with enable_last} +%{_mandir}/man1/last.1.gz +%{_mandir}/man1/lastb.1.gz +%endif +%{_mandir}/man1/line.1.gz +%{_mandir}/man1/login.1.gz +%{_mandir}/man1/look.1.gz +%{_mandir}/man1/lscpu.1.gz +%{_mandir}/man1/mcookie.1.gz +%{_mandir}/man1/mesg.1.gz +%{_mandir}/man1/more.1.gz +%{_mandir}/man1/namei.1.gz +%{_mandir}/man1/nsenter.1.gz +%{_mandir}/man1/ionice.1.gz +%{_mandir}/man1/prlimit.1.gz +%{_mandir}/man1/rename.1.gz +%{_mandir}/man1/rev.1.gz +%{_mandir}/man1/renice.1.gz +%{_mandir}/man1/setpriv.1.gz +%{_mandir}/man1/setsid.1.gz +%{_mandir}/man1/script.1.gz +%{_mandir}/man1/scriptreplay.1.gz +%{_mandir}/man1/setterm.1.gz +%{_mandir}/man1/tailf.1.gz +%{_mandir}/man1/taskset.1.gz +%{_mandir}/man1/ul.1.gz +%{_mandir}/man1/unshare.1.gz +%{_mandir}/man1/wall.1.gz +%{_mandir}/man1/whereis.1.gz +%{_mandir}/man1/write.1.gz +%{_mandir}/man1/ipcmk.1.gz +%if %{with sysvinit_tools} +%{_mandir}/man1/mountpoint.1.gz +%{_mandir}/man1/utmpdump.1.gz +%endif +%{_mandir}/man1/runuser.1.gz +%{_mandir}/man1/uuidgen.1.gz +%{_mandir}/man5/fstab.5.gz +%{_mandir}/man5/terminal-colors.d.5.gz +%{_mandir}/man8/addpart.8.gz +%{_mandir}/man8/agetty.8.gz +%{_mandir}/man8/blockdev.8.gz +%{_mandir}/man8/delpart.8.gz +%{_mandir}/man8/ctrlaltdel.8.gz +%{_mandir}/man8/blkid.8.gz +%{_mandir}/man8/blkdiscard.8.gz +%{_mandir}/man8/switch_root.8.gz +%{_mandir}/man8/mkfs.bfs.8.gz +%{_mandir}/man8/mkfs.minix.8.gz +%{_mandir}/man8/findfs.8.gz +%{_mandir}/man8/fsck.8.gz +%{_mandir}/man8/fsck.cramfs.8.gz +%{_mandir}/man8/fsck.minix.8.gz +%{_mandir}/man8/isosize.8.gz +%{_mandir}/man8/ldattach.8.gz +%{_mandir}/man8/losetup.8.gz +%{_mandir}/man8/lslocks.8.gz +%{_mandir}/man8/mkfs.8.gz +%{_mandir}/man8/mkfs.cramfs.8.gz +%{_mandir}/man8/mkswap.8.gz +%{_mandir}/man8/mount.8.gz +%{_mandir}/man8/nologin.8.gz +%{_mandir}/man8/findmnt.8.gz +%{_mandir}/man8/fsfreeze.8.gz +%{_mandir}/man8/swaplabel.8.gz +%{_mandir}/man8/readprofile.8.gz +%{_mandir}/man8/chcpu.8.gz +%ifnarch ppc ppc64 +%{_mandir}/man8/mkzimage_cmdline.8.gz +%endif +%{_mandir}/man8/partx.8.gz +%{_mandir}/man8/pivot_root.8.gz +%{_mandir}/man8/raw.8.gz +%{_mandir}/man8/rtcwake.8.gz +%{_mandir}/man8/setarch.8.gz +%{_mandir}/man8/swapoff.8.gz +%{_mandir}/man8/swapon.8.gz +%{_mandir}/man8/umount.8.gz +%{_mandir}/man8/uname26.8.gz +%{_mandir}/man8/setctsid.8.gz +%{_mandir}/man8/wipefs.8.gz +%{_mandir}/man8/fstrim.8.gz +%{_mandir}/man8/lsblk.8.gz +%{_mandir}/man8/resizepart.8.gz +%if %{with sysvinit_tools} +%{_mandir}/man8/sulogin.8.gz +%endif +%{_mandir}/man8/wdctl.8.gz +%{_sbindir}/flushb +%{_sbindir}/readprofile +%dir %{_datadir}/getopt +%attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash +%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh +# FIXME: Fix directory ownership. +%dir %{_datadir}/bash-completion +%{_datadir}/bash-completion/* +%if %build_util_linux_systemd +%exclude %{_datadir}/bash-completion/logger +%exclude %{_datadir}/bash-completion/uuidd +%endif +%ifnarch ia64 m68k +#XXX: post our patches upstream +#XXX: call fdupes on /usr/share/man +#UsrMerge +/sbin/fdisk +#EndUsrMerge +%{_sbindir}/fdisk +%{_mandir}/man8/fdisk.8.gz +%endif +%ifnarch %sparc ia64 m68k +%{_mandir}/man8/cfdisk.8.gz +%{_mandir}/man8/sfdisk.8.gz +#UsrMerge +/sbin/cfdisk +/sbin/sfdisk +#EndUsrMerge +%{_sbindir}/cfdisk +%{_sbindir}/sfdisk +%endif +%ifnarch s390 s390x +%{_sbindir}/fdformat +#UsrMerge +/sbin/hwclock +#EndUsrMerge +%{_sbindir}/hwclock +%{_sbindir}/klogconsole +%{_bindir}/setterm +%{_sbindir}/tunelp +%{_mandir}/man8/fdformat.8.gz +%{_mandir}/man8/hwclock.8.gz +%{_mandir}/man8/klogconsole.8.gz +%{_mandir}/man8/tunelp.8.gz +%endif + +%files -n libblkid1 +%defattr(-, root, root) +%{_libdir}/libblkid.so.1 +%{_libdir}/libblkid.so.1.* + +%files -n libblkid-devel +%defattr(-, root, root) +%{_libdir}/libblkid.so +%dir %{_includedir}/blkid +%{_includedir}/blkid/blkid.h +%{_libdir}/pkgconfig/blkid.pc +%{_mandir}/man3/libblkid.3.gz + +%files -n libblkid-devel-static +%defattr(-, root, root) +%{_libdir}/libblkid.*a + +%files -n libmount1 +%defattr(-, root, root) +%{_libdir}/libmount.so.1 +%{_libdir}/libmount.so.1.* + +%files -n libmount-devel +%defattr(-, root, root) +%{_libdir}/libmount.so +%dir %{_includedir}/libmount +%{_includedir}/libmount/libmount.h +%{_libdir}/pkgconfig/mount.pc + +%files -n libmount-devel-static +%defattr(-, root, root) +%{_libdir}/libmount.*a + +%files -n libsmartcols1 +%defattr(-, root, root) +%{_libdir}/libsmartcols.so.1 +%{_libdir}/libsmartcols.so.1.* + +%files -n libsmartcols-devel +%defattr(-, root, root) +%{_libdir}/libsmartcols.so +%dir %{_includedir}/libsmartcols +%{_includedir}/libsmartcols/libsmartcols.h +%{_libdir}/pkgconfig/smartcols.pc + +%files -n libsmartcols-devel-static +%defattr(-, root, root) +%{_libdir}/libsmartcols.*a + +%files -n libuuid1 +%defattr(-, root, root) +%{_libdir}/libuuid.so.1 +%{_libdir}/libuuid.so.1.* + +%files -n libuuid-devel +%defattr(-, root, root) +%{_libdir}/libuuid.so +%dir %{_includedir}/uuid +%{_includedir}/uuid/uuid.h +%{_libdir}/pkgconfig/uuid.pc +%{_mandir}/man3/uuid* + +%files -n libuuid-devel-static +%defattr(-, root, root) +%{_libdir}/libuuid.*a +%endif + +%if %build_util_linux_systemd +%if %build_util_linux +%files systemd +%else +%files +%endif +%defattr(-, root, root) +/bin/logger +%{_bindir}/logger +%{_bindir}/lslogins +%{_datadir}/bash-completion/logger +%{_mandir}/man1/logger.1.gz +%{_mandir}/man1/lslogins.1.gz +%{_unitdir}/fstrim.service +%{_unitdir}/fstrim.timer + +%files -n uuidd +%defattr(-, root, root) +%verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd +%attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid +%ghost %{_localstatedir}/lib/libuuid/clock.txt +%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd +%{_datadir}/bash-completion/uuidd +%{_initddir}/uuidd +%{_mandir}/man8/uuidd.8.gz +%{_sbindir}/rcuuidd +%{_unitdir}/uuidd.service +%{_unitdir}/uuidd.socket +%endif + +%if %build_python_libmount +%if %build_util_linux +%files -n python-libmount +%else +%files +%endif +%defattr(-, root, root) +%{python_sitearch}/libmount +%endif + +%changelog diff --git a/sulogin-does-not-find-any-console.patch b/sulogin-does-not-find-any-console.patch deleted file mode 100644 index 77ed85c..0000000 --- a/sulogin-does-not-find-any-console.patch +++ /dev/null @@ -1,32 +0,0 @@ -Enable sulogin to find a suitable console device even if the first line -in /proc/consoles does not have any major and minor number (bnc#862078) - ---- - sulogin-consoles.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- login-utils/sulogin-consoles.c -+++ login-utils/sulogin-consoles.c 2014-02-07 15:47:14.246235487 +0000 -@@ -319,7 +319,7 @@ static int detect_consoles_from_proc(str - char fbuf[16 + 1]; - DIR *dir = NULL; - FILE *fc = NULL; -- int maj, min, rc = 1; -+ int maj, min, rc = 1, matches; - - DBG(dbgprint("trying /proc")); - -@@ -332,10 +332,12 @@ static int detect_consoles_from_proc(str - if (!dir) - goto done; - -- while (fscanf(fc, "%*s %*s (%16[^)]) %d:%d", fbuf, &maj, &min) == 3) { -+ while ((matches = fscanf(fc, "%*s %*s (%16[^)]) %d:%d", fbuf, &maj, &min)) >= 1) { - char *name; - dev_t comparedev; - -+ if (matches != 3) -+ continue; - if (!strchr(fbuf, 'E')) - continue; - comparedev = makedev(maj, min); diff --git a/sulogin-fooled-on-tty-line-due-plymouth.patch b/sulogin-fooled-on-tty-line-due-plymouth.patch deleted file mode 100644 index cf6ad5f..0000000 --- a/sulogin-fooled-on-tty-line-due-plymouth.patch +++ /dev/null @@ -1,72 +0,0 @@ -Make sure that plymouth does not break sulogin. - ---- - sulogin.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 50 insertions(+), 1 deletion(-) - ---- login-utils/sulogin.c -+++ login-utils/sulogin.c 2014-03-05 17:42:40.442235465 +0000 -@@ -77,13 +77,62 @@ static volatile sig_atomic_t sigchild; - #endif - - /* -+ * For the case plymouth is found on this system -+ */ -+static int plymouth_command(const char* arg) -+{ -+ const char *cmd = "/usr/bin/plymouth"; -+ static int has_plymouth = 1; -+ pid_t pid; -+ -+ if (!has_plymouth) -+ return 127; -+ -+ pid = fork(); -+ if (!pid) { -+ int fd = open("/dev/null", O_RDWR); -+ dup2(fd, 0); -+ dup2(fd, 1); -+ dup2(fd, 2); -+ close(fd); -+ execl(cmd, cmd, arg, (char *) NULL); -+ exit(127); -+ } else if (pid > 0) { -+ int status; -+ waitpid(pid, &status, 0); -+ if (status == 127) -+ has_plymouth = 0; -+ return status; -+ } -+ return 1; -+} -+ -+/* - * Fix the tty modes and set reasonable defaults. - */ - static void tcinit(struct console *con) - { - int mode = 0, flags = 0; - struct termios *tio = &con->tio; -- int fd = con->fd; -+ struct termios lock; -+ int fd = con->fd, i = (plymouth_command("--ping")) ? 20 : 0; -+ -+ while (i-- > 0) { -+ /* -+ * With plymouth the termios flags become changed after this -+ * function had changed the termios. -+ */ -+ memset(&lock, 0, sizeof(struct termios)); -+ if (ioctl(fd, TIOCGLCKTRMIOS, &lock) < 0) -+ break; -+ if (!lock.c_iflag && !lock.c_oflag && !lock.c_cflag && !lock.c_lflag) -+ break; -+ if (i == 15 && plymouth_command("quit") != 0) -+ break; -+ sleep(1); -+ } -+ memset(&lock, 0, sizeof(struct termios)); -+ ioctl(fd, TIOCSLCKTRMIOS, &lock); - - errno = 0; - diff --git a/support-other-tty-lines-not-vconsole.patch b/support-other-tty-lines-not-vconsole.patch deleted file mode 100644 index ce31fd0..0000000 --- a/support-other-tty-lines-not-vconsole.patch +++ /dev/null @@ -1,104 +0,0 @@ ---- - login-utils/sulogin.c | 17 ++++++++++++----- - term-utils/agetty.c | 23 +++++++++++------------ - 2 files changed, 23 insertions(+), 17 deletions(-) - ---- login-utils/sulogin.c -+++ login-utils/sulogin.c 2014-05-08 08:01:13.102622002 +0000 -@@ -49,6 +49,11 @@ - # include - #endif - -+#ifdef __linux__ -+# include -+# include -+#endif -+ - #include "c.h" - #include "closestream.h" - #include "nls.h" -@@ -142,10 +147,14 @@ static void tcinit(struct console *con) - return; - } - -- /* Handle serial lines here */ -- if (ioctl(fd, TIOCMGET, (char *) &mode) == 0) { -+ /* Handle lines other than virtual consoles here */ -+#if defined(KDGKBMODE) -+ if (ioctl(fd, KDGKBMODE, &mode) < 0) -+#endif -+ { - speed_t ispeed, ospeed; - struct winsize ws; -+ errno = 0; - - /* this is a modem line */ - con->flags |= CON_SERIAL; -@@ -191,9 +200,7 @@ static void tcinit(struct console *con) - goto setattr; - } - #if defined(IUTF8) && defined(KDGKBMODE) -- /* Detect mode of current keyboard setup, e.g. for UTF-8 */ -- if (ioctl(fd, KDGKBMODE, &mode) < 0) -- mode = K_RAW; -+ /* Handle mode of current keyboard setup, e.g. for UTF-8 */ - switch(mode) { - case K_UNICODE: - setlocale(LC_CTYPE, "C.UTF-8"); ---- term-utils/agetty.c -+++ term-utils/agetty.c 2014-05-08 08:02:16.786235584 +0000 -@@ -139,6 +139,7 @@ struct options { - int nice; /* Run login with this priority */ - int numspeed; /* number of baud rates to try */ - int clocal; /* CLOCAL_MODE_* */ -+ int kbmode; /* Keyboard mode if virtual console */ - speed_t speeds[MAX_SPEED]; /* baud rates to be tried */ - }; - -@@ -936,7 +937,7 @@ static void update_utmp(struct options * - static void open_tty(char *tty, struct termios *tp, struct options *op) - { - const pid_t pid = getpid(); -- int serial, closed = 0; -+ int closed = 0; - - /* Set up new standard input, unless we are given an already opened port. */ - -@@ -1080,15 +1081,18 @@ static void open_tty(char *tty, struct t - #endif - /* - * Detect if this is a virtual console or serial/modem line. -- * In case of a virtual console the ioctl TIOCMGET fails and -- * the error number will be set to EINVAL. -+ * In case of a virtual console the ioctl KDGKBMODE succeeds -+ * whereas on other lines it will fails. - */ -- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) { -+ if (ioctl(STDIN_FILENO, KDGKBMODE, &op->kbmode) == 0) { - op->flags |= F_VCONSOLE; - if (!op->term) - op->term = DEFAULT_VCTERM; -- } else if (!op->term) -- op->term = DEFAULT_STERM; -+ } else { -+ op->kbmode = K_RAW; -+ if (!op->term) -+ op->term = DEFAULT_STERM; -+ } - - setenv("TERM", op->term, 1); - } -@@ -1122,12 +1126,7 @@ static void termio_init(struct options * - - if (op->flags & F_VCONSOLE) { - #if defined(IUTF8) && defined(KDGKBMODE) -- int mode; -- -- /* Detect mode of current keyboard setup, e.g. for UTF-8 */ -- if (ioctl(STDIN_FILENO, KDGKBMODE, &mode) < 0) -- mode = K_RAW; -- switch(mode) { -+ switch(op->kbmode) { - case K_UNICODE: - setlocale(LC_CTYPE, "C.UTF-8"); - op->flags |= F_UTF8; diff --git a/util-linux-2.23.1-eject-fpie.patch b/util-linux-2.23.1-eject-fpie.patch deleted file mode 100644 index f997932..0000000 --- a/util-linux-2.23.1-eject-fpie.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- util-linux-2.23.1/sys-utils/Makemodule.am -+++ util-linux-2.23.1/sys-utils/Makemodule.am 2013-06-05 12:55:10.921439066 +0000 -@@ -142,8 +142,8 @@ endif # LINUX - if BUILD_EJECT - usrbin_exec_PROGRAMS += eject - eject_SOURCES = sys-utils/eject.c --eject_LDADD = $(LDADD) libmount.la libcommon.la --eject_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) -+eject_LDADD = $(SUID_LDFLAGS) $(LDADD) libmount.la libcommon.la -+eject_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS) -I$(ul_libmount_incdir) - dist_man_MANS += sys-utils/eject.1 - endif - diff --git a/util-linux-2.24-fdisk_remove_bogus_warnings.patch b/util-linux-2.24-fdisk_remove_bogus_warnings.patch deleted file mode 100644 index 0a07b8b..0000000 --- a/util-linux-2.24-fdisk_remove_bogus_warnings.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- util-linux-2.24/libfdisk/src/dos.c.orig 2013-10-21 11:22:29.810014709 +0200 -+++ util-linux-2.24/libfdisk/src/dos.c 2013-11-13 23:57:27.535962925 +0100 -@@ -1107,6 +1107,7 @@ - /* compute logical ending (c, h, s) */ - long2chs(cxt, dos_partition_get_start(p) + dos_partition_get_size(p) - 1, &lec, &leh, &les); - -+#if 0 - /* Same physical / logical beginning? */ - if (cxt->geom.cylinders <= 1024 - && (pbc != lbc || pbh != lbh || pbs != lbs)) { -@@ -1117,6 +1118,7 @@ - pbc, pbh, pbs, - lbc, lbh, lbs); - } -+#endif - - /* Same physical / logical ending? */ - if (cxt->geom.cylinders <= 1024 diff --git a/util-linux-2.24.2.tar.sign b/util-linux-2.24.2.tar.sign deleted file mode 100644 index 7185d53..0000000 --- a/util-linux-2.24.2.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJTWOMEAAoJEOS3HV7sOcKENCYP+wbqkV8Oj9rfvgQguiN7hFje -xGshx7s7R4q3ZOK3k7Iw6yln0vT/XWAieEmuy1SIitsQ7GWe81qMloJ85hGKeryQ -G6U/+T5RX3F3bpGBGAMrQ8Z1VM85+6Q84g4LbXK9QclVNpdYuIF68hs5KWjSlx+R -GhH87GpEVIskpTlNE7UmEGoxYm5sdmwb3pIg04SkVFPtvjlRxlTgL5uLjNc1d2tW -XVKgflMD6RLX/OeQTpmqPpfE8yQwwi20hph9ISQ/0cHXsp3Ab6Tx+hSZUlujQPZT -7ljuTioRplp0n7tBbE4Fu0r7BqummGgRTA8q1JakOCxs5UGDvhhILjNxf42jpkL4 -g++J6M2IoiMPbZlXu3NQEwaTkbIRY4THnWj0SSZtc6WVNdcPggwV8sx9fuzVHYjR -+FPRkPLFMsTYg1FZDFFNHVU0DynzHhCvY2idWEFTUFxou71dS1EMlaF7yu8uHN1R -QJZqfl0K1s76uffnzU3ljTg6ZD6PgVSYrJj85Q4UBUjxz3FLlj7XP9n/rNZszmc0 -YGRwmkifdiAh1g5vmax8LRPWs46450XUjd+U+d5NvAfLihtNhwsjlXs+Xqsnk9Do -Aq6IeyoVLO+pi2KRbYEWFzajUhBp5qpcNPjQHXn/1FOTuVFDpMwWhEhHrVb/SYlo -9qhwLq9ab+rI3J7Zgiqh -=JB8F ------END PGP SIGNATURE----- diff --git a/util-linux-2.24.2.tar.xz b/util-linux-2.24.2.tar.xz deleted file mode 100644 index 8f68bee..0000000 --- a/util-linux-2.24.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0 -size 3586580 diff --git a/util-linux-2.25.tar.sign b/util-linux-2.25.tar.sign new file mode 100644 index 0000000..4f51484 --- /dev/null +++ b/util-linux-2.25.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJTzjJFAAoJEOS3HV7sOcKEYVcQAKNAIwpaYSNL4H3PYVlj/t6p +z5LrX9wD6c0nmNriaK6sqpRbJt7zRt/e9Vzmgs3TkHHsM7F7jq7Zir2erDyN+XRL +AjdDAjdPEbhWLwIOqCApoXirZTx1iv8GBrp/vWWrnk3DEQi30yuZENx5g6BlXVTr +wGNt0cpk2Pm7Qd2VZXFSl/D8wRxedoP4iI4+oNoIE9Z/Hc339qM8GBnptaYc9xCB +1EZdnMEsAZoS/lG/NWW1JPqoVoQzNG8wzVU97xPdTCdZINTaXNJGo5fvMF37mt/D +bIQagMayt6+FLUUGCvTP843gt/P3R5yQmiBwvuRXfnXHCemWZa6eTP4hjI7xdZYC +sV5CG+EUUxm/2R9nuKFaTImMPf7kGywxbWsMb3o09XJ8iDZogLrIFa7cfcdobJw3 +4sjFZxQ5SeWc7AJU8331b074VyL3w1eZreSZRX0CAXOYd/4p9k/fbIxLMN99iPd2 +3fyWS2WvJ8Y58ZPCeSZw/ZEaXcOpXxd1it3vFoOz5Vhr67IHM4P5CrHB7+WZF4AH +BxsVr2jLKN2GzqOlBn3hKdWW6bDUCwRYEBGdshwtzGy/Sw3lvSXVfeSicYNlmrYD +a5WxujQvjiAf12OA0GydOzR3nBkjcpmwMe9pQypMG8YEIO+3dXYpV3m+WSAMYq1g +eO4GVmg4fthgme1SMXBY +=Et2U +-----END PGP SIGNATURE----- diff --git a/util-linux-2.25.tar.xz b/util-linux-2.25.tar.xz new file mode 100644 index 0000000..ba0562a --- /dev/null +++ b/util-linux-2.25.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47ba5a8bd8cdd55262699078a5612a95db17966c7f20c43e3fe492c90ce7980a +size 3681308 diff --git a/util-linux-HACK-boot.localfs.diff b/util-linux-HACK-boot.localfs.diff deleted file mode 100644 index a5f7844..0000000 --- a/util-linux-HACK-boot.localfs.diff +++ /dev/null @@ -1,27 +0,0 @@ -From 89a0fa3ca57be7440500dd207d96ea1e2908959f Mon Sep 17 00:00:00 2001 -From: Ludwig Nussel -Date: Wed, 20 Jun 2012 10:56:05 +0200 -Subject: [PATCH] UGLY HACK: boot.localfs parses mount ouput and needs source - rather than target - ---- - sys-utils/mount.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/sys-utils/mount.c b/sys-utils/mount.c -index 8706716..b28d67a 100644 ---- a/sys-utils/mount.c -+++ b/sys-utils/mount.c -@@ -166,6 +166,9 @@ static int mount_all(struct libmnt_context *cxt) - while (mnt_context_next_mount(cxt, itr, &fs, &mntrc, &ignored) == 0) { - - const char *tgt = mnt_fs_get_target(fs); -+ if (getenv("MOUNT_PRINT_SOURCE")) { -+ tgt = mnt_fs_get_srcpath(fs); -+ } - - if (ignored) { - if (mnt_context_is_verbose(cxt)) --- -1.7.7 - diff --git a/util-linux-bash-completion-blockdev.patch b/util-linux-bash-completion-blockdev.patch new file mode 100644 index 0000000..d2f0f0b --- /dev/null +++ b/util-linux-bash-completion-blockdev.patch @@ -0,0 +1,13 @@ +Index: util-linux-2.25/bash-completion/Makemodule.am +=================================================================== +--- util-linux-2.25.orig/bash-completion/Makemodule.am ++++ util-linux-2.25/bash-completion/Makemodule.am +@@ -122,7 +122,7 @@ endif + if BUILD_FDFORMAT + dist_bashcompletion_DATA += bash-completion/fdformat + endif +-if LINUX ++if BUILD_BLOCKDEV + dist_bashcompletion_DATA += bash-completion/blockdev + endif + diff --git a/util-linux-libblkid-ext-probe.patch b/util-linux-libblkid-ext-probe.patch deleted file mode 100644 index 7212335..0000000 --- a/util-linux-libblkid-ext-probe.patch +++ /dev/null @@ -1,274 +0,0 @@ -This is a backport of patch from master branch. - -commit a1ca32fb3862ccac7275d6b342805b6d99f20e39 -Author: Lukas Czerner -Date: Tue Dec 3 16:24:44 2013 +0100 - - libblkid: Identify extN file system properly - - Currently when trying to identify extN file system we're playing games - with searching for kernel modules and parsing /proc/filesystem. All of - this just because ext4 module can be used to mount ext3 and ext2 file - systems on recent kernel and also because of ext4dev. - - However all of this is not necessary. Ext4 module which does support - mounting ext2 and ext3 file system is able to recognize and mount ext2 - and ext3 type so there is no need to disguise it and ext4dev should only - be ever used for testing and not as fallback when other modules are - missing (use -t instead). - - This also introduces a bug when in situation that we only have ext4 - modules with ext2/ext3 support which is not loaded and we try to mount - ext2 file system we will mount it incorrectly as ext4. This will not - happen if the ext4 module is already loaded. - - With this patch we remove all the unnecessary checks and return the real - type of the file system which is on the device. This fixes the issue. - However on the kernel which was not compiled with EXT4_USE_FOR_EXT23 - support one would have to provide file system type (-t) to be able to - mount the file system with ext4 driver. - - Signed-off-by: Lukas Czerner - Signed-off-by: Karel Zak - -Index: util-linux-2.24.1/libblkid/src/superblocks/ext.c -=================================================================== ---- util-linux-2.24.1.orig/libblkid/src/superblocks/ext.c -+++ util-linux-2.24.1/libblkid/src/superblocks/ext.c -@@ -18,7 +18,6 @@ - #endif - #include - --#include "linux_version.h" - #include "superblocks.h" - - struct ext2_super_block { -@@ -132,140 +131,11 @@ struct ext2_super_block { - #define EXT3_FEATURE_RO_COMPAT_UNSUPPORTED ~EXT3_FEATURE_RO_COMPAT_SUPP - - /* -- * Check to see if a filesystem is in /proc/filesystems. -- * Returns 1 if found, 0 if not -- */ --static int fs_proc_check(const char *fs_name) --{ -- FILE *f; -- char buf[80], *cp, *t; -- -- f = fopen("/proc/filesystems", "r" UL_CLOEXECSTR); -- if (!f) -- return 0; -- while (!feof(f)) { -- if (!fgets(buf, sizeof(buf), f)) -- break; -- cp = buf; -- if (!isspace(*cp)) { -- while (*cp && !isspace(*cp)) -- cp++; -- } -- while (*cp && isspace(*cp)) -- cp++; -- if ((t = strchr(cp, '\n')) != NULL) -- *t = 0; -- if ((t = strchr(cp, '\t')) != NULL) -- *t = 0; -- if ((t = strchr(cp, ' ')) != NULL) -- *t = 0; -- if (!strcmp(fs_name, cp)) { -- fclose(f); -- return 1; -- } -- } -- fclose(f); -- return (0); --} -- --/* -- * Check to see if a filesystem is available as a module -- * Returns 1 if found, 0 if not -- */ --static int check_for_modules(const char *fs_name) --{ --#ifdef __linux__ -- struct utsname uts; -- FILE *f; -- char buf[1024], *cp; -- int namesz; -- -- if (uname(&uts)) -- return 0; -- snprintf(buf, sizeof(buf), "/lib/modules/%s/modules.dep", uts.release); -- -- f = fopen(buf, "r" UL_CLOEXECSTR); -- if (!f) -- return 0; -- -- namesz = strlen(fs_name); -- -- while (!feof(f)) { -- if (!fgets(buf, sizeof(buf), f)) -- break; -- if ((cp = strchr(buf, ':')) != NULL) -- *cp = 0; -- else -- continue; -- if ((cp = strrchr(buf, '/')) == NULL) -- continue; -- cp++; -- -- if (!strncmp(cp, fs_name, namesz) && -- (!strcmp(cp + namesz, ".ko") || -- !strcmp(cp + namesz, ".ko.gz"))) { -- fclose(f); -- return 1; -- } -- } -- fclose(f); --#endif /* __linux__ */ -- return 0; --} -- --/* - * Starting in 2.6.29, ext4 can be used to support filesystems - * without a journal. - */ - #define EXT4_SUPPORTS_EXT2 KERNEL_VERSION(2, 6, 29) - --static int system_supports_ext2(void) --{ -- static time_t last_check = 0; -- static int ret = -1; -- time_t now = time(0); -- -- if (ret != -1 || (now - last_check) < 5) -- return ret; -- last_check = now; -- ret = (fs_proc_check("ext2") || check_for_modules("ext2")); -- return ret; --} -- --static int system_supports_ext4(void) --{ -- static time_t last_check = 0; -- static int ret = -1; -- time_t now = time(0); -- -- if (ret != -1 || (now - last_check) < 5) -- return ret; -- last_check = now; -- ret = (fs_proc_check("ext4") || check_for_modules("ext4")); -- return ret; --} -- --static int system_supports_ext4dev(void) --{ -- static time_t last_check = 0; -- static int ret = -1; -- time_t now = time(0); -- -- if (ret != -1 || (now - last_check) < 5) -- return ret; -- last_check = now; -- ret = (fs_proc_check("ext4dev") || check_for_modules("ext4dev")); -- return ret; --} -- --static int system_supports_ext4_ext2(void) --{ --#ifdef __linux__ -- return get_linux_version() >= EXT4_SUPPORTS_EXT2; --#else -- return 0; --#endif --} - /* - * reads superblock and returns: - * fc = feature_compat -@@ -357,15 +227,6 @@ static int probe_ext2(blkid_probe pr, - (fi & EXT2_FEATURE_INCOMPAT_UNSUPPORTED)) - return 1; - -- /* -- * If ext2 is not present, but ext4 or ext4dev are, then -- * disclaim we are ext2 -- */ -- if (!system_supports_ext2() && -- (system_supports_ext4() || system_supports_ext4dev()) && -- system_supports_ext4_ext2()) -- return 1; -- - ext_get_info(pr, 2, es); - return 0; - } -@@ -408,34 +269,9 @@ static int probe_ext4dev(blkid_probe pr, - if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) - return 1; - -- /* -- * If the filesystem does not have a journal and ext2 and ext4 -- * is not present, then force this to be detected as an -- * ext4dev filesystem. -- */ -- if (!(fc & EXT3_FEATURE_COMPAT_HAS_JOURNAL) && -- !system_supports_ext2() && !system_supports_ext4() && -- system_supports_ext4dev() && -- system_supports_ext4_ext2()) -- goto force_ext4dev; -- -- /* -- * If the filesystem is marked as OK for use by in-development -- * filesystem code, but ext4dev is not supported, and ext4 is, -- * then don't call ourselves ext4dev, since we should be -- * detected as ext4 in that case. -- * -- * If the filesystem is marked as in use by production -- * filesystem, then it can only be used by ext4 and NOT by -- * ext4dev, so always disclaim we are ext4dev in that case. -- */ -- if (le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS) { -- if (!system_supports_ext4dev() && system_supports_ext4()) -- return 1; -- } else -+ if (!(le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS)) - return 1; - --force_ext4dev: - ext_get_info(pr, 4, es); - return 0; - } -@@ -454,22 +290,11 @@ static int probe_ext4(blkid_probe pr, - if (fi & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) - return 1; - -- /* -- * If the filesystem does not have a journal and ext2 is not -- * present, then force this to be detected as an ext2 -- * filesystem. -- */ -- if (!(fc & EXT3_FEATURE_COMPAT_HAS_JOURNAL) && -- !system_supports_ext2() && system_supports_ext4() && -- system_supports_ext4_ext2()) -- goto force_ext4; -- - /* Ext4 has at least one feature which ext3 doesn't understand */ - if (!(frc & EXT3_FEATURE_RO_COMPAT_UNSUPPORTED) && - !(fi & EXT3_FEATURE_INCOMPAT_UNSUPPORTED)) - return 1; - --force_ext4: - /* - * If the filesystem is a OK for use by in-development - * filesystem code, and ext4dev is supported or ext4 is not -@@ -480,10 +305,8 @@ force_ext4: - * filesystem, then it can only be used by ext4 and NOT by - * ext4dev. - */ -- if (le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS) { -- if (system_supports_ext4dev() || !system_supports_ext4()) -- return 1; -- } -+ if (le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS) -+ return 1; - - ext_get_info(pr, 4, es); - return 0; diff --git a/util-linux-lscpu-improve-hypervisor-detection.patch b/util-linux-lscpu-improve-hypervisor-detection.patch deleted file mode 100644 index 2a2f3e6..0000000 --- a/util-linux-lscpu-improve-hypervisor-detection.patch +++ /dev/null @@ -1,206 +0,0 @@ -Index: util-linux-2.24.1/sys-utils/lscpu.c -=================================================================== ---- util-linux-2.24.1.orig/sys-utils/lscpu.c -+++ util-linux-2.24.1/sys-utils/lscpu.c -@@ -32,6 +32,15 @@ - #include - #include - #include -+#include -+#include -+#include -+#include -+#if defined(__x86_64__) || defined(__i386__) -+#ifdef HAVE_sys_io_h -+#include -+#endif -+#endif - - #include "cpuset.h" - #include "nls.h" -@@ -59,6 +68,7 @@ - #define _PATH_PROC_STATUS "/proc/self/status" - #define _PATH_PROC_VZ "/proc/vz" - #define _PATH_PROC_BC "/proc/bc" -+#define _PATH_PROC_DEVICETREE "/proc/device-tree" - #define _PATH_DEV_MEM "/dev/mem" - - /* virtualization types */ -@@ -86,7 +96,28 @@ const char *hv_vendors[] = { - [HYPER_UML] = "User-mode Linux", - [HYPER_INNOTEK] = "Innotek GmbH", - [HYPER_HITACHI] = "Hitachi", -- [HYPER_PARALLELS] = "Parallels" -+ [HYPER_PARALLELS] = "Parallels", -+ [HYPER_VBOX] = "Oracle", -+ [HYPER_OS400] = "OS/400", -+ [HYPER_PHYP] = "pHyp" -+}; -+ -+const int hv_vendor_pci[] = { -+ [HYPER_NONE] = 0x0000, -+ [HYPER_XEN] = 0x5853, -+ [HYPER_KVM] = 0x0000, -+ [HYPER_MSHV] = 0x1414, -+ [HYPER_VMWARE] = 0x15ad, -+ [HYPER_VBOX] = 0x80ee -+}; -+ -+const int hv_graphics_pci[] = { -+ [HYPER_NONE] = 0x0000, -+ [HYPER_XEN] = 0x0001, -+ [HYPER_KVM] = 0x0000, -+ [HYPER_MSHV] = 0x5353, -+ [HYPER_VMWARE] = 0x0710, -+ [HYPER_VBOX] = 0xbeef - }; - - /* CPU modes */ -@@ -550,10 +581,111 @@ read_hypervisor_cpuid(struct lscpu_desc - desc->hyper = HYPER_VMWARE; - } - -+#define VMWARE_BDOOR_MAGIC 0x564D5868 -+#define VMWARE_BDOOR_PORT 0x5658 -+#define VMWARE_BDOOR_CMD_GETVERSION 10 -+ -+#define VMWARE_BDOOR(eax, ebx, ecx, edx) \ -+ __asm__("inl (%%dx)" : \ -+ "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) : \ -+ "0"(VMWARE_BDOOR_MAGIC), "1"(VMWARE_BDOOR_CMD_GETVERSION), \ -+ "2"(VMWARE_BDOOR_PORT), "3"(0) : \ -+ "memory"); -+ -+static jmp_buf segv_handler_env; -+ -+static void -+segv_handler(int sig, siginfo_t *info, void *ignored) -+{ -+ siglongjmp(segv_handler_env, 1); -+} -+ -+static int -+is_vmware_platform(void) -+{ -+ uint32_t eax, ebx, ecx, edx; -+ struct sigaction act, oact; -+ -+ /* -+ * The assembly routine for vmware detection works -+ * fine under vmware, even if ran as regular user. But -+ * on real HW or under other hypervisors, it segfaults (which is -+ * expected). So we temporarily install SIGSEGV handler to catch -+ * the signal. All this magic is needed because lscpu -+ * isn't supposed to require root privileges. -+ */ -+ if (sigsetjmp(segv_handler_env, 1)) -+ return 0; -+ -+ bzero(&act, sizeof(act)); -+ act.sa_sigaction = segv_handler; -+ act.sa_flags = SA_SIGINFO; -+ -+ if (sigaction(SIGSEGV, &act, &oact)) -+ err(EXIT_FAILURE, _("error: can not set signal handler")); -+ -+ VMWARE_BDOOR(eax, ebx, ecx, edx); -+ -+ if (sigaction(SIGSEGV, &oact, NULL)) -+ err(EXIT_FAILURE, _("error: can not restore signal handler")); -+ -+ return eax != (uint32_t)-1 && ebx == VMWARE_BDOOR_MAGIC; -+} -+ - #else /* ! __x86_64__ */ - static void - read_hypervisor_cpuid(struct lscpu_desc *desc __attribute__((__unused__))) - { -+#ifdef __powerpc__ -+ /* powerpc: -+ * IBM iSeries: legacy, if /proc/iSeries exists, its para-virtualized on top of OS/400 -+ * IBM pSeries: always has a hypervisor -+ * if partition-name is "full", its kind of "bare-metal": full-system-partition -+ * otherwise its some partition created by Hardware Management Console -+ * in any case, its always some sort of HVM -+ * KVM: "linux,kvm" in /hypervisor/compatible indicates a KVM guest -+ * Xen: not in use, not detected -+ */ -+ if (path_exist("/proc/iSeries")) { -+ desc->hyper = HYPER_OS400; -+ desc->virtype = VIRT_FULL; -+ } else if (path_exist(_PATH_PROC_DEVICETREE "/ibm,partition-name")) { -+ FILE *fd; -+ desc->hyper = HYPER_PHYP; -+ desc->virtype = VIRT_FULL; -+ fd = fopen(_PATH_PROC_DEVICETREE "/ibm,partition-name", "r"); -+ if (fd) { -+ char buf[256]; -+ if (fscanf(fd, "%s", buf) == 1 && !strcmp(buf, "full")) -+ desc->virtype = VIRT_NONE; -+ fclose(fd); -+ } -+ } else if (path_exist(_PATH_PROC_DEVICETREE "/hypervisor/compatible")) { -+ FILE *fd; -+ fd = fopen(_PATH_PROC_DEVICETREE "/hypervisor/compatible", "r"); -+ if (fd) { -+ char buf[256]; -+ int i; -+ memset(buf, 0, sizeof(buf)); -+ fread(buf, sizeof(buf) - 1, 1, fd); -+ fclose(fd); -+ for (i = 0; i < sizeof(buf);) { -+ if (!strcmp(&buf[i], "linux,kvm")) { -+ desc->hyper = HYPER_KVM; -+ desc->virtype = VIRT_FULL; -+ break; -+ } -+ i += strlen(&buf[i]); -+ i++; -+ } -+ } -+ } -+#endif -+} -+ -+static int is_vmware_platform(void) -+{ -+ return 0; - } - #endif - -@@ -588,9 +720,18 @@ read_hypervisor(struct lscpu_desc *desc, - desc->hyper = HYPER_XEN; - - /* Xen full-virt on non-x86_64 */ -- } else if (has_pci_device(0x5853, 0x0001)) { -+ } else if (has_pci_device( hv_vendor_pci[HYPER_XEN], hv_graphics_pci[HYPER_XEN])) { - desc->hyper = HYPER_XEN; - desc->virtype = VIRT_FULL; -+ } else if (is_vmware_platform()) { -+ desc->hyper = HYPER_VMWARE; -+ desc->virtype = VIRT_FULL; -+ } else if (has_pci_device( hv_vendor_pci[HYPER_VMWARE], hv_graphics_pci[HYPER_VMWARE])) { -+ desc->hyper = HYPER_VMWARE; -+ desc->virtype = VIRT_FULL; -+ } else if (has_pci_device( hv_vendor_pci[HYPER_VBOX], hv_graphics_pci[HYPER_VBOX])) { -+ desc->hyper = HYPER_VBOX; -+ desc->virtype = VIRT_FULL; - - /* IBM PR/SM */ - } else if (path_exist(_PATH_PROC_SYSINFO)) { -Index: util-linux-2.24.1/sys-utils/lscpu.h -=================================================================== ---- util-linux-2.24.1.orig/sys-utils/lscpu.h -+++ util-linux-2.24.1/sys-utils/lscpu.h -@@ -13,7 +13,10 @@ enum { - HYPER_UML, - HYPER_INNOTEK, /* VBOX */ - HYPER_HITACHI, -- HYPER_PARALLELS /* OpenVZ/VIrtuozzo */ -+ HYPER_PARALLELS, /* OpenVZ/VIrtuozzo */ -+ HYPER_VBOX, -+ HYPER_OS400, -+ HYPER_PHYP - }; - - extern int read_hypervisor_dmi(void); diff --git a/util-linux-ng-2.16-squashfs3-detect.patch b/util-linux-ng-2.16-squashfs3-detect.patch deleted file mode 100644 index 94caaab..0000000 --- a/util-linux-ng-2.16-squashfs3-detect.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- - shlibs/blkid/src/superblocks/superblocks.c | 1 - shlibs/blkid/src/superblocks/superblocks.h | 1 - shlibs/blkid/src/superblocks/squashfs.c | 63 +++++++++++++++++++++++++++--------- - 3 files changed, 50 insertions(+), 15 deletions(-) - -Index: util-linux-2.19/shlibs/blkid/src/superblocks/superblocks.c -=================================================================== ---- util-linux-2.19.orig/libblkid/src/superblocks/superblocks.c -+++ util-linux-2.19/libblkid/src/superblocks/superblocks.c -@@ -131,6 +131,7 @@ static const struct blkid_idinfo *idinfo - &oracleasm_idinfo, - &vxfs_idinfo, - &squashfs_idinfo, -+ &squashfs3_idinfo, - &netware_idinfo, - &btrfs_idinfo, - &ubifs_idinfo, -Index: util-linux-2.19/shlibs/blkid/src/superblocks/superblocks.h -=================================================================== ---- util-linux-2.19.orig/libblkid/src/superblocks/superblocks.h -+++ util-linux-2.19/libblkid/src/superblocks/superblocks.h -@@ -54,6 +54,7 @@ extern const struct blkid_idinfo luks_id - extern const struct blkid_idinfo highpoint37x_idinfo; - extern const struct blkid_idinfo highpoint45x_idinfo; - extern const struct blkid_idinfo squashfs_idinfo; -+extern const struct blkid_idinfo squashfs3_idinfo; - extern const struct blkid_idinfo netware_idinfo; - extern const struct blkid_idinfo sysv_idinfo; - extern const struct blkid_idinfo xenix_idinfo; -Index: util-linux-2.19/shlibs/blkid/src/superblocks/squashfs.c -=================================================================== ---- util-linux-2.19.orig/libblkid/src/superblocks/squashfs.c -+++ util-linux-2.19/libblkid/src/superblocks/squashfs.c -@@ -31,20 +31,46 @@ struct sqsh_super_block { - static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag) - { - struct sqsh_super_block *sq; -+ uint16_t major; -+ uint16_t minor; - - sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block); - if (!sq) - return -1; - -- if (strcmp(mag->magic, "sqsh") == 0 || -- strcmp(mag->magic, "qshs") == 0) -- blkid_probe_sprintf_version(pr, "%u.%u", -- sq->s_major, -- sq->s_minor); -- else -- blkid_probe_sprintf_version(pr, "%u.%u", -- swab16(sq->s_major), -- swab16(sq->s_minor)); -+ major = le16_to_cpu(sq->s_major); -+ minor = le16_to_cpu(sq->s_minor); -+ if (major < 4) -+ return -1; -+ -+ blkid_probe_sprintf_version(pr, "%u.%u", major, minor); -+ -+ return 0; -+} -+ -+static int probe_squashfs3(blkid_probe pr, const struct blkid_idmag *mag) -+{ -+ struct sqsh_super_block *sq; -+ uint16_t major; -+ uint16_t minor; -+ -+ sq = blkid_probe_get_sb(pr, mag, struct sqsh_super_block); -+ if (!sq) -+ return -1; -+ -+ if (strcmp(mag->magic, "sqsh") == 0) { -+ major = be16_to_cpu(sq->s_major); -+ minor = be16_to_cpu(sq->s_minor); -+ } else { -+ major = le16_to_cpu(sq->s_major); -+ minor = le16_to_cpu(sq->s_minor); -+ } -+ -+ if (major > 3) -+ return -1; -+ -+ blkid_probe_sprintf_version(pr, "%u.%u", major, minor); -+ - return 0; - } - -@@ -55,14 +81,21 @@ const struct blkid_idinfo squashfs_idinf - .probefunc = probe_squashfs, - .magics = - { -- { .magic = "sqsh", .len = 4 }, -- { .magic = "hsqs", .len = 4 }, /* swap */ -- -- /* LZMA version */ -- { .magic = "qshs", .len = 4 }, -- { .magic = "shsq", .len = 4 }, /* swap */ -+ { .magic = "hsqs", .len = 4 }, - { NULL } - } - }; - -+const struct blkid_idinfo squashfs3_idinfo = -+{ -+ .name = "squashfs3", -+ .usage = BLKID_USAGE_FILESYSTEM, -+ .probefunc = probe_squashfs3, -+ .magics = -+ { -+ { .magic = "sqsh", .len = 4 }, /* big endian */ -+ { .magic = "hsqs", .len = 4 }, /* little endian */ -+ { NULL } -+ } -+}; - diff --git a/util-linux-2.23.1-noenc-suse.diff b/util-linux-noenc-suse.patch similarity index 52% rename from util-linux-2.23.1-noenc-suse.diff rename to util-linux-noenc-suse.patch index b2a1a66..77cc2da 100644 --- a/util-linux-2.23.1-noenc-suse.diff +++ b/util-linux-noenc-suse.patch @@ -1,9 +1,11 @@ ---- util-linux-2.23.1/libmount/src/context_loopdev.c -+++ util-linux-2.23.1/libmount/src/context_loopdev.c 2013-06-05 09:44:37.081939564 +0000 -@@ -213,6 +213,9 @@ int mnt_context_setup_loopdev(struct lib +Index: util-linux/libmount/src/context_loopdev.c +=================================================================== +--- util-linux.orig/libmount/src/context_loopdev.c ++++ util-linux/libmount/src/context_loopdev.c +@@ -212,6 +212,9 @@ int mnt_context_setup_loopdev(struct lib if (rc == 0 && (cxt->user_mountflags & MNT_MS_ENCRYPTION) && mnt_optstr_get_option(optstr, "encryption", &val, &len) == 0) { - DBG(CXT, mnt_debug_h(cxt, "encryption no longer supported")); + DBG(CXT, ul_debugobj(cxt, "encryption no longer supported")); + // XXX: nasty for the lib but there's on better way to give a hint atm + fprintf(stderr, "mount: encryption no longer supported.\n" + " Please use /etc/crypttab instead (man 5 crypttab)\n"); diff --git a/util-linux-prevent-excessive-clock-drift-calculations.patch b/util-linux-prevent-excessive-clock-drift-calculations.patch deleted file mode 100644 index 9b7f359..0000000 --- a/util-linux-prevent-excessive-clock-drift-calculations.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 654e902731ea15a3494a3831b78d2b9f1cd1408d Mon Sep 17 00:00:00 2001 -From: Ruediger Meier -Date: Fri, 16 May 2014 17:01:43 +0200 -Subject: [PATCH] Prevent excessive clock drift calculations - -Squashed commit of the following: - -commit f55b4b45126b657fe02f5f0d3d7fde740e6a6247 -Author: Karel Zak -Date: Tue May 6 12:51:42 2014 +0200 - - hwclock: fix typo - - Reported-by: Stanislav Brabec - Signed-off-by: Karel Zak - -commit db8fc5f37728810bdd5b865ac420c31714e35def -Author: Stanislav Brabec -Date: Mon May 5 20:49:49 2014 +0200 - - hwclock: Check drift value in /etc/adjtime - - Due to bug in older versions of hwclock, /etc/adjtime can contain - excessive drift value (up to many years per day). Prevent it - from applying. - - Signed-off-by: Stanislav Brabec - -commit f196fd1a5f8fff63635fd88b5a0f0bbc96978df2 -Author: Stanislav Brabec -Date: Mon May 5 20:49:29 2014 +0200 - - hwclock: Prevent excessive drift values - - Failure of CMOS battery can cause writing of excessive drift - values (up to many years per day). - - This causes excessive hwclock adjustment next time, which may lead - to overflow in calculate_adjustment() (and hang before 4a44a54b). - - Prevent this situation, check drift for limits and reset drift to zero - instead. - - Steps to reproduce: - - mv /etc/adjtime /etc/adjtime.backup - - rm /etc/adjtime - hwclock --set --date 2001-01-01\ 01:00:00 - - changing of /etc/adjtime. - mv /etc/adjtime /etc/adjtime.saved - hwclock --set --date 2001-01-02\ 01:00:01 - mv /etc/adjtime.saved /etc/adjtime - - echo "======= The /etc/adjtime has a \"correct\" look:" - cat /etc/adjtime - - hwclock --debug --systohc --utc - echo "======= The /etc/adjtime now has deeply failed drift value:" - cat /etc/adjtime - - mv /etc/adjtime /etc/adjtime.saved - hwclock --set --date 2015-01-01\ 01:00:00 - mv /etc/adjtime.saved /etc/adjtime - - hwclock --debug --adjust - echo "======= And the last /etc/adjtime:" - cat /etc/adjtime - - mv /etc/adjtime.backup /etc/adjtime - hwclock --systohc --utc - - Signed-off-by: Stanislav Brabec - -Signed-off-by: Ruediger Meier ---- - sys-utils/hwclock.c | 47 ++++++++++++++++++++++++++++++++++------------- - 1 file changed, 34 insertions(+), 13 deletions(-) - -diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c -index 395b5c3..0abf01f 100644 ---- a/sys-utils/hwclock.c -+++ b/sys-utils/hwclock.c -@@ -91,6 +91,11 @@ struct clock_ops *ur; - - #define FLOOR(arg) ((arg >= 0 ? (int) arg : ((int) arg) - 1)); - -+/* Maximal clock adjustment in seconds per day. -+ (adjtime() glibc call has 2145 seconds limit on i386, so it is good enough for us as well, -+ 43219 is a maximal safe value preventing exact_adjustment overflow.) */ -+#define MAX_DRIFT 2145.0 -+ - const char *adj_file_name = NULL; - - struct adjtime { -@@ -1008,6 +1013,7 @@ adjust_drift_factor(struct adjtime *adjtime_p, - double adj_days, cal_days; - double exp_drift, unc_drift; - double factor_adjust; -+ double drift_factor; - - /* Adjusted time units per hardware time unit */ - atime_per_htime = 1.0 + adjtime_p->drift_factor / sec_per_day; -@@ -1033,16 +1039,28 @@ adjust_drift_factor(struct adjtime *adjtime_p, - /* Amount to add to previous drift factor */ - factor_adjust = unc_drift / cal_days; - -- if (debug) -- printf(_("Clock drifted %.1f seconds in the past " -- "%d seconds in spite of a drift factor of " -- "%f seconds/day.\n" -- "Adjusting drift factor by %f seconds/day\n"), -- unc_drift, -- (int)(nowtime - adjtime_p->last_calib_time), -- adjtime_p->drift_factor, factor_adjust); -- -- adjtime_p->drift_factor += factor_adjust; -+ /* New drift factor */ -+ drift_factor = adjtime_p->drift_factor + factor_adjust; -+ -+ if (abs(drift_factor) > MAX_DRIFT) { -+ if (debug) -+ printf(_("Clock drift factor was calculated as " -+ "%f seconds/day.\n" -+ "It is far too much. Resetting to zero.\n"), -+ drift_factor); -+ drift_factor = 0; -+ } else { -+ if (debug) -+ printf(_("Clock drifted %.1f seconds in the past " -+ "%d seconds in spite of a drift factor of " -+ "%f seconds/day.\n" -+ "Adjusting drift factor by %f seconds/day\n"), -+ unc_drift, -+ (int)(nowtime - adjtime_p->last_calib_time), -+ adjtime_p->drift_factor, factor_adjust); -+ } -+ -+ adjtime_p->drift_factor = drift_factor; - } - adjtime_p->last_calib_time = nowtime; - -@@ -1190,9 +1208,12 @@ do_adjustment(struct adjtime *adjtime_p, - adjtime_p->dirty = TRUE; - } else if (adjtime_p->last_adj_time == 0) { - if (debug) -- printf(_ -- ("Not setting clock because last adjustment time is zero, " -- "so history is bad.")); -+ printf(_("Not setting clock because last adjustment time is zero, " -+ "so history is bad.\n")); -+ } else if (abs(adjtime_p->drift_factor) > MAX_DRIFT) { -+ if (debug) -+ printf(_("Not setting clock because drift factor %f is far too high.\n"), -+ adjtime_p->drift_factor); - } else { - int adjustment; - /* Number of seconds we must insert in the Hardware Clock */ --- -1.8.4.5 - diff --git a/util-linux-rpmlintrc b/util-linux-rpmlintrc index 9f6d408..676746b 100644 --- a/util-linux-rpmlintrc +++ b/util-linux-rpmlintrc @@ -10,4 +10,5 @@ addFilter(".*W:.*files-duplicate.*/pam/su.*/pam.d/su-l.*") addFilter(".*W:.*permissions-symlink.*/bin/su.*") addFilter(".*W:.*permissions-symlink.*/bin/umount.*") addFilter(".*W:.*permissions-symlink.*/bin/mount.*") - +# UGLY HACK: rpmlint falsely declares problems with files-attr-not-set +addFilter("W: files-attr-not-set") diff --git a/util-linux-setarch-uname26.patch b/util-linux-setarch-uname26.patch deleted file mode 100644 index eab770f..0000000 --- a/util-linux-setarch-uname26.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: util-linux-2.24/sys-utils/setarch.c -=================================================================== ---- util-linux-2.24.orig/sys-utils/setarch.c -+++ util-linux-2.24/sys-utils/setarch.c -@@ -146,6 +146,7 @@ set_arch(const char *pers, unsigned long - int perval; - const char *target_arch, *result_arch; - } transitions[] = { -+ {UNAME26, "uname26", NULL}, - {PER_LINUX32, "linux32", NULL}, - {PER_LINUX, "linux64", NULL}, - #if defined(__powerpc__) || defined(__powerpc64__) -Index: util-linux-2.24/sys-utils/Makemodule.am -=================================================================== ---- util-linux-2.24.orig/sys-utils/Makemodule.am -+++ util-linux-2.24/sys-utils/Makemodule.am -@@ -89,7 +89,7 @@ usrbin_exec_PROGRAMS += setarch - dist_man_MANS += sys-utils/setarch.8 - setarch_SOURCES = sys-utils/setarch.c - --SETARCH_LINKS = linux32 linux64 -+SETARCH_LINKS = uname26 linux32 linux64 - - if ARCH_S390 - SETARCH_LINKS += s390 s390x diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes new file mode 100644 index 0000000..2eaed7c --- /dev/null +++ b/util-linux-systemd.changes @@ -0,0 +1,3997 @@ +------------------------------------------------------------------- +Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz + +- Update to version 2.25 + (using work of Ruediger Meier ): + * based on the git master branch of util-linux + * many fixes (including bnc#869355, bnc#871951 and + bnc#871698#c49) + * new Python binding sub-package for libmount: python-libmount + * new library: libsmartcols + * new commands: lslogins, setpriv + * add fstrim systemd timer + * better systemd integration + * DROPPED command: + * cytune: Upstream decided to remove tool untested for years + that supports this old hardware. +- Dropped patches included in the upstream: + (*git) Included with no changes + (+git) Included with improvements + (!git) Included with differences + * support-other-tty-lines-not-vconsole.patch (*b9c7390) + * agetty-fooled-on-serial-line-due-plymouth.patch, + * sulogin-fooled-on-tty-line-due-plymouth.patch (*bb280f7) + * agetty-on-s390-on-dev-3270-tty1-line.patch (*f2bcda5) + * sulogin-does-not-find-any-console.patch (*624b204) + * util-linux-setarch-uname26.patch (*f6eb160) + * util-linux-ng-2.16-squashfs3-detect.patch (*11402f5) + * util-linux-lscpu-improve-hypervisor-detection.patch + (!b774473, b32488c, 5bd31c6, 0f0c558, 96ce475) + WARNING, INCOMPATIBLE CHANGE: "lscpu -p" no more reports + hypervisor, as it breaks standard behavior. Use standard output + instead! (FATE#310255) + * blkid-stop-scanning-on-I-O-error.patch (+296d96e) + * blkid-convert-superblocks-to-new-calling-convention.patch + (+37f4060) + * util-linux-libblkid-ext-probe.patch (*a1ca32f) + * util-linux-hwclock-drift-check.patch (*f196fd1) + * util-linux-hwclock-adjtime-check.patch (*db8fc5f) +- Dropped obsolete patch: + * util-linux-2.23.1-eject-fpie.patch (eject is no more SUID) + * util-linux-2.24-fdisk_remove_bogus_warnings.patch + (upstream fixed it in a different way) + * util-linux-HACK-boot.localfs.diff + (MOUNT_PRINT_SOURCE is no more referenced) +- Ported and renamed: + * util-linux-2.23.1-noenc-suse.diff + -> util-linux-noenc-suse.patch +- Split spec file to three stages: + * util-linux.spec: Everything that do not need python or systemd. + * util-linux-systemd.spec: Stuff that needs systemd: + util-linux-systemd and uuidd + NOTE: Not building systemd-less variants of utilities. + * python-libmount.spec: Just python-libmount +- Move bash-completion files to correct packages. +- Add patch util-linux-bash-completion-blockdev.patch. +- Add hacks to prevent damaging of spec files by format_spec_file + (bnc#891152, also edited util-linux-rpmlintrc). + +------------------------------------------------------------------- +Sat Jul 26 11:44:57 UTC 2014 - dimstar@opensuse.org + +- Really fix devel-static requires (libblkid-devel-static). + +------------------------------------------------------------------- +Sat Jul 26 09:39:30 UTC 2014 - coolo@suse.com + +- fix requires of devel-static packages + +------------------------------------------------------------------- +Thu Jul 24 18:45:53 CEST 2014 - dsterba@suse.cz + +- enable build of libmount-devel-static, libuuid-devel-static and + libblkid-devel-static + +------------------------------------------------------------------- +Tue May 27 21:17:40 UTC 2014 - sweet_f_a@gmx.de + +- use nologin from upstream (was added in 2.24) +- remove unknown configure options +- remove unused and outdated suse READMEs +- require bc for checks + +------------------------------------------------------------------- +Fri May 16 15:10:53 UTC 2014 - sweet_f_a@gmx.de + +- Prevent excessive clock drift calculations (bnc#871698, + util-linux-prevent-excessive-clock-drift-calculations.patch), + committed by sbrabec@suse.cz + +------------------------------------------------------------------- +Thu May 8 08:15:04 UTC 2014 - werner@suse.de + +- Modify patch support-other-tty-lines-not-vconsole.patch to + make it work on virtual console +- Modify patch agetty-on-s390-on-dev-3270-tty1-line.patch + to add the missed 3270 support upstream + +------------------------------------------------------------------- +Wed May 7 14:12:32 UTC 2014 - werner@suse.de + +- Add patch support-other-tty-lines-not-vconsole.patch + to be able to support console lines like xvc and hvc + +------------------------------------------------------------------- +Thu Apr 24 11:33:36 UTC 2014 - sweet_f_a@gmx.de + +- Update to util-linux-2.24.2: + addpart: + * minor man page improvements + blockdev: + * Some minor corrections to the manual + build-sys: + * don't connect _DEPENDENCIES and _LIBADD + * fix .h.in usage in libblkid and libmount + * libmount/python/__init__.py is always a dist file + chcpu: + * cleanup return codes + * cleanup stdout/stderr usage + delpart: + * minor man page improvements + dmesg: + * -w output not line-buffered + * don't report EPIPE + docs: + * update AUTHORS file + fallocate: + * Clarify that space can also be deallocated + fdformat: + * Some minor change to the manual + fdisk: + * don't colorize "foo " prefixes + flock: + * use nfs4 fallback on EBADF too + fsck: + * Some typographical corrections to the manual + fsck.minix: + * A few typographical corrections to the manual + fstrim: + * add hint to man page + getopt: + * getopt.1 The usual doc dir is /usr/share/doc, not .../docs + hwclock: + * fix possible hang and other set_hardware_clock_exact() issues + include/closestream: + * don't wipe errno on EPIPE + ipcs: + * cleanup jumplabel stlyes + * fix ipc_msg_get_info fallback case + * fix ipc_sem_get_info fallback case + * fix ipc_shm_get_info fallback case + * fix memleak in ipc_*_get_info functions + isosize: + * A few typographical changes to the manual + last: + * fix minor typos in the man page + lib/sysfs: + * make dirent d_type usage more robust + libblkid: + * add extra checks to XFS prober + libfdisk: + * fix logical partition reorder command + * make qsort_r() optional + * properly implement read-only mode + libmount: + * FS id and parent ID could be zero + * accept (deleted) path suffix in mountinfo file + * initialize *root to NULL in mnt_table_get_root_fs + login: + * fix minor typos in the man page + losetup: + * wait for udev + lscpu: + * cleanup, use _PATH_SYS_CPU/NODE + * don't abort if cache size is unknown + * don't assume filesystem supports d_type when searching for NUMA nodes + * read_hypervisor_dmi only fallback to memory scan on x86/x86_64 + mkfs: + * Some typographical changes to the manual + mkfs.bfs: + * One typographical correction to the manual + mkfs.cramfs: + * Some typographical corrections to the manual + mkfs.minix: + * Some typographical changes in the manual + mkswap: + * Some minor typographical corrections to the manual + more: + * improve formatting and wording of man page and help text + mount: + * apply "nofail" to MNT_ERR_NOSOURCE libmount error + * fix --all and nofail return code + * mount.8 Some typographical and prefix corrections to the manual + * remove obsolete and confusing statement from mount.8 + * update mount.8 about barrier mount options defaults + nologin: + * minor man page improvements + nsenter: + * fix set{gid,uid} order,drop supplementary groups + partx: + * Improve the typesetting of the manual + * make dirent d_type usage more robust + po: + * merge changes + * update cs.po (from translationproject.org) + * update da.po (from translationproject.org) + * update de.po (from translationproject.org) + raw: + * Improve the typesetting of the manual + renice: + * correct max priority in renice man page + runuser: + * fix minor typos in the man page + script: + * Also flush writes to timing file. + * time from end of read() call partially fixes #58 + scriptreplay: + * no need to skip first time value or last bytes fixes #58 + setarch: + * Fix ppc64le architectures + setpriv: + * Fix --apparmor-profile + su: + * don't use kill(0, ...) when propagate signal + * fix minor typos in the man page + sulogin: + * minor man page improvements + swaplabel: + * Improve the typesetting of the manual + * wrong version number in check + switch_root: + * make dirent d_type usage more robust + * verify initramfs by f_type, not devno + tests: + * add fdisk 'f' command MBR test + * add lscpu dump for ppc cpu with no cache size + * clean up backport + * cleanup, remove unused lscpu output + * update Py parse mountinfo test + * update libmount tabdiff tests + * use old output format + umount: + * fix typo in usage + * more robust success message for --all + unshare: + * include libmount.h to provide missing MS_* defines + utmpdump: + * minor man page improvements + vipw: + * minor man page improvements +- remove tty3270-on-serial-line-of-s390.patch (was already upstream + since 2.24.1) +- remove barrier_documentation.patch (applied upstream) +- rebase blkid-convert-superblocks-to-new-calling-convention.patch + +------------------------------------------------------------------- +Thu Apr 17 22:43:31 CEST 2014 - sbrabec@suse.cz + +- Enable socket activation needed by systemd service (bnc#872807). + +------------------------------------------------------------------- +Fri Apr 11 16:45:03 CEST 2014 - sbrabec@suse.cz + +- libblkid: Drop the broken ext2/ext3/ext4 discrimination logic + (util-linux-libblkid-ext-probe.patch, bnc#864703). + +------------------------------------------------------------------- +Fri Apr 11 16:27:11 CEST 2014 - hare@suse.de + +- Abort blkid probing on I/O errors (bnc#859062, + blkid-stop-scanning-on-I-O-error.patch, + blkid-convert-superblocks-to-new-calling-convention.patch, + http://www.spinics.net/lists/util-linux-ng/msg08976.html) + +------------------------------------------------------------------- +Tue Apr 1 18:49:26 UTC 2014 - sweet_f_a@gmx.de + +- remove unnecessarily added patches from SLE11: + * util-linux-update-default-commit-interval.patch, openSUSE has + never changed the default and neither will SLE12 + * sfdisk-warn-about-2TB-limit.patch, fixed by upstream years ago + * umount-avoid-readlink.patch, this patch only affects unused + code and the used code does not have this bug +- edit util-linux-lscpu-improve-hypervisor-detection.patch to not + change the default behaviour of "lscpu -p" as documented in it's + man page. Now this patch only affects the summary output. + +------------------------------------------------------------------- +Mon Mar 17 22:36:58 CET 2014 - sbrabec@suse.cz + +- Merge fixes and features from SLE11 (bnc#831868): + * Detect squashfs version <= 3 as squashfs3 and version >= 4 as + squashfs. (mszeredi@suse.cz, + util-linux-ng-2.16-squashfs3-detect.patch, bnc#666893) + * add sfdisk-warn-about-2TB-limit.patch (puzel@novell.com, + bnc#495657) + * Document barrier option in mount.8 (jack@suse.cz, + hvogel@suse.de, + util-linux-ng-2.19.1-barrier_documentation.patch, bnc#489740) + * lscpu: improve hypervisor detection (puzel@novell.com, + fate#310255) + - util-linux-lscpu-improve-hypervisor-detection.patch + * umount: avoid calling readlink on mountpoints if not necessary + - add: umount-avoid-readlink.patch (puzel@suse.com, bnc#794529) + * fix file conflict between util-linux and s390-32 + (puzel@suse.com, bnc#805684) + * util-linux-update-default-commit-interval.patch: + mount(8): update default commit interval (puzel@suse.com, + bnc#809480) + * Obsolete no more packaged uuid-runtime. +- Add uname26 (util-linux-setarch-uname26.patch, FATE#313476). + +------------------------------------------------------------------- +Thu Mar 6 09:43:34 UTC 2014 - werner@suse.de + +- Modify the patches + agetty-fooled-on-serial-line-due-plymouth.patch + sulogin-fooled-on-tty-line-due-plymouth.patch + to be able to disable plymouth if not already terminated due to + a hanging network service (bnc#866860) + +------------------------------------------------------------------- +Sun Feb 9 21:20:31 UTC 2014 - andreas.stieger@gmx.de + +- util-linux 2.24.1 +- agetty: + * support the special terminal on first serial line on a S/390 +- blkdiscard: + * BLKSSZGET fills in an int, not a uint64 +- blkid: + * escape quotes in the output + * simple typo +- blockdev: + * don't use HDIO_GETGEO +- build-sys: + * add --with-smack to config-gen.d + * fstrim depends on libmount +- chsh, chfn: + * add info about non-local support to the man pages +- dmesg: + * fix --raw zero timestamp for kmsg +- docs: + * add patching process to howto-contribute.txt + * update AUTHORS file + * update links to http //git.kernel.org/ web repository views + -fdisk: + * don't care about partition type + * fix printf stuff + * fix usage(), -l [] +- flock: + * Change the 'exit status' man page section to make more sense +- fsck: + * add ext4 to list of filesystems with progress bars in fsck man page +- fstrim: + * add --all to discard all filesystem + * cleanup usage() +- lib/path: + * add path_strdup() +- libblkid: + * (nilfs2) check also backup superblock + * detect alone PMBR + * fix memory leak in blkid_parse_tag_string() + * fix swap-area version +- libfdisk: + * (dos) be more verbose when change bootable flag + * (dos) fix free part counter + * (dos) warn on type 0 + * (gpt) add /home GUID + * (gpt) improve and cleanup recovery code + * (gpt) recover from corrupted primary/backup PT + * (sgi) generate partname according to partition position + * (sun) fix end sectors with +1 error +- libmount: + * add efivarfs to the list of pseudo filesystems + * add mnt_tag_is_valid() + * cleanup fix_optstr() regards to selinux and smack + * fix typo in smack path + * remove smackfs* option when SMACK not enabled +- lsblk: + * fix -D segfault +- lscpu: + * sort NUMA nodes to keep output human readable + * support discontinuous NUMA nodes + * support non sequentially numbering of CPUs +- man: + * Syntax and spelling fixes +- mkfs.minix: + * fix fscanf() format string [coverity scan] +- mkswap: + * fix compiler warning [-Wunused-variable] + * remove cruft from the man page +- mount: + * add note about "noauto" to --all description + * correct mount man page default iso9660 permission + * fix man mount page type + * improve -s man mage info + * make NAME=value tags usable for non-root + * mount.8 fix grammar + * update man page ext3/4 mount options +- partx: + * fix --update ranges and out of order tables +- po: + * merge changes + * update da.po (from translationproject.org) + * update de.po (from translationproject.org) + * update pt_BR.po (from translationproject.org) + * update zh_CN.po (from translationproject.org) +- pylibmount: + * correctly import from pylibmount.so + * import directly from pylibmount in tests + * remove unncessary subdirectory +- script: + * don't call TIOCGWINSZ in signal handler + * restore errno in signal handler + * use poll() rather then O_NONBLOCK +- setpriv: + * simplify usage() +- setterm: + * fix -dump man page info +- sulogin: + * use dirent->d_type when scans /dev +- taskset: + * fix PERMISSIONS section of taskset man page +- tests: + * update blkid swap tests + * update build-sys tests + * update lscpu tests +- textual: + * small inprovements to usage and man page of fstrim +- umount: + * fix umount by tag for non-roots +- unshare: + * add more hints about mount namespaces to the man page +- wipefs: + * call BLKRRPART when erase partition table +- removed patches: + * blkdiscard-BLKSSZGET-fills-in-an-int.patch, applied upstream +- modified patches: + * tty3270-on-serial-line-of-s390.patch, one hunk applied + upstream + +------------------------------------------------------------------ +Fri Feb 7 15:59:20 UTC 2014 - werner@suse.de + +- Add patch sulogin-does-not-find-any-console.patch to enable sulogin + to find suitable console device even if first is not usable (bnc#862078) + +------------------------------------------------------------------- +Thu Feb 6 10:03:30 UTC 2014 - werner@suse.de + +- Avoid that hanging plymouth locks terminal lines that is + add patch sulogin-fooled-on-tty-line-due-plymouth.patch and + modify patch agetty-fooled-on-serial-line-due-plymouth.patch + to remove any lock which had been left over. + +------------------------------------------------------------------- +Tue Feb 4 10:24:02 UTC 2014 - werner@suse.de + +- Modify patch agetty-on-s390-on-dev--3270-tty1-line.patch and + patch tty3270-on-serial-line-of-s390.patch to handle 3270 + terminals +- Really do not verify /usr/bin/eject + +------------------------------------------------------------------- +Mon Feb 3 16:16:36 UTC 2014 - werner@suse.de + +- Add patch agetty-on-s390-on-dev--3270-tty1-line.patch + to let agetty detect /dev/3270/tty1 as device not as baud rate + +------------------------------------------------------------------- +Tue Jan 28 09:37:57 UTC 2014 - speilicke@suse.com + +- Don't verify /usr/bin/eject, it lost the SUID bit and was dropped + from /etc/permissions (bnc#824406) + +------------------------------------------------------------------- +Thu Jan 23 12:40:06 UTC 2014 - werner@suse.de + +- Change patch agetty-fooled-on-serial-line-due-plymouth.patch + to sleep instead of sending breaks to terminal (bnc#774126). + +------------------------------------------------------------------- +Mon Jan 13 10:45:54 CET 2014 - fcrozat@suse.com + +- Ensure localstatedir value used by configure is /run (changed to that + value upstream since 2012). + +------------------------------------------------------------------- +Fri Jan 10 13:08:45 UTC 2014 - werner@suse.de + +- Add patch + agetty-fooled-on-serial-line-due-plymouth.patch + even with TTYReset=no it seems with systemd or plymouth the termios + flags become changed from under the first agetty on a serial system + console as the flags are locked (bnc#774126). + +------------------------------------------------------------------- +Tue Dec 10 16:10:27 UTC 2013 - sweet_f_a@gmx.de + +- Update to util-linux-2.24 + + Release highlights (2.24) + fdisk(8): + * the code has been completely refactored and moved to libfdisk + (the library does not have a stable API yet) + * user interface has been unified for all label types and it + supports colors + * GPT disk UUID, partition UUID and partition name modification + is supported now + pylibmount: + * this new library provides PYTHON BINDINGS for libmount; + use --with-python[=2|3] to enable the bindings + last(1) and lastb(1): + * the NEW IMPLEMENTATION has been merged from sysvinit to + util-linux and extended; now it supports command line options + --present, --since, and --time-format + * use --enable-deprecated-last to enable the old util-linux + last(1) implementation + swapon(8): + * the option --discard= and fstab mount option discard= allow + to explicitly specify 'pages' or 'once' discard policy. If no + policy is selected, the default behavior is to enable both. + See swapon.8 man page for more details. + libblkid and blkid(8): + * supports LOGUUID= for external logs (e.g. extN and XFS) + * generates a pseudo PARTUUID= for MBR partitions (based on MBR + Id, Linux kernel supports the same concept for root= command + line option) + agetty(8): + * supportes new issue file \S escape code to read information + from /etc/os-release + * the option -L allows to completely control CLOCAL flag + dmesg(1): + * supports new command line option --time-format to specify + time format + * supports new iso-8601 time format + hexdump(1): + * supports long options now + wall(1): + * the command is compatible with sysvinit implementation now + logger(1): + * supports new command line option --prio-prefix when logging + stdin + lscpu(1): + * allows to detect more hypervisor types and provides info + about Max and Min CPU Mhz + unshare(8): + * supports new command line options --fork and --mount-proc for + pid namespaces + wipefs(8): + * now wipes superblocks with incorrect checksums too + * supports new command line option --backup to backup erased + data to $HOME/wipefs--.bak + nologin(8): + * this command has been merged into util-linux, the command + politely refuses a login. +- Removed following patches now upstream + * eject-scsi-check-host_status-and-driver_status.patch + * more-fix-buffer-overflow.patch + * more-check-for-buffer-size-when-write-multibyte-char.patch + * more-guarantee-space-for-multibyte.patch +- Removed following patch because now pkg-config does that + * fdisk-tinfo.patch +- Refreshed following patches with updating version string + * util-linux-2.23.1-fdisk_remove_bogus_warnings.patch +- Added enable_last condition in case we don't want to use the last + binary from sysvinit-tools in future +- Upstream moved getopt examples from datadir to docdir but we keep + the old location because we would need to fix the manpage first. + +------------------------------------------------------------------- +Fri Nov 29 13:46:21 UTC 2013 - werner@suse.de + +- Add patch + tty3270-on-serial-line-of-s390.patch + to better support the first and second serial line on s390/x + +------------------------------------------------------------------- +Sun Nov 3 12:53:34 UTC 2013 - schwab@linux-m68k.org + +- blkdiscard-BLKSSZGET-fills-in-an-int.patch: Fix type mismatch in + blkdiscard + +------------------------------------------------------------------- +Fri Oct 25 18:52:01 CEST 2013 - sbrabec@suse.cz + +- Drop SUID flag for eject (bnc#824406). + +------------------------------------------------------------------- +Wed Oct 9 10:00:55 UTC 2013 - schwab@suse.de + +- No *fdisk on m68k + +------------------------------------------------------------------- +Wed Oct 2 18:55:22 CEST 2013 - sbrabec@suse.cz + +- Safely migrate su config files from coreutils to util-linux + (bnc#814626#c18). + +------------------------------------------------------------------- +Fri Sep 27 21:58:03 UTC 2013 - mgorse@suse.com + +- Add more-check-for-buffer-size-when-write-multibyte-char.patch and + more-guarantee-space-for-multibyte.patch -- check for buffer space with + multi-byte chars (BNC#829720). + +------------------------------------------------------------------- +Fri Sep 27 16:58:40 UTC 2013 - mgorse@suse.com + +- Add more-fix-buffer-overflow.patch (bnc#829720). + +------------------------------------------------------------------- +Fri Sep 13 07:06:19 UTC 2013 - werner@suse.de + +- Avoid build require gpg-offline twice + +------------------------------------------------------------------- +Wed Sep 11 20:54:24 CEST 2013 - sbrabec@suse.cz + +- Update to version 2.23.2: + nsenter(1): + * this NEW COMMAND provides command line interface to setns() + Linux syscall and allows to run program with namespaces of + other processes + unshare(1): + * supports new PID and USER namespaces + fdisk(8): + * provides experimental support for GUID Partition Table (GPT), + the implementation is still not complete and some (unimportant) + features are missing. + * ~50% of fdisk code has been refactored, this task is going to + be complete in the next release. The goal is to have libfdisk + shared between all fdisks. + partx(8): + * supports new "update" command (implemented by + BLKPG_RESIZE_PARTITION ioctl) + mount(8): + * supports new userspace mount option x-mount.mkdir[=] to + create mountpoints on demand + * the support for propagation flags has been improved, now the + flags could be specified in /etc/fstab and used together with + regular mount options. It's also possible to specify more + propagation flags together. This EXPERIMENTAL feature is + implemented by additional mount(2) syscalls, because Linux does + not allow to use propagation flags with another options or more + flags together. + umount(8): + * supports new command line option --recursive to recursively + unmount all sub-mounts for the specified mountpoint * supports + new command line option --all-targets to unmount all + mountpoints in the current namespace for the specified + filesystem * the options --recursive and --all-targets could be + used together + dmesg(1): + * supports new command line options --color, --human and + --nopager, the --human option enables relative times, colors and + pager support. + su(1): + * supports new command line options --group and --supp-group to + specify primary and supplementary groups + chfn(1) and chsh(1): + * the commands could be linked with libuser to support non-local + accounts modification (e.g. LDAP, etc). + kill(1): + * the command has been improved to be compatible with procps + version, the procps version is deprecated now, the util-linux + version is enabled by default. + blkdiscard(8): + * this NEW COMMAND discard sectors on a device (for example on + SSD disks) + sulogin(8): + * provides multi-console feature from SysVinit + findmnt(8): + * provides new columns FREQ, PASSNO, ID, OPT-FIELDS, PROPAGATION + lslocks(8): + * provides new column BLOCKER and detects blocked locks + lsblk(8): + * supports new command line option --scsi and new columns HCTL, + TRANsport VENDOR and REVision + swapon(8) and losetup(8): + * the commands prints basic overview by default if no option + specified + column(1): + * supports new command line option --output-separator to specify + table output delimiter + rename(1): + * supports new command line option --symlink to rename symlink + target + hwclock(8): + * supports new command line option --compare to periodically + compare the Hardware Clock to the System Time (based on + adjtimex -c) + ipcs(1): + * supports new command line options --bytes and --human + wipefs(1): + * supports new command line option --force to force erase on used + devices +- Removed upstreamed patches (mkfs.bfs_cleanup_64bit.patch-Patch, + mkfs.bfs_cleanup_endian.patch) + +------------------------------------------------------------------- +Mon Jul 1 13:43:23 UTC 2013 - mail@bernhard-voelker.de + +- Correct condition for Conflicts of sysvinit-tools. + +------------------------------------------------------------------- +Mon Jul 1 07:08:46 UTC 2013 - werner@suse.de + +- Correct version in source URL path. + +------------------------------------------------------------------- +Fri Jun 28 17:42:14 CEST 2013 - sbrabec@suse.cz + +- Fix Provides and Obsoletes of eject. +- Conflict with old coreutils and sysvinit-tools with conflicting + files to guarantee seamless upgrade. +- Remove Provides and Obsoletes of packages that do not exist since + SuSE Linux 8. +- Include upstreamed patch from SUSE eject package: + Check eject host_status and driver_status when using SG_IO + (eject-scsi-check-host_status-and-driver_status.patch, + bnc#358033). + +------------------------------------------------------------------- +Wed Jun 19 10:58:17 UTC 2013 - coolo@suse.com + +- rely on systemd-rpm-macros instead of the full thing + +------------------------------------------------------------------- +Wed Jun 12 21:02:28 UTC 2013 - mail@bernhard-voelker.de + +- util-linux.spec: remove previously added "moving-su-trickery" again + as a su-less coreutils packet is in Base:Build and Factory now. + +------------------------------------------------------------------- +Fri Jun 7 00:13:25 UTC 2013 - mail@bernhard-voelker.de + +- util-linux.spec: work around su(1) PAM problems based on su(1) + being provided by both the coreutils and the util-linux package. + Fix macro typo in %post and %verifyscript sections related to su(1): + s/sysvinit_tools/enable_su/ + +------------------------------------------------------------------- +Thu Jun 6 08:27:43 UTC 2013 - werner@suse.de + +- Add make-sure-sbin-resp-usr-sbin-are-in-PATH.diff, that is include + the old "let `su' handle /sbin and /usr/sbin in path" +- Provide the new eject utility to avoid file conflict with old + eject package + +------------------------------------------------------------------- +Wed Jun 5 12:30:45 UTC 2013 - werner@suse.de + +- Update to util-linux-2.23.1 + + Release highlights (2.22) + su(1): + * has been merged from coreutils into util-linux + * utils-linux version uses /etc/pam.d/su-l PAM config file for --login + (e.g. "su -") session. + sulogin(8): + * has been merged from sysvinit into util-linux + utmpdump(1): + * has been merged from sysvinit into util-linux + eject(1): + * has been merged from inactive upstream from sf.net and Fedora into util-linux + * supports new options --manualeject, --force and --no-partitions-unmount + lslocks(1) + * this NEW COMMAND prints local system locks and it's replacement to very + long time unmaintained lslk(1) + wdctl(8): + * this NEW COMMAND shows hardware watchdog status + libuuid: + * does NOT EXECUTE uuidd on demand, the daemon has to be started by + init scripts / systemd + uuidd: + * supports socket activation (for systemd) + * supports new options -no-fork, --no-pid and --socket-activation + + Release highlights (2.23) + blkdiscard(8): + * this NEW COMMAND discard sectors on a device (for example on SSD disks) + sulogin(8): + * provides multi-console feature from SysVinit +- Removed following patches now upstream + * 0001-Test-for-secure_getenv-too.patch + * 0001-include-bitops.h-Use-the-operating-system-byteswappi.patch + * add-canonicalize_path_restricted.patch + * fdiskbsdlabel.patch + * libmount-add-MNT_ERR_LOOPDEV.patch + * libmount-add-special-MNT_ERR-codes.patch + * libmount-don-t-use-nosuid-noexec-nodev-for-cifs-user.patch + * login-close-tty-before-vhangup.patch + * mount-new-add-loopdev-specific-error-message.patch + * mount-new-allow-sloppy-for-non-root.patch + * mount-new-improve-error-messages.patch + * mount-new-use-MNT_ERR-for-error-messages.patch + * mount-sanitize-paths-from-non-root-users.patch + * util-linux-2.21.2-noenc.diff + * umount-sanitize-paths-from-non-root-users.patch +- Removed following patch which otherwise cause to break build + * util-linux-2.20-libmount-deps.patch +- Refreshed following patches with updating version string + * util-linux-2.23.1-fdisk_remove_bogus_warnings.patch + * util-linux-2.23.1-noenc-suse.diff +- Add util-linux-2.23.1-eject-fpie.patch to compile and link eject + with PIE + +------------------------------------------------------------------- +Wed May 29 11:45:04 UTC 2013 - ihno@suse.com + +- fixing mkfs.bfs to make it 64bit and endian clean. + adding the patches mkfs.bfs_cleanup_64bit.patch and + mkfs.bfs_cleanup_endian.patch + +------------------------------------------------------------------- +Sun Mar 17 20:39:47 UTC 2013 - jengelh@inai.de + +- Split "which", "time" and "adjtimex" off util-linux + +------------------------------------------------------------------- +Sat Feb 16 17:48:29 UTC 2013 - schwab@suse.de + +- fdiskbsdlabel.patch: + Fix fdisk compilation on aarch64 + +------------------------------------------------------------------- +Tue Feb 5 14:32:49 UTC 2013 - crrodriguez@opensuse.org + +- 0001-Test-for-secure_getenv-too.patch: + Current glibc in 12.3/factory no longer exports internal + function __secure_getenv() but has secure_getenv() instead. + +------------------------------------------------------------------- +Mon Jan 7 13:26:15 UTC 2013 - puzel@suse.com + +- add-canonicalize_path_restricted.patch, + mount-sanitize-paths-from-non-root-users.patch, + umount-sanitize-paths-from-non-root-users.patch: + prevent leaking information about existence of folders + (bnc#797002, CVE-2013-0157) + +------------------------------------------------------------------- +Fri Dec 28 04:30:58 UTC 2012 - crrodriguez@opensuse.org + +- 0001-include-bitops.h-Use-the-operating-system-byteswappi.patch + Use OS byteswapping macros, this patch is functionally identical + to the version submitted upstream with the exception it excludes + code that target non-linux systems. + +------------------------------------------------------------------- +Wed Sep 19 19:41:10 UTC 2012 - jslaby@suse.com + +- login: close tty before vhangup (bnc#778842) + login-close-tty-before-vhangup.patch + +------------------------------------------------------------------- +Fri Jun 22 09:37:20 CEST 2012 - kukuk@suse.de + +- Remove pam_lastlog from login.pamd, login is doing it itself. + [bnc#768067] + +------------------------------------------------------------------- +Wed Jun 20 09:22:50 UTC 2012 - lnussel@suse.de + +- add a hack for boot.localfs to determine the devices to wait for + +------------------------------------------------------------------- +Fri Jun 15 12:57:06 UTC 2012 - puzel@suse.com + +- improve error messages from new mount (bnc#767208) + - backport patches from upstream git: + - mount-new-add-loopdev-specific-error-message.patch + - mount-new-use-MNT_ERR-for-error-messages.patch + - libmount-add-special-MNT_ERR-codes.patch + - mount-new-improve-error-messages.patch + - libmount-add-MNT_ERR_LOOPDEV.patch + +------------------------------------------------------------------- +Fri Jun 15 10:07:26 UTC 2012 - lnussel@suse.de + +- remove encryption options completely as upstream will do that as + well in the next release (bnc#748879). + +------------------------------------------------------------------- +Thu Jun 14 13:04:40 UTC 2012 - puzel@suse.com + +- fix automount with quota (rh#825836) + - mount-new-allow-sloppy-for-non-root.patch +- fix wrong mount options for CIFS mounts (bnc#766157) + - libmount-don-t-use-nosuid-noexec-nodev-for-cifs-user.patch + +------------------------------------------------------------------- +Thu May 31 10:04:23 UTC 2012 - sweet_f_a@gmx.de + +- require binutils-devel because "which" wants to find libiberty.a +- remove which-lib64.patch because it's broken and couldn't find + libiberty.a whithin /usr/lib64 +- which doesn't need autoreconf anymore + +------------------------------------------------------------------- +Tue May 29 09:28:55 UTC 2012 - puzel@suse.com + +- switch to new libmount-based mount(8) + +------------------------------------------------------------------- +Fri May 25 12:12:09 UTC 2012 - puzel@suse.com + +- update to util-linux-2.21.2 + - bugfix release +- drop sfdisk-fix-calculation-due-to-type-mismatch.patch + (fixed upstream) + +------------------------------------------------------------------- +Fri May 25 12:03:07 UTC 2012 - puzel@suse.com + +- build with RPM_OPT_FLAGS again (removed by mistake) + +------------------------------------------------------------------- +Thu Apr 12 09:09:05 UTC 2012 - puzel@suse.com + +- fix miscalculation in sfdisk on ix86 (bnc#754789) + - add sfdisk-fix-calculation-due-to-type-mismatch.patch + +------------------------------------------------------------------- +Sat Mar 31 11:09:38 UTC 2012 - puzel@suse.com + +- update to util-linux-2.21.1 + - bugfix release + +------------------------------------------------------------------- +Fri Mar 16 09:56:21 UTC 2012 - fcrozat@suse.com + +- Fix Obsoletes / Provides for login. + +------------------------------------------------------------------- +Tue Mar 13 16:38:34 CET 2012 - kukuk@suse.de + +- Enable /bin/login and obsolete old fork now merged back + (not moved to /usr/bin until all problems are solved to + avoid that root is not able to login). + +------------------------------------------------------------------- +Tue Mar 6 21:18:56 UTC 2012 - rschweikert@suse.com + +- keep binaries in /usr tree (UsrMerge project) + +------------------------------------------------------------------- +Tue Feb 21 13:46:25 UTC 2012 - puzel@suse.com + +- update to util-linux-2.21 + chcpu(8): + - new command + prlimit(1): + - new command + losetup(8): + - the command has been rewritten, features: + * supports 64bit ioctls only + * losetup -a does not require root permissions + * uses new /dev/loop-control kernel API + * supports new command line option --partscan to enable + kernel partition table parser + agetty(8): + - supports new command line options --nohints to disable hints + about Num, Caps and Scroll Locks + - supports new command line option --remote to add a hostname + to the login(1) command line + dmesg(1): + - supports new command line options --file to read the log from + a file rather than from kernel buffer + fallocate(8): + - supports new command line options --punch-hole to punch holes + in the file + findmnt(8): + - supports alternative location of the fstab file + ipcrm(8): + - supports new command line option --all to remove all resources + lscpu(1): + - supports new command line options --all, --offline and + --online to list all, offline or online CPUs + - supports s390 topology description (polarization, books, ...) + partx(8): + - supports partitioned loop devices + wipefs(8): + - allows to zap partition tables + - supports new command line option "--type " to wipe only + specified filesystems, RAIDs or partition table types + libblkid: + - provides new function blkid_do_wipe() to remove all + signatures from the given block device. +- disable elvtune (works only with 2.4 kernel) +- drop patches which are upstream now: + - drop fsck-use-FS-blacklist-for-non-all-mode-too.patch + - drop util-linux-dmesg-fix-printing-of-multibyte-characters.patch + - libmount-ignore-tailing-slash-in-netfs-source-paths.patch + - libmount-fix-chdir-to-parent-for-restricted-user-umo.patch +- update to adjtimex-1.29 +- use fdupes to symlink duplicate manpages +- disabled make check for time (noop) +- libraries back to %{_libdir}, /usr merge project (by + crrodriguez@opensuse.org) +- drop cryptoloop support (provided by dm-crypt) + - util-linux-2.17.1-mount_losetup_crypto.patch + +------------------------------------------------------------------- +Tue Feb 7 14:48:23 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections + +------------------------------------------------------------------- +Sun Dec 25 22:19:44 UTC 2011 - coolo@suse.com + +- do not call %suse_update_config + +------------------------------------------------------------------- +Mon Nov 21 15:13:56 UTC 2011 - aj@suse.de + +- add fdisk-tinfo.patch to fix build with newer curses. + +------------------------------------------------------------------- +Tue Nov 15 13:15:19 UTC 2011 - coolo@suse.com + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Wed Nov 9 08:27:17 UTC 2011 - puzel@suse.com + +- add libmount-ignore-tailing-slash-in-netfs-source-paths.patch and + libmount-fix-chdir-to-parent-for-restricted-user-umo.patch: + fix umounting network filesystems as plain user (bnc#728480) + +------------------------------------------------------------------- +Tue Nov 8 09:36:41 UTC 2011 - puzel@suse.com + +- add fsck-use-FS-blacklist-for-non-all-mode-too.patch (bnc#728645) + +------------------------------------------------------------------- +Wed Nov 2 09:37:12 UTC 2011 - puzel@suse.com + +- add util-linux-dmesg-fix-printing-of-multibyte-characters.patch + (bnc#725993) + +------------------------------------------------------------------- +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 + +- add fdisk-dont-shorten-long-path-to-disk.patch (bnc#722959) + +------------------------------------------------------------------- +Tue Oct 4 11:32:11 UTC 2011 - uli@suse.com + +- cross-build fix: use %__cc, %configure macros +- set bindir explicitly when installing +- (cross-?)build fix: disable build dependency on SELINUX_LIBS + in libmount + +------------------------------------------------------------------- +Tue Sep 13 09:10:43 UTC 2011 - puzel@suse.com + +- add util-linux-lib-sysfs-deinit.patch (bnc#714151) + +------------------------------------------------------------------- +Mon Aug 29 14:57:57 UTC 2011 - puzel@suse.com + +- update to util-linux-2.20 + - cleanups, bugfixes +- build with --enable-ddate +- add util-linux-sfdisk-manpage-fix.patch + +------------------------------------------------------------------- +Thu Aug 25 14:12:15 UTC 2011 - rguenther@novell.com + +- BuildIgnore pwdutils. + +------------------------------------------------------------------- +Wed Aug 17 10:37:20 UTC 2011 - puzel@novell.com + +- update to util-linux-2.20-rc2 + - bugfixes +- drop patches: + - util-linux-fix-manpages.patch + - util-linux-wall-build-with-pie.patch + - util-linux-2.20-rc1-agetty-fixes.patch + - util-linux-2.20-rc1-hexdump-segfault.patch + - util-linux-2.20-rc-fix-dmesg.patch + +------------------------------------------------------------------- +Wed Aug 10 13:42:33 UTC 2011 - puzel@novell.com + +- add util-linux-2.20-rc1-hexdump-segfault.patch (bnc#710877) + +------------------------------------------------------------------- +Wed Aug 10 12:20:41 UTC 2011 - puzel@novell.com + +- add util-linux-2.20-rc-fix-dmesg.patch (bnc#710417) + +------------------------------------------------------------------- +Wed Aug 10 11:06:15 UTC 2011 - puzel@novell.com + +- add util-linux-2.20-rc1-agetty-fixes.patch (bnc#711240) + +------------------------------------------------------------------- +Mon Aug 1 13:44:21 UTC 2011 - puzel@novell.com + +- update to util-linux-2.20-rc1 + - Release highlights + agetty(8): + - mingetty features have been merged to agetty + chrt(1), taskset(1): + - supports new command line option "--all-tasks" to set or + retrieve the scheduling attributes of all the tasks (threads) + for a given PID + dmesg(1): + - supports new command line options: --clear, --console-on, + --console-off, --ctime, --decode, --facility=, + --level=, --show-delta, --notime, --kernel and + --userspace + fdisk(8): + - improved dialogs to be more user-friendly + findmnt(8), partx(8), lsblk(8) + - support new command line option "--pairs" to enable + key="value" output format + findmnt(8): + - supports new command line options "--poll" and "--timeout" to + monitor /proc/self/mountinfo changes + ionice(1): + - supports human-readable scheduling class names, for example: + ionice -c best-effort $PID + kill(1): + - supports new command line option "-q " to use + sigqueue(2) + - supports real-time signals in formats RT, RTMIN+ and + RTMAX- + lsblk(8): + - supports new columns + - supports new command line option "-D" to print device discard + topology + lscpu(8): + - improved support for s390 boxes + mkfs.minix: + - supports minix version 3 + simpleinit: + - this set of deprecated utils has been REMOVED + wall(1): + - support new command line option "--timeout" to specify write + timeout to terminals in seconds. +- add util-linux-fix-manpages.patch +- add util-linux-wall-build-with-pie.patch +- package /sbin/rcuuidd + +------------------------------------------------------------------- +Tue May 3 09:39:37 UTC 2011 - puzel@novell.com + +- update to util-linux-2.19.1 + - numerous bugfixes, including (bnc#690486 and bnc#690488) +- drop umount-by-imgname.patch (merged upstream) +- cleanup: do not register ipc.info.gz (not provided by + this package) + +------------------------------------------------------------------- +Thu Apr 14 16:27:27 UTC 2011 - puzel@novell.com + +- merge util-linux-2.17.1-losetup-honor-documented-c-option and + util-linux-2.17.1-mount_losetup_crypto.patch) + +------------------------------------------------------------------- +Mon Feb 21 16:28:38 UTC 2011 - puzel@novell.com + +- add umount-by-imgname.patch (bnc#666161) + +------------------------------------------------------------------- +Thu Feb 10 11:01:40 UTC 2011 - puzel@novell.com + +- update to util-linux-2.19 + - uuid fixes + - cleanups, documentation and translation updates +- drop util-linux-2.19-rc1-loop-offset.diff (fixed in upstream, by + different patch) + +------------------------------------------------------------------- +Wed Jan 26 11:47:55 UTC 2011 - puzel@novell.com + +- update to util-linux-2.19-rc3 + - bugfixes + +------------------------------------------------------------------- +Tue Jan 25 09:29:15 UTC 2011 - lnussel@suse.de + +- don't mess with /etc/mtab in %post. aaa_base does that for us + already. + +------------------------------------------------------------------- +Fri Jan 21 12:34:35 UTC 2011 - lnussel@suse.de + +- fix parsing offset= followed by more options (bnc#666150) + +------------------------------------------------------------------- +Tue Jan 18 09:47:11 UTC 2011 - bwiedemann@novell.com + +- fix bnc#664873 + +------------------------------------------------------------------- +Thu Jan 6 16:43:46 UTC 2011 - puzel@novell.com + +- update to util-linux-2.19-rc1 +- important changes: + * lsblk(8): + - this NEW COMMAND lists information about all or selected block + devices in tree-like format. + * partx(8): + - this command has been rewritten to use libblkid for partition + tables parsing. It supports aix, bsd, dos, gpt, mac, minix, + sgi, solaris_x86, sun, ultrix and unixware now. + - supports new command line option "--show" to list partitions in + new format + - prints UUID and name for GPT and mac partitions + * findmnt(8): + - supports new command line option "--submounts" to list all + submounts for selected mountpoint(s) + * agetty(8): + - supports new command line options "-c" and "-s" to reuse + already initialized tty cflags and existing baud rate + * mount(8), umount(8): + - could be linked with libmount (--enable-libmount-mount) to + manage userspace mount options outside /etc/mtab on systems + where the file is a symlink to /proc/mounts. (EXPERIMENTAL, + enabled in openSUSE package) + * losetup(8), mount(8): + - uses /sys/dev/block//loop/backing_file rather than + loopdev ioctls (requires kernel >= 2.6.37) + * fsck(8): + - supports new command line option "-l" to lock whole-disk device + by exclusive flock(2). This option is recommended when more + fsck(8) instances are executed in the same time. + * rtcwake(8): + - supports new mode "show" to print the current RTC alarm time + * fstrim(8): + - this NEW COMMAND allows to discard unused blocks on a mounted + filesystem (wrapper for FITRIM ioctl) + * swapon(8): + - supports new options "discard" and "nofail" + +- in post, replace /etc/mtab with a symlink to /proc/mounts/self +- drop following patches (in upstream) + - util-linux-swapon-btrfs-limitations + - util-linux-agetty-s-option.patch + - util-linux-fsck-l-option.patch + - util-linux-2.18-no-canonicalize-fix.patch + - util-linux-swapon-canonicalize-swap-device.patch +- fix uuidd Summary and Description +- build with --enable-libmount-mount (new option) +- use set_permissions macros +- run spec-cleaner + +------------------------------------------------------------------- +Tue Dec 14 16:11:34 UTC 2010 - puzel@novell.com + +- add util-linux-swapon-canonicalize-swap-device.patch + (bnc#641142) + +------------------------------------------------------------------- +Thu Dec 2 17:09:08 CET 2010 - mszeredi@suse.cz + +- mount: don't canonicalize "spec" with --no-canonicalize option + [bnc#651598] + +------------------------------------------------------------------- +Thu Dec 2 15:23:36 CET 2010 - mszeredi@suse.cz + +- add Provides: util-linux(fake+no-canonicalize) [bnc#651598] + +------------------------------------------------------------------- +Tue Nov 30 12:19:53 UTC 2010 - puzel@novell.com + +- update util-linux-2.17.1-mount_losetup_crypto.patch (bnc#655804) + +------------------------------------------------------------------- +Fri Nov 26 19:10:27 CET 2010 - kay.sievers@novell.com + +- add Provides: fsck-with-dev-lock + +------------------------------------------------------------------- +Thu Nov 25 13:37:43 CET 2010 - kay.sievers@novell.com + +- add 'fsck -l' option needed for systemd + +------------------------------------------------------------------- +Tue Nov 16 16:08:48 UTC 2010 - cristian.rodriguez@opensuse.org + +- disable silent rules + +------------------------------------------------------------------- +Thu Nov 11 10:36:35 CET 2010 - kay.sievers@novell.com + +- add 'agetty' -s option needed for systemd's serial console setup + +------------------------------------------------------------------- +Tue Sep 28 11:42:46 UTC 2010 - aj@suse.de + +- uuidd rc file already creates /var/run/uuidd, mark it as %ghost + in spec file. + +------------------------------------------------------------------- +Fri Jul 9 06:23:27 UTC 2010 - puzel@novell.com + +- update to util-linux-ng-2.18 + - do not provide rdev, ramsize, vidmode and rootflags commands + anymore + - fdisk does not use cylinders as display units by default + - libmount: new library; its API is still officially unstable + - new commands: findmnt, fsfreeze, swaplabel + - blkid: new option "-i" to print I/O limits + - full release notes: + ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ReleaseNotes +- update to adjtimex-1.28 +- update to which-2.20 +- drop util-linux-2.14.1-mount_skip_sync.patch (fixed upstream) +- drop util-linux-addpart-use-atoll.patch (fixed upstream) +- drop util-linux-mount-detect-ro-mount.patch (fixed upstream) +- drop adjtimex-1.20-nosyscall.diff (fixed upstream) +- cleanup specfile a bit + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh@medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Thu Jun 24 23:24:41 CEST 2010 - jeffm@suse.de + +- document btrfs limitation with swapfiles (bnc#616617) + +------------------------------------------------------------------- +Tue Jun 22 16:48:29 UTC 2010 - bg@novell.com + +- hppa specific binaries are parisc{,32,64} + +------------------------------------------------------------------- +Tue Jun 1 14:23:23 UTC 2010 - puzel@novell.com + +- do not run uuidd as root, but uuidd:uuidd (bnc#604168) + +------------------------------------------------------------------- +Fri May 28 13:24:43 UTC 2010 - puzel@novell.com + +- add util-linux-mount-detect-ro-mount.patch (bnc#481123) + +------------------------------------------------------------------- +Tue May 11 13:58:49 UTC 2010 - puzel@novell.com + +- add util-linux-addpart-use-atoll.patch (bnc#603328) + +------------------------------------------------------------------- +Tue Apr 6 13:22:37 UTC 2010 - hvogel@novell.com + +- update to version 2.17.2 + - fix small typo in v2.17.1-ReleaseNotes + - fix -b fdisk + - fix typo in ionice + - fix display of device size, fix infinite loop when probe chain + bails out early, more robust minix probing, remove "0x" prefix + from DRBD UUID, reset BLKID_TINY_DEV flag in + blkid_probe_set_device, support alignment_offset=-1 in libblkid + - fix cpuid opcode detection in lscpu + - more explicitly explain fstab usage in mount.8, posix option + of vfat is obsolete, properly ignore comments in + /etc/filesystems in mount + - update ja.po, pl.po, update vi.po + - remove " (deleted)" from filenames from /proc/swaps + - cleanup usage() and man page of wipefs + +------------------------------------------------------------------- +Wed Mar 10 23:11:42 CET 2010 - jeffm@suse.de + +- Properly honor documented -c option (bnc#583677) + +------------------------------------------------------------------- +Tue Mar 2 09:53:04 UTC 2010 - lnussel@suse.de + +- drop freeramdisk (bnc#584565) +- drop hostid (bnc#584562) + +------------------------------------------------------------------- +Tue Feb 23 12:46:07 UTC 2010 - lnussel@suse.de + +- new version 2.17.1 + - new commands: wipefs, unshare, fallocate + - fdisk: DOS-compatible mode marked deprecated + - honor nofail option in fsck + - libblkid overhaul + - lots of bug fixes +- fix self-obsoletes +- compile suid programs using -fpie +- drop -DCONFIG_SMP for s390 as it doesn't seem to be used anyways + +------------------------------------------------------------------- +Sun Dec 13 15:19:16 CET 2009 - jengelh@medozas.de + +- add baselibs.conf as a source + +------------------------------------------------------------------- +Sun Dec 6 15:07:33 CET 2009 - jengelh@medozas.de + +- enabled parallel build + +------------------------------------------------------------------- +Mon Nov 30 17:05:38 CET 2009 - meissner@suse.de + +- exclude sparc correctly -> %sparc bnc#559180 + +------------------------------------------------------------------- +Sun Nov 15 14:04:48 CET 2009 - meissner@suse.de + +- refreshed patches with fuzz=0 + +------------------------------------------------------------------- +Mon Oct 26 17:45:53 UTC 2009 - crrodriguez@opensuse.org + +- fsck during boot up fails with Too many open files [bnc#503008] + +------------------------------------------------------------------- +Tue Oct 20 12:14:24 CEST 2009 - dmueller@suse.de + +- fix typo in baselibs.conf change + +------------------------------------------------------------------- +Tue Oct 13 11:23:07 UTC 2009 - aj@suse.de + +- Fix requires of 32-bit devel packages. + +------------------------------------------------------------------- +Tue Sep 29 12:58:37 UTC 2009 - hvogel@novell.com + +- finaly remove the mount mtab locking patch: + * util-linux-2.14.1-mount_race.patch + It causes too much regressions. + +------------------------------------------------------------------- +Mon Jul 13 14:21:07 CEST 2009 - kay.sievers@novell.com + +- update to final 2.16 release + - fix libdir issues in pkgconfig files + - fix location of uuidd run directory + - improve libuuid handling if uuidd is installed but not setuid +- add blkid.conf file to: + - disable the sequential /dev scanner + - move cache to /dev/.blkid.tab to get file out of /etc + and prevent the cache file to survive a reboot + +------------------------------------------------------------------- +Wed Jul 8 13:14:42 CEST 2009 - meissner@novell.com + +- added baselibs.conf for libblkid* and libuuid* + +------------------------------------------------------------------- +Sun Jun 28 21:36:57 CEST 2009 - kay.sievers@novell.com + +- update to version 2.16 +- switch from libvolume_id to new libblkid +- provide fsck +- provide libblkid +- provide libuuid +- provide setarch +- provide separate uuidd package +- remove patches: + util-linux-2.14.1-lscpu.patch (upstream) + util-linux-2.14.1-lscpu_add_hypervisor_detection.patch (upstream) + util-linux-2.14.1-lscpu_sysroot_option.patch (upstream) + util-linux-2.14.1-sys-utils_lscpu_exit.patch (upstream) + util-linux-2.14.2-schedutils_fix_email.patch (upstream) + util-linux-2.12r-fdisk_cyl.patch (upstream) + util-linux-2.14.1-mount_swap_pagesize.patch (--fixpg option) + util-linux-2.14.2-schedutils_ionice_enosys.patch (-t option) + util-linux-2.14.1-hwclock_adjust_and_hctosys.patch (--systz) + +------------------------------------------------------------------- +Thu Apr 16 14:55:22 CEST 2009 - werner@suse.de + +- Move /usr/sbin/adjtimex to /sbin/adjtimex to be able to check the + kernel time variables even without /usr mounted + +------------------------------------------------------------------- +Mon Feb 16 12:35:00 CET 2009 - mkoenig@suse.de + +- remove util-linux-2.14.1-fdisk_cylinder.patch + fixed upstream + +------------------------------------------------------------------- +Thu Feb 12 17:12:28 CET 2009 - mkoenig@suse.de + +- update to version 2.14.2 + chrt: + * support CFS SCHED_IDLE priority and document it + fdisk: + * cannot create partition with starting beyond 1 TB + * remove obsolete information from man page + hwclock: + * remove "cli" and "sti" from i386 CMOS code + * remove x86_64-specific bogon + losetup: + * add warning about read-only mode + * missing EBUSY error hint message + more: + * minor fixes to magic() + mount: + * add i_version support + * add info about /proc/mounts to mount.1 + * add info about semantics of read-only mount to mount.8 + * add rootcontext= SELinux mount option + * clean up SPEC canonicalization + * create separate section for fs-independent options in mount.8 + * finalize support of quoted LABELs/UUIDs + * mtab created multiple times with -a option + * suggest to use blockdev --setro rather than losetup +- catch ENOSYS in ionice to allow execution in virtualized + environments which don't support ioprio_{get,set} calls [bnc#444637] +- umount: fix suid check for user mounted loop devices [bnc#461732] +- fix doc [bnc#456375] +- remove patches: + util-linux-2.13.1-fdisk_cfdisk_yesno.patch + util-linux-2.13-hwclock_rtc_wait_busy_tempfix.patch + util-linux-2.14.1-disk-utils_mkfs.minix_file_size_detection.patch + util-linux-2.14.1-fdisk_missing_include.patch + util-linux-2.14.1-mount_loop_ro_fix.patch + +------------------------------------------------------------------- +Sat Feb 7 18:28:58 CET 2009 - schwab@suse.de + +- Fix info dir entry for which. + +------------------------------------------------------------------- +Wed Jan 7 15:42:38 CET 2009 - mkoenig@suse.de + +- fix locking problem for external mount helpers when type + is not given [bnc#459839] + +------------------------------------------------------------------- +Tue Dec 2 12:23:37 CET 2008 - mkoenig@suse.de + +- raw: do not stat the raw devices when binding, since they + are created dynamically [bnc#450675] + +------------------------------------------------------------------- +Thu Nov 27 01:27:19 CET 2008 - dmueller@suse.de + +- mount: fix hang on trying to find a free loop device + if one of them has a stale nfs handle mounted (bnc#449646) + +------------------------------------------------------------------- +Mon Nov 24 15:24:11 CET 2008 - mkoenig@suse.de + +- mount: fix locking patch to not break -n [bnc#447937] + +------------------------------------------------------------------- +Thu Nov 20 18:08:33 CET 2008 - mkoenig@suse.de + +- mount: enhance mount/umount mtab locking and lock the whole + read mtab/syscall/write mtab process to avoid mtab corruption + with highly concurrent mount/umount calls [bnc#444966] +- add arch/powerpc/boot/addnote.c from kernel 2.6.27 + as /usr/bin/chrp-addnote [bnc#443859] +- umount: skip sync() in umount -a if no umount happened [bnc#447036] +- hwclock: allow --adjust and --hctosys simultaneously [bnc#441106] + +------------------------------------------------------------------- +Fri Nov 7 14:50:00 CET 2008 - mkoenig@suse.de + +- fdisk: support +cylinder notation [bnc#441871] +- check for EACCES when using ro fallback when loop mounting + a readonly image +- fix uninitialized variable in swapon pagesize detection + +------------------------------------------------------------------- +Mon Oct 27 17:33:01 CET 2008 - mkoenig@suse.de + +- fdisk: add missing includes [bnc#438670] + +------------------------------------------------------------------- +Thu Oct 23 17:58:28 CEST 2008 - mkoenig@suse.de + +- swapon: add swap pagesize detection [bnc#433028] +- lscpu: fix return code [bnc#437367] +- mkfs.minix: fix device size detection [bnc#437980] +- lscpu: update to most recent version for hypervisor detection + +------------------------------------------------------------------- +Thu Oct 2 11:10:11 CEST 2008 - mkoenig@suse.de + +- add lscpu tool from current util-linux-ng git, + needed for fate#303051 +- replace hypervisor detection tool with the solution blessed by + upstream, which adds hv detection as lscpu feature [fate#303051] + +------------------------------------------------------------------- +Wed Sep 24 11:28:07 CEST 2008 - mkoenig@suse.de + +- add new tool /bin/hypervisor for x86, x86_64 + from Ky Srinivasan + to detect the presence of a hypervisor [fate#303051] + +------------------------------------------------------------------- +Wed Sep 10 15:58:52 CEST 2008 - mkoenig@suse.de + +- update to version 2.14.1 + * fdisk: don't check for GPT when asked for disk size only + * losetup: remove unnecessary minor number check + * rtcwake: prefer RTC_WKALM_SET over RTC_ALM_SET + * scriptreplay: new implementation is out-of-sync + * selinux: is_selinux_enabled() returns 0, 1 and -1 + * umount: improve "-d" option for autoclear loops +- remove patch + util-linux-2.14-loop_autoclear.patch + +------------------------------------------------------------------- +Wed Aug 20 15:20:06 CEST 2008 - mkoenig@suse.de + +- enable SELinux support [fate#303662] + +------------------------------------------------------------------- +Mon Aug 18 18:13:10 CEST 2008 - mrueckert@suse.de + +- remove outdated options in the fillup_and_insserv call + +------------------------------------------------------------------- +Mon Aug 18 12:36:39 CEST 2008 - mkoenig@suse.de + +- raw: fix init script tags + +------------------------------------------------------------------- +Mon Jul 7 15:13:24 CEST 2008 - mkoenig@suse.de + +- update which to version 2.19 + * Upgraded code from bash to version 3.2. This DOES has influence + on how Which behaves under certain circumstances. + * When the environment variable HOME is not set, the home directory + is now read from /etc/passwd or set to '/' if no home directory + could be found (this now matches the tilde lib used in bash) + * Changed the license to GPLv3 + * Add support for shells that output '{' on the same line as the + function name in the output of 'declare -f' (ie zsh). +- fix build + +------------------------------------------------------------------- +Wed Jul 2 15:47:08 CEST 2008 - mkoenig@suse.de + +- replace util-linux-2.14-mount_ignore_ENXIO_in_del_loop.patch + with upstream version + util-linux-2.14-loop_autoclear.patch + +------------------------------------------------------------------- +Fri Jun 27 17:05:46 CEST 2008 - schwab@suse.de + +- Fix lib64 check. + +------------------------------------------------------------------- +Wed Jun 25 14:26:49 CEST 2008 - mkoenig@suse.de + +- update to version 2.14 + most important changes: + * new command ldattach + mount: + * support auto-destruction of loop devices + losetup: + * new option -j + * supports unlimited number of loop devices + * new option --sizelimit to set data end + * option -s (short form of --show) now deprecated + mkswap: + * new option -U to set UUID explicitly + fdisk: + * calculate partition size in 2^N [bnc#381270] + hwclock: + * new option --adjfile to override default /etc/adjtime +- readd scriptreplay, implemented now in C +- add retry for mount if ENOMEDIUM is returned [bnc#390204] +- ignore ENXIO in del_loop, because they might have been + auto-destructed +- removed patches: + util-linux-2.13.1-canonicalize_loopfile_name.patch + util-linux-2.13.1-mkfs.minix_add_sectorsize_check.patch + util-linux-2.13.1-mkfs.minix_device_size_cleanup.patch + util-linux-2.13.1-mount_getfs_fix.patch + util-linux-2.13.1-prevent_loop_mounting_the_same_file_twice.patch + util-linux-2.13-fdisk_cfdisk_ncursesw.patch + util-linux-mount_opt_nofail.patch + util-linux-ng-2.13-swapon-swsuspend.patch + +------------------------------------------------------------------- +Thu Apr 3 17:11:53 CEST 2008 - mkoenig@suse.de + +- cfdisk: accept english answer [bnc#369043] +- use upstream getfs fix + +------------------------------------------------------------------- +Wed Mar 26 22:05:42 CET 2008 - coolo@suse.de + +- actually require the split out package + +------------------------------------------------------------------- +Sun Mar 23 11:13:13 CET 2008 - coolo@suse.de + +- splitting out 60% of the size of the package: + creating lang subpackage + +------------------------------------------------------------------- +Wed Feb 13 10:21:42 CET 2008 - bg@suse.de + +- don't try to package parisc*.8 manual pages + +------------------------------------------------------------------- +Mon Feb 11 17:49:04 CET 2008 - mkoenig@suse.de + +- update to version 2.13.1 again +- fix broken util-linux-2.13.1-getfs_fix.patch + +------------------------------------------------------------------- +Sun Feb 10 18:11:07 CET 2008 - lrupp@suse.de + +- revert to 2.13.0.1+git20071121 + breaks current 'mount' call in Buildservice + +------------------------------------------------------------------- +Thu Feb 7 12:41:25 CET 2008 - mkoenig@suse.de + +- update to version 2.13.1: + mount: + * -L|-U segfault when label or uuid doesn't exist + * chain of symlinks to fstab causes use of pointer after free + * don't call canonicalize(SPEC) for cifs, smbfs and nfs + * improve error message when helper program not present + losetup: + * fix errno usage + mkswap: + * possible to crash with SELinux relabeling support + sfdisk: + * allow partitioning drives of over 2^31 sectors + hwclock: + * check for ENODEV +- mount: fix problem with device canonicalization when using + persistent name in fstab but call mount with real bd name +- patches merged: + util-linux-2.13-mount_fd_leak.patch + +------------------------------------------------------------------- +Tue Dec 18 15:55:19 CET 2007 - mkoenig@suse.de + +- add temporary workaround for broken RTC update interrupts + [#338419] + +------------------------------------------------------------------- +Mon Dec 3 11:03:57 CET 2007 - ro@suse.de + +- remove "arch", in coreutils now + +------------------------------------------------------------------- +Thu Nov 29 17:51:17 CET 2007 - lnussel@suse.de + +- update crypto patch + * fix mount buffer overflow when reading the passphrase (#332148) + * add loop_fish2 compatability code to losetup/mount again (#332095) + * change default hash size for 128bit keys to sha256 again + + +------------------------------------------------------------------- +Wed Nov 21 13:43:31 CET 2007 - mkoenig@suse.de + +- update to git20071121: + add sector size check for mkfs.minix [#308256] + fix canonicalization for cifs [#338375] +- provide Short-Description for raw init script +- add rpmlintrc + +------------------------------------------------------------------- +Tue Nov 20 17:49:35 CET 2007 - mkoenig@suse.de + +- fix raw path in init script + +------------------------------------------------------------------- +Tue Nov 6 16:11:02 CET 2007 - mkoenig@suse.de + +- update to 2.13.0.1+git20071106 +- prevent loop mounting the same file twice [#240653] +- merged upstream: + util-linux-2.13-mount_helper_fix.patch + util-linux-2.13-hwclock_rtc_option.patch + +------------------------------------------------------------------- +Thu Oct 4 22:24:04 CEST 2007 - bg@suse.de + +- don't use parisc, parisc32 and parisc64. + +------------------------------------------------------------------- +Mon Oct 1 17:08:06 CEST 2007 - mkoenig@suse.de + +- update to version 2.13 + merged upstream: + util-linux-2.12r-disk_utils_mkfs_open_exclusive.patch + util-linux-2.13-loop.patch + util-linux-2.13-mount_create_mtab.patch + util-linux-2.13-schedutils_error_handling.patch + util-linux-2.13-sys_utils_build_rdev_x86_64.patch +- fix hwclock --rtc option [#326106] +- fix setuid/setgid mixup and error checking [#327022] + +------------------------------------------------------------------- +Fri Sep 14 11:24:33 CEST 2007 - mkoenig@suse.de + +- link cfdisk against libncursesw instead libncurses to fix + broken utf-8 characters [#307353] + +------------------------------------------------------------------- +Wed Aug 29 12:22:21 CEST 2007 - mkoenig@suse.de + +- fix fd leaks in previous patch + +------------------------------------------------------------------- +Tue Aug 28 16:42:04 CEST 2007 - lnussel@suse.de + +- add support for specifying the key length and password hash + algorithm [#304861] + +------------------------------------------------------------------- +Fri Aug 24 14:09:19 CEST 2007 - mkoenig@suse.de + +- avoid duplicates of root fs if defined with LABEL in fstab + [#297959] +- fix ionice error handling [#301675] + +------------------------------------------------------------------- +Thu Aug 16 18:34:30 CEST 2007 - ssommer@suse.de + +- free loop devices when mount fails [#297172] + +------------------------------------------------------------------- +Wed Jul 25 18:43:42 CEST 2007 - mkoenig@suse.de + +- update to git20070725 +- removed patches (merged upstream): + util-linux-2.12r-mount_mount.8_xfs_update.patch + util-linux-2.12r-sys_utils_readprofile_mapfile.patch + util-linux-2.12r-disk_utils_mkswap_fix.patch + util-linux-2.13-schedutils_ionice_idle.patch + +------------------------------------------------------------------- +Tue Jul 17 10:44:18 CEST 2007 - mkoenig@suse.de + +- updated to version 2.13-rc2: + * add wakertc +- cleanup ionice usage [#270251] +- enable hwclock audit support [#280113] +- removed patches (merged/fixed upstream) + util-linux-login_utils_wall.patch + util-linux-mount_mount.8-acl.patch + util-linux-2.12r-mount_mtab_update.patch + util-linux-2.13-schedutils_chrt.patch + util-linux-2.13-sys_utils_arch.patch + util-linux-2.12a-mount_mountpointwithcolon.patch + util-linux-2.12a-mount_procswapcheck.patch + util-linux-2.12q-mount_umount2_not_static.patch + +------------------------------------------------------------------- +Fri Jul 13 12:31:56 CEST 2007 - mkoenig@suse.de + +- replace hotplug with nofail option and fix it to not use + syscall reserved values. +- removed patch + util-linux-2.11z-hwclock_geteuid.patch + it is intentional that suid hwclock capabilities are limited +- removed patch (fixed upstream) + util-linux-2.12q-mount_--move.patch + +------------------------------------------------------------------- +Mon Jul 9 11:34:33 CEST 2007 - mkoenig@suse.de + +- add libuuid-devel to BuildRequires to let mkswap use UUIDs + +------------------------------------------------------------------- +Thu Jul 5 16:08:58 CEST 2007 - mkoenig@suse.de + +- use %config(noreplace) for /etc/filesystems +- Keep rdev stuff for x86_64 + util-linux-2.13-sys_utils_build_rdev_x86_64.patch +- removed patches (merged upstream) + util-linux-2.12r-misc_utils_cal_formatting.patch + util-linux-2.12q-sys_utils_ionice.patch + +------------------------------------------------------------------- +Thu Jul 5 11:59:30 CEST 2007 - mkoenig@suse.de + +- update to 2.13-rc1: + * mount fixes + * agetty: add 'O' escape code to display domain name + * blockdev: add BLKFRAGET/BLKFRASET ioctls + * fdisk: many significant improvements and fixes to Sun label handling + * update po files +- removed patches (merged upstream): + util-linux-2.11q-fdisk_fs_mac.patch + util-linux-2.12r-fdisk_fdiskwrap.patch + util-linux-2.12r-mount_racy_loop.patch + util-linux-2.13-misc_utils_cal_ncurses.patch + util-linux-2.13-mount_volumeid_label.patch +- use %find_lang + +------------------------------------------------------------------- +Thu Jun 21 14:50:58 CEST 2007 - mkoenig@suse.de + +- use encoded label names with volume_id [#232929] + util-linux-2.13-mount_volumeid_label.patch + +------------------------------------------------------------------- +Thu Jun 14 10:52:25 CEST 2007 - mkoenig@suse.de + +- mkzimage_cmdline: activate commandline if used with -s [#279935] + +------------------------------------------------------------------- +Wed Jun 13 12:33:59 CEST 2007 - mkoenig@suse.de + +- schedutils: let chrt accept pid 0 for current process and + fix some documentation bugs [#266879] + util-linux-2.13-schedutils_chrt.patch + +------------------------------------------------------------------- +Wed Jun 6 16:15:43 CEST 2007 - mkoenig@suse.de + +- update to git20070530 +- removed patches + util-linux-2.13-mount_volume_id.patch + util-linux-2.12r-mount_by_uuid.patch + util-linux-2.13-build_gnu_source.patch +- fix build with ncurses + +------------------------------------------------------------------- +Tue Jun 5 17:01:48 CEST 2007 - mkoenig@suse.de + +- update to git20070509 + mount: NFS code removed (use mount.nfs{,4} from nfs-utils) +- remove sm-notify (nfs-utils) +- removed patches + util-linux-2.11u-mount_nfs_mount_acl.patch + util-linux-2.12-mount_base_nfsv4.patch + util-linux-2.12-mount_mountfallback.patch + util-linux-2.12-mount_nfs_tcp.patch + util-linux-2.12q-mount_strict_aliasing.patch + util-linux-2.12r-mount_nfs_remount_options.patch + util-linux-2.12r-mount_rpcsec_gss.patch + util-linux-2.12r-mount_sec_manpage.patch + util-linux-2.12r-mount_umount_nosysfs.patch + util-linux-2.13-mount_nfs_timeo.patch + util-linux-mount_nfs.8.patch + util-linux-mount_warn_nfsudp.patch + +------------------------------------------------------------------- +Tue Jun 5 14:34:49 CEST 2007 - pth@suse.de + +- Update to which-2.16, mainly because regenerating configure + with newer autotools works. +- Fix the patch for AC_CHECK_STATICLIB +- Our distribution doesn't install libiberty.a, so pass + --disable-iberty to configure of which to not use a libiberty from + somewhere else. + +------------------------------------------------------------------- +Mon Jun 4 17:06:47 CEST 2007 - pth@suse.de + +- Make configure of which search for static libs in lib64 subdirs. + +------------------------------------------------------------------- +Mon Apr 23 16:49:00 CEST 2007 - mkoenig@suse.de + +- update to git20070412 +- remove chkdupexe and scriptreplay to get rid of the + perl dependency [#265757] + util-linux-2.13-build_no_perl_dependency.patch +- upstream integration of umount helper support [#252089] +- merged patches: + util-linux-2.13-misc_utils_add_man_scriptreplay.patch + util-linux-2.13-tests_missing_include.patch + +------------------------------------------------------------------- +Mon Apr 16 17:20:16 CEST 2007 - mkoenig@suse.de + +- fix initialization of offset in + util-linux-2.12r-mount_racy_loop.patch [#264225] + +------------------------------------------------------------------- +Tue Apr 10 17:25:34 CEST 2007 - mkoenig@suse.de + +- update to version git20070330 of new forked development tree +- removed Suse crypto patches for losetup [FATE#302001] +- removed binaries: + /bin/guessfstype + /sbin/sln + /usr/bin/setfdprm +- removed obsolete patches: + * guessfstype2.patch + * loop-AES-v3.0a-util-linux-2.12p.diff + * mount-nfs-nonreserved + * stupid-programmer.diff + * util-linux-nodiratime.diff + * util-linux-2.12-multipleraw.diff + * util-linux-2.12-enablereplaybuild.diff + * util-linux-2.12-mount_guessfstype.diff + * util-linux-2.12h-mtablock.diff + * util-linux-2.12i-x86_64intel.diff + * util-linux-2.12q-null.diff + * util-linux-2.12r.diff + * util-linux-2.12r-fdisk_llseek.patch + * util-linux-2.12r-mount-doubleslashessourceprefix-cifs.diff + * util-linux-2.12r-mount_external_prog_on_guess.patch + * util-linux-2.12r-nonfsmountfallback.diff + * util-linux-2.12r-pagesize.patch + * util-linux-2.12r-partx_enable.patch + * util-linux-2.12r-partx_gpt_warning.patch +- add patches: + * util-linux-2.13-misc_utils_add_man_scriptreplay.patch + install man page for scriptreplay + * util-linux-2.13-tests_missing_include.patch + fix missing header in tests/mnt_test_sysinfo.c + * util-linux-2.13-sys_utils_arch.patch + keep /bin/arch + * util-linux-2.13-build_gnu_source.patch + build with _GNU_SOURCE + * util-linux-2.13-build_fix_intel_check.patch + detect also x86_64 as INTEL architecture +- rename patches to identify them clearly by subsystem +- schedutils now part of util-linux itself + +------------------------------------------------------------------- +Wed Apr 4 12:55:40 CEST 2007 - mkoenig@suse.de + +- add Supplements line [FATE#301966] + +------------------------------------------------------------------- +Mon Mar 26 15:49:09 CEST 2007 - rguenther@suse.de + +- add ncurses-devel and zlib-devel BuildRequires + +------------------------------------------------------------------- +Thu Mar 15 17:24:34 CET 2007 - mkoenig@suse.de + +- mount: Let swapon automatically reinitialize a suspended + swap partition [#254437] + +------------------------------------------------------------------- +Thu Mar 9 11:00:11 CET 2007 - mkoenig@suse.de + +- mount: fix mtablock patch to avoid mtab corruption [#226783] + +------------------------------------------------------------------- +Thu Mar 8 17:27:22 CET 2007 - mkoenig@suse.de + +- partx: fix warning for too long literal + +------------------------------------------------------------------- +Wed Mar 7 16:58:08 CET 2007 - rguenther@suse.de + +- fix changelog entry order + +------------------------------------------------------------------- +Tue Feb 27 10:58:46 CET 2007 - mkoenig@suse.de + +- fix missing return code in + util-linux-2.12r-losetup_password.patch +- mount: fix race condition in mount -o loop [#242750] + +------------------------------------------------------------------- +Mon Feb 12 17:22:45 CET 2007 - mkoenig@suse.de + +- remove legacy warnings from fdisk [#241372] + +------------------------------------------------------------------- +Fri Feb 2 13:27:31 CET 2007 - mkoenig@suse.de + +- do not use O_EXCL for mkfs.cramfs [#241466] + +------------------------------------------------------------------- +Wed Jan 31 12:06:55 CET 2007 - mkoenig@suse.de + +- let mkfs tools open with O_EXCL [#238687] + +------------------------------------------------------------------- +Tue Dec 12 11:04:07 CET 2006 - mkoenig@suse.de + +- provide different return codes for losetup with encryption + for empty and too short passwords. [#197493] + +------------------------------------------------------------------- +Tue Dec 5 18:13:32 CET 2006 - mkoenig@suse.de + +- default swap to V1 in any case [#205956] + patch: util-linux-2.12r-mkswap_fix.patch +- do not append addr option with each nfs remount [#130625] + patch: util-linux-2.12r-nfs_remount_options.patch +- add README.largedisk about fdisk partition size constraints + [#153657] + +------------------------------------------------------------------- +Tue Nov 7 13:09:45 CET 2006 - mkoenig@suse.de + +- enable partx [#214992] + +------------------------------------------------------------------- +Tue Oct 10 18:17:42 CEST 2006 - mkoenig@suse.de + +- Round up partition end LBA to a cylinder boundary during + add_partition() [#174892] +- Fix readprofile on ppc64 [#179122] +- Fix cal formatting bug [#203469] + +------------------------------------------------------------------- +Mon Oct 9 12:27:33 CEST 2006 - mkoenig@suse.de + +- Fix llseek issues. +- swapon.c: Do not use PAGE_SIZE macro. + +------------------------------------------------------------------- +Mon Aug 21 12:10:01 CEST 2006 - mkoenig@suse.de + +- Added sysfs to list of filesystems not to unmount with + umount -a, resolves #190385 + +------------------------------------------------------------------- +Mon Jun 12 14:08:25 CEST 2006 - kay.sievers@suse.de + +- use libvolume_id from provided as a rpm by udev 094 + +------------------------------------------------------------------- +Wed May 17 23:48:27 CEST 2006 - jeffm@suse.com + +- Fixed support for calling external programs w/o -t , + it would add mtab twice [#176582] + +------------------------------------------------------------------- +Mon Apr 24 14:33:20 CEST 2006 - hvogel@suse.de + +- document xfs dmapi mount options better [#158955] + +------------------------------------------------------------------- +Fri Apr 21 15:48:16 CEST 2006 - olh@suse.de + +- add mkzimage_cmdline to edit CHRP zImage kernel cmdline (168313) + +------------------------------------------------------------------- +Tue Apr 18 16:09:46 CEST 2006 - hvogel@suse.de + +- fix number of supported raw devices [#165570] + +------------------------------------------------------------------- +Wed Mar 29 13:54:32 CEST 2006 - olh@suse.de + +- clearify comments about mac disk label handling in fdisk + +------------------------------------------------------------------- +Tue Mar 28 17:53:46 CEST 2006 - hvogel@suse.de + +- more fixes for the fdiskwrap patch [#160822] + +------------------------------------------------------------------- +Tue Mar 21 11:35:26 CET 2006 - okir@suse.de + +- Update nfs(5) manpage to document security flavors [#159368] + +------------------------------------------------------------------- +Mon Mar 20 12:14:18 CET 2006 - hvogel@suse.de + +- fix numbers of supported raw devices to match the kernel + [#158203] +- make NFSv3 client support RPCSEC_GSS [#158401] +- fix that if the user doesn't specify -t + mount.fstype will never be called. [#155147] + +------------------------------------------------------------------- +Fri Mar 10 12:07:10 CET 2006 - hvogel@suse.de + +- Fix init.d/raw script to parse device names with , in them + correctly [#155653] + +------------------------------------------------------------------- +Thu Mar 9 12:28:04 CET 2006 - hare@suse.de + +- Fix potential security hole in libvolume_id (#133256) + +------------------------------------------------------------------- +Mon Mar 6 12:03:35 CET 2006 - hvogel@suse.de + +- patch fdiskmaclabel.h too + +------------------------------------------------------------------- +Thu Mar 2 15:49:06 CET 2006 - hvogel@suse.de + +- axboe made fdisk not wrap at 2TB [#153657] + +------------------------------------------------------------------- +Fri Feb 17 15:25:39 CET 2006 - lmuelle@suse.de + +- Use cifs instead of smbfs if the source starts with // and we do not set a + different fs type. + +------------------------------------------------------------------- +Sun Feb 12 12:40:21 CET 2006 - olh@suse.de + +- cosmetic fix for option_hotplug declaration + fix unininitalized string for unknown filesystems (#148855) + +------------------------------------------------------------------- +Fri Feb 10 14:00:48 CET 2006 - hvogel@suse.de + +- mount should not put / in the mtab twice if mount -f / is called + [#148409] +- fix hostid printf [#149163] + +------------------------------------------------------------------- +Wed Feb 1 03:58:58 CET 2006 - olh@suse.de + +- dont invent our own MS_FLAGS (#147132) + +------------------------------------------------------------------- +Wed Feb 1 02:20:17 CET 2006 - ro@suse.de + +- fix typo in previous change, binary negation is "~" + +------------------------------------------------------------------- +Fri Jan 27 13:02:36 CET 2006 - sscheler@suse.de + +- fixed mount hotplug option (#143352). now we don't send the + MS_HOTPLUG flag to the kernel any longer, because the kernel + doesn't know this option (EINVAL) and actually doesn't need to + know about it. + +------------------------------------------------------------------- +Fri Jan 27 12:55:29 CET 2006 - olh@suse.de + +- remove clock symlink, hwclock exists since 7 years + +------------------------------------------------------------------- +Fri Jan 27 11:46:17 CET 2006 - olh@suse.de + +- lsprop and nvsetenv moved to powerpc-utils [#144758] + +------------------------------------------------------------------- +Thu Jan 26 13:06:51 CET 2006 - hvogel@suse.de + +- Make nfsboot world readable [#145418] + +------------------------------------------------------------------- +Wed Jan 25 21:31:03 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Jan 24 17:06:22 CET 2006 - mmj@suse.de + +- Remove faulty nfs fallback code [#139019] + +------------------------------------------------------------------- +Mon Jan 16 11:25:28 CET 2006 - mmj@suse.de + +- Add patch for nsetenv to fix short reads/short writes [#142546] + +------------------------------------------------------------------- +Wed Jan 11 12:46:28 CET 2006 - mmj@suse.de + +- Update sm-notify [#141542] + +------------------------------------------------------------------- +Wed Jan 4 13:52:31 CET 2006 - mmj@suse.de + +- Update to 2.12r including since 2.12q: + o cfdisk: fix a segfault with ReiserFS partitions + o umount: disallow -r option for non-root users + +------------------------------------------------------------------- +Tue Nov 22 11:49:39 CET 2005 - mmj@suse.de + +- install proper renice manpage [#132470] + +------------------------------------------------------------------- +Tue Nov 15 17:01:34 CET 2005 - uli@suse.de + +- umount2 is not static (only fails on ARM, surprisingly) +- added ARM ionice syscalls + +------------------------------------------------------------------- +Fri Nov 11 10:42:35 CET 2005 - hare@suse.de + +- Fix reverse-mapping of by-UUID and by-LABEL mounts. + +------------------------------------------------------------------- +Thu Nov 10 09:04:17 CET 2005 - hare@suse.de + +- Fix a mishandling of by-UUID mounts. +- Use libvolume_id from udev. + +------------------------------------------------------------------- +Sat Oct 22 17:55:16 CEST 2005 - mmj@suse.de + +- Increase lsprop.c max property size to 4k [#128155] + +------------------------------------------------------------------- +Mon Oct 10 12:44:05 CEST 2005 - mmj@suse.de + +- Add -fno-strict-aliasing to nfsmount_xdr.c + +------------------------------------------------------------------- +Mon Oct 3 09:55:56 CEST 2005 - mmj@suse.de + +- Teach the mount manual page about nodiratime [#118987] + +------------------------------------------------------------------- +Thu Sep 29 12:42:03 CEST 2005 - mmj@suse.de + +- Patch from jakub007@go2.pl to make mount --move update + /etc/mtab correctly [#115129] + +------------------------------------------------------------------- +Tue Sep 13 14:16:58 CEST 2005 - mmj@suse.de + +- Only allow root to pass -r to umount [#116741] + +------------------------------------------------------------------- +Mon Sep 5 13:18:27 CEST 2005 - mmj@suse.de + +- MAC -> Mac [#104081] + +------------------------------------------------------------------- +Fri Sep 2 13:48:17 CEST 2005 - mmj@suse.de + +- Don't package manual executable [#114849] + +------------------------------------------------------------------- +Thu Sep 1 10:56:25 CEST 2005 - mmj@suse.de + +- Add patch for device-mapper mount by label support [#75966] + +------------------------------------------------------------------- +Thu Sep 1 00:12:39 CEST 2005 - ro@suse.de + +- provide and obsolete schedutils + +------------------------------------------------------------------- +Tue Aug 23 18:00:01 CEST 2005 - hvogel@suse.de + +- update ionice patch by axboe so that ionice will complain about + missing sys_ioprio_set support, but it will still + execute the process. + +------------------------------------------------------------------- +Mon Aug 22 17:06:42 CEST 2005 - hvogel@suse.de + +- Fix rpm verify output [#105807] + (ghost entry for /var/lib/nfs/state) + +------------------------------------------------------------------- +Mon Aug 22 16:27:16 CEST 2005 - schwab@suse.de + +- Fix stupid buffer overflow bug in cfdisk [#66020]. + +------------------------------------------------------------------- +Wed Aug 17 12:59:24 CEST 2005 - hare@suse.de + +- Add option 'hotplug' to mount (#104405) + +------------------------------------------------------------------- +Mon Aug 15 16:33:48 CEST 2005 - schwab@suse.de + +- Always build with RPM_OPT_FLAGS. + +------------------------------------------------------------------- +Thu Aug 11 14:41:18 CEST 2005 - mmj@suse.de + +- Patch from Patrick Kirsch to make fdisk detect MAC-fs [#104081] + +------------------------------------------------------------------- +Wed Aug 3 20:50:59 CEST 2005 - mmj@suse.de + +- Merge schedutils to here (it's happened upstream already) + +------------------------------------------------------------------- +Tue Aug 2 08:47:47 CEST 2005 - mmj@suse.de + +- Support for s390 and s390x + +------------------------------------------------------------------- +Mon Aug 1 20:04:13 CEST 2005 - mmj@suse.de + +- It's not __ppc_ and __ppc64__ but __powerpc__ and __powerpc64__ + +------------------------------------------------------------------- +Mon Aug 1 12:17:39 CEST 2005 - mmj@suse.de + +- Add ionice binary from Jens Axboe + +------------------------------------------------------------------- +Wed Jun 29 11:26:31 CEST 2005 - mmj@suse.de + +- Document load and clearly issues about NFS over UDP [#80263] +- Don't compile with -fsigned-char [#93886] + +------------------------------------------------------------------- +Tue May 31 13:26:05 CEST 2005 - okir@suse.de + +- Added NFSv4 support + +------------------------------------------------------------------- +Mon May 9 17:27:59 CEST 2005 - hvogel@suse.de + +- move hashalot and cryptsetup tools to util-linux-crypto + +------------------------------------------------------------------- +Tue Apr 12 16:13:57 CEST 2005 - mmj@suse.de + +- bump TCP timeo to 600 [#76198] + +------------------------------------------------------------------- +Tue Mar 29 13:43:31 CEST 2005 - mmj@suse.de + +- Add awareness of twofishSL92 [#74359] +- Update hashalot to version 0.3 + +------------------------------------------------------------------- +Mon Mar 14 15:30:49 CET 2005 - okir@suse.de + +- Changed sm-notify to recognize host names as well as addresses. + +------------------------------------------------------------------- +Thu Mar 10 11:28:21 CET 2005 - mmj@suse.de + +- Don't strip anything explicitly +- Don't compile with -fno-strict-aliasing [#66020] + +------------------------------------------------------------------- +Fri Feb 4 14:48:27 CET 2005 - schwab@suse.de + +- Fix stupid programmer. + +------------------------------------------------------------------- +Mon Jan 24 17:01:51 CET 2005 - meissner@suse.de + +- implicit strcmp / strerror in setctsid fixed. +- 0 -> NULL in an execl + +------------------------------------------------------------------- +Fri Jan 21 14:37:21 CET 2005 - mmj@suse.de + +- Sleep after inserting the raw module to make sure it's ready [#49807] +- Update to 2.12q including since 2.12p: + o New upstream maintainer - Adrian Bunk + o sfdisk: add -G option + o Updated translations + +------------------------------------------------------------------- +Tue Jan 18 17:04:30 CET 2005 - okir@suse.de + +- Updated sm-notify; try not to stall bootup my moving the NSM + state update after we've backgrounded (#49072). + +------------------------------------------------------------------- +Mon Jan 10 14:45:12 CET 2005 - mmj@suse.de + +- Update adjtimex to 1.20 +- Update to util-linux-2.12p including since 2.12i: + o cfdisk: fix number of new partition when partitions not in disk order + o fdisk: fix Sun label handling in sector mode + o mkfs: never truncate filename (not that that ever happened) + o more: fix redraw flaw + o lomount: revert patch from 2.12j + o lptune.8: -T option is obsolete + o mkswap, mkswap.8, swapon: support labels + o umount: allow user unmounting repeatedly mounted nfs mounts + o cfdisk: recognize JFS, support reiserfs labels + o mount: fix option parsing bug + o mount.8: several updates + o swapon.8: document -v option + o Makefile: remove cat-id-tbl.c upon make clean + o fdisk: fixed a bug that would cause a non-update of a sun disklabel + o fdisk: use sectorsize instead of 512 for SGI + o hwclock: actually use HAVE_tm_gmtoff + o swapon: fix priority handling + o umount: refuse to unmount an empty string + o configure, MCONFIG: detect gcc 3.4.0 and use -mtune option + o configure: do not run ./conftest (for cross compilation) + o fsck.cramfs: try to get correct PAGE_CACHE_SIZE + o losetup: try to give better error messages + o readprofile: default map file is /boot/System.map + o rdev.8: added historical info on ramdisk + o cal: highlight today + o lomount: stop reading passwd at NUL, fix lo_encrypt key_size + o losetup: add -f option to find an unused loop device + o more: code cleanup + o mount: add "group" mount option + o sfdisk: fix 2.6.8 BLKRRPART ioctl damage + o swapon: let swapon -a skip the swapfiles marked "noauto" + o umount: fix problem with empty mtab + o umount: use special umount program if it exists + o new flock binary + o New messages + +------------------------------------------------------------------- +Tue Nov 30 11:02:32 CET 2004 - mmj@suse.de + +- Install ramsize, rdev, rootflags and vidmode on x86-64 [#48633] + +------------------------------------------------------------------- +Fri Nov 12 15:01:36 CET 2004 - schwab@suse.de + +- Don't install *fdisk on ia64. + +------------------------------------------------------------------- +Fri Nov 12 14:50:24 CET 2004 - ro@suse.de + +- correct permissions handling for wall and write + +------------------------------------------------------------------- +Tue Nov 9 16:00:23 CET 2004 - mmj@suse.de + +- Fix segfault with mount -l [#48029] + +------------------------------------------------------------------- +Fri Nov 5 11:36:16 CET 2004 - mmj@suse.de + +- Update to util-linux-2.12i including: + o MCONFIG: fix build conditions + o chfn, chsh: add error checking + o cytune: use local header cyclades.h + o fdisk: fix default SGI volume header size + o fstab.c: use strsignal() instead of sys_siglist[] + o hwclock: use when available on i386 + o hwclock: dont try KDGHWCLK on archs other than __m68k__ + o sfdisk: correct typo in __attribute__used nonsense + o sfdisk: use PACKED on __arm__ + o sfdisk: fix warning printout + +------------------------------------------------------------------- +Thu Nov 4 08:37:19 CET 2004 - mmj@suse.de + +- Update to util-linux-2.12h including: + o cfdisk: avoid crash if no partition table + o elvtune: tell user that this only works on 2.4 kernels + o lomount: clear passwords after use + o mount: accept comments (specified by comment=) in fstab + o mount: support ocfs, ocfs2 + o [u]mount: be more careful with malloc, try to avoid OOM with + many mounts + o sfdisk: __attribute__used nonsense to support gcc 3.4 + o shutdown: do not unmount various virtual filesystems + o mount.8: added recent ext2 mount options + o mount: support jfs mount-by-label, improve reiserfs support + o sfdisk: remove strange "ends in a digit" heuristic + o *fdisk: use common disksize() routine + +------------------------------------------------------------------- +Tue Oct 19 10:24:13 CEST 2004 - mmj@suse.de + +- Add patch from SGI for fdisk label [#47368] + +------------------------------------------------------------------- +Tue Sep 28 11:18:50 CEST 2004 - mmj@suse.de + +- And another one [#46201] + +------------------------------------------------------------------- +Wed Sep 15 23:11:56 CEST 2004 - mmj@suse.de + +- Add patch from Andries to fix cfdisk [#44996] + +------------------------------------------------------------------- +Tue Sep 7 07:32:39 CEST 2004 - mmj@suse.de + +- Update to util-linux-2.12c including: + o mount.8: added recent ext2 mount options + o mount: support jfs mount-by-label, improve reiserfs support + o sfdisk: remove strange "ends in a digit" heuristic + o *fdisk: use common disksize() routine [#44678] + +------------------------------------------------------------------- +Wed Aug 25 12:54:00 CEST 2004 - mmj@suse.de + +- Update to util-linux-2.12b including: + o chsh: improved error message + o dmesg: ask kernel proper buffer size + o losetup: handle 64-bit offsets + o blockdev: also report BLKGETSIZE64 result [#43464] + o blockdev, elvtune, fdisk: handle new kernel _IOR,_IOW defines + o fdisk: remove strange "ends in a digit" heuristic + o fdisk: also list Solaris as possible type for 0x82 + o mount: added --rbind option + o mount: use blkid library + o mount: support reiserfs mount by label + o mount: attempt to use the right definition of dev_t in struct + loopinfo + o mount.8: jfs mount options added + o readprofile: new -s option + o rename.1: added ref to mmv.1 + o replay: renamed to scriptreplay; correct typos + o script: do not use locale for time delay floating point number + format + o sfdisk: error messages to stderr + o New Catalan, Dutch, Finnish, French, German, Spanish, Swedish, + Turkish, Ukrainian messages +- Update the loop-AES patch, thanks to Sumit Bose +- Change the minimum password length to 8 chars + +------------------------------------------------------------------- +Tue Aug 24 08:03:24 CEST 2004 - mmj@suse.de + +- Fix signed/unsigned bug in lsprop [#44048] + +------------------------------------------------------------------- +Wed Aug 18 15:56:01 CEST 2004 - mmj@suse.de + +- Readd patch that got lost to make fdisk -l work better with + RAID controllers [#43485] + +------------------------------------------------------------------- +Mon Aug 9 11:06:34 CEST 2004 - mmj@suse.de + +- Add an improved version of the dmesg bufsize patch. + +------------------------------------------------------------------- +Tue Jun 22 15:50:05 CEST 2004 - mmj@suse.de + +- Add patch to try and guess a filesystem type before blindly + assuming it's nfs because of the colon [#42097] + +------------------------------------------------------------------- +Mon Jun 14 19:21:08 CEST 2004 - agruen@suse.de + +- Formatting error in mount.8 manual page. + +------------------------------------------------------------------- +Wed Jun 9 15:17:47 CEST 2004 - mmj@suse.de + +- Add patch from Olaf Kirch to make protocol selection for mount + independent of protocol selection for NFS, and picks what is + available (preferring TCP over UDP) [#41735] + +------------------------------------------------------------------- +Wed Jun 9 12:10:03 CEST 2004 - mls@suse.de + +- add '-f' option to setctsid + +------------------------------------------------------------------- +Thu May 27 15:07:13 CEST 2004 - okir@suse.de + +- sm-notify now binds to a reserved port + +------------------------------------------------------------------- +Sat May 15 16:15:00 CEST 2004 - mmj@suse.de + +- Add documentation about raw device handling [#39037] + +------------------------------------------------------------------- +Mon May 10 14:40:43 CEST 2004 - mmj@suse.de + +- Make dmesg dump entire buffer. Patch from Andries/odabrunz [#39761] + +------------------------------------------------------------------- +Wed May 6 10:05:16 CEST 2004 - mmj@suse.de + +- Also check if the device is the same when doing swapon. Could be + the same block device with 2 different names [#39436] + +------------------------------------------------------------------- +Wed May 5 11:12:47 CEST 2004 - mmj@suse.de + +- Do a /sbin/modprobe raw when invoking raw devices [#39037] + +------------------------------------------------------------------- +Tue Apr 20 09:28:09 CEST 2004 - mmj@suse.de + +- Update to 2.12a including: + o fdisk: fix for kernels 2.4.15-2.4.17 + o fdisk: fix when all partitions are in use + o hwclock: add a timeout when waiting for a clock update + o ipcs: compilation fix + o ipcs: shminfo.shmall gives pages + o mount: efs support + o partx: bigendian fix + o readprofile: support for 64-bit addresses + o setterm: fix klogctl error message + o setterm.1: clarification + o sfdisk: fix check for is_ide_cdrom_or_tape + o umount: skip proc, devfs, devpts on umount -a + +------------------------------------------------------------------- +Mon Apr 19 11:52:54 CEST 2004 - mmj@suse.de + +- Add patch for unlimited raw devices [#39037] + +------------------------------------------------------------------- +Thu Apr 15 11:08:50 CEST 2004 - mmj@suse.de + +- Make sm-notify be more quiet when nothing wrong, and log to sys- + log when something is. + +------------------------------------------------------------------- +Tue Apr 6 14:45:36 CEST 2004 - mmj@suse.de + +- Don't use startproc for sm-notify [#38481] + +------------------------------------------------------------------- +Mon Apr 5 14:55:39 CEST 2004 - mmj@suse.de + +- Removing elvtune alltogether was a bit drastic, since it of + course works fine with 2.4 kernels. So print a warning in case + the BLKELVGET ioctl returns something indicating 2.6 kernels. + +------------------------------------------------------------------- +Thu Apr 1 19:50:47 CEST 2004 - mmj@suse.de + +- Don't package elvtune anymore since it's obsolete now that io + scheduler can be tuned in /sys/block/hdX/queue/iosched/* [#37869] + +------------------------------------------------------------------- +Wed Mar 31 11:19:28 CEST 2004 - mmj@suse.de + +- Apply util-linux-2.12a fixes for hwclock and readprofile. The + hwclock bit is a timout fix which hopefully fixes [#35877] +- Move sm-notify to here from nfs-utils [#36737] + +------------------------------------------------------------------- +Mon Mar 29 13:26:20 CEST 2004 - mmj@suse.de + +- Adjust warnings about Crypto-API + +------------------------------------------------------------------- +Sun Mar 28 11:00:24 CEST 2004 - mmj@suse.de + +- Add patch to make script allways use the same LC_NUMERIC [#35476] + +------------------------------------------------------------------- +Fri Mar 26 21:38:27 CET 2004 - od@suse.de + +- Add setctsid by Werner Fink [#37177] + +------------------------------------------------------------------- +Fri Mar 26 15:07:00 CET 2004 - mmj@suse.de + +- Mount option "code" is now "codepage" so update /etc/fstab in + postinstall [#36950] + +------------------------------------------------------------------- +Fri Mar 26 11:49:01 CET 2004 - mmj@suse.de + +- Remove false statement in nfs.5 about the linux kernel not + supporting nfs over tcp [#37060] + +------------------------------------------------------------------- +Wed Mar 17 21:41:17 CET 2004 - mmj@suse.de + +- Use correct permissions for README.hashalot [#36303] + +------------------------------------------------------------------- +Mon Mar 8 10:51:46 CET 2004 - mmj@suse.de + +- Enable build of replay [#35434] + +------------------------------------------------------------------- +Wed Feb 25 14:07:15 CET 2004 - mmj@suse.de + +- Use loop-AES-v2.0f-util-linux-2.12.diff instead of losetup patch + added earlier. Thanks Sumit Bose! + +------------------------------------------------------------------- +Thu Feb 19 09:54:03 CET 2004 - mmj@suse.de + +- Add cryptsetup script from Christophe Saout, for usage with the + new dm-crypt. + +------------------------------------------------------------------- +Mon Feb 16 15:32:57 CET 2004 - mmj@suse.de + +- Add losetup patch and hashalot program from Ben Slusky + +------------------------------------------------------------------- +Sun Feb 1 14:11:51 CET 2004 - kukuk@suse.de + +- Remove newgrp again (will use POSIX conform version) + +------------------------------------------------------------------- +Fri Jan 16 13:26:55 CET 2004 - kukuk@suse.de + +- Add pam-devel to neededforbuild + +------------------------------------------------------------------- +Mon Jan 12 11:31:47 CET 2004 - mmj@suse.de + +- Adjust the nfs.5 manual page to reflect we're mounting nfs over + tcp pr. default. +- Collapse two similar patches 2 one. + +------------------------------------------------------------------- +Fri Dec 19 16:43:39 CET 2003 - garloff@suse.de + +- Fix by okir for previous patch. + +------------------------------------------------------------------- +Fri Dec 19 11:19:43 CET 2003 - garloff@suse.de + +- Add patch to fallback to UDP if TCP NFS mount fails. + +------------------------------------------------------------------- +Tue Dec 2 09:03:32 CET 2003 - mmj@suse.de + +- Make patch to guess if a CD is a CD-Extra [#30316] +- Adjust patch that moves ext2/3 in front of vfat +- Regenerate patches (filename still tells when they were added) + +------------------------------------------------------------------- +Tue Nov 18 13:57:28 CET 2003 - mmj@suse.de + +- Mount NFS over TCP pr. default [#33018] + +------------------------------------------------------------------- +Thu Nov 13 14:43:39 CET 2003 - mmj@suse.de + +- Update to util-linux-2.12 including: + o losetup: -p option specifies fd for passphrase + o fdisk: sgi layout fix + o mount: -p option specifies fd for passphrase + o mount: recognize some PCDOS floppies + o umount: in "umount name", first try to interpret "name" as a mount point + o translations updates for several languages + o cfdisk: localize the Y/N answer, improve printing localized messages + o cfdisk: make various variables long long - some disks are close to 2 TB + o cfdisk: use BLKGETSIZE64 + o fdisk: make various variables unsigned to lengthen the life of 32-bit vars + o fdisk: some sgi fixes + o fdisk: k=1000, K=1024 + o fdisk: removed last occurrences of HDIO_REQ + o fdisk: use BLKGETSIZE64 + o hwclock: fix rtc test + o login: set a timeout on printing the timeout message + o md5: x86_64 fix + o more: POSIX fixes + o mount: do not supply MS_MGC_VAL when there are conflicting flags + o mount: ncp and smb are called smbfs and ncpfs - global change + o mount: add support for xvm mount by label + o mount: correct hfs magic recognition + o mount: keep original umask - it influences the mount call + o raw.8: documented unbinding of raw devices + o readprofile: fixed off-by eight error + o script: add -c option + o sfdisk.8: added an example of partitioning with logical partitions + o sfdisk: only add a AA55 signature for DOS-type partition tables + o tailf: new + +------------------------------------------------------------------- +Tue Oct 21 15:49:01 CEST 2003 - mmj@suse.de + +- Correct permissions + +------------------------------------------------------------------- +Tue Oct 21 14:53:54 CEST 2003 - ja@suse.cz + +- added support for cryptoloop in 2.6.x kernels. + +------------------------------------------------------------------- +Wed Oct 15 13:20:54 CEST 2003 - mmj@suse.de + +- Don't build as root + +------------------------------------------------------------------- +Mon Oct 13 21:44:43 CEST 2003 - kukuk@suse.de + +- Enable newgrp + +------------------------------------------------------------------- +Thu Oct 2 11:31:14 CEST 2003 - kukuk@suse.de + +- Fix compiling with kernel 2.6.0-test6 header files + +------------------------------------------------------------------- +Tue Aug 12 15:27:20 CEST 2003 - mmj@suse.de + +- Update to pmac-utils-2.1 sources and only include nvsetenv + +------------------------------------------------------------------- +Tue Aug 12 12:38:18 CEST 2003 - mmj@suse.de + +- Add mount_guessfstype support for PCDOS [#27814] + +------------------------------------------------------------------- +Wed Jun 18 16:16:15 CEST 2003 - ak@suse.de + +- support noreserved option for NFS (#27428) + +------------------------------------------------------------------- +Thu Jun 5 14:06:51 CEST 2003 - mmj@suse.de + +- Rearrange the specfile wrt. archs + +------------------------------------------------------------------- +Tue May 13 11:20:26 CEST 2003 - mmj@suse.de + +- Use %defattr +- Remove files we don't package + +------------------------------------------------------------------- +Wed May 7 15:38:56 CEST 2003 - mmj@suse.de + +- Rearrange the do_guess_fstype() code to look for ext2/3 before + vfat [#26581] + +------------------------------------------------------------------- +Thu Apr 24 12:20:23 CEST 2003 - ro@suse.de + +- fix install_info --delete call and move from preun to postun + +------------------------------------------------------------------- +Mon Apr 14 15:12:27 CEST 2003 - pthomas@suse.de + +- Get rid of the syscall for adjtimex in selective cases and + just call the glibc wrapper. Fixes build on s390. + +------------------------------------------------------------------- +Mon Apr 14 10:35:38 CEST 2003 - pthomas@suse.de + +- Use geteuid instead of getuid in hwclock to enable making + hwclock suid root. + +------------------------------------------------------------------- +Mon Apr 7 15:40:54 CEST 2003 - mmj@suse.de + +- Only delete info entries when removing last version. + +------------------------------------------------------------------- +Thu Mar 13 11:29:54 CET 2003 - mmj@suse.de + +- Apply patch to make sfdisk not destroy BSD slices [#25093] + +------------------------------------------------------------------- +Mon Mar 3 16:19:04 CET 2003 - mmj@suse.de + +- Remove superflous umask(033); calls [#23292] + +------------------------------------------------------------------- +Mon Mar 3 12:27:01 CET 2003 - ro@suse.de + +- add missing info dir entries + +------------------------------------------------------------------- +Tue Feb 18 14:29:45 CET 2003 - agruen@suse.de + +- Add description of the effect of `mount -t nfs -o noacl' on + the use of the GETACL and SETACL remote procedure calls to + the nfs(5) manual page. + +------------------------------------------------------------------- +Mon Feb 17 15:44:28 CET 2003 - mmj@suse.de + +- It's called smbfs not smb [#23697] + +------------------------------------------------------------------- +Thu Feb 13 06:17:02 CET 2003 - mmj@suse.de + +- Readd patch for passphrase timeout that got lost [#23527] + +------------------------------------------------------------------- +Fri Feb 7 12:24:12 CET 2003 - mmj@suse.de + +- The install_info macros need PreReq: %install_info_prereq + +------------------------------------------------------------------- +Fri Feb 7 01:30:53 CET 2003 - ro@suse.de + +- added install_info macros + +------------------------------------------------------------------- +Tue Feb 4 22:34:10 CET 2003 - ro@suse.de + +- don't package /bin/kill (part of coreutils now) + +------------------------------------------------------------------- +Tue Feb 4 12:40:00 CET 2003 - meissner@suse.de + +- Include tarball with pmac-utils manpages, so we do not need + sgmltool and all its dependents. + +------------------------------------------------------------------- +Wed Jan 29 11:52:19 CET 2003 - mmj@suse.de + +- Update to util-linux-2.11z including: + Translation updates + mount: fix LABEL= handling for user umount, don't abort on read + error with photocds and add dmask and fmask vfat mount options + setterm: accept devfs name + simpleinit: security: refuse initctl_fd if FD_CLOEXEC fails + umount: allow user umount after mount by label or uuid + +------------------------------------------------------------------- +Wed Jan 22 15:10:24 CET 2003 - sf@suse.de + +- removed last patch, added new (correct) patch + +------------------------------------------------------------------- +Wed Jan 22 12:48:30 CET 2003 - sf@suse.de + +- removed eliminate_doubles() from mkfs.cramfs.c + for x86_64, as it segfaults. + (makes the images slightly larger, about 10%) + +------------------------------------------------------------------- +Tue Jan 21 14:51:29 CET 2003 - mmj@suse.de + +- Added description of ISO mount options to mount.8 [#22915] + +------------------------------------------------------------------- +Mon Dec 2 12:21:38 CET 2002 - mmj@suse.de + +- Update the ReiserFS patch from Chris Mason + +------------------------------------------------------------------- +Fri Nov 29 10:38:02 CET 2002 - mmj@suse.de + +- Fix missing #include + +------------------------------------------------------------------- +Thu Nov 28 15:03:05 CET 2002 - mmj@suse.de + +- Make readprofile also try to locate the System.map in + /boot/System.map-`uname -r` [#22168] + +------------------------------------------------------------------- +Wed Nov 27 11:01:52 CET 2002 - mmj@suse.de + +- Update to util-linux-2.11y including: + o Translation updates + o fdisk,cfdisk: cosmetic fixes + o mount,umount: fix LABEL= handling for non-root [#17322] + o more: kill external help file + o simpleinit: security: refuse initctl_fd if setting FD_CLOEXEC + fails (patch we had, now folded upstream) + +------------------------------------------------------------------- +Wed Nov 20 12:19:33 CET 2002 - mmj@suse.de + +- Update to util-linux-2.11x including: + o Translation updates for several languages + o cfdisk: correct error printout + o fdisk: allow addition of a new partition when logicals all used + but primary free + o hwclock: detect systime jumps backward during setting hwclock + o Merge of the cramfs bloksize patch + o mount: new --rbind flag, for recursive loopback mounts + o mount, umount: new -O option + o setpwnam.c: open temp pw file with O_EXCL + o simpleinit: fix for "spawn too fast" + o swapon: new -e option + +------------------------------------------------------------------- +Tue Nov 19 20:12:02 CET 2002 - mmj@suse.de + +- Fix multistring assignment in adjtimex + +------------------------------------------------------------------- +Mon Nov 11 11:26:14 CET 2002 - ro@suse.de + +- changed neededforbuild to +- changed neededforbuild to <> + +------------------------------------------------------------------- +Thu Oct 31 14:59:11 CET 2002 - mmj@suse.de + +- Add -b option to mkfs.cramfs (needed for biarch architectures) + +------------------------------------------------------------------- +Thu Oct 31 00:40:09 CET 2002 - ro@suse.de + +- hack time to build on alpha + +------------------------------------------------------------------- +Tue Oct 22 16:13:36 CEST 2002 - mmj@suse.de + +- Add correction to the ReiserFS patch that fixes the case where it + was possible but unlikely to detect a logged copy of a super on a + dedicated logging device as the real thing. From Chris Mason. + +------------------------------------------------------------------- +Tue Oct 22 14:13:30 CEST 2002 - mmj@suse.de + +- Update to util-linux-2.11w including: + o fdisk and cfdisk fixes + o more bigendian fix + o translation updates + o > 2GB swapspace + o mount umask, cramfs and ocfs stuff + +------------------------------------------------------------------- +Tue Oct 8 17:13:18 CEST 2002 - mmj@suse.de + +- Only enable below patch on ix86 and x86_64 + +------------------------------------------------------------------- +Mon Oct 7 16:35:24 CEST 2002 - mmj@suse.de + +- Make small bugfix to below patch + +------------------------------------------------------------------- +Sat Oct 5 01:27:51 CEST 2002 - mmj@suse.de + +- Apply patch to enable > 2GB swap (redhat) [#20533] + +------------------------------------------------------------------- +Wed Oct 2 15:27:47 CEST 2002 - mmj@suse.de + +- Add one-liner security fix to mount and umount. + +------------------------------------------------------------------- +Mon Sep 23 09:47:33 CEST 2002 - mmj@suse.de + +- Readd fix for klogconsole that got lost [#19834] + +------------------------------------------------------------------- +Fri Sep 13 12:55:24 CEST 2002 - mmj@suse.de + +- Added patch from Oracle to mount ocfs by label [#19262] + +------------------------------------------------------------------- +Thu Sep 12 18:06:21 CEST 2002 - mmj@suse.de + +- more: Do not cast char * to int and back [#18896] + +------------------------------------------------------------------- +Sat Aug 31 17:58:26 CEST 2002 - olh@suse.de + +- add mount_cramfs_be.diff to allow mount -oloop cramfsfile loopdir + +------------------------------------------------------------------- +Mon Aug 26 16:56:52 CEST 2002 - mmj@suse.de + +- Make mode not 666 when writing /etc/mtab [#18342] + +------------------------------------------------------------------- +Mon Aug 26 13:21:30 CEST 2002 - meissner@suse.de + +- quieten klogconsole if the console does not support TIOCLINUX [#12516] + +------------------------------------------------------------------- +Thu Aug 22 15:05:32 CEST 2002 - mmj@suse.de + +- Added patch from Andreas Gruenbacher for nfs-access-acl [#18183] + +------------------------------------------------------------------- +Wed Aug 21 10:33:05 CEST 2002 - mmj@suse.de + +- Fixed an mtab locking bug with patch from Olaf Kirch [#17637] + +------------------------------------------------------------------- +Mon Aug 19 16:46:54 CEST 2002 - mmj@suse.de + +- Updated reiserfs patch from Chris Mason +- Added patch for mount.8, thanks Andreas Gruenbacher + +------------------------------------------------------------------- +Thu Aug 15 19:56:31 CEST 2002 - mmj@suse.de + +- Correct PreReq: + +------------------------------------------------------------------- +Mon Aug 5 10:45:05 CEST 2002 - mmj@suse.de + +- Update to 2.11u which includes: + o Danish, German, Spanish, Swedish and Turkish updates. + o configure: for fsck.cramfs, mkfs.cramfs: add test for libz + o text-utils/Makefile: pg fix + o agetty: use same test as login does to find utmp entry + o fdisk: fix for fdisk on empty disk + o mount updates + +------------------------------------------------------------------- +Tue Jul 23 21:10:27 CEST 2002 - schwab@suse.de + +- Fix mkfs.cramfs for architectures with non-4k pages. + +------------------------------------------------------------------- +Wed Jul 17 00:34:49 CEST 2002 - mmj@suse.de + +- Merged base into util-linux + +------------------------------------------------------------------- +Mon Jul 15 10:23:51 CEST 2002 - mmj@suse.de + +- Added JFSv2 patch from Christoph Hellwig for volume label. Does + for JFS, what below patch does for ReiserFS. + +------------------------------------------------------------------- +Sun Jul 14 19:04:16 CEST 2002 - adrian@suse.de + +- fix ul-2.10m-sgi-fdisk.diff patch to apply again + +------------------------------------------------------------------- +Thu Jul 11 10:36:16 CEST 2002 - mmj@suse.de + +- Added patch from Chris Mason for volume label on reiserfs + +------------------------------------------------------------------- +Wed Jul 10 15:31:53 CEST 2002 - olh@suse.de + +- add mkfs.cramfs and fsck.cramfs to file list + +------------------------------------------------------------------- +Wed Jul 10 15:12:48 CEST 2002 - mmj@suse.de + +- Fixed nfs.5 to tell nfsver defaults to 3 [#16815] + +------------------------------------------------------------------- +Mon Jul 8 21:16:07 CEST 2002 - mmj@suse.de + +- Update to 2.11t which includes + * fdformat: remove test on major + * fdisk, hwclock and swap polishing + * Lots of translations + * cramfs tools includes from the kernel + * swap{on,off} honours /proc/swaps + * mount small fixups + +------------------------------------------------------------------- +Fri Jul 5 11:10:06 CEST 2002 - kukuk@suse.de + +- Use %ix86 macro + +------------------------------------------------------------------- +Mon Jul 1 14:23:38 CEST 2002 - bk@suse.de + +- get raw built on s390 and s390x +- remove %ifarchs s390 s390x for fdisk(needed for SCSI disks) + +------------------------------------------------------------------- +Mon Jun 17 10:52:49 CEST 2002 - mmj@suse.de + +- Added a fix for simpleinit exploit. + +------------------------------------------------------------------- +Thu Jun 13 17:01:38 CEST 2002 - olh@suse.de + +- disable hwclock ppc patch, maybe obsolete with recent kernels + +------------------------------------------------------------------- +Thu May 16 12:57:53 CEST 2002 - mmj@suse.de + +- Added manpage guessfstype(8) + +------------------------------------------------------------------- +Thu May 9 19:07:21 CEST 2002 - mmj@suse.de + +- Updated to util-linux-2.11r, including translations, x86-64 sup- + port and small bugfixes. + +------------------------------------------------------------------- +Sat Apr 13 14:19:46 CEST 2002 - mmj@suse.de + +- Updated to util-linux-2.11q, includes bugfixes. +- util-linux-mkswap.patch for ia64 was folded into mainline + +------------------------------------------------------------------- +Fri Apr 12 16:49:38 CEST 2002 - stepan@suse.de + +- added x86-64 support. + +------------------------------------------------------------------- +Thu Apr 4 20:06:09 CEST 2002 - ihno@suse.de + +- corrected printf to report shared memories sizes bigger than + 2 GByte correct (Bug #15585). It was reportet on s390x, but + should effect other 64-Bit systems as well. + +------------------------------------------------------------------- +Tue Mar 19 13:41:04 MET 2002 - mmj@suse.de + +- Updated to 2.11o. The hexdump patch have been dropped since it + was folded to mainline util-linux. + +------------------------------------------------------------------- +Fri Mar 15 12:08:15 CET 2002 - schwab@suse.de + +- Fix mkswap for ia64. + +------------------------------------------------------------------- +Mon Mar 4 16:21:41 MET 2002 - draht@suse.de + +- permissions fixes for write(1) and wall(1) + +------------------------------------------------------------------- +Fri Feb 1 14:46:45 CET 2002 - mmj@suse.de + +- Moved /usr/bin/logger to /bin/logger (needed by sysconfig) + +------------------------------------------------------------------- +Mon Jan 28 13:59:26 CET 2002 - mmj@suse.de + +- Added the guessfstype binary from msvec/fehr + +------------------------------------------------------------------- +Thu Jan 24 10:16:37 CET 2002 - ro@suse.de + +- modified fillup_and_insserv call (perl-hack not needed here) + +------------------------------------------------------------------- +Mon Jan 21 17:08:17 CET 2002 - mmj@suse.de + +- Merge NetBSD hexdump changes, fixes bugzilla #12801 + +------------------------------------------------------------------- +Thu Jan 10 14:18:21 CET 2002 - ro@suse.de + +- removed ACTIVATE_RAW_DEV + +------------------------------------------------------------------- +Mon Dec 31 19:05:45 UTC 2001 - adrian@suse.de + +- add patch for mips to create SGI partition tables with fdisk + +------------------------------------------------------------------- +Tue Dec 18 16:50:34 CET 2001 - bjacke@suse.de + +- add adjtimex + +------------------------------------------------------------------- +Mon Dec 10 18:22:06 CET 2001 - mmj@suse.de + +- Update to util-linux-2.11n + +------------------------------------------------------------------- +Tue Nov 20 14:48:25 CET 2001 - mmj@suse.de + +- Added a patch to 'wall' to remove unwanted newline (#12181) + +------------------------------------------------------------------- +Wed Nov 7 14:15:51 CET 2001 - kukuk@suse.de + +- Remove unneeded SPARC patch for hwclock + +------------------------------------------------------------------- +Sat Oct 13 20:59:29 CEST 2001 - kukuk@suse.de + +- Update to util-linux 2.11l + +------------------------------------------------------------------- +Wed Sep 12 00:13:22 MEST 2001 - garloff@suse.de + +- Fixed some dutch translations. (bug #10276) + +------------------------------------------------------------------- +Mon Sep 10 19:31:57 CEST 2001 - olh@suse.de + +- marry fdisk and AIX label again... + add lsprop for ppc + dumps the device tree in a human readable format + +------------------------------------------------------------------- +Mon Sep 3 09:50:11 CEST 2001 - kukuk@suse.de + +- Update to version 2.11i: + - blockdev: corrected ioctl numbers + - cal: fixed for multibyte locales + - line: new + - mount: added vxfs magic + +------------------------------------------------------------------- +Sat Sep 1 19:08:46 CEST 2001 - kukuk@suse.de + +- Let mount follow symlinks again + +------------------------------------------------------------------- +Wed Aug 29 16:00:18 CEST 2001 - kukuk@suse.de + +- Add new option to losetup manual page + +------------------------------------------------------------------- +Tue Aug 28 18:24:14 MEST 2001 - draht@suse.de + +- added timeout support for losetup (-t ) + +------------------------------------------------------------------- +Mon Aug 27 15:24:25 CEST 2001 - kukuk@suse.de + +- Add raw rc scripts, too + +------------------------------------------------------------------- +Sun Aug 26 08:51:29 CEST 2001 - bjacke@suse.de + +- added raw binary and put rawio into obsoletes and provides + +------------------------------------------------------------------- +Sat Aug 25 20:22:58 CEST 2001 - kukuk@suse.de + +- Fix path in getopt.1 manual page to example directory [Bug #9831] + +------------------------------------------------------------------- +Fri Aug 24 16:00:13 CEST 2001 - kukuk@suse.de + +- Small fix for hwclock on newer SPARCs + +------------------------------------------------------------------- +Mon Aug 13 15:51:59 CEST 2001 - ro@suse.de + +- changed neededforbuild to + +------------------------------------------------------------------- +Mon Jul 30 10:59:46 CEST 2001 - kukuk@suse.de + +- Update to util-linux-2.11h +- Add nologin program + +------------------------------------------------------------------- +Tue Jul 10 16:44:35 CEST 2001 - kukuk@suse.de + +- Remove swapdev from filelist + +------------------------------------------------------------------- +Tue Jul 10 13:10:23 CEST 2001 - kukuk@suse.de + +- Update to util-linux-2.11g + +------------------------------------------------------------------- +Wed Jun 6 17:25:33 EDT 2001 - bk@suse.de + +- added s390x to all ifnarch s390 + +------------------------------------------------------------------- +Fri Apr 20 12:09:40 CEST 2001 - kukuk@suse.de + +- Fix wall bug (character 80, 160, 240, are missing) [Bug #6962] + +------------------------------------------------------------------- +Mon Mar 26 10:24:40 CEST 2001 - kukuk@suse.de + +- Add exception for broken i2o disk device numbering scheme, kernel + hacker are not able to fix this and make it right [Bug #5881]. + +------------------------------------------------------------------- +Sat Mar 24 15:27:56 CET 2001 - kukuk@suse.de + +- Update to util-linux 2.11b + +------------------------------------------------------------------- +Thu Mar 15 15:47:34 CET 2001 - kukuk@suse.de + +- Fix changing of partitions with ID 0 on SPARC +- Remove duplicate mount patch + +------------------------------------------------------------------- +Wed Mar 14 21:29:23 CET 2001 - schwab@suse.de + +- Don't use _syscallX on ia64. +- Fix missing includes. + +------------------------------------------------------------------- +Wed Mar 14 11:05:22 CET 2001 - kukuk@suse.de + +- Update to version 2.11a + +------------------------------------------------------------------- +Fri Mar 2 17:05:01 CET 2001 - kukuk@suse.de + +- enable write again + +------------------------------------------------------------------- +Mon Feb 12 15:23:14 CET 2001 - kukuk@suse.de + +- cmos.c: Use sys/io.h, fix PowerPC hack + +------------------------------------------------------------------- +Tue Feb 6 11:54:34 CET 2001 - ro@suse.de + +- wall.c: include time.h + +------------------------------------------------------------------- +Mon Feb 5 11:13:56 CET 2001 - kukuk@suse.de + +- Split hex to extra package +- Update to util-linux-2.10s + +------------------------------------------------------------------- +Fri Feb 2 12:18:56 CET 2001 - werner@suse.de + +- Make swapon/swapoff more handy: + * Ignore swap files on ro mounted file systems + * If -a is given ignore already active devices at swapon + * If -a is given ignore not active devices at swapoff + +------------------------------------------------------------------- +Thu Jan 25 00:37:22 CET 2001 - ro@suse.de + +- added Provides: util + +------------------------------------------------------------------- +Fri Jan 12 10:08:29 MET 2001 - garloff@suse.de + +- Apply patch to lomount to allow all kerneli crypt algos to be + passed and allow to pass passwd with -k. +- losetup seems to support >2GB files just fine (#5433) + +------------------------------------------------------------------- +Tue Jan 2 12:04:33 CET 2001 - kukuk@suse.de + +- Save permissions of /etc/mtab [Bug #5027] + +------------------------------------------------------------------- +Tue Dec 5 15:25:45 CET 2000 - kukuk@suse.de + +- Search first in /etc/filesystems, then in /proc/filesystems + +------------------------------------------------------------------- +Tue Dec 5 11:24:34 CET 2000 - kukuk@suse.de + +- Use AIX/fdisk patch from util-linux-2.10r +- Backport "guess filesystems" from util-linux-2.10r + +------------------------------------------------------------------- +Tue Dec 5 11:10:10 CET 2000 - schwab@suse.de + +- Don't use _syscallX on ia64. + + +------------------------------------------------------------------- +Mon Dec 4 09:27:28 CET 2000 - olh@suse.de + +- fix diff again + +------------------------------------------------------------------- +Sun Dec 3 00:09:16 CET 2000 - olh@suse.de + +- no segfaults with AIX disklabels + +------------------------------------------------------------------- +Wed Nov 29 18:21:25 CET 2000 - uli@suse.de + +- fixed to build on PPC + +------------------------------------------------------------------- +Mon Nov 27 19:03:20 CET 2000 - schwab@suse.de + +- Fix broken casts in hwclock. + +------------------------------------------------------------------- +Thu Nov 23 15:48:35 CET 2000 - bk@suse.de + +- temporary disable pivot_root on s390(2.4 kernel is not yet built) + +------------------------------------------------------------------- +Wed Nov 22 13:28:06 CET 2000 - schwab@suse.de + +- Add pivot_root to file list. + +------------------------------------------------------------------- +Mon Nov 20 11:37:35 CET 2000 - kukuk@suse.de + +- Fix pmac-utils to compile with new kernel + +------------------------------------------------------------------- +Fri Nov 17 19:40:20 CET 2000 - kukuk@suse.de + +- Fix hwclock to compile on PPC + +------------------------------------------------------------------- +Wed Nov 15 12:39:13 CET 2000 - kukuk@suse.de + +- Update util-linux to 2.10q, merge flushb.diff + +------------------------------------------------------------------- +Thu Nov 2 10:21:12 CET 2000 - kukuk@suse.de + +- Remove some of the last specfile changes + +------------------------------------------------------------------- +Wed Nov 1 14:17:07 CET 2000 - olh@suse.de + +- update pmac-utils for new powermacs, cleanup specfile + +------------------------------------------------------------------- +Fri Oct 20 14:58:09 CEST 2000 - kukuk@suse.de + +- Update util-linux to 2.10p +- Rename package from util to util-linux + +------------------------------------------------------------------- +Wed Sep 27 11:30:21 CEST 2000 - kukuk@suse.de + +- Allow NFS v3 with 2.2.17.SuSE + +------------------------------------------------------------------- +Tue Sep 26 17:54:23 CEST 2000 - kukuk@suse.de + +- Fix mount for new NFS kernel patch + +------------------------------------------------------------------- +Sat Sep 9 17:36:24 CEST 2000 - kukuk@suse.de + +- Remove tcsh dependency +- Update to util-linux 2.10o, use of /etc/filesystems is still broken + +------------------------------------------------------------------- +Fri Aug 25 17:05:50 MEST 2000 - pthomas@suse.de + +- use %{_mandir} and %{_infodir} exclusively. This allows building + from source rpm on platforms other than 7.0. + +------------------------------------------------------------------- +Wed Jul 19 00:50:48 CEST 2000 - bk@suse.de + +- s390: removed dasdfmt and silo, %ifnarch s390 for some non-s390 things. + +------------------------------------------------------------------- +Tue May 30 18:45:56 CEST 2000 - bk@suse.de + +- added dasdfmt and silo on s390 + +------------------------------------------------------------------- +Mon May 15 18:15:05 CEST 2000 - kukuk@suse.de + +- util-linux: Update to 2.10m + +------------------------------------------------------------------- +Wed Apr 26 11:22:54 CEST 2000 - kukuk@suse.de + +- flusb: Don't use kernel headers, even if we don't need them! + +------------------------------------------------------------------- +Wed Apr 19 13:56:28 CEST 2000 - kukuk@suse.de + +- util-linux: Update to 2.10l + +------------------------------------------------------------------- +Mon Apr 17 15:06:51 CEST 2000 - kukuk@suse.de + +- util-linux: Update to 2.10k + +------------------------------------------------------------------- +Thu Apr 13 15:57:45 CEST 2000 - kukuk@suse.de + +- Move /sbin/setserial to /bin/setserial, add compat link to + /sbin. This fixes [Bug 1084] and is necessary for FHS 2.1 + +------------------------------------------------------------------- +Wed Apr 12 15:43:05 CEST 2000 - kukuk@suse.de + +- Fix util-linux for Alpha + +------------------------------------------------------------------- +Wed Apr 12 14:36:41 CEST 2000 - kukuk@suse.de + +- util-linux: Update to 2.10j + +------------------------------------------------------------------- +Sun Apr 2 01:08:05 CEST 2000 - bk@suse.de + +- suse s390 team added support for s390 + +------------------------------------------------------------------- +Thu Mar 30 21:31:15 CEST 2000 - uli@suse.de + +- hwclock/PPC: added support for MK48T559 RTC chip used in MTX+ boards + +------------------------------------------------------------------- +Fri Mar 24 11:49:25 CET 2000 - kukuk@suse.de + +- Add Linux LVM partition tag to fdisk +- Fix a lot of more possible buffer overruns +- Fix some fdisk sunlabel bugs +- added BuildRoot fixes from nadvorni@suse.cz + +------------------------------------------------------------------- +Wed Mar 22 14:28:27 CET 2000 - kukuk@suse.de + +- Update util-linux to 2.10h +- Add clock again for non PPC platforms + +------------------------------------------------------------------- +Fri Mar 17 15:10:50 CET 2000 - uli@suse.de + +- now contains both hwclock and clock on PPC (/sbin/init.d/boot + chooses what to run at runtime) + +------------------------------------------------------------------- +Tue Mar 14 19:23:26 CET 2000 - schwab@suse.de + +- Add support for ia64. + +------------------------------------------------------------------- +Thu Mar 9 21:25:15 CET 2000 - kukuk@suse.de + +- fdisk: Fix -l for Mylex RAID controller + +------------------------------------------------------------------- +Tue Mar 7 17:23:57 CET 2000 - kukuk@suse.de + +- etc/filesystems: Add minix and reiserfs + +------------------------------------------------------------------- +Tue Mar 7 11:49:23 CET 2000 - kukuk@suse.de + +- mount: fix endian problem with minix fs + +------------------------------------------------------------------- +Tue Feb 15 12:11:50 CET 2000 - kukuk@suse.de + +- mount: Add hack for PPC/syscall mount problem + +------------------------------------------------------------------- +Sun Feb 13 05:16:13 CET 2000 - bk@suse.de + +- let rdev continue in case it stubles over a bad file in /dev (/dev/snd fix) + +------------------------------------------------------------------- +Fri Feb 4 17:14:07 CET 2000 - kukuk@suse.de + +- Make PPC clock parameter compatible to hwclock + +------------------------------------------------------------------- +Thu Feb 3 14:42:23 CET 2000 - kukuk@suse.de + +- Fix filelist for SPARC + +------------------------------------------------------------------- +Thu Feb 3 11:14:29 CET 2000 - kukuk@suse.de + +- util-linux: Update to 2.10f (mount security fix) + +------------------------------------------------------------------- +Sun Jan 23 15:45:08 CET 2000 - kukuk@suse.de + +- util-linux: Update to 2.10e + +------------------------------------------------------------------- +Tue Jan 18 19:18:08 CET 2000 - kukuk@suse.de + +- mount now looks at first in /etc/filesystems and then in + /proc/filesystems + +------------------------------------------------------------------- +Tue Jan 18 16:32:05 CET 2000 - ro@suse.de + +- fixed pmac-utils to build with 2.3 as well + +------------------------------------------------------------------- +Tue Jan 18 14:56:22 CET 2000 - kukuk@suse.de + +- Fix a lot of fdisk buffer overruns [Bug 1642] + +------------------------------------------------------------------- +Mon Jan 17 18:23:56 CET 2000 - kukuk@suse.de + +- Fix setserial for Linux 2.3.40 +- Remove write, is now in nkitb +- Build minix and bfs tools for SPARC +- Fix some buffer overflows in fdisk + +------------------------------------------------------------------- +Fri Dec 17 15:00:19 MET 1999 - kukuk@suse.de + +- util-linux: Update to 2.10d +- hex: Update to 1.2 +- Move manual pages to /usr/share/man + +------------------------------------------------------------------- +Tue Nov 30 18:28:14 CET 1999 - uli@suse.de + +- re-added hwclock link for PPC (2nd try) + +------------------------------------------------------------------- +Tue Nov 30 17:49:27 MET 1999 - uli@suse.de + +- re-added hwclock link for PPC + +------------------------------------------------------------------- +Mon Nov 15 12:39:41 MET 1999 - kukuk@suse.de + +- util-linux: Update to 2.10b + +------------------------------------------------------------------- +Sat Nov 13 15:36:37 MET 1999 - kukuk@suse.de + +- setserial: Add Patch for Sparc +- Fix filelist for Sparc + +------------------------------------------------------------------- +Wed Oct 27 04:03:42 CEST 1999 - garloff@suse.de + +- added flushb (moved here from ddrescue). +- fix bug in logger (remove trailing newlines). + +------------------------------------------------------------------- +Fri Oct 22 11:29:51 MEST 1999 - kukuk@suse.de + +- util-linux: Remove old patches for mk_loop_h + +------------------------------------------------------------------- +Sat Oct 16 16:40:13 MEST 1999 - kukuk@suse.de + +- util-linux: Update to 2.9z + +------------------------------------------------------------------- +Fri Oct 8 10:58:48 MEST 1999 - kukuk@suse.de + +- Update to util-linux-2.9y (execpt fdisk) + +------------------------------------------------------------------- +Tue Sep 14 18:14:53 CEST 1999 - uli@suse.de + +- added PMac-specific utils for PPC + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Thu Aug 26 15:05:03 CEST 1999 - uli@suse.de + +- disabled hayesesp for PPC + +------------------------------------------------------------------- +Wed Aug 25 18:04:35 MEST 1999 - kukuk@suse.de + +- Don?t install tsort, its now in textutils 2.0 + +------------------------------------------------------------------- +Tue Aug 24 10:11:06 MEST 1999 - kukuk@suse.de + +- Update to util-linux-2.9w (execpt fdisk) + +------------------------------------------------------------------- +Mon Aug 9 10:55:48 MEST 1999 - kukuk@suse.de + +- Update to util-linux-2.9v (execpt fdisk) + +------------------------------------------------------------------- +Tue Jul 20 18:01:29 CEST 1999 - garloff@suse.de + +- Added hex from Erich S. Raymond + +------------------------------------------------------------------- +Mon Jul 12 12:11:45 MEST 1999 - kukuk@suse.de + +- Add fdisk patch from Klaus G. Wagner +- Add mount patch from util-linux 2.9u + +------------------------------------------------------------------- +Tue Jul 6 12:23:47 MEST 1999 - kukuk@suse.de + +- update to util-linux-2.9t + +------------------------------------------------------------------- +Fri Jun 25 14:44:30 MEST 1999 - kukuk@suse.de + +- update to util-linux-2.9s + +------------------------------------------------------------------- +Wed Mar 3 11:25:50 MET 1999 - ro@suse.de + +- hwclock.c: always use busywait to get rtctime + (it's hard to find out at runtime if we will get an irq) + +------------------------------------------------------------------- +Tue Mar 2 00:42:15 MET 1999 - ro@suse.de + +- update to util-linux-2.9i +- update to setserial-2.15 +- using diffs from jurix and add-ons from kgw for compaq smart raid + +------------------------------------------------------------------- +Mon Feb 1 10:22:10 MET 1999 - ro@suse.de + +- rdev is not built on alpha + +------------------------------------------------------------------- +Mon Jan 18 21:29:36 MET 1999 - florian@suse.de + +- fixed one broken case to delete a partition in fdisk + +------------------------------------------------------------------- +Sun Dec 13 22:20:16 MET 1998 - bs@suse.de + +- fixed file list + +------------------------------------------------------------------- +Thu Dec 10 16:38:08 MET 1998 - fehr@suse.de + +- fix bug in fdisk + +------------------------------------------------------------------- +Tue Dec 8 15:43:23 MET 1998 - ro@suse.de + +- removed last from filelist +- added link /sbin/clock -> hwclock + +------------------------------------------------------------------- +Wed Nov 4 00:23:02 MET 1998 - ro@suse.de + +- fdisksunlabel: don't include scsi/scsi.h for glibc-2.0 + +------------------------------------------------------------------- +Fri Oct 30 11:46:38 MET 1998 - ro@suse.de + +- update to 2.9 / added hostid from previous diff +- copied some glibc changes from previous diff (strcpy..) + +------------------------------------------------------------------- +Thu Sep 17 13:04:14 MEST 1998 - ro@suse.de + +- define _GNU_SOURCE when using getopt + +------------------------------------------------------------------- +Mon Aug 31 16:12:36 MEST 1998 - ro@suse.de + +- full switch to util-linux 2.8 +-- sync has moved to pkg fileutils +-- chroot has moved to pkg sh_utils (has been there for a while) +-- adopted hostid from previous suse-pkg + +------------------------------------------------------------------- +Mon Aug 24 10:46:33 MEST 1998 - ro@suse.de + +- switched to use mount from util-linux-2.8 + +------------------------------------------------------------------- +Tue Jun 23 10:46:45 MEST 1998 - ro@suse.de + +- added fdisk, sfdisk, cfdisk from util-linux-2.8 + (including man-pages,readmes) + +------------------------------------------------------------------- +Mon Nov 17 14:14:47 MET 1997 - ro@suse.de + +- changed /local/bin/perl5 in chkdupexe to /usr/bin/perl + +------------------------------------------------------------------- +Fri Oct 31 13:38:58 MET 1997 - ro@suse.de + +- temporarily removed mount-hacker + +------------------------------------------------------------------- +Wed Oct 29 23:44:37 MET 1997 - florian@suse.de + +- add changes from ms@suse.de for hostid.c + + +------------------------------------------------------------------- +Tue May 20 14:10:37 MEST 1997 - florian@suse.de + + +- only support kernel 2.0.x for nfs mounts, please use /bin/mount-hacker + for kernel 2.1.x + + +------------------------------------------------------------------- +Wed Apr 30 15:57:14 CEST 1997 - florian@suse.de + + +- update to mount 2.6g + + +------------------------------------------------------------------- +Sun Apr 13 23:04:29 MEST 1997 - florian@suse.de + + +- update to new version util-linux 2.6 + +- update to new version mount 2.6e + + + +------------------------------------------------------------------- +Sat Nov 2 17:35:11 CET 1996 - florian@suse.de + + +- update to mount 2.5p + + +------------------------------------------------------------------- +Thu Oct 17 16:05:09 CEST 1996 - florian@suse.de + + +- Update auf neue Version von mount 2.5o. + + +------------------------------------------------------------------- +Tue Sep 3 17:01:45 MET DST 1996 - florian@suse.de + + +- updated to new version mount 2.5m +- (u)mount now gives much better error messages + + +------------------------------------------------------------------- +Sun Aug 25 19:28:50 MET DST 1996 - bs@suse.de + +compile setterm with libtermcap and not libncurses +use newer mount instead of the old version in util-linux +(security fix) diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec new file mode 100644 index 0000000..5dbc183 --- /dev/null +++ b/util-linux-systemd.spec @@ -0,0 +1,1328 @@ +# +# spec file for package util-linux-systemd +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%bcond_without sysvinit_tools +%bcond_without enable_su +%bcond_without enable_eject +%bcond_with enable_last + +Name: util-linux-systemd +%define _name util-linux +# WARNING: After editing this file please call pre_checkin.sh to update spec files: +%define _name util-linux +# To prevent dependency loop in automatic build systems, we want to +# build util-linux in parts. To build all at once, set build_all to 1. +# +# build_util_linux: First stage build builds all except: +# build_util_linux_systemd: Builds util-linux-systemd and uuidd. +# build_python_libmount: Builds python-libmount. +%define build_all 0 +%if "%{name}" == "python-libmount" +%define build_util_linux 0 +%define build_util_linux_systemd 0 +%define build_python_libmount 1 +# To prevent dependency loops, verify signature only in third stage. +%define verify_sig 1 +%else +%if "%{name}" == "util-linux-systemd" +%define build_util_linux 0 +%define build_util_linux_systemd 1 +%define build_python_libmount 0 +%define verify_sig 0 +%else +%if %build_all +%define build_util_linux 1 +%define build_util_linux_systemd 1 +%define build_python_libmount 1 +%define verify_sig 1 +%else +%define build_util_linux 1 +%define build_util_linux_systemd 0 +%define build_python_libmount 0 +%define verify_sig 0 +%endif +%endif +%endif +BuildRequires: audit-devel +BuildRequires: bc +BuildRequires: binutils-devel +BuildRequires: fdupes +BuildRequires: gettext-devel +BuildRequires: libcap-ng-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: pam-devel +BuildRequires: pkg-config +BuildRequires: readline-devel +BuildRequires: utempter-devel +BuildRequires: zlib-devel +%if %verify_sig +BuildRequires: gpg-offline +%endif +%if %build_util_linux_systemd +%if 0%{?suse_version} <= 1230 +BuildRequires: pkgconfig(systemd) +%else +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-journal) +%endif +%endif +%if %build_python_libmount +BuildRequires: python-devel +%endif +#BEGIN SECOND STAGE DEPENDENCIES +%if !%build_util_linux +%if %build_util_linux_systemd +BuildRequires: libblkid-devel +BuildRequires: libmount-devel +BuildRequires: libsmartcols-devel +BuildRequires: libuuid-devel +%endif +%if %build_python_libmount +BuildRequires: libmount-devel +%endif +%endif +#END SECOND STAGE DEPENDENCIES +Version: 2.25 +Release: 0 +# util-linux is a base package and uuidd pre-requiring pwdutils pulls +# that into the core build cycle. pwdutils also pulls in the whole +# ldap stack into it. Avoid this whole mess which is done only to +# make the rpm install check of uuidd happy which has support to work without +# these tools as well +#!BuildIgnore: pwdutils +Url: https://www.kernel.org/pub/linux/utils/util-linux/ +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP +License: GPL-2.0+ +Group: System/Base +%endif +# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.preamble +#END UGLY HACK +Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz +Source1: util-linux-rpmlintrc +Source4: raw.init +Source5: etc.raw +Source6: etc_filesystems +Source7: baselibs.conf +Source8: login.pamd +Source9: remote.pamd +Source10: su.pamd +Source11: su.default +Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign +Source13: %{_name}.keyring +# TODO: split to separate package +Source40: klogconsole.tar.bz2 +# XXX: Run a program in a new session and with controlling tty +Source22: setctsid.c +Source23: setctsid.8 +# XXX: ppc specific, still needed? +Source28: mkzimage_cmdline.8 +Source29: mkzimage_cmdline.c +Source31: addnote.c +# +Source50: uuidd.rc +Source51: blkid.conf +# detachec parts of spec file +Source100: util-linux.preamble +Source101: util-linux.util-linux +Source102: util-linux.python-libmount +## +## util-linux patches +## +# PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path +Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff +# PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. +Patch12: util-linux-noenc-suse.patch +# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. +Patch13: util-linux-bash-completion-blockdev.patch +## +## klogconsole +## +Patch55: klogconsole-quiet.patch +Patch56: klogconsole.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# +%if %build_util_linux +Supplements: filesystem(minix) +Provides: fsck-with-dev-lock = %{version} +# bnc#651598: +Provides: util-linux(fake+no-canonicalize) +PreReq: %install_info_prereq permissions +PreReq: %insserv_prereq %fillup_prereq /bin/sed +Recommends: %{name}-lang = %{version} +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP +Group: System/Base +%endif +# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.util-linux +#END UGLY HACK +%if %{with enable_eject} +Provides: eject = 2.1.0-166.8 +%endif +Provides: login = 4.0-33.7 +%if %{with enable_eject} +# File conflict of eject (up to 12.3 and SLE11). +Obsoletes: eject < 2.1.0-166.8 +%endif +# File conflict of login (up to 12.1 and SLE11). +Obsoletes: login < 4.0-33.7 +%if %{with enable_su} +# File conflict of su and kill (up to 12.3 and SLE11). +# It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. +Conflicts: coreutils < 8.21 +%endif +%if %{with sysvinit_tools} +# File conflict of sulogin and utmpdump (up to 12.3 and SLE11). +Conflicts: sysvinit-tools < 2.88+-87 +%endif +# bnc#805684: +%ifarch s390x +Obsoletes: s390-32 +Provides: s390-32 +%endif +# uuid-runtime appeared in SLE11 SP1 to SLE11 SP3 +Provides: uuid-runtime = %{version}-%{release} +Obsoletes: uuid-runtime < %{version}-%{release} +# +# Using "Requires" here would lend itself to help upgrading, but since +# util-linux is in the initial bootstrap, that is not a good thing to do: +# +Recommends: adjtimex +Recommends: time +Recommends: which +%else +# Exact copy of headers below is needed for spec cleaner that does not support +# if condition across preamble and subsequent sections. +%if %build_python_libmount +# Exact copy of the %%package tag from python-libmount section below: +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP +Group: System/Base +%endif +# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.python-libmount +#END UGLY HACK +%else +%if %build_util_linux_systemd +# Exact copy of the %%package tag from systemd section below: +Summary: A collection of basic systemd utilities +Group: System/Base +Supplements: packageand(util-linux:systemd) +# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 +Provides: util-linux:/usr/lib/systemd/system/fstrim.service +# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 +Conflicts: util-linux < 2.25 +%else +# ERROR: No build_* variables are set. +%endif +%endif +%endif + +%if %build_util_linux +%description +This package contains a large variety of low-level system utilities +that are necessary for a Linux system to function. It contains the +mount program, the fdisk configuration tool, and more. + +%package -n libblkid1 +Summary: Filesystem detection library +Group: System/Filesystems + +%description -n libblkid1 +Library for filesystem detection. + +%package -n libblkid-devel +Summary: Development files for the filesystem detection library +Group: Development/Libraries/C and C++ +Requires: libblkid1 = %{version} + +%description -n libblkid-devel +Files needed to develop applications using the library for filesystem +detection. + +%package -n libblkid-devel-static +Summary: Development files for the filesystem detection library +Group: Development/Libraries/C and C++ +Requires: libblkid-devel = %{version} + +%description -n libblkid-devel-static +Files needed to develop applications using the library for filesystem +detection. + +%package -n libuuid1 +Summary: Library to generate UUIDs +Group: System/Filesystems + +%description -n libuuid1 +A library to generate universally unique IDs (UUIDs). + +%package -n libuuid-devel +Summary: Development files for libuuid1 +Group: Development/Libraries/C and C++ +Requires: libuuid1 = %{version} + +%description -n libuuid-devel +Files to develop applications using the library to generate universally +unique IDs (UUIDs). + +%package -n libuuid-devel-static +Summary: Development files for libuuid1 +Group: Development/Libraries/C and C++ +Requires: libuuid-devel = %{version} + +%description -n libuuid-devel-static +Files to develop applications using the library to generate universally +unique IDs (UUIDs). + +%package -n libmount1 +Summary: Device mount library +Group: System/Filesystems + +%description -n libmount1 +Library designed to be used in low-level utils like +mount(8) and /usr/sbin/mount. helpers. + +%package -n libmount-devel +Summary: Development files for libmount1 +Group: Development/Libraries/C and C++ +Requires: libmount1 = %{version} + +%package -n libmount-devel-static +Summary: Development files for libmount1 +Group: Development/Libraries/C and C++ +Requires: libmount-devel = %{version} + +%description -n libmount-devel-static +Files to develop applications using the libmount library. + +%description -n libmount-devel +Files to develop applications using the libmount library. + +%package -n libsmartcols1 +Summary: Column-based text sort engine +Group: System/Libraries + +%description -n libsmartcols1 +Library to sort human readable column-based text output. + +%package -n libsmartcols-devel +Summary: Development files for libsmartcols1 +Group: Development/Libraries/C and C++ +Requires: libsmartcols1 = %{version} + +%description -n libsmartcols-devel +Files to develop applications using the libsmartcols library. + +%package -n libsmartcols-devel-static +Summary: Development files for libsmartcols1 +Group: Development/Libraries/C and C++ +Requires: libsmartcols-devel = %{version} + +%description -n libsmartcols-devel-static +Files to develop applications using the libsmartcols library. + +%lang_package +%endif +%if %build_util_linux_systemd +%if %build_util_linux +%package systemd +# Do not forget to copy duplicate of this section to the preamble: +Summary: A collection of basic systemd utilities +Group: System/Base +Supplements: packageand(util-linux:systemd) +# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 +Provides: util-linux:/usr/lib/systemd/system/fstrim.service +# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 +Conflicts: util-linux < 2.25 + +%description systemd +%else +%description +%endif +This package contains low-level util-linux utilities that use systemd. + +%package -n uuidd +Summary: Helper daemon to guarantee uniqueness of time-based UUIDs +Group: System/Filesystems +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: permissions +PreReq: pwdutils +# uuidd bash-completion moved to a correct package +Conflicts: util-linux < 2.25 + +%description -n uuidd +The uuidd package contains a userspace daemon (uuidd) which guarantees +uniqueness of time-based UUID generation even at very high rates on +SMP systems. + +%endif +%if %build_python_libmount +%if %build_util_linux +%package -n python-libmount +# Do not forget to copy duplicate of this section to the preamble: +Summary: Python bindings for the libmount library +Group: System/Filesystems + +%description -n python-libmount +%else +%description +%endif +This package contains the python bindings for util-linux libmount +library. + +%endif +%prep +%if %verify_sig +xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - +%endif +%setup -q -n %{_name}-%{version} -b 40 +%patch4 -p1 +%patch12 -p1 +%patch13 -p1 +# +# setctsid +cp -p %{S:22} %{S:23} . + +pushd ../klogconsole +%patch55 -p1 +%patch56 -p1 +popd + +%build +%if %build_util_linux +pushd ../klogconsole +# klogconsole build +make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}" +popd +# setctsid build +rm -f setctsid +make %{?_smp_mflags} setctsid CFLAGS="%{optflags}" CC="%{__cc}" +# +#BEGIN SYSTEMD SAFETY CHECK +# With systemd, some utilities are built differently. Keep track of these +# sources to prevent building of systemd-less versions. +# +# WARNING: Never edit following line without doing all suggested in the echo below! +UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/logger.c ./misc-utils/uuidd.c ' +UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIBSYSTEMD' . | fgrep '.c' | LC_ALL=C sort | tr '\n' ' ') +if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ; then + echo "List of utilities depending on systemd have changed. +Please check the new util-linux-systemd file list, file removal and update of Conflicts for safe update! +Then update configure options to build what needed. +Only then you can safely update following spec file line: +UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'" + exit 1 +fi +#END SYSTEMD SAFETY CHECK +#BEGIN FIRST STAGE MODIFICATIONS +%if !%build_util_linux_systemd +sed -i 's/BUILD_LSLOGINS/FALSE/ + s/BUILD_LOGGER/FALSE/ + ' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am +autoreconf -f -i +%endif +#END FIRST STAGE MODIFICATIONS +%else +#BEGIN SECOND STAGE MODIFICATIONS +# delete all make modules except wanted ones +sed -i '/^include/{ +%if %build_python_libmount + /libmount\/Makemodule.am/b 1 +%endif +%if %build_util_linux_systemd +# for lslogins + /login-utils/b 1 +# for logger and uuidd + /misc-utils/b 1 +# for fstrim.service and fstrim.timer + /sys-utils/b 1 +# for uninstalled libcommon required by uuidd + / lib\//b 1 +# for bash completions + /bash-completion/b 1 +# we always want tests (they are smart enough to skip irrelevant parts) + /tests/b 1 +%endif +%if %build_python_libmount + /libmount\/python/b 1 +%endif + d + :1 + }' Makefile.am libmount/Makemodule.am +%if %build_python_libmount +# trick: we do not want to build libmount, but include subdirs +# We close prefious if FALSE and open new pairing with endif +sed -i '/^if BUILD_LIBMOUNT/d +/^if ENABLE_GTK_DOC/i \ +if BUILD_LIBMOUNT +' libmount/Makemodule.am +# Do not install terminal-colors.d.5 +sed -i '/dist_man_MANS/d' lib/Makemodule.am +%endif +# disable all make modules except wanted ones +sed -i '/^if BUILD_/{ +%if %build_util_linux_systemd + /LSLOGINS/b 1 + /LOGGER/b 1 + /UUIDD/b 1 + /BASH_COMPLETION/b 1 +%endif + s/BUILD_.*/FALSE/ + :1 + } + ' libmount/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am sys-utils/Makemodule.am bash-completion/Makemodule.am +%if %build_util_linux_systemd +# trick: we do not want to build fstrim, but we want to install fstrim systemd connectors +# We close prefious if FALSE and open new pairing with endif +sed -i '/^if HAVE_SYSTEMD/i \ +endif\ +if TRUE +' sys-utils/Makemodule.am +# Do not install terminal-colors.d.5 +sed -i '/dist_man_MANS/d' lib/Makemodule.am +%endif +# Use installed first stage libraries +sed -i ' +# extra space to not replace pylibmount.la + s/ libmount\.la/ -lmount/g + s/libuuid\.la/-luuid/g + s/libblkid\.la/-lblkid/g + s/libsmartcols\.la/-lsmartcols/g + ' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am +# Ignore dependencies on optional (and not built in second stage) libraries +sed -i ' + /AM_GNU_GETTEXT/d + s/UL_REQUIRES_BUILD(\[.*\], \[libuuid\])/dnl &/ + s/UL_REQUIRES_BUILD(\[.*\], \[libsmartcols\])/dnl &/ + ' configure.ac +sed -i ' + /SUBDIRS =/s/ po// + ' Makefile.am +autoreconf -f -i +#END SECOND STAGE MODIFICATIONS +%endif +# +# util-linux itself +# +# Version check for libutempter +# +uhead=$(find %_includedir -name utempter.h 2>/dev/null) +if test -n "$uhead" && grep -q utempter_add_record "$uhead" +then + uhead=--with-utempter +else + uhead=--without-utempter +fi +export SUID_CFLAGS="-fpie" +export SUID_LDFLAGS="-pie" +# override default localstatedir to /run +# only used for volatile data +# +# SUSE now supports only systemd based system. We do not build +# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. +%configure \ + --localstatedir=/run \ + --docdir=%{_docdir}/%{_name} \ + --with-audit \ + --with-gnu-ld \ + --with-ncurses \ + --with-selinux \ + $uhead \ + --with-bashcompletiondir=%{_datadir}/bash-completion \ + --enable-all-programs \ + --disable-reset \ + --disable-use-tty-group \ + --disable-silent-rules \ + --enable-static \ + --disable-rpath \ +%if %{without enable_last} + --disable-last \ +%endif +%if %{without enable_eject} + --disable-eject \ +%endif +%if %{with sysvinit_tools} + --enable-sulogin-emergency-mount \ +%else + --disable-sulogin \ + --disable-mountpoint \ +%endif +%if %{without enable_su} + --disable-su \ + --disable-kill \ +%endif +%if %build_util_linux_systemd + --enable-uuidd \ + --with-systemd \ + --with-systemdsystemunitdir=%{_unitdir} \ +%else + --disable-uuidd \ + --without-systemd \ +%endif +%if %build_python_libmount + --with-python \ +%else + --without-python \ +%endif +# +make %{?_smp_mflags} +# +%if %build_util_linux +%{__cc} -fwhole-program %{optflags} -o mkzimage_cmdline %{S:29} +%{__cc} -fwhole-program %{optflags} -o chrp-addnote %{SOURCE31} +%endif + +%check +# mark some tests "known_fail" +%ifarch ppc ppc64 ppc64le s390 s390x +export TS_OPT_fdisk_bsd_known_fail="yes" +%endif +%ifarch %{ix86} +export TS_OPT_misc_setarch_known_fail="yes" +%endif +# +%ifarch armv7l armv7hl aarch64 +%if 0%{?suse_version} > 1310 +export TS_OPT_misc_setarch_known_fail="yes" +%endif +%endif +# +%ifarch armv6l armv6hl aarch64 +export TS_OPT_fdisk_gpt_known_fail="yes" +export TS_OPT_fdisk_oddinput_known_fail="yes" +export TS_OPT_fdisk_sunlabel_known_fail="yes" +export TS_OPT_misc_ionice_known_fail="yes" +export TS_OPT_misc_swaplabel_known_fail="yes" +export TS_OPT_kill_name_to_number_known_fail="yes" +export TS_OPT_kill_print_pid_known_fail="yes" +export TS_OPT_kill_queue_known_fail="yes" +%endif +%ifarch aarch64 s390 s390x +export TS_OPT_utmpdump_known_fail="yes" +%endif +# FIXME: These sometimes fails: +export TS_OPT_libmount_lock_known_fail="yes" +%ifarch x86_64 +# FIXME: Something is wrong here. This test never fails in SLE12: +export TS_OPT_ipcs_limits2_known_fail="yes" +%endif +# +# hacks +export PATH="$PATH:/sbin:/usr/sbin" +# +# do the check but don't abort yet +result="0" +make %{?_smp_mflags} check || result="1" +# +# always show test diffs (inclusive known_fail) and exit result +diffs_files="$(find tests/diff -type f | sort)" +echo "$diffs_files" | xargs -r cat +exit "$result" + +%install +%if %build_util_linux +mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} +install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf +install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login +install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote +%if %{with enable_su} +install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su +install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l +install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su +%endif +mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +pushd ../klogconsole +# klogconsole install +make install DEST=%{buildroot} +popd +%endif +# +# util-linux install +# +%make_install +rm -f %{buildroot}%{python_sitearch}/libmount/*.*a +%if %build_util_linux +#UsrMerge +%if %{with enable_su} +ln -s %{_bindir}/kill %{buildroot}/bin +ln -s %{_bindir}/su %{buildroot}/bin +%endif +ln -s %{_bindir}/dmesg %{buildroot}/bin +ln -s %{_bindir}/more %{buildroot}/bin +ln -s %{_bindir}/mount %{buildroot}/bin +ln -s %{_bindir}/umount %{buildroot}/bin +ln -s %{_bindir}/findmnt %{buildroot}/bin +ln -s %{_bindir}/lsblk %{buildroot}/bin +ln -s %{_sbindir}/agetty %{buildroot}/sbin +ln -s %{_sbindir}/blockdev %{buildroot}/sbin +ln -s %{_sbindir}/cfdisk %{buildroot}/sbin +ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin +ln -s %{_sbindir}/fdisk %{buildroot}/sbin +ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin +ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin +ln -s %{_sbindir}/hwclock %{buildroot}/sbin +ln -s %{_sbindir}/losetup %{buildroot}/sbin +ln -s %{_sbindir}/mkfs %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin +ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin +ln -s %{_sbindir}/mkswap %{buildroot}/sbin +ln -s %{_sbindir}/nologin %{buildroot}/sbin +ln -s %{_sbindir}/pivot_root %{buildroot}/sbin +ln -s %{_sbindir}/raw %{buildroot}/sbin +ln -s %{_sbindir}/sfdisk %{buildroot}/sbin +ln -s %{_sbindir}/swapoff %{buildroot}/sbin +ln -s %{_sbindir}/swapon %{buildroot}/sbin +ln -s %{_sbindir}/blkid %{buildroot}/sbin +ln -s %{_sbindir}/findfs %{buildroot}/sbin +ln -s %{_sbindir}/fsck %{buildroot}/sbin +ln -s %{_sbindir}/switch_root %{buildroot}/sbin +ln -s %{_sbindir}/wipefs %{buildroot}/sbin +ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin +ln -s %{_sbindir}/swaplabel %{buildroot}/sbin +ln -s %{_sbindir}/fstrim %{buildroot}/sbin +ln -s %{_sbindir}/chcpu %{buildroot}/sbin +#EndUsrMerge +install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems +%ifnarch ppc ppc64 +install -m 755 mkzimage_cmdline %{buildroot}%{_bindir} +install -m 644 %{S:28} %{buildroot}%{_mandir}/man8 +install -m 755 chrp-addnote %{buildroot}%{_bindir} +%endif +# setctsid install +install -m 755 setctsid %{buildroot}%{_sbindir} +install -m 444 setctsid.8 %{buildroot}%{_mandir}/man8/ +echo -e "#! /bin/bash\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb +chmod 755 %{buildroot}%{_sbindir}/flushb +# Install scripts to configure raw devices at boot time +install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw +install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw +ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw +# upstream moved getopt examples from datadir to docdir but we keep +# the old location because we would need to fix the manpage first +mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ +# Stupid hack so we don't have a tcsh dependency +chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh +# Following files we don't want to package, so remove them +rm -f %{buildroot}%{_bindir}/pg +rm -f %{buildroot}%{_mandir}/man1/pg.1* +# Do not package these files to get rid of the perl dependency +rm -f %{buildroot}%{_bindir}/chkdupexe +rm -f %{buildroot}%{_mandir}/man1/chkdupexe.1 +# we use this tools from pwdutils +rm -f %{buildroot}%{_bindir}/{chfn,chsh,newgrp} +rm -f %{buildroot}%{_sbindir}/{vigr,vipw} +rm -f %{buildroot}%{_mandir}/man1/{chfn.1*,chsh.1*,newgrp.1*} +rm -f %{buildroot}%{_mandir}/man8/{vigr.8*,vipw.8*} +# login is always and only in /bin +mv %{buildroot}%{_bindir}/login %{buildroot}/bin/ +# arch dependent +%ifarch s390 s390x +rm -f %{buildroot}%{_sysconfdir}/fdprm +rm -f %{buildroot}%{_sbindir}/fdformat +rm -f %{buildroot}%{_sbindir}/hwclock +#UsrMerge +rm -f %{buildroot}/sbin/hwclock +#EndUsrMerge +rm -f %{buildroot}%{_sbindir}/klogconsole +rm -f %{buildroot}%{_bindir}/setterm +rm -f %{buildroot}%{_sbindir}/tunelp +rm -f %{buildroot}%{_mandir}/man8/fdformat.8* +rm -f %{buildroot}%{_mandir}/man8/hwclock.8* +rm -f %{buildroot}%{_mandir}/man8/klogconsole.8* +rm -f %{buildroot}%{_mandir}/man8/tunelp.8* +%endif +%ifarch ia64 %sparc m68k +rm -f %{buildroot}%{_mandir}/man8/cfdisk.8* +rm -f %{buildroot}%{_mandir}/man8/sfdisk.8* +rm -f %{buildroot}%{_sbindir}/cfdisk +#UsrMerge +rm -f %{buildroot}/sbin/cfdisk +#EndUsrMerge +rm -f %{buildroot}%{_sbindir}/sfdisk +#UsrMerge +rm -f %{buildroot}/sbin/sfdisk +#EndUsrMerge +%endif +%ifarch ia64 m68k +rm -f %{buildroot}%{_sbindir}/fdisk +#UsrMerge +rm -f %{buildroot}/sbin/fdisk +#EndUsrMerge +rm -f %{buildroot}%{_mandir}/man8/fdisk.8* +%endif +%find_lang %{name} %{name}.lang +# create list of setarch(8) symlinks +find %{buildroot}%{_bindir}/ -regextype posix-egrep -type l \ + -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)$" \ + -printf "%{_bindir}/%f\n" >> %{name}.files +find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \ + -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)\.8.*" \ + -printf "%{_mandir}/man8/%f*\n" >> %{name}.files +%else +# install systemd files manually, don't use Makefile that expect build of utilities and its dependencies. +%endif +%if %build_util_linux_systemd +mkdir -p %{buildroot}%{_sysconfdir}/init.d +mkdir -p %{buildroot}/bin +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid +mkdir -p %{buildroot}/run/uuidd +install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd +ln -s %{_bindir}/logger %{buildroot}/bin +# clock.txt from uuidd is a ghost file +touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt +# rcuuidd helper +ln -sf ../..%{_sysconfdir}/init.d/uuidd %{buildroot}%{_sbindir}/rcuuidd +%if !%build_util_linux +%make_install +%endif +%endif +# link duplicate manpages and python bindings +%fdupes -s %{buildroot}%{_prefix} + +%if %build_util_linux +%post +%{fillup_and_insserv raw} +%set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount +%if %{with enable_su} +%set_permissions %{_bindir}/su +# Safely migrate PAM files from coreutils to util-linux +# (openSUSE 12.3->13.1, SLE11->SLE12) +# +# coreutils with su were upgraded (and su removed) before util-linux +# with su was installed (see the Conflicts above). If the admin edited +# the PAM file, the seemingly no more used modified file was saved as +# .rpmsave and the new clean file was installed. As we want +# "noreplace" upgrade, and the contents of the clean file contents has +# no changes, we should restore admin modification, and rename the +# clean file to .rpmnew, as it would happen if the file was not moved +# from one package to another. +for PAM_FILE in default/su pam.d/su pam.d/su-l ; do + if test -f %{_sysconfdir}/$PAM_FILE.rpmsave ; then + mv %{_sysconfdir}/$PAM_FILE %{_sysconfdir}/$PAM_FILE.rpmnew + mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE + fi +done +%endif + +# mount option 'code=' is now called 'codepage=' so change fstab +if [ -f etc/fstab ]; then + sed -i 's:code=:codepage=:' etc/fstab +fi + +%postun +%install_info_delete --info-dir=%{_infodir} %{_infodir}/ipc.info.gz +%{insserv_cleanup} + +%verifyscript +%verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount +%if %{with enable_su} +%verify_permissions -e %{_bindir}/su +%endif + +%post -n libblkid1 -p /sbin/ldconfig + +%postun -n libblkid1 -p /sbin/ldconfig + +%post -n libmount1 -p /sbin/ldconfig + +%postun -n libmount1 -p /sbin/ldconfig + +%post -n libsmartcols1 -p /sbin/ldconfig + +%postun -n libsmartcols1 -p /sbin/ldconfig + +%post -n libuuid1 -p /sbin/ldconfig + +%postun -n libuuid1 -p /sbin/ldconfig + +%files lang -f %{name}.lang +%endif + +%if %build_util_linux_systemd +%pre -n uuidd +%{_sbindir}/groupadd -r uuidd 2>/dev/null || : +%{_sbindir}/useradd -r -g uuidd -c "User for uuidd" \ + -d /var/run/uuidd uuidd 2>/dev/null || : + +%preun -n uuidd +%{stop_on_removal uuidd} + +%post -n uuidd +%{fillup_and_insserv -n uuidd} +%set_permissions %{_sbindir}/uuidd + +%postun -n uuidd +%{restart_on_update uuidd} +%{insserv_cleanup} + +%verifyscript -n uuidd +%verify_permissions -e %{_sbindir}/uuidd +%endif + +%if %build_util_linux +%files -f %{name}.files +# Common files for all archs +%defattr(-,root,root) +# util-linux documentation files +%doc Documentation/blkid.txt +%doc Documentation/cal.txt +%doc Documentation/col.txt +%doc Documentation/deprecated.txt +%doc Documentation/fdisk.txt +%doc Documentation/getopt.txt +%doc Documentation/howto-debug.txt +%doc Documentation/hwclock.txt +%doc Documentation/modems-with-agetty.txt +%doc Documentation/mount.txt +%doc Documentation/pg.txt +%doc Documentation/sfdisk.txt +%config %attr(744,root,root) %{_sysconfdir}/init.d/raw +%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw +%config(noreplace) %{_sysconfdir}/filesystems +%config(noreplace) %{_sysconfdir}/blkid.conf +%config(noreplace) %{_sysconfdir}/pam.d/login +%config(noreplace) %{_sysconfdir}/pam.d/remote +%if %{with enable_su} +%config(noreplace) %{_sysconfdir}/pam.d/su +%config(noreplace) %{_sysconfdir}/pam.d/su-l +%config(noreplace) %{_sysconfdir}/default/su +%endif +#UsrMerge +%if %{with enable_su} +/bin/kill +/bin/su +%endif +/bin/dmesg +/bin/more +/bin/mount +/bin/umount +/bin/findmnt +/bin/login +/bin/lsblk +/sbin/agetty +/sbin/blockdev +/sbin/ctrlaltdel +/sbin/fsck.minix +/sbin/fsck.cramfs +/sbin/losetup +/sbin/mkfs +/sbin/mkfs.bfs +/sbin/mkfs.minix +/sbin/mkfs.cramfs +/sbin/mkswap +/sbin/nologin +/sbin/pivot_root +/sbin/raw +/sbin/swapoff +/sbin/swapon +/sbin/blkid +/sbin/findfs +/sbin/fsck +/sbin/switch_root +/sbin/wipefs +/sbin/fsfreeze +/sbin/swaplabel +/sbin/fstrim +/sbin/chcpu +#EndUsrMerge +%if %{with enable_su} +%{_bindir}/kill +%{_bindir}/su +%endif +%if %{with enable_eject} +%if 0%{?suse_version} <= 1310 +%verify(not mode) %attr(4750,root,audio) %{_bindir}/eject +%else +%{_bindir}/eject +%endif +%endif +%{_bindir}/cal +%{_bindir}/chrt +%{_bindir}/col +%{_bindir}/colcrt +%{_bindir}/colrm +%{_bindir}/column +%{_bindir}/dmesg +%{_bindir}/fallocate +%{_bindir}/findmnt +%{_bindir}/flock +%{_bindir}/getopt +%{_bindir}/hexdump +%{_bindir}/ionice +%{_bindir}/ipcmk +%{_bindir}/ipcrm +%{_bindir}/ipcs +%{_bindir}/isosize +%if %{with enable_last} +%{_bindir}/last +%{_bindir}/lastb +%endif +%{_bindir}/line +%{_bindir}/look +%{_bindir}/lsblk +%{_bindir}/lscpu +%{_bindir}/lslocks +%{_bindir}/mcookie +%{_bindir}/mesg +%{_bindir}/more +%{_bindir}/mount +%{_bindir}/namei +%{_bindir}/nsenter +%{_bindir}/prlimit +%{_bindir}/rename +%{_bindir}/renice +%{_bindir}/rev +%{_bindir}/script +%{_bindir}/scriptreplay +%{_bindir}/setarch +%{_bindir}/setpriv +%{_bindir}/setsid +%{_bindir}/tailf +%{_bindir}/taskset +%{_bindir}/ul +%{_bindir}/umount +%{_bindir}/unshare +%if %{with sysvinit_tools} +%{_bindir}/mountpoint +%{_bindir}/utmpdump +%endif +%{_bindir}/uuidgen +%{_bindir}/uname26 +%ifnarch ppc ppc64 +%{_bindir}/chrp-addnote +%{_bindir}/mkzimage_cmdline +%endif +%{_bindir}/wdctl +%{_sbindir}/addpart +%{_sbindir}/agetty +%{_sbindir}/blkid +%{_sbindir}/blkdiscard +%{_sbindir}/blockdev +%{_sbindir}/chcpu +%{_sbindir}/ctrlaltdel +%{_sbindir}/delpart +%{_sbindir}/findfs +%{_sbindir}/fsck +%{_sbindir}/fsck.minix +%{_sbindir}/fsck.cramfs +%{_sbindir}/fsfreeze +%{_sbindir}/fstrim +%{_sbindir}/ldattach +%{_sbindir}/losetup +%{_sbindir}/mkfs +%{_sbindir}/mkfs.bfs +%{_sbindir}/mkfs.minix +%{_sbindir}/mkfs.cramfs +%{_sbindir}/mkswap +%{_sbindir}/nologin +%{_sbindir}/partx +%{_sbindir}/pivot_root +%{_sbindir}/raw +%{_sbindir}/rcraw +%{_sbindir}/resizepart +%{_sbindir}/rtcwake +%{_sbindir}/runuser +%{_sbindir}/setctsid +%if %{with sysvinit_tools} +%{_sbindir}/sulogin +%endif +%{_sbindir}/swaplabel +%{_sbindir}/swapoff +%{_sbindir}/swapon +%{_sbindir}/switch_root +%{_sbindir}/wipefs +%verify(not mode) %attr(0755,root,tty) %{_bindir}/wall +%{_bindir}/whereis +%verify(not mode) %attr(0755,root,tty) %{_bindir}/write +%if %{with enable_su} +%{_mandir}/man1/kill.1.gz +%{_mandir}/man1/su.1.gz +%endif +%{_mandir}/man1/cal.1.gz +%{_mandir}/man1/chrt.1.gz +%{_mandir}/man1/col.1.gz +%{_mandir}/man1/colcrt.1.gz +%{_mandir}/man1/colrm.1.gz +%{_mandir}/man1/column.1.gz +%{_mandir}/man1/dmesg.1.gz +%if %{with enable_eject} +%{_mandir}/man1/eject.1.gz +%endif +%{_mandir}/man1/fallocate.1.gz +%{_mandir}/man1/flock.1.gz +%{_mandir}/man1/getopt.1.gz +%{_mandir}/man1/hexdump.1.gz +%{_mandir}/man1/ipcrm.1.gz +%{_mandir}/man1/ipcs.1.gz +%if %{with enable_last} +%{_mandir}/man1/last.1.gz +%{_mandir}/man1/lastb.1.gz +%endif +%{_mandir}/man1/line.1.gz +%{_mandir}/man1/login.1.gz +%{_mandir}/man1/look.1.gz +%{_mandir}/man1/lscpu.1.gz +%{_mandir}/man1/mcookie.1.gz +%{_mandir}/man1/mesg.1.gz +%{_mandir}/man1/more.1.gz +%{_mandir}/man1/namei.1.gz +%{_mandir}/man1/nsenter.1.gz +%{_mandir}/man1/ionice.1.gz +%{_mandir}/man1/prlimit.1.gz +%{_mandir}/man1/rename.1.gz +%{_mandir}/man1/rev.1.gz +%{_mandir}/man1/renice.1.gz +%{_mandir}/man1/setpriv.1.gz +%{_mandir}/man1/setsid.1.gz +%{_mandir}/man1/script.1.gz +%{_mandir}/man1/scriptreplay.1.gz +%{_mandir}/man1/setterm.1.gz +%{_mandir}/man1/tailf.1.gz +%{_mandir}/man1/taskset.1.gz +%{_mandir}/man1/ul.1.gz +%{_mandir}/man1/unshare.1.gz +%{_mandir}/man1/wall.1.gz +%{_mandir}/man1/whereis.1.gz +%{_mandir}/man1/write.1.gz +%{_mandir}/man1/ipcmk.1.gz +%if %{with sysvinit_tools} +%{_mandir}/man1/mountpoint.1.gz +%{_mandir}/man1/utmpdump.1.gz +%endif +%{_mandir}/man1/runuser.1.gz +%{_mandir}/man1/uuidgen.1.gz +%{_mandir}/man5/fstab.5.gz +%{_mandir}/man5/terminal-colors.d.5.gz +%{_mandir}/man8/addpart.8.gz +%{_mandir}/man8/agetty.8.gz +%{_mandir}/man8/blockdev.8.gz +%{_mandir}/man8/delpart.8.gz +%{_mandir}/man8/ctrlaltdel.8.gz +%{_mandir}/man8/blkid.8.gz +%{_mandir}/man8/blkdiscard.8.gz +%{_mandir}/man8/switch_root.8.gz +%{_mandir}/man8/mkfs.bfs.8.gz +%{_mandir}/man8/mkfs.minix.8.gz +%{_mandir}/man8/findfs.8.gz +%{_mandir}/man8/fsck.8.gz +%{_mandir}/man8/fsck.cramfs.8.gz +%{_mandir}/man8/fsck.minix.8.gz +%{_mandir}/man8/isosize.8.gz +%{_mandir}/man8/ldattach.8.gz +%{_mandir}/man8/losetup.8.gz +%{_mandir}/man8/lslocks.8.gz +%{_mandir}/man8/mkfs.8.gz +%{_mandir}/man8/mkfs.cramfs.8.gz +%{_mandir}/man8/mkswap.8.gz +%{_mandir}/man8/mount.8.gz +%{_mandir}/man8/nologin.8.gz +%{_mandir}/man8/findmnt.8.gz +%{_mandir}/man8/fsfreeze.8.gz +%{_mandir}/man8/swaplabel.8.gz +%{_mandir}/man8/readprofile.8.gz +%{_mandir}/man8/chcpu.8.gz +%ifnarch ppc ppc64 +%{_mandir}/man8/mkzimage_cmdline.8.gz +%endif +%{_mandir}/man8/partx.8.gz +%{_mandir}/man8/pivot_root.8.gz +%{_mandir}/man8/raw.8.gz +%{_mandir}/man8/rtcwake.8.gz +%{_mandir}/man8/setarch.8.gz +%{_mandir}/man8/swapoff.8.gz +%{_mandir}/man8/swapon.8.gz +%{_mandir}/man8/umount.8.gz +%{_mandir}/man8/uname26.8.gz +%{_mandir}/man8/setctsid.8.gz +%{_mandir}/man8/wipefs.8.gz +%{_mandir}/man8/fstrim.8.gz +%{_mandir}/man8/lsblk.8.gz +%{_mandir}/man8/resizepart.8.gz +%if %{with sysvinit_tools} +%{_mandir}/man8/sulogin.8.gz +%endif +%{_mandir}/man8/wdctl.8.gz +%{_sbindir}/flushb +%{_sbindir}/readprofile +%dir %{_datadir}/getopt +%attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash +%attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh +# FIXME: Fix directory ownership. +%dir %{_datadir}/bash-completion +%{_datadir}/bash-completion/* +%if %build_util_linux_systemd +%exclude %{_datadir}/bash-completion/logger +%exclude %{_datadir}/bash-completion/uuidd +%endif +%ifnarch ia64 m68k +#XXX: post our patches upstream +#XXX: call fdupes on /usr/share/man +#UsrMerge +/sbin/fdisk +#EndUsrMerge +%{_sbindir}/fdisk +%{_mandir}/man8/fdisk.8.gz +%endif +%ifnarch %sparc ia64 m68k +%{_mandir}/man8/cfdisk.8.gz +%{_mandir}/man8/sfdisk.8.gz +#UsrMerge +/sbin/cfdisk +/sbin/sfdisk +#EndUsrMerge +%{_sbindir}/cfdisk +%{_sbindir}/sfdisk +%endif +%ifnarch s390 s390x +%{_sbindir}/fdformat +#UsrMerge +/sbin/hwclock +#EndUsrMerge +%{_sbindir}/hwclock +%{_sbindir}/klogconsole +%{_bindir}/setterm +%{_sbindir}/tunelp +%{_mandir}/man8/fdformat.8.gz +%{_mandir}/man8/hwclock.8.gz +%{_mandir}/man8/klogconsole.8.gz +%{_mandir}/man8/tunelp.8.gz +%endif + +%files -n libblkid1 +%defattr(-, root, root) +%{_libdir}/libblkid.so.1 +%{_libdir}/libblkid.so.1.* + +%files -n libblkid-devel +%defattr(-, root, root) +%{_libdir}/libblkid.so +%dir %{_includedir}/blkid +%{_includedir}/blkid/blkid.h +%{_libdir}/pkgconfig/blkid.pc +%{_mandir}/man3/libblkid.3.gz + +%files -n libblkid-devel-static +%defattr(-, root, root) +%{_libdir}/libblkid.*a + +%files -n libmount1 +%defattr(-, root, root) +%{_libdir}/libmount.so.1 +%{_libdir}/libmount.so.1.* + +%files -n libmount-devel +%defattr(-, root, root) +%{_libdir}/libmount.so +%dir %{_includedir}/libmount +%{_includedir}/libmount/libmount.h +%{_libdir}/pkgconfig/mount.pc + +%files -n libmount-devel-static +%defattr(-, root, root) +%{_libdir}/libmount.*a + +%files -n libsmartcols1 +%defattr(-, root, root) +%{_libdir}/libsmartcols.so.1 +%{_libdir}/libsmartcols.so.1.* + +%files -n libsmartcols-devel +%defattr(-, root, root) +%{_libdir}/libsmartcols.so +%dir %{_includedir}/libsmartcols +%{_includedir}/libsmartcols/libsmartcols.h +%{_libdir}/pkgconfig/smartcols.pc + +%files -n libsmartcols-devel-static +%defattr(-, root, root) +%{_libdir}/libsmartcols.*a + +%files -n libuuid1 +%defattr(-, root, root) +%{_libdir}/libuuid.so.1 +%{_libdir}/libuuid.so.1.* + +%files -n libuuid-devel +%defattr(-, root, root) +%{_libdir}/libuuid.so +%dir %{_includedir}/uuid +%{_includedir}/uuid/uuid.h +%{_libdir}/pkgconfig/uuid.pc +%{_mandir}/man3/uuid* + +%files -n libuuid-devel-static +%defattr(-, root, root) +%{_libdir}/libuuid.*a +%endif + +%if %build_util_linux_systemd +%if %build_util_linux +%files systemd +%else +%files +%endif +%defattr(-, root, root) +/bin/logger +%{_bindir}/logger +%{_bindir}/lslogins +%{_datadir}/bash-completion/logger +%{_mandir}/man1/logger.1.gz +%{_mandir}/man1/lslogins.1.gz +%{_unitdir}/fstrim.service +%{_unitdir}/fstrim.timer + +%files -n uuidd +%defattr(-, root, root) +%verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd +%attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid +%ghost %{_localstatedir}/lib/libuuid/clock.txt +%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd +%{_datadir}/bash-completion/uuidd +%{_initddir}/uuidd +%{_mandir}/man8/uuidd.8.gz +%{_sbindir}/rcuuidd +%{_unitdir}/uuidd.service +%{_unitdir}/uuidd.socket +%endif + +%if %build_python_libmount +%if %build_util_linux +%files -n python-libmount +%else +%files +%endif +%defattr(-, root, root) +%{python_sitearch}/libmount +%endif + +%changelog diff --git a/util-linux.changes b/util-linux.changes index 2936f09..2eaed7c 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,61 @@ +------------------------------------------------------------------- +Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz + +- Update to version 2.25 + (using work of Ruediger Meier ): + * based on the git master branch of util-linux + * many fixes (including bnc#869355, bnc#871951 and + bnc#871698#c49) + * new Python binding sub-package for libmount: python-libmount + * new library: libsmartcols + * new commands: lslogins, setpriv + * add fstrim systemd timer + * better systemd integration + * DROPPED command: + * cytune: Upstream decided to remove tool untested for years + that supports this old hardware. +- Dropped patches included in the upstream: + (*git) Included with no changes + (+git) Included with improvements + (!git) Included with differences + * support-other-tty-lines-not-vconsole.patch (*b9c7390) + * agetty-fooled-on-serial-line-due-plymouth.patch, + * sulogin-fooled-on-tty-line-due-plymouth.patch (*bb280f7) + * agetty-on-s390-on-dev-3270-tty1-line.patch (*f2bcda5) + * sulogin-does-not-find-any-console.patch (*624b204) + * util-linux-setarch-uname26.patch (*f6eb160) + * util-linux-ng-2.16-squashfs3-detect.patch (*11402f5) + * util-linux-lscpu-improve-hypervisor-detection.patch + (!b774473, b32488c, 5bd31c6, 0f0c558, 96ce475) + WARNING, INCOMPATIBLE CHANGE: "lscpu -p" no more reports + hypervisor, as it breaks standard behavior. Use standard output + instead! (FATE#310255) + * blkid-stop-scanning-on-I-O-error.patch (+296d96e) + * blkid-convert-superblocks-to-new-calling-convention.patch + (+37f4060) + * util-linux-libblkid-ext-probe.patch (*a1ca32f) + * util-linux-hwclock-drift-check.patch (*f196fd1) + * util-linux-hwclock-adjtime-check.patch (*db8fc5f) +- Dropped obsolete patch: + * util-linux-2.23.1-eject-fpie.patch (eject is no more SUID) + * util-linux-2.24-fdisk_remove_bogus_warnings.patch + (upstream fixed it in a different way) + * util-linux-HACK-boot.localfs.diff + (MOUNT_PRINT_SOURCE is no more referenced) +- Ported and renamed: + * util-linux-2.23.1-noenc-suse.diff + -> util-linux-noenc-suse.patch +- Split spec file to three stages: + * util-linux.spec: Everything that do not need python or systemd. + * util-linux-systemd.spec: Stuff that needs systemd: + util-linux-systemd and uuidd + NOTE: Not building systemd-less variants of utilities. + * python-libmount.spec: Just python-libmount +- Move bash-completion files to correct packages. +- Add patch util-linux-bash-completion-blockdev.patch. +- Add hacks to prevent damaging of spec files by format_spec_file + (bnc#891152, also edited util-linux-rpmlintrc). + ------------------------------------------------------------------- Sat Jul 26 11:44:57 UTC 2014 - dimstar@opensuse.org @@ -17,7 +75,7 @@ Thu Jul 24 18:45:53 CEST 2014 - dsterba@suse.cz ------------------------------------------------------------------- Tue May 27 21:17:40 UTC 2014 - sweet_f_a@gmx.de -- use nologin from upstream (was added in 2.24) +- use nologin from upstream (was added in 2.24) - remove unknown configure options - remove unused and outdated suse READMEs - require bc for checks diff --git a/util-linux.group b/util-linux.group new file mode 100644 index 0000000..6b3b994 --- /dev/null +++ b/util-linux.group @@ -0,0 +1 @@ +Group: System/Base diff --git a/util-linux.license b/util-linux.license new file mode 100644 index 0000000..4360fb4 --- /dev/null +++ b/util-linux.license @@ -0,0 +1 @@ +License: GPL-2.0+ diff --git a/util-linux.preamble b/util-linux.preamble new file mode 100644 index 0000000..4360fb4 --- /dev/null +++ b/util-linux.preamble @@ -0,0 +1 @@ +License: GPL-2.0+ diff --git a/util-linux.python-libmount b/util-linux.python-libmount new file mode 100644 index 0000000..495db08 --- /dev/null +++ b/util-linux.python-libmount @@ -0,0 +1,2 @@ +Summary: Python bindings for the libmount library +Group: System/Filesystems diff --git a/util-linux.spec b/util-linux.spec index d42cffa..da3f510 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -17,23 +17,53 @@ %bcond_without sysvinit_tools -%bcond_without enable_su -%bcond_without enable_eject +%bcond_without enable_su +%bcond_without enable_eject %bcond_with enable_last Name: util-linux +%define _name util-linux +# WARNING: After editing this file please call pre_checkin.sh to update spec files: +%define _name util-linux +# To prevent dependency loop in automatic build systems, we want to +# build util-linux in parts. To build all at once, set build_all to 1. +# +# build_util_linux: First stage build builds all except: +# build_util_linux_systemd: Builds util-linux-systemd and uuidd. +# build_python_libmount: Builds python-libmount. +%define build_all 0 +%if "%{name}" == "python-libmount" +%define build_util_linux 0 +%define build_util_linux_systemd 0 +%define build_python_libmount 1 +# To prevent dependency loops, verify signature only in third stage. +%define verify_sig 1 +%else +%if "%{name}" == "util-linux-systemd" +%define build_util_linux 0 +%define build_util_linux_systemd 1 +%define build_python_libmount 0 +%define verify_sig 0 +%else +%if %build_all +%define build_util_linux 1 +%define build_util_linux_systemd 1 +%define build_python_libmount 1 +%define verify_sig 1 +%else +%define build_util_linux 1 +%define build_util_linux_systemd 0 +%define build_python_libmount 0 +%define verify_sig 0 +%endif +%endif +%endif BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel BuildRequires: fdupes BuildRequires: gettext-devel -# Use rpmbuild -D 'VERIFY_SIG 1' to verify signature during build or run -# one-shot check by -# xzcat util-linux-*.tar.xz | \ -# sh -x gpg-offline --verify --package=util-linux *.tar.sign - -%if 0%{?VERIFY_SIG} -BuildRequires: gpg-offline -%endif +BuildRequires: libcap-ng-devel BuildRequires: libselinux-devel BuildRequires: libsepol-devel BuildRequires: libtool @@ -41,14 +71,37 @@ BuildRequires: ncurses-devel BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: readline-devel +BuildRequires: utempter-devel +BuildRequires: zlib-devel +%if %verify_sig +BuildRequires: gpg-offline +%endif +%if %build_util_linux_systemd %if 0%{?suse_version} <= 1230 BuildRequires: pkgconfig(systemd) %else BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-journal) %endif -BuildRequires: utempter-devel -BuildRequires: zlib-devel -Version: 2.24.2 +%endif +%if %build_python_libmount +BuildRequires: python-devel +%endif +#BEGIN SECOND STAGE DEPENDENCIES +%if !%build_util_linux +%if %build_util_linux_systemd +BuildRequires: libblkid-devel +BuildRequires: libmount-devel +BuildRequires: libsmartcols-devel +BuildRequires: libuuid-devel +%endif +%if %build_python_libmount +BuildRequires: libmount-devel +%endif +%endif +#END SECOND STAGE DEPENDENCIES +Version: 2.25 Release: 0 # util-linux is a base package and uuidd pre-requiring pwdutils pulls # that into the core build cycle. pwdutils also pulls in the whole @@ -57,16 +110,17 @@ Release: 0 # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -Supplements: filesystem(minix) -Provides: fsck-with-dev-lock = %{version} -# bnc#651598: -Provides: util-linux(fake+no-canonicalize) -PreReq: %install_info_prereq permissions -Recommends: %{name}-lang = %{version} -Summary: A collection of basic system utilities +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP License: GPL-2.0+ Group: System/Base -Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz +%endif +# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.preamble +#END UGLY HACK +Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz Source1: util-linux-rpmlintrc Source4: raw.init Source5: etc.raw @@ -76,8 +130,8 @@ Source8: login.pamd Source9: remote.pamd Source10: su.pamd Source11: su.default -Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.sign -Source13: %{name}.keyring +Source12: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.sign +Source13: %{_name}.keyring # TODO: split to separate package Source40: klogconsole.tar.bz2 # XXX: Run a program in a new session and with controlling tty @@ -90,52 +144,43 @@ Source31: addnote.c # Source50: uuidd.rc Source51: blkid.conf +# detachec parts of spec file +Source100: util-linux.preamble +Source101: util-linux.util-linux +Source102: util-linux.python-libmount ## ## util-linux patches ## -# 241372 - remove legacy warnings from fdisk -Patch1: util-linux-2.24-fdisk_remove_bogus_warnings.patch -Patch2: util-linux-2.23.1-eject-fpie.patch # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff -# disable encryption -Patch12: util-linux-2.23.1-noenc-suse.diff -# PATCH-FIX-SUSE Be aware that there are e.g. xvc/hvc -Patch14: support-other-tty-lines-not-vconsole.patch -# PATCH-FIX-SUSE -- Let agetty not be fooled by locked termios srtucture -Patch15: agetty-fooled-on-serial-line-due-plymouth.patch -# PATCH-FIX-SUSE -- Let agetty detect /dev/3270/tty1 as device not as baud rate -Patch16: agetty-on-s390-on-dev-3270-tty1-line.patch -# PATCH-FIX-SUSE -- Make sure that plymouth does not break sulogin -Patch17: sulogin-fooled-on-tty-line-due-plymouth.patch -# PATCH-FIX-SUSE -- sulogin: find suitable console device even if first is not usable -Patch18: sulogin-does-not-find-any-console.patch -# PATCH-FEATURE-SLES util-linux-setarch-uname26.patch fate313476 sbrabec@suse.cz -- Support for uname26 binary. -Patch19: util-linux-setarch-uname26.patch -# hack for boot.localfs -Patch20: util-linux-HACK-boot.localfs.diff -# PATCH-FEATURE-SLES util-linux-ng-2.16-squashfs3-detect.patch bnc666893 mszeredi@suse.cz -- Detect squashfs version <= 3 as squashfs3 and version >= 4 as squashfs. -Patch21: util-linux-ng-2.16-squashfs3-detect.patch -# PATCH-FEATURE-SLES util-linux-lscpu-improve-hypervisor-detection.patch fate310255 puzel@novell.com -- Improve hypervisor detection. -Patch24: util-linux-lscpu-improve-hypervisor-detection.patch -# PATH-FIX-SLES blkid-stop-scanning-on-I-O-error.patch bnc859062 hare@suse.de -- Abort blkid probing on I/O errors -Patch30: blkid-stop-scanning-on-I-O-error.patch -# PATH-FIX-SLES lkid-convert-superblocks-to-new-calling-convention.patch bnc859062 hare@suse.de -- convert blkid probing functions to new calling sequence -Patch31: blkid-convert-superblocks-to-new-calling-convention.patch -# PATH-FIX-UPSTREAM util-linux-libblkid-ext-probe.patch bnc864703 sbrabec@suse.cz -- libblkid: Drop the broken ext2/ext3/ext4 discrimination logic. -Patch32: util-linux-libblkid-ext-probe.patch -# PATCH-FIX-UPSTREAM bnc871698 sbrabec@suse.cz -Patch33: util-linux-prevent-excessive-clock-drift-calculations.patch - +# PATCH-FEATURE-SUSE -- Report about disabled encryption to stderr. +Patch12: util-linux-noenc-suse.patch +# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. +Patch13: util-linux-bash-completion-blockdev.patch ## ## klogconsole ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff - BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: %insserv_prereq %fillup_prereq /bin/sed # +%if %build_util_linux +Supplements: filesystem(minix) +Provides: fsck-with-dev-lock = %{version} +# bnc#651598: +Provides: util-linux(fake+no-canonicalize) +PreReq: %install_info_prereq permissions +PreReq: %insserv_prereq %fillup_prereq /bin/sed +Recommends: %{name}-lang = %{version} +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP +Group: System/Base +%endif +# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.util-linux +#END UGLY HACK %if %{with enable_eject} Provides: eject = 2.1.0-166.8 %endif @@ -170,7 +215,37 @@ Obsoletes: uuid-runtime < %{version}-%{release} Recommends: adjtimex Recommends: time Recommends: which +%else +# Exact copy of headers below is needed for spec cleaner that does not support +# if condition across preamble and subsequent sections. +%if %build_python_libmount +# Exact copy of the %%package tag from python-libmount section below: +#BEGIN UGLY HACK +%if 0 +# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) +Summary: TRAP +Group: System/Base +%endif +# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. +%include %{_sourcedir}/util-linux.python-libmount +#END UGLY HACK +%else +%if %build_util_linux_systemd +# Exact copy of the %%package tag from systemd section below: +Summary: A collection of basic systemd utilities +Group: System/Base +Supplements: packageand(util-linux:systemd) +# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 +Provides: util-linux:/usr/lib/systemd/system/fstrim.service +# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 +Conflicts: util-linux < 2.25 +%else +# ERROR: No build_* variables are set. +%endif +%endif +%endif +%if %build_util_linux %description This package contains a large variety of low-level system utilities that are necessary for a Linux system to function. It contains the @@ -201,19 +276,6 @@ Requires: libblkid-devel = %{version} Files needed to develop applications using the library for filesystem detection. -%package -n uuidd -Summary: Helper daemon to guarantee uniqueness of time-based UUIDs -Group: System/Filesystems -PreReq: %fillup_prereq -PreReq: %insserv_prereq -PreReq: permissions -PreReq: pwdutils - -%description -n uuidd -The uuidd package contains a userspace daemon (uuidd) which guarantees -uniqueness of time-based UUID generation even at very high rates on -SMP systems. - %package -n libuuid1 Summary: Library to generate UUIDs Group: System/Filesystems @@ -252,9 +314,6 @@ Summary: Development files for libmount1 Group: Development/Libraries/C and C++ Requires: libmount1 = %{version} -%description -n libmount-devel -Files to develop applications using the libmount library. - %package -n libmount-devel-static Summary: Development files for libmount1 Group: Development/Libraries/C and C++ @@ -263,31 +322,91 @@ Requires: libmount-devel = %{version} %description -n libmount-devel-static Files to develop applications using the libmount library. +%description -n libmount-devel +Files to develop applications using the libmount library. + +%package -n libsmartcols1 +Summary: Column-based text sort engine +Group: System/Libraries + +%description -n libsmartcols1 +Library to sort human readable column-based text output. + +%package -n libsmartcols-devel +Summary: Development files for libsmartcols1 +Group: Development/Libraries/C and C++ +Requires: libsmartcols1 = %{version} + +%description -n libsmartcols-devel +Files to develop applications using the libsmartcols library. + +%package -n libsmartcols-devel-static +Summary: Development files for libsmartcols1 +Group: Development/Libraries/C and C++ +Requires: libsmartcols-devel = %{version} + +%description -n libsmartcols-devel-static +Files to develop applications using the libsmartcols library. + %lang_package -%prep -%if 0%{?VERIFY_SIG} -xzcat %{S:0} | %gpg_verify %{S:12} - %endif -%setup -q -n %{name}-%{version} -b 40 -%patch1 -p1 -%patch2 -p1 +%if %build_util_linux_systemd +%if %build_util_linux +%package systemd +# Do not forget to copy duplicate of this section to the preamble: +Summary: A collection of basic systemd utilities +Group: System/Base +Supplements: packageand(util-linux:systemd) +# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 +Provides: util-linux:/usr/lib/systemd/system/fstrim.service +# Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 +Conflicts: util-linux < 2.25 + +%description systemd +%else +%description +%endif +This package contains low-level util-linux utilities that use systemd. + +%package -n uuidd +Summary: Helper daemon to guarantee uniqueness of time-based UUIDs +Group: System/Filesystems +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: permissions +PreReq: pwdutils +# uuidd bash-completion moved to a correct package +Conflicts: util-linux < 2.25 + +%description -n uuidd +The uuidd package contains a userspace daemon (uuidd) which guarantees +uniqueness of time-based UUID generation even at very high rates on +SMP systems. + +%endif +%if %build_python_libmount +%if %build_util_linux +%package -n python-libmount +# Do not forget to copy duplicate of this section to the preamble: +Summary: Python bindings for the libmount library +Group: System/Filesystems + +%description -n python-libmount +%else +%description +%endif +This package contains the python bindings for util-linux libmount +library. + +%endif +%prep +%if %verify_sig +xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - +%endif +%setup -q -n %{_name}-%{version} -b 40 %patch4 -p1 %patch12 -p1 -%patch14 -p0 -%patch15 -p0 -%patch16 -p0 -%patch17 -p0 -%patch18 -p0 -%patch19 -p1 -# -%patch20 -p1 -# -%patch21 -p1 -%patch24 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 +%patch13 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -298,6 +417,7 @@ pushd ../klogconsole popd %build +%if %build_util_linux pushd ../klogconsole # klogconsole build make %{?_smp_mflags} CFLAGS="%{optflags}" CC="%{__cc}" @@ -306,6 +426,112 @@ popd rm -f setctsid make %{?_smp_mflags} setctsid CFLAGS="%{optflags}" CC="%{__cc}" # +#BEGIN SYSTEMD SAFETY CHECK +# With systemd, some utilities are built differently. Keep track of these +# sources to prevent building of systemd-less versions. +# +# WARNING: Never edit following line without doing all suggested in the echo below! +UTIL_LINUX_KNOWN_SYSTEMD_DEPS='./login-utils/lslogins.c ./misc-utils/logger.c ./misc-utils/uuidd.c ' +UTIL_LINUX_FOUND_SYSTEMD_DEPS=$(grep -rl 'HAVE_LIBSYSTEMD' . | fgrep '.c' | LC_ALL=C sort | tr '\n' ' ') +if test "$UTIL_LINUX_KNOWN_SYSTEMD_DEPS" != "$UTIL_LINUX_FOUND_SYSTEMD_DEPS" ; then + echo "List of utilities depending on systemd have changed. +Please check the new util-linux-systemd file list, file removal and update of Conflicts for safe update! +Then update configure options to build what needed. +Only then you can safely update following spec file line: +UTIL_LINUX_KNOWN_SYSTEMD_DEPS='$UTIL_LINUX_FOUND_SYSTEMD_DEPS'" + exit 1 +fi +#END SYSTEMD SAFETY CHECK +#BEGIN FIRST STAGE MODIFICATIONS +%if !%build_util_linux_systemd +sed -i 's/BUILD_LSLOGINS/FALSE/ + s/BUILD_LOGGER/FALSE/ + ' misc-utils/Makemodule.am login-utils/Makemodule.am bash-completion/Makemodule.am +autoreconf -f -i +%endif +#END FIRST STAGE MODIFICATIONS +%else +#BEGIN SECOND STAGE MODIFICATIONS +# delete all make modules except wanted ones +sed -i '/^include/{ +%if %build_python_libmount + /libmount\/Makemodule.am/b 1 +%endif +%if %build_util_linux_systemd +# for lslogins + /login-utils/b 1 +# for logger and uuidd + /misc-utils/b 1 +# for fstrim.service and fstrim.timer + /sys-utils/b 1 +# for uninstalled libcommon required by uuidd + / lib\//b 1 +# for bash completions + /bash-completion/b 1 +# we always want tests (they are smart enough to skip irrelevant parts) + /tests/b 1 +%endif +%if %build_python_libmount + /libmount\/python/b 1 +%endif + d + :1 + }' Makefile.am libmount/Makemodule.am +%if %build_python_libmount +# trick: we do not want to build libmount, but include subdirs +# We close prefious if FALSE and open new pairing with endif +sed -i '/^if BUILD_LIBMOUNT/d +/^if ENABLE_GTK_DOC/i \ +if BUILD_LIBMOUNT +' libmount/Makemodule.am +# Do not install terminal-colors.d.5 +sed -i '/dist_man_MANS/d' lib/Makemodule.am +%endif +# disable all make modules except wanted ones +sed -i '/^if BUILD_/{ +%if %build_util_linux_systemd + /LSLOGINS/b 1 + /LOGGER/b 1 + /UUIDD/b 1 + /BASH_COMPLETION/b 1 +%endif + s/BUILD_.*/FALSE/ + :1 + } + ' libmount/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am sys-utils/Makemodule.am bash-completion/Makemodule.am +%if %build_util_linux_systemd +# trick: we do not want to build fstrim, but we want to install fstrim systemd connectors +# We close prefious if FALSE and open new pairing with endif +sed -i '/^if HAVE_SYSTEMD/i \ +endif\ +if TRUE +' sys-utils/Makemodule.am +# Do not install terminal-colors.d.5 +sed -i '/dist_man_MANS/d' lib/Makemodule.am +%endif +# Use installed first stage libraries +sed -i ' +# extra space to not replace pylibmount.la + s/ libmount\.la/ -lmount/g + s/libuuid\.la/-luuid/g + s/libblkid\.la/-lblkid/g + s/libsmartcols\.la/-lsmartcols/g + ' libmount/python/Makemodule.am misc-utils/Makemodule.am login-utils/Makemodule.am +# Ignore dependencies on optional (and not built in second stage) libraries +sed -i ' + /AM_GNU_GETTEXT/d + s/UL_REQUIRES_BUILD(\[.*\], \[libuuid\])/dnl &/ + s/UL_REQUIRES_BUILD(\[.*\], \[libsmartcols\])/dnl &/ + ' configure.ac +sed -i ' + /SUBDIRS =/s/ po// + ' Makefile.am +autoreconf -f -i +#END SECOND STAGE MODIFICATIONS +%endif +# +# util-linux itself +# # Version check for libutempter # uhead=$(find %_includedir -name utempter.h 2>/dev/null) @@ -315,78 +541,115 @@ then else uhead=--without-utempter fi -# -# util-linux itself -# -autoreconf -fi export SUID_CFLAGS="-fpie" export SUID_LDFLAGS="-pie" # override default localstatedir to /run # only used for volatile data +# +# SUSE now supports only systemd based system. We do not build +# sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. %configure \ --localstatedir=/run \ - --docdir=%{_docdir}/%{name} \ + --docdir=%{_docdir}/%{_name} \ --with-audit \ --with-gnu-ld \ --with-ncurses \ --with-selinux \ $uhead \ - --with-systemdsystemunitdir=%_unitdir \ --with-bashcompletiondir=%{_datadir}/bash-completion \ - --enable-mesg \ - --enable-partx \ - --enable-raw \ - --enable-write \ - --enable-line \ - --enable-tunelp \ - --enable-socket-activation \ -%if %{with enable_last} - --enable-last \ -%else + --enable-all-programs \ + --disable-reset \ + --disable-use-tty-group \ + --disable-silent-rules \ + --enable-static \ + --disable-rpath \ +%if %{without enable_last} --disable-last \ %endif -%if %{with enable_eject} - --enable-eject \ -%else +%if %{without enable_eject} --disable-eject \ %endif %if %{with sysvinit_tools} - --enable-sulogin \ --enable-sulogin-emergency-mount \ - --enable-mountpoint \ %else --disable-sulogin \ --disable-mountpoint \ %endif -%if %{with enable_su} - --enable-kill \ - --enable-su \ -%else +%if %{without enable_su} --disable-su \ --disable-kill \ %endif - --disable-use-tty-group \ - --enable-static \ - --disable-silent-rules \ - --disable-rpath +%if %build_util_linux_systemd + --enable-uuidd \ + --with-systemd \ + --with-systemdsystemunitdir=%{_unitdir} \ +%else + --disable-uuidd \ + --without-systemd \ +%endif +%if %build_python_libmount + --with-python \ +%else + --without-python \ +%endif # make %{?_smp_mflags} # +%if %build_util_linux %{__cc} -fwhole-program %{optflags} -o mkzimage_cmdline %{S:29} %{__cc} -fwhole-program %{optflags} -o chrp-addnote %{SOURCE31} +%endif %check -if ! make check; then - echo "cat test diffs:" - find tests/diff -type f | xargs -r cat - #exit 1 -fi +# mark some tests "known_fail" +%ifarch ppc ppc64 ppc64le s390 s390x +export TS_OPT_fdisk_bsd_known_fail="yes" +%endif +%ifarch %{ix86} +export TS_OPT_misc_setarch_known_fail="yes" +%endif +# +%ifarch armv7l armv7hl aarch64 +%if 0%{?suse_version} > 1310 +export TS_OPT_misc_setarch_known_fail="yes" +%endif +%endif +# +%ifarch armv6l armv6hl aarch64 +export TS_OPT_fdisk_gpt_known_fail="yes" +export TS_OPT_fdisk_oddinput_known_fail="yes" +export TS_OPT_fdisk_sunlabel_known_fail="yes" +export TS_OPT_misc_ionice_known_fail="yes" +export TS_OPT_misc_swaplabel_known_fail="yes" +export TS_OPT_kill_name_to_number_known_fail="yes" +export TS_OPT_kill_print_pid_known_fail="yes" +export TS_OPT_kill_queue_known_fail="yes" +%endif +%ifarch aarch64 s390 s390x +export TS_OPT_utmpdump_known_fail="yes" +%endif +# FIXME: These sometimes fails: +export TS_OPT_libmount_lock_known_fail="yes" +%ifarch x86_64 +# FIXME: Something is wrong here. This test never fails in SLE12: +export TS_OPT_ipcs_limits2_known_fail="yes" +%endif +# +# hacks +export PATH="$PATH:/sbin:/usr/sbin" +# +# do the check but don't abort yet +result="0" +make %{?_smp_mflags} check || result="1" +# +# always show test diffs (inclusive known_fail) and exit result +diffs_files="$(find tests/diff -type f | sort)" +echo "$diffs_files" | xargs -r cat +exit "$result" %install +%if %build_util_linux mkdir -p %{buildroot}{%{_sysconfdir}/{init.d,pam.d,default},%{_mandir}/man{1,8},/bin,/sbin,%{_bindir},%{_sbindir},%{_infodir}} -mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid/ -mkdir -p %{buildroot}/run/uuidd/ -install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd install -m 644 %{SOURCE51} %{buildroot}%{_sysconfdir}/blkid.conf install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote @@ -400,17 +663,18 @@ pushd ../klogconsole # klogconsole install make install DEST=%{buildroot} popd +%endif # # util-linux install # %make_install -rm -f %{buildroot}/%{_libdir}/lib*.la +rm -f %{buildroot}%{python_sitearch}/libmount/*.*a +%if %build_util_linux #UsrMerge %if %{with enable_su} ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin %endif -ln -s %{_bindir}/logger %{buildroot}/bin ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin @@ -446,15 +710,15 @@ ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin ln -s %{_sbindir}/swaplabel %{buildroot}/sbin ln -s %{_sbindir}/fstrim %{buildroot}/sbin ln -s %{_sbindir}/chcpu %{buildroot}/sbin -#EndUsrMerge +#EndUsrMerge install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems %ifnarch ppc ppc64 -install -m 755 mkzimage_cmdline %{buildroot}/%{_bindir} +install -m 755 mkzimage_cmdline %{buildroot}%{_bindir} install -m 644 %{S:28} %{buildroot}%{_mandir}/man8 -install -m 755 chrp-addnote %{buildroot}/%{_bindir} +install -m 755 chrp-addnote %{buildroot}%{_bindir} %endif # setctsid install -install -m 755 setctsid %{buildroot}/%{_sbindir} +install -m 755 setctsid %{buildroot}%{_sbindir} install -m 444 setctsid.8 %{buildroot}%{_mandir}/man8/ echo -e "#! /bin/bash\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb chmod 755 %{buildroot}%{_sbindir}/flushb @@ -464,7 +728,7 @@ install -m 755 $RPM_SOURCE_DIR/raw.init %{buildroot}%{_initddir}/raw ln -sf ../..%{_sysconfdir}/init.d/raw %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first -mv %{buildroot}%{_docdir}/%{name}/getopt %{buildroot}%{_datadir}/ +mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ # Stupid hack so we don't have a tcsh dependency chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh # Following files we don't want to package, so remove them @@ -474,41 +738,39 @@ rm -f %{buildroot}%{_mandir}/man1/pg.1* rm -f %{buildroot}%{_bindir}/chkdupexe rm -f %{buildroot}%{_mandir}/man1/chkdupexe.1 # we use this tools from pwdutils -rm -f %{buildroot}/%{_bindir}/{chfn,chsh,newgrp} -rm -f %{buildroot}/%{_sbindir}/{vigr,vipw} -rm -f %{buildroot}/%{_mandir}/man1/{chfn.1*,chsh.1*,newgrp.1*} -rm -f %{buildroot}/%{_mandir}/man8/{vigr.8*,vipw.8*} +rm -f %{buildroot}%{_bindir}/{chfn,chsh,newgrp} +rm -f %{buildroot}%{_sbindir}/{vigr,vipw} +rm -f %{buildroot}%{_mandir}/man1/{chfn.1*,chsh.1*,newgrp.1*} +rm -f %{buildroot}%{_mandir}/man8/{vigr.8*,vipw.8*} # login is always and only in /bin -mv %{buildroot}/%{_bindir}/login %{buildroot}/bin/ +mv %{buildroot}%{_bindir}/login %{buildroot}/bin/ # arch dependent %ifarch s390 s390x rm -f %{buildroot}%{_sysconfdir}/fdprm -rm -f %{buildroot}%{_bindir}/cytune rm -f %{buildroot}%{_sbindir}/fdformat rm -f %{buildroot}%{_sbindir}/hwclock #UsrMerge rm -f %{buildroot}/sbin/hwclock -#EndUsrMerge +#EndUsrMerge rm -f %{buildroot}%{_sbindir}/klogconsole rm -f %{buildroot}%{_bindir}/setterm rm -f %{buildroot}%{_sbindir}/tunelp -rm -f %{buildroot}/%{_mandir}/man8/cytune.8* -rm -f %{buildroot}/%{_mandir}/man8/fdformat.8* -rm -f %{buildroot}/%{_mandir}/man8/hwclock.8* -rm -f %{buildroot}/%{_mandir}/man8/klogconsole.8* -rm -f %{buildroot}/%{_mandir}/man8/tunelp.8* +rm -f %{buildroot}%{_mandir}/man8/fdformat.8* +rm -f %{buildroot}%{_mandir}/man8/hwclock.8* +rm -f %{buildroot}%{_mandir}/man8/klogconsole.8* +rm -f %{buildroot}%{_mandir}/man8/tunelp.8* %endif %ifarch ia64 %sparc m68k -rm -f %{buildroot}/%{_mandir}/man8/cfdisk.8* -rm -f %{buildroot}/%{_mandir}/man8/sfdisk.8* +rm -f %{buildroot}%{_mandir}/man8/cfdisk.8* +rm -f %{buildroot}%{_mandir}/man8/sfdisk.8* rm -f %{buildroot}%{_sbindir}/cfdisk #UsrMerge rm -f %{buildroot}/sbin/cfdisk -#EndUsrMerge +#EndUsrMerge rm -f %{buildroot}%{_sbindir}/sfdisk #UsrMerge rm -f %{buildroot}/sbin/sfdisk -#EndUsrMerge +#EndUsrMerge %endif %ifarch ia64 m68k rm -f %{buildroot}%{_sbindir}/fdisk @@ -525,13 +787,29 @@ find %{buildroot}%{_bindir}/ -regextype posix-egrep -type l \ find %{buildroot}%{_mandir}/man8 -regextype posix-egrep \ -regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|parisc|parisc32|parisc64)\.8.*" \ -printf "%{_mandir}/man8/%f*\n" >> %{name}.files +%else +# install systemd files manually, don't use Makefile that expect build of utilities and its dependencies. +%endif +%if %build_util_linux_systemd +mkdir -p %{buildroot}%{_sysconfdir}/init.d +mkdir -p %{buildroot}/bin +mkdir -p %{buildroot}%{_sbindir} +mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid +mkdir -p %{buildroot}/run/uuidd +install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd +ln -s %{_bindir}/logger %{buildroot}/bin # clock.txt from uuidd is a ghost file touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt # rcuuidd helper ln -sf ../..%{_sysconfdir}/init.d/uuidd %{buildroot}%{_sbindir}/rcuuidd -# remove duplicate manpages -%fdupes -s %{buildroot}/%{_mandir} +%if !%build_util_linux +%make_install +%endif +%endif +# link duplicate manpages and python bindings +%fdupes -s %{buildroot}%{_prefix} +%if %build_util_linux %post %{fillup_and_insserv raw} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount @@ -579,6 +857,18 @@ fi %postun -n libmount1 -p /sbin/ldconfig +%post -n libsmartcols1 -p /sbin/ldconfig + +%postun -n libsmartcols1 -p /sbin/ldconfig + +%post -n libuuid1 -p /sbin/ldconfig + +%postun -n libuuid1 -p /sbin/ldconfig + +%files lang -f %{name}.lang +%endif + +%if %build_util_linux_systemd %pre -n uuidd %{_sbindir}/groupadd -r uuidd 2>/dev/null || : %{_sbindir}/useradd -r -g uuidd -c "User for uuidd" \ @@ -595,22 +885,17 @@ fi %{restart_on_update uuidd} %{insserv_cleanup} -%post -n libuuid1 -p /sbin/ldconfig - -%postun -n libuuid1 -p /sbin/ldconfig - %verifyscript -n uuidd %verify_permissions -e %{_sbindir}/uuidd +%endif -%files lang -f %{name}.lang - +%if %build_util_linux %files -f %{name}.files # Common files for all archs %defattr(-,root,root) # util-linux documentation files %doc Documentation/blkid.txt %doc Documentation/cal.txt -%doc Documentation/cfdisk.txt %doc Documentation/col.txt %doc Documentation/deprecated.txt %doc Documentation/fdisk.txt @@ -642,7 +927,6 @@ fi /bin/mount /bin/umount /bin/findmnt -/bin/logger /bin/login /bin/lsblk /sbin/agetty @@ -704,7 +988,6 @@ fi %{_bindir}/lastb %endif %{_bindir}/line -%{_bindir}/logger %{_bindir}/look %{_bindir}/lsblk %{_bindir}/lscpu @@ -722,6 +1005,7 @@ fi %{_bindir}/script %{_bindir}/scriptreplay %{_bindir}/setarch +%{_bindir}/setpriv %{_bindir}/setsid %{_bindir}/tailf %{_bindir}/taskset @@ -805,7 +1089,6 @@ fi %{_mandir}/man1/lastb.1.gz %endif %{_mandir}/man1/line.1.gz -%{_mandir}/man1/logger.1.gz %{_mandir}/man1/login.1.gz %{_mandir}/man1/look.1.gz %{_mandir}/man1/lscpu.1.gz @@ -819,6 +1102,7 @@ fi %{_mandir}/man1/rename.1.gz %{_mandir}/man1/rev.1.gz %{_mandir}/man1/renice.1.gz +%{_mandir}/man1/setpriv.1.gz %{_mandir}/man1/setsid.1.gz %{_mandir}/man1/script.1.gz %{_mandir}/man1/scriptreplay.1.gz @@ -838,6 +1122,7 @@ fi %{_mandir}/man1/runuser.1.gz %{_mandir}/man1/uuidgen.1.gz %{_mandir}/man5/fstab.5.gz +%{_mandir}/man5/terminal-colors.d.5.gz %{_mandir}/man8/addpart.8.gz %{_mandir}/man8/agetty.8.gz %{_mandir}/man8/blockdev.8.gz @@ -893,7 +1178,12 @@ fi %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh # FIXME: Fix directory ownership. -%{_datadir}/bash-completion +%dir %{_datadir}/bash-completion +%{_datadir}/bash-completion/* +%if %build_util_linux_systemd +%exclude %{_datadir}/bash-completion/logger +%exclude %{_datadir}/bash-completion/uuidd +%endif %ifnarch ia64 m68k #XXX: post our patches upstream #XXX: call fdupes on /usr/share/man @@ -914,7 +1204,6 @@ fi %{_sbindir}/sfdisk %endif %ifnarch s390 s390x -%{_bindir}/cytune %{_sbindir}/fdformat #UsrMerge /sbin/hwclock @@ -923,7 +1212,6 @@ fi %{_sbindir}/klogconsole %{_bindir}/setterm %{_sbindir}/tunelp -%{_mandir}/man8/cytune.8.gz %{_mandir}/man8/fdformat.8.gz %{_mandir}/man8/hwclock.8.gz %{_mandir}/man8/klogconsole.8.gz @@ -932,8 +1220,8 @@ fi %files -n libblkid1 %defattr(-, root, root) -/%{_libdir}/libblkid.so.1 -/%{_libdir}/libblkid.so.1.* +%{_libdir}/libblkid.so.1 +%{_libdir}/libblkid.so.1.* %files -n libblkid-devel %defattr(-, root, root) @@ -945,12 +1233,12 @@ fi %files -n libblkid-devel-static %defattr(-, root, root) -%{_libdir}/libblkid.a +%{_libdir}/libblkid.*a %files -n libmount1 %defattr(-, root, root) -/%{_libdir}/libmount.so.1 -/%{_libdir}/libmount.so.1.* +%{_libdir}/libmount.so.1 +%{_libdir}/libmount.so.1.* %files -n libmount-devel %defattr(-, root, root) @@ -961,24 +1249,28 @@ fi %files -n libmount-devel-static %defattr(-, root, root) -%{_libdir}/libmount.a +%{_libdir}/libmount.*a -%files -n uuidd +%files -n libsmartcols1 %defattr(-, root, root) -%verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd -%attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid -%ghost %{_localstatedir}/lib/libuuid/clock.txt -%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd -%{_initddir}/uuidd -%{_mandir}/man8/uuidd.8.gz -%{_sbindir}/rcuuidd -%{_unitdir}/uuidd.service -%{_unitdir}/uuidd.socket +%{_libdir}/libsmartcols.so.1 +%{_libdir}/libsmartcols.so.1.* + +%files -n libsmartcols-devel +%defattr(-, root, root) +%{_libdir}/libsmartcols.so +%dir %{_includedir}/libsmartcols +%{_includedir}/libsmartcols/libsmartcols.h +%{_libdir}/pkgconfig/smartcols.pc + +%files -n libsmartcols-devel-static +%defattr(-, root, root) +%{_libdir}/libsmartcols.*a %files -n libuuid1 %defattr(-, root, root) -/%{_libdir}/libuuid.so.1 -/%{_libdir}/libuuid.so.1.* +%{_libdir}/libuuid.so.1 +%{_libdir}/libuuid.so.1.* %files -n libuuid-devel %defattr(-, root, root) @@ -990,6 +1282,47 @@ fi %files -n libuuid-devel-static %defattr(-, root, root) -%{_libdir}/libuuid.a +%{_libdir}/libuuid.*a +%endif + +%if %build_util_linux_systemd +%if %build_util_linux +%files systemd +%else +%files +%endif +%defattr(-, root, root) +/bin/logger +%{_bindir}/logger +%{_bindir}/lslogins +%{_datadir}/bash-completion/logger +%{_mandir}/man1/logger.1.gz +%{_mandir}/man1/lslogins.1.gz +%{_unitdir}/fstrim.service +%{_unitdir}/fstrim.timer + +%files -n uuidd +%defattr(-, root, root) +%verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd +%attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid +%ghost %{_localstatedir}/lib/libuuid/clock.txt +%attr(-,uuidd,uuidd) %ghost %dir /run/uuidd +%{_datadir}/bash-completion/uuidd +%{_initddir}/uuidd +%{_mandir}/man8/uuidd.8.gz +%{_sbindir}/rcuuidd +%{_unitdir}/uuidd.service +%{_unitdir}/uuidd.socket +%endif + +%if %build_python_libmount +%if %build_util_linux +%files -n python-libmount +%else +%files +%endif +%defattr(-, root, root) +%{python_sitearch}/libmount +%endif %changelog diff --git a/util-linux.util-linux b/util-linux.util-linux new file mode 100644 index 0000000..8a98094 --- /dev/null +++ b/util-linux.util-linux @@ -0,0 +1,2 @@ +Summary: A collection of basic system utilities +Group: System/Base From cd9b9d676e443eefd69f0066751cccc65c49d24a036d5ea6b0d489458c2af27d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 21 Aug 2014 14:16:08 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=249 --- util-linux.group | 1 - util-linux.license | 1 - 2 files changed, 2 deletions(-) delete mode 100644 util-linux.group delete mode 100644 util-linux.license diff --git a/util-linux.group b/util-linux.group deleted file mode 100644 index 6b3b994..0000000 --- a/util-linux.group +++ /dev/null @@ -1 +0,0 @@ -Group: System/Base diff --git a/util-linux.license b/util-linux.license deleted file mode 100644 index 4360fb4..0000000 --- a/util-linux.license +++ /dev/null @@ -1 +0,0 @@ -License: GPL-2.0+