Wed May 2 00:01:22 UTC 2012

7 files changed, 25 insertions, 32 deletions

diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index 55f74f01e..a4bf827ca 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,35 +1,30 @@
-# $Id: PKGBUILD 146753 2012-01-17 02:18:51Z eric $
+# $Id: PKGBUILD 157926 2012-04-30 06:14:42Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/"
 license=('GPL3')
 groups=('base')
 depends=('readline' 'ncurses' 'pam')
-provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
 backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
-        'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
+        'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
 options=('!emptydirs')
 install=inetutils.install
 source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
-        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd \
-        dnsdomainname domainname)
+        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd \
+        dnsdomainname)
 sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
           'ff0aad9946a38915580b094dadf67e790e8a2f87'
           '84dc802b5e57b5e04c847572225a3b9612017155'
           '68a590083b45997dfdb80e666b2de762f494ba74'
           'bfad98a4a62f1fff8779f076c6019ed07f9111af'
           '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'
           '81f10b3b688e3952f793b35bcef63b5bf257a92b'
           '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'ac69756d6cc50157d430d863db04a5aac4688380'
           'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
 build() {
@@ -42,8 +37,8 @@ build() {
     --enable-talk --enable-talkd \
     --enable-rlogin --enable-rlogind \
     --enable-rsh --enable-rshd \
-    --enable-rexec --enable-rexecd \
     --enable-rcp --enable-hostname \
+    --disable-rexec --disable-rexecd \
     --disable-tftp --disable-tftpd \
     --disable-ping --disable-ping6 \
     --disable-logger --disable-syslogd \
@@ -63,15 +58,12 @@ package() {
 
   install -d "${pkgdir}/bin"
   ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
-  install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname"
   install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
-  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1"
   echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
   install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
   install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
   install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
   install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
-  install -D -m644 "${srcdir}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec"
   install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
   install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
 }
diff --git a/core/inetutils/dnsdomainname b/core/inetutils/dnsdomainname
index 4bba209fe..a1b8a8c31 100644
--- a/core/inetutils/dnsdomainname
+++ b/core/inetutils/dnsdomainname
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/hostname -y "$@"
+exec /usr/bin/hostname -d "$@"
diff --git a/core/libusb/PKGBUILD b/core/libusb/PKGBUILD
index 31f148fc1..801cd583b 100644
--- a/core/libusb/PKGBUILD
+++ b/core/libusb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142115 2011-11-05 10:15:17Z tpowa $
+# $Id: PKGBUILD 157958 2012-04-30 07:20:00Z tpowa $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 pkgname=libusb
-pkgver=1.0.8
-pkgrel=2
+pkgver=1.0.9
+pkgrel=1
 depends=('glibc')
 pkgdesc="Library to enable user space application programs to communicate with USB devices."
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ license=('LGPL')
 source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2)
 options=(!libtool)
 replaces=(libusb1)
-md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef')
+md5sums=('7f5a02375ad960d4e33a6dae7d63cfcb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 5c7819708..061fd9f6d 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 147125 2012-01-22 11:01:03Z tpowa $
+# $Id: PKGBUILD 157942 2012-04-30 07:17:54Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -41,13 +41,13 @@ build() {
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/bin/install DESTDIR=$pkgdir install
+  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
   install -D -m755 mdassemble $pkgdir/sbin/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/lib/initcpio/install/mdadm
-  install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm
-  install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev
+  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
   # symlink for backward compatibility
-  ln -sf /lib/initcpio/hooks/mdadm  $pkgdir/lib/initcpio/hooks/raid
+  ln -sf /usr/lib/initcpio/hooks/mdadm  $pkgdir/usr/lib/initcpio/hooks/raid
 }
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 665a82a85..191b43974 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154404 2012-03-27 21:06:23Z eric $
+# $Id: PKGBUILD 158014 2012-05-01 02:11:44Z eric $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
-pkgver=2.4.30
+pkgver=2.4.31
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.openldap.org/"
@@ -13,7 +13,7 @@ source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver
         slapd slapd.default
         ntlm.patch
         mutex-end-of-struct-sigsegv.patch)
-sha1sums=('7447e89b9a5199f9bb2231bda42c308a1b6513d9'
+sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765'
           'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
           'd89b8a533045123f1ab46c9c430cf132d58a20a4'
           'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef'
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index e4e2520ac..66fb4603c 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 157127 2012-04-24 08:19:54Z bisson $
+# $Id: PKGBUILD 157930 2012-04-30 06:17:08Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
 pkgver=6.0p1
-pkgrel=1
+pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
@@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
 sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
           '954bf1660aa32620c37034320877f4511b767ccb'
           'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          '3413909fd45a28701c92e6e5b59c6b65346ddb0f'
+          '659e3ee95c269014783ff8b318c6f50bf7496fbd'
           '21fa88de6cc1c7912e71655f50896ba17991a1c2')
 
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
diff --git a/core/openssh/sshd.pam b/core/openssh/sshd.pam
index c7b91cdfb..aeef8be27 100644
--- a/core/openssh/sshd.pam
+++ b/core/openssh/sshd.pam
@@ -8,5 +8,6 @@ account		required	pam_time.so
 password	required	pam_unix.so
 session		required	pam_unix_session.so
 session		required	pam_limits.so
+session         optional        pam_loginuid.so
 -session	optional	pam_ck_connector.so nox11
 -session	optional	pam_systemd.so