diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2019-10-07 21:07:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2019-10-08 05:45:59 +0200 |
| commit | f92cfc9d1e244e1e5473c08d147769be9f30404f (patch) | |
| tree | 30d4c7dea3065027b506abf4abb38aab50efa86b /package | |
| parent | 33a0a0ae31a81c06977b91bcc27a281905a1fd9e (diff) | |
openswan: update to 2.6.51.5
Diffstat (limited to 'package')
| -rw-r--r-- | package/openswan/Makefile | 4 | ||||
| -rw-r--r-- | package/openswan/patches/patch-Makefile_inc | 14 | ||||
| -rw-r--r-- | package/openswan/patches/patch-lib_liblwres_Makefile | 11 |
3 files changed, 9 insertions, 20 deletions
diff --git a/package/openswan/Makefile b/package/openswan/Makefile index a752e897d..5a48daf15 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openswan -PKG_VERSION:= 2.6.49.1 +PKG_VERSION:= 2.6.51.5 PKG_RELEASE:= 1 -PKG_HASH:= b9690e8c6ff524732cd2a729a8a08f5d2acedff41cb97303b82946d039de55f0 +PKG_HASH:= 4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d PKG_DESCR:= ipsec software PKG_SECTION:= net/security PKG_DEPENDS:= libgmp diff --git a/package/openswan/patches/patch-Makefile_inc b/package/openswan/patches/patch-Makefile_inc index 82a9d5878..2b3529ed1 100644 --- a/package/openswan/patches/patch-Makefile_inc +++ b/package/openswan/patches/patch-Makefile_inc @@ -1,15 +1,15 @@ ---- openswan-2.6.46.orig/Makefile.inc 2016-01-22 16:50:30.000000000 +0100 -+++ openswan-2.6.46/Makefile.inc 2016-02-15 21:06:59.000000000 +0100 +--- openswan-2.6.51.5.orig/Makefile.inc 2019-06-14 21:35:45.000000000 +0200 ++++ openswan-2.6.51.5/Makefile.inc 2019-10-07 20:44:06.511702433 +0200 @@ -194,10 +194,10 @@ BISONOSFLAGS= #Example for a cross compile: #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib GCC_LINT ?= -DGCC_LINT --USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} -+USERCOMPILE?=-g -O3 -fPIE -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} +-USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} ++USERCOMPILE?=-g -fPIC -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT) ${USERCOMPILEEXTRA} # on fedora/rhel - #USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS --KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM -+KLIPSCOMPILE=-O2 -fPIE -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM + #USERCOMPILE?=-g -O2 -g -pipe -Wall -Wp,-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -fPIE -pie -DSUPPORT_BROKEN_ANDROID_ICS +-KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM ++KLIPSCOMPILE=-O2 -Wformat -Wformat-security -Werror=format-security -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM # Additional debugging for developers (warning: can crash openswan!) #USERCOMPILE?=-g -DLEAK_DETECTIVE ${LIBEFENCE} # You can also run this before starting openswan on glibc systems: diff --git a/package/openswan/patches/patch-lib_liblwres_Makefile b/package/openswan/patches/patch-lib_liblwres_Makefile deleted file mode 100644 index fb788473a..000000000 --- a/package/openswan/patches/patch-lib_liblwres_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- openswan-2.6.43.orig/lib/liblwres/Makefile 2015-03-13 13:49:09.000000000 -0500 -+++ openswan-2.6.43/lib/liblwres/Makefile 2015-05-01 04:01:15.175426999 -0500 -@@ -23,7 +23,7 @@ CINCLUDES = -I${srcdir}${ISCARCH}/includ - -I${srcdir}../libisc/include \ - -I. -I./include -I${srcdir}include - CDEFINES = --CWARNINGS = -Werror -+#CWARNINGS = -Werror - - CFLAGS+=${USERCOMPILE} ${PORTINCLUDE} ${CINCLUDES} ${CDEFINES} ${CWARNINGS} - |