aboutsummaryrefslogtreecommitdiffstats
path: root/main/ssmtp
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-01-03 09:39:02 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-01-03 10:04:44 +0000
commit825163e06e2d0c82a9bf2e0255cfee66790ac178 (patch)
tree17d888045e89f4b576ce90a051fc790ff24b6893 /main/ssmtp
parentcd1a2a838522299d7b28d89497433a4484a961bb (diff)
downloadaports-825163e06e2d0c82a9bf2e0255cfee66790ac178.tar.bz2
aports-825163e06e2d0c82a9bf2e0255cfee66790ac178.tar.xz
main/ssmtp: fix underlinking to libcrypto
and cleanup unused patch
Diffstat (limited to 'main/ssmtp')
-rw-r--r--main/ssmtp/APKBUILD21
-rw-r--r--main/ssmtp/CVE-2008-3962.patch14
-rw-r--r--main/ssmtp/generate_config.patch4
-rw-r--r--main/ssmtp/libcrypto-underlinking.patch11
4 files changed, 29 insertions, 21 deletions
diff --git a/main/ssmtp/APKBUILD b/main/ssmtp/APKBUILD
index d21dac8b0c..d8ee553a24 100644
--- a/main/ssmtp/APKBUILD
+++ b/main/ssmtp/APKBUILD
@@ -3,22 +3,32 @@
pkgname=ssmtp
pkgver=2.64
-pkgrel=4
+pkgrel=5
pkgdesc="Extremely simple MTA to get mail off the system to a mail hub"
subpackages="$pkgname-doc"
arch="all"
url="http://packages.debian.org/source/lenny/ssmtp"
license="GPL-2"
depends=
-makedepends="openssl-dev"
+makedepends="openssl-dev autoconf"
install=
source="http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
generate_config.patch
+ libcrypto-underlinking.patch
"
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+ autoconf
+}
build() {
- cd "$srcdir"/$pkgname-$pkgver
- patch generate_config ../generate_config.patch || return 1
+ cd "$_builddir"
sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
./configure --prefix=/usr \
@@ -38,4 +48,5 @@ package() {
}
md5sums="65b4e0df4934a6cd08c506cabcbe584f ssmtp_2.64.orig.tar.bz2
-c70c395fe71589ca8b10b666455d5071 generate_config.patch"
+a9ea0b998975e51b37a8946f5ea977db generate_config.patch
+d782db1a953c6d48b63353d71f0c52f5 libcrypto-underlinking.patch"
diff --git a/main/ssmtp/CVE-2008-3962.patch b/main/ssmtp/CVE-2008-3962.patch
deleted file mode 100644
index fca144fa68..0000000000
--- a/main/ssmtp/CVE-2008-3962.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ssmtp.orig/ssmtp.c
-+++ ssmtp/ssmtp.c
-@@ -485,6 +485,11 @@ char *from_format(char *str, bool_t over
- die("from_format() -- snprintf() failed");
- }
- }
-+ else {
-+ if(snprintf(buf, BUF_SZ, "%s", str) == -1) {
-+ die("from_format() -- snprintf() failed");
-+ }
-+ }
- }
-
- #if 0
diff --git a/main/ssmtp/generate_config.patch b/main/ssmtp/generate_config.patch
index dd4baf9f8a..23285b193a 100644
--- a/main/ssmtp/generate_config.patch
+++ b/main/ssmtp/generate_config.patch
@@ -1,5 +1,5 @@
---- src/ssmtp/generate_config 2004-07-23 05:58:48.000000000 +0000
-+++ generate_config 2009-01-27 10:09:11.000000000 +0000
+--- ./generate_config 2004-07-23 05:58:48.000000000 +0000
++++ ./generate_config 2009-01-27 10:09:11.000000000 +0000
@@ -4,7 +4,7 @@
# Figure out the system's mailname
#
diff --git a/main/ssmtp/libcrypto-underlinking.patch b/main/ssmtp/libcrypto-underlinking.patch
new file mode 100644
index 0000000000..4928f271cf
--- /dev/null
+++ b/main/ssmtp/libcrypto-underlinking.patch
@@ -0,0 +1,11 @@
+--- ./configure.in.orig
++++ ./configure.in
+@@ -52,7 +52,7 @@
+ [ --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=""
+