Merge branch 'master' of ssh://gparabola/srv/git/abslibre

6 files changed, 6 insertions, 128 deletions

diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD
index 896d5bacf..fe8204d0a 100644
--- a/social/asterisk/PKGBUILD
+++ b/social/asterisk/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Alessio Biancalana <dottorblaster@gmail.com>
 
 pkgname=asterisk
-pkgver=10.9.0
+pkgver=11.0.1
 pkgrel=1
 pkgdesc="A complete PBX solution"
 arch=('i686' 'x86_64')
@@ -15,20 +15,20 @@ source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$
 	asterisk \
 	asterisk.logrotated)
 install=$pkgname.install
-md5sums=('2fb85dc753584ac13692c27f9749c6cb'
+md5sums=('3e80a5cef7b0f8808578efcc84c39fd7'
          '59146273738605f1e011d8e7bed3561a'
          '486e07a0a1405ea25ec5b1736034653e')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
+  make || return 1
 }
 
 package(){
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  make DESTDIR=${pkgdir} samples
+  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} samples || return 1
 
   (cd ${pkgdir}/etc/asterisk
 #  for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done
diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD
deleted file mode 100644
index a28b9842f..000000000
--- a/social/miniupnpc/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Contributor: Florian Loitsch <archlinux@florian.loitsch.com>
-pkgname=miniupnpc
-pkgver=1.7.20120830
-pkgrel=1
-pkgdesc='A small UPnP client library/tool to access Internet Gateway Devices'
-arch=('i686' 'x86_64' 'mips64el')
-url="http://miniupnp.free.fr"
-license=('BSD')
-depends=('sh')
-source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz")
-md5sums=('c74b24b906e11860005fc425b4979fe6')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  make
-}
-
-package(){
-  cd $srcdir/$pkgname-$pkgver
-  make INSTALLPREFIX=$pkgdir/usr install
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/social/openswan/PKGBUILD b/social/openswan/PKGBUILD
deleted file mode 100644
index b60ca8401..000000000
--- a/social/openswan/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Contributor: Jan Fader <jan.fader@web.de>
-pkgname=openswan
-pkgver=2.6.36
-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=('iproute' 'gmp' 'perl')
-backup=(etc/ipsec.conf \
-        etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear})
-source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz
-        openswan.rc.d
-        compile.patch)
-
-build() {
-  # Create /etc/rc.d for init script, and license directory
-  mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan}
-
-  cd $srcdir/openswan-$pkgver
-  patch -p1 -i $srcdir/compile.patch
-
-  # Change install paths to Arch defaults
-  sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc
-
-  make USE_XAUTH=true USE_OBJDIR=true programs
-}
-
-package(){
-  cd $srcdir/openswan-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # Change permissions in /var
-  chmod 755 $pkgdir/var/run/pluto
-  
-  # Copy License
-  cp LICENSE $pkgdir/usr/share/licenses/openswan
-  
-  # Install init script
-  install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan
-  # fix manpages
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-}
-md5sums=('b3a1733493520bb18729633b62ef8247'
-         '543d84162761b9cc9ec319e938c4dd2a'
-         '5540437bb334873da646e21ac9caa963')
diff --git a/social/openswan/compile.patch b/social/openswan/compile.patch
deleted file mode 100644
index 8ddff67f2..000000000
--- a/social/openswan/compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openswan-2.6.23/Makefile	2009-09-09 02:42:54.000000000 +0200
-+++ Makefile	2009-12-30 10:13:53.000000000 +0100
-@@ -12,6 +12,8 @@
- # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- # for more details.
- #
-+CFLAGS=-fno-strict-aliasing
-+CXXFLAGS=-fno-strict-aliasing
- 
- 
- OPENSWANSRCDIR?=$(shell pwd)
diff --git a/social/openswan/openswan.rc.d b/social/openswan/openswan.rc.d
deleted file mode 100644
index 30bd0d56e..000000000
--- a/social/openswan/openswan.rc.d
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Openswan IPsec"
-    /etc/rc.d/ipsec --start
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon openswan
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Openswan IPsec"
-    /etc/rc.d/ipsec --stop
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      rm_daemon openswan
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting Openswan IPsec"
-    /etc/rc.d/ipsec --restart
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-      add_daemon openswan
-    fi
-    ;;
-  status)
-    /etc/rc.d/ipsec --status
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-
diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD
index 8cb84fad5..6ab789ccc 100644
--- a/social/sipwitch/PKGBUILD
+++ b/social/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=sipwitch
 pkgver=1.2.4