[arch-commits] Commit in krb5/trunk (5 files)

Stéphane Gaudreault stephane at archlinux.org
Thu Jun 30 18:09:31 UTC 2011


    Date: Thursday, June 30, 2011 @ 14:09:30
  Author: stephane
Revision: 129991

upgpkg: krb5 1.9.1-2
Fix FS#24921

Added:
  krb5/trunk/krb5-kadmind
    (from rev 129957, krb5/trunk/kadmind.rc)
  krb5/trunk/krb5-kdc
    (from rev 129957, krb5/trunk/krb5-kdc.rc)
Modified:
  krb5/trunk/PKGBUILD
Deleted:
  krb5/trunk/kadmind.rc
  krb5/trunk/krb5-kdc.rc

--------------+
 PKGBUILD     |   33 +++++++++++++++------------------
 kadmind.rc   |   40 ----------------------------------------
 krb5-kadmind |   40 ++++++++++++++++++++++++++++++++++++++++
 krb5-kdc     |   40 ++++++++++++++++++++++++++++++++++++++++
 krb5-kdc.rc  |   40 ----------------------------------------
 5 files changed, 95 insertions(+), 98 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-30 18:09:26 UTC (rev 129990)
+++ PKGBUILD	2011-06-30 18:09:30 UTC (rev 129991)
@@ -3,7 +3,7 @@
 
 pkgname=krb5
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64')
 url="http://web.mit.edu/kerberos/"
@@ -13,12 +13,12 @@
 provides=('heimdal')
 replaces=('heimdal')
 conflicts=('heimdal')
-backup=('etc/krb5/krb5.conf' 'etc/krb5/kdc.conf')
+backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
-        kadmind.rc
-        krb5-kdc.rc)
+        krb5-kadmind
+        krb5-kdc)
 sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
-          '640e3046c6558313d2be81cf2252afc8622892b0'
+          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
           '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393')
 options=('!emptydirs')
 
@@ -29,7 +29,6 @@
    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 \
@@ -39,26 +38,24 @@
                --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
+   # Sample KDC config file
+   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
+   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.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
+   # Default configuration file
+   install -dm 755 "${pkgdir}"/etc
+   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
 
+   install -dm 755 "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
+
    install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }

Deleted: kadmind.rc
===================================================================
--- kadmind.rc	2011-06-30 18:09:26 UTC (rev 129990)
+++ kadmind.rc	2011-06-30 18:09:30 UTC (rev 129991)
@@ -1,40 +0,0 @@
-#!/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

Copied: krb5/trunk/krb5-kadmind (from rev 129957, krb5/trunk/kadmind.rc)
===================================================================
--- krb5-kadmind	                        (rev 0)
+++ krb5-kadmind	2011-06-30 18:09:30 UTC (rev 129991)
@@ -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 krb5-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 krb5-kadmind
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0

Copied: krb5/trunk/krb5-kdc (from rev 129957, krb5/trunk/krb5-kdc.rc)
===================================================================
--- krb5-kdc	                        (rev 0)
+++ krb5-kdc	2011-06-30 18:09:30 UTC (rev 129991)
@@ -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

Deleted: krb5-kdc.rc
===================================================================
--- krb5-kdc.rc	2011-06-30 18:09:26 UTC (rev 129990)
+++ krb5-kdc.rc	2011-06-30 18:09:30 UTC (rev 129991)
@@ -1,40 +0,0 @@
-#!/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




More information about the arch-commits mailing list