fix packages to be compile with stack protector

- libtool do not pass -fstack-protector while linking,
  but this is required to successfully link libraries or
  executables with SSP
- pass LDFLAGS for non-libtool packages

6 files changed, 65 insertions, 55 deletions

diff --git a/package/ssmtp/patches/901-strftime_space_padding.patch b/package/ssmtp/patches/901-strftime_space_padding.patch
deleted file mode 100644
index dd0b9b116..000000000
--- a/package/ssmtp/patches/901-strftime_space_padding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN ssmtp-2.60-old/arpadate.c ssmtp-2.60-new/arpadate.c
---- ssmtp-2.60-old/arpadate.c	2002-12-08 18:30:11.000000000 +0100
-+++ ssmtp-2.60-new/arpadate.c	2004-05-23 18:54:32.000000000 +0200
-@@ -79,7 +79,7 @@
- 	time_t now;
- 
- 	/* RFC822 format string borrowed from GNU shellutils date.c */
--	const char *format = "%a, %_d %b %Y %H:%M:%S %z";
-+	const char *format = "%a, %d %b %Y %H:%M:%S %z";
- 
- 	now = time(NULL);
- 
diff --git a/package/ssmtp/patches/patch-Makefile_in b/package/ssmtp/patches/patch-Makefile_in
new file mode 100644
index 000000000..01150acf4
--- /dev/null
+++ b/package/ssmtp/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- ssmtp-2.61.orig/Makefile.in	2004-07-26 07:32:18.000000000 +0200
++++ ssmtp-2.61/Makefile.in	2011-01-17 15:06:49.000000000 +0100
+@@ -79,7 +79,7 @@ uninstall-sendmail: uninstall
+ 
+ # Binaries:
+ ssmtp: $(OBJS)
+-	$(CC) -o ssmtp $(OBJS) @LIBS@
++	$(CC) @LDFLAGS@ -o ssmtp $(OBJS) @LIBS@
+ 
+ .PHONY: clean
+ clean:
diff --git a/package/ssmtp/patches/patch-arpadate_c b/package/ssmtp/patches/patch-arpadate_c
new file mode 100644
index 000000000..e753470f6
--- /dev/null
+++ b/package/ssmtp/patches/patch-arpadate_c
@@ -0,0 +1,11 @@
+--- ssmtp-2.61.orig/arpadate.c	2002-12-08 18:30:11.000000000 +0100
++++ ssmtp-2.61/arpadate.c	2011-01-17 15:09:18.000000000 +0100
+@@ -79,7 +79,7 @@ get_arpadate (char *d_string)
+ 	time_t now;
+ 
+ 	/* RFC822 format string borrowed from GNU shellutils date.c */
+-	const char *format = "%a, %_d %b %Y %H:%M:%S %z";
++	const char *format = "%a, %d %b %Y %H:%M:%S %z";
+ 
+ 	now = time(NULL);
+ 
diff --git a/package/ssmtp/patches/patch-configure_in b/package/ssmtp/patches/patch-configure_in
new file mode 100644
index 000000000..274ae978e
--- /dev/null
+++ b/package/ssmtp/patches/patch-configure_in
@@ -0,0 +1,13 @@
+--- ssmtp-2.61.orig/configure.in	2004-07-23 06:40:29.000000000 +0200
++++ ssmtp-2.61/configure.in	2011-01-17 14:46:46.000000000 +0100
+@@ -24,8 +24,8 @@ AC_C_CONST
+ AC_STRUCT_TM
+ 
+ dnl Checks for libraries.
+-AC_CHECK_LIB(nsl, gethostname)
+-AC_CHECK_LIB(socket, socket)
++AC_SEARCH_LIBS(gethostname, nsl)
++AC_SEARCH_LIBS(socket, socket)
+ 
+ dnl Checks for library functions.
+ AC_TYPE_SIGNAL
diff --git a/package/ssmtp/patches/500-debian-subset-2.61-2.patch b/package/ssmtp/patches/patch-ssmtp_c
index f682c97a1..38d45ca3d 100644
--- a/package/ssmtp/patches/500-debian-subset-2.61-2.patch
+++ b/package/ssmtp/patches/patch-ssmtp_c
@@ -1,17 +1,6 @@
---- ssmtp-2.61.orig/ssmtp.conf
-+++ ssmtp-2.61/ssmtp.conf
-@@ -36,3 +36,8 @@
- 
- # Use this RSA certificate.
- #TLSCert=/etc/ssl/certs/ssmtp.pem
-+
-+# Get enhanced (*really* enhanced) debugging information in the logs
-+# If you want to have debugging of the config file parsing, move this option
-+# to the top of the config file and uncomment
-+#Debug=YES
---- ssmtp-2.61.orig/ssmtp.c
-+++ ssmtp-2.61/ssmtp.c
-@@ -93,6 +93,7 @@
+--- ssmtp-2.61.orig/ssmtp.c	2004-07-23 07:58:48.000000000 +0200
++++ ssmtp-2.61/ssmtp.c	2011-01-17 14:46:46.000000000 +0100
+@@ -93,6 +93,7 @@ SSL *ssl;
  static char hextab[]="0123456789abcdef";
  #endif
  
