updated to 1.96

Changed files:
    freeswan-Makefiles.patch -> 1.7
    freeswan-config.patch -> 1.4

diff --git a/freeswan-Makefiles.patch b/freeswan-Makefiles.patch
deleted file mode 100644 (file)
index c5feb74..0000000
--- a/freeswan-Makefiles.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -Naur freeswan-1.95.orig/Makefile.inc freeswan-1.95/Makefile.inc
---- freeswan-1.95.orig/Makefile.inc    Mon Feb 18 12:48:29 2002
-+++ freeswan-1.95/Makefile.inc Mon Feb 18 12:50:31 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*
-@@ -59,14 +59,14 @@
- 
- # where the appropriate manpage tree is located
- # location within INC_USRLOCAL
--INC_MANDIR=man
-+INC_MANDIR=share/man
- # the full pathname
- MANTREE=$(DESTDIR)$(INC_USRLOCAL)/$(INC_MANDIR)
- # all relevant subdirectories of MANTREE
- MANPLACES=man3 man5 man8
- 
- # where configuration files go
--CONFDIR=$(DESTDIR)/etc
-+CONFDIR=$(DESTDIR)/etc/ipsec
- 
- # An attempt is made to automatically figure out where boot/shutdown scripts 
- # will finally go:  the first directory in INC_RCDIRS which exists gets them.
-@@ -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 $(INC_RCDEFAULT) )
-+FINALRCDIR=/etc/rc.d/init.d
- RCDIR=$(DESTDIR)$(FINALRCDIR)
- 
- 
-@@ -124,8 +121,8 @@
- 
- # 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)
- 
- # extra options for use in kernel build
- KERNMAKEOPTS=
-diff -Naur freeswan-1.95.orig/pluto/Makefile freeswan-1.95/pluto/Makefile
---- freeswan-1.95.orig/pluto/Makefile  Mon Feb 18 12:48:23 2002
-+++ freeswan-1.95/pluto/Makefile       Mon Feb 18 12:55:38 2002
-@@ -71,7 +71,8 @@
- 
- CPPFLAGS = $(HDRDIRS) $(BYTE_ORDER) \
-       -DPLUTO -DKLIPS -DDODGE_DH_MISSING_ZERO_BUG \
--      -DDEBUG -DGCC_LINT # -DLEAK_DETECTIVE
-+      -DDEBUG -DGCC_LINT -DSHARED_SECRETS_FILE='"/etc/ipsec/ipsec.secrets"'
-+      # -DLEAK_DETECTIVE
- 
- ALLFLAGS = $(CPPFLAGS) $(CFLAGS)
- 

diff --git a/freeswan-config.patch b/freeswan-config.patch
index 5e6848b898a6cdab8b2aeda7ecbccad513d6c0b3..c881fdeb2b0e519b0b051a8d8a8846981f40cf3d 100644 (file)
--- a/freeswan-config.patch
+++ b/freeswan-config.patch
@@ -1,18 +1,6 @@
-diff -Naur freeswan-1.95.orig/utils/Makefile freeswan-1.95/utils/Makefile
---- freeswan-1.95.orig/utils/Makefile  Mon Feb 18 12:48:24 2002
-+++ freeswan-1.95/utils/Makefile       Mon Feb 18 13:12:55 2002
-@@ -67,7 +67,7 @@
- send-pr.8: send-pr.man
-       sed "s/xVERSIONx/$(IPSECVERSION)/" send-pr.man | sed "s:@IPSEC_DIR@:$(FINALBINDIR):" >$@
- 
--# generate RSA private key... if, and only if, /etc/ipsec.secrets does
-+# generate RSA private key... if, and only if, /etc/ipsec/ipsec.secrets does
- # not already exist
- BLURB=-- not filled in because ipsec.secrets existed at build time --
- secrets.eg:   secrets.proto ranbits rsasigkey
-diff -Naur freeswan-1.95.orig/utils/_confread freeswan-1.95/utils/_confread
---- freeswan-1.95.orig/utils/_confread Mon Feb 18 12:48:24 2002
-+++ freeswan-1.95/utils/_confread      Mon Feb 18 13:10:13 2002
+diff -Naur freeswan-1.96.orig/utils/_confread freeswan-1.96/utils/_confread
+--- freeswan-1.96.orig/utils/_confread Mon Mar 18 09:49:41 2002
++++ freeswan-1.96/utils/_confread      Mon Mar 18 09:54:25 2002
 @@ -14,7 +14,7 @@
  #
  # RCSID $Id$
