Merge branch 'master' of git+ssh://parabola-git/abslibre-mips64el

3 files changed, 21 insertions, 23 deletions

diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index a96ea1c4a..83f108937 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 142292 2011-11-08 00:30:49Z thomas $
+# $Id: PKGBUILD 146230 2012-01-06 14:32:39Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.4.1
+pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
@@ -12,16 +12,15 @@ depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt')
 conflicts=('mkinitcpio<0.7')
 options=('!libtool' '!emptydirs')
 source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
+        http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
         encrypt_hook
-	encrypt_install
-	cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch)
-sha256sums=('96d682853c8019cfeae0b21250cd2d00af42e46251807e8dbda2ff8427c2e9ed'
+        encrypt_install)
+sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb'
+            '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88'
             '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
-            'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573'
-            '6fa1d3172014ba3ba96f7a67acbcae7f26b24a61abb84b3917f526a54f81dd87')
+            'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573')
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}
-  patch -p0 -i "${srcdir}"/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch
   ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
   make
 }
diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD
index f4489153a..9184647f8 100644
--- a/core/libpcap/PKGBUILD
+++ b/core/libpcap/PKGBUILD
@@ -1,25 +1,22 @@
-# $Id: PKGBUILD 142215 2011-11-06 10:21:27Z thomas $
+# $Id: PKGBUILD 146220 2012-01-06 09:21:20Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=libpcap
-pkgver=1.1.1
-pkgrel=4
+pkgver=1.2.1
+pkgrel=1
 pkgdesc="A system-independent interface for user-level packet capture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tcpdump.org/"
 license=('BSD')
 depends=('glibc' 'libnl' 'sh')
 makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz)
-        #Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch
-        #Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch)
-sha256sums=('508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85')
-            #'194aa268a3397be3ba406b7102dbdbc14fc16c6e4b535d0a0fab6b04d414563a'
-            #'f1f31c3e2b064f4c9d0e643e8ed1874a65ec17f770362f8ffa3b3f9ee9dc71bb')
+source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz
+        http://www.tcpdump.org/release/libpcap-1.2.1.tar.gz.sig)
+sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd'
+            'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4')
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  #patch -p1 -i "${srcdir}"/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch
-  #patch -p1 -i "${srcdir}"/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch
   ./configure --prefix=/usr --enable-ipv6
   make
 }
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index d90a8a570..6bda23d46 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 135525 2011-08-14 20:37:18Z thomas $
+# $Id: PKGBUILD 146232 2012-01-06 14:32:42Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=openvpn
-pkgver=2.2.1
+pkgver=2.2.2
 pkgrel=1
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
 arch=(i686 x86_64 'mips64el')
@@ -13,10 +13,12 @@ backup=(usr/share/openvpn/easy-rsa/vars
         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
+        http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc
         openvpn.rc
         openvpn-tapdev.rc
         openvpn-tapdev.conf)
-md5sums=('500bee5449b29906150569aaf2eb2730'
+md5sums=('c5181e27b7945fa6276d21873329c5c7'
+         '81ff11ec8cd9fc3c8bc646aae24c4298'
          'a3809b9727f0c2af2d0770f5c7442db2'
          'd2c48e970088d679dd3c2afd914ff731'
          '722f483c9e3ce2ec66d3301aaf7cf3d5')