[packages/freeswan.git] / freeswan-Makefiles.patch

diff -ruN freeswan-1.8.orig/Makefile freeswan-1.8/Makefile
--- freeswan-1.8.orig/Makefile	Thu Nov 30 05:25:05 2000
+++ freeswan-1.8/Makefile	Tue Dec 12 19:00:31 2000
@@ -17,24 +17,20 @@
 # PUBDIR is where the "ipsec" command goes; beware, many things define PATH
 # settings which are assumed to include it (or at least, to include *some*
 # copy of the "ipsec" command).
-PUBDIR=$(DESTDIR)/usr/local/sbin
+PUBDIR=$(DESTDIR)/usr/sbin
 # PRIVDIR is where commands get put, REALPRIVDIR is where they think they
 # will be run from in the end (currently only used by utils/ipsec)
-REALPRIVDIR=/usr/local/lib/ipsec
+REALPRIVDIR=/usr/lib/ipsec
 PRIVDIR=$(DESTDIR)$(REALPRIVDIR)
 # where manpages go
-MANTREE=$(DESTDIR)/usr/local/man
+MANTREE=$(DESTDIR)/usr/share/man
 # all relevant manpage subdirectories
 MANPLACES=man3 man5 man8
 # where configuration files go
-CONFDIR=$(DESTDIR)/etc
+CONFDIR=$(DESTDIR)/etc/freeswan
 # RCDIR is where boot/shutdown scripts go (first RCDIRS that exists gets it);
 # REALRCDIR is where they think they will ultimately be (for utils/Makefile)
-RCDIRS=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d
-REALRCDIR=$(shell for d in $(RCDIRS) ; \
-		do if test -d $$d ; \
-		then echo $$d ; exit 0 ; \
-		fi ; done ; echo /etc/rc.d/init.d )
+REALRCDIR=/etc/rc.d/init.d
 RCDIR=$(DESTDIR)$(REALRCDIR)
 
 # kernel location, and location of kernel patches in the distribution
diff -ruN freeswan-1.8.orig/klips/utils/Makefile freeswan-1.8/klips/utils/Makefile
--- freeswan-1.8.orig/klips/utils/Makefile	Fri Jun 30 08:20:25 2000
+++ freeswan-1.8/klips/utils/Makefile	Tue Dec 12 19:01:34 2000
@@ -14,7 +14,7 @@
 # RCSID $Id$
 
 CC=gcc
-CFLAGS=-O2 -I../net/ipsec -I../../lib -g
+CFLAGS=$(OPT_FLAGS) -I../net/ipsec -I../../lib -g
 
 CFLAGS+= -Wall
 #CFLAGS+= -Wconversion
@@ -30,8 +30,8 @@
 CFLAGS+= -Wbad-function-cast 
 
 ALL=spi eroute spigrp tncfg klipsdebug
-BINDIR=/usr/local/lib/ipsec
-MANTREE=/usr/local/man
+BINDIR=/usr/lib/ipsec
+MANTREE=/usr/share/man
 MANDIR8=$(MANTREE)/man8
 MANDIR5=$(MANTREE)/man5
 FREESWANLIB=../../lib/libfreeswan.a
diff -ruN freeswan-1.8.orig/lib/Makefile freeswan-1.8/lib/Makefile
--- freeswan-1.8.orig/lib/Makefile	Thu Oct 26 01:58:57 2000
+++ freeswan-1.8/lib/Makefile	Tue Dec 12 19:03:01 2000
@@ -25,7 +25,7 @@
 HDRS=freeswan.h internal.h
 LIB=libfreeswan.a
 # Original flags
-CFLAGS=-O3 -I.
+CFLAGS=$(OPT_FLAGS) -I.
 # Add debugging symbols
 CFLAGS+= -g
 CFLAGS+= -Wall
@@ -44,7 +44,7 @@
 ARFLAGS=crvs
 EXTHDRS=des.h
 EXTLIBS=libdes.a
