Fri Feb 24 23:15:21 UTC 2012

1 files changed, 28 insertions, 33 deletions

diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 507b7c3f7..7e354a274 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 48888 2011-06-07 11:05:59Z spupykin $
+# $Id: PKGBUILD 66310 2012-02-23 14:02:47Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 _madwifiver=0.9.4.4133
 pkgname=hostapd
 pkgver=0.7.3
-pkgrel=5
+pkgrel=7
 pkgdesc="daemon for wireless software access points"
 arch=('i686' 'x86_64')
 url="http://hostap.epitest.fi/hostapd/"
 license=('custom')
 depends=('openssl' 'libnl')
-makedepends=('svn')
+makedepends=()
 provides=('hostapd')
 conflicts=('hostapd')
 backup=('etc/hostapd/hostapd.conf'
@@ -27,51 +27,46 @@ backup=('etc/hostapd/hostapd.conf'
 install=hostapd.install
 source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
 	ftp://ftp.archlinux.org/other/madwifi/madwifi-${_madwifiver}.tar.bz2
-	config.bz2
+	hostap_allow-linking-with-libnl-3.2.patch
+	config
 	hostapd
 	hostapd.conf.d)
 md5sums=('91a7c8d0f090b7104152d3455a84c112'
          'ca3c3504d000e7b3d7063af46271c932'
-         '5d087e2e047ffceb3218e6b2b68fb3bf'
+         'e904e62b12c5d64132dd9441e8b45dce'
+         'bfe5701bc93d5d091e6f1a93f1a32dd6'
          'd570327c385f34a4af24d3a0d61cea19'
          'f169534b0f59b341f6df1a21e0344511')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver/hostapd
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
 
-  cp ../../config ./.config
+  cd hostapd
+  cp "$srcdir/config" ./.config
 
-  sed -i "s|/usr|$srcdir/madwifi|" .config
-  sed -i "s|/usr/local/bin|$pkgdir/usr/bin|" Makefile
-
-  mkdir -p $pkgdir/usr/bin $pkgdir/etc/hostapd \
-      $pkgdir/usr/man/man1 $pkgdir/usr/man/man8 \
-      $pkgdir/usr/share/licenses/$pkgname $pkgdir/etc/rc.d
+  sed -i "s|@@madwifi@@|$srcdir/madwifi|" .config
+  sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
 
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/hostapd
-  make DESTDIR=$pkg install
+  cd "$srcdir/$pkgname-$pkgver/hostapd"
+  
+  install -D hostapd "$pkgdir/usr/bin/hostapd"
+  install hostapd_cli "$pkgdir/usr/bin/hostapd_cli"
+
+  install -Dm644 hlr_auc_gw.milenage_db "$pkgdir/etc/hostapd/hlr_auc_gw.milenage_db"
+  install -m644 -t "$pkgdir/etc/hostapd" \
+    hostapd.{accept,conf,deny,eap_user,radius_clients,sim_db,vlan,wpa_psk} \
+    wired.conf
+  
+  install -Dm644 hostapd.8 "$pkgdir/usr/share/man/man8/hostapd.8"
+  install -Dm644 hostapd_cli.1 "$pkgdir/usr/share/man/man1/hostapd_cli.1"
 
-  cp hlr_auc_gw.milenage_db $pkgdir/etc/hostapd
-  cp hostapd.accept $pkgdir/etc/hostapd
-  cp hostapd.conf $pkgdir/etc/hostapd
-  cp hostapd.deny $pkgdir/etc/hostapd
-  cp hostapd.eap_user $pkgdir/etc/hostapd
-  cp hostapd.radius_clients $pkgdir/etc/hostapd
-  cp hostapd.sim_db $pkgdir/etc/hostapd
-  cp hostapd.vlan $pkgdir/etc/hostapd
-  cp hostapd.wpa_psk $pkgdir/etc/hostapd
-  cp wired.conf $pkgdir/etc/hostapd
-  cp hostapd.8 $pkgdir/usr/man/man8
-  cp hostapd_cli.1 $pkgdir/usr/man/man1
-  cp ../COPYING $pkgdir/usr/share/licenses/hostapd
-  cp ../../hostapd $pkgdir/etc/rc.d
-  mkdir -p $pkgdir/etc/conf.d
-  cp ../../hostapd.conf.d $pkgdir/etc/conf.d/hostapd
+  install -D "$srcdir/hostapd" "$pkgdir/etc/rc.d/hostapd"
+  install -Dm644 "$srcdir/hostapd.conf.d" "$pkgdir/etc/conf.d/hostapd"
 
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-  sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' $pkgdir/etc/hostapd/hostapd.conf
+  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }