diff --git a/security/strongswan/ar-usage.patch b/security/strongswan/ar-usage.patch deleted file mode 100644 index d157a85b1..000000000 --- a/security/strongswan/ar-usage.patch +++ /dev/null @@ -1,40 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../strongswan/ar-usage.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -AR might be set to a cross toolchain -ar ... - - - Rene Rebe - ---- strongswan-2.4.4/lib/libcrypto/libblowfish/Makefile.vanilla 2005-06-22 20:33:19.000000000 +0200 -+++ strongswan-2.4.4/lib/libcrypto/libblowfish/Makefile 2005-06-22 20:33:32.000000000 +0200 -@@ -14,7 +14,7 @@ - MAKE= make -f Makefile.ssl - MAKEDEPEND= $(TOP)/util/domd $(TOP) - MAKEFILE= Makefile.ssl --AR= ar r -+AR= ar - RANLIB= ranlib - PERL= perl - -@@ -58,7 +58,7 @@ - lib: $(LIB) - - $(LIB): $(LIBOBJ) -- $(AR) $(LIB) $(LIBOBJ) -+ $(AR) r $(LIB) $(LIBOBJ) - $(RANLIB) $(LIB) - - # elf diff --git a/security/strongswan/strongswan.conf b/security/strongswan/strongswan.conf index 3de8ac4fb..59be7a58c 100644 --- a/security/strongswan/strongswan.conf +++ b/security/strongswan/strongswan.conf @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../strongswan/strongswan.conf +# Copyright (C) 2010 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -21,44 +22,18 @@ if [ $prefix_auto = 1 ] ; then set_confopt fi -var_append makeopt " " "programs" - -strongswan_premake () { - - # 2005-06-17: Christian Wiese - # it seems that strongswan doesn't like the appending of certain makeopt's - # so we've to use sed for now for tweaking the Makefiles. - # Any ideas for solving this issue are higly appreciated ;) - - PLUTO_MAKEFILE="programs/pluto/Makefile" - - # setting install prefix - # var_append makeopt ' ' "DESTDIR=/" - # var_append makeopt ' ' "INC_USRLOCAL=/$prefix" - sed -i "/INC_USRLOCAL=/s,/.*,/$prefix," Makefile.inc - - # setting config file location - var_append makeopt ' ' "FINALCONFDIR=$sysconfdir" - - # checking if we can enable CRL fetching using HTTP - if pkginstalled curl; then - # var_append makeopt ' ' "LIBCURL=1" - sed -i 's/^#\(LIBCURL\)/\1/' $PLUTO_MAKEFILE - fi +# checking if we can enable CRL fetching using HTTP +if pkginstalled curl; then + var_append extraconfopt ' ' "--enable-curl" +fi - # checking if we can enable CRL fetching using LDAP - if pkginstalled openldap; then - pkgprefix -t openldap - var_append CFLAGS ' ' "-I$( pkgprefix includedir openldap )" - var_append CPPFLAGS ' ' "-I$( pkgprefix includedir openldap )" - var_append LDFLAGS ' ' "-L$( pkgprefix libdir openldap )" - export CPPFLAGS CFLAGS LDFLAGS +# checking if we can enable CRL fetching using LDAP +if pkginstalled openldap; then + pkgprefix -t openldap + var_append CFLAGS ' ' "-I$( pkgprefix includedir openldap )" + var_append CPPFLAGS ' ' "-I$( pkgprefix includedir openldap )" + var_append LDFLAGS ' ' "-L$( pkgprefix libdir openldap )" + export CPPFLAGS CFLAGS LDFLAGS - # var_append makeopt ' ' "LDAP_VERSION=3" - sed -i 's/^#\(LDAP_VERSION=3\)/\1/' $PLUTO_MAKEFILE - fi - - var_append makeopt ' ' "USERCOMPILE=$CFLAGS" + var_append extraconfopt ' ' "--enable-ldap" } - -hook_add premake 5 "strongswan_premake" diff --git a/security/strongswan/strongswan.desc b/security/strongswan/strongswan.desc index 1d73960bc..1e763792e 100644 --- a/security/strongswan/strongswan.desc +++ b/security/strongswan/strongswan.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../strongswan/strongswan.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2010 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -56,7 +56,7 @@ [L] GPL [S] Stable -[V] 2.8.3 +[V] 4.4.1 [P] X -----5---9 200.500 -[D] 4016879581 strongswan-2.8.3.tar.bz2 http://download.strongswan.org/ +[D] 3282747467 strongswan-4.4.1.tar.bz2 http://download.strongswan.org/