Waldemar Brodkorb 6 лет назад
Родитель
Сommit
f92cfc9d1e

+ 2 - 2
package/openswan/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 include ${ADK_TOPDIR}/rules.mk
 
 
 PKG_NAME:=		openswan
 PKG_NAME:=		openswan
-PKG_VERSION:=		2.6.49.1
+PKG_VERSION:=		2.6.51.5
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		b9690e8c6ff524732cd2a729a8a08f5d2acedff41cb97303b82946d039de55f0
+PKG_HASH:=		4124f4ce970089f301c34b9c48f54b021cf6b2b8813877942337f8022104f70d
 PKG_DESCR:=		ipsec software
 PKG_DESCR:=		ipsec software
 PKG_SECTION:=		net/security
 PKG_SECTION:=		net/security
 PKG_DEPENDS:=		libgmp
 PKG_DEPENDS:=		libgmp

+ 7 - 7
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=
 @@ -194,10 +194,10 @@ BISONOSFLAGS=
  #Example for a cross compile:
  #Example for a cross compile:
  #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
  #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
  GCC_LINT ?= -DGCC_LINT
  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
  # 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!)
  # Additional debugging for developers (warning: can crash openswan!)
  #USERCOMPILE?=-g -DLEAK_DETECTIVE ${LIBEFENCE}
  #USERCOMPILE?=-g -DLEAK_DETECTIVE ${LIBEFENCE}
  # You can also run this before starting openswan on glibc systems:
  # You can also run this before starting openswan on glibc systems:

+ 0 - 11
package/openswan/patches/patch-lib_liblwres_Makefile

@@ -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}
-