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

Conflicts:
	community/hostapd/PKGBUILD
	extra/samba/PKGBUILD
	staging/ffmpeg/PKGBUILD

2 files changed, 50 insertions, 33 deletions

diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 54ca1c75b..ffe7847dc 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,62 +1,68 @@
-# $Id: PKGBUILD 70872 2012-05-18 10:00:26Z spupykin $
+# $Id: PKGBUILD 72181 2012-06-09 21:54:04Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hostapd
 pkgver=1.0
-pkgrel=1
-pkgdesc="daemon for wireless software access points"
+pkgrel=2
+pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hostap.epitest.fi/hostapd/"
 license=('custom')
 depends=('openssl' 'libnl')
-makedepends=()
-provides=('hostapd')
-conflicts=('hostapd')
 backup=('etc/hostapd/hostapd.conf'
-	'etc/conf.d/hostapd'
-	'etc/hostapd/hlr_auc_gw.milenage_db'
-	'etc/hostapd/hostapd.accept'
-	'etc/hostapd/hostapd.deny'
-	'etc/hostapd/hostapd.eap_user'
-	'etc/hostapd/hostapd.radius_clients'
-	'etc/hostapd/hostapd.sim_db'
-	'etc/hostapd/hostapd.vlan'
-	'etc/hostapd/hostapd.wpa_psk'
-	'etc/hostapd/wired.conf')
+        'etc/conf.d/hostapd'
+        'etc/hostapd/hlr_auc_gw.milenage_db'
+        'etc/hostapd/hostapd.accept'
+        'etc/hostapd/hostapd.deny'
+        'etc/hostapd/hostapd.eap_user'
+        'etc/hostapd/hostapd.radius_clients'
+        'etc/hostapd/hostapd.sim_db'
+        'etc/hostapd/hostapd.vlan'
+        'etc/hostapd/hostapd.wpa_psk'
+        'etc/hostapd/wired.conf')
 install=hostapd.install
 source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
-	config
-	hostapd
-	hostapd.conf.d)
+        config hostapd hostapd.conf.d hostapd.service)
 md5sums=('236247a7bbd4f60d5fa3e99849d1ffc9'
          '5d7ee10b04e33f22c37be56a4c33dddb'
          'd570327c385f34a4af24d3a0d61cea19'
-         'f169534b0f59b341f6df1a21e0344511')
+         'f169534b0f59b341f6df1a21e0344511'
+         'a0a16879eed5e4e41ae6b225a4809955')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"/hostapd
-  cp "$srcdir/config" ./.config
+  cd $pkgname-$pkgver/hostapd
+  cp ../../config .config
   sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
-  export CFLAGS="$CFLAGS `pkg-config --cflags libnl-3.0`"
+  export CFLAGS="$CFLAGS $(pkg-config --cflags libnl-3.0)"
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver/hostapd"
+  # RC script
+  install -D hostapd "$pkgdir/etc/rc.d/hostapd"
+  install -Dm644 hostapd.conf.d "$pkgdir/etc/conf.d/hostapd"
 
-  install -D hostapd "$pkgdir/usr/bin/hostapd"
-  install hostapd_cli "$pkgdir/usr/bin/hostapd_cli"
+  # Systemd unit
+  install -Dm644 hostapd.service "$pkgdir/usr/lib/systemd/system/hostapd.service"
 
-  install -Dm644 hlr_auc_gw.milenage_db "$pkgdir/etc/hostapd/hlr_auc_gw.milenage_db"
+  cd $pkgname-$pkgver
+
+  # License
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+  cd hostapd
+
+  # Binaries
+  install -d "$pkgdir/usr/bin"
+  install -t "$pkgdir/usr/bin" hostapd hostapd_cli
+
+  # Configuration
+  install -d "$pkgdir/etc/hostapd"
   install -m644 -t "$pkgdir/etc/hostapd" \
     hostapd.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} \
-    wired.conf
+    wired.conf hlr_auc_gw.milenage_db
 
+  # Man pages
   install -Dm644 hostapd.8 "$pkgdir/usr/share/man/man8/hostapd.8"
   install -Dm644 hostapd_cli.1 "$pkgdir/usr/share/man/man1/hostapd_cli.1"
-
-  install -D "$srcdir/hostapd" "$pkgdir/etc/rc.d/hostapd"
-  install -Dm644 "$srcdir/hostapd.conf.d" "$pkgdir/etc/conf.d/hostapd"
-
-  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/community/hostapd/hostapd.service b/community/hostapd/hostapd.service
new file mode 100644
index 000000000..f278bf793
--- /dev/null
+++ b/community/hostapd/hostapd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/hostapd.pid
+ExecStart=/usr/bin/hostapd /etc/hostapd/hostapd.conf -P /run/hostapd.pid -B
+
+[Install]
+WantedBy=multi-user.target