Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/nginx/PKGBUILD
	community-testing/nginx/nginx.install
	community/chrony/PKGBUILD
	community/lxdm/PKGBUILD
	community/oidentd/PKGBUILD
	community/oss/PKGBUILD
	community/pdnsd/PKGBUILD
	community/ruby-cairo/PKGBUILD
	community/subtle/PKGBUILD
	core/kmod/PKGBUILD
	core/lvm2/PKGBUILD
	core/openldap/PKGBUILD
	core/systemd/PKGBUILD
	extra/smartmontools/PKGBUILD
	multilib/wine/PKGBUILD

6 files changed, 61 insertions, 4 deletions

diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 7c024a6c1..a2973f06c 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160944 2012-06-07 11:57:54Z stephane $
+# $Id: PKGBUILD 162178 2012-06-22 17:24:25Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
 pkgver=1.10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://web.mit.edu/kerberos/"
@@ -14,13 +14,23 @@ backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar
         krb5-1.10.1-gcc47.patch
         krb5-kadmind
+        krb5-kadmind.service
         krb5-kdc
-        krb5-kpropd)
+        krb5-kdc.service
+        krb5-kpropd
+        krb5-kpropd.service
+        krb5-kpropd@.service
+        krb5-kpropd.socket)
 sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d'
           '78b759d566b1fdefd9bbcd06df14f07f12effe96'
           '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
+          'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
           '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          '7f402078fa65bb9ff1beb6cbbbb017450df78560')
+          'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e'
+          '7f402078fa65bb9ff1beb6cbbbb017450df78560'
+          '614401dd4ac18e310153240bb26eb32ff1e8cf5b'
+          '023a8164f8ee7066ac814486a68bc605e79f6101'
+          'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
 options=('!emptydirs')
 
 build() {
@@ -74,4 +84,9 @@ package() {
    install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
 
    install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+   # systemd stuff
+   install -dm 755 "${pkgdir}"/usr/lib/systemd/system
+   install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \
+      "${pkgdir}"/usr/lib/systemd/system
 }
diff --git a/core/krb5/krb5-kadmind.service b/core/krb5/krb5-kadmind.service
new file mode 100644
index 000000000..f3836c898
--- /dev/null
+++ b/core/krb5/krb5-kadmind.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 administration server
+
+[Service]
+ExecStart=/usr/sbin/kadmind -nofork
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kdc.service b/core/krb5/krb5-kdc.service
new file mode 100644
index 000000000..6ec93bb72
--- /dev/null
+++ b/core/krb5/krb5-kdc.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kerberos 5 KDC
+
+[Service]
+ExecStart=/usr/sbin/krb5kdc -n
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kpropd.service b/core/krb5/krb5-kpropd.service
new file mode 100644
index 000000000..a7c5b579d
--- /dev/null
+++ b/core/krb5/krb5-kpropd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 propagation server
+
+[Service]
+ExecStart=/usr/sbin/kpropd -S
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kpropd.socket b/core/krb5/krb5-kpropd.socket
new file mode 100644
index 000000000..4389290c0
--- /dev/null
+++ b/core/krb5/krb5-kpropd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Kerberos 5 propagation server
+
+[Socket]
+ListenStream=754
+Accept=yes
+
+[Install]
+WantedBy=sockets.target
diff --git a/core/krb5/krb5-kpropd@.service b/core/krb5/krb5-kpropd@.service
new file mode 100644
index 000000000..46f7e3639
--- /dev/null
+++ b/core/krb5/krb5-kpropd@.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Kerberos 5 propagation server
+Conflicts=krb5-kpropd.service
+
+[Service]
+ExecStart=/usr/sbin/kpropd
+StandardInput=socket
+StandardError=syslog