coreutils: update to 8.20

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7168 ec354946-7b23-47d6-9f5a-488ba84defc7

c/coreutils/coreutils-vl.spec

@@ -1,22 +1,18 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Summary(ja): GNU コアユーティリティ: シェルスクリプトで用いるツール集
 Name:    coreutils
-Version: 8.10
+Version: 8.20
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
 
 Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
 Source101:  coreutils-DIR_COLORS
-Source102:  coreutils-DIR_COLORS.xterm
+Source102:  coreutils-DIR_COLORS.lightbgcolor
 Source103:  coreutils-DIR_COLORS.256color
 Source105:  coreutils-colorls.sh
 Source106:  coreutils-colorls.csh
-Source200:  coreutils-su.pamd
-Source201:  coreutils-runuser.pamd
-Source202:  coreutils-su-l.pamd
-Source203:  coreutils-runuser-l.pamd
 
 # Vine sources
 Source1000: coreutils-8.10-ja.po
@@ -34,38 +30,22 @@ Patch102: coreutils-7.4-sttytcsadrain.patch
 Patch103: coreutils-8.2-uname-processortype.patch
 #df --direct
 Patch104: coreutils-df-direct.patch
-#add jar-like archives to colored ones
-Patch106: coreutils-8.5-dircolors.patch
 
 # sh-utils
-#Patch703: sh-utils-2.0.11-dateman.patch
-Patch704: sh-utils-1.16-paths.patch
-# RMS will never accept the PAM patch because it removes his historical
-# rant about Twenex and the wheel group, so we'll continue to maintain
-# it here indefinitely.
-Patch706: coreutils-8.5-pam.patch
 Patch713: coreutils-4.5.3-langinfo.patch
 
 # (sb) lin18nux/lsb compliance
-Patch800: coreutils-8.10-i18n.patch
+Patch800: coreutils-8.19-i18n.patch
 
-#Call setsid() in su under some circumstances (bug #173008).
-Patch900: coreutils-setsid.patch
-#make runuser binary based on su.c
-Patch907: coreutils-8.7-runuser.patch
 #getgrouplist() patch from Ulrich Drepper.
 Patch908: coreutils-getgrouplist.patch
 #Prevent buffer overflow in who(1) (bug #158405).
 Patch912: coreutils-overflow.patch
-#compile su with pie flag and RELRO protection
-Patch917: coreutils-8.4-su-pie.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gettext libtermcap-devel bison
-%{?!nopam:BuildRequires: pam-devel}
 BuildRequires: texinfo >= 4.3
-BuildRequires: autoconf >= 2.58, automake >= 1.10
+BuildRequires: autoconf >= 2.58, automake >= 1.11.2
-%{?!nopam:Requires: pam >= 0.66-12}
 BuildRequires: libcap-devel
 BuildRequires: libattr-devel
 BuildRequires: libacl-devel
@@ -82,6 +62,8 @@ Provides:	fileutils = %version, sh-utils = %version, stat, textutils = %version
 Obsoletes:	fileutils sh-utils stat textutils
 Provides:	mktemp = %version
 Obsoletes:	mktemp
+# su/runuser moved to util-linux
+Requires: util-linux >= 2.22.1
 
 %description
 These are the GNU core utilities.  This package is the combination of
@@ -105,23 +87,18 @@ sh-utils, textutils を統合したパッケージです。
 %patch102 -p1 -b .tcsadrain
 %patch103 -p1 -b .sysinfo
 %patch104 -p1 -b .dfdirect
-%patch106 -p1 -b .java
 
 # sh-utils
 #%patch703 -p1 -b .dateman
-%patch704 -p1 -b .paths
+#%patch706 -p1 -b .pam
-%patch706 -p1 -b .pam
 %patch713 -p1 -b .langinfo
 
 # li18nux/lsb
 %patch800 -p1 -b .i18n
 
 # Coreutils
-%patch900 -p1 -b .setsid
-%patch907 -p1 -b .runuser
 %patch908 -p1 -b .getgrouplist
 %patch912 -p1 -b .overflow
