From 6c26534cc2a4b2dad5c422f28ce2c006c423f09a9e3e6ec0d719a559b19fb43b Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 23 Apr 2007 21:27:30 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=13 --- util-linux-2.12-misc_utils_hostid.patch | 18 +++---- util-linux-2.12r-mount_mtab_update.patch | 35 +++++--------- ...-linux-2.13-build_no_perl_dependency.patch | 48 +++++++++++++++++++ ...2.13-misc_utils_add_man_scriptreplay.patch | 13 ----- util-linux-2.13-tests_missing_include.patch | 12 ----- util-linux-ng-2.12r+git20070330.tar.bz2 | 3 -- util-linux-ng-2.12r+git20070412.tar.bz2 | 3 ++ util-linux.changes | 12 +++++ util-linux.spec | 27 ++++++----- 9 files changed, 100 insertions(+), 71 deletions(-) create mode 100644 util-linux-2.13-build_no_perl_dependency.patch delete mode 100644 util-linux-2.13-misc_utils_add_man_scriptreplay.patch delete mode 100644 util-linux-2.13-tests_missing_include.patch delete mode 100644 util-linux-ng-2.12r+git20070330.tar.bz2 create mode 100644 util-linux-ng-2.12r+git20070412.tar.bz2 diff --git a/util-linux-2.12-misc_utils_hostid.patch b/util-linux-2.12-misc_utils_hostid.patch index 170046d..84ac6fa 100644 --- a/util-linux-2.12-misc_utils_hostid.patch +++ b/util-linux-2.12-misc_utils_hostid.patch @@ -1,7 +1,7 @@ -Index: util-linux-ng-2.12r+git20070330/misc-utils/hostid.1 +Index: util-linux-ng-2.12r+git20070412/misc-utils/hostid.1 =================================================================== --- /dev/null -+++ util-linux-ng-2.12r+git20070330/misc-utils/hostid.1 ++++ util-linux-ng-2.12r+git20070412/misc-utils/hostid.1 @@ -0,0 +1,24 @@ +.TH hostid 1 +.SH NAME @@ -27,10 +27,10 @@ Index: util-linux-ng-2.12r+git20070330/misc-utils/hostid.1 +.SH SEE ALSO +gethostid(2), sethostid(2) + -Index: util-linux-ng-2.12r+git20070330/misc-utils/hostid.c +Index: util-linux-ng-2.12r+git20070412/misc-utils/hostid.c =================================================================== --- /dev/null -+++ util-linux-ng-2.12r+git20070330/misc-utils/hostid.c ++++ util-linux-ng-2.12r+git20070412/misc-utils/hostid.c @@ -0,0 +1,88 @@ +/* Program hostid. Changed on 7.10.1997 + New: - Hostid 0 is not permitted. @@ -120,10 +120,10 @@ Index: util-linux-ng-2.12r+git20070330/misc-utils/hostid.c + + return 0; +} -Index: util-linux-ng-2.12r+git20070330/misc-utils/Makefile.am +Index: util-linux-ng-2.12r+git20070412/misc-utils/Makefile.am =================================================================== ---- util-linux-ng-2.12r+git20070330.orig/misc-utils/Makefile.am -+++ util-linux-ng-2.12r+git20070330/misc-utils/Makefile.am +--- util-linux-ng-2.12r+git20070412.orig/misc-utils/Makefile.am ++++ util-linux-ng-2.12r+git20070412/misc-utils/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST = README.* \ bin_PROGRAMS = @@ -137,8 +137,8 @@ Index: util-linux-ng-2.12r+git20070330/misc-utils/Makefile.am CLEANFILES = chkdupexe scriptreplay man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ -- namei.1 script.1 whereis.1 -+ namei.1 script.1 whereis.1 hostid.1 +- namei.1 script.1 whereis.1 scriptreplay.1 ++ namei.1 script.1 whereis.1 scriptreplay.1 hostid.1 if HAVE_NCURSES cal_LDADD = -lncurses diff --git a/util-linux-2.12r-mount_mtab_update.patch b/util-linux-2.12r-mount_mtab_update.patch index 410e510..aa35f6c 100644 --- a/util-linux-2.12r-mount_mtab_update.patch +++ b/util-linux-2.12r-mount_mtab_update.patch @@ -2,30 +2,21 @@ Index: mount/mount.c =================================================================== --- mount/mount.c.orig +++ mount/mount.c -@@ -842,6 +842,7 @@ try_mount_one (const char *spec0, const - int mnt5_res = 0; /* only for gcc */ - int mnt_err; - int flags; -+ int isroot; - char *extra_opts; /* written in mtab */ - char *mount_opts; /* actually used on system call */ - const char *opts, *spec, *node, *types; -@@ -942,13 +943,17 @@ retry_nfs: +@@ -954,11 +954,16 @@ retry_nfs: + } + + if (fake || mnt5_res == 0) { ++ int isroot; ++ + /* Mount succeeded, report this (if verbose) and write mtab entry. */ if (loop) opt_loopdev = loopdev; -- update_mtab_entry(loop ? loopfile : spec, -+ isroot = (streq (node, "/") || streq (node, "root") || -+ streq (node, "rootfs")); -+ if (!isroot) { -+ update_mtab_entry(loop ? loopfile : spec, +- if (!(mounttype & MS_PROPAGATION)) { ++ isroot = (streq(node, "/") || streq(node, "root") || ++ streq(node, "rootfs")); ++ ++ if (!(mounttype & MS_PROPAGATION) && !isroot) { + update_mtab_entry(loop ? loopfile : spec, node, types ? types : "unknown", - fix_opts_string (flags & ~MS_NOMTAB, extra_opts, user), - flags, - freq, - pass); -+ } - - block_signals (SIG_UNBLOCK); - res = 0; diff --git a/util-linux-2.13-build_no_perl_dependency.patch b/util-linux-2.13-build_no_perl_dependency.patch new file mode 100644 index 0000000..763602f --- /dev/null +++ b/util-linux-2.13-build_no_perl_dependency.patch @@ -0,0 +1,48 @@ +Index: util-linux-ng-2.12r+git20070412/configure.ac +=================================================================== +--- util-linux-ng-2.12r+git20070412.orig/configure.ac ++++ util-linux-ng-2.12r+git20070412/configure.ac +@@ -244,6 +244,11 @@ AC_ARG_ENABLE([partx], + ) + AM_CONDITIONAL(BUILD_PARTX, test x$enable_partx = xyes) + ++AC_ARG_ENABLE([perl-scripts], ++ AC_HELP_STRING([--enable-perl-scripts], [install perl scripts (chkdupexe, scriptreplay)]), ++ enable_perl_scripts=$enableval, enable_perl_scripts=no ++) ++AM_CONDITIONAL(INSTALL_PERL_SCRIPTS, test x$enable_perl_scripts = xyes) + + AC_ARG_ENABLE([raw], + AC_HELP_STRING([--enable-raw], [build raw]), +Index: util-linux-ng-2.12r+git20070412/misc-utils/Makefile.am +=================================================================== +--- util-linux-ng-2.12r+git20070412.orig/misc-utils/Makefile.am ++++ util-linux-ng-2.12r+git20070412/misc-utils/Makefile.am +@@ -11,9 +11,16 @@ bin_PROGRAMS = + usrbinexec_PROGRAMS = cal ddate logger look mcookie \ + namei script whereis hostid + ++usrbinexec_SCRIPTS = ++ ++man_MANS = cal.1 ddate.1 logger.1 look.1 mcookie.1 \ ++ namei.1 script.1 whereis.1 hostid.1 ++ + mcookie_LDADD = $(top_srcdir)/lib/libmd5.a + ++if INSTALL_PERL_SCRIPTS + usrbinexec_SCRIPTS = chkdupexe scriptreplay ++man_MANS += chkdupexe.1 scriptreplay.1 + + chkdupexe: chkdupexe.pl + sed -e 's,[@]PERL[@],$(PERL),g' < chkdupexe.pl > chkdupexe +@@ -22,9 +29,7 @@ scriptreplay: scriptreplay.pl + sed -e 's,[@]PERL[@],$(PERL),g' < scriptreplay.pl > scriptreplay + + CLEANFILES = chkdupexe scriptreplay +- +-man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ +- namei.1 script.1 whereis.1 scriptreplay.1 hostid.1 ++endif + + if HAVE_NCURSES + cal_LDADD = -lncurses diff --git a/util-linux-2.13-misc_utils_add_man_scriptreplay.patch b/util-linux-2.13-misc_utils_add_man_scriptreplay.patch deleted file mode 100644 index ba22200..0000000 --- a/util-linux-2.13-misc_utils_add_man_scriptreplay.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: util-linux-ng-2.12r+git20070330/misc-utils/Makefile.am -=================================================================== ---- util-linux-ng-2.12r+git20070330.orig/misc-utils/Makefile.am -+++ util-linux-ng-2.12r+git20070330/misc-utils/Makefile.am -@@ -24,7 +24,7 @@ scriptreplay: scriptreplay.pl - CLEANFILES = chkdupexe scriptreplay - - man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ -- namei.1 script.1 whereis.1 hostid.1 -+ namei.1 script.1 whereis.1 hostid.1 scriptreplay.1 - - if HAVE_NCURSES - cal_LDADD = -lncurses diff --git a/util-linux-2.13-tests_missing_include.patch b/util-linux-2.13-tests_missing_include.patch deleted file mode 100644 index ed9c233..0000000 --- a/util-linux-2.13-tests_missing_include.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: util-linux-ng-2.12r+git20070330/tests/helpers/mnt_test_sysinfo.c -=================================================================== ---- util-linux-ng-2.12r+git20070330.orig/tests/helpers/mnt_test_sysinfo.c -+++ util-linux-ng-2.12r+git20070330/tests/helpers/mnt_test_sysinfo.c -@@ -1,6 +1,7 @@ - - #include - #include -+#include - #include - - #include diff --git a/util-linux-ng-2.12r+git20070330.tar.bz2 b/util-linux-ng-2.12r+git20070330.tar.bz2 deleted file mode 100644 index a4e861a..0000000 --- a/util-linux-ng-2.12r+git20070330.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d072434a058eb2c3545194f13dc1914efc59c52b5f4d3e6f2a509ee52452778b -size 1518908 diff --git a/util-linux-ng-2.12r+git20070412.tar.bz2 b/util-linux-ng-2.12r+git20070412.tar.bz2 new file mode 100644 index 0000000..abf8a26 --- /dev/null +++ b/util-linux-ng-2.12r+git20070412.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:24be49bdf51ff79df2f4289c2c72471aefd9e2a5473cac2c66893cbee612a040 +size 1521684 diff --git a/util-linux.changes b/util-linux.changes index cb66e2f..c3c9741 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 diff --git a/util-linux.spec b/util-linux.spec index 612a7db..3b96220 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,5 +1,5 @@ # -# spec file for package util-linux (Version 2.12r+git20070330) +# spec file for package util-linux (Version 2.12r+git20070412) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ PreReq: %install_info_prereq permissions License: BSD License and BSD-like, GNU General Public License (GPL) Group: System/Base Autoreqprov: on -Version: 2.12r+git20070330 -Release: 2 +Version: 2.12r+git20070412 +Release: 1 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2 Source2: nologin.c @@ -121,13 +121,12 @@ Patch34: util-linux-2.12r-disk_utils_mkfs_open_exclusive.patch Patch35: util-linux-2.12r-fdisk_remove_bogus_warnings.patch # 242750 - mount: fix race condition when using -o loop Patch36: util-linux-2.12r-mount_racy_loop.patch -Patch37: util-linux-2.13-misc_utils_add_man_scriptreplay.patch # 254437 - swapon should automatically reset the suspend signature Patch38: util-linux-2.12r-mount_swapon_swsuspend_resume.patch -Patch39: util-linux-2.13-tests_missing_include.patch Patch40: util-linux-2.13-sys_utils_arch.patch Patch41: util-linux-2.13-build_gnu_source.patch Patch42: util-linux-2.13-build_fix_intel_check.patch +Patch43: util-linux-2.13-build_no_perl_dependency.patch ## ## adjtimex ## @@ -193,12 +192,11 @@ Authors: %patch34 -p1 %patch35 -p1 %patch36 -p1 -%patch37 -p1 %patch38 -p1 -%patch39 -p1 %patch40 -p1 %patch41 -p1 %patch42 -p1 +%patch43 -p1 # cd adjtimex-* %patch50 -p1 @@ -271,7 +269,7 @@ CFLAGS=-DCONFIG_SMP --enable-partx \ --enable-raw \ --enable-rdev \ - --enable-script \ + --enable-perl-scripts=no \ --enable-write \ --disable-use-tty-group \ CFLAGS="$CFLAGS $RPM_OPT_FLAGS" @@ -449,7 +447,6 @@ fi /sbin/swapon /bin/logger /usr/bin/cal -/usr/bin/chkdupexe /usr/bin/chrt /usr/bin/col /usr/bin/colcrt @@ -474,7 +471,6 @@ fi /usr/bin/namei /usr/bin/rename /usr/bin/renice -/usr/bin/scriptreplay /usr/bin/rev /usr/bin/script /usr/bin/setsid @@ -504,7 +500,6 @@ fi %{_infodir}/which.info*.gz %{_mandir}/man1/arch.1.gz %{_mandir}/man1/cal.1.gz -%{_mandir}/man1/chkdupexe.1.gz %{_mandir}/man1/chrt.1.gz %{_mandir}/man1/col.1.gz %{_mandir}/man1/colcrt.1.gz @@ -525,7 +520,6 @@ fi %{_mandir}/man1/ionice.1.gz %{_mandir}/man1/readprofile.1.gz %{_mandir}/man1/rename.1.gz -%{_mandir}/man1/scriptreplay.1.gz %{_mandir}/man1/rev.1.gz %{_mandir}/man1/script.1.gz %{_mandir}/man1/setterm.1.gz @@ -616,6 +610,15 @@ fi %endif %changelog +* Mon Apr 23 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 2007 - mkoenig@suse.de - fix initialization of offset in util-linux-2.12r-mount_racy_loop.patch [#264225]