Thu May 12 22:37:08 UTC 2011

10 files changed, 230 insertions, 93 deletions

diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
new file mode 100644
index 000000000..4e3dd2c4f
--- /dev/null
+++ b/core/krb5/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+
+pkgname=krb5
+pkgver=1.9.1
+pkgrel=1
+pkgdesc="The Kerberos network authentication system"
+arch=('i686' 'x86_64')
+url="http://web.mit.edu/kerberos/"
+license=('custom')
+depends=('e2fsprogs' 'libldap' 'keyutils')
+makedepends=('perl')
+provides=('heimdal')
+replaces=('heimdal')
+conflicts=('heimdal')
+backup=('etc/krb5/krb5.conf' 'etc/krb5/kdc.conf')
+source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
+        kadmind.rc
+        krb5-kdc.rc)
+sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
+          '640e3046c6558313d2be81cf2252afc8622892b0'
+          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
+options=('!emptydirs')
+
+build() {
+   tar zxvf ${pkgname}-${pkgver}.tar.gz
+   cd "${srcdir}/${pkgname}-${pkgver}/src"
+
+   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
+   export CPPFLAGS+=" -I/usr/include/et"
+   ./configure --prefix=/usr \
+               --sysconfdir=/etc/krb5 \
+               --mandir=/usr/share/man \
+               --localstatedir=/var/lib \
+               --enable-shared \
+               --with-system-et \
+               --with-system-ss \
+               --disable-rpath \
+               --without-tcl \
+               --enable-dns-for-realm \
+               --with-ldap
+
+   make
+}
+
+check() {
+   # We can't do this in the build directory.
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   make -C src check
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}/src"
+   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
+
+   install -D -m 644 config-files/kdc.conf "${pkgdir}"/etc/krb5/kdc.conf
+   install -D -m 644 config-files/krb5.conf "${pkgdir}"/etc/krb5/krb5.conf
+
+   install -d -m 755 "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kdc.rc "${pkgdir}"/etc/rc.d
+   install -m 755 ../../kadmind.rc "${pkgdir}"/etc/rc.d
+
+   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/core/krb5/kadmind.rc b/core/krb5/kadmind.rc
new file mode 100644
index 000000000..45835e35b
--- /dev/null
+++ b/core/krb5/kadmind.rc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/kadmind`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Admin Daemon"
+        if [ -z "$PID" ]; then
+           /usr/sbin/kadmind
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon kadmind
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Admin Daemon"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon kadmind
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
diff --git a/core/krb5/krb5-kdc.rc b/core/krb5/krb5-kdc.rc
new file mode 100644
index 000000000..05a03411e
--- /dev/null
+++ b/core/krb5/krb5-kdc.rc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/krb5kdc`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Authentication"
+        if [ -z "$PID" ]; then
+           /usr/sbin/krb5kdc
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Authentication"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
diff --git a/core/librpcsecgss/PKGBUILD b/core/librpcsecgss/PKGBUILD
index 56cfae7cf..c16ea175b 100644
--- a/core/librpcsecgss/PKGBUILD
+++ b/core/librpcsecgss/PKGBUILD
@@ -1,33 +1,22 @@
-# $Id: PKGBUILD 109603 2011-02-11 00:48:10Z stephane $
+# $Id: PKGBUILD 121187 2011-04-29 07:12:44Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com>
 
 pkgname=librpcsecgss
 pkgver=0.19
-pkgrel=4
+pkgrel=5
 pkgdesc="Library for RPCSECGSS support"
 arch=('i686' 'x86_64')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 license=('GPL')
-depends=('glibc' 'heimdal')
+depends=('glibc' 'krb5' 'libgssglue')
 makedepends=('pkg-config' 'autoconf')
 options=('!libtool')
-source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-	      librpcsecgss-0.18-heimdal.patch)
-md5sums=('b45ed565bdc3099023aa35830ec92997'
-         '0cfe088551d5776f5bc08c1741a34346')
+source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('b45ed565bdc3099023aa35830ec92997')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Patch from gentoo for heimdal compatibility Bug #231395
-  # http://bugs.gentoo.org/show_bug.cgi?id=231395
-  patch -Np1 -i $srcdir/librpcsecgss-0.18-heimdal.patch
-
-  rm -f config.guess config.sub ltmain.sh
-  autoreconf -i
-
-  GSSAPI_CFLAGS='-I/usr/include/gssapi' \
   ./configure --prefix=/usr
   make
 }
diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD
index 952640dcb..b222249ff 100644
--- a/core/libtirpc/PKGBUILD
+++ b/core/libtirpc/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 97756 2010-11-01 19:49:14Z tpowa $
+# $Id: PKGBUILD 121179 2011-04-29 06:50:46Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=libtirpc
 pkgver=0.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
 arch=(i686 x86_64)
-depends=('glibc' 'libgssglue' 'heimdal')
+depends=('glibc' 'libgssglue' 'krb5')
 url="http://libtirpc.sourceforge.net/"
 license=('GPL2')
