- updated to 1.95

Changed files:
    freeswan-Makefiles.patch -> 1.5
    freeswan-config.patch -> 1.2

diff --git a/freeswan-Makefiles.patch b/freeswan-Makefiles.patch
index af77b03c0aa7d05a7f19982c642c2448e016cec8..a3310a66771c7e504c5730c7d58e7144e098a931 100644 (file)
--- a/freeswan-Makefiles.patch
+++ b/freeswan-Makefiles.patch
@@ -1,204 +1,48 @@
-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 @@
+diff -Naur freeswan-1.95/Makefile.inc freeswan-1.95-p/Makefile.inc
+--- freeswan-1.95/Makefile.inc Fri Feb  1 04:26:40 2002
++++ freeswan-1.95-p/Makefile.inc       Thu Feb  7 19:23:59 2002
+@@ -45,7 +45,7 @@
+ DESTDIR=
+ 
+ # "local" part of tree, used in building other pathnames
+-INC_USRLOCAL=/usr/local
++INC_USRLOCAL=/usr
+ 
  # 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 ; \
+@@ -80,10 +80,7 @@
+ # will finally be (so utils/Makefile can create a symlink in BINDIR to the
+ # place where the boot/shutdown script will finally be, rather than the
+ # place where it is installed).
+-FINALRCDIR=$(shell for d in $(INC_RCDIRS) ; \
+-              do if test -d $(DESTDIR)/$$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 @@
+-              fi ; done ; echo $(INC_RCDEFAULT) )
++FINALRCDIR=/etc/rc.d/init.d
+ RCDIR=$(DESTDIR)$(FINALRCDIR)
  
- #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
+@@ -124,8 +121,8 @@
  
-@@ -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 
+ # extra compile flags, for userland and kernel stuff, e.g. -g for debug info
+ # (caution, this stuff is still being sorted out, will change in future)
+-USERCOMPILE=-g -O3
+-KLIPSCOMPILE=-O3
++USERCOMPILE=$(OPT_FLAGS)
++KLIPSCOMPILE=$(OPT_FLAGS)
  
--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 @@
+ # extra options for use in kernel build
+ KERNMAKEOPTS=
+diff -Naur freeswan-1.95/pluto/Makefile freeswan-1.95-p/pluto/Makefile
+--- freeswan-1.95/pluto/Makefile       Tue Nov 27 17:33:42 2001
++++ freeswan-1.95-p/pluto/Makefile     Thu Feb  7 19:26:29 2002
+@@ -71,7 +71,8 @@
  
  CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \
        -DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG \
--      -DDEBUG -DGCC_LINT
+-      -DDEBUG -DGCC_LINT # -DLEAK_DETECTIVE
 +      -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/freeswan/ipsec.secrets"'
++      # -DLEAK_DETECTIVE
  
  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

diff --git a/freeswan-config.patch b/freeswan-config.patch
index 9103c85e842082894c78018610b6fa7942006f1a..dfc18edaf065f1116cbbd0e5f2e79f6e3b1cfacd 100644 (file)
--- a/freeswan-config.patch
+++ b/freeswan-config.patch
@@ -1,6 +1,6 @@
-diff -durN freeswan-1.3.orig/utils/_confread freeswan-1.3/utils/_confread
---- freeswan-1.3.orig/utils/_confread  Tue Feb  8 22:22:30 2000
-+++ freeswan-1.3/utils/_confread       Tue Apr 25 11:59:19 2000
+diff -Naur freeswan-1.95/utils/_confread freeswan-1.95-p/utils/_confread
+--- freeswan-1.95/utils/_confread      Sun Oct 14 01:42:50 2001
++++ freeswan-1.95-p/utils/_confread    Thu Feb  7 19:29:06 2002
 @@ -41,7 +41,7 @@
  #     exit 1
  # fi
@@ -10,9 +10,9 @@ diff -durN freeswan-1.3.orig/utils/_confread freeswan-1.3/utils/_confread
  include=yes
  type=conn
  fieldfmt=yes
-diff -durN freeswan-1.3.orig/utils/auto freeswan-1.3/utils/auto
---- freeswan-1.3.orig/utils/auto       Tue Feb  8 22:22:30 2000
-+++ freeswan-1.3/utils/auto    Tue Apr 25 11:59:59 2000
+diff -Naur freeswan-1.95/utils/auto freeswan-1.95-p/utils/auto
+--- freeswan-1.95/utils/auto   Thu Jan 31 21:28:59 2002
++++ freeswan-1.95-p/utils/auto Thu Feb  7 19:29:19 2002
 @@ -24,7 +24,7 @@
        other options: [--config ipsecconfigfile] [--verbose] [--show]"
  
@@ -22,26 +22,35 @@ diff -durN freeswan-1.3.orig/utils/auto freeswan-1.3/utils/auto
  info=/var/run/ipsec.info
  shopts=
  noinclude=
-diff -durN freeswan-1.3.orig/utils/barf freeswan-1.3/utils/barf
---- freeswan-1.3.orig/utils/barf       Tue Feb  8 22:22:30 2000
-+++ freeswan-1.3/utils/barf    Tue Apr 25 12:00:35 2000
-@@ -79,9 +79,9 @@
- _________________________
+diff -Naur freeswan-1.95/utils/barf freeswan-1.95-p/utils/barf
+--- freeswan-1.95/utils/barf   Tue Nov 27 03:03:00 2001
++++ freeswan-1.95-p/utils/barf Thu Feb  7 19:30:26 2002
+@@ -144,15 +144,15 @@
+ _________________________ ipsec/showdefaults
  ipsec showdefaults
- _________________________
+ _________________________ ipsec/conf
 -ipsec _include /etc/ipsec.conf | ipsec _keycensor
 +ipsec _include /etc/freeswan/ipsec.conf | ipsec _keycensor
- _________________________
+ _________________________ ipsec/secrets
 -ipsec _include /etc/ipsec.secrets | ipsec _secretcensor
 +ipsec _include /etc/freeswan/ipsec.secrets | ipsec _secretcensor
- _________________________
+ _________________________ ipsec/ls-dir
+-ls -l ${IPSEC_DIR-/usr/local/lib/ipsec}
++ls -l ${IPSEC_DIR-/usr/lib/ipsec}
+ _________________________ ipsec/updowns
+-for f in `ls ${IPSEC_DIR-/usr/local/lib/ipsec} | egrep updown`
++for f in `ls ${IPSEC_DIR-/usr/lib/ipsec} | egrep updown`
+ do
+-      cat ${IPSEC_DIR-/usr/local/lib/ipsec}/$f
++      cat ${IPSEC_DIR-/usr/lib/ipsec}/$f
+ done
+ _________________________ proc/net/dev
  cat /proc/net/dev
- _________________________
-diff -durN freeswan-1.3.orig/utils/manual freeswan-1.3/utils/manual
---- freeswan-1.3.orig/utils/manual     Tue Feb  8 22:22:31 2000
-+++ freeswan-1.3/utils/manual  Tue Apr 25 12:01:37 2000
-@@ -28,7 +28,7 @@
- export LANG LC_ALL
+diff -Naur freeswan-1.95/utils/manual freeswan-1.95-p/utils/manual
+--- freeswan-1.95/utils/manual Fri Jun  1 17:49:13 2001
++++ freeswan-1.95-p/utils/manual       Thu Feb  7 19:30:46 2002
+@@ -26,7 +26,7 @@
+ unset LANG LANGUAGE LC_ALL LC_MESSAGES
  
  showonly=
 -config=/etc/ipsec.conf