1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- openswan-2.1.2/lib/libdes/Makefile~flags.patch
+++ openswan-2.1.2/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)
+override CFLAGS+=-I${KLIPSD}/include -I${SRCDIR}
CPP=$(CC) -E
# Assember version of des_encrypt*().
--- openswan-2.1.2/lib/libfreeswan/Makefile~flags.patch
+++ openswan-2.1.2/lib/libfreeswan/Makefile
@@ -45,7 +45,8 @@
LIB=libfreeswan.a
# Original flags
-CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
+override CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${FREESWANSRCDIR}
+CFLAGS+= $(USERCOMPILE)
CFLAGS+= -Wall
#CFLAGS+= -Wconversion
#CFLAGS+= -Wmissing-prototypes
@@ -59,7 +60,7 @@
CFLAGS+= -Wbad-function-cast
ifeq ($(USE_NAT_TRAVERSAL),true)
-CFLAGS+= -DNAT_TRAVERSAL
+override CFLAGS+= -DNAT_TRAVERSAL
endif
--- openswan-2.1.2/lib/libipsecpolicy/Makefile~flags.patch
+++ openswan-2.1.2/lib/libipsecpolicy/Makefile
@@ -30,7 +30,8 @@
LIB=libipsecpolicy.a
# Original flags
-CFLAGS=-I. -I${KLIPSD} -I${FREESWANSRCDIR} $(USERCOMPILE)
+override CFLAGS+= -I. -I${KLIPSD} -I${FREESWANSRCDIR}
+CFLAGS+= $(USERCOMPILE)
CFLAGS+= -Wall
CFLAGS+= -Wpointer-arith
CFLAGS+= -Wcast-qual
--- openswan-2.1.2/lib/liblwres/Makefile~flags.patch
+++ openswan-2.1.2/lib/liblwres/Makefile
@@ -24,7 +24,8 @@
CDEFINES = -g
CWARNINGS = -Werror
-CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS}
+override CFLAGS=${CINCLUDES}
+CFLAGS+=${CDEFINES} ${CWARNINGS}
VERSION="@(\#) freeswan-hacking-9.2.1-for-fs2"
LIBINTERFACE=2
--- openswan-2.1.2/lib/libopenswan/Makefile~flags.patch
+++ openswan-2.1.2/lib/libopenswan/Makefile
@@ -46,7 +46,8 @@
LIB=libopenswan.a
# Original flags
-CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${OPENSWANSRCDIR} $(USERCOMPILE)
+override CFLAGS=-I. -I${SRCDIR} -I${KLIPSD} -I${OPENSWANSRCDIR}
+CFLAGS+= $(USERCOMPILE)
CFLAGS+= -Wall
#CFLAGS+= -Wconversion
#CFLAGS+= -Wmissing-prototypes
@@ -60,7 +61,7 @@
CFLAGS+= -Wbad-function-cast
ifeq ($(USE_NAT_TRAVERSAL),true)
-CFLAGS+= -DNAT_TRAVERSAL
+override CFLAGS+= -DNAT_TRAVERSAL
endif
--- openswan-2.1.2/programs/Makefile.program~flags.patch
+++ openswan-2.1.2/programs/Makefile.program
@@ -1,7 +1,7 @@
include ${FREESWANSRCDIR}/Makefile.ver
-CFLAGS+=$(USERCOMPILE) -I${KLIPSINC}
+override CFLAGS+=-I${KLIPSINC}
CFLAGS+= $(USERCOMPILE)
CFLAGS+= -Wall
@@ -15,10 +15,9 @@
#CFLAGS+= -W
#CFLAGS+= -Wwrite-strings
CFLAGS+= -Wbad-function-cast
-CFLAGS+= -DNAT_TRAVERSAL
ifeq ($(USE_NAT_TRAVERSAL),true)
-CFLAGS+= -DNAT_TRAVERSAL
+override CFLAGS+= -DNAT_TRAVERSAL
endif
# die if there are any warnings
--- openswan-2.1.2/programs/lwdnsq/Makefile~flags.patch
+++ openswan-2.1.2/programs/lwdnsq/Makefile
@@ -29,7 +29,7 @@
CFLAGS+=-I${BIND9INCDIR}
endif
-CFLAGS+=-I${LWRESINCL}
+override CFLAGS+=-I${LWRESINCL}
#USERCOMPILE=-g
--- openswan-2.1.2/programs/pluto/Makefile~flags.patch
+++ openswan-2.1.2/programs/pluto/Makefile
@@ -203,7 +203,7 @@
DEFINES+= -DSMARTCARD
endif
-CPPFLAGS = $(HDRDIRS) $(DEFINES) \
+override CPPFLAGS = $(HDRDIRS) $(DEFINES) \
-DSHARED_SECRETS_FILE=\"${FINALCONFDIR}/ipsec.secrets\" \
-DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \
-DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\"
--- openswan-2.1.2/testing/utils/ikeping/Makefile~flags.patch
+++ openswan-2.1.2/testing/utils/ikeping/Makefile
@@ -35,7 +35,7 @@
HDRDIRS = $(FREESWANINCLS)
-CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) -DDEBUG
+override CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) -DDEBUG
ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
--- openswan-2.1.2/testing/utils/uml_netjig/Makefile~flags.patch
+++ openswan-2.1.2/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 ${PCAPH} ${NETDISSECTH}
+override CFLAGS += ${OPTIONS}
LIBS = ${NETDISSECTLIB} ${PCAPLIB} ${OPENSSL}
|
