Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.

BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA

3 files changed, 427 insertions, 0 deletions

diff --git a/freeswan/freeswan-2.04/flags.patch b/freeswan/freeswan-2.04/flags.patch
index e69de29bb2..2ee800070b 100644
--- a/freeswan/freeswan-2.04/flags.patch
+++ b/freeswan/freeswan-2.04/flags.patch
@@ -0,0 +1,137 @@
+--- freeswan-2.04/lib/libdes/Makefile	Tue Apr 22 19:38:03 2003
++++ freeswan-2.04/lib/libdes/Makefile	Fri Jan  2 14:30:34 2004
+@@ -58,9 +58,10 @@
+ #CC=gcc
+ #CFLAG= -O4 -funroll-loops -fomit-frame-pointer
+ # normally overridden by FreeS/WAN Makefiles anyway
+-CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR}
++CFLAG= -O3 -fomit-frame-pointer
+ 
+-CFLAGS=$(OPTS) $(CFLAG)
++CFLAGS=$(CFLAG)
++override CFLAGS += $(OPTS) -I${KLIPSD}/include -I${SRCDIR}
+ CPP=$(CC) -E
+ 
+ # Assember version of des_encrypt*().
+--- freeswan-2.04/lib/libfreeswan/Makefile	Wed Jul  9 21:39:20 2003
++++ freeswan-2.04/lib/libfreeswan/Makefile	Fri Jan  2 14:31:16 2004
+@@ -43,7 +43,7 @@
+ 
+ LIB=libfreeswan.a
+ # Original flags
+-CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
++CFLAGS=$(USERCOMPILE)
+ CFLAGS+= -Wall
+ #CFLAGS+= -Wconversion
+ #CFLAGS+= -Wmissing-prototypes
+@@ -55,6 +55,7 @@
+ #CFLAGS+= -W
+ #CFLAGS+= -Wwrite-strings
+ CFLAGS+= -Wbad-function-cast 
++override CFLAGS += -I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR}
+ 
+ 
+ 
+--- freeswan-2.04/lib/libipsecpolicy/Makefile	Tue May 13 21:12:12 2003
++++ freeswan-2.04/lib/libipsecpolicy/Makefile	Fri Jan  2 14:31:42 2004
+@@ -30,12 +30,13 @@
+ 
+ LIB=libipsecpolicy.a
+ # Original flags
+-CFLAGS=-I. -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
++CFLAGS = $(USERCOMPILE)
+ CFLAGS+= -Wall
+ CFLAGS+= -Wpointer-arith
+ CFLAGS+= -Wcast-qual
+ CFLAGS+= -Wstrict-prototypes
+ CFLAGS+= -Wbad-function-cast 
++override CFLAGS += -I. -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
+ 
+ MANS=
+ 
+--- freeswan-2.04/lib/liblwres/Makefile	Fri Apr 11 12:15:40 2003
++++ freeswan-2.04/lib/liblwres/Makefile	Fri Jan  2 14:32:14 2004
+@@ -24,7 +24,8 @@
+ CDEFINES = -g
+ CWARNINGS = -Werror
+ 
+-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
++CFLAGS=${CDEFINES} ${CWARNINGS}
++override CFLAGS+=${CINCLUDES}
+ 
+ VERSION="@(\#) freeswan-hacking-9.2.1-for-fs2"
+ LIBINTERFACE=2
+--- freeswan-2.04/programs/Makefile.program	Sun Jun 29 16:34:49 2003
++++ freeswan-2.04/programs/Makefile.program	Fri Jan  2 14:54:58 2004
+@@ -1,7 +1,7 @@
+ 
+ include ${FREESWANSRCDIR}/Makefile.ver
+ 
+-CFLAGS+=$(USERCOMPILE) -I${KLIPSINC}
++override CFLAGS+=-I${KLIPSINC}
+ 
+ CFLAGS+= $(USERCOMPILE)
+ CFLAGS+= -Wall
+@@ -24,7 +24,7 @@
+ CFLAGS+= ${WERROR}
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+-LDFLAGS=-L$(LD_LIBRARY_PATH)
++LDFLAGS+=-L$(LD_LIBRARY_PATH)
+ endif
+ 
+ MANDIR8=$(MANTREE)/man8
+--- freeswan-2.04/programs/lwdnsq/Makefile	Tue Sep  2 20:13:24 2003
++++ freeswan-2.04/programs/lwdnsq/Makefile	Fri Jan  2 14:32:56 2004
+@@ -24,7 +24,7 @@
+ LWRESINCL=${LWRESDIR}/include
+ 
+ LIBS:=${FREESWANLIB} ${LWRESLIB} ${BIND9STATICLIBDIR}/libdns.a ${BIND9STATICLIBDIR}/libisc.a
+-CFLAGS+=-I${LWRESINCL}
++override CFLAGS+=-I${LWRESINCL}
+ #USERCOMPILE=-g
+ 
+ 
+--- freeswan-2.04/programs/pluto/Makefile	Mon Aug 25 17:12:34 2003
++++ freeswan-2.04/programs/pluto/Makefile	Fri Jan  2 14:45:56 2004
+@@ -107,7 +107,7 @@
+ 	-DGCC_LINT \
+ 	# -DLEAK_DETECTIVE
+ 
+-CPPFLAGS = $(HDRDIRS) $(DEFINES) \
++override CPPFLAGS += $(HDRDIRS) $(DEFINES) \
+ 	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
+ 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
+ 	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
+@@ -120,7 +120,7 @@
+ LIBSPLUTO+= -lgmp -lresolv # -lefence
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+-LDFLAGS=-L$(LD_LIBRARY_PATH)
++LDFLAGS+=-L$(LD_LIBRARY_PATH)
+ endif
+ 
+ LIBSADNS = $(FREESWANLIB)
+--- freeswan-2.04/testing/utils/ikeping/Makefile	Wed Mar 27 17:28:25 2002
++++ freeswan-2.04/testing/utils/ikeping/Makefile	Fri Jan  2 14:33:43 2004
+@@ -35,7 +35,7 @@
+ 
+ HDRDIRS =  $(FREESWANINCLS)
+ 
+-CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) -DDEBUG 
++override CPPFLAGS += $(HDRDIRS) $(BYTE_ORDER) -DDEBUG 
+ 
+ ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
+ 
+--- freeswan-2.04/testing/utils/uml_netjig/Makefile	Thu Nov  7 16:17:49 2002
++++ freeswan-2.04/testing/utils/uml_netjig/Makefile	Fri Jan  2 14:34:19 2004
+@@ -43,7 +43,8 @@
+ #PCAPH=-I/home/mcr/src/libpcap
+ #PCAPLIB=-L/home/mcr/src/linux/i386/libpcap -lpcap
+ 
+-CFLAGS = -g -Wall ${PCAPH} ${NETDISSECTH} ${OPTIONS}
++CFLAGS = -g -Wall
++override CFLAGS += ${PCAPH} ${NETDISSECTH} ${OPTIONS}
+ LIBS = ${NETDISSECTLIB} ${PCAPLIB} ${OPENSSL}
+ 
+ 
diff --git a/freeswan/freeswan-2.05/flags.patch b/freeswan/freeswan-2.05/flags.patch
index e69de29bb2..32da53918e 100644
--- a/freeswan/freeswan-2.05/flags.patch
+++ b/freeswan/freeswan-2.05/flags.patch
@@ -0,0 +1,145 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- freeswan-2.05/lib/libdes/Makefile~flags	2003-04-22 20:38:03.000000000 -0400
++++ freeswan-2.05/lib/libdes/Makefile	2004-02-25 18:49:22.000000000 -0500
+@@ -58,9 +58,10 @@
+ #CC=gcc
+ #CFLAG= -O4 -funroll-loops -fomit-frame-pointer
+ # normally overridden by FreeS/WAN Makefiles anyway
+-CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR}
++CFLAG= -O3 -fomit-frame-pointer
+ 
+-CFLAGS=$(OPTS) $(CFLAG)
++CFLAGS=$(CFLAG)
++override CFLAGS += $(OPTS) -I${KLIPSD}/include -I${SRCDIR}
+ CPP=$(CC) -E
+ 
+ # Assember version of des_encrypt*().
+--- freeswan-2.05/lib/libfreeswan/Makefile~flags	2003-12-11 15:09:30.000000000 -0500
++++ freeswan-2.05/lib/libfreeswan/Makefile	2004-02-25 18:49:22.000000000 -0500
+@@ -44,7 +44,7 @@
+ 
+ LIB=libfreeswan.a
+ # Original flags
+-CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
++CFLAGS=$(USERCOMPILE)
+ CFLAGS+= -Wall
+ #CFLAGS+= -Wconversion
+ #CFLAGS+= -Wmissing-prototypes
+@@ -56,6 +56,7 @@
+ #CFLAGS+= -W
+ #CFLAGS+= -Wwrite-strings
+ CFLAGS+= -Wbad-function-cast 
++override CFLAGS += -I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR}
+ 
+ 
+ 
+--- freeswan-2.05/lib/libipsecpolicy/Makefile~flags	2003-12-04 17:03:19.000000000 -0500
++++ freeswan-2.05/lib/libipsecpolicy/Makefile	2004-02-25 18:49:22.000000000 -0500
+@@ -30,12 +30,13 @@
+ 
+ LIB=libipsecpolicy.a
+ # Original flags
+-CFLAGS=-I. -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
++CFLAGS = $(USERCOMPILE)
+ CFLAGS+= -Wall
+ CFLAGS+= -Wpointer-arith
+ CFLAGS+= -Wcast-qual
+ CFLAGS+= -Wstrict-prototypes
+ CFLAGS+= -Wbad-function-cast 
++override CFLAGS += -I. -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
+ 
+ MANS=
+ 
+--- freeswan-2.05/lib/liblwres/Makefile~flags	2003-04-11 13:15:40.000000000 -0400
++++ freeswan-2.05/lib/liblwres/Makefile	2004-02-25 18:49:22.000000000 -0500
+@@ -24,7 +24,8 @@
+ CDEFINES = -g
+ CWARNINGS = -Werror
+ 
+-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
++CFLAGS=${CDEFINES} ${CWARNINGS}
++override CFLAGS+=${CINCLUDES}
+ 
+ VERSION="@(\#) freeswan-hacking-9.2.1-for-fs2"
+ LIBINTERFACE=2
+--- freeswan-2.05/programs/Makefile.program~flags	2003-06-29 17:34:49.000000000 -0400
++++ freeswan-2.05/programs/Makefile.program	2004-02-25 18:49:22.000000000 -0500
+@@ -1,7 +1,7 @@
+ 
+ include ${FREESWANSRCDIR}/Makefile.ver
+ 
+-CFLAGS+=$(USERCOMPILE) -I${KLIPSINC}
++override CFLAGS+=-I${KLIPSINC}
+ 
+ CFLAGS+= $(USERCOMPILE)
+ CFLAGS+= -Wall
+@@ -24,7 +24,7 @@
+ CFLAGS+= ${WERROR}
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+-LDFLAGS=-L$(LD_LIBRARY_PATH)
++LDFLAGS+=-L$(LD_LIBRARY_PATH)
+ endif
+ 
+ MANDIR8=$(MANTREE)/man8
+--- freeswan-2.05/programs/lwdnsq/Makefile~flags	2003-12-07 22:29:18.000000000 -0500
++++ freeswan-2.05/programs/lwdnsq/Makefile	2004-02-25 18:50:10.000000000 -0500
+@@ -24,9 +24,9 @@
+ LWRESINCL=${LWRESDIR}/include
+ 
+ LIBS:=${FREESWANLIB} ${LWRESLIB} ${BIND9STATICLIBDIR}/libdns.a ${BIND9STATICLIBDIR}/libisc.a
+-CFLAGS+=-I${LWRESINCL}
++override CFLAGS+=-I${LWRESINCL}
+ ifneq (${BIND9INCDIR},/usr/local/include)
+-CFLAGS+=-I${BIND9INCDIR}
++override CFLAGS+=-I${BIND9INCDIR}
+ endif
+ #USERCOMPILE=-g
+ 
+--- freeswan-2.05/programs/pluto/Makefile~flags	2003-11-06 21:58:07.000000000 -0500
++++ freeswan-2.05/programs/pluto/Makefile	2004-02-25 18:49:22.000000000 -0500
+@@ -108,7 +108,7 @@
+ 	-DGCC_LINT \
+ 	# -DLEAK_DETECTIVE
+ 
+-CPPFLAGS = $(HDRDIRS) $(DEFINES) \
++override CPPFLAGS += $(HDRDIRS) $(DEFINES) \
+ 	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
+ 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
+ 	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
+@@ -121,7 +121,7 @@
+ LIBSPLUTO+= -lgmp -lresolv # -lefence
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+-LDFLAGS=-L$(LD_LIBRARY_PATH)
++LDFLAGS+=-L$(LD_LIBRARY_PATH)
+ endif
+ 
+ LIBSADNS = $(FREESWANLIB)
+--- freeswan-2.05/testing/utils/ikeping/Makefile~flags	2002-03-27 18:28:25.000000000 -0500
++++ freeswan-2.05/testing/utils/ikeping/Makefile	2004-02-25 18:49:22.000000000 -0500
+@@ -35,7 +35,7 @@
+ 
+ HDRDIRS =  $(FREESWANINCLS)
+ 
+-CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) -DDEBUG 
++override CPPFLAGS += $(HDRDIRS) $(BYTE_ORDER) -DDEBUG 
+ 
+ ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
+ 
+--- freeswan-2.05/testing/utils/uml_netjig/Makefile~flags	2002-11-07 17:17:49.000000000 -0500
++++ freeswan-2.05/testing/utils/uml_netjig/Makefile	2004-02-25 18:49:22.000000000 -0500
+@@ -43,7 +43,8 @@
+ #PCAPH=-I/home/mcr/src/libpcap
+ #PCAPLIB=-L/home/mcr/src/linux/i386/libpcap -lpcap
+ 
+-CFLAGS = -g -Wall ${PCAPH} ${NETDISSECTH} ${OPTIONS}
++CFLAGS = -g -Wall
++override CFLAGS += ${PCAPH} ${NETDISSECTH} ${OPTIONS}
+ LIBS = ${NETDISSECTLIB} ${PCAPLIB} ${OPENSSL}
+ 
+ 
diff --git a/freeswan/freeswan-2.06/flags.patch b/freeswan/freeswan-2.06/flags.patch
index e69de29bb2..7ae325eaf9 100644
--- a/freeswan/freeswan-2.06/flags.patch
+++ b/freeswan/freeswan-2.06/flags.patch
@@ -0,0 +1,145 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- freeswan-2.06/lib/libdes/Makefile~flags
++++ freeswan-2.06/lib/libdes/Makefile
+@@ -58,9 +58,10 @@
+ #CC=gcc
+ #CFLAG= -O4 -funroll-loops -fomit-frame-pointer
+ # normally overridden by FreeS/WAN Makefiles anyway
+-CFLAG= -O3 -fomit-frame-pointer -I${KLIPSD}/include -I${SRCDIR}
++CFLAG= -O3 -fomit-frame-pointer
+ 
+-CFLAGS=$(OPTS) $(CFLAG)
++CFLAGS=$(CFLAG)
++override CFLAGS += $(OPTS) -I${KLIPSD}/include -I${SRCDIR}
+ CPP=$(CC) -E
+ 
+ # Assember version of des_encrypt*().
+--- freeswan-2.06/lib/libfreeswan/Makefile~flags
++++ freeswan-2.06/lib/libfreeswan/Makefile
+@@ -45,7 +45,7 @@
+ 
+ LIB=libfreeswan.a
+ # Original flags
+-CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
++CFLAGS=$(USERCOMPILE)
+ CFLAGS+= -Wall
+ #CFLAGS+= -Wconversion
+ #CFLAGS+= -Wmissing-prototypes
+@@ -57,6 +57,7 @@
+ #CFLAGS+= -W
+ #CFLAGS+= -Wwrite-strings
+ CFLAGS+= -Wbad-function-cast 
++override CFLAGS += -I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR}
+ 
+ 
+ 
+--- freeswan-2.06/lib/libipsecpolicy/Makefile~flags
++++ freeswan-2.06/lib/libipsecpolicy/Makefile
+@@ -30,12 +30,13 @@
+ 
+ LIB=libipsecpolicy.a
+ # Original flags
+-CFLAGS=-I. -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
++CFLAGS = $(USERCOMPILE)
+ CFLAGS+= -Wall
+ CFLAGS+= -Wpointer-arith
+ CFLAGS+= -Wcast-qual
+ CFLAGS+= -Wstrict-prototypes
+ CFLAGS+= -Wbad-function-cast 
++override CFLAGS += -I. -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
+ 
+ MANS=
+ 
+--- freeswan-2.06/lib/liblwres/Makefile~flags
++++ freeswan-2.06/lib/liblwres/Makefile
+@@ -24,7 +24,8 @@
+ CDEFINES = -g
+ CWARNINGS = -Werror
+ 
+-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
++CFLAGS=${CDEFINES} ${CWARNINGS}
++override CFLAGS+=${CINCLUDES}
+ 
+ VERSION="@(\#) freeswan-hacking-9.2.1-for-fs2"
+ LIBINTERFACE=2
+--- freeswan-2.06/programs/Makefile.program~flags
++++ freeswan-2.06/programs/Makefile.program
+@@ -1,7 +1,7 @@
+ 
+ include ${FREESWANSRCDIR}/Makefile.ver
+ 
+-CFLAGS+=$(USERCOMPILE) -I${KLIPSINC}
++override CFLAGS+=-I${KLIPSINC}
+ 
+ CFLAGS+= -Wall
+ #CFLAGS+= -Wconversion
+@@ -23,7 +23,7 @@
+ CFLAGS+= ${WERROR}
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+-LDFLAGS=-L$(LD_LIBRARY_PATH)
++LDFLAGS+=-L$(LD_LIBRARY_PATH)
+ endif
+ 
+ MANDIR8=$(MANTREE)/man8
+--- freeswan-2.06/programs/lwdnsq/Makefile~flags
++++ freeswan-2.06/programs/lwdnsq/Makefile
+@@ -26,9 +26,9 @@
+ LIBS:=${FREESWANLIB} ${LWRESLIB} 
+ LIBS+=${BIND9STATICLIBDIR}/libdns.a ${BIND9STATICLIBDIR}/libisc.a
+ LIBS+=${BIND9STATICLIBEXTRA}
+-CFLAGS+=-I${LWRESINCL}
++override CFLAGS+=-I${LWRESINCL}
+ ifneq (${BIND9INCDIR},/usr/local/include)
+-CFLAGS+=-I${BIND9INCDIR}
++override CFLAGS+=-I${BIND9INCDIR}
+ endif
+ #USERCOMPILE=-g
+ 
+--- freeswan-2.06/programs/pluto/Makefile~flags
++++ freeswan-2.06/programs/pluto/Makefile
+@@ -108,7 +108,7 @@
+ 	-DGCC_LINT \
+ 	# -DLEAK_DETECTIVE
+ 
+-CPPFLAGS = $(HDRDIRS) $(DEFINES) \
++override CPPFLAGS += $(HDRDIRS) $(DEFINES) \
+ 	-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
+ 	-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
+ 	-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
+@@ -121,7 +121,7 @@
+ LIBSPLUTO+= -lgmp -lresolv # -lefence
+ 
+ ifneq ($(LD_LIBRARY_PATH),)
+-LDFLAGS=-L$(LD_LIBRARY_PATH)
++LDFLAGS+=-L$(LD_LIBRARY_PATH)
+ endif
+ 
+ LIBSADNS = $(FREESWANLIB)
+--- freeswan-2.06/testing/utils/ikeping/Makefile~flags
++++ freeswan-2.06/testing/utils/ikeping/Makefile
+@@ -35,7 +35,7 @@
+ 
+ HDRDIRS =  $(FREESWANINCLS)
+ 
+-CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) -DDEBUG 
++override CPPFLAGS += $(HDRDIRS) $(BYTE_ORDER) -DDEBUG 
+ 
+ ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
+ 
+--- freeswan-2.06/testing/utils/uml_netjig/Makefile~flags
++++ freeswan-2.06/testing/utils/uml_netjig/Makefile
+@@ -43,7 +43,8 @@
+ #PCAPH=-I/home/mcr/src/libpcap
+ #PCAPLIB=-L/home/mcr/src/linux/i386/libpcap -lpcap
+ 
+-CFLAGS = -g -Wall ${PCAPH} ${NETDISSECTH} ${OPTIONS}
++CFLAGS = -g -Wall
++override CFLAGS += ${PCAPH} ${NETDISSECTH} ${OPTIONS}
+ LIBS = ${NETDISSECTLIB} ${PCAPLIB} ${OPENSSL}
+ 
+