-%patch917 -p1 -b .pie
 
 # copy updated ja.po
 mv po/ja.po po/ja.po.orig
@@ -134,28 +111,26 @@ touch aclocal.m4 configure config.hin Makefile.in */Makefile.in
 aclocal -I m4
 autoconf --force
 automake --copy --force --add-missing
-%configure --enable-largefile --with-afs %{?!nopam:--enable-pam} \
+%configure --enable-largefile \
-           --enable-install-program=su,hostname,arch \
+           --enable-install-program=hostname,arch \
            --with-tty-group \
            DEFAULT_POSIX2_VERSION=200112 alternative=199209 || :
 
 touch man/*.x
 
-%__make all %{?_smp_mflags} \
+%__make all %{?_smp_mflags}
-	%{?!nopam:CPPFLAGS="-DUSE_PAM"} \
-	su_LDFLAGS="-pie %{?!nopam:-lpam -lpam_misc}"
 
 %__make -C po update-gmo
 
 [[ -f ChangeLog && -f ChangeLog.bz2  ]] || bzip2 -9f ChangeLog
 
 # XXX docs should say /var/run/[uw]tmp not /etc/[uw]tmp
-perl -pi -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi
+sed -i -e 's,/etc/utmp,/var/run/utmp,g;s,/etc/wtmp,/var/run/wtmp,g' doc/coreutils.texi
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%__make DESTDIR=$RPM_BUILD_ROOT install
 
 # man pages are not installed with make install
 %__make mandir=$RPM_BUILD_ROOT%{_mandir} install-man
@@ -170,7 +145,6 @@ fi
 
 # let be compatible with old fileutils, sh-utils and textutils packages :
 mkdir -p $RPM_BUILD_ROOT{/bin,%_bindir,%_sbindir,/sbin}
-%{?!nopam:mkdir -p $RPM_BUILD_ROOT%_sysconfdir/pam.d}
 for f in basename cat chgrp chmod chown cp cut date dd df echo env false \
          link ln ls mkdir mknod mktemp mv nice pwd rm rmdir sleep sort \
 	 stty sync touch true uname unlink
@@ -190,20 +164,11 @@ install -p -c -m644 %SOURCE103 $RPM_BUILD_ROOT%{_sysconfdir}/DIR_COLORS.256color
 install -p -c -m644 %SOURCE105 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.sh
 install -p -c -m644 %SOURCE106 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/colorls.csh
 
-# su
-install -m 4755 src/su $RPM_BUILD_ROOT/bin
-install -m 755 src/runuser $RPM_BUILD_ROOT/sbin
-
 # These come from util-linux and/or procps.
 for i in hostname uptime kill ; do
 	rm -f $RPM_BUILD_ROOT{%_bindir/$i,%_mandir/man1/$i.1}
 done
 
-%{?!nopam:install -p -m 644 %SOURCE200 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su}
-%{?!nopam:install -p -m 644 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/pam.d/su-l}
-%{?!nopam:install -p -m 644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/pam.d/runuser}
-%{?!nopam:install -p -m 644 %SOURCE203 $RPM_BUILD_ROOT%_sysconfdir/pam.d/runuser-l}
-
 bzip2 -f9 old/*/C* || :
 
 %find_lang %name
@@ -252,20 +217,18 @@ fi
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/DIR_COLORS*
 %config(noreplace) %{_sysconfdir}/profile.d/*
-%{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/su}
-%{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/su-l}
-%{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/runuser}
-%{?!nopam:%config(noreplace) %{_sysconfdir}/pam.d/runuser-l}
 %doc COPYING ABOUT-NLS ChangeLog.bz2 NEWS README THANKS TODO old/*
 /bin/*
 %{_bindir}/*
-%{_libdir}/coreutils
+%{_libexecdir}/coreutils
 %{_infodir}/coreutils*
 %{_mandir}/man*/*
 %{_sbindir}/chroot
-/sbin/runuser
 
 %changelog
+* Mon Nov 26 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 8.20-1
+- update to 8.20
+
 * Sat Apr 02 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 8.10-2
 - update ja.po
 - add BR: libcap-devel, gmp-devel, libattr-devel, libacl-devel