]> git.pld-linux.org Git - packages/freeswan.git/blame - freeswan-Makefiles.patch
projects / packages / freeswan.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- version 1.4
[packages/freeswan.git] / freeswan-Makefiles.patch
CommitLineData
7cfbbab1
JK		 1diff -durN freeswan-1.3.orig/Makefile freeswan-1.3/Makefile
2--- freeswan-1.3.orig/Makefile Tue Feb 8 22:22:28 2000
3+++ freeswan-1.3/Makefile Tue Apr 25 11:44:45 2000
4@@ -16,21 +16,17 @@
5 # public and private command directories
6 # Beware, many things define PATH settings which are assumed to include
7 # PUBDIR (or at least, to include *some* copy of the "ipsec" command).
8-PUBDIR=/usr/local/sbin
9+PUBDIR=/usr/sbin
10 # PRIVDIR is where things get put, FINALPRIVDIR is where they think they
11 # will be put (currently only used by utils/ipsec)
12-PRIVDIR=/usr/local/lib/ipsec
13-FINALPRIVDIR=/usr/local/lib/ipsec
14+PRIVDIR=/usr/lib/ipsec
15+FINALPRIVDIR=/usr/lib/ipsec
16 # where manpages go
17-MANTREE=/usr/local/man
18+MANTREE=/usr/share/man
19 # all relevant manpage subdirectories
20 MANPLACES=man3 man5 man8
21 # where boot/shutdown scripts go (first one that exists gets it)
22-RCDIRS=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d
23-RCDIR=$(shell for d in $(RCDIRS) ; \
24- do if test -d $$d ; \
25- then echo $$d ; exit 0 ; \
26- fi ; done ; echo /unknown )
27+RCDIR=/etc/rc.d/init.d
28
29 # kernel location, and location of kernel patches in the distribution
30 KERNELSRC=/usr/src/linux
31@@ -205,8 +201,8 @@
32 SETTINGS=BINDIR=$(PRIVDIR) PUBDIR=$(PUBDIR) PRIVDIR=$(PRIVDIR) \
33 FINALPRIVDIR=$(FINALPRIVDIR) MANTREE=$(MANTREE) INSTALL="$(INSTALL)"
34 install:
35- mkdir -p $(PRIVDIR) $(PUBDIR)
36- for m in $(MANPLACES) ; do mkdir -p $(MANTREE)/$$m ; done
37+ mkdir -p $(DESTDIR)$(PRIVDIR) $(DESTDIR)$(PUBDIR)
38+ for m in $(MANPLACES) ; do mkdir -p $(DESTDIR)$(MANTREE)/$$m ; done
39 cd lib ; $(MAKE) install $(SETTINGS)
40 cd klips/utils ; $(MAKE) install $(SETTINGS)
41 cd pluto ; $(MAKE) install $(SETTINGS)
42diff -durN freeswan-1.3.orig/klips/utils/Makefile freeswan-1.3/klips/utils/Makefile
43--- freeswan-1.3.orig/klips/utils/Makefile Tue Feb 8 22:22:06 2000
44+++ freeswan-1.3/klips/utils/Makefile Tue Apr 25 11:44:45 2000
45@@ -14,7 +14,7 @@
46 # RCSID $Id$
47
48 CC=gcc
49-CFLAGS=-O2 -I../net/ipsec -I../../lib -g
50+CFLAGS=$(OPT_FLAGS) -I../net/ipsec -I../../lib
51
52 CFLAGS+= -Wall
53 #CFLAGS+= -Wconversion
54@@ -30,8 +30,8 @@
55 CFLAGS+= -Wbad-function-cast
56
57 ALL=spi eroute spigrp tncfg klipsdebug
58-BINDIR=/usr/local/lib/ipsec
59-MANTREE=/usr/local/man
60+BINDIR=/usr/lib/ipsec
61+MANTREE=/usr/share/man
62 MANDIR=$(MANTREE)/man8
63 FREESWANLIB=../../lib/libfreeswan.a
64 INSTALL=install
65@@ -39,9 +39,9 @@
66 all: $(ALL)
67
68 install: $(ALL)
69- $(INSTALL) $(ALL) $(BINDIR)
70+ $(INSTALL) $(ALL) $(DESTDIR)$(BINDIR)
71 for f in $(addsuffix .8, $(ALL)) ; do \
72- $(INSTALL) $$f $(MANDIR)/ipsec_$$f || exit 1 ; done
73+ $(INSTALL) $$f $(DESTDIR)$(MANDIR)/ipsec_$$f || exit 1 ; done
74
75 spi: spi.o
76 $(CC) $(DFLAGS) -o $@ $? $(FREESWANLIB)
77diff -durN freeswan-1.3.orig/lib/Makefile freeswan-1.3/lib/Makefile
78--- freeswan-1.3.orig/lib/Makefile Tue Feb 8 22:22:09 2000
79+++ freeswan-1.3/lib/Makefile Tue Apr 25 11:44:45 2000
80@@ -19,9 +19,9 @@
81 HDRS=freeswan.h internal.h
82 LIB=libfreeswan.a
83 # Original flags
84-CFLAGS=-O3 -I.
85+CFLAGS=$(OPT_FLAGS) -I.
86 # Add debugging symbols
87-CFLAGS+= -g
88+#CFLAGS+= -g
89 CFLAGS+= -Wall
90 #CFLAGS+= -Wconversion
91 #CFLAGS+= -Wmissing-prototypes
92@@ -36,9 +36,9 @@
93 CFLAGS+= -Wbad-function-cast
94
95 ARFLAGS=crvs
96-EXTHDRS=des.h gmp.h
97-EXTLIBS=libdes.a libgmp.a
98-MANTREE=/usr/local/man
99+EXTHDRS=des.h
100+EXTLIBS=libdes.a
101+MANTREE=/usr/share/man
102 MANDIR=$(MANTREE)/man3
103 MANS=atoaddr.3 atoasr.3 atodata.3 atosa.3 atoul.3 goodmask.3 optionsfrom.3 \
104 subnetof.3
105@@ -50,11 +50,11 @@
106 all: $(EXTHDRS) $(LIB) $(EXTLIBS)
107
108 install:
109- mkdir -p $(MANDIR)
110+ mkdir -p $(DESTDIR)$(MANDIR)
111 for f in $(MANS) ; \
112 do \
113- $(INSTALL) $$f $(MANDIR)/ipsec_$$f || exit 1 ; \
114- ../utils/manlink $(MANDIR) ipsec_$$f ; \
115+ $(INSTALL) $$f $(DESTDIR)$(MANDIR)/ipsec_$$f || exit 1 ; \
116+ ../utils/manlink $(DESTDIR)$(MANDIR) ipsec_$$f ; \
117 done
118
119 $(LIB): $(OBJS)
120diff -durN freeswan-1.3.orig/libdes/Makefile freeswan-1.3/libdes/Makefile
121--- freeswan-1.3.orig/libdes/Makefile Thu Nov 25 18:04:25 1999
122+++ freeswan-1.3/libdes/Makefile Tue Apr 25 11:44:45 2000
123@@ -46,7 +46,7 @@
124
125 CC=gcc
126 #CFLAG= -O4 -funroll-loops -fomit-frame-pointer
127-CFLAG= -O3 -fomit-frame-pointer
128+CFLAG= $(OPT_FLAGS) -fomit-frame-pointer
129
130 CFLAGS=$(OPTS) $(CFLAG)
131 CPP=$(CC) -E
132@@ -59,10 +59,10 @@
133 #DES_ENC=asm/dx86-sol.o asm/yx86-sol.o # solaris format x86
134 #DES_ENC=asm/dx86bsdi.o asm/yx86basi.o # bsdi format x86
135
136-LIBDIR=/usr/local/lib
137-BINDIR=/usr/local/bin
138-INCDIR=/usr/local/include
139-MANDIR=/usr/local/man
140+LIBDIR=/usr/lib
141+BINDIR=/usr/bin
142+INCDIR=/usr/include
143+MANDIR=/usr/man
144 MAN1=1
145 MAN3=3
146 SHELL=/bin/sh
147@@ -231,20 +231,16 @@
148 chmod 644 $(INSTALLTOP)/include/des.h; \
149 else \
150 echo Standalone install; \
151- cp $(DLIB) $(LIBDIR)/$(DLIB); \
152+ cp $(DLIB) $(DESTDIR)$(LIBDIR)/$(DLIB); \
153 if test -s /bin/ranlib; then \
154- /bin/ranlib $(LIBDIR)/$(DLIB); \
155+ /bin/ranlib $(DESTDIR)$(LIBDIR)/$(DLIB); \
156 else \
157 if test -s /usr/bin/ranlib; then \
158- /usr/bin/ranlib $(LIBDIR)/$(DLIB); \
159+ /usr/bin/ranlib $(DESTDIR)$(LIBDIR)/$(DLIB); \
160 fi; \
161 fi; \
162- chmod 644 $(LIBDIR)/$(DLIB); \
163- cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
164- chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
165- cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \
166- chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \
167- cp des.h $(INCDIR)/des.h; \
168- chmod 644 $(INCDIR)/des.h; \
169+ cp des_crypt.man $(DESTDIR)$(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
170+ cp des.man $(DESTDIR)$(MANDIR)/man$(MAN1)/des.$(MAN1); \
171+ cp des.h $(DESTDIR)$(INCDIR)/des.h; \
172 fi
173 # DO NOT DELETE THIS LINE -- make depend depends on it.
174diff -durN freeswan-1.3.orig/pluto/Makefile freeswan-1.3/pluto/Makefile
175--- freeswan-1.3.orig/pluto/Makefile Fri Dec 17 03:42:19 1999
176+++ freeswan-1.3/pluto/Makefile Tue Apr 25 11:45:57 2000
177@@ -19,10 +19,10 @@
178 CC = gcc
179
180 # directory in which to install programs
181-BINDIR=/usr/local/lib/ipsec
182+BINDIR=/usr/lib/ipsec
183
184 # directory in which to install man pages
185-MANTREE=/usr/local/man
186+MANTREE=/usr/share/man
187 FMANDIR=$(MANTREE)/man5
188 PMANDIR=$(MANTREE)/man8
189
190@@ -37,7 +37,7 @@
191 INSTALL=install
192
193 # -O on Linux makes gcc coredump when compiling sha1.c
194-CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
195+CFLAGS = $(OPT_FLAGS) -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
196 -Wcast-qual -Wmissing-declarations -Wwrite-strings -Wstrict-prototypes
197
198 # where to find klips headers and FreeS/WAN headers
199@@ -74,7 +74,7 @@
200
201 CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \
202 -DPLUTO -DKLIPS -DROAD_WARRIOR_FUDGE -DDODGE_DH_MISSING_ZERO_BUG \
203- -DDEBUG -DGCC_LINT
204+ -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/freeswan/ipsec.secrets"'
205
206 ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
207
208@@ -142,21 +142,21 @@
209 OBJSPLUTO = connections.o constants.o cookie.o crypto.o defs.o log.o \
210 state.o main.o server.o timer.o id.o ipsec_doi.o kernel.o \
211 kernel_comm.o demux.o packet.o preshared.o rnd.o spdb.o \
212- sha1.o md5.o $(OBJSGCRYPT) $(LIBDESLITE) $(LIBGMP) $(FREESWANLIB)
213+ sha1.o md5.o $(OBJSGCRYPT) $(LIBDESLITE) $(FREESWANLIB)
214
215 OBJSWHACK = whack.o $(FREESWANLIB)
216
217 all: $(BINNAMEPLUTO) $(BINNAMEWHACK)
218
219 install: all
220- $(INSTALL) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(BINDIR)
221- $(INSTALL) pluto.8 $(PMANDIR)/ipsec_pluto.8
222- ../utils/manlink $(PMANDIR) ipsec_pluto.8
223- $(INSTALL) ipsec.secrets.5 $(FMANDIR)
224- ../utils/manlink $(FMANDIR) ipsec.secrets.5
225+ $(INSTALL) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(DESTDIR)$(BINDIR)
226+ $(INSTALL) pluto.8 $(DESTDIR)$(PMANDIR)/ipsec_pluto.8
227+ ../utils/manlink $(DESTDIR)$(PMANDIR) ipsec_pluto.8
228+ $(INSTALL) ipsec.secrets.5 $(DESTDIR)$(FMANDIR)
229+ ../utils/manlink $(DESTDIR)$(FMANDIR) ipsec.secrets.5
230
231 $(BINNAMEPLUTO): $(OBJSPLUTO)
232- $(CC) -o $(BINNAMEPLUTO) $(LDFLAGS) $(OBJSPLUTO) $(LIBSPLUTO)
233+ $(CC) -o $(BINNAMEPLUTO) $(LDFLAGS) $(OBJSPLUTO) $(LIBSPLUTO) -lgmp
234
235 $(BINNAMEWHACK): $(OBJSWHACK)
236 $(CC) -o $(BINNAMEWHACK) $(OBJSWHACK) $(LIBSWHACK)
237diff -durN freeswan-1.3.orig/utils/Makefile freeswan-1.3/utils/Makefile
238--- freeswan-1.3.orig/utils/Makefile Tue Feb 8 22:22:30 2000
239+++ freeswan-1.3/utils/Makefile Tue Apr 25 11:44:45 2000
240@@ -14,12 +14,12 @@
241 # RCSID $Id$
242
243 # pathnames, subject to overrides from main Makefile
244-PUBDIR=/usr/local/sbin
245-PRIVDIR=/usr/local/lib/ipsec
246-FINALPRIVDIR=/usr/local/lib/ipsec
247+PUBDIR=/usr/sbin
248+PRIVDIR=/usr/lib/ipsec
249+FINALPRIVDIR=/usr/lib/ipsec
250 RCDIR=/etc/rc.d/init.d
251-CONFDIR=/etc
252-MANTREE=/usr/local/man
253+CONFDIR=/etc/freeswan
254+MANTREE=/usr/share/man
255
256 FMANDIR=$(MANTREE)/man5
257 CMANDIR=$(MANTREE)/man8
258@@ -50,7 +50,7 @@
259 $(CC) $(CFLAGS) ranbits.o $(LIB) -o $@
260
261 rsasigkey: rsasigkey.o
262- $(CC) $(CFLAGS) rsasigkey.o $(LIB) ../lib/libgmp.a -o $@
263+ $(CC) $(CFLAGS) rsasigkey.o $(LIB) -lgmp -o $@
264
265 man_xref: man_xref.o
266 $(CC) $(CFLAGS) man_xref.o $(LIB) -o $@
267@@ -80,38 +80,24 @@
268 ./randomize conf.proto | egrep -v RCSI >$@
269
270 install: $(PUBS) $(PRIVS) $(MANS) $(GENDFILES)
271- mkdir -p $(PUBDIR) $(PRIVDIR) $(FMANDIR) $(CMANDIR)
272- $(INSTALL) $(PUBS) $(PUBDIR)
273- $(INSTALL) $(PRIVS) $(PRIVDIR)
274- $(INSTALL) $(PUB) ipsec.conf.5 $(FMANDIR)
275- $(INSTALL) $(PUB) $(PLAIN_MANS) $(CMANDIR)
276+ mkdir -p $(DESTDIR)$(PUBDIR) $(DESTDIR)$(PRIVDIR) $(DESTDIR)$(FMANDIR) $(DESTDIR)$(CMANDIR)
277+ $(INSTALL) $(PUBS) $(DESTDIR)$(PUBDIR)
278+ $(INSTALL) $(PRIVS) $(DESTDIR)$(PRIVDIR)
279+ $(INSTALL) $(PUB) ipsec.conf.5 $(DESTDIR)$(FMANDIR)
280+ $(INSTALL) $(PUB) $(PLAIN_MANS) $(DESTDIR)$(CMANDIR)
281 for f in $(IPSEC_CMANS) ; \
282 do \
283- $(INSTALL) $(PUB) $$f $(CMANDIR)/ipsec_$$f || exit 1 ; \
284- ./manlink $(CMANDIR) ipsec_$$f ; \
285+ $(INSTALL) $(PUB) $$f $(DESTDIR)$(CMANDIR)/ipsec_$$f || exit 1 ; \
286+ ./manlink $(DESTDIR)$(CMANDIR) ipsec_$$f ; \
287 done
288- test -f $(CONFDIR)/ipsec.secrets || \
289- $(INSTALL) $(PRIV) secrets.eg $(CONFDIR)/ipsec.secrets
290- test -f $(CONFDIR)/ipsec.conf || \
291- $(INSTALL) $(PUB) conf.eg $(CONFDIR)/ipsec.conf
292+ test -f $(DESTDIR)$(CONFDIR)/ipsec.secrets || \
293+ $(INSTALL) $(PRIV) secrets.eg $(DESTDIR)$(CONFDIR)/ipsec.secrets
294+ test -f $(DESTDIR)$(CONFDIR)/ipsec.conf || \
295+ $(INSTALL) $(PUB) conf.eg $(DESTDIR)$(CONFDIR)/ipsec.conf
296 # main copy must go in RCDIR, PRIVDIR may not be mounted at boot time
297- $(INSTALL) setup $(RCDIR)/ipsec
298- rm -f $(PRIVDIR)/setup
299- ln -s $(RCDIR)/ipsec $(PRIVDIR)/setup
300- if which chkconfig >/dev/null 2>&1 ; \
301- then chkconfig --add ipsec ; \
302- else $(MAKE) setup4 ; \
303- fi
304-
305-setup4: $(RCDIR)/ipsec
306- # fallback rc install -- on in run states 2345, off in 016
307- -cd $(RCDIR)/../rc0.d ; ln -s ../init.d/ipsec K35ipsec
308- -cd $(RCDIR)/../rc1.d ; ln -s ../init.d/ipsec K35ipsec
309- -cd $(RCDIR)/../rc2.d ; ln -s ../init.d/ipsec S35ipsec
310- -cd $(RCDIR)/../rc3.d ; ln -s ../init.d/ipsec S35ipsec
311- -cd $(RCDIR)/../rc4.d ; ln -s ../init.d/ipsec S35ipsec
312- -cd $(RCDIR)/../rc5.d ; ln -s ../init.d/ipsec S35ipsec
313- -cd $(RCDIR)/../rc6.d ; ln -s ../init.d/ipsec K35ipsec
314+ $(INSTALL) setup $(DESTDIR)$(RCDIR)/ipsec
315+ rm -f $(DESTDIR)$(PRIVDIR)/setup
316+ ln -s $(RCDIR)/ipsec $(DESTDIR)$(PRIVDIR)/setup
317
318 clean:
319 rm -f *.o $(BINS) $(GENDFILES) $(LOCALS)
Free IPSEC implemetation
This page took 0.123389 seconds and 4 git commands to generate.