-MANTREE=/usr/local/man
+MANTREE=/usr/share/man
 MANDIR=$(MANTREE)/man3
 MANS=anyaddr.3 atoaddr.3 atoasr.3 atosa.3 atoul.3 goodmask.3 \
 	initaddr.3 initsubnet.3 optionsfrom.3 portof.3 rangetosubnet.3 \
@@ -57,11 +57,11 @@
 all:	$(EXTHDRS) $(LIB) $(EXTLIBS)
 
 install:
-	mkdir -p $(MANDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)
 	for f in $(MANS) ; \
 	do \
-		$(INSTALL) $$f $(MANDIR)/ipsec_$$f || exit 1 ; \
-		../utils/manlink $(MANDIR) ipsec_$$f ; \
+		$(INSTALL) $$f $(DESTDIR)$(MANDIR)/ipsec_$$f || exit 1 ; \
+		../utils/manlink $(DESTDIR)$(MANDIR) ipsec_$$f ; \
 	done
 
 $(LIB):	$(OBJS)
diff -ruN freeswan-1.8.orig/libdes/Makefile freeswan-1.8/libdes/Makefile
--- freeswan-1.8.orig/libdes/Makefile	Wed Oct 11 04:12:45 2000
+++ freeswan-1.8/libdes/Makefile	Tue Dec 12 19:06:18 2000
@@ -46,9 +46,9 @@
 
 #CC=gcc
 #CFLAG= -O4 -funroll-loops -fomit-frame-pointer
-CFLAG= -O3 -fomit-frame-pointer
+CFLAG=-fomit-frame-pointer
 
-CFLAGS=$(OPTS) $(CFLAG)
+CFLAGS=$(OPT_FLAGS) $(CFLAG)
 CPP=$(CC) -E
 AS=as
 
@@ -59,10 +59,10 @@
 #DES_ENC=asm/dx86-sol.o	asm/yx86-sol.o	# solaris format x86 
 #DES_ENC=asm/dx86bsdi.o	asm/yx86basi.o	# bsdi format x86 
 
-LIBDIR=/usr/local/lib
-BINDIR=/usr/local/bin
-INCDIR=/usr/local/include
-MANDIR=/usr/local/man
+LIBDIR=/usr/lib
+BINDIR=/usr/bin
+INCDIR=/usr/include
+MANDIR=/usr/share/man
 MAN1=1
 MAN3=3
 SHELL=/bin/sh
@@ -231,20 +231,16 @@
 	    chmod 644 $(INSTALLTOP)/include/des.h; \
 	else \
 	    echo Standalone install; \
-	    cp $(DLIB) $(LIBDIR)/$(DLIB); \
+	    cp $(DLIB) $(DESTDIR)$(LIBDIR)/$(DLIB); \
 	    if test -s /bin/ranlib; then \
-	      /bin/ranlib $(LIBDIR)/$(DLIB); \
+	      /bin/ranlib $(DESTDIR)$(LIBDIR)/$(DLIB); \
 	    else \
 	      if test -s /usr/bin/ranlib; then \
 		/usr/bin/ranlib $(LIBDIR)/$(DLIB); \
 	      fi; \
 	    fi; \
