ssmtp: fix linking against openssl

Reported-by: Alexander Dahl <post@lespocky.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

6 files changed, 65 insertions, 20 deletions

diff --git a/patches/ssmtp-2.64/ssmtp-2.61-ldflags.diff b/patches/ssmtp-2.64/0001-use-LDFLAGS-for-linking.patch
index fa8b77b35..9ad40df0e 100644
--- a/patches/ssmtp-2.64/ssmtp-2.61-ldflags.diff
+++ b/patches/ssmtp-2.64/0001-use-LDFLAGS-for-linking.patch
@@ -1,15 +1,20 @@
-Subject: [PATCH] use LDFLAGS for linking
 From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Wed, 14 Aug 2013 10:24:18 +0200
+Subject: [PATCH] use LDFLAGS for linking
 
 Please use LDFLAGS, not CFLAGS, for linking. This makes it possible to
 overwrite the variable from the outside and do the correct thing.
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff -urN ssmtp-2.61-orig/Makefile.in ssmtp-2.61/Makefile.in
---- ssmtp-2.61-orig/Makefile.in	2006-03-04 23:19:04.000000000 +0100
-+++ ssmtp-2.61/Makefile.in	2006-03-04 23:19:36.000000000 +0100
-@@ -79,7 +79,7 @@
+diff --git a/Makefile.in b/Makefile.in
+index f0aff41..d235182 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -79,7 +79,7 @@ uninstall-sendmail: uninstall
  
  # Binaries:
  ssmtp: $(OBJS)
diff --git a/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff b/patches/ssmtp-2.64/0002-use-DESTDIR-when-installing.patch
index dc862ee95..537d012cd 100644
--- a/patches/ssmtp-2.64/ssmtp-2.64-destdir.diff
+++ b/patches/ssmtp-2.64/0002-use-DESTDIR-when-installing.patch
@@ -1,18 +1,18 @@
-Subject: [PATCH] use DESTDIR when installing
 From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Wed, 14 Aug 2013 10:24:18 +0200
+Subject: [PATCH] use DESTDIR when installing
 
 Prefix all paths with DESTDIR when installing
 
 Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
 ---
- Makefile.in |   40 ++++++++++++++++++++--------------------
+ Makefile.in | 40 ++++++++++++++++++++--------------------
  1 file changed, 20 insertions(+), 20 deletions(-)
 
-Index: ssmtp-2.64/Makefile.in
-===================================================================
---- ssmtp-2.64.orig/Makefile.in
-+++ ssmtp-2.64/Makefile.in
+diff --git a/Makefile.in b/Makefile.in
+index d235182..756d754 100644
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -46,36 +46,36 @@ all: ssmtp
  
  .PHONY: install
diff --git a/patches/ssmtp-2.64/ssmtp-2.64-non-interactive-install.diff b/patches/ssmtp-2.64/0003-make-installing-non-interactive.patch
index 7c1564fe6..0536d9aed 100644
--- a/patches/ssmtp-2.64/ssmtp-2.64-non-interactive-install.diff
+++ b/patches/ssmtp-2.64/0003-make-installing-non-interactive.patch
@@ -1,5 +1,6 @@
-Subject: make installing non-interactive
 From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 14 Aug 2013 10:24:18 +0200
+Subject: [PATCH] make installing non-interactive
 
 $(GEN_CONFIG) need user ineraction to create a config file.
 It doesn't work for cross-compiling and we don't need it.
@@ -7,13 +8,12 @@ It doesn't work for cross-compiling and we don't need it.
 Not for upstream.
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-
 ---
- Makefile.in |    3 +--
+ Makefile.in | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-Index: b/Makefile.in
-===================================================================
+diff --git a/Makefile.in b/Makefile.in
+index 756d754..cb3610c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -45,14 +45,13 @@ all: ssmtp
diff --git a/patches/ssmtp-2.64/0004-configure-if-using-ssl-link-against-libcrypto-too.patch b/patches/ssmtp-2.64/0004-configure-if-using-ssl-link-against-libcrypto-too.patch
new file mode 100644
index 000000000..e69cf3483
--- /dev/null
+++ b/patches/ssmtp-2.64/0004-configure-if-using-ssl-link-against-libcrypto-too.patch
@@ -0,0 +1,35 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 14 Aug 2013 10:27:05 +0200
+Subject: [PATCH] configure: if using ssl link against libcrypto, too
+
+otherwise linking fails with:
+arm-v5te-linux-gnueabi-gcc -o ssmtp ssmtp.o arpadate.o base64.o xgethostname.o md5auth/md5c.o md5auth/hmac_md5.o  -lnsl  -lssl
+/opt/OSELAS.Toolchain-2012.12.1/arm-v5te-linux-gnueabi/gcc-4.7.2-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/4.7.2/../../../../arm-v5te-linux-gnueabi/bin/ld:
+ssmtp.o: undefined reference to symbol 'X509_free@@OPENSSL_1.0.0'
+/opt/OSELAS.Toolchain-2012.12.1/arm-v5te-linux-gnueabi/gcc-4.7.2-glibc-2.16.0-binutils-2.22-kernel-3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/4.7.2/../../../../arm-v5te-linux-gnueabi/bin/ld:
+note: 'X509_free@@OPENSSL_1.0.0' is defined in DSO
+XXXXX/sysroot-target/usr/lib/libcrypto.so.1.0.0 so try adding it to the
+linker command line
+XXXXX/sysroot-target/usr/lib/libcrypto.so.1.0.0: could not read symbols:
+Invalid operation
+collect2: error: ld returned 1 exit status
+
+Reported-by: Alexander Dahl <post@lespocky.de>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 2d7221d..0633add 100644
+--- a/configure.in
++++ b/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=""
+ 
diff --git a/patches/ssmtp-2.64/autogen.sh b/patches/ssmtp-2.64/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/ssmtp-2.64/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/patches/ssmtp-2.64/series b/patches/ssmtp-2.64/series
index eb2612119..b89ac6363 100644
--- a/patches/ssmtp-2.64/series
+++ b/patches/ssmtp-2.64/series
@@ -1,3 +1,7 @@
-ssmtp-2.61-ldflags.diff
-ssmtp-2.64-destdir.diff
-ssmtp-2.64-non-interactive-install.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-use-LDFLAGS-for-linking.patch
+0002-use-DESTDIR-when-installing.patch
+0003-make-installing-non-interactive.patch
+0004-configure-if-using-ssl-link-against-libcrypto-too.patch
+# 4ac054ecac57de7c903a18a4dfcd2270  - git-ptx-patches magic