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

1 files changed, 84 insertions, 5 deletions

diff --git a/package/osiris/patches/patch-configure b/package/osiris/patches/patch-configure
index 7d0b90b3f..b9ae74fe0 100644
--- a/package/osiris/patches/patch-configure
+++ b/package/osiris/patches/patch-configure
@@ -1,7 +1,13 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 --- osiris-4.2.3.orig/configure	2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/configure	2009-12-11 21:26:32.000000000 +0100
-@@ -3403,7 +3403,7 @@ else
++++ osiris-4.2.3/configure	2011-01-16 15:16:06.000000000 +0100
+@@ -1,4 +1,5 @@
+ #! /bin/sh
++set -x
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.59.
+ #
+@@ -3403,7 +3404,7 @@ else
  fi
  
  
@@ -10,7 +16,80 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  AUTOHEADER=echo
  
  if test "x$prefix" = "xNONE" ; then
-@@ -3738,7 +3738,7 @@ CYGWIN*)
+@@ -3573,7 +3574,6 @@ else
+ 
+ 	for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
+                 CPPFLAGS="$saved_CPPFLAGS"
+-                LDFLAGS="$saved_LDFLAGS"
+ 
+ # GOD DAMN FUCKING STATIC BINARIES ON SOLARIS CAN EAT MY ASS.
+ 
+@@ -3596,29 +3596,6 @@ else
+                 if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
+                         continue;
+                 fi
+-                if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
+-                        # Try to use $ssldir/lib if it exists, otherwise
+-                        # $ssldir
+-                        if test -d "$ssldir/lib" ; then
+-                                LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
+-                                if test ! -z "$need_dash_r" ; then
+-                                        LDFLAGS="-R$ssldir/lib $LDFLAGS"
+-                                fi
+-                        else
+-                                LDFLAGS="-L$ssldir $saved_LDFLAGS"
+-                                if test ! -z "$need_dash_r" ; then
+-                                        LDFLAGS="-R$ssldir $LDFLAGS"
+-                                fi
+-                        fi
+-
+-                        # Try to use $ssldir/include if it exists, otherwise
+-                        # $ssldir
+-                        if test -d "$ssldir/include" ; then
+-                                CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
+-                        else
+-                                CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
+-                        fi
+-                fi
+ 
+                 # Basic test to check for compatible version and correct linking
+ 
+@@ -3694,34 +3671,6 @@ fi
+ echo "$as_me:$LINENO: result: $ac_cv_openssldir" >&5
+ echo "${ECHO_T}$ac_cv_openssldir" >&6
+ 
+-if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; then
+-#         AC_DEFINE(HAVE_OPENSSL)
+-                ssldir=$ac_cv_openssldir
+-        if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then
+-                # Try to use $ssldir/lib if it exists, otherwise
+-                # $ssldir
+-                if test -d "$ssldir/lib" ; then
+-                        LDFLAGS="-L$ssldir/lib $saved_LDFLAGS"
+-                        if test ! -z "$need_dash_r" ; then
+-                                LDFLAGS="-R$ssldir/lib $LDFLAGS"
+-                        fi
+-                else
+-                        LDFLAGS="-L$ssldir $saved_LDFLAGS"
+-                        if test ! -z "$need_dash_r" ; then
+-                                LDFLAGS="-R$ssldir $LDFLAGS"
+-                        fi
+-                fi
+-                # Try to use $ssldir/include if it exists, otherwise
+-                # $ssldir
+-                if test -d "$ssldir/include" ; then
+-                        CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS"
+-                else
+-                        CPPFLAGS="-I$ssldir $saved_CPPFLAGS"
+-                fi
+-        fi
+-fi
+-
+-
+ case "$OS_NAME" in
+ SunOS*)
+     LIBS="$saved_LIBS $ssldir/lib/libssl.a $ssldir/lib/libcrypto.a"
+@@ -3738,7 +3687,7 @@ CYGWIN*)
  esac
  
  
@@ -19,7 +98,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  case "${OS_NAME}" in
      MINGW32*)
-@@ -4448,11 +4448,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -4448,11 +4397,6 @@ cat >>confdefs.h <<_ACEOF
  #define SYSTEM_LINUX 1
  _ACEOF
  
@@ -31,7 +110,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
      ;;
  BSD*)
  
-@@ -11394,7 +11389,6 @@ chmod ug+x src/install/install.sh
+@@ -11394,7 +11338,6 @@ chmod ug+x src/install/install.sh
      echo "   Osiris MD Directory: ${with_md_root_dir}"
      echo "        Osiris MD user: ${with_osiris_md_user}"
      echo "  Osiris MD config dir: ${with_md_conf_dir}"