which --version
-GNU which v2.19, Copyright (C) 1999 - 2008 Carlo Wood.
+GNU which v2.20, Copyright (C) 1999 - 2008 Carlo Wood.
GNU which comes with ABSOLUTELY NO WARRANTY;
This program is free software; your freedom to use, change
and distribute this program is protected by the GPL.
@@ -154,7 +154,7 @@
id
uid=1000(carlo) gid=1000(carlo) groups=20(dialout),24(cdrom),25(floppy),29(audio),44(video),46(plugdev),106(netdev),109(powerdev),115(kvm),1000(carlo)
ls -l xxx
--rwx------ 1 root carlo 0 2008-01-18 19:12 xxx
+-rwx------ 1 root carlo 0 2008-08-06 17:22 xxx
su
chmod 750 xxx
chgrp carlo xxx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/NEWS new/which-2.20/NEWS
--- old/which-2.19/NEWS 2008-01-18 19:11:27.000000000 +0100
+++ new/which-2.20/NEWS 2008-03-11 06:42:09.000000000 +0100
@@ -1,3 +1,9 @@
+Version 2.19 --> 2.20
Hello community,
here is the log from the commit of package util-linux for openSUSE:Factory
checked in at Fri Jul 30 12:35:43 CEST 2010.
--------
--- util-linux/util-linux.changes 2010-06-24 23:25:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2010-07-09 09:15:50.000000000 +0200
@@ -1,0 +2,25 @@
+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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
adjtimex-1.20-nosyscall.diff
adjtimex-1.20.tar.bz2
util-linux-2.14.1-mount_skip_sync.patch
util-linux-addpart-use-atoll.patch
util-linux-mount-detect-ro-mount.patch
util-linux-ng-2.17.2.tar.bz2
which-2.19.tar.bz2
New:
----
adjtimex-1.28.tar.bz2
util-linux-ng-2.18.tar.bz2
which-2.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ util-linux.spec ++++++
--- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:00.000000000 +0200
+++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package util-linux (Version 2.17.2)
+# spec file for package util-linux (Version 2.18)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,31 +16,40 @@
#
+%define time_ver 1.7
+%define which_ver 2.20
+%define adjtimex_ver 1.28
Name: util-linux
-BuildRequires: audit-devel gettext-devel pkg-config
-BuildRequires: libselinux-devel libsepol-devel ncurses-devel pam-devel readline-devel zlib-devel
+BuildRequires: audit-devel
+BuildRequires: gettext-devel
+BuildRequires: libselinux-devel
+BuildRequires: libsepol-devel
+BuildRequires: ncurses-devel
+BuildRequires: pam-devel
+BuildRequires: pkg-config
+BuildRequires: readline-devel
+BuildRequires: zlib-devel
Url: http://userweb.kernel.org/~kzak/util-linux-ng/
Supplements: filesystem(minix)
PreReq: %install_info_prereq permissions
License: GPLv2+
Group: System/Base
AutoReqProv: on
-Version: 2.17.2
-Release: 5
+Version: 2.18
+Release: 1
Recommends: %name-lang = %{version}
Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2
Source1: util-linux-rpmlintrc
+# XXX: make nologin part of login package
Source2: nologin.c
Source3: nologin.8
Source4: raw.init
Source5: etc.raw
Source6: etc_filesystems
+# XXX: add libmnt
Source7: baselibs.conf
-%define time_ver 1.7
-%define which_ver 2.19
-%define adjtimex_ver 1.20
# XXX: post upstream?
Source9: adjtimex-%{adjtimex_ver}.tar.bz2
# XXX: post upstream?
@@ -66,20 +75,13 @@
##
# 241372 - remove legacy warnings from fdisk
Patch1: util-linux-2.12r-fdisk_remove_bogus_warnings.patch
-# bnc#447036
-Patch2: util-linux-2.14.1-mount_skip_sync.patch
# crypto patch
Patch3: util-linux-2.17.1-mount_losetup_crypto.patch
Patch4: util-linux-2.17.1-losetup-honor-documented-c-option
-# 603328
-Patch5: util-linux-addpart-use-atoll.patch
-# bnc#481123
-Patch6: util-linux-mount-detect-ro-mount.patch
Patch7: util-linux-swapon-btrfs-limitations
##
## adjtimex
##
-Patch50: adjtimex-1.20-nosyscall.diff
##
## klogconsole
##
@@ -96,8 +98,8 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %insserv_prereq %fillup_prereq /bin/sed
#
-Provides: util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} schedutils = %{version}-%{release} uuid-runtime = %{version}-%{release}
-Obsoletes: util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} schedutils < %{version}-%{release} uuid-runtime < %{version}-%{release}
+Provides: util = %{version}-%{release} rawio = %{version}-%{release} raw = %{version}-%{release} base = %{version}-%{release} uuid-runtime = %{version}-%{release}
+Obsoletes: util < %{version}-%{release} rawio < %{version}-%{release} raw < %{version}-%{release} base < %{version}-%{release} uuid-runtime < %{version}-%{release}
%description
This package contains a large variety of low-level system utilities
@@ -118,7 +120,7 @@
Summary: Development files for the filesystem detection library
Group: Development/Libraries/C and C++
AutoReqProv: on
-Requires: libblkid1 = %version libuuid-devel
+Requires: libblkid1 = %version
%description -n libblkid-devel
Files needed to develop applications using the library for filesystem
@@ -156,27 +158,44 @@
Files to develop applications using the library to generate universally
unique IDs (UUIDs).
+%package -n libmount1
+License: GPLv2+
+Summary: Mount library
+Group: System/Filesystems
+AutoReqProv: on
+
+%description -n libmount1
+Library designed to be used in low-level utils like
+mount(8) and /sbin/mount.<type> helpers.
+
+%package -n libmount-devel
+License: GPLv2+
+Summary: Development files for libmount1
+Group: Development/Libraries/C and C++
+AutoReqProv: on
+Requires: libmount1 = %version
+
+%description -n libmount-devel
+Files to develop applications using the libmount library.
+
%lang_package
%prep
%setup -q -a 9 -b 11 -b 12 -b 13 -n %name-ng-%version
-#patch0 -p1
%patch1 -p1
-%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%patch7 -p1
#
cd adjtimex-*
-%patch50 -p1
+# adjtimex patches belongs here
cd -
# setctsid
cp %{S:22} %{S:23} .
# nologin
cp %{S:2} %{S:3} %{S:26} %{S:30} .
cd ../klogconsole
-%patch55 -p1 -b .quiet
+#%#patch55 -p1 -b .quiet
+%patch55 -p1
%patch56 -p1
cd ../time-*
%patch60
@@ -187,12 +206,11 @@
# adjtimex build
cd adjtimex-%{adjtimex_ver}
CFLAGS="$RPM_OPT_FLAGS" ./configure
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
cd ..
pushd ../
# which build
cd which-%{which_ver}
-#autoreconf -fi
aclocal --force
autoconf --force
automake --force-missing --add-missing --foreign
@@ -201,7 +219,7 @@
--mandir=%{_mandir} \
--infodir=%{_infodir} \
%{_target_cpu}-suse-linux
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
cd ..
# time build
cd time-%{time_ver}
@@ -211,16 +229,16 @@
--mandir=%{_mandir} \
--infodir=%{_infodir} \
%{_target_cpu}-suse-linux
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
cd ..
# klogconsole build
cd klogconsole
-make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
cd ..
popd
# setctsid build
rm -f setctsid
-make %{?jobs:-j%jobs} setctsid CFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} setctsid CFLAGS="$RPM_OPT_FLAGS"
#
# util-linux itself
#
@@ -243,11 +261,8 @@
--enable-write \
--disable-use-tty-group \
--disable-static \
-%ifarch %ix86 x86_64
- --enable-rdev \
-%endif
#
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
#
gcc $RPM_OPT_FLAGS -o nologin nologin.c
gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29}
@@ -300,6 +315,7 @@
install -m 755 nologin $RPM_BUILD_ROOT/sbin
rm -f $RPM_BUILD_ROOT/%{_libdir}/libblkid.la
rm -f $RPM_BUILD_ROOT/%{_libdir}/libuuid.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libmount.la
%ifnarch ppc ppc64
install -m 755 mkzimage_cmdline $RPM_BUILD_ROOT/usr/bin
install -m 644 %{S:28} $RPM_BUILD_ROOT%{_mandir}/man8
@@ -385,6 +401,12 @@
%postun -n libblkid1
/sbin/ldconfig
+%post -n libmount1
+/sbin/ldconfig
+
+%postun -n libmount1
+/sbin/ldconfig
+
%pre -n uuidd
/usr/sbin/groupadd -r uuidd 2>/dev/null || :
/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
@@ -432,6 +454,7 @@
/bin/more
/bin/mount
/bin/umount
+/bin/findmnt
/sbin/adjtimex
/sbin/agetty
/sbin/blockdev
@@ -455,6 +478,8 @@
/sbin/fsck
/sbin/switch_root
/sbin/wipefs
+/sbin/fsfreeze
+/sbin/swaplabel
/usr/bin/ipcmk
/bin/logger
/usr/bin/cal
@@ -473,8 +498,6 @@
/usr/bin/ipcs
/usr/bin/isosize
/usr/bin/line
-#/usr/bin/linux32
-#/usr/bin/linux64
/usr/bin/look
/usr/bin/lscpu
/usr/bin/mcookie
@@ -573,13 +596,14 @@
%{_mandir}/man8/fsck.minix.8.gz
%{_mandir}/man8/isosize.8.gz
%{_mandir}/man8/ldattach.8.gz
-#%{_mandir}/man8/linux32.8.gz
-#%{_mandir}/man8/linux64.8.gz
%{_mandir}/man8/losetup.8.gz
%{_mandir}/man8/mkfs.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
%ifnarch ppc ppc64
%{_mandir}/man8/mkzimage_cmdline.8.gz
%endif
@@ -600,7 +624,6 @@
%attr (755,root,root) /usr/share/getopt/getopt-parse.tcsh
%attr (755,root,root) /usr/share/getopt/getopt-test.bash
%attr (755,root,root) /usr/share/getopt/getopt-test.tcsh
-#/usr/share/locale/*/LC_MESSAGES/util-linux-ng.mo
%ifnarch ia64
%doc fdisk/README.fdisk
/sbin/fdisk
@@ -613,18 +636,7 @@
/sbin/cfdisk
/sbin/sfdisk
%endif
-%ifarch %ix86 x86_64
-/usr/sbin/ramsize
-/usr/sbin/rdev
-/usr/sbin/rootflags
-/usr/sbin/vidmode
-%{_mandir}/man8/ramsize.8.gz
-%{_mandir}/man8/rdev.8.gz
-%{_mandir}/man8/rootflags.8.gz
-%{_mandir}/man8/vidmode.8.gz
-%endif
%ifnarch s390 s390x
-#%config(noreplace) /etc/fdprm
/usr/bin/cytune
/usr/sbin/fdformat
/sbin/hwclock
@@ -637,35 +649,6 @@
%{_mandir}/man8/klogconsole.8.gz
%{_mandir}/man8/tunelp.8.gz
%endif
-# setarch links
-#%ifarch %ix86 x86_64
-#/usr/bin/i386
-#%{_mandir}/man8/i386.8.gz
-#%endif
-#%ifarch x86_64
-#/usr/bin/x86_64
-#%{_mandir}/man8/x86_64.8.gz
-#%endif
-#%ifarch s390 s390x
-#/usr/bin/s390
-#/usr/bin/s390x
-#%{_mandir}/man8/s390.8.gz
-#%{_mandir}/man8/s390x.8.gz
-#%endif
-#%ifarch ppc ppc64
-#/usr/bin/ppc
-#/usr/bin/ppc32
-#/usr/bin/ppc64
-#%{_mandir}/man8/ppc.8.gz
-#%{_mandir}/man8/ppc32.8.gz
-#%{_mandir}/man8/ppc64.8.gz
-#%endif
-#%ifarch ia64
-#/usr/bin/i386
-#/usr/bin/ia64
-#%{_mandir}/man8/i386.8.gz
-#%{_mandir}/man8/ia64.8.gz
-#%endif
%files -n libblkid1
%defattr(-, root, root)
@@ -680,6 +663,18 @@
%_libdir/pkgconfig/blkid.pc
%{_mandir}/man3/libblkid.3.gz
+%files -n libmount1
+%defattr(-, root, root)
+/%{_lib}/libmount.so.1
+/%{_lib}/libmount.so.1.*
+
+%files -n libmount-devel
+%defattr(-, root, root)
+%{_libdir}/libmount.so
+%dir %{_includedir}/mount
+%{_includedir}/mount/mount.h
+%_libdir/pkgconfig/mount.pc
+
%files -n uuidd
%defattr(-, root, root)
%verify(not mode) %attr(0755,root,root) /usr/sbin/uuidd
++++++ adjtimex-1.20.tar.bz2 -> adjtimex-1.28.tar.bz2 ++++++
++++ 8702 lines of diff (skipped)
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:01.000000000 +0200
+++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:01.000000000 +0200
@@ -2,12 +2,11 @@
libuuid-devel
requires -libuuid-<targettype>
requires "libuuid1-<targettype> = <version>"
- requires -libblkid-<targettype>
- requires "libblkid1-<targettype> = <version>"
libblkid1
- obsoletes "e2fsprogs-<targettype> <= <version>"
libblkid-devel
requires -libblkid-<targettype>
requires "libblkid1-<targettype> = <version>"
- requires -libuuid-<targettype>
- requires "libuuid1-<targettype> = <version>"
+libmount1
+libmount-devel
+ requires -libmount-<targettype>
+ requires "libmount1-<targettype> = <version>"
++++++ util-linux-2.12r-fdisk_remove_bogus_warnings.patch ++++++
--- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:01.000000000 +0200
+++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:01.000000000 +0200
@@ -1,8 +1,8 @@
-Index: util-linux-ng-2.16/fdisk/fdisk.c
+Index: util-linux-ng-2.18/fdisk/fdisk.c
===================================================================
---- util-linux-ng-2.16.orig/fdisk/fdisk.c
-+++ util-linux-ng-2.16/fdisk/fdisk.c
-@@ -1586,6 +1586,7 @@ static void check_consistency(struct par
+--- util-linux-ng-2.18.orig/fdisk/fdisk.c 2010-06-30 14:44:25.000000000 +0200
++++ util-linux-ng-2.18/fdisk/fdisk.c 2010-07-08 14:35:07.000000000 +0200
+@@ -1838,6 +1838,7 @@ static void check_consistency(struct par
/* compute logical ending (c, h, s) */
long2chs(get_start_sect(p) + get_nr_sects(p) - 1, &lec, &leh, &les);
@@ -10,7 +10,7 @@
/* Same physical / logical beginning? */
if (cylinders <= 1024 && (pbc != lbc || pbh != lbh || pbs != lbs)) {
printf(_("Partition %d has different physical/logical "
-@@ -1602,7 +1603,6 @@ static void check_consistency(struct par
+@@ -1854,7 +1855,6 @@ static void check_consistency(struct par
printf(_("logical=(%d, %d, %d)\n"),lec, leh, les);
}
++++++ util-linux-2.17.1-mount_losetup_crypto.patch ++++++
--- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:01.000000000 +0200
+++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:01.000000000 +0200
@@ -38,24 +38,23 @@
create mode 100644 mount/sha512.c
create mode 100644 mount/sha512.h
-diff --git a/mount/Makefile.am b/mount/Makefile.am
-index c5f58aa..43ff01a 100644
---- a/mount/Makefile.am
-+++ b/mount/Makefile.am
-@@ -7,7 +7,8 @@ sbin_PROGRAMS = losetup swapon
+Index: util-linux-ng-2.18/mount/Makefile.am
+===================================================================
+--- util-linux-ng-2.18.orig/mount/Makefile.am 2010-05-24 12:35:47.000000000 +0200
++++ util-linux-ng-2.18/mount/Makefile.am 2010-07-08 14:39:01.000000000 +0200
+@@ -7,7 +7,7 @@ sbin_PROGRAMS = losetup swapon
dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8
# generic sources for all programs (mount, umount, losetup)
--srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h
-+srcs_common = sundries.c xmalloc.c ../lib/canonicalize.c sundries.h xmalloc.h \
-+ rmd160.c sha512.c
+-srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h
++srcs_common = sundries.c xmalloc.c $(top_srcdir)/lib/canonicalize.c sundries.h xmalloc.h rmd160.c sha512.c
# generic header for mount and umount
hdrs_mount = fstab.h mount_mntent.h mount_constants.h \
-diff --git a/mount/lomount.c b/mount/lomount.c
-index 67712c6..a0b951c 100644
---- a/mount/lomount.c
-+++ b/mount/lomount.c
+Index: util-linux-ng-2.18/mount/lomount.c
+===================================================================
+--- util-linux-ng-2.18.orig/mount/lomount.c 2010-05-19 23:36:23.000000000 +0200
++++ util-linux-ng-2.18/mount/lomount.c 2010-07-08 14:39:29.000000000 +0200
@@ -23,6 +23,12 @@
#include "sundries.h"
#include "xmalloc.h"
@@ -143,7 +142,7 @@
char *filename;
if (verbose) {
-@@ -707,13 +742,37 @@ set_loop(const char *device, const char *file, unsigned long long offset,
+@@ -707,13 +742,37 @@ set_loop(const char *device, const char
filename = (char *) file;
xstrncpy((char *)loopinfo64.lo_file_name, filename, LO_NAME_SIZE);
@@ -183,7 +182,7 @@
}
}
-@@ -734,20 +793,70 @@ set_loop(const char *device, const char *file, unsigned long long offset,
+@@ -734,20 +793,70 @@ set_loop(const char *device, const char
}
#endif
@@ -266,7 +265,7 @@
}
if (ioctl(fd, LOOP_SET_FD, ffd) < 0) {
-@@ -895,7 +1004,13 @@ usage(void) {
+@@ -897,7 +1006,13 @@ usage(void) {
fprintf(stderr, _("\nOptions:\n"
" -e | --encryption <type> enable data encryption with specified \n"
@@ -280,7 +279,7 @@
" -o | --offset <num> start at offset <num> into file\n"
" --sizelimit <num> loop limited to only <num> bytes of the file\n"
" -p | --pass-fd <num> read passphrase from file descriptor <num>\n"
-@@ -908,11 +1023,14 @@ usage(void) {
+@@ -910,11 +1025,14 @@ usage(void) {
int
main(int argc, char **argv) {
char *p, *offset, *sizelimit, *encryption, *passfd, *device, *file, *assoc;
@@ -292,10 +291,10 @@
int ro = 0;
int pfd = -1;
+ int keysz = 0;
- unsigned long long off, slimit;
+ uintmax_t off = 0, slimit = 0;
struct option longopts[] = {
{ "all", 0, 0, 'a' },
-@@ -921,6 +1039,8 @@ main(int argc, char **argv) {
+@@ -923,6 +1041,8 @@ main(int argc, char **argv) {
{ "encryption", 1, 0, 'e' },
{ "find", 0, 0, 'f' },
{ "help", 0, 0, 'h' },
@@ -305,8 +304,8 @@
{ "offset", 1, 0, 'o' },
{ "sizelimit", 1, 0, 128 },
@@ -939,12 +1059,13 @@ main(int argc, char **argv) {
- off = 0;
- slimit = 0;
+
+ capacity = delete = find = all = 0;
assoc = offset = sizelimit = encryption = passfd = NULL;
+ keysize = NULL;
@@ -332,7 +331,7 @@
case 'o':
offset = optarg;
break;
-@@ -1054,8 +1181,11 @@ main(int argc, char **argv) {
+@@ -1058,8 +1185,11 @@ main(int argc, char **argv) {
else {
if (passfd && sscanf(passfd, "%d", &pfd) != 1)
usage();
@@ -345,10 +344,10 @@
if (res == 2 && find) {
if (verbose)
printf(_("stolen loop=%s...trying again\n"),
-diff --git a/mount/lomount.h b/mount/lomount.h
-index 59108d4..07ab875 100644
---- a/mount/lomount.h
-+++ b/mount/lomount.h
+Index: util-linux-ng-2.18/mount/lomount.h
+===================================================================
+--- util-linux-ng-2.18.orig/mount/lomount.h 2010-02-04 12:53:56.000000000 +0100
++++ util-linux-ng-2.18/mount/lomount.h 2010-07-08 14:38:38.000000000 +0200
@@ -1,5 +1,6 @@
-extern int set_loop(const char *, const char *, unsigned long long, unsigned long long,
- const char *, int, int *);
@@ -358,11 +357,11 @@
extern int del_loop(const char *);
extern int is_loop_device(const char *);
extern int is_loop_autoclear(const char *device);
-diff --git a/mount/losetup.8 b/mount/losetup.8
-index 8ccab6c..8566898 100644
---- a/mount/losetup.8
-+++ b/mount/losetup.8
-@@ -92,9 +92,18 @@ find the first unused loop device. If a
+Index: util-linux-ng-2.18/mount/losetup.8
+===================================================================
+--- util-linux-ng-2.18.orig/mount/losetup.8 2010-05-19 23:36:23.000000000 +0200
++++ util-linux-ng-2.18/mount/losetup.8 2010-07-08 14:38:38.000000000 +0200
+@@ -96,9 +96,18 @@ find the first unused loop device. If a
argument is present, use this device. Otherwise, print its name
.IP "\fB\-h, \-\-help\fP"
print help
@@ -381,7 +380,7 @@
.IP "\fB\-o, \-\-offset \fIoffset\fP"
the data start is moved \fIoffset\fP bytes into the specified file or
device
-@@ -165,6 +174,8 @@ the command
+@@ -169,6 +178,8 @@ the command
.fi
.SH RESTRICTION
DES encryption is painfully slow. On the other hand, XOR is terribly weak.
@@ -390,11 +389,11 @@
Cryptoloop is deprecated in favor of dm-crypt. For more details see
.BR cryptsetup (8).
-diff --git a/mount/mount.8 b/mount/mount.8
-index 2888b46..582898a 100644
---- a/mount/mount.8
-+++ b/mount/mount.8
-@@ -826,6 +826,15 @@ Every time the inode is modified, the i_version field will be incremented.
+Index: util-linux-ng-2.18/mount/mount.8
+===================================================================
+--- util-linux-ng-2.18.orig/mount/mount.8 2010-06-30 10:41:35.000000000 +0200
++++ util-linux-ng-2.18/mount/mount.8 2010-07-08 14:38:38.000000000 +0200
+@@ -869,6 +869,15 @@ Every time the inode is modified, the i_
.B noiversion
Do not increment the i_version inode field.
.TP
@@ -410,7 +409,7 @@
.B mand
Allow mandatory locks on this filesystem. See
.BR fcntl (2).
-@@ -2525,6 +2534,10 @@ that are really options to
+@@ -2582,6 +2591,10 @@ that are really options to
.BR \%losetup (8).
(These options can be used in addition to those specific
to the filesystem type.)
@@ -419,13 +418,13 @@
+.BR \-\-pass-fd
+option.
- If no explicit loop device is mentioned
- (but just an option `\fB\-o loop\fP' is given), then
-diff --git a/mount/mount.c b/mount/mount.c
-index efe1165..09006f7 100644
---- a/mount/mount.c
-+++ b/mount/mount.c
-@@ -95,6 +95,9 @@ struct mountargs {
+ Since Linux 2.6.25 is supported auto-destruction of loop devices and
+ then any loop device allocated by
+Index: util-linux-ng-2.18/mount/mount.c
+===================================================================
+--- util-linux-ng-2.18.orig/mount/mount.c 2010-06-30 12:51:09.000000000 +0200
++++ util-linux-ng-2.18/mount/mount.c 2010-07-08 14:38:38.000000000 +0200
+@@ -96,6 +96,9 @@ struct mountargs {
void *data;
};
@@ -435,7 +434,7 @@
/* Map from -o and fstab option strings to the flag argument to mount(2). */
struct opt_map {
const char *opt; /* option name */
-@@ -200,6 +203,7 @@ static int opt_nofail = 0;
+@@ -201,6 +204,7 @@ static int opt_nofail = 0;
static const char *opt_loopdev, *opt_vfstype, *opt_offset, *opt_sizelimit,
*opt_encryption, *opt_speed, *opt_comment, *opt_uhelper;
@@ -443,7 +442,7 @@
static int is_readonly(const char *node);
static int mounted (const char *spec0, const char *node0);
-@@ -216,6 +220,8 @@ static struct string_opt_map {
+@@ -217,6 +221,8 @@ static struct string_opt_map {
{ "offset=", 0, &opt_offset },
{ "sizelimit=", 0, &opt_sizelimit },
{ "encryption=", 0, &opt_encryption },
@@ -452,7 +451,7 @@
{ "speed=", 0, &opt_speed },
{ "comment=", 1, &opt_comment },
{ "uhelper=", 0, &opt_uhelper },
-@@ -1081,7 +1087,8 @@ loop_check(const char **spec, const char **type, int *flags,
+@@ -1116,7 +1122,8 @@ loop_check(const char **spec, const char
*type = opt_vfstype;
}
@@ -461,8 +460,8 @@
+ opt_encryption || opt_phash || opt_keybits);
*loopfile = *spec;
- if (*loop) {
-@@ -1113,7 +1120,7 @@ loop_check(const char **spec, const char **type, int *flags,
+ /* Automatically create a loop device from a regular file if a filesystem
+@@ -1170,7 +1177,7 @@ loop_check(const char **spec, const char
printf(_("mount: going to use the loop device %s\n"), *loopdev);
if ((res = set_loop(*loopdev, *loopfile, offset, sizelimit,
@@ -471,7 +470,7 @@
if (res == 2) {
/* loop dev has been grabbed by some other process,
try again, if not given explicitly */
-@@ -1920,6 +1927,7 @@ static struct option longopts[] = {
+@@ -1981,6 +1988,7 @@ static struct option longopts[] = {
{ "options", 1, 0, 'o' },
{ "test-opts", 1, 0, 'O' },
{ "pass-fd", 1, 0, 'p' },
@@ -479,7 +478,7 @@
{ "types", 1, 0, 't' },
{ "bind", 0, 0, 'B' },
{ "move", 0, 0, 'M' },
-@@ -2082,6 +2090,7 @@ main(int argc, char *argv[]) {
+@@ -2143,6 +2151,7 @@ main(int argc, char *argv[]) {
char *options = NULL, *test_opts = NULL, *node;
const char *spec = NULL;
char *label = NULL;
@@ -487,7 +486,7 @@
char *uuid = NULL;
char *types = NULL;
char *p;
-@@ -2112,7 +2121,7 @@ main(int argc, char *argv[]) {
+@@ -2173,7 +2182,7 @@ main(int argc, char *argv[]) {
initproctitle(argc, argv);
#endif
@@ -496,7 +495,7 @@
longopts, NULL)) != -1) {
switch (c) {
case 'a': /* mount everything in fstab */
-@@ -2133,6 +2142,9 @@ main(int argc, char *argv[]) {
+@@ -2194,6 +2203,9 @@ main(int argc, char *argv[]) {
case 'i':
external_allowed = 0;
break;
@@ -506,7 +505,7 @@
case 'l':
list_with_volumelabel = 1;
break;
-@@ -2280,6 +2292,9 @@ main(int argc, char *argv[]) {
+@@ -2341,6 +2353,9 @@ main(int argc, char *argv[]) {
atexit(unlock_mtab);
@@ -516,11 +515,10 @@
switch (argc+specseen) {
case 0:
/* mount -a */
-diff --git a/mount/rmd160.c b/mount/rmd160.c
-new file mode 100644
-index 0000000..3430954
---- /dev/null
-+++ b/mount/rmd160.c
+Index: util-linux-ng-2.18/mount/rmd160.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ util-linux-ng-2.18/mount/rmd160.c 2010-07-08 14:38:38.000000000 +0200
@@ -0,0 +1,532 @@
+/* rmd160.c - RIPE-MD160
+ * Copyright (C) 1998 Free Software Foundation, Inc.
@@ -1054,11 +1052,10 @@
+ rmd160_final( &hd );
+ memcpy( outbuf, hd.buf, 20 );
+}
-diff --git a/mount/rmd160.h b/mount/rmd160.h
-new file mode 100644
-index 0000000..4b2c61d
---- /dev/null
-+++ b/mount/rmd160.h
+Index: util-linux-ng-2.18/mount/rmd160.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ util-linux-ng-2.18/mount/rmd160.h 2010-07-08 14:38:38.000000000 +0200
@@ -0,0 +1,11 @@
+#ifndef RMD160_H
+#define RMD160_H
@@ -1071,11 +1068,10 @@
+#endif /*RMD160_H*/
+
+
-diff --git a/mount/sha512.c b/mount/sha512.c
-new file mode 100644
-index 0000000..f717c8b
---- /dev/null
-+++ b/mount/sha512.c
+Index: util-linux-ng-2.18/mount/sha512.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ util-linux-ng-2.18/mount/sha512.c 2010-07-08 14:38:38.000000000 +0200
@@ -0,0 +1,432 @@
+/*
+ * sha512.c
@@ -1509,11 +1505,10 @@
+ memset(&ctx, 0, sizeof(ctx));
+}
+#endif
-diff --git a/mount/sha512.h b/mount/sha512.h
-new file mode 100644
-index 0000000..4b57c01
---- /dev/null
-+++ b/mount/sha512.h
+Index: util-linux-ng-2.18/mount/sha512.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ util-linux-ng-2.18/mount/sha512.h 2010-07-08 14:38:38.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ * sha512.h
@@ -1560,6 +1555,3 @@
+/* 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);
---
-1.6.4.2
-
++++++ util-linux-ng-2.17.2.tar.bz2 -> util-linux-ng-2.18.tar.bz2 ++++++
util-linux/util-linux-ng-2.17.2.tar.bz2 /mounts/work_src_done/STABLE/util-linux/util-linux-ng-2.18.tar.bz2 differ: char 11, line 1
++++++ util-linux-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.I39Ywd/_old 2010-07-30 12:35:01.000000000 +0200
+++ /var/tmp/diff_new_pack.I39Ywd/_new 2010-07-30 12:35:01.000000000 +0200
@@ -1,5 +1,4 @@
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)")
++++++ which-2.19.tar.bz2 -> which-2.20.tar.bz2 ++++++
++++ 2407 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/EXAMPLES new/which-2.20/EXAMPLES
--- old/which-2.19/EXAMPLES 2008-01-18 19:12:06.000000000 +0100
+++ new/which-2.20/EXAMPLES 2008-08-06 17:22:13.000000000 +0200
@@ -36,7 +36,7 @@
Report bugs to .
+
+* xmalloc.h included a readline header for no apparent reason. The compilation
+ failed if readline was not installed. The dependency on the readline header
+ was removed. Submitted by Tushar Teredesai.
+
Version 2.18 --> 2.19
* Upgraded code from bash to version 3.2. This DOES has influence
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/configure.ac new/which-2.20/configure.ac
--- old/which-2.19/configure.ac 2008-01-16 17:55:28.000000000 +0100
+++ new/which-2.20/configure.ac 2008-03-11 06:42:31.000000000 +0100
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(which.c)
-AM_INIT_AUTOMAKE(which, 2.19)
+AM_INIT_AUTOMAKE(which, 2.20)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/missing new/which-2.20/missing
--- old/which-2.19/missing 2006-11-27 03:51:30.000000000 +0100
+++ new/which-2.20/missing 2008-02-10 03:55:24.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/stamp-vti new/which-2.20/stamp-vti
--- old/which-2.19/stamp-vti 2008-01-16 18:35:42.000000000 +0100
+++ new/which-2.20/stamp-vti 2008-08-06 17:20:48.000000000 +0200
@@ -1,4 +1,4 @@
@set UPDATED 16 January 2008
@set UPDATED-MONTH January 2008
-@set EDITION 2.19
-@set VERSION 2.19
+@set EDITION 2.20
+@set VERSION 2.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/tilde/xmalloc.h new/which-2.20/tilde/xmalloc.h
--- old/which-2.19/tilde/xmalloc.h 2008-01-16 17:07:57.000000000 +0100
+++ new/which-2.20/tilde/xmalloc.h 2008-03-11 06:38:00.000000000 +0100
@@ -23,12 +23,6 @@
#if !defined (_XMALLOC_H_)
#define _XMALLOC_H_
-#if defined (READLINE_LIBRARY)
-# include "rlstdc.h"
-#else
-# include
-#endif
-
#ifndef PTR_T
#ifdef __STDC__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/version.texi new/which-2.20/version.texi
--- old/which-2.19/version.texi 2008-01-16 17:59:02.000000000 +0100
+++ new/which-2.20/version.texi 2008-08-06 17:20:48.000000000 +0200
@@ -1,4 +1,4 @@
@set UPDATED 16 January 2008
@set UPDATED-MONTH January 2008
-@set EDITION 2.19
-@set VERSION 2.19
+@set EDITION 2.20
+@set VERSION 2.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/which-2.19/which.info new/which-2.20/which.info
--- old/which-2.19/which.info 2008-01-16 18:35:42.000000000 +0100
+++ new/which-2.20/which.info 2008-08-06 17:20:56.000000000 +0200
@@ -27,7 +27,7 @@
The `which' program shows the full path of (shell) commands.
-This file documents `which' version 2.19, updated 16 January 2008.
+This file documents `which' version 2.20, updated 16 January 2008.
* Menu:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org