--- org.openswan-2.4.5/Makefile.inc 2006-04-07 00:50:08.000000000 +0200 +++ org.openswan-2.4.5/Makefile.inc 2006-05-27 10:41:21.000000000 +0200 @@ -46,7 +46,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* @@ -80,7 +80,7 @@ MANPLACES=man3 man5 man8 # where configuration files go -FINALCONFFILE?=/etc/ipsec.conf +FINALCONFFILE?=/etc/ipsec/ipsec.conf CONFFILE=$(DESTDIR)$(FINALCONFFILE) FINALCONFDIR?=/etc @@ -91,10 +91,10 @@ # sample configuration files go into INC_DOCDIR?=share/doc -FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan +FINALEXAMPLECONFDIR=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.5 EXAMPLECONFDIR=${DESTDIR}${FINALEXAMPLECONFDIR} -FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan +FINALDOCDIR?=${INC_USRLOCAL}/${INC_DOCDIR}/openswan-2.4.5 DOCDIR=${DESTDIR}${FINALDOCDIR} # where per-conn pluto logs go @@ -239,7 +239,7 @@ # installed one in RH 7.2, won't work - you wind up depending upon # openssl. -BIND9STATICLIBDIR?=/usr/local/lib +BIND9STATICLIBDIR?=/usr/lib # if you install elsewere, you may need to point the include files to it. #BIND9STATICLIBDIR?=/sandel/lib --- org.openswan-2.4.5/doc/Makefile 2005-11-08 22:32:45.000000000 +0100 +++ org.openswan-2.4.5/doc/Makefile 2006-05-27 10:41:21.000000000 +0200 @@ -1,6 +1,6 @@ # Makefile to generate various formats from HTML source # -# Assumes the htmldoc utility is available. +# No longer cares if the htmldoc utility is available. # This can be downloaded from www.easysw.com # # Also needs lynx(1) for HTML-to-text conversion --- org.openswan-2.4.5/lib/libcrypto/libdes/asm/crypt586.pl 2004-07-16 02:24:45.000000000 +0200 +++ org.openswan-2.4.5/lib/libcrypto/libdes/asm/crypt586.pl 2006-05-27 10:41:21.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # The inner loop instruction sequence and the IP/FP modifications are from # Svend Olaf Mikkelsen --- org.openswan-2.4.5/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2004-07-10 10:07:06.000000000 +0200 +++ org.openswan-2.4.5/lib/libcrypto/libdes/asm/perlasm/cbc.pl 2006-05-27 10:41:21.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc) # des_cblock (*input); --- org.openswan-2.4.5/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2004-07-10 10:07:06.000000000 +0200 +++ org.openswan-2.4.5/lib/libcrypto/libdes/asm/perlasm/x86asm.pl 2006-05-27 10:41:21.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # require 'x86asm.pl'; # &asm_init("cpp","des-586.pl"); --- org.openswan-2.4.5/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2004-07-10 10:07:07.000000000 +0200 +++ org.openswan-2.4.5/lib/libcrypto/libdes/asm/perlasm/x86ms.pl 2006-05-27 10:41:21.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl package x86ms; --- org.openswan-2.4.5/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2004-07-10 10:07:07.000000000 +0200 +++ org.openswan-2.4.5/lib/libcrypto/libdes/asm/perlasm/x86unix.pl 2006-05-27 10:41:21.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl package x86unix; --- org.openswan-2.4.5/lib/liblwres/Makefile 2004-12-18 19:13:34.000000000 +0100 +++ org.openswan-2.4.5/lib/liblwres/Makefile 2006-05-27 10:41:21.000000000 +0200 @@ -20,7 +20,7 @@ CDEFINES = -g CWARNINGS = -Werror -CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} +CFLAGS=${CINCLUDES} ${CDEFINES} ${CWARNINGS} $(USERCOMPILE) VERSION="@(\#) openswan-hacking-9.3-for-osw2" LIBINTERFACE=2 --- org.openswan-2.4.5/linux/net/ipsec/des/asm/des-586.pl 2004-07-10 10:06:50.000000000 +0200 +++ org.openswan-2.4.5/linux/net/ipsec/des/asm/des-586.pl 2006-05-27 10:41:21.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl # # The inner loop instruction sequence and the IP/FP modifications are from # Svend Olaf Mikkelsen --- org.openswan-2.4.5/linux/net/ipsec/des/asm/des686.pl 2004-07-10 10:06:50.000000000 +0200 +++ org.openswan-2.4.5/linux/net/ipsec/des/asm/des686.pl 2006-05-27 10:41:21.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl $prog="des686.pl"; --- org.openswan-2.4.5/linux/net/ipsec/des/asm/desboth.pl 2004-07-10 10:06:50.000000000 +0200 +++ org.openswan-2.4.5/linux/net/ipsec/des/asm/desboth.pl 2006-05-27 10:41:21.000000000 +0200 @@ -1,4 +1,4 @@ -#!/usr/local/bin/perl +#!/usr/bin/perl $L="edi"; $R="esi"; --- org.openswan-2.4.5/programs/_include/_include.in 2003-01-06 22:44:04.000000000 +0100 +++ org.openswan-2.4.5/programs/_include/_include.in 2006-05-27 10:41:21.000000000 +0200 @@ -47,10 +47,10 @@ do if test ! -r "$f" then - if test ! "$f" = "/etc/ipsec.conf" + if test ! "$f" = "/etc/ipsec/ipsec.conf" then echo "#:cannot open configuration file \'$f\'" - if test "$f" = "/etc/ipsec.secrets" + if test "$f" = "/etc/ipsec/ipsec.secrets" then echo "#:Your secrets file will be created when you start FreeS/WAN for the first time." fi --- org.openswan-2.4.5/programs/barf/barf.in 2005-11-25 06:00:45.000000000 +0100 +++ org.openswan-2.4.5/programs/barf/barf.in 2006-05-27 10:41:21.000000000 +0200 @@ -16,7 +16,7 @@ LOGS=${LOGS-/var/log} CONFS=${IPSEC_CONFS-/etc} -CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec.d} +CONFDDIR=${IPSEC_CONFDDIR-/etc/ipsec/ipsec.d} me="ipsec barf" # Max lines to use for things like 'route -n' maxlines=100 @@ -238,13 +238,13 @@ done fi _________________________ ipsec/ls-libdir -ls -l ${IPSEC_LIBDIR-/usr/local/lib/ipsec} +ls -l ${IPSEC_LIBDIR-/usr/lib/ipsec} _________________________ ipsec/ls-execdir -ls -l ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} +ls -l ${IPSEC_EXECDIR-/usr/libexec/ipsec} _________________________ ipsec/updowns -for f in `ls ${IPSEC_EXECDIR-/usr/local/libexec/ipsec} | egrep updown` +for f in `ls ${IPSEC_EXECDIR-/usr/libexec/ipsec} | egrep updown` do - cat ${IPSEC_EXECDIR-/usr/local/libexec/ipsec}/$f + cat ${IPSEC_EXECDIR-/usr/libexec/ipsec}/$f done _________________________ /proc/net/dev cat /proc/net/dev --- org.openswan-2.4.5/programs/eroute/eroute.5 2003-10-31 03:32:27.000000000 +0100 +++ org.openswan-2.4.5/programs/eroute/eroute.5 2006-05-27 10:41:21.000000000 +0200 @@ -223,7 +223,7 @@ in hexadecimal using Authentication Header protocol (51, IPPROTO_AH) with no identies defined for either end. .SH FILES -/proc/net/ipsec_eroute, /usr/local/bin/ipsec +/proc/net/ipsec_eroute, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_spi(5), ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_eroute(8), ipsec_version(5), --- org.openswan-2.4.5/programs/eroute/eroute.8 2003-10-31 03:32:27.000000000 +0100 +++ org.openswan-2.4.5/programs/eroute/eroute.8 2006-05-27 10:41:21.000000000 +0200 @@ -308,7 +308,7 @@ .br .LP .SH FILES -/proc/net/ipsec_eroute, /usr/local/bin/ipsec +/proc/net/ipsec_eroute, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_eroute(5) --- org.openswan-2.4.5/programs/ipsec/ipsec.8 2003-02-27 17:51:54.000000000 +0100 +++ org.openswan-2.4.5/programs/ipsec/ipsec.8 2006-05-27 10:41:21.000000000 +0200 @@ -81,7 +81,7 @@ .I ipsec thinks the IPsec configuration files are stored. .SH FILES -/usr/local/lib/ipsec usual utilities directory +/usr/lib/ipsec usual utilities directory .SH ENVIRONMENT .PP The following environment variables control where FreeS/WAN finds its --- org.openswan-2.4.5/programs/klipsdebug/klipsdebug.5 2002-04-24 09:35:38.000000000 +0200 +++ org.openswan-2.4.5/programs/klipsdebug/klipsdebug.5 2006-05-27 10:41:21.000000000 +0200 @@ -103,7 +103,7 @@ sockets debugging has been set and everything else is not set. .LP .SH FILES -/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec +/proc/net/ipsec_klipsdebug, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5), ipsec_version(5), --- org.openswan-2.4.5/programs/klipsdebug/klipsdebug.8 2002-04-24 09:35:39.000000000 +0200 +++ org.openswan-2.4.5/programs/klipsdebug/klipsdebug.8 2006-05-27 10:41:21.000000000 +0200 @@ -117,7 +117,7 @@ debugging messages. .LP .SH FILES -/proc/net/ipsec_klipsdebug, /usr/local/bin/ipsec +/proc/net/ipsec_klipsdebug, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(5) --- org.openswan-2.4.5/programs/lwdnsq/lwdnsq.xml.in 2004-04-04 03:50:56.000000000 +0200 +++ org.openswan-2.4.5/programs/lwdnsq/lwdnsq.xml.in 2006-05-27 10:41:21.000000000 +0200 @@ -430,7 +430,7 @@ Special IPSECKEY processing -/etc/ipsec.d/lwdnsq.conf +/etc/ipsec/ipsec.d/lwdnsq.conf --- org.openswan-2.4.5/programs/mailkey/mailkey.in 2005-01-30 20:07:15.000000000 +0100 +++ org.openswan-2.4.5/programs/mailkey/mailkey.in 2006-05-27 10:41:21.000000000 +0200 @@ -60,7 +60,7 @@ "$test1st" -Common concerns: This account must be able to read /etc/ipsec.secrets. +Common concerns: This account must be able to read /etc/ipsec/ipsec.secrets. If you haven't generated your key yet, please run 'ipsec newhostkey'." exit 0 } --- org.openswan-2.4.5/programs/pluto/Makefile 2005-08-12 03:12:38.000000000 +0200 +++ org.openswan-2.4.5/programs/pluto/Makefile 2006-05-27 10:41:21.000000000 +0200 @@ -262,7 +262,7 @@ -DPOLICYGROUPSDIR=\"${FINALCONFDDIR}/policies\" \ -DPERPEERLOGDIR=\"${FINALLOGDIR}/pluto/peer\" -ALLFLAGS = $(CPPFLAGS) $(CFLAGS) +ALLFLAGS = $(CPPFLAGS) $(CFLAGS) $(USERCOMPILE) # libefence is a free memory allocation debugger # Solaris 2 needs -lsocket -lnsl --- org.openswan-2.4.5/programs/setup/Makefile 2004-12-18 19:13:43.000000000 +0100 +++ org.openswan-2.4.5/programs/setup/Makefile 2006-05-27 10:41:21.000000000 +0200 @@ -33,25 +33,10 @@ @rm -f $(BINDIR)/setup @$(INSTALL) $(INSTBINFLAGS) setup $(RCDIR)/ipsec @ln -s $(FINALRCDIR)/ipsec $(BINDIR)/setup - -@for i in 0 1 2 3 4 5 6; do mkdir -p $(RCDIR)/../rc$$i.d; done - -@cd $(RCDIR)/../rc0.d && ln -f -s ../init.d/ipsec K76ipsec - -@cd $(RCDIR)/../rc1.d && ln -f -s ../init.d/ipsec K76ipsec - -@cd $(RCDIR)/../rc2.d && ln -f -s ../init.d/ipsec S47ipsec - -@cd $(RCDIR)/../rc3.d && ln -f -s ../init.d/ipsec S47ipsec - -@cd $(RCDIR)/../rc4.d && ln -f -s ../init.d/ipsec S47ipsec - -@cd $(RCDIR)/../rc5.d && ln -f -s ../init.d/ipsec S47ipsec - -@cd $(RCDIR)/../rc6.d && ln -f -s ../init.d/ipsec K76ipsec install_file_list:: @echo $(RCDIR)/ipsec @echo $(BINDIR)/setup - @echo $(RCDIR)/../rc0.d/K76ipsec - @echo $(RCDIR)/../rc1.d/K76ipsec - @echo $(RCDIR)/../rc2.d/S47ipsec - @echo $(RCDIR)/../rc3.d/S47ipsec - @echo $(RCDIR)/../rc4.d/S47ipsec - @echo $(RCDIR)/../rc5.d/S47ipsec - @echo $(RCDIR)/../rc6.d/K76ipsec clean:: @rm -f setup --- org.openswan-2.4.5/programs/showhostkey/showhostkey.in 2004-11-14 14:40:41.000000000 +0100 +++ org.openswan-2.4.5/programs/showhostkey/showhostkey.in 2006-05-27 10:41:21.000000000 +0200 @@ -18,7 +18,7 @@ usage="Usage: $me [--file secrets] [--left] [--right] [--txt gateway] [--id id] [--dhclient] [--ipseckey]" -file=/etc/ipsec.secrets +file=/etc/ipsec/ipsec.secrets fmt="" gw= id= --- org.openswan-2.4.5/programs/spi/spi.5 2002-04-24 09:35:39.000000000 +0200 +++ org.openswan-2.4.5/programs/spi/spi.5 2006-05-27 10:41:21.000000000 +0200 @@ -162,7 +162,7 @@ 3858 seconds ago and has been idle for 23 seconds. .LP .SH FILES -/proc/net/ipsec_spi, /usr/local/bin/ipsec +/proc/net/ipsec_spi, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_spi(8), ipsec_version(5), --- org.openswan-2.4.5/programs/spi/spi.8 2002-04-24 09:35:40.000000000 +0200 +++ org.openswan-2.4.5/programs/spi/spi.8 2006-05-27 10:41:21.000000000 +0200 @@ -461,7 +461,7 @@ (4). .LP .SH FILES -/proc/net/ipsec_spi, /usr/local/bin/ipsec +/proc/net/ipsec_spi, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_spi(5) --- org.openswan-2.4.5/programs/spigrp/spigrp.5 2002-04-24 09:35:40.000000000 +0200 +++ org.openswan-2.4.5/programs/spigrp/spigrp.5 2006-05-27 10:41:21.000000000 +0200 @@ -77,7 +77,7 @@ machine. .LP .SH FILES -/proc/net/ipsec_spigrp, /usr/local/bin/ipsec +/proc/net/ipsec_spigrp, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_tncfg(5), ipsec_eroute(5), ipsec_spi(5), ipsec_klipsdebug(5), ipsec_spigrp(8), ipsec_version(5), --- org.openswan-2.4.5/programs/spigrp/spigrp.8 2002-04-24 09:35:41.000000000 +0200 +++ org.openswan-2.4.5/programs/spigrp/spigrp.8 2006-05-27 10:41:21.000000000 +0200 @@ -128,7 +128,7 @@ .BR 0x236 . .LP .SH FILES -/proc/net/ipsec_spigrp, /usr/local/bin/ipsec +/proc/net/ipsec_spigrp, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_tncfg(8), ipsec_eroute(8), ipsec_spi(8), ipsec_klipsdebug(8), ipsec_spigrp(5) --- org.openswan-2.4.5/programs/tncfg/tncfg.5 2002-04-24 09:35:41.000000000 +0200 +++ org.openswan-2.4.5/programs/tncfg/tncfg.5 2006-05-27 10:41:21.000000000 +0200 @@ -75,7 +75,7 @@ is not connected to any physical device. .LP .SH "FILES" -/proc/net/ipsec_tncfg, /usr/local/bin/ipsec +/proc/net/ipsec_tncfg, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_eroute(5), ipsec_spi(5), ipsec_spigrp(5), ipsec_klipsdebug(5), ipsec_tncfg(8), ipsec_version(5), --- org.openswan-2.4.5/programs/tncfg/tncfg.8 2002-04-24 09:35:41.000000000 +0200 +++ org.openswan-2.4.5/programs/tncfg/tncfg.8 2006-05-27 10:41:21.000000000 +0200 @@ -76,7 +76,7 @@ physical device. .LP .SH "FILES" -/proc/net/ipsec_tncfg, /usr/local/bin/ipsec +/proc/net/ipsec_tncfg, /usr/bin/ipsec .SH "SEE ALSO" ipsec(8), ipsec_manual(8), ipsec_eroute(8), ipsec_spi(8), ipsec_spigrp(8), ipsec_klipsdebug(8), ipsec_tncfg(5)