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

Conflicts:
	community/chmsee/PKGBUILD
	community/darkstat/PKGBUILD
	community/dbmail/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/epic4/PKGBUILD
	community/fb-client/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/fdupes/PKGBUILD
	community/flobopuyo/PKGBUILD
	community/intel-tbb/PKGBUILD
	community/openbsd-netcat/PKGBUILD
	community/sunpinyin/PKGBUILD
	community/tinc/PKGBUILD
	community/uudeview/PKGBUILD
	community/zathura/PKGBUILD
	core/libedit/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/openssl/PKGBUILD
	core/util-linux/PKGBUILD
	extra/lua/PKGBUILD
	gnome-unstable/pidgin/PKGBUILD
	testing/openssl/PKGBUILD
	testing/sudo/PKGBUILD
	testing/udev/PKGBUILD
	testing/util-linux/PKGBUILD

3 files changed, 7 insertions, 28 deletions

diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 3874b2aa8..a52740de9 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 66310 2012-02-23 14:02:47Z allan $
+# $Id: PKGBUILD 67614 2012-03-13 14:20:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
-_madwifiver=0.9.4.4133
 pkgname=hostapd
 pkgver=0.7.3
-pkgrel=7
+pkgrel=8
 pkgdesc="daemon for wireless software access points"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hostap.epitest.fi/hostapd/"
@@ -26,15 +25,13 @@ backup=('etc/hostapd/hostapd.conf'
 	'etc/hostapd/wired.conf')
 install=hostapd.install
 source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
-	ftp://ftp.archlinux.org/other/madwifi/madwifi-${_madwifiver}.tar.bz2
 	hostap_allow-linking-with-libnl-3.2.patch
 	config
 	hostapd
 	hostapd.conf.d)
 md5sums=('91a7c8d0f090b7104152d3455a84c112'
-         'ca3c3504d000e7b3d7063af46271c932'
          'e904e62b12c5d64132dd9441e8b45dce'
-         'bfe5701bc93d5d091e6f1a93f1a32dd6'
+         '5d7ee10b04e33f22c37be56a4c33dddb'
          'd570327c385f34a4af24d3a0d61cea19'
          'f169534b0f59b341f6df1a21e0344511')
 
@@ -45,7 +42,6 @@ build() {
   cd hostapd
   cp "$srcdir/config" ./.config
 
-  sed -i "s|@@madwifi@@|$srcdir/madwifi|" .config
   sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
 
   make
@@ -53,7 +49,7 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname-$pkgver/hostapd"
-  
+
   install -D hostapd "$pkgdir/usr/bin/hostapd"
   install hostapd_cli "$pkgdir/usr/bin/hostapd_cli"
 
@@ -61,7 +57,7 @@ package() {
   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"
 
diff --git a/community/hostapd/config b/community/hostapd/config
index d77e77461..a11ebd587 100644
--- a/community/hostapd/config
+++ b/community/hostapd/config
@@ -15,10 +15,6 @@ CONFIG_DRIVER_HOSTAP=y
 # Driver interface for wired authenticator
 CONFIG_DRIVER_WIRED=y
 
-# Driver interface for madwifi driver
-CONFIG_DRIVER_MADWIFI=y
-CFLAGS += -I@@madwifi@@  # change to reflect local setup; directory for madwifi src
-
 # Driver interface for Prism54 driver
 CONFIG_DRIVER_PRISM54=y
 
diff --git a/community/hostapd/hostapd.install b/community/hostapd/hostapd.install
index 801187e71..d838c6a47 100644
--- a/community/hostapd/hostapd.install
+++ b/community/hostapd/hostapd.install
@@ -1,20 +1,7 @@
 post_install() {
-	echo "> Note: You will find some config examples in"
-	echo "> /etc/hostapd. The default location of several"
-	echo "> key configuration files for hostapd are in"
-	echo "> /etc/hostapd as well. They are:"
-	echo "> hostapd.conf --> primary configuration file"
-	echo "> hostapd.allow --> MAC allow list"
-	echo "> hostapd.deny --> MAC deny list"
-	echo "> Also, note that there are some self-explanatory"
-	echo "> examples in the directory. Feel free to change the mac" 
-	echo "> list location by defining it differently in your hostapd.conf"
-	echo "> file. Please, note, however. The daemon start/stop" 
-	echo "> script assumes you have a working config file at"
-	echo "> /etc/hostapd/hostapd.conf. One final thing to remember."
-	echo "> You need to install madwifi if you want support for it."
+  echo "> More info: https://wiki.archlinux.org/index.php/Software_Access_Point"
 }
 
 post_upgrade() {
-	post_install
+  post_install
 }