patch-Makefile_inc 2.4 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. --- openswan-2.6.41.orig/Makefile.inc 2014-02-21 21:46:57.000000000 +0100
  2. +++ openswan-2.6.41/Makefile.inc 2014-03-12 18:39:50.906115397 +0100
  3. @@ -169,7 +169,7 @@ INSTALL=install
  4. # how backup names are composed.
  5. # Note that the install procedures will never overwrite an existing config
  6. # file, which is why -b is not specified for them.
  7. -INSTBINFLAGS=-b --suffix=.old
  8. +INSTBINFLAGS=
  9. INSTSUIDFLAGS=--mode=u+rxs,g+rx,o+rx --group=root -b --suffix=.old
  10. INSTMANFLAGS=
  11. INSTCONFFLAGS=
  12. @@ -191,10 +191,10 @@ BISONOSFLAGS=
  13. #Example for a cross compile:
  14. #USERCOMPILE?=-g ${PORTDEFINE} -I/usr/local/arm_tools/arm-elf/inc -L/usr/local/arm_tools/lib/gcc-lib
  15. GCC_LINT ?= -DGCC_LINT
  16. -USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
  17. +USERCOMPILE?=-g -O3 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 ${WERROR} $(GCC_LINT)
  18. # on fedora/rhel
  19. #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
  20. -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
  21. +KLIPSCOMPILE=-O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -DCONFIG_KLIPS_ALG -DDISABLE_UDP_CHECKSUM
  22. # Additional debugging for developers (warning: can crash openswan!)
  23. #USERCOMPILE?=-g -DLEAK_DETECTIVE -lefence
  24. # You can also run this before starting openswan on glibc systems:
  25. @@ -283,12 +283,12 @@ RH_KERNELSRC?=/lib/modules/2.6.9-1.681_F
  26. # Note you need a locally running bind9 nameserver with lwres{} enabled
  27. # to use this, or have the "lwres" package installed and running.
  28. # This only affects conns that use DNS for keys in lookups.
  29. -USE_LWRES?=false
  30. +USE_LWRES?=true
  31. # Do a new lookup every time a connection is (re)started. This works better
  32. # on hosts with some dyndns service, since DPD will cause a new dns lookup,
  33. # but it could be a potential security issue if receiving spoofed dns.
  34. -USE_DYNAMICDNS?=true
  35. +USE_DYNAMICDNS?=false
  36. # Do we want all the configuration files like ipsec.conf and ipsec.secrets
  37. # and any certificates to be in a single directory defined by