Wed May 22 00:46:35 PDT 2013

15 files changed, 65 insertions, 139 deletions

diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index ab03530b2..e45d47fa8 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='cronie'
 pkgver=1.4.9
-pkgrel=2
+pkgrel=4
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
@@ -16,13 +16,11 @@ optdepends=('pm-utils: defer anacron on battery power'
 source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'cron.deny'
 	'service'
-        'pam.d'
-        'rc.d')
+        'pam.d')
 sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4'
           '0f279b8fb820340267d578dc85511c980715f91e'
-          'fa91ebee59df127ff3983b8d6fb9e1cc5fca53d0'
-          '5eff7fb31f6bc0a924243ff046704726cf20c221'
-          'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
+          'de455f11a310e64d6930390e57726ed70f3295d0'
+          '5eff7fb31f6bc0a924243ff046704726cf20c221')
 
 backup=('etc/anacrontab'
         'etc/conf.d/crond'
@@ -33,6 +31,11 @@ conflicts=('cron')
 provides=('cron')
 groups=('base')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
@@ -40,6 +43,7 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
+		--sbindir=/usr/bin \
 		--enable-anacron \
 		--with-inotify \
 		--with-pam \
@@ -56,7 +60,6 @@ package() {
 	install -d "${pkgdir}"/var/spool/{ana,}cron
 	install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
 
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
 	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
 	install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service
diff --git a/core/cronie/rc.d b/core/cronie/rc.d
deleted file mode 100755
index d0659685c..000000000
--- a/core/cronie/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=crond
-. /etc/conf.d/crond
-PID=$(pidof -o %PPID /usr/sbin/crond)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/core/cronie/service b/core/cronie/service
index 4fa4d4593..cc671f7b6 100644
--- a/core/cronie/service
+++ b/core/cronie/service
@@ -2,7 +2,7 @@
 Description=Periodic Command Scheduler
 
 [Service]
-ExecStart=/usr/sbin/crond -n
+ExecStart=/usr/bin/crond -n
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always
diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD
index 292e30dcf..0ed7113df 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160939 2012-06-07 07:26:49Z allan $
+# $Id: PKGBUILD 186069 2013-05-20 23:10:56Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=fakeroot
-pkgver=1.18.4
+pkgver=1.19
 pkgrel=1
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ install=fakeroot.install
 depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
 options=('!libtool')
 source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('706171d8d520b1ca1576ac73f2ceb4f3')
+md5sums=('3a00a1264cb31a815552050ef0c2468b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD
index 394af6391..095ba8c8c 100644
--- a/core/hdparm/PKGBUILD
+++ b/core/hdparm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 172450 2012-12-02 17:54:26Z tpowa $
+# $Id: PKGBUILD 186146 2013-05-21 09:12:32Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 
 pkgname=hdparm
 pkgver=9.43
-pkgrel=1
+pkgrel=2
 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters"
 arch=(i686 x86_64)
 depends=('glibc')
@@ -17,25 +17,27 @@ options=('emptydirs')
 md5sums=('f73233be118d86c779a8463d8b6a3cdb'
          '74e368f384166a7710b447573cda120a')
 
-build() {
+prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # Fix Range input/output error when wiping Intel G2 and OCZ drives
   patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
-  
-  # build
+}
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   # install
-  mkdir -p ${pkgdir}/{usr,sbin}
-  make DESTDIR=${pkgdir} install
-  install -m755 contrib/idectl ${pkgdir}/sbin
-  install -m755 contrib/ultrabayd ${pkgdir}/sbin
+  mkdir -p ${pkgdir}/usr/bin
+  make DESTDIR=${pkgdir} sbindir=/usr/bin install
+  install -m755 contrib/idectl ${pkgdir}/usr/bin
+  install -m755 contrib/ultrabayd ${pkgdir}/usr/bin
 
   install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
-  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh
+  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/bin/wiper.sh
 
   #install license file
   install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 08405c999..6d3cd4c24 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177952 2013-02-12 12:13:48Z thomas $
+# $Id: PKGBUILD 186140 2013-05-21 09:11:15Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,7 +13,6 @@ conflicts=('mkinitcpio<0.7')
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
-        mdadm 
         mdadm.conf 
         mdadm_install
         mdadm_hook
@@ -22,12 +21,24 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
         disable-werror.patch
         mdadm-fix-udev-rules.patch)
 replaces=('raidtools')
+md5sums=('3e255dc71e5144bbcb872788ca647267'
+         '5a37c112aa07dccdde62f9fa5b888607'
+         'af2f73f0094ebee66f503ca4710c7142'
+         'fbfb7d07efcbaf5dc61af424c5f6e352'
+         'b6b0bfd6487c99264578630616dfe5eb'
+         'eb1786b18fa4d13cfd7b71d6b05cfb4f'
+         '4ad87b74a4bc9a34621280abe0e0c3e4'
+         '6c76f2f261c1c3397c7290633f0a9acc')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
   patch -p1 -i ../mdadm-fix-udev-rules.patch
-  make CXFLAGS="$CFLAGS"
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
   # build static mdassemble for Arch's initramfs
   make MDASSEMBLE_AUTO=1 mdassemble
   
@@ -35,22 +46,12 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
-  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+  install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
-  install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
   install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
   install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
   install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
   # systemd service file
   install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
 }
-md5sums=('3e255dc71e5144bbcb872788ca647267'
-         '8333d405f550317c2bacd5510bf1cb60'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '815245a3af16a73ec1c5e5989fb892e9'
-         'fbb5542d9bdf87441a11dd7e7a0a17f8'
-         '0e35422d0cc007c3654a5e2591a9f9b5'
-         'aafb5f9ac8437a284cbf948b9b13b179'
-         '4ad87b74a4bc9a34621280abe0e0c3e4'
-         '0bf45d6dcb3ea14facddbb10b3303806')
diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm
deleted file mode 100755
index 9bf468e98..000000000
--- a/core/mdadm/mdadm
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/mdadm.pid
-if [[ -r $pidfile ]]; then
-  read -r PID <"$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting mdadm RAID Monitor"
-    if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then
-      add_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mdadm RAID Monitor"
-    if [[ $PID ]] && kill "$PID" &>/dev/null; then
-      rm_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/core/mdadm/mdadm-fix-udev-rules.patch b/core/mdadm/mdadm-fix-udev-rules.patch
index 60f5ae131..941cadf3a 100644
--- a/core/mdadm/mdadm-fix-udev-rules.patch
+++ b/core/mdadm/mdadm-fix-udev-rules.patch
@@ -39,7 +39,7 @@ index 0000000..883ee4d
 +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
 +LABEL="md_ignore_state"
 +
-+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode"
 +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
 +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
 +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
@@ -75,9 +75,9 @@ index 0000000..b89775e
 +
 +# remember you can limit what gets auto/incrementally assembled by
 +# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
-+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot"
-+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
-+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot"
++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}"
++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name"
 +
 +LABEL="md_inc_end"
 diff --git a/udev-md-raid.rules b/udev-md-raid.rules