@@ -31,9 +19,9 @@ diff -Naur freeswan-1.95.orig/utils/_confread freeswan-1.95/utils/_confread
  include=yes
  type=conn
  fieldfmt=yes
-diff -Naur freeswan-1.95.orig/utils/auto freeswan-1.95/utils/auto
---- freeswan-1.95.orig/utils/auto      Mon Feb 18 12:48:24 2002
-+++ freeswan-1.95/utils/auto   Mon Feb 18 13:07:54 2002
+diff -Naur freeswan-1.96.orig/utils/auto freeswan-1.96/utils/auto
+--- freeswan-1.96.orig/utils/auto      Mon Mar 18 09:49:41 2002
++++ freeswan-1.96/utils/auto   Mon Mar 18 09:55:54 2002
 @@ -24,7 +24,7 @@
        other options: [--config ipsecconfigfile] [--verbose] [--show]"
  
@@ -43,10 +31,10 @@ diff -Naur freeswan-1.95.orig/utils/auto freeswan-1.95/utils/auto
  info=/var/run/ipsec.info
  shopts=
  noinclude=
-diff -Naur freeswan-1.95.orig/utils/barf freeswan-1.95/utils/barf
---- freeswan-1.95.orig/utils/barf      Mon Feb 18 12:48:24 2002
-+++ freeswan-1.95/utils/barf   Mon Feb 18 13:09:09 2002
-@@ -144,9 +144,9 @@
+diff -Naur freeswan-1.96.orig/utils/barf freeswan-1.96/utils/barf
+--- freeswan-1.96.orig/utils/barf      Mon Mar 18 09:49:41 2002
++++ freeswan-1.96/utils/barf   Mon Mar 18 09:56:45 2002
+@@ -163,9 +163,9 @@
  _________________________ ipsec/showdefaults
  ipsec showdefaults
  _________________________ ipsec/conf
@@ -58,18 +46,9 @@ diff -Naur freeswan-1.95.orig/utils/barf freeswan-1.95/utils/barf
  _________________________ ipsec/ls-dir
  ls -l ${IPSEC_DIR-/usr/local/lib/ipsec}
  _________________________ ipsec/updowns
-diff -Naur freeswan-1.95.orig/utils/conf.proto freeswan-1.95/utils/conf.proto
---- freeswan-1.95.orig/utils/conf.proto        Mon Feb 18 12:48:24 2002
-+++ freeswan-1.95/utils/conf.proto     Mon Feb 18 13:09:51 2002
-@@ -1,4 +1,4 @@
--# /etc/ipsec.conf - FreeS/WAN IPsec configuration file
-+# /etc/ipsec/ipsec.conf - FreeS/WAN IPsec configuration file
- # RCSID $Id$
- 
- # More elaborate and more varied sample configurations can be found
-diff -Naur freeswan-1.95.orig/utils/manual freeswan-1.95/utils/manual
---- freeswan-1.95.orig/utils/manual    Mon Feb 18 12:48:24 2002
-+++ freeswan-1.95/utils/manual Mon Feb 18 13:13:17 2002
+diff -Naur freeswan-1.96.orig/utils/manual freeswan-1.96/utils/manual
+--- freeswan-1.96.orig/utils/manual    Mon Mar 18 09:49:41 2002
++++ freeswan-1.96/utils/manual Mon Mar 18 09:58:04 2002
 @@ -26,7 +26,7 @@
  unset LANG LANGUAGE LC_ALL LC_MESSAGES
  
@@ -79,9 +58,9 @@ diff -Naur freeswan-1.95.orig/utils/manual freeswan-1.95/utils/manual
  info=/var/run/ipsec.info
  shopts=
  other=0
-diff -Naur freeswan-1.95.orig/utils/showhostkey freeswan-1.95/utils/showhostkey
---- freeswan-1.95.orig/utils/showhostkey       Mon Feb 18 12:48:24 2002
-+++ freeswan-1.95/utils/showhostkey    Mon Feb 18 13:14:06 2002
+diff -Naur freeswan-1.96.orig/utils/showhostkey freeswan-1.96/utils/showhostkey
+--- freeswan-1.96.orig/utils/showhostkey       Mon Mar 18 09:49:41 2002
++++ freeswan-1.96/utils/showhostkey    Mon Mar 18 09:58:55 2002
 @@ -17,7 +17,7 @@
  me="ipsec showhostkey"
  usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id]"