-	    chmod 644 $(LIBDIR)/$(DLIB); \
-	    cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
-	    chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
-	    cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \
-	    chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \
-	    cp des.h $(INCDIR)/des.h; \
-	    chmod 644 $(INCDIR)/des.h; \
+	    cp des_crypt.man $(DESTDIR)$(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
+	    cp des.man $(DESTDIR)$(MANDIR)/man$(MAN1)/des.$(MAN1); \
+	    cp des.h $(DESTDIR)$(INCDIR)/des.h; \
 	fi
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff -ruN freeswan-1.8.orig/pluto/Makefile freeswan-1.8/pluto/Makefile
--- freeswan-1.8.orig/pluto/Makefile	Thu Oct 26 01:58:15 2000
+++ freeswan-1.8/pluto/Makefile	Tue Dec 12 19:09:07 2000
@@ -19,10 +19,10 @@
 CC = gcc
 
 # directory in which to install programs
-BINDIR=/usr/local/lib/ipsec
+BINDIR=/usr/lib/ipsec
 
 # directory in which to install man pages
-MANTREE=/usr/local/man
+MANTREE=/usr/share/man
 FMANDIR=$(MANTREE)/man5
 PMANDIR=$(MANTREE)/man8
 
@@ -37,7 +37,7 @@
 
 # -O on Linux makes gcc coredump when compiling sha1.c
 # -Wundef is nice but RHL5.2 compiler doesn't support it
-CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
+CFLAGS = $(OPT_FLAGS) -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
 	-Wcast-qual -Wmissing-declarations -Wwrite-strings -Wstrict-prototypes
 
 # where to find klips headers and FreeS/WAN headers
@@ -76,7 +76,7 @@
 
 CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \
 	-DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG \
-	-DDEBUG -DGCC_LINT
+	-DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/freeswan/ipsec.secrets"'
 
 ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
 
diff -ruN freeswan-1.8.orig/utils/Makefile freeswan-1.8/utils/Makefile
--- freeswan-1.8.orig/utils/Makefile	Thu Oct 26 01:57:22 2000
+++ freeswan-1.8/utils/Makefile	Tue Dec 12 19:10:13 2000
@@ -14,13 +14,13 @@
 # RCSID $Id$
 
 # pathnames, subject to overrides from main Makefile
-PUBDIR=/usr/local/sbin
-PRIVDIR=/usr/local/lib/ipsec
-REALPRIVDIR=/usr/local/lib/ipsec
+PUBDIR=/usr/sbin
+PRIVDIR=/usr/lib/ipsec
+REALPRIVDIR=/usr/lib/ipsec
 RCDIR=/etc/rc.d/init.d
 REALRCDIR=/etc/rc.d/init.d
-CONFDIR=/etc
-MANTREE=/usr/local/man
+CONFDIR=/etc/freeswan
+MANTREE=/usr/share/man
 
 FMANDIR=$(MANTREE)/man5
 CMANDIR=$(MANTREE)/man8
Commit	Line	Data
0e5fb54e	1	diff -ruN freeswan-1.8.orig/Makefile freeswan-1.8/Makefile
	2	--- freeswan-1.8.orig/Makefile Thu Nov 30 05:25:05 2000
	3	+++ freeswan-1.8/Makefile Tue Dec 12 19:00:31 2000
0955d6b3 JK	4	@@ -17,24 +17,20 @@
	5	# PUBDIR is where the "ipsec" command goes; beware, many things define PATH
	6	# settings which are assumed to include it (or at least, to include some
	7	# copy of the "ipsec" command).
	8	-PUBDIR=$(DESTDIR)/usr/local/sbin
	9	+PUBDIR=$(DESTDIR)/usr/sbin
	10	# PRIVDIR is where commands get put, REALPRIVDIR is where they think they
	11	# will be run from in the end (currently only used by utils/ipsec)
	12	-REALPRIVDIR=/usr/local/lib/ipsec
	13	+REALPRIVDIR=/usr/lib/ipsec
	14	PRIVDIR=$(DESTDIR)$(REALPRIVDIR)
7cfbbab1	15	# where manpages go
0955d6b3 JK	16	-MANTREE=$(DESTDIR)/usr/local/man
0955d6b3 JK	17	+MANTREE=$(DESTDIR)/usr/share/man
7cfbbab1 JK	18	# all relevant manpage subdirectories
7cfbbab1 JK	19	MANPLACES=man3 man5 man8
0955d6b3 JK	20	# where configuration files go
	21	-CONFDIR=$(DESTDIR)/etc
	22	+CONFDIR=$(DESTDIR)/etc/freeswan
194992cc JK	23	# RCDIR is where boot/shutdown scripts go (first RCDIRS that exists gets it);
194992cc JK	24	# REALRCDIR is where they think they will ultimately be (for utils/Makefile)
7cfbbab1	25	-RCDIRS=/etc/rc.d/init.d /etc/rc.d /etc/init.d /sbin/init.d
0955d6b3	26	-REALRCDIR=$(shell for d in $(RCDIRS) ; \
7cfbbab1 JK	27	- do if test -d $$d ; \
7cfbbab1 JK	28	- then echo $$d ; exit 0 ; \
0955d6b3 JK	29	- fi ; done ; echo /etc/rc.d/init.d )
	30	+REALRCDIR=/etc/rc.d/init.d
	31	RCDIR=$(DESTDIR)$(REALRCDIR)
7cfbbab1 JK	32
7cfbbab1 JK	33	# kernel location, and location of kernel patches in the distribution
0e5fb54e	34	diff -ruN freeswan-1.8.orig/klips/utils/Makefile freeswan-1.8/klips/utils/Makefile
	35	--- freeswan-1.8.orig/klips/utils/Makefile Fri Jun 30 08:20:25 2000
	36	+++ freeswan-1.8/klips/utils/Makefile Tue Dec 12 19:01:34 2000
7cfbbab1 JK	37	@@ -14,7 +14,7 @@
	38	# RCSID $Id$
	39
	40	CC=gcc
	41	-CFLAGS=-O2 -I../net/ipsec -I../../lib -g
0e5fb54e	42	+CFLAGS=$(OPT_FLAGS) -I../net/ipsec -I../../lib -g
7cfbbab1 JK	43
	44	CFLAGS+= -Wall
	45	#CFLAGS+= -Wconversion
	46	@@ -30,8 +30,8 @@
	47	CFLAGS+= -Wbad-function-cast
	48
	49	ALL=spi eroute spigrp tncfg klipsdebug
	50	-BINDIR=/usr/local/lib/ipsec
	51	-MANTREE=/usr/local/man
	52	+BINDIR=/usr/lib/ipsec
	53	+MANTREE=/usr/share/man
194992cc JK	54	MANDIR8=$(MANTREE)/man8
194992cc JK	55	MANDIR5=$(MANTREE)/man5
7cfbbab1	56	FREESWANLIB=../../lib/libfreeswan.a
0e5fb54e	57	diff -ruN freeswan-1.8.orig/lib/Makefile freeswan-1.8/lib/Makefile
	58	--- freeswan-1.8.orig/lib/Makefile Thu Oct 26 01:58:57 2000
	59	+++ freeswan-1.8/lib/Makefile Tue Dec 12 19:03:01 2000
	60	@@ -25,7 +25,7 @@
7cfbbab1 JK	61	HDRS=freeswan.h internal.h
	62	LIB=libfreeswan.a
	63	# Original flags
	64	-CFLAGS=-O3 -I.
	65	+CFLAGS=$(OPT_FLAGS) -I.
	66	# Add debugging symbols
0e5fb54e	67	CFLAGS+= -g
7cfbbab1	68	CFLAGS+= -Wall
0e5fb54e	69	@@ -44,7 +44,7 @@
7cfbbab1	70	ARFLAGS=crvs
0e5fb54e	71	EXTHDRS=des.h
0e5fb54e	72	EXTLIBS=libdes.a
7cfbbab1	73	-MANTREE=/usr/local/man
7cfbbab1 JK	74	+MANTREE=/usr/share/man
7cfbbab1 JK	75	MANDIR=$(MANTREE)/man3
0e5fb54e	76	MANS=anyaddr.3 atoaddr.3 atoasr.3 atosa.3 atoul.3 goodmask.3 \
	77	initaddr.3 initsubnet.3 optionsfrom.3 portof.3 rangetosubnet.3 \
	78	@@ -57,11 +57,11 @@
7cfbbab1 JK	79	all: $(EXTHDRS) $(LIB) $(EXTLIBS)
	80
	81	install:
	82	- mkdir -p $(MANDIR)
	83	+ mkdir -p $(DESTDIR)$(MANDIR)
	84	for f in $(MANS) ; \
	85	do \
	86	- $(INSTALL) $$f $(MANDIR)/ipsec_$$f \|\| exit 1 ; \
	87	- ../utils/manlink $(MANDIR) ipsec_$$f ; \
	88	+ $(INSTALL) $$f $(DESTDIR)$(MANDIR)/ipsec_$$f \|\| exit 1 ; \
	89	+ ../utils/manlink $(DESTDIR)$(MANDIR) ipsec_$$f ; \
	90	done
	91
	92	$(LIB): $(OBJS)
0e5fb54e	93	diff -ruN freeswan-1.8.orig/libdes/Makefile freeswan-1.8/libdes/Makefile
	94	--- freeswan-1.8.orig/libdes/Makefile Wed Oct 11 04:12:45 2000
	95	+++ freeswan-1.8/libdes/Makefile Tue Dec 12 19:06:18 2000
	96	@@ -46,9 +46,9 @@
7cfbbab1	97
0e5fb54e	98	#CC=gcc
7cfbbab1 JK	99	#CFLAG= -O4 -funroll-loops -fomit-frame-pointer
7cfbbab1 JK	100	-CFLAG= -O3 -fomit-frame-pointer
0e5fb54e	101	+CFLAG=-fomit-frame-pointer
7cfbbab1	102
0e5fb54e	103	-CFLAGS=$(OPTS) $(CFLAG)
0e5fb54e	104	+CFLAGS=$(OPT_FLAGS) $(CFLAG)
7cfbbab1	105	CPP=$(CC) -E
0e5fb54e	106	AS=as
0e5fb54e	107
7cfbbab1 JK	108	@@ -59,10 +59,10 @@
	109	#DES_ENC=asm/dx86-sol.o asm/yx86-sol.o # solaris format x86
	110	#DES_ENC=asm/dx86bsdi.o asm/yx86basi.o # bsdi format x86
	111
	112	-LIBDIR=/usr/local/lib
	113	-BINDIR=/usr/local/bin
	114	-INCDIR=/usr/local/include
	115	-MANDIR=/usr/local/man
	116	+LIBDIR=/usr/lib
	117	+BINDIR=/usr/bin
	118	+INCDIR=/usr/include
0e5fb54e	119	+MANDIR=/usr/share/man
7cfbbab1 JK	120	MAN1=1
	121	MAN3=3
	122	SHELL=/bin/sh
	123	@@ -231,20 +231,16 @@
	124	chmod 644 $(INSTALLTOP)/include/des.h; \
	125	else \
	126	echo Standalone install; \
	127	- cp $(DLIB) $(LIBDIR)/$(DLIB); \
	128	+ cp $(DLIB) $(DESTDIR)$(LIBDIR)/$(DLIB); \
	129	if test -s /bin/ranlib; then \
	130	- /bin/ranlib $(LIBDIR)/$(DLIB); \
	131	+ /bin/ranlib $(DESTDIR)$(LIBDIR)/$(DLIB); \
	132	else \
	133	if test -s /usr/bin/ranlib; then \
0e5fb54e	134	/usr/bin/ranlib $(LIBDIR)/$(DLIB); \
7cfbbab1 JK	135	fi; \
	136	fi; \
	137	- chmod 644 $(LIBDIR)/$(DLIB); \
	138	- cp des_crypt.man $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
	139	- chmod 644 $(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
	140	- cp des.man $(MANDIR)/man$(MAN1)/des.$(MAN1); \
	141	- chmod 644 $(MANDIR)/man$(MAN1)/des.$(MAN1); \
	142	- cp des.h $(INCDIR)/des.h; \
	143	- chmod 644 $(INCDIR)/des.h; \
	144	+ cp des_crypt.man $(DESTDIR)$(MANDIR)/man$(MAN3)/des_crypt.$(MAN3); \
	145	+ cp des.man $(DESTDIR)$(MANDIR)/man$(MAN1)/des.$(MAN1); \
	146	+ cp des.h $(DESTDIR)$(INCDIR)/des.h; \
	147	fi
	148	# DO NOT DELETE THIS LINE -- make depend depends on it.
0e5fb54e	149	diff -ruN freeswan-1.8.orig/pluto/Makefile freeswan-1.8/pluto/Makefile
	150	--- freeswan-1.8.orig/pluto/Makefile Thu Oct 26 01:58:15 2000
	151	+++ freeswan-1.8/pluto/Makefile Tue Dec 12 19:09:07 2000
7cfbbab1 JK	152	@@ -19,10 +19,10 @@
	153	CC = gcc
	154
	155	# directory in which to install programs
	156	-BINDIR=/usr/local/lib/ipsec
	157	+BINDIR=/usr/lib/ipsec
	158
	159	# directory in which to install man pages
	160	-MANTREE=/usr/local/man
	161	+MANTREE=/usr/share/man
	162	FMANDIR=$(MANTREE)/man5
	163	PMANDIR=$(MANTREE)/man8
	164
	165	@@ -37,7 +37,7 @@
7cfbbab1 JK	166
7cfbbab1 JK	167	# -O on Linux makes gcc coredump when compiling sha1.c
0e5fb54e	168	# -Wundef is nice but RHL5.2 compiler doesn't support it
7cfbbab1 JK	169	-CFLAGS = -g -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
	170	+CFLAGS = $(OPT_FLAGS) -Wall -W -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast \
	171	-Wcast-qual -Wmissing-declarations -Wwrite-strings -Wstrict-prototypes
	172
	173	# where to find klips headers and FreeS/WAN headers
0e5fb54e	174	@@ -76,7 +76,7 @@
7cfbbab1 JK	175
7cfbbab1 JK	176	CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \
0e5fb54e	177	-DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG \
7cfbbab1 JK	178	- -DDEBUG -DGCC_LINT
	179	+ -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/freeswan/ipsec.secrets"'
	180
	181	ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
	182
0e5fb54e	183	diff -ruN freeswan-1.8.orig/utils/Makefile freeswan-1.8/utils/Makefile
	184	--- freeswan-1.8.orig/utils/Makefile Thu Oct 26 01:57:22 2000
	185	+++ freeswan-1.8/utils/Makefile Tue Dec 12 19:10:13 2000
0955d6b3	186	@@ -14,13 +14,13 @@
7cfbbab1 JK	187	# RCSID $Id$
	188
	189	# pathnames, subject to overrides from main Makefile
	190	-PUBDIR=/usr/local/sbin
	191	-PRIVDIR=/usr/local/lib/ipsec
0955d6b3	192	-REALPRIVDIR=/usr/local/lib/ipsec
7cfbbab1 JK	193	+PUBDIR=/usr/sbin
7cfbbab1 JK	194	+PRIVDIR=/usr/lib/ipsec
0955d6b3	195	+REALPRIVDIR=/usr/lib/ipsec
7cfbbab1	196	RCDIR=/etc/rc.d/init.d
0955d6b3	197	REALRCDIR=/etc/rc.d/init.d
7cfbbab1 JK	198	-CONFDIR=/etc
	199	-MANTREE=/usr/local/man
	200	+CONFDIR=/etc/freeswan
	201	+MANTREE=/usr/share/man
	202
	203	FMANDIR=$(MANTREE)/man5
	204	CMANDIR=$(MANTREE)/man8