[arch-commits] Commit in krb5/trunk (PKGBUILD krb5-kdc.rc)

[Stéphane Gaudreault]

    Date: Saturday, March 26, 2011 @ 21:55:30
  Author: stephane
Revision: 116972

apply patches

Modified:
  krb5/trunk/PKGBUILD
  krb5/trunk/krb5-kdc.rc

-------------+
 PKGBUILD    |   10 +++++++---
 krb5-kdc.rc |    2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-27 01:42:07 UTC (rev 116971)
+++ PKGBUILD	2011-03-27 01:55:30 UTC (rev 116972)
@@ -22,7 +22,7 @@
         CVE-2011-0284.patch)
 sha1sums=('a7ad1b4ed37bff4b9087f6c4561b2b222208d779'
           '640e3046c6558313d2be81cf2252afc8622892b0'
-          '049571fd560e7100a7779d7f8f497f6d7f3b8ec6'
+          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
           '79ece8b1c140deb2c01bfb64af575636b9bc7704'
           'fb2486168ce128cb1a2866bd0df8cd7c4bcd7824'
           '1c72390c5d629eee592e5cb0c2b600b376e2fdc5')
@@ -32,6 +32,10 @@
    tar zxvf ${pkgname}-${pkgver}.tar.gz
 	cd "${srcdir}/${pkgname}-${pkgver}/src"
 
+   patch -Np2 -i ../../CVE-2010-4022.patch
+   patch -Np2 -i ../../CVE-2011-0281.0282.0283.patch
+   patch -Np2 -i ../../CVE-2011-0284.patch
+
    export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
 	export CPPFLAGS+=" -I/usr/include/et"
 	./configure --prefix=/usr \
@@ -55,8 +59,8 @@
 
    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 ../../krb5-kdc.rc ${startdir}/pkg/etc/rc.d
-   install -D -m 755 ../../kadmind.rc ${startdir}/pkg/etc/rc.d
+   install -D -m 755 ../../krb5-kdc.rc "${startdir}"/pkg/etc/rc.d
+   install -D -m 755 ../../kadmind.rc "${startdir}"/pkg/etc/rc.d
 
 	install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }

Modified: krb5-kdc.rc
===================================================================
--- krb5-kdc.rc	2011-03-27 01:42:07 UTC (rev 116971)
+++ krb5-kdc.rc	2011-03-27 01:55:30 UTC (rev 116972)
@@ -9,7 +9,7 @@
     start)
         stat_busy "Starting Kerberos Authentication"
         if [ -z "$PID" ]; then
-           /usr/sbin/krb5kdc --detach
+           /usr/sbin/krb5kdc
         fi
         if [ ! -z "$PID" -o $? -gt 0 ]; then
             stat_fail