Mon Aug 15 23:14:29 UTC 2011

4 files changed, 25 insertions, 26 deletions

diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 67cc374ca..8d6015157 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 111467 2011-02-27 10:05:15Z thomas $
+# $Id: PKGBUILD 135527 2011-08-14 20:37:21Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=iw
-pkgver=0.9.22
+pkgver=3.0
 pkgrel=1
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
 arch=("i686" "x86_64")
@@ -11,7 +11,7 @@ license=("GPL")
 depends=("libnl")
 makedepends=("kernel-headers")
 source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('138ce4dc827d8b0af55fe1c444e749b985c1540d791b27922aad880d12908bb1')
+sha256sums=('a0ccbf1ce71ae4bdb05495ca18ab00a87c06dce2c3bf8b8358c615e60c4632fb')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index d0d7111b6..378c58edd 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 123913 2011-05-14 10:10:30Z thomas $
+# $Id: PKGBUILD 135525 2011-08-14 20:37:18Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=openvpn
-pkgver=2.2.0
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
 arch=(i686 x86_64)
 url="http://openvpn.net/index.php/open-source.html"
-depends=('openssl' 'lzo2')
+depends=('openssl' 'lzo2' 'iproute2')
 license=('custom')
 backup=(usr/share/openvpn/easy-rsa/vars
-        usr/share/openvpn/easy-rsa/openssl.cnf
+        usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf
         etc/conf.d/openvpn-tapdev)
 source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
         openvpn.rc
         openvpn-tapdev.rc
         openvpn-tapdev.conf)
-md5sums=('4f440603eac45fec7be218b87d570834'
+md5sums=('500bee5449b29906150569aaf2eb2730'
          'a3809b9727f0c2af2d0770f5c7442db2'
          'd2c48e970088d679dd3c2afd914ff731'
          '722f483c9e3ce2ec66d3301aaf7cf3d5')
@@ -24,7 +24,11 @@ md5sums=('4f440603eac45fec7be218b87d570834'
 build() {
   cd $srcdir/$pkgname-$pkgver
   # Build openvpn
-  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure --prefix=/usr --enable-password-save --mandir=/usr/share/man
+  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
+    --prefix=/usr \
+    --enable-password-save \
+    --mandir=/usr/share/man \
+    --enable-iproute2
   make
 
   # Build plugins
@@ -50,10 +54,15 @@ package() {
   for plug in auth-pam down-root; do
     cd $srcdir/$pkgname-$pkgver/plugin/$plug
     install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so
+    cd -
   done
+  # Install contrib
+  install -d -m755 $pkgdir/usr/share/openvpn/contrib
+  cp -r contrib $pkgdir/usr/share/openvpn
   # Install easy-rsa
   cd $srcdir/$pkgname-$pkgver
   make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa
+  rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf
   # Install rc scripts
   install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn
   install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev
diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD
index 6712f4491..ce4c93698 100644
--- a/core/wget/PKGBUILD
+++ b/core/wget/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 122950 2011-05-07 12:59:07Z allan $
+# $Id: PKGBUILD 135508 2011-08-14 11:32:07Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=wget
-pkgver=1.12
-pkgrel=7
+pkgver=1.13
+pkgrel=1
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/wget/wget.html"
@@ -14,28 +14,18 @@ depends=('glibc' 'openssl')
 optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        wget-1.12-CVE-2010-2252.patch
-        wget-1.12-subjectAltName.patch)
-md5sums=('141461b9c04e454dc8933c9d1f2abf83'
-         '2c8bc23eff98fd4efc3f96394fc8e61e'
-         'bd589403b7bb4967a6f41b0f43b1c8aa')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('48c5384123156e7b7501d2f5b5c7189a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Fix arbitrary file overwrite via 3xx redirect (CVE-2010-2252)
-  patch -Np1 -i $srcdir/wget-1.12-CVE-2010-2252.patch
-
-  # https://savannah.gnu.org/bugs/index.php?20421
-  patch -Np0 -i $srcdir/wget-1.12-subjectAltName.patch
-
   # Note : We do not build with --enable-nls, because there is a bug in wget causing
   # international domain names to be not properly converted to punycode if
   # the current locale is a UTF-8 one
   # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html
 
-  ./configure -with-ssl --prefix=/usr --sysconfdir=/etc
+  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc
   make
 }
 
diff --git a/core/wget/wget.install b/core/wget/wget.install
index 171533352..8eb6a2c3f 100644
--- a/core/wget/wget.install
+++ b/core/wget/wget.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(wget.info)
 
 post_install() {