@@ -19,7 +8,7 @@
  
  /*
  log_event() -- Write event to syslog (or log file if defined)
-@@ -129,7 +130,7 @@
+@@ -129,7 +130,7 @@ void log_event(int priority, char *forma
  #endif
  }
  
@@ -28,7 +17,7 @@
  int smtp_read(int fd, char *response);
  int smtp_read_all(int fd, char *response);
  int smtp_okay(int fd, char *response);
-@@ -150,7 +151,7 @@
+@@ -150,7 +151,7 @@ void dead_letter(void)
  	if(isatty(fileno(stdin))) {
  		if(log_level > 0) {
  			log_event(LOG_ERR,
@@ -37,7 +26,7 @@
  		}
  		return;
  	}
-@@ -964,6 +965,17 @@
+@@ -964,6 +965,17 @@ bool_t read_config()
  					log_event(LOG_INFO, "Set AuthMethod=\"%s\"\n", auth_method);
  				}
  			}
@@ -55,7 +44,7 @@
  			else {
  				log_event(LOG_INFO, "Unable to set %s=\"%s\"\n", p, q);
  			}
-@@ -1232,10 +1244,11 @@
+@@ -1232,10 +1244,11 @@ ssize_t fd_puts(int fd, const void *buf,
  /*
  smtp_write() -- A printf to an fd and append <CR/LF>
  */
@@ -68,7 +57,7 @@
  
  	va_start(ap, format);
  	if(vsnprintf(buf, (BUF_SZ - 2), format, ap) == -1) {
-@@ -1252,7 +1265,9 @@
+@@ -1252,7 +1265,9 @@ void smtp_write(int fd, char *format, ..
  	}
  	(void)strcat(buf, "\r\n");
  
@@ -79,7 +68,7 @@
  }
  
  /*
-@@ -1282,6 +1297,8 @@
+@@ -1282,6 +1297,8 @@ int ssmtp(char *argv[])
  	int i, sock;
  	uid_t uid;
  
@@ -88,7 +77,7 @@
  	uid = getuid();
  	if((pw = getpwuid(uid)) == (struct passwd *)NULL) {
  		die("Could not find password entry for UID %d", uid);
-@@ -1335,10 +1352,10 @@
+@@ -1335,10 +1352,10 @@ int ssmtp(char *argv[])
  
  	/* If user supplied username and password, then try ELHO */
  	if(auth_user) {
@@ -101,7 +90,7 @@
  	}
  	(void)alarm((unsigned) MEDWAIT);
  
