From 00a883d077ce6e985266c5d4d81e5a470a516f72 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Sun, 16 Dec 2012 01:16:25 +0000
Subject: [PATCH 1/4] openssl group, openvpn,pyhton2, python2-m2crypto renamed,
 ruby, syslog-ng

---
 nfs-utils/PKGBUILD                            |  2 +-
 openvpn/PKGBUILD                              | 25 ++++---
 python-m2crypto/PKGBUILD                      | 34 ----------
 python2-m2crypto/PKGBUILD                     | 33 +++++++++
 .../openssl1.patch                            |  0
 python2/PKGBUILD                              |  7 +-
 ruby/PKGBUILD                                 | 23 +++----
 syslog-ng/PKGBUILD                            | 22 ++----
 syslog-ng/syslog-ng.rc                        | 67 -------------------
 vpnc/vpnc.rc                                  | 35 ----------
 10 files changed, 71 insertions(+), 177 deletions(-)
 delete mode 100644 python-m2crypto/PKGBUILD
 create mode 100644 python2-m2crypto/PKGBUILD
 rename {python-m2crypto => python2-m2crypto}/openssl1.patch (100%)
 delete mode 100755 syslog-ng/syslog-ng.rc
 delete mode 100644 vpnc/vpnc.rc

diff --git a/nfs-utils/PKGBUILD b/nfs-utils/PKGBUILD
index 11c1551f8..735deb55b 100644
--- a/nfs-utils/PKGBUILD
+++ b/nfs-utils/PKGBUILD
@@ -60,7 +60,7 @@ build() {
               --without-tcp-wrappers --with-statedir=/var/lib/nfs \
               --enable-ipv6 --sysconfdir=/etc \
 	      --enable-libmount-mount --enable-mountconfig
-  
+
   make 
 }
 
diff --git a/openvpn/PKGBUILD b/openvpn/PKGBUILD
index 734594fc3..48656434a 100644
--- a/openvpn/PKGBUILD
+++ b/openvpn/PKGBUILD
@@ -1,23 +1,32 @@
+#
+# Core packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas[at]chakra-project[dot]org>
+
 pkgname=openvpn
-pkgver=2.1.4
-pkgrel=4
+pkgver=2.2.2
+pkgrel=1
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
-arch=(i686 x86_64)
+arch=('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
         etc/conf.d/openvpn-tapdev)
