[arch-commits] Commit in shadow/trunk (PKGBUILD login.defs shadow.cron.daily)

[Dave Reisner]

    Date: Thursday, May 30, 2013 @ 15:44:15
  Author: dreisner
Revision: 186687

upgpkg: shadow 4.1.5.1-6

- move binaries to /usr/bin

Modified:
  shadow/trunk/PKGBUILD
  shadow/trunk/login.defs
  shadow/trunk/shadow.cron.daily

-------------------+
 PKGBUILD          |   17 +++++++++++------
 login.defs        |    4 ++--
 shadow.cron.daily |    4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-30 13:43:55 UTC (rev 186686)
+++ PKGBUILD	2013-05-30 13:44:15 UTC (rev 186687)
@@ -4,7 +4,7 @@
 
 pkgname=shadow
 pkgver=4.1.5.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 arch=('i686' 'x86_64')
 url='http://pkg-shadow.alioth.debian.org/'
@@ -32,15 +32,15 @@
         shadow-strncpy-usage.patch
         lastlog.tmpfiles)
 sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
-          '126570e2939bf3b57f28df5197ab9309747a6b5c'
+          'SKIP'
           '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
           '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
           '12427b1ca92a9b85ca8202239f0d9f50198b818f'
           '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
-          '6fac49a4826e2b821c8d41ed5911bc8d04735986'
+          'e92045fb75e0c21a3f294a00de0bd2cd252e9463'
           '12427b1ca92a9b85ca8202239f0d9f50198b818f'
           '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
-          '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
+          '98f4919014b1a9eb9f01ca7731e04b1d973cedd5'
           '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
           '6010fffeed1fc6673ad9875492e1193b1a847b53'
           '21e12966a6befb25ec123b403cd9b5c492fe5b16'
@@ -64,6 +64,8 @@
 
   ./configure \
     --prefix=/usr \
+    --bindir=/usr/bin \
+    --sbindir=/usr/bin \
     --libdir=/lib \
     --mandir=/usr/share/man \
     --sysconfdir=/etc \
@@ -112,8 +114,7 @@
 
   # Remove utilities provided by util-linux
   rm \
-      "$pkgdir"/usr/bin/{chsh,chfn,sg} \
-      "$pkgdir"/bin/{login,su} \
+      "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg} \
       "$pkgdir"/usr/sbin/{vipw,vigr}
 
   # but we keep newgrp, as sg is really an alias to it
@@ -133,4 +134,8 @@
   rmdir \
       "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \
       "$pkgdir"/usr/share/man/{fi,ko/man8}
+
+  # move everything else to /usr/bin, because this isn't handled by ./configure
+  mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin
+  rmdir "$pkgdir/usr/sbin"
 }

Modified: login.defs
===================================================================
--- login.defs	2013-05-30 13:43:55 UTC (rev 186686)
+++ login.defs	2013-05-30 13:44:15 UTC (rev 186687)
@@ -81,8 +81,8 @@
 # *REQUIRED*  The default PATH settings, for superuser and normal users.
 #
 # (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH	PATH=/bin:/usr/bin
+ENV_SUPATH	PATH=/usr/bin
+ENV_PATH	PATH=/usr/bin
 
 #
 # Terminal permissions

Modified: shadow.cron.daily
===================================================================
--- shadow.cron.daily	2013-05-30 13:43:55 UTC (rev 186686)
+++ shadow.cron.daily	2013-05-30 13:44:15 UTC (rev 186687)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 # Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
+/usr/bin/pwck -r
+/usr/bin/grpck -r