-source=(http://downloads.sourceforge.net/sourceforge/libtirpc/$pkgname-$pkgver.tar.bz2
+source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2
        libtirpc-0.2.1-fortify.patch)
 backup=('etc/netconfig')
 options=(!libtool)
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   # fix http://bugs.gentoo.org/293593
   # https://bugs.archlinux.org/task/20082
   patch -Np1 -i ../libtirpc-0.2.1-fortify.patch
   ./configure --prefix=/usr --enable-gss
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make 
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   # install netconfig
-  install -D -m644 doc/etc_netconfig $pkgdir/etc/netconfig
+  install -D -m644 doc/etc_netconfig "${pkgdir}"/etc/netconfig
 }
 md5sums=('d77eb15f464bf9d6e66259eaf78b2a4e'
          '2e5c067f1651469dfbbdc91d3c9c60e8')
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 339d9a32a..e732cfa27 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109322 2011-02-08 08:33:56Z ibiru $
+# $Id: PKGBUILD 123110 2011-05-08 13:46:17Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,8 +6,8 @@
 # Contributor: Marco Lima <cipparello gmail com>
 
 pkgname=nfs-utils
-pkgver=1.2.2
-pkgrel=6
+pkgver=1.2.3
+pkgrel=2
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
@@ -23,49 +23,31 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
 	exports
 	idmapd.conf
 	start-statd.patch
-	nfs-utils-1.1.2-kerberos-ac.patch
-	nfs-utils-1.1.6-no_libgssapi.patch
-	nfs-utils-1.1.6-heimdal_functions.patch
 	nfs-utils-1.1.4-mtab-sym.patch
 	nfs-utils-1.1.4-no-exec.patch)
 install=nfs-utils.install
-md5sums=('dad92f64db3266c7757f71bb53ee8f35'
+md5sums=('1131dc5f27c4f3905a6e7ee0d594fd4d'
          'fc508e10cdf5e8ddd80373b1b2bc99a1'
          'f73f197a16b02c3e248488ec35c4cf43'
          '5ae080f6117cef3140f02bc162bdc755'
-         'b9b334414baec31b97f0431d9ecdcfb9'
+         '2bf71def3263325643a09458635520f0'
          'ff585faf410a62c4333a027c50b56bae'
          'eb4f4027fab6fc1201f1ca04f5954c76'
          'e24f81a8c8657672e262c61235d34b4a'
-         'f3be115d392d9f9bb0f056e8d4341a14'
-         '20c6fae1c771b9d8e91c4973f16372e3'
-         'e6fd3a8acfe97970a53db1b902c34f45'
          '7674106eaaa4c149bccd4f05fe3604e9'
          '4f4827dfc93008dfadd0a530ad0872b2')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver}
-  # Patches from gentoo for heimdal compatibility Bug 231396
-  # http://bugs.gentoo.org/show_bug.cgi?id=231396
-  patch -Np1 -i ../nfs-utils-1.1.2-kerberos-ac.patch 
-  patch -Np1 -i ../nfs-utils-1.1.6-no_libgssapi.patch 
-  patch -Np0 -i ../nfs-utils-1.1.6-heimdal_functions.patch
   patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
   patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
 
   # arch specific patch
   patch -Np0 -i $srcdir/start-statd.patch
 
-  rm -f config.guess config.sub ltmain.sh
-  autoreconf -i
-
-  export GSSGLUE_CFLAGS='-I/usr/include/gssapi'
-  export GSSGLUE_LIBS='-lgssapi -ldl'
-
   ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
               --with-tcp-wrappers --with-statedir=/var/lib/nfs --enable-ipv6 --sysconfdir=/etc
 
-  unset LDFLAGS
   make 
 }
 
diff --git a/core/nfs-utils/nfs-server.conf b/core/nfs-utils/nfs-server.conf
index cf75fb6f9..4054d6b88 100644
--- a/core/nfs-utils/nfs-server.conf
+++ b/core/nfs-utils/nfs-server.conf
@@ -18,7 +18,7 @@ PROCNFSD_MOUNTOPTS=""
 # If you have a port-based firewall, you might want to set up
 # a fixed port here using the --port option.
 # See rpc.mountd(8) for more details.
-MOUNTD_OPTS="--no-nfs-version 1 --no-nfs-version 2"
+MOUNTD_OPTS="--no-nfs-version 2"
 
 # Do you want to start the svcgssd daemon? It is only required for Kerberos
 # exports. Valid alternatives are "yes" and "no"; the default is "no".
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 756c5cd60..e0f866502 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 123287 2011-05-09 17:39:25Z bisson $
+# $Id: PKGBUILD 123290 2011-05-09 17:45:14Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=openssh
 pkgver=5.8p2
-pkgrel=5
+pkgrel=6
 pkgdesc='Free version of the SSH connectivity tools'
 arch=('i686' 'x86_64')
 license=('custom:BSD')
 url='http://www.openssh.org/portable.html'
 backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-depends=('tcp_wrappers' 'heimdal' 'openssl' 'libedit')
+depends=('tcp_wrappers' 'krb5' 'openssl' 'libedit')
 source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
         'sshd.confd'
         'sshd.pam'
diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD
index e9ca12719..3a25d87e4 100644
--- a/core/syslog-ng/PKGBUILD
+++ b/core/syslog-ng/PKGBUILD
@@ -1,58 +1,52 @@
-# $Id: PKGBUILD 114715 2011-03-15 15:44:12Z tpowa $
+# $Id: PKGBUILD 123085 2011-05-08 03:28:44Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=syslog-ng
-pkgver=3.2.2
-pkgrel=2
+pkgver=3.2.4
+pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
 groups=('base')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap')
+depends=('glib2' 'eventlog' 'tcp_wrappers' 'openssl' 'libcap' 'awk')
 makedepends=('flex' 'pkg-config')
 optdepends=('logrotate: for rotating log files')
 provides=('logger')
 options=('!libtool')
-backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz
-        syslog-ng.conf
-        syslog-ng.logrotate
-        syslog-ng.rc
-        cap_syslog.patch)
-md5sums=('ed8ebe559d52a63fb61e3e2db566643f' '344dddfff946300f5576b13a7e8ea19f'\
-         '735636090be4582885974542d2a75855' 'b90f8f1ba0433e5a1518ac30f882560a')
-sha1sums=('3a340f8e72b460cc0bc1ec1d4c86b74678912dd6' 'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'\
-         'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' '253e59f4182fba46aea56bebc4b79a199fae32bc')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    # fix #22555 for kernels >=2.6.38
-    patch -Np1 -i ../cap_syslog.patch 
-    ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \
-                --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \
-                --enable-tcp-wrapper \
-                --with-pidfile-dir=/var/run \
-                --disable-spoof-source
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-    install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
-    install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
-    install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
-    install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
-}
-md5sums=('ed8ebe559d52a63fb61e3e2db566643f'
+backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
+        'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/${pkgver}/source/${pkgname}_${pkgver}.tar.gz \
+        syslog-ng.conf syslog-ng.logrotate syslog-ng.rc cap_syslog.patch)
+md5sums=('5995f7dad0053a478b60a63f6f754203'
          '344dddfff946300f5576b13a7e8ea19f'
          '735636090be4582885974542d2a75855'
-         'b90f8f1ba0433e5a1518ac30f882560a'
+         '8b4441343d859c2f01c2cf799a7e6f98'
          '46e5dcff71f820d497898331a3f608fe')
-sha1sums=('3a340f8e72b460cc0bc1ec1d4c86b74678912dd6'
+sha1sums=('ff732f7223bd2bd0424d4b9028b523cf62133af1'
           'b9eb8c61f7cccda543fc5c97fe1d40a8d15e713f'
           'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
-          '253e59f4182fba46aea56bebc4b79a199fae32bc'
+          '4481819762fd1b6f25903016a8878e63c0058fcb'
           'f093a09626a528d23f0f2aeece018cab15a735a9')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+# fix #22555 for kernels >=2.6.38
+  patch -p1 -i ../cap_syslog.patch 
+  ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng \
+    --libexecdir=/usr/lib --localstatedir=/var/lib/syslog-ng \
+    --enable-tcp-wrapper \
+    --with-pidfile-dir=/var/run \
+    --disable-spoof-source
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -dm755 "${pkgdir}/var/lib/syslog-ng" "${pkgdir}/etc/syslog-ng/patterndb.d"
+  install -Dm644 "${srcdir}/syslog-ng.conf" "${pkgdir}/etc/syslog-ng/syslog-ng.conf"
+  install -Dm644 "${srcdir}/syslog-ng.logrotate" "${pkgdir}/etc/logrotate.d/syslog-ng"
+  install -Dm755 "${srcdir}/syslog-ng.rc" "${pkgdir}/etc/rc.d/syslog-ng"
+}
diff --git a/core/syslog-ng/syslog-ng.rc b/core/syslog-ng/syslog-ng.rc
index fbd41fc7b..bb5320b2c 100755
--- a/core/syslog-ng/syslog-ng.rc
+++ b/core/syslog-ng/syslog-ng.rc
@@ -3,10 +3,20 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+checkconfig() {
+    syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf
+    if [ $? -gt 0 ]; then
+	stat_busy "Configuration error. Please fix your config file (/etc/syslog-ng/syslog-ng.conf)."
+	stat_fail
+        exit 0
+    fi
+}
+
 PID=`pidof -o %PPID /usr/sbin/syslog-ng`
 case "$1" in
   start)
     stat_busy "Starting Syslog-NG"
+    checkconfig
     [ -z "$PID" ] && /usr/sbin/syslog-ng
     if [ $? -gt 0 ]; then
       stat_fail
@@ -17,7 +27,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping Syslog-NG"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -28,12 +38,26 @@ case "$1" in
       stat_done
     fi
     ;;
+  reload)
+    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
+    if [ -z "$PID" ]; then
+      stat_fail
+    else
+      checkconfig
+      kill -HUP $PID &> /dev/null
+      if [ $? -gt 0 ]; then
+        stat_fail
+      else
+        stat_done
+      fi
+    fi
+    ;;
   restart)
     $0 stop
     sleep 1
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart|reload}"  
 esac
 exit 0