-source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
-	openvpn@.service)
-md5sums=('96a11868082685802489254f03ff3bde'
+source=("http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz"
+	'openvpn@.service')
+md5sums=('c5181e27b7945fa6276d21873329c5c7'
          '44047df812a3fcd57a7e36a61732a9b9')
 
 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
diff --git a/python-m2crypto/PKGBUILD b/python-m2crypto/PKGBUILD
deleted file mode 100644
index 91302bd9e..000000000
--- a/python-m2crypto/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# Note: needs rebuild against 2.x python. 2.7.x would be fine and is not needed.
-
-pkgname=python-m2crypto
-pkgver=0.20.2
-pkgrel=4
-pkgdesc="A crypto and SSL toolkit for Python"
-arch=('i686' 'x86_64')
-url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-license=('BSD')
-depends=('python' 'openssl')
-makedepends=('swig')
-source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz"
-	'openssl1.patch')
-md5sums=('6c24410410d6eb1920ea43f77a93613a'
-	'80a707ad6610f2871efdf40658e30364')
-
-build() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  patch -Np0 -i ${srcdir}/openssl1.patch || return 1
-  python setup.py build
-}
-
-package() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  python setup.py install --root="${pkgdir}/"
-
-  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/python2-m2crypto/PKGBUILD b/python2-m2crypto/PKGBUILD
new file mode 100644
index 000000000..6fabf3d13
--- /dev/null
+++ b/python2-m2crypto/PKGBUILD
@@ -0,0 +1,33 @@
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas[at]chakra-project[dot]org>
+
+pkgname=python2-m2crypto
+pkgver=0.21.1
+pkgrel=1
+pkgdesc="A crypto and SSL toolkit for Python"
+arch=('x86_64')
+url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
+license=('BSD')
+depends=('python2' 'openssl')
+provides=('python-m2crypto')
+replaces=('python-m2crypto')
+conflicts=('python-m2crypto')
+makedepends=('swig')
+source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz")
+md5sums=('f93d8462ff7646397a9f77a2fe602d17')
+
+build() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
+   
+  python setup.py build
+}
+
+package() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
+  
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
+
+  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/python-m2crypto/openssl1.patch b/python2-m2crypto/openssl1.patch
similarity index 100%
rename from python-m2crypto/openssl1.patch
rename to python2-m2crypto/openssl1.patch
diff --git a/python2/PKGBUILD b/python2/PKGBUILD
index dc75122ba..a89b7a048 100644
--- a/python2/PKGBUILD
+++ b/python2/PKGBUILD
@@ -1,15 +1,14 @@
 #
 # Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=python2
 pkgver=2.7.3
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('PSF')
 url="http://www.python.org"
 depends=('db>=4.8' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
diff --git a/ruby/PKGBUILD b/ruby/PKGBUILD
index 23f54cead..a50b58703 100644
--- a/ruby/PKGBUILD
+++ b/ruby/PKGBUILD
@@ -5,18 +5,18 @@
 # maintainer : Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p194
-_pkgver=1.9.3-p194
-pkgrel=2
+pkgver=1.9.3_p327
+_pkgver=1.9.3-p327
+pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.ruby-lang.org/en/"
 license=('custom')
 makedepends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'tk' 'libffi'
              'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs')
 source=("ftp://ftp.ruby-lang.org/pub/ruby/1.9/${pkgname}-${_pkgver}.tar.bz2")
-md5sums=('2278eff4cfed3cbc0653bc73085caa34')
+md5sums=('7d602aba93f31ceef32800999855fbca')
 
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
@@ -28,8 +28,7 @@ build() {
   make
 }
 
-package_ruby()
-{
+package_ruby() {
   depends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'libffi' 'libyaml')
   provides=('rubygems' 'rake')
   conflicts=('rubygems' 'rake')
@@ -40,13 +39,13 @@ package_ruby()
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
-package_ruby-docs()
-{
+package_ruby-docs() {
   pkgdesc="Documentation files for ruby"
-  #arch=('any')
+
   depends=('ruby')
 
-  cd "${srcdir}/${pkgname}-${_pkgver}"
+  cd "${srcdir}/ruby-${_pkgver}"
   make -j1 DESTDIR="${pkgdir}" install-doc install-capi
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/COPYING"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
 }
diff --git a/syslog-ng/PKGBUILD b/syslog-ng/PKGBUILD
index b8769a02a..f3f8974b2 100644
--- a/syslog-ng/PKGBUILD
+++ b/syslog-ng/PKGBUILD
@@ -5,14 +5,13 @@
 
 
 pkgname=syslog-ng
-pkgver=3.3.5
+pkgver=3.3.7
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL2')
-groups=('base')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
+depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk' 'systemd')
 makedepends=('flex' 'pkg-config')
 optdepends=('logrotate: for rotating log files')
 provides=('logger')
@@ -22,13 +21,11 @@ backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
 source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
         'syslog-ng.conf'
         'syslog-ng.conf.d'
-        'syslog-ng.logrotate'
-        'syslog-ng.rc')
-sha1sums=('0c8b85079b60c68c4279bcd4124b1e3c6358407b'
+        'syslog-ng.logrotate')
+sha1sums=('06f09057c3dfb84eba381e0141f92565673ec0c8'
           '98074e0facfc6ef036202662cc86d04b38a2c142'
           'eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd'
-          '949128fe3d7f77a7aab99048061f885bc758000c'
-          '94af81a84e3add6653755122cdd5080694de059d')
+          '949128fe3d7f77a7aab99048061f885bc758000c')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -53,12 +50,5 @@ package() {
   install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
   install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
   install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
-  install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
   install -Dm644 "$srcdir/syslog-ng.conf.d" "$pkgdir/etc/conf.d/syslog-ng"
-
-  # location of systemctl
-  sed -e 's@/bin/systemctl@/usr&@' \
-      -e '$aAlias=syslog.service' \
-      -e '/^ExecStartPre/d' \
-      -i "$pkgdir/usr/lib/systemd/system/syslog-ng.service"
 }
