Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/pigeonhole/PKGBUILD
	community/pv/PKGBUILD
	community/python-gnupginterface/PKGBUILD
	community/tdl/PKGBUILD
	extra/clisp/PKGBUILD
	extra/expect/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/hspell/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/imake/PKGBUILD
	extra/libfontenc/PKGBUILD
	extra/libice/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libspectre/PKGBUILD
	extra/libtasn1/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxaw/PKGBUILD
	extra/libxxf86dga/PKGBUILD
	extra/mp3splt/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nss_ldap/PKGBUILD
	extra/pam_ldap/PKGBUILD
	extra/recode/PKGBUILD
	extra/ruby/PKGBUILD
	extra/squid/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/umfpack/PKGBUILD
	extra/xorg-xbacklight/PKGBUILD
	extra/xorg-xbiff/PKGBUILD
	extra/xorg-xcalc/PKGBUILD
	extra/xorg-xconsole/PKGBUILD
	extra/xorg-xedit/PKGBUILD
	extra/xorg-xeyes/PKGBUILD
	extra/xorg-xvinfo/PKGBUILD

2 files changed, 39 insertions, 11 deletions

diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD
index 88ddbe40e..85fb499d2 100644
--- a/extra/ssmtp/PKGBUILD
+++ b/extra/ssmtp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 75590 2010-04-01 22:29:13Z ibiru $
+# $Id: PKGBUILD 151206 2012-02-25 07:42:28Z pierre $
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 
 pkgname=ssmtp
 pkgver=2.64
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Extremely simple MTA to get mail off the system to a mailhub"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -13,22 +13,29 @@ conflicts=('exim')
 provides=('smtp-forwarder')
 backup=('etc/ssmtp/ssmtp.conf' 'etc/ssmtp/revaliases')
 options=('!makeflags' '!emptydirs')
-source=(http://ftp.debian.org/debian/pool/main/s/ssmtp/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('65b4e0df4934a6cd08c506cabcbe584f')
+source=("http://ftp.debian.org/debian/pool/main/s/ssmtp/${pkgname}_${pkgver}.orig.tar.bz2"
+        'opessl_crypto.patch')
+md5sums=('65b4e0df4934a6cd08c506cabcbe584f'
+         'aeb4ed09a26eefea9a5f6ac755c4dff0')
 
 ## if you build in chroot, make sure the chroots fully qualified hostname is the same as in your real root system ##
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
-   sed -ri 's/-lssl/-lssl -lcrypto/' configure
+   patch -p1 -i "${srcdir}/opessl_crypto.patch"
+   autoreconf
    ./configure --prefix=/usr \
-		--sysconfdir=/etc \
-                --mandir=/usr/share/man \
-		--enable-md5auth --enable-ssl || return 1
-   make || return 1
-   yes | make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man8" etcdir="${pkgdir}/etc" install || return 1
+    --sysconfdir=/etc \
+    --mandir=/usr/share/man \
+    --enable-md5auth --enable-ssl
+   make
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}"
+   yes | make prefix="${pkgdir}/usr" mandir="${pkgdir}/usr/share/man/man8" etcdir="${pkgdir}/etc" install
 
-   install -D -m644 ssmtp.conf.5 "${pkgdir}/usr/share/man/man5/ssmtp.conf.5" || return 1
+   install -D -m644 ssmtp.conf.5 "${pkgdir}/usr/share/man/man5/ssmtp.conf.5"
 
    ln -s ssmtp "${pkgdir}/usr/sbin/sendmail"
    ln -s ssmtp "${pkgdir}/usr/sbin/newaliases"
diff --git a/extra/ssmtp/opessl_crypto.patch b/extra/ssmtp/opessl_crypto.patch
new file mode 100644
index 000000000..e3055b2e7
--- /dev/null
+++ b/extra/ssmtp/opessl_crypto.patch
@@ -0,0 +1,21 @@
+Fix linking error:
+
+Undefined symbols:
+  "_X509_free", referenced from:
+      _smtp_open in ssmtp.o
+ld: symbol(s) not found
+
+
+Index: ssmtp-2.64/configure.in
+===================================================================
+--- ssmtp-2.64.orig/configure.in
++++ ssmtp-2.64/configure.in
+@@ -52,7 +52,7 @@ AC_ARG_ENABLE(ssl,
+ [  --enable-ssl           support for secure connection to mail server])
+ if test x$enableval = xyes ; then
+ 	AC_DEFINE(HAVE_SSL)
+-	LIBS="$LIBS -lssl"
++	LIBS="$LIBS -lssl -lcrypto"
+ fi
+ enableval=""
+