[arch-commits] Commit in coreutils/repos (3 files)

andyrtr at archlinux.org andyrtr at archlinux.org
Wed Feb 25 18:59:20 UTC 2009


    Date: Wednesday, February 25, 2009 @ 13:59:20
  Author: andyrtr
Revision: 27767

Merged revisions 27765-27766 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/coreutils/trunk

........
  r27765 | andyrtr | 2009-02-25 18:26:21 +0000 (Mi, 25 Feb 2009) | 1 line
  
  add install file
........
  r27766 | andyrtr | 2009-02-25 18:58:45 +0000 (Mi, 25 Feb 2009) | 2 lines
  
  upgpkg: coreutils 7.1-1.1
      built the pkg as with makepkg --asroot - quick fix for broken su setuid bit; seems to be a fakeroot bug on x86_64
........

Added:
  coreutils/repos/testing-x86_64/coreutils.install
    (from rev 27766, coreutils/trunk/coreutils.install)
Modified:
  coreutils/repos/testing-x86_64/	(properties)
  coreutils/repos/testing-x86_64/PKGBUILD

-------------------+
 PKGBUILD          |   21 ++++++++++++---------
 coreutils.install |   21 +++++++++++++++++++++
 2 files changed, 33 insertions(+), 9 deletions(-)


Property changes on: coreutils/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /coreutils/trunk:1-27672
   + /coreutils/trunk:1-27766

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-02-25 18:58:45 UTC (rev 27766)
+++ testing-x86_64/PKGBUILD	2009-02-25 18:59:20 UTC (rev 27767)
@@ -4,7 +4,7 @@
 
 pkgname=coreutils
 pkgver=7.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
 arch=(i686 x86_64)
 license=('GPL3')
@@ -52,19 +52,22 @@
   make || return 1
   make DESTDIR=${pkgdir} install || return 1
 
-  rm -f $startdir/pkg/usr/bin/hostname $startdir/pkg/usr/share/man/man1/hostname.1 || return 1
-  rm -f $startdir/pkg/usr/bin/uptime $startdir/pkg/usr/share/man/man1/uptime.1 || return 1
-  rm -f $startdir/pkg/usr/bin/groups $startdir/pkg/usr/share/man/man1/groups.1 || return 1
-  rm -f $startdir/pkg/usr/bin/kill $startdir/pkg/usr/share/man/man1/kill.1|| return 1
-  cd $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/bin $startdir/pkg/sbin $startdir/pkg/usr/sbin
+  rm -f ${pkgdir}/usr/bin/hostname ${pkgdir}/usr/share/man/man1/hostname.1 || return 1
+  rm -f ${pkgdir}/usr/bin/uptime ${pkgdir}/usr/share/man/man1/uptime.1 || return 1
+  rm -f ${pkgdir}/usr/bin/groups ${pkgdir}/usr/share/man/man1/groups.1 || return 1
+  rm -f ${pkgdir}/usr/bin/kill ${pkgdir}/usr/share/man/man1/kill.1|| return 1
+  cd ${pkgdir}/usr/bin
+  mkdir -p ${pkgdir}/bin ${pkgdir}/sbin ${pkgdir}/usr/sbin
   mv su date echo false pwd stty true uname cat tr cut readlink ../../bin
   mv dd cp df du ln ls mv rm dir sync vdir chgrp chmod chown ../../bin
   mv mkdir mknod rmdir shred touch mkfifo dircolors install sleep ../../bin
   mv chroot ../sbin
   ln -sf test [
-  ln -sf /bin/sleep $startdir/pkg/usr/bin/sleep
-  install -D -m644 $startdir/src/su $startdir/pkg/etc/pam.d/su
+  ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep
+  install -D -m644 $startdir/src/su ${pkgdir}/etc/pam.d/su
 
+  ls -lha ${pkgdir}/bin/su
+  chmod -v 4555 ${pkgdir}/bin/su
+
   rm -f ${pkgdir}/usr/share/info/dir
 }

Copied: coreutils/repos/testing-x86_64/coreutils.install (from rev 27766, coreutils/trunk/coreutils.install)
===================================================================
--- testing-x86_64/coreutils.install	                        (rev 0)
+++ testing-x86_64/coreutils.install	2009-02-25 18:59:20 UTC (rev 27767)
@@ -0,0 +1,21 @@
+infodir=/usr/share/info
+filelist=(coreutils.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+    usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+




More information about the arch-commits mailing list