diff --git a/syslog-ng/syslog-ng.rc b/syslog-ng/syslog-ng.rc
deleted file mode 100755
index d48b71ed1..000000000
--- a/syslog-ng/syslog-ng.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/syslog-ng
-
-checkconfig() {
-  if ! syslog-ng -s "${SYSLOG_NG_CHECKOPTS[@]}"; then
-    stat_fail
-    exit 1
-  fi
-}
-
-pidfile=/run/syslog-ng.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting Syslog-NG"
-    checkconfig
-    if [[ -z $PID ]] && /usr/sbin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then
-      add_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Syslog-NG"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
-    if [[ -z $PID ]]; then
-      stat_fail
-    else
-      checkconfig
-      if kill -HUP $PID &>/dev/null; then
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac
diff --git a/vpnc/vpnc.rc b/vpnc/vpnc.rc
deleted file mode 100644
index 972ed3211..000000000
--- a/vpnc/vpnc.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Connecting to VPN"
-    /usr/sbin/vpnc
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon vpnc
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Disconnecting from VPN"
-    /usr/sbin/vpnc-disconnect
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon vpnc
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0

From e1f484c58cfbfa0093fb92441bbe199b880e6090 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Sun, 16 Dec 2012 02:04:00 +0000
Subject: [PATCH 2/4] openssl group vpnc, wget, wpa_supplicant

---
 vpnc/PKGBUILD           |  30 ++++++-----
 wget/PKGBUILD           |  23 +++------
 wpa_supplicant/PKGBUILD |  11 ++--
 wpa_supplicant/config   | 108 ++++++++++++++++++++++++++++++++++------
 4 files changed, 122 insertions(+), 50 deletions(-)

diff --git a/vpnc/PKGBUILD b/vpnc/PKGBUILD
index a9cfd718f..296bfbcf7 100644
--- a/vpnc/PKGBUILD
+++ b/vpnc/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 75214 2010-04-01 02:29:38Z pierre $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
+#
+# Core packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas[at]chakra-project[dot]org>
+
 pkgname=vpnc
-pkgver=0.5.3
-pkgrel=3
+pkgver=0.5.3.1
+pkgrel=1
 pkgdesc="VPN client for cisco3000 VPN Concentrators"
 url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
 license=('GPL')
 depends=('libgcrypt' 'openssl' 'iproute2')
-arch=('i686' 'x86_64')
-source=(http://www.unix-ag.uni-kl.de/~massar/vpnc/$pkgname-$pkgver.tar.gz
-        vpnc.conf vpnc.rc)
+arch=('x86_64')
+source=("http://www.chakra-linux.org/sources/vpnc/$pkgname-$pkgver.tar.xz"
+        'vpnc.conf')
 backup=(etc/vpnc/default.conf)
-md5sums=('4378f9551d5b077e1770bbe09995afb3'
-         'a3f4e0cc682f437e310a1c86ae198e45'
-         'c5885162ac198eaa36da9a01e7c0c55b')
+md5sums=('b0802bea7ee8218ffcc256b62fdbe606'
+         'a3f4e0cc682f437e310a1c86ae198e45')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -21,14 +23,16 @@ build() {
   # Build hybrid support
   sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
 
-  make PREFIX=/usr || return 1
+  make 
 }
 
 package() {
   cd $srcdir/$pkgname-$pkgver
+  
   make DESTDIR=$pkgdir PREFIX=/usr install
 
   install -D -m644 $srcdir/vpnc.conf $pkgdir/etc/vpnc/default.conf
-  install -D -m755 $srcdir/vpnc.rc $pkgdir/etc/rc.d/vpnc
-  rm -f $pkgdir/etc/vpnc/vpnc.conf
+
 }
