[arch-commits] Commit in netcfg/repos (3 files)

[Thomas Bächler]

    Date: Saturday, April 4, 2009 @ 11:37:54
  Author: thomas
Revision: 33655

Merged revisions 29315 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/netcfg/trunk

........
  r29315 | james | 2009-03-07 23:30:39 +0100 (Sa, 07 M?\195?\164r 2009) | 1 line
  
  upgpkg: netcfg 2.1.3-3
........

Added:
  netcfg/repos/testing-x86_64/wpa_conf.diff
    (from rev 29315, netcfg/trunk/wpa_conf.diff)
Modified:
  netcfg/repos/testing-x86_64/	(properties)
  netcfg/repos/testing-x86_64/PKGBUILD

---------------+
 PKGBUILD      |    9 +++++----
 wpa_conf.diff |   11 +++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)


Property changes on: netcfg/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /netcfg/trunk:1-28992
   + /netcfg/trunk:1-33654

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-04-04 14:51:01 UTC (rev 33654)
+++ testing-x86_64/PKGBUILD	2009-04-04 15:37:54 UTC (rev 33655)
@@ -2,14 +2,14 @@
 # Maintainer: James Rayner <james at archlinux.org>
 pkgname=netcfg
 pkgver=2.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Network configuration and profile scripts"
 url="http://archlinux.org"
 license=("BSD")
 backup=(etc/iftab)
 depends=(wireless_tools coreutils "wpa_supplicant>=0.6.8" net-tools "dhcpcd>=4.0")
 optdepends=(dialog)
-source=(http://ftp.archlinux.org/other/netcfg/netcfg-$pkgver.tar.gz)
+source=(wpa_conf.diff http://ftp.archlinux.org/other/netcfg/netcfg-$pkgver.tar.gz)
 
 #source=(netcfg-$pkgver.tar.gz)
 arch=(i686 x86_64)
@@ -17,6 +17,7 @@
 build() {
   cd $startdir/src/netcfg-$pkgver
   sed -i 's|/man/|/share/man/|' Makefile
+  patch -p1 -i $startdir/src/wpa_conf.diff 
   make DESTDIR=$startdir/pkg install
   make DESTDIR=$startdir/pkg install-contrib
   install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/netcfg/LICENSE
@@ -25,5 +26,5 @@
   ln -s /usr/bin/netcfg2 $startdir/pkg/usr/bin/netcfg 
 }
 
-
-md5sums=('dab5e9fd3b01e027408845928c79396f')
+md5sums=('fb886083e9309e2b9aad43bede40c070'
+         'dab5e9fd3b01e027408845928c79396f')

Copied: netcfg/repos/testing-x86_64/wpa_conf.diff (from rev 29315, netcfg/trunk/wpa_conf.diff)
===================================================================
--- testing-x86_64/wpa_conf.diff	                        (rev 0)
+++ testing-x86_64/wpa_conf.diff	2009-04-04 15:37:54 UTC (rev 33655)
@@ -0,0 +1,11 @@
+diff -Naur netcfg-2.1.3/src/wireless.subr netcfg-2.1.3-fix/src/wireless.subr
+--- netcfg-2.1.3/src/wireless.subr	2009-03-01 20:13:48.000000000 +1100
++++ netcfg-2.1.3-fix/src/wireless.subr	2009-03-08 09:15:36.000000000 +1100
+@@ -165,6 +165,7 @@
+         quirk "wpaessid" && eval iwconfig $INTERFACE essid "\"$ESSID\""
+         
+         # Create a random file to store configuration, make it root only. 
++        touch $WPA_CONF
+         chmod 600 $WPA_CONF
+         echo "ctrl_interface=/var/run/wpa_supplicant" >> $WPA_CONF
+         echo "ctrl_interface_group=0" >> $WPA_CONF