Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/freewrl/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/gnash/PKGBUILD
	community-testing/gource/PKGBUILD
	community-testing/gpac/PKGBUILD
	community-testing/rss-glx/PKGBUILD
	community-testing/smc/PKGBUILD
	community/blobby2/PKGBUILD
	community/jack2/PKGBUILD
	community/kleansweep/PKGBUILD
	core/gcc/PKGBUILD
	extra/at/PKGBUILD
	extra/maxima/PKGBUILD
	extra/nicotine/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/sqlite/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gst-plugins-base/PKGBUILD
	gnome-unstable/gstreamer/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/libtool-multilib/PKGBUILD
	multilib/jack2-multilib/PKGBUILD
	staging/mesa/PKGBUILD
	testing/bzflag/PKGBUILD
	testing/cabal-install/PKGBUILD
	testing/cairo/PKGBUILD
	testing/gcc/PKGBUILD
	testing/glew/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/libreoffice/PKGBUILD
	testing/libtool/PKGBUILD
	testing/mesa/PKGBUILD
	testing/nx/PKGBUILD
	testing/xf86-video-ati/PKGBUILD
	testing/xf86-video-intel/PKGBUILD
	testing/xf86-video-intel/xf86-video-intel.install
	testing/xf86-video-nouveau/PKGBUILD
	testing/xine-lib/PKGBUILD
	testing/xorg-server/PKGBUILD

3 files changed, 25 insertions, 2 deletions

diff --git a/community/xl2tpd/PKGBUILD b/community/xl2tpd/PKGBUILD
index 87fa07394..7c9722fba 100644
--- a/community/xl2tpd/PKGBUILD
+++ b/community/xl2tpd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65258 2012-02-20 12:39:15Z spupykin $
+# $Id: PKGBUILD 77112 2012-10-05 10:17:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Hengfu <rhfcaesar@gmail.com>
 
 pkgname=xl2tpd
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="an open source implementation of the L2TP maintained by Xelerance Corporation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xelerance.com/services/software/xl2tpd/"
@@ -18,12 +18,16 @@ source=(http://arch.p5n.pp.ru/~sergej/dl/2012/xl2tpd-$pkgver.tar.gz
 	xl2tpd.conf.client-example
 	xl2tpd.conf.server-example
 	options.l2tpd
+	xl2tpd.service
+	xl2tpd.tmpfiles
 	ipparam.patch)
 md5sums=('28264284552c442b24cf421755a2bb48'
          '1439d13084fc09c2a19c97b24a834345'
          '5f0ae07026e61a3dd15a76fd4144a6d5'
          '16ed0886115d4dcc21072cfb847250bb'
          'ed57eb67335cdf246251285dad502cc7'
+         '5ba9ddaf66c9827fe4a2caef67cf61c2'
+         '2e95e4fc03e1521ab20fd7e249efab5a'
          '4d258a58cc109d5c4d96af8f81d481cf')
 
 build() {
@@ -38,4 +42,7 @@ build() {
   install -D -m0644 $srcdir/xl2tpd.conf.client-example $pkgdir/etc/xl2tpd/xl2tpd.conf.client-example
   install -D -m0644 $srcdir/xl2tpd.conf.server-example $pkgdir/etc/xl2tpd/xl2tpd.conf.server-example
   install -D -m0644 $srcdir/options.l2tpd $pkgdir/etc/ppp/options.l2tpd
+
+  install -Dm0644 $srcdir/xl2tpd.service $pkgdir/usr/lib/systemd/system/xl2tpd.service
+  install -Dm0644 $srcdir/xl2tpd.tmpfiles $pkgdir/usr/lib/tmpfiles.d/xl2tpd.conf
 }
diff --git a/community/xl2tpd/xl2tpd.service b/community/xl2tpd/xl2tpd.service
new file mode 100644
index 000000000..b47cadf02
--- /dev/null
+++ b/community/xl2tpd/xl2tpd.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Level 2 Tunnel Protocol Daemon (L2TP)
+After=syslog.target network.target
+After=ipsec.service
+# Some ISPs in Russia use l2tp without IPsec, so don't insist anymore
+#Wants=ipsec.service
+
+[Service]
+Type=simple
+PIDFile=/var/run/xl2tpd/xl2tpd.pid
+ExecStart=/usr/sbin/xl2tpd -D
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/xl2tpd/xl2tpd.tmpfiles b/community/xl2tpd/xl2tpd.tmpfiles
new file mode 100644
index 000000000..139680eb2
--- /dev/null
+++ b/community/xl2tpd/xl2tpd.tmpfiles
@@ -0,0 +1 @@
+d /var/run/xl2tpd 0755 root root -