+
+
diff --git a/wget/PKGBUILD b/wget/PKGBUILD
index 537118510..9ca662096 100644
--- a/wget/PKGBUILD
+++ b/wget/PKGBUILD
@@ -1,33 +1,27 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=wget
-pkgver=1.13.4
+pkgver=1.14
 pkgrel=1
 pkgdesc="A network utility to retrieve files from the Web"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.gnu.org/software/wget/wget.html"
 license=('GPL3')
 groups=('base')
-depends=('glibc' 'openssl')
+depends=('glibc' 'openssl' 'libidn' 'util-linux')
 optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('7f518b3a71e9efd330e9a0c3714f8463')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('316f6f59292c9098ad81fd54f658c579')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # 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=openssl --prefix=/usr --sysconfdir=/etc
+  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls
   make
 }
 
@@ -41,7 +35,4 @@ package() {
 ca_certificate=/etc/ssl/certs/ca-certificates.crt
 EOF
 
-  # remove IRI option from wgetrc as it does not work (see above)
-  sed -i '118,120d' $pkgdir/etc/wgetrc
-
 }
diff --git a/wpa_supplicant/PKGBUILD b/wpa_supplicant/PKGBUILD
index 237b3b63e..a62c9e39d 100644
--- a/wpa_supplicant/PKGBUILD
+++ b/wpa_supplicant/PKGBUILD
@@ -1,25 +1,24 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=wpa_supplicant
 pkgver=0.7.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A utility providing key negotiation for WPA wireless networks"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 depends=('openssl' 'dbus-core>=1.2.4' 'readline>=6.0' 'libnl')
 optdepends=('wpa_supplicant_gui: wpa_gui program')
 license=('GPL')
 groups=('base')
 backup=('etc/wpa_supplicant.conf')
 url="http://hostap.epitest.fi/wpa_supplicant"