-@@ -1354,7 +1371,7 @@
+@@ -1354,7 +1371,7 @@ int ssmtp(char *argv[])
  		}
  
  		if(strcasecmp(auth_method, "cram-md5") == 0) {
@@ -110,7 +99,7 @@
  			(void)alarm((unsigned) MEDWAIT);
  
  			if(smtp_read(sock, buf) != 3) {
-@@ -1369,7 +1386,7 @@
+@@ -1369,7 +1386,7 @@ int ssmtp(char *argv[])
  #endif
  		memset(buf, 0, sizeof(buf));
  		to64frombits(buf, auth_user, strlen(auth_user));
@@ -119,7 +108,7 @@
  
  		(void)alarm((unsigned) MEDWAIT);
  		if(smtp_read(sock, buf) != 3) {
-@@ -1381,7 +1398,7 @@
+@@ -1381,7 +1398,7 @@ int ssmtp(char *argv[])
  #ifdef MD5AUTH
  		}
  #endif
@@ -128,7 +117,7 @@
  		(void)alarm((unsigned) MEDWAIT);
  
  		if(smtp_okay(sock, buf) == False) {
-@@ -1390,7 +1407,7 @@
+@@ -1390,7 +1407,7 @@ int ssmtp(char *argv[])
  	}
  
  	/* Send "MAIL FROM:" line */
@@ -137,7 +126,7 @@
  
  	(void)alarm((unsigned) MEDWAIT);
  
-@@ -1408,7 +1425,7 @@
+@@ -1408,7 +1425,7 @@ int ssmtp(char *argv[])
  
  		while(rt->next) {
  			p = rcpt_remap(rt->string);
@@ -146,7 +135,7 @@
  
  			(void)alarm((unsigned)MEDWAIT);
  
-@@ -1425,7 +1442,7 @@
+@@ -1425,7 +1442,7 @@ int ssmtp(char *argv[])
  			while(p) {
  				/* RFC822 Address -> "foo@bar" */
  				q = rcpt_remap(addr_parse(p));
@@ -155,7 +144,7 @@
  
  				(void)alarm((unsigned) MEDWAIT);
  
-@@ -1439,7 +1456,7 @@
+@@ -1439,7 +1456,7 @@ int ssmtp(char *argv[])
  	}
  
  	/* Send DATA */
@@ -164,7 +153,7 @@
  	(void)alarm((unsigned) MEDWAIT);
  
  	if(smtp_read(sock, buf) != 3) {
-@@ -1447,45 +1464,45 @@
+@@ -1447,45 +1464,45 @@ int ssmtp(char *argv[])
  		die("%s", buf);
  	}
  
@@ -218,7 +207,7 @@
  	(void)alarm((unsigned) MAXWAIT);
  
  	if(smtp_okay(sock, buf) == 0) {
-@@ -1495,11 +1512,12 @@
+@@ -1495,11 +1512,12 @@ int ssmtp(char *argv[])
  	/* Close conection */
  	(void)signal(SIGALRM, SIG_IGN);
  
@@ -233,16 +222,3 @@
  
  	return(0);
  }
---- ssmtp-2.61.orig/configure.in
-+++ ssmtp-2.61/configure.in
-@@ -24,8 +24,8 @@
- AC_STRUCT_TM
- 
- dnl Checks for libraries.
--AC_CHECK_LIB(nsl, gethostname)
--AC_CHECK_LIB(socket, socket)
-+AC_SEARCH_LIBS(gethostname, nsl)
-+AC_SEARCH_LIBS(socket, socket)
- 
- dnl Checks for library functions.
- AC_TYPE_SIGNAL
diff --git a/package/ssmtp/patches/patch-ssmtp_conf b/package/ssmtp/patches/patch-ssmtp_conf
new file mode 100644
index 000000000..fb8ffae95
--- /dev/null
+++ b/package/ssmtp/patches/patch-ssmtp_conf
@@ -0,0 +1,11 @@
+--- ssmtp-2.61.orig/ssmtp.conf	2004-07-23 07:58:48.000000000 +0200
++++ ssmtp-2.61/ssmtp.conf	2011-01-17 14:46:46.000000000 +0100
+@@ -36,3 +36,8 @@ hostname=_HOSTNAME_
+ 
+ # Use this RSA certificate.
+ #TLSCert=/etc/ssl/certs/ssmtp.pem
++
++# Get enhanced (*really* enhanced) debugging information in the logs
++# If you want to have debugging of the config file parsing, move this option
++# to the top of the config file and uncomment
++#Debug=YES