diff --git a/core/mdadm/mdadm.conf b/core/mdadm/mdadm.conf
index 57bd4c683..36eaa0cc0 100644
--- a/core/mdadm/mdadm.conf
+++ b/core/mdadm/mdadm.conf
@@ -59,8 +59,8 @@ DEVICE partitions
 
 
 # When used in --follow (aka --monitor) mode, mdadm needs a
-# mail address and/or a program.  To start mdadm's monitor mode, add
-# "mdadm" to your DAEMONS array in /etc/rc.conf
+# mail address and/or a program.  To start mdadm's monitor mode, enable
+# mdadm.service in systemd.
 #
 # If the lines are not found, mdadm will exit quietly
 #MAILADDR root@mydomain.tld
diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service
index 8389715e8..b3ca5f7a7 100644
--- a/core/mdadm/mdadm.service
+++ b/core/mdadm/mdadm.service
@@ -2,7 +2,7 @@
 Description=MDADM Event Monitor
 
 [Service]
-ExecStart=/sbin/mdadm --monitor --scan
+ExecStart=/usr/bin/mdadm --monitor --scan
 
 [Install]
 WantedBy=multi-user.target
diff --git a/core/mdadm/mdadm_hook b/core/mdadm/mdadm_hook
index 787be5d0c..5371baaca 100755
--- a/core/mdadm/mdadm_hook
+++ b/core/mdadm/mdadm_hook
@@ -43,7 +43,7 @@ run_hook() {
     fi
 
     # assemble everything
-    [ -s "$mdconfig" ] && /sbin/mdassemble
+    [ -s "$mdconfig" ] && /usr/bin/mdassemble
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/mdadm/mdadm_install b/core/mdadm/mdadm_install
index 36b37fd0b..7390509fa 100644
--- a/core/mdadm/mdadm_install
+++ b/core/mdadm/mdadm_install
@@ -8,7 +8,7 @@ build() {
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
-    add_binary "/sbin/mdassemble"
+    add_binary "/usr/bin/mdassemble"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
 
     add_runscript
diff --git a/core/mdadm/mdadm_udev_install b/core/mdadm/mdadm_udev_install
index 5635b8f63..c01cbaf24 100644
--- a/core/mdadm/mdadm_udev_install
+++ b/core/mdadm/mdadm_udev_install
@@ -9,7 +9,7 @@ build() {
         add_file "/etc/mdadm.conf"
     fi
 
-    add_binary "mdadm"
+    add_binary "/usr/bin/mdadm"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
     add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules"
 }
@@ -17,7 +17,7 @@ build() {
 help() {
   cat <<HELPEOF
 This hook loads the necessary modules for a RAID array and uses incremental
-assembly via udev at runtime to create the devices. This hook with NOT work
+assembly via udev at runtime to create the devices. This hook will NOT work
 without the udev hook included on the image.
 HELPEOF
 }
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 9093fa594..756f55a6e 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185040 2013-05-10 16:21:45Z tomegun $
+# $Id: PKGBUILD 186139 2013-05-21 09:11:14Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
 pkgver=1.1.6
-pkgrel=3
+pkgrel=4
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -25,13 +25,13 @@ md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
-  ./configure --libdir=/usr/lib
+  ./configure --libdir=/usr/lib --sbindir=/usr/bin
   patch -Np0 -i ../pam_namespace-build-1.1.6.patch
   make
 
   cd $srcdir/pam_unix2-2.9.1
   patch -Np1 -i ../pam_unix2-glibc216.patch
-  ./configure --libdir=/usr/lib
+  ./configure --libdir=/usr/lib --sbindir=/usr/bin
   make
 }
 
@@ -62,5 +62,5 @@ _EOT
   ln -s pam_unix.so pam_unix_session.so
 
   # set unix_chkpwd uid
-  chmod +s $pkgdir/sbin/unix_chkpwd
+  chmod +s $pkgdir/usr/bin/unix_chkpwd
 }
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 3ff913b2e..f31d69699 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $
+# $Id: PKGBUILD 186143 2013-05-21 09:11:35Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
 pkgver=3.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64)
 license=('GPL2')
@@ -15,15 +15,15 @@ md5sums=('3fccb0b28879adb57d8156115f8003c8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a 
+  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a 
   cp lib/libpci.a "${srcdir}/"
   make clean
-  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
+  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
+  make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
   install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
   # this is now supplied by the hwids package
   rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}