-source=(http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz
+source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz"
         config
 	wpa_supplicant.service)
 sha256sums=('d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443'
-            '6a0837f18e5ff179ccd6954f7952dfc2e6aa69f353194ee4cb29c1ed2ef68c5d'
+            '54568aa6912a7e8ee0c28a71a79dd8d5b6f11368ca71733c26e41d1a142587ba'
             '7473ff4479f7b40e9f1369f1ccbf8f514ae17729be18572801f80d3b4a4df3d0')
 
 build() {
diff --git a/wpa_supplicant/config b/wpa_supplicant/config
index 192e338f2..5e6dfedc8 100644
--- a/wpa_supplicant/config
+++ b/wpa_supplicant/config
@@ -78,6 +78,11 @@
 #CONFIG_DRIVER_RALINK=y
 
 # Driver interface for generic Linux wireless extensions
+# Note: WEXT is deprecated in the current Linux kernel version and no new
+# functionality is added to it. nl80211-based interface is the new
+# replacement for WEXT and its use allows wpa_supplicant to properly control
+# the driver to improve existing functionality like roaming and to support new
+# functionality.
 CONFIG_DRIVER_WEXT=y
 
 # Driver interface for Linux drivers using the nl80211 kernel interface
@@ -109,11 +114,6 @@ CONFIG_DRIVER_NL80211=y
 # Driver interface for development testing
 #CONFIG_DRIVER_TEST=y
 
-# Include client MLME (management frame processing) for test driver
-# This can be used to test MLME operations in hostapd with the test interface.
-# space.
-#CONFIG_CLIENT_MLME=y
-
 # Driver interface for wired Ethernet drivers
 CONFIG_DRIVER_WIRED=y
 
@@ -123,6 +123,10 @@ CONFIG_DRIVER_WIRED=y
 # Driver interface for no driver (e.g., WPS ER only)
 #CONFIG_DRIVER_NONE=y
 
+# Solaris libraries
+#LIBS += -lsocket -ldlpi -lnsl
+#LIBS_c += -lsocket
+
 # Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
 # included)
 CONFIG_IEEE8021X_EAPOL=y
@@ -161,6 +165,9 @@ CONFIG_EAP_OTP=y
 # EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
 #CONFIG_EAP_PSK=y
 
+# EAP-pwd (secure authentication using only a password)
+#CONFIG_EAP_PWD=y
+
 # EAP-PAX
 #CONFIG_EAP_PAX=y
 
@@ -190,6 +197,13 @@ CONFIG_EAP_LEAP=y
 
 # Wi-Fi Protected Setup (WPS)
 CONFIG_WPS=y
+# Enable WSC 2.0 support
+#CONFIG_WPS2=y
+# Enable WPS external registrar functionality
+#CONFIG_WPS_ER=y
+# Disable credentials for an open network by default when acting as a WPS
+# registrar.
+#CONFIG_WPS_REG_DISABLE_OPEN=y
 
 # EAP-IKEv2
 #CONFIG_EAP_IKEV2=y
@@ -224,6 +238,10 @@ CONFIG_CTRL_IFACE=y
 # the resulting binary.
 CONFIG_READLINE=y
 
+# Include internal line edit mode in wpa_cli. This can be used as a replacement
+# for GNU Readline to provide limited command line editing and history support.
+#CONFIG_WPA_CLI_EDIT=y
+
 # Remove debugging code that is printing out debug message to stdout.
 # This can be used to reduce the size of the wpa_supplicant considerably
 # if debugging code is not needed. The size reduction can be around 35%
@@ -305,18 +323,17 @@ CONFIG_PEERKEY=y
 
 # Select TLS implementation
 # openssl = OpenSSL (default)
-# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
+# gnutls = GnuTLS
 # internal = Internal TLSv1 implementation (experimental)
 # none = Empty template
 #CONFIG_TLS=openssl
 
-# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
-# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
-# even though the core GnuTLS library is released under LGPL, this extra
-# library uses GPL and as such, the terms of GPL apply to the combination
-# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
-# apply for distribution of the resulting binary.
-#CONFIG_GNUTLS_EXTRA=y
+# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
+# can be enabled to get a stronger construction of messages when block ciphers
+# are used. It should be noted that some existing TLS v1.0 -based
+# implementation may not be compatible with TLS v1.1 message (ClientHello is
+# sent prior to negotiating which version will be used)
+#CONFIG_TLSV11=y
 
 # If CONFIG_TLS=internal is used, additional library and include paths are
 # needed for LibTomMath. Alternatively, an integrated, minimal version of
@@ -378,6 +395,11 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y
 # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
 CONFIG_DEBUG_FILE=y
 
+# Send debug messages to syslog instead of stdout
+#CONFIG_DEBUG_SYSLOG=y
+# Set syslog facility for debug messages
+#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
+
 # Enable privilege separation (see README 'Privilege separation' for details)
 #CONFIG_PRIVSEP=y
 
@@ -389,7 +411,7 @@ CONFIG_DEBUG_FILE=y
 # This tracks use of memory allocations and other registrations and reports
 # incorrect use with a backtrace of call (or allocation) location.
 #CONFIG_WPA_TRACE=y
-# For BSD, comment out these.
+# For BSD, uncomment these.
 #LIBS += -lexecinfo
 #LIBS_p += -lexecinfo
 #LIBS_c += -lexecinfo
@@ -398,7 +420,63 @@ CONFIG_DEBUG_FILE=y
 # This enables use of libbfd to get more detailed symbols for the backtraces
 # generated by CONFIG_WPA_TRACE=y.
 #CONFIG_WPA_TRACE_BFD=y
-# For BSD, comment out these.
+# For BSD, uncomment these.
 #LIBS += -lbfd -liberty -lz
 #LIBS_p += -lbfd -liberty -lz
 #LIBS_c += -lbfd -liberty -lz
+
+# wpa_supplicant depends on strong random number generation being available
+# from the operating system. os_get_random() function is used to fetch random
+# data when needed, e.g., for key generation. On Linux and BSD systems, this
+# works by reading /dev/urandom. It should be noted that the OS entropy pool
+# needs to be properly initialized before wpa_supplicant is started. This is
+# important especially on embedded devices that do not have a hardware random
+# number generator and may by default start up with minimal entropy available
+# for random number generation.
+#
+# As a safety net, wpa_supplicant is by default trying to internally collect
+# additional entropy for generating random data to mix in with the data fetched
+# from the OS. This by itself is not considered to be very strong, but it may
+# help in cases where the system pool is not initialized properly. However, it
+# is very strongly recommended that the system pool is initialized with enough
+# entropy either by using hardware assisted random number generator or by
+# storing state over device reboots.
+#
+# wpa_supplicant can be configured to maintain its own entropy store over
+# restarts to enhance random number generation. This is not perfect, but it is
+# much more secure than using the same sequence of random numbers after every
+# reboot. This can be enabled with -e<entropy file> command line option. The
+# specified file needs to be readable and writable by wpa_supplicant.
+#
+# If the os_get_random() is known to provide strong random data (e.g., on
+# Linux/BSD, the board in question is known to have reliable source of random
+# data from /dev/urandom), the internal wpa_supplicant random pool can be
+# disabled. This will save some in binary size and CPU use. However, this
+# should only be considered for builds that are known to be used on devices
+# that meet the requirements described above.
+CONFIG_NO_RANDOM_POOL=y
+
+# IEEE 802.11n (High Throughput) support (mainly for AP mode)
+#CONFIG_IEEE80211N=y
+
+# Interworking (IEEE 802.11u)
+# This can be used to enable functionality to improve interworking with
+# external networks (GAS/ANQP to learn more about the networks and network
+# selection based on available credentials).
+#CONFIG_INTERWORKING=y
+
+CONFIG_LIBNL32=y
+
+# More options that are not in defconfig:
+
+# Lightweight AP mode
+CONFIG_AP=y
+
+# P2P (WiFi Direct)
+CONFIG_P2P=y
+
+# RSN IBSS/AdHoc support
+CONFIG_IBSS_RSN=y
+
+# Simple background scan
+CONFIG_BGSCAN_SIMPLE=y

From 7b4f6e66437eb6af84bb03cd5fe090eb8d4999d5 Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Sun, 16 Dec 2012 16:59:46 +0000
Subject: [PATCH 3/4] apr & apr-util update for sed/apache build issue

---
 apr-util/PKGBUILD |  6 +++---
 apr/PKGBUILD      | 31 +++++++++++++++++--------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/apr-util/PKGBUILD b/apr-util/PKGBUILD
index c397065a9..dd2958485 100644
--- a/apr-util/PKGBUILD
+++ b/apr-util/PKGBUILD
@@ -4,16 +4,16 @@
 # maintainer abveritas@chakra-project.org
 
 pkgname=apr-util
-pkgver=1.4.1
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://apr.apache.org/"
 depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
 options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('52b31b33fb1aa16e65ddaefc76e41151')
+md5sums=('9c1db8606e520f201c451ec9a0b095f6')
 
 build() {
   cd "${srcdir}/apr-util-${pkgver}"
diff --git a/apr/PKGBUILD b/apr/PKGBUILD
index 28ec19516..e8542cc2e 100644
--- a/apr/PKGBUILD
+++ b/apr/PKGBUILD
@@ -1,34 +1,37 @@
 #
 # Core Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=apr
-pkgver=1.4.5
-pkgrel=2
+pkgver=1.4.6
+pkgrel=1
 pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://apr.apache.org/"
-depends=('util-linux-ng>=2.16')
+depends=('util-linux')
 options=('!libtool')
 license=('APACHE')
-source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('daf5487c82dd7bec9c005c96f8cb01b1')
-
-md5sums=('8b53f5a5669d0597f2da889a2f576eb6')
+source=("http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2")
+md5sums=('ffee70a111fd07372982b0550bbb14b7')
 
 build() {
   cd "${srcdir}/apr-${pkgver}"
-  export apr_cv_accept4=no
+
 
   ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
     --with-installbuilddir=/usr/share/apr-1/build \
     --enable-nonportable-atomics \
     --with-devrandom=/dev/urandom
   make
+}
+
+check() {
+  cd "${srcdir}/apr-${pkgver}"
+  make -j1 check
+}
+
+package() {
+  cd "${srcdir}/apr-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }

From 20326aba4d2b78ca36362fd05d576b2924f09daf Mon Sep 17 00:00:00 2001
From: abveritas <abveritas@chakra-project.org>
Date: Fri, 21 Dec 2012 16:41:35 +0000
Subject: [PATCH 4/4] subversion update, part of openssl, start of rc.conf
 clean-up

---
 subversion/PKGBUILD | 21 ++++++---------------
 subversion/svnserve | 42 ------------------------------------------
 2 files changed, 6 insertions(+), 57 deletions(-)
 delete mode 100755 subversion/svnserve

diff --git a/subversion/PKGBUILD b/subversion/PKGBUILD
index 98e961be2..4d6852358 100644
--- a/subversion/PKGBUILD
+++ b/subversion/PKGBUILD
@@ -4,33 +4,30 @@
 # maintainer abveritas@chakra-project.org
 
 pkgname=subversion
-pkgver=1.7.6
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('apache' 'bsd')
 depends=('neon' 'apr-util' 'sqlite3' 'file')
 optdepends=('kdeutils-kwallet' 'bash-completion: for svn bash completion')
 makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 
              'autoconf' 'db' 'e2fsprogs' 'kdelibs')
-backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
+#backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
 url="http://subversion.apache.org/"
 provides=('svn')
 options=('!makeflags' '!libtool')
 source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
-        svnserve svn svnserve.conf 
+        svn svnserve.conf 
 	svnserve.tmpfiles
 	svnserve.service
-        subversion-1.7.6-kwallet-gcc47.patch
         subversion.rpath.fix.patch)
-md5sums=('4baa434db7709bb059b05d02a2547663'
-         '62b1a7dcfcda6a07c0a9804b2322614d'
-         'a2b029e8385007ffb99b437b30521c90'
+md5sums=('454b9f398415c3504435bf8c3f6ed127'
+         '8fc10351ec75a103b0c0c69d8ed786b7'
          'a0db6dd43af33952739b6ec089852630'
          'c459e299192552f61578f3438abf0664'
          'bb2857eceafcfac35dde39dcffad2314'
          'e8020c7a1d1a0c47091b5fdd034f81c5'
-         'f02cef1ab91cc5f345ebf3d281288db3'
          '6b4340ba9d8845cd8497e013ae01be3f')
 
 build() {
@@ -41,8 +38,6 @@ build() {
    patch -p0 -i ../subversion.rpath.fix.patch
    sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
 
-   patch -p1 -i ../subversion-1.7.6-kwallet-gcc47.patch
-
    # configure
    autoreconf
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
@@ -75,10 +70,6 @@ package() {
    ## svnserve
    install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
 
-   # rc.d
-   install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
-   install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
-
    # systemd
    install -D -m 644 "${srcdir}"/svnserve.service  "${pkgdir}"/usr/lib/systemd/system/svnserve.service
    install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf
diff --git a/subversion/svnserve b/subversion/svnserve
deleted file mode 100755
index 670fee742..000000000
--- a/subversion/svnserve
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/svnserve
-
-PID=`pidof -o %PPID /usr/bin/svnserve`
-case "$1" in
-  start)
-    stat_busy "Starting svnserve"
-    if [ -z "$PID" ]; then 
-      if [ -n "$SVNSERVE_USER" ]; then
-        su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
-      else
-        /usr/bin/svnserve -d $SVNSERVE_ARGS &
-      fi
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon svnserve
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping svnserve"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon svnserve
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac