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

3 files changed, 23 insertions, 31 deletions

diff --git a/pcr/babeld/babeld.install b/pcr/babeld/babeld.install
deleted file mode 100644
index 686153617..000000000
--- a/pcr/babeld/babeld.install
+++ /dev/null
@@ -1,18 +0,0 @@
-compatibility_warning() {
-  echo "PLEASE NOTE:"
-  echo " "
-  echo "-------------------------------------------------------------"
-  echo " This version uses the IANA-allocated UDP port and multicast"
-  echo " group and is therefore incompatible with older versions."
-  echo "-------------------------------------------------------------"
-}
-
-post_upgrade() {
-  major=$(echo $2 | cut -d '.' -f1)
-  minor=$(echo $2 | cut -d '.' -f2)
-  if [ $major -lt 1 ]; then
-    compatibility_warning
-  elif [ $major -eq 1 -a $minor -lt 1 ]; then
-    compatibility_warning
-  fi	
-}
diff --git a/pcr/networkmanager-openswan/PKGBUILD b/pcr/networkmanager-openswan/PKGBUILD
index 715c578d0..f831e7ad2 100644
--- a/pcr/networkmanager-openswan/PKGBUILD
+++ b/pcr/networkmanager-openswan/PKGBUILD
@@ -1,8 +1,9 @@
 # Contributor (Arch): Marti Raudsepp <marti@juffo.org>
+# Maintainer: fauno <fauno@parabola.nu>
 
 pkgname=networkmanager-openswan
 _pkgname=NetworkManager-openswan
-pkgver=0.9.8.0
+pkgver=0.9.8.4
 pkgrel=1
 pkgdesc="NetworkManager plugin for IPSec VPN tunnels"
 arch=('i686' 'x86_64')
@@ -13,10 +14,20 @@ makedepends=('intltool')
 source=(http://ftp.acc.umu.se/pub/GNOME/sources/$_pkgname/0.9/$_pkgname-$pkgver.tar.xz)
 md5sums=('6a373868f85ac3b7c953f7fd6c76e637')
 
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+#  sed -e "s/gnome_keyring_memory_free/gcr_secure_memory_free/g" \
+#      -e "s/gnome_keyring_memory_strdup/gcr_secure_memory_strdup/g" \
+#      -e "s/gnome_keyring_find_itemsv_sync/secret_service_search_sync/g" \
+#      -i auth-dialog/main.c
+}
+
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/networkmanager
+
+  sed -e "s/-Werror//g" -i auth-dialog/Makefile
   make
 }
 
@@ -24,3 +35,4 @@ package() {
   cd "$srcdir/$_pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
+md5sums=('6cb2b64bc79c4174856613d077667b66')
diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD
index 3d20cb08d..4a81ca23b 100644
--- a/pcr/openswan/PKGBUILD
+++ b/pcr/openswan/PKGBUILD
@@ -1,22 +1,23 @@
 # Contributor (Arch): xjpvictor Huang <ke [AT] xjpvictor [DOT] info>
 pkgname=openswan
-pkgver=2.6.38
-pkgrel=2
+pkgver=2.6.41
+pkgrel=1
 pkgdesc="Open Source implementation of IPsec for the Linux operating system"
 url="http://www.openswan.org"
 license=('GPL' 'custom')
 arch=('i686' 'x86_64')
 depends=('iproute2>=2.6.8' 'gmp' 'perl')
+optdepends=('python2')
 makedepends=('flex' 'bison')
 conflicts=('ipsec-tools')
 backup=(etc/ipsec.conf \
         etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
 source=(http://download.openswan.org/openswan/openswan-$pkgver.tar.gz
-        openswan
         openswan.service)
 
 prepare() {
   cd $srcdir/openswan-$pkgver
+
   # Change install paths to Arch defaults
   sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
 }
@@ -24,17 +25,14 @@ prepare() {
 build() {
   cd $srcdir/openswan-$pkgver
 
-  # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|;s|)/sbin|)/bin|' Makefile.inc
-
   make USE_XAUTH=true USE_OBJDIR=true programs
 }
 
 package() {
-  cd $srcdir/openswan-$pkgver
-
   # Create /etc/rc.d for init script, and license directory
   mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
+
+  cd $srcdir/openswan-$pkgver
   make DESTDIR=$pkgdir install
 
   # Change permissions in /var
@@ -44,13 +42,13 @@ package() {
   cp LICENSE $pkgdir/usr/share/licenses/openswan
 
   # Install init script
-  install -Dm755 ../openswan $pkgdir/etc/rc.d/openswan
   install -Dm644 ../openswan.service $pkgdir/usr/lib/systemd/system/openswan.service
   mkdir $pkgdir/usr/lib/systemd/scripts/
-  cp $pkgdir/etc/rc.d/ipsec $pkgdir/usr/lib/systemd/scripts/ipsec
+  mv $pkgdir/etc/rc.d/ipsec $pkgdir/usr/lib/systemd/scripts/ipsec
   # fix manpages
   mv $pkgdir/usr/man $pkgdir/usr/share/
+  # fix python2
+  sed -i '1s|python|python2|' $pkgdir/usr/lib/openswan/verify
 }
-md5sums=('13073eb5314b83a31be88e4117e8bbcd'
-         '543d84162761b9cc9ec319e938c4dd2a'
+md5sums=('da2e8b02ecc30a408cc5766767fef84f'
          'd8b465c10838c72e31329d65011002b6')