From 0e5fb54e86f7bd5b63d42994a902780647f95301 Mon Sep 17 00:00:00 2001 From: waszi Date: Tue, 12 Dec 2000 18:26:43 +0000 Subject: [PATCH] - updated for 1.8 Changed files: freeswan-Makefiles.patch -> 1.4 freeswan-init.patch -> 1.3 --- freeswan-Makefiles.patch | 587 +++------------------------------------ freeswan-init.patch | 10 +- 2 files changed, 44 insertions(+), 553 deletions(-) diff --git a/freeswan-Makefiles.patch b/freeswan-Makefiles.patch index be157ea..af77b03 100644 --- a/freeswan-Makefiles.patch +++ b/freeswan-Makefiles.patch @@ -1,6 +1,6 @@ -diff -durN freeswan-1.5.orig/Makefile freeswan-1.5/Makefile ---- freeswan-1.5.orig/Makefile Fri Jun 16 05:14:53 2000 -+++ freeswan-1.5/Makefile Tue Jul 11 18:10:27 2000 +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* @@ -31,15 +31,15 @@ diff -durN freeswan-1.5.orig/Makefile freeswan-1.5/Makefile RCDIR=$(DESTDIR)$(REALRCDIR) # kernel location, and location of kernel patches in the distribution -diff -durN freeswan-1.5.orig/klips/utils/Makefile freeswan-1.5/klips/utils/Makefile ---- freeswan-1.5.orig/klips/utils/Makefile Fri Jun 30 08:20:25 2000 -+++ freeswan-1.5/klips/utils/Makefile Tue Jul 11 18:11:05 2000 +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 ++CFLAGS=$(OPT_FLAGS) -I../net/ipsec -I../../lib -g CFLAGS+= -Wall #CFLAGS+= -Wconversion @@ -54,35 +54,28 @@ diff -durN freeswan-1.5.orig/klips/utils/Makefile freeswan-1.5/klips/utils/Makef MANDIR8=$(MANTREE)/man8 MANDIR5=$(MANTREE)/man5 FREESWANLIB=../../lib/libfreeswan.a -diff -durN freeswan-1.5.orig/lib/Makefile freeswan-1.5/lib/Makefile ---- freeswan-1.5.orig/lib/Makefile Fri Jan 21 10:44:29 2000 -+++ freeswan-1.5/lib/Makefile Tue Jul 11 18:09:07 2000 -@@ -19,9 +19,9 @@ +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+= -g + CFLAGS+= -g CFLAGS+= -Wall - #CFLAGS+= -Wconversion - #CFLAGS+= -Wmissing-prototypes -@@ -36,9 +36,9 @@ - CFLAGS+= -Wbad-function-cast - +@@ -44,7 +44,7 @@ ARFLAGS=crvs --EXTHDRS=des.h gmp.h --EXTLIBS=libdes.a libgmp.a + EXTHDRS=des.h + EXTLIBS=libdes.a -MANTREE=/usr/local/man -+EXTHDRS=des.h -+EXTLIBS=libdes.a +MANTREE=/usr/share/man MANDIR=$(MANTREE)/man3 - MANS=atoaddr.3 atoasr.3 atodata.3 atosa.3 atoul.3 goodmask.3 optionsfrom.3 \ - subnetof.3 -@@ -50,11 +50,11 @@ + 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: @@ -97,18 +90,21 @@ diff -durN freeswan-1.5.orig/lib/Makefile freeswan-1.5/lib/Makefile done $(LIB): $(OBJS) -diff -durN freeswan-1.5.orig/libdes/Makefile freeswan-1.5/libdes/Makefile ---- freeswan-1.5.orig/libdes/Makefile Thu Nov 25 18:04:25 1999 -+++ freeswan-1.5/libdes/Makefile Tue Jul 11 18:09:07 2000 -@@ -46,7 +46,7 @@ +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 + #CC=gcc #CFLAG= -O4 -funroll-loops -fomit-frame-pointer -CFLAG= -O3 -fomit-frame-pointer -+CFLAG= $(OPT_FLAGS) -fomit-frame-pointer ++CFLAG=-fomit-frame-pointer - CFLAGS=$(OPTS) $(CFLAG) +-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 @@ -120,7 +116,7 @@ diff -durN freeswan-1.5.orig/libdes/Makefile freeswan-1.5/libdes/Makefile +LIBDIR=/usr/lib +BINDIR=/usr/bin +INCDIR=/usr/include -+MANDIR=/usr/man ++MANDIR=/usr/share/man MAN1=1 MAN3=3 SHELL=/bin/sh @@ -135,8 +131,7 @@ diff -durN freeswan-1.5.orig/libdes/Makefile freeswan-1.5/libdes/Makefile + /bin/ranlib $(DESTDIR)$(LIBDIR)/$(DLIB); \ else \ if test -s /usr/bin/ranlib; then \ -- /usr/bin/ranlib $(LIBDIR)/$(DLIB); \ -+ /usr/bin/ranlib $(DESTDIR)$(LIBDIR)/$(DLIB); \ + /usr/bin/ranlib $(LIBDIR)/$(DLIB); \ fi; \ fi; \ - chmod 644 $(LIBDIR)/$(DLIB); \ @@ -151,9 +146,9 @@ diff -durN freeswan-1.5.orig/libdes/Makefile freeswan-1.5/libdes/Makefile + cp des.h $(DESTDIR)$(INCDIR)/des.h; \ fi # DO NOT DELETE THIS LINE -- make depend depends on it. -diff -durN freeswan-1.5.orig/pluto/Makefile freeswan-1.5/pluto/Makefile ---- freeswan-1.5.orig/pluto/Makefile Sat May 20 21:50:00 2000 -+++ freeswan-1.5/pluto/Makefile Tue Jul 11 18:09:07 2000 +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 @@ -168,521 +163,26 @@ diff -durN freeswan-1.5.orig/pluto/Makefile freeswan-1.5/pluto/Makefile PMANDIR=$(MANTREE)/man8 @@ -37,7 +37,7 @@ - INSTALL=install # -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 -@@ -74,7 +74,7 @@ +@@ -76,7 +76,7 @@ CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \ - -DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG -DOLD_RESOLVER \ + -DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG \ - -DDEBUG -DGCC_LINT + -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/freeswan/ipsec.secrets"' ALLFLAGS = $(CPPFLAGS) $(CFLAGS) -@@ -145,7 +145,7 @@ - OBJSPLUTO = connections.o constants.o cookie.o crypto.o defs.o log.o \ - state.o main.o server.o timer.o id.o ipsec_doi.o kernel.o \ - kernel_comm.o demux.o packet.o preshared.o dnskey.o rnd.o spdb.o \ -- sha1.o md5.o $(OBJSGCRYPT) $(LIBDESLITE) $(LIBGMP) $(FREESWANLIB) -+ sha1.o md5.o $(OBJSGCRYPT) $(LIBDESLITE) $(FREESWANLIB) - - OBJSWHACK = whack.o $(FREESWANLIB) - -@@ -159,7 +159,7 @@ - ../utils/manlink $(FMANDIR) ipsec.secrets.5 - - $(BINNAMEPLUTO): $(OBJSPLUTO) -- $(CC) -o $(BINNAMEPLUTO) $(LDFLAGS) $(OBJSPLUTO) $(LIBSPLUTO) -+ $(CC) -o $(BINNAMEPLUTO) $(LDFLAGS) $(OBJSPLUTO) $(LIBSPLUTO) -lgmp - - $(BINNAMEWHACK): $(OBJSWHACK) - $(CC) -o $(BINNAMEWHACK) $(OBJSWHACK) $(LIBSWHACK) -diff -durN freeswan-1.5.orig/pluto/Makefile.orig freeswan-1.5/pluto/Makefile.orig ---- freeswan-1.5.orig/pluto/Makefile.orig Thu Jan 1 01:00:00 1970 -+++ freeswan-1.5/pluto/Makefile.orig Sat May 20 21:50:00 2000 -@@ -0,0 +1,473 @@ -+# Pluto Makefile -+# Copyright (C) 1997 Angelos D. Keromytis. -+# Copyright (C) 1998, 1999 D. Hugh Redelmeier -+# -+# This program is free software; you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation; either version 2 of the License, or (at your -+# option) any later version. See . -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+# for more details. -+# -+# RCSID $Id$ -+ -+SHELL = /bin/sh -+ -+CC = gcc -+ -+# directory in which to install programs -+BINDIR=/usr/local/lib/ipsec -+ -+# directory in which to install man pages -+MANTREE=/usr/local/man -+FMANDIR=$(MANTREE)/man5 -+PMANDIR=$(MANTREE)/man8 -+ -+FREESWANLIBDIR=../lib -+FREESWANINCLS= -I$(FREESWANLIBDIR) -+FREESWANLIB=$(FREESWANLIBDIR)/libfreeswan.a -+LIBDESLITE=$(FREESWANLIBDIR)/libdes.a -+LIBGMP=$(FREESWANLIBDIR)/libgmp.a -+ -+KLIPSD=../klips/src -+ -+INSTALL=install -+ -+# -O on Linux makes gcc coredump when compiling sha1.c -+CFLAGS = -g -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 -+HDRDIRS = -I$(KLIPSD) $(FREESWANINCLS) -+ -+# On non-LINUX systems, these one of these may be needed (see endian.h) -+# BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=BIG_ENDIAN -+# BYTE_ORDER = -DBIG_ENDIAN=4321 -DLITTLE_ENDIAN=1234 -DBYTE_ORDER=LITTLE_ENDIAN -+ -+# -DKLIPS enables interface to Kernel LINUX IPsec code -+# -DDEBUG enables debugging code, allowing for debugging output -+# (note that output must also be selected at runtime, so it is -+# reasonable to always define this) -+# -DGCC_LINT uses gcc-specific declarations to improve compile-time -+# diagnostics. -+# -DLEAK_DETECTIVE enables crude code to find memory allocation leaks. -+# -DDODGE_DH_MISSING_ZERO_BUG enables kludge to remain interoperable -+# with Pluto from FreeS/WAN 1.00 and before. -+# -DNO_RSA, we're American. Eliminates use of RSA. -+# -DOLD_RESOLVER needs to be set unless resolver is new enough to have -+# the new res_ninit etc. interface with statp arguments. RH6.2 -+# seems to be "old". -+ -+# The following are best left undefined -- each can be overridden at runtime -+# if need be. -+# -DPORT=n sets the default UDP port for IKE messages (otherwise 500) -+# -DSHARED_SECRETS_FILE=string overrides /etc/ipsec.secrets as the -+# default name of the file containing secrets used to authenticate other -+# IKE daemons. In the Makefile, two levels of quoting are needed: -+# -DSHARED_SECRETS_FILE='"/etc/ipsec.secrets"' -+# -DDEFAULT_CTLBASE=string overrides /var/run/pluto as default directory -+# and basename for pluto's lockfile (.pid) and control socket (.ctl). -+# Double quoting may be needed. -+ -+CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \ -+ -DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG -DOLD_RESOLVER \ -+ -DDEBUG -DGCC_LINT -+ -+ALLFLAGS = $(CPPFLAGS) $(CFLAGS) -+ -+# libefence is a free memory allocation debugger -+# Solaris 2 needs -lsocket -lnsl -+LIBSPLUTO = -lresolv # -lefence -+ -+LDFLAGS = -+ -+# Solaris needs -lsocket -lnsl -+LIBSWHACK = -+ -+BINNAMEPLUTO = pluto -+BINNAMEWHACK = whack -+ -+RM = /bin/rm -+RMFLAGS = -f -+ -+.SUFFIXES: -+.SUFFIXES: .c .o -+ -+# files for a (source) distribution -+ -+DISTMISC = CHANGES TODO ipsec.secrets Makefile \ -+ pluto.8 ipsec.secrets.5 -+ -+DISTGCRYPT = \ -+ gcryptfix.c gcryptfix.h \ -+ dsa.c dsa.h \ -+ elgamal.c elgamal.h \ -+ primegen.c \ -+ smallprime.c -+ -+DISTSRC = \ -+ connections.c connections.h \ -+ constants.c constants.h \ -+ cookie.c cookie.h \ -+ crypto.h crypto.c \ -+ defs.h defs.c \ -+ demux.c demux.h \ -+ dnskey.c dnskey.h \ -+ endian.h \ -+ id.c id.h \ -+ ipsec_doi.c ipsec_doi.h \ -+ kernel.c kernel.h \ -+ kernel_comm.c kernel_comm.h \ -+ log.c log.h \ -+ main.c \ -+ md5.c md5.h \ -+ packet.c packet.h \ -+ preshared.c preshared.h \ -+ rnd.c rnd.h \ -+ server.c server.h \ -+ sha1.c sha1.h \ -+ spdb.c spdb.h \ -+ state.c state.h \ -+ timer.c timer.h \ -+ $(DISTGCRYPT) \ -+ whack.c whack.h -+ -+DIST = $(DISTMISC) $(DISTSRC) -+ -+ -+# start of support for DSS/DSA. Not currently used. -+# OBJSGCRYPT = gcryptfix.o dsa.o elgamal.o primegen.o smallprime.o -+OBJSGCRYPT = -+ -+OBJSPLUTO = connections.o constants.o cookie.o crypto.o defs.o log.o \ -+ state.o main.o server.o timer.o id.o ipsec_doi.o kernel.o \ -+ kernel_comm.o demux.o packet.o preshared.o dnskey.o rnd.o spdb.o \ -+ sha1.o md5.o $(OBJSGCRYPT) $(LIBDESLITE) $(LIBGMP) $(FREESWANLIB) -+ -+OBJSWHACK = whack.o $(FREESWANLIB) -+ -+all: $(BINNAMEPLUTO) $(BINNAMEWHACK) -+ -+install: all -+ $(INSTALL) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(BINDIR) -+ $(INSTALL) pluto.8 $(PMANDIR)/ipsec_pluto.8 -+ ../utils/manlink $(PMANDIR) ipsec_pluto.8 -+ $(INSTALL) ipsec.secrets.5 $(FMANDIR) -+ ../utils/manlink $(FMANDIR) ipsec.secrets.5 -+ -+$(BINNAMEPLUTO): $(OBJSPLUTO) -+ $(CC) -o $(BINNAMEPLUTO) $(LDFLAGS) $(OBJSPLUTO) $(LIBSPLUTO) -+ -+$(BINNAMEWHACK): $(OBJSWHACK) -+ $(CC) -o $(BINNAMEWHACK) $(OBJSWHACK) $(LIBSWHACK) -+ -+distlist: -+ @echo $(DIST) -+ -+# Exuberant Ctags doesn't work if LC_ALL is set to something other than C -+ -+CTAGSFLAGS = -N --format=1 # fishy options required for Exuberant Ctags -+ -+tags: $(DISTSRC) -+ LC_ALL=C ctags $(CTAGSFLAGS) $(DISTSRC) -+ -+cleanall: clean -+ -+distclean: clean -+ -+mostlyclean: clean -+ -+realclean: clean -+ -+clean: -+ $(RM) $(RMFLAGS) $(OBJSPLUTO) *.core core *~ a.out ktrace.out -+ $(RM) $(RMFLAGS) $(BINNAMEPLUTO) $(OBJSWHACK) $(BINNAMEWHACK) -+ -+.c.o: -+ $(CC) $(COPTS) $(ALLFLAGS) -c $< -+ -+# These rules are not for production use -+$(FREESWANLIB): -+ cd $(FREESWANLIBDIR) ; $(MAKE) -+ -+$(LIBDESLITE): -+ cd $(FREESWANLIBDIR) ; $(MAKE) libdes.a -+ -+$(LIBGMP): -+ cd $(FREESWANLIBDIR) ; $(MAKE) libgmp.a -+ -+# Gather dependencies caused by explicit #includes within .c files -+# -+# Each .c is assumed to compile into a .o with the corresponding name. -+# Unlike dependencies generated by the compiler, these include dependencies -+# suppressed by conditional compilation (good, we think). -+# This code can be tricked by embeding #include in comments or -+# vice-versa, but we're among friends. -+ -+gatherdeps: -+ @ls $(DISTSRC) | grep '\.c' | sed -e 's/\(.*\)\.c$$/\1.o: \1.c/' -+ @echo -+ @ls $(DISTSRC) | grep '\.c' | xargs grep '^#[ ]*include[ ]*"' | \ -+ sed -e 's/\.c:#[ ]*include[ ]*"/.o: /' -e 's/".*//' -+ -+# Dependencies generated by "make gatherdeps": -+ -+connections.o: connections.c -+constants.o: constants.c -+cookie.o: cookie.c -+crypto.o: crypto.c -+defs.o: defs.c -+demux.o: demux.c -+dnskey.o: dnskey.c -+dsa.o: dsa.c -+elgamal.o: elgamal.c -+gcryptfix.o: gcryptfix.c -+id.o: id.c -+ipsec_doi.o: ipsec_doi.c -+kernel.o: kernel.c -+kernel_comm.o: kernel_comm.c -+log.o: log.c -+main.o: main.c -+md5.o: md5.c -+packet.o: packet.c -+preshared.o: preshared.c -+primegen.o: primegen.c -+rnd.o: rnd.c -+server.o: server.c -+sha1.o: sha1.c -+smallprime.o: smallprime.c -+spdb.o: spdb.c -+state.o: state.c -+timer.o: timer.c -+whack.o: whack.c -+ -+connections.o: constants.h -+connections.o: defs.h -+connections.o: id.h -+connections.o: connections.h -+connections.o: packet.h -+connections.o: demux.h -+connections.o: state.h -+connections.o: ipsec_doi.h -+connections.o: server.h -+connections.o: kernel.h -+connections.o: log.h -+connections.o: preshared.h -+connections.o: whack.h -+constants.o: constants.h -+constants.o: packet.h -+cookie.o: constants.h -+cookie.o: defs.h -+cookie.o: sha1.h -+cookie.o: rnd.h -+cookie.o: cookie.h -+crypto.o: constants.h -+crypto.o: defs.h -+crypto.o: state.h -+crypto.o: log.h -+crypto.o: md5.h -+crypto.o: sha1.h -+crypto.o: crypto.h -+defs.o: constants.h -+defs.o: defs.h -+defs.o: log.h -+demux.o: constants.h -+demux.o: defs.h -+demux.o: cookie.h -+demux.o: id.h -+demux.o: connections.h -+demux.o: state.h -+demux.o: packet.h -+demux.o: md5.h -+demux.o: sha1.h -+demux.o: crypto.h -+demux.o: log.h -+demux.o: demux.h -+demux.o: ipsec_doi.h -+demux.o: timer.h -+demux.o: whack.h -+demux.o: server.h -+dnskey.o: constants.h -+dnskey.o: defs.h -+dnskey.o: id.h -+dnskey.o: log.h -+dnskey.o: connections.h -+dnskey.o: preshared.h -+dnskey.o: dnskey.h -+dnskey.o: packet.h -+dsa.o: constants.h -+dsa.o: defs.h -+dsa.o: log.h -+dsa.o: rnd.h -+dsa.o: gcryptfix.h -+dsa.o: dsa.h -+elgamal.o: constants.h -+elgamal.o: defs.h -+elgamal.o: log.h -+elgamal.o: rnd.h -+elgamal.o: gcryptfix.h -+elgamal.o: elgamal.h -+gcryptfix.o: constants.h -+gcryptfix.o: defs.h -+gcryptfix.o: log.h -+gcryptfix.o: rnd.h -+gcryptfix.o: gcryptfix.h -+id.o: constants.h -+id.o: defs.h -+id.o: id.h -+id.o: connections.h -+id.o: packet.h -+ipsec_doi.o: constants.h -+ipsec_doi.o: defs.h -+ipsec_doi.o: state.h -+ipsec_doi.o: id.h -+ipsec_doi.o: connections.h -+ipsec_doi.o: preshared.h -+ipsec_doi.o: packet.h -+ipsec_doi.o: demux.h -+ipsec_doi.o: kernel.h -+ipsec_doi.o: log.h -+ipsec_doi.o: cookie.h -+ipsec_doi.o: server.h -+ipsec_doi.o: spdb.h -+ipsec_doi.o: timer.h -+ipsec_doi.o: rnd.h -+ipsec_doi.o: ipsec_doi.h -+ipsec_doi.o: whack.h -+ipsec_doi.o: sha1.h -+ipsec_doi.o: md5.h -+ipsec_doi.o: crypto.h -+kernel.o: constants.h -+kernel.o: defs.h -+kernel.o: rnd.h -+kernel.o: id.h -+kernel.o: connections.h -+kernel.o: state.h -+kernel.o: kernel.h -+kernel.o: log.h -+kernel.o: server.h -+kernel_comm.o: constants.h -+kernel_comm.o: defs.h -+kernel_comm.o: id.h -+kernel_comm.o: connections.h -+kernel_comm.o: whack.h -+kernel_comm.o: packet.h -+kernel_comm.o: demux.h -+kernel_comm.o: state.h -+kernel_comm.o: ipsec_doi.h -+kernel_comm.o: kernel.h -+kernel_comm.o: kernel_comm.h -+kernel_comm.o: log.h -+kernel_comm.o: preshared.h -+kernel_comm.o: dnskey.h -+kernel_comm.o: server.h -+log.o: constants.h -+log.o: defs.h -+log.o: log.h -+log.o: state.h -+log.o: id.h -+log.o: connections.h -+log.o: whack.h -+main.o: constants.h -+main.o: defs.h -+main.o: id.h -+main.o: connections.h -+main.o: packet.h -+main.o: demux.h -+main.o: server.h -+main.o: kernel.h -+main.o: log.h -+main.o: preshared.h -+main.o: rnd.h -+main.o: state.h -+main.o: sha1.h -+main.o: md5.h -+main.o: crypto.h -+main.o: version.c -+md5.o: md5.h -+md5.o: endian.h -+packet.o: constants.h -+packet.o: defs.h -+packet.o: log.h -+packet.o: packet.h -+preshared.o: constants.h -+preshared.o: defs.h -+preshared.o: id.h -+preshared.o: connections.h -+preshared.o: state.h -+preshared.o: preshared.h -+preshared.o: log.h -+primegen.o: constants.h -+primegen.o: defs.h -+primegen.o: log.h -+primegen.o: rnd.h -+primegen.o: gcryptfix.h -+rnd.o: sha1.h -+rnd.o: constants.h -+rnd.o: defs.h -+rnd.o: rnd.h -+rnd.o: log.h -+rnd.o: timer.h -+server.o: constants.h -+server.o: defs.h -+server.o: state.h -+server.o: id.h -+server.o: connections.h -+server.o: kernel.h -+server.o: log.h -+server.o: server.h -+server.o: timer.h -+server.o: packet.h -+server.o: demux.h -+server.o: kernel_comm.h -+sha1.o: sha1.h -+sha1.o: endian.h -+smallprime.o: constants.h -+smallprime.o: defs.h -+smallprime.o: gcryptfix.h -+spdb.o: constants.h -+spdb.o: defs.h -+spdb.o: id.h -+spdb.o: connections.h -+spdb.o: state.h -+spdb.o: packet.h -+spdb.o: preshared.h -+spdb.o: kernel.h -+spdb.o: log.h -+spdb.o: spdb.h -+spdb.o: sha1.h -+spdb.o: md5.h -+spdb.o: crypto.h -+state.o: constants.h -+state.o: defs.h -+state.o: id.h -+state.o: connections.h -+state.o: state.h -+state.o: kernel.h -+state.o: log.h -+state.o: rnd.h -+state.o: timer.h -+state.o: whack.h -+state.o: sha1.h -+state.o: md5.h -+state.o: crypto.h -+timer.o: constants.h -+timer.o: defs.h -+timer.o: id.h -+timer.o: connections.h -+timer.o: state.h -+timer.o: packet.h -+timer.o: demux.h -+timer.o: ipsec_doi.h -+timer.o: server.h -+timer.o: log.h -+timer.o: rnd.h -+timer.o: timer.h -+timer.o: whack.h -+whack.o: constants.h -+whack.o: defs.h -+whack.o: version.c -+whack.o: whack.h -diff -durN freeswan-1.5.orig/utils/Makefile freeswan-1.5/utils/Makefile ---- freeswan-1.5.orig/utils/Makefile Wed Apr 19 23:37:20 2000 -+++ freeswan-1.5/utils/Makefile Tue Jul 11 18:09:07 2000 +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$ @@ -702,12 +202,3 @@ diff -durN freeswan-1.5.orig/utils/Makefile freeswan-1.5/utils/Makefile FMANDIR=$(MANTREE)/man5 CMANDIR=$(MANTREE)/man8 -@@ -53,7 +53,7 @@ - $(CC) $(CFLAGS) ranbits.o $(LIB) -o $@ - - rsasigkey: rsasigkey.o -- $(CC) $(CFLAGS) rsasigkey.o $(LIB) ../lib/libgmp.a -o $@ -+ $(CC) $(CFLAGS) rsasigkey.o $(LIB) -lgmp -o $@ - - man_xref: man_xref.o - $(CC) $(CFLAGS) man_xref.o $(LIB) -o $@ diff --git a/freeswan-init.patch b/freeswan-init.patch index 24f2cfe..a78d70f 100644 --- a/freeswan-init.patch +++ b/freeswan-init.patch @@ -23,14 +23,14 @@ diff -durN freeswan-1.4.orig/utils/setup freeswan-1.4/utils/setup # Start things rolling. # (Warning, changes to this log message may affect barf.) version="`ipsec --version | awk 'NR == 1 { print $3 }'`" -+ show "Starting FreeS/WAN IPSEC"; busy ++ msg_starting "FreeS/WAN IPSEC"; busy echo "Starting FreeS/WAN IPSEC $version..." | logit rm -f $info if test ! -r /dev/random then echo "...unable to start FreeS/WAN IPSEC, no /dev/random!" | logit -+ deltext; fail ++ fail exit 1 fi startklips 2>&1 | logit @@ -38,12 +38,12 @@ diff -durN freeswan-1.4.orig/utils/setup freeswan-1.4/utils/setup fore) plutogo 2>&1 | logit ;; esac echo "...FreeS/WAN IPSEC started" | logonly -+ deltext; ok ++ ok ;; stop|--stop) # Shut things down. -+ show "Stopping FreeS/WAN IPSEC" ; busy ++ msg_stopping "FreeS/WAN IPSEC" ; busy echo "Stopping FreeS/WAN IPSEC..." | logit if test " $IPSECforwardcontrol" = " yes" then @@ -51,7 +51,7 @@ diff -durN freeswan-1.4.orig/utils/setup freeswan-1.4/utils/setup fi rm -f $info echo "...FreeS/WAN IPSEC stopped" | logonly -+ deltext; ok ++ ok ;; + status|--status) -- 2.44.0