Accepting request 33270 from home:lnussel:branches:Base:System

Copy from home:lnussel:branches:Base:System/util-linux via accept of submit request 33270 revision 4. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/33270 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=30
2010-02-24 12:06:09 +00:00
parent eaa36caf50
commit 831bb96645
5 changed files with 140 additions and 124 deletions
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -16,23 +16,24 @@
 #


+# NOTES:
+# both SUSE and Fedora include nologin.c, why not upstream?
+# hostid command is in coreutils already

 Name:           util-linux
 BuildRequires:  audit-devel gettext-devel pkg-config
 BuildRequires:  libselinux-devel libsepol-devel ncurses-devel pam-devel readline-devel zlib-devel
 Url:            http://userweb.kernel.org/~kzak/util-linux-ng/
-Provides:       util rawio raw base schedutils uuid-runtime
-Obsoletes:      util rawio raw base schedutils uuid-runtime
 Supplements:    filesystem(minix)
 PreReq:         %install_info_prereq permissions
 License:        BSD3c(or similar) ; GPLv2+
 Group:          System/Base
 AutoReqProv:    on
-Version:        2.16
-Release:        9
-Requires:       %name-lang = %{version}
+Version:        2.17.1
+Release:        1
+Recommends:     %name-lang = %{version}
 Summary:        A collection of basic system utilities
-Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
+Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v%{version}/%name-ng-%{version}.tar.bz2
 Source1:        util-linux-rpmlintrc
 Source2:        nologin.c
 Source3:        nologin.8
@@ -43,33 +44,39 @@ 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: DROP?
 Source10:       freeramdisk.tar.bz2
+# XXX: post upstream?
 Source11:       klogconsole.tar.bz2
+# TODO: split to separate package
 Source12:       which-%{which_ver}.tar.bz2
+# TODO: split to separate package
 Source13:       time-%{time_ver}.tar.bz2
-Source15:       cryptoloop.txt
+# XXX: needed?
 Source22:       setctsid.c
 Source23:       setctsid.8
-Source26:       README.raw
+# XXX: ppc specific, still needed?
 Source28:       mkzimage_cmdline.8
 Source29:       mkzimage_cmdline.c
-Source30:       README.largedisk
 Source31:       addnote.c
+#
+Source26:       README.raw
+Source30:       README.largedisk
 Source50:       uuidd.rc
 Source51:       blkid.conf
 ##
 ## util-linux patches
 ##
-# add hostid
+# add hostid. FIXME: use the one from coreutils
 Patch0:         util-linux-2.12-misc_utils_hostid.patch
 # 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-mount_losetup_crypto.patch
-Patch4:         util-linux-ng-bnc503008.patch	
+Patch3:         util-linux-2.17.1-mount_losetup_crypto.patch
 ##
 ## adjtimex
 ##
@@ -89,6 +96,9 @@ Patch60:        time-1.7.dif
 Patch70:        which-lib64.patch
 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}

 %description
 This package contains a large variety of low-level system utilities
@@ -154,7 +164,6 @@ unique IDs (UUIDs).
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 #
 cd adjtimex-*
 %patch50 -p1
@@ -162,7 +171,7 @@ cd -
 # setctsid
 cp %{S:22} %{S:23} .
 # nologin
-cp %{S:2} %{S:3} %{S:15} %{S:26} %{S:30} .
+cp %{S:2} %{S:3} %{S:26} %{S:30} .
 cd ../klogconsole
 %patch55 -p1 -b .quiet
 %patch56 -p1 
@@ -216,15 +225,10 @@ make %{?jobs:-j%jobs} setctsid CFLAGS="$RPM_OPT_FLAGS"
 #
 # util-linux itself
 #
-%ifarch s390 s390x
-CFLAGS=-DCONFIG_SMP
-%endif
-# architecture dependent builds
-BUILD_ENABLE=
-%ifarch %ix86 x86_64
-BUILD_ENABLE="--enable-rdev"
-%endif
 autoreconf -fi
+export SUID_CFLAGS="-fpie"
+export SUID_LDFLAGS="-pie"
+CFLAGS="$RPM_OPT_FLAGS" \
 ./configure \
  --mandir=%{_mandir} \
  --datadir=%{_datadir} \
@@ -240,9 +244,12 @@ autoreconf -fi
  --enable-write \
  --disable-use-tty-group \
  --disable-static \
-  $BUILD_ENABLE \
-  CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+%ifarch %ix86 x86_64
+  --enable-rdev \
+%endif
+#
 make %{?jobs:-j%jobs}
+#
 gcc $RPM_OPT_FLAGS -o nologin nologin.c
 gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29}
 gcc $RPM_OPT_FLAGS -o chrp-addnote %{SOURCE31}
@@ -361,7 +368,8 @@ rm -rf $RPM_BUILD_ROOT

 %post
 %{fillup_and_insserv raw}
-%install_info --entry="* freeramdisk: (freeramdisk). tell kernel to free allocated memory for ramdisk" --info-dir=%{_infodir} %{_infodir}/freeramdisk.info.gz
+txt='* freeramdisk: (freeramdisk). tell kernel to free allocated memory for ramdisk'
+%install_info --entry="$txt" --info-dir=%{_infodir} %{_infodir}/freeramdisk.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/ipc.info.gz
 %install_info --entry="* time: (time). summarizing used system resources" --info-dir=%{_infodir} %{_infodir}/time.info.gz
 %install_info --info-dir=%{_infodir} %{_infodir}/which.info.gz
@@ -455,6 +463,7 @@ fi
 /sbin/findfs
 /sbin/fsck
 /sbin/switch_root
+/sbin/wipefs
 /usr/bin/ipcmk
 /bin/logger
 /usr/bin/cal
@@ -464,6 +473,7 @@ fi
 /usr/bin/colrm
 /usr/bin/column
 /usr/bin/ddate
+/usr/bin/fallocate
 /usr/bin/flock
 /usr/bin/getopt
 /usr/bin/hexdump
@@ -496,6 +506,7 @@ fi
 /usr/bin/tailf
 /usr/bin/taskset
 /usr/bin/time
+/usr/bin/unshare
 /usr/bin/which
 /usr/sbin/addpart
 /usr/sbin/delpart
@@ -524,6 +535,7 @@ fi
 %{_mandir}/man1/column.1.gz
 %{_mandir}/man1/ddate.1.gz
 %{_mandir}/man1/dmesg.1.gz
+%{_mandir}/man1/fallocate.1.gz
 %{_mandir}/man1/flock.1.gz
 %{_mandir}/man1/getopt.1.gz
 %{_mandir}/man1/hexdump.1.gz
@@ -550,6 +562,7 @@ fi
 %{_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
@@ -592,6 +605,7 @@ fi
 %{_mandir}/man8/swapon.8.gz
 %{_mandir}/man8/umount.8.gz
 %{_mandir}/man8/setctsid.8.gz
+%{_mandir}/man8/wipefs.8.gz
 /usr/sbin/flushb
 /usr/sbin/readprofile
 %dir /usr/share/getopt