diff --git a/raw.init b/raw.init index fd2e76b..7fb0069 100644 --- a/raw.init +++ b/raw.init @@ -15,6 +15,7 @@ # Required-Stop: # Default-Start: 2 3 5 # Default-Stop: 0 1 6 +# Short-Description: raw devices # Description: raw-devices ### END INIT INFO diff --git a/util-linux-2.13-mount_losetup_crypto.patch b/util-linux-2.13-mount_losetup_crypto.patch index 7a94536..ed6b607 100644 --- a/util-linux-2.13-mount_losetup_crypto.patch +++ b/util-linux-2.13-mount_losetup_crypto.patch @@ -4,20 +4,20 @@ Signed-off-by: Ludwig Nussel -Index: util-linux-ng-2.13.0.1+git20071106/mount/Makefile.am +Index: util-linux-ng-2.13.0.1+git20071121/mount/Makefile.am =================================================================== ---- util-linux-ng-2.13.0.1+git20071106.orig/mount/Makefile.am -+++ util-linux-ng-2.13.0.1+git20071106/mount/Makefile.am -@@ -12,7 +12,7 @@ headers_common = fstab.h linux_fs.h moun +--- util-linux-ng-2.13.0.1+git20071121.orig/mount/Makefile.am ++++ util-linux-ng-2.13.0.1+git20071121/mount/Makefile.am +@@ -12,7 +12,7 @@ headers_common = fstab.h mount_mntent.h mount_paths.h lomount.h fsprobe.h realpath.h xmalloc.h \ getusername.h loop.h sundries.h -mount_common = fstab.c mount_mntent.c getusername.c lomount.c \ +mount_common = fstab.c mount_mntent.c getusername.c lomount.c rmd160.c sha512.c \ - $(utils_common) $(headers_common) ../lib/env.c + $(utils_common) $(headers_common) ../lib/env.c ../lib/linux_version.c \ + ../lib/blkdev.c - mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c -@@ -25,7 +25,7 @@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LD +@@ -26,7 +26,7 @@ umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LD swapon_SOURCES = swapon.c swap_constants.h $(utils_common) @@ -26,10 +26,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/Makefile.am loop.h lomount.h xmalloc.h sundries.h realpath.h losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) -Index: util-linux-ng-2.13.0.1+git20071106/mount/rmd160.h +Index: util-linux-ng-2.13.0.1+git20071121/mount/rmd160.h =================================================================== --- /dev/null -+++ util-linux-ng-2.13.0.1+git20071106/mount/rmd160.h ++++ util-linux-ng-2.13.0.1+git20071121/mount/rmd160.h @@ -0,0 +1,11 @@ +#ifndef RMD160_H +#define RMD160_H @@ -42,10 +42,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/rmd160.h +#endif /*RMD160_H*/ + + -Index: util-linux-ng-2.13.0.1+git20071106/mount/lomount.c +Index: util-linux-ng-2.13.0.1+git20071121/mount/lomount.c =================================================================== ---- util-linux-ng-2.13.0.1+git20071106.orig/mount/lomount.c -+++ util-linux-ng-2.13.0.1+git20071106/mount/lomount.c +--- util-linux-ng-2.13.0.1+git20071121.orig/mount/lomount.c ++++ util-linux-ng-2.13.0.1+git20071121/mount/lomount.c @@ -20,12 +20,18 @@ #include "loop.h" @@ -343,10 +343,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/lomount.c if (res == 2 && find) { if (verbose) printf("stolen loop=%s...trying again\n", -Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c +Index: util-linux-ng-2.13.0.1+git20071121/mount/mount.c =================================================================== ---- util-linux-ng-2.13.0.1+git20071106.orig/mount/mount.c -+++ util-linux-ng-2.13.0.1+git20071106/mount/mount.c +--- util-linux-ng-2.13.0.1+git20071121.orig/mount/mount.c ++++ util-linux-ng-2.13.0.1+git20071121/mount/mount.c @@ -88,6 +88,9 @@ static int suid = 0; /* Contains the fd to read the passphrase from, if any. */ static int pfd = -1; @@ -393,7 +393,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c + keysz = strtoul(opt_keybits, NULL, 0); + if (opt_nohashpass) { + if(opt_phash && strcmp(opt_phash, "none")) { -+ error(_("mount: please specify either phash=%s or nohashpass\n")); ++ error(_("mount: please specify either phash=%s or nohashpass\n"), opt_phash); + return EX_FAIL; + } + opt_phash = "none"; @@ -404,7 +404,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c if (res == 2) { /* loop dev has been grabbed by some other process, try again, if not given explicitly */ -@@ -1677,6 +1692,7 @@ static struct option longopts[] = { +@@ -1668,6 +1683,7 @@ static struct option longopts[] = { { "options", 1, 0, 'o' }, { "test-opts", 1, 0, 'O' }, { "pass-fd", 1, 0, 'p' }, @@ -412,7 +412,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c { "types", 1, 0, 't' }, { "bind", 0, 0, 128 }, { "move", 0, 0, 133 }, -@@ -1823,6 +1839,7 @@ main(int argc, char *argv[]) { +@@ -1814,6 +1830,7 @@ main(int argc, char *argv[]) { char *options = NULL, *test_opts = NULL, *node; const char *spec = NULL; char *label = NULL; @@ -420,7 +420,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c char *uuid = NULL; char *types = NULL; char *p; -@@ -1853,7 +1870,7 @@ main(int argc, char *argv[]) { +@@ -1844,7 +1861,7 @@ main(int argc, char *argv[]) { initproctitle(argc, argv); #endif @@ -429,7 +429,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c longopts, NULL)) != -1) { switch (c) { case 'a': /* mount everything in fstab */ -@@ -1871,6 +1888,9 @@ main(int argc, char *argv[]) { +@@ -1862,6 +1879,9 @@ main(int argc, char *argv[]) { case 'i': external_allowed = 0; break; @@ -439,7 +439,7 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c case 'l': list_with_volumelabel = 1; break; -@@ -2007,6 +2027,9 @@ main(int argc, char *argv[]) { +@@ -1998,6 +2018,9 @@ main(int argc, char *argv[]) { atexit(unlock_mtab); @@ -449,10 +449,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/mount.c switch (argc+specseen) { case 0: /* mount -a */ -Index: util-linux-ng-2.13.0.1+git20071106/mount/rmd160.c +Index: util-linux-ng-2.13.0.1+git20071121/mount/rmd160.c =================================================================== --- /dev/null -+++ util-linux-ng-2.13.0.1+git20071106/mount/rmd160.c ++++ util-linux-ng-2.13.0.1+git20071121/mount/rmd160.c @@ -0,0 +1,532 @@ +/* rmd160.c - RIPE-MD160 + * Copyright (C) 1998 Free Software Foundation, Inc. @@ -986,10 +986,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/rmd160.c + rmd160_final( &hd ); + memcpy( outbuf, hd.buf, 20 ); +} -Index: util-linux-ng-2.13.0.1+git20071106/mount/sha512.c +Index: util-linux-ng-2.13.0.1+git20071121/mount/sha512.c =================================================================== --- /dev/null -+++ util-linux-ng-2.13.0.1+git20071106/mount/sha512.c ++++ util-linux-ng-2.13.0.1+git20071121/mount/sha512.c @@ -0,0 +1,432 @@ +/* + * sha512.c @@ -1423,10 +1423,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/sha512.c + memset(&ctx, 0, sizeof(ctx)); +} +#endif -Index: util-linux-ng-2.13.0.1+git20071106/mount/sha512.h +Index: util-linux-ng-2.13.0.1+git20071121/mount/sha512.h =================================================================== --- /dev/null -+++ util-linux-ng-2.13.0.1+git20071106/mount/sha512.h ++++ util-linux-ng-2.13.0.1+git20071121/mount/sha512.h @@ -0,0 +1,45 @@ +/* + * sha512.h @@ -1473,10 +1473,10 @@ Index: util-linux-ng-2.13.0.1+git20071106/mount/sha512.h +/* no sha384_write(), use sha512_write() */ +/* no sha384_final(), use sha512_final(), result in ctx->sha_out[0...47] */ +extern void sha384_hash_buffer(const unsigned char *, size_t, unsigned char *, size_t); -Index: util-linux-ng-2.13.0.1+git20071106/mount/lomount.h +Index: util-linux-ng-2.13.0.1+git20071121/mount/lomount.h =================================================================== ---- util-linux-ng-2.13.0.1+git20071106.orig/mount/lomount.h -+++ util-linux-ng-2.13.0.1+git20071106/mount/lomount.h +--- util-linux-ng-2.13.0.1+git20071121.orig/mount/lomount.h ++++ util-linux-ng-2.13.0.1+git20071121/mount/lomount.h @@ -1,5 +1,5 @@ -extern int set_loop(const char *, const char *, unsigned long long, - const char *, int, int *); diff --git a/util-linux-2.13-rpmlintrc b/util-linux-2.13-rpmlintrc new file mode 100644 index 0000000..1741f88 --- /dev/null +++ b/util-linux-2.13-rpmlintrc @@ -0,0 +1,5 @@ +addFilter("init-script-without-%stop_on_removal-preun /etc/init.d/raw") +addFilter("incoherent-init-script-name raw") +addFilter("no-reload-entry /etc/init.d/raw") +addFilter("files-duplicate .*(rootflags|ramsize|vidmode)") + diff --git a/util-linux-ng-2.13.0.1+git20071106.tar.bz2 b/util-linux-ng-2.13.0.1+git20071106.tar.bz2 deleted file mode 100644 index bd32644..0000000 --- a/util-linux-ng-2.13.0.1+git20071106.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b7a2605c41e987edeec27dd043952517c81d06291a41bc491fed60871edb0759 -size 1565548 diff --git a/util-linux-ng-2.13.0.1+git20071121.tar.bz2 b/util-linux-ng-2.13.0.1+git20071121.tar.bz2 new file mode 100644 index 0000000..ac50340 --- /dev/null +++ b/util-linux-ng-2.13.0.1+git20071121.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:901086dc7bc99a89b9f11839107a0dc83f6b9e89158bccb8b30ad0a5a609123b +size 1585119 diff --git a/util-linux.changes b/util-linux.changes index 4fa346a..035989b 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/util-linux.spec b/util-linux.spec index d2287f7..9f6a7ba 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,5 +1,5 @@ # -# spec file for package util-linux (Version 2.13.0.1+git20071106) +# spec file for package util-linux (Version 2.13.0.1+git20071121) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,10 +20,11 @@ PreReq: %install_info_prereq permissions License: BSD 3-Clause; GPL v2 or later Group: System/Base AutoReqProv: on -Version: 2.13.0.1+git20071106 -Release: 4 +Version: 2.13.0.1+git20071121 +Release: 1 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 +Source1: util-linux-2.13-rpmlintrc Source2: nologin.c Source3: nologin.8 Source4: raw.init @@ -154,7 +155,6 @@ CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE " INSTALL_PROGRAM='$(INSTALL)' \ --infodir=%{_infodir} \ %{_target_cpu}-suse-linux make -make check cd .. # klogconsole build cd klogconsole @@ -190,6 +190,10 @@ make gcc $RPM_OPT_FLAGS -o nologin nologin.c gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29} +%check +cd ../time-%{time_ver} +make check + %install mkdir -p "$RPM_BUILD_ROOT"{/etc/init.d,%{_mandir}/man{1,8},\ /bin,/sbin,/usr/bin,/usr/sbin,%{_infodir}} @@ -554,6 +558,12 @@ fi #/usr/bin/ia64 #%endif %changelog +* Wed Nov 21 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 2007 - mkoenig@suse.de - fix raw path in init script * Tue Nov 06 2007 - mkoenig@suse.de