mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

update openswan to 2.40

Browse Source 
SVN-Revision: 2003
This commit is contained in:
Waldemar Brodkorb 2005-09-29 12:40:16 +00:00
parent 1f7186d288
commit d1c1fb556b
5 changed files with 134 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openwrt/package/openswan/Makefile
View File

@ -3,9 +3,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=openswan PKG_NAME:=openswan
PKG_VERSION:=2.3.1 PKG_VERSION:=2.4.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=3dcf1cd7efcbe8db3148fc288d429db1 PKG_MD5SUM:=6cbba783658eb62b87cbf4937f5e8464
PKG_SOURCE_URL:=http://www.openswan.org/download PKG_SOURCE_URL:=http://www.openswan.org/download
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -19,12 +19,6 @@ $(eval $(call PKG_template,OPENSWAN,openswan,$(PKG_VERSION)-$(PKG_RELEASE),$(ARC
FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include FLAGS := $(TARGET_CFLAGS) -I$(PKG_BUILD_DIR)/linux/include -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.built:
# $(MAKE) -C $(PKG_BUILD_DIR) \
# $(TARGET_CONFIGURE_OPTS) \
# KERNELSRC="$(LINUX_DIR)" \
# ARCH="mips" \
# USERCOMPILE="$(FLAGS)" \
# module
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
KERNELSRC="$(LINUX_DIR)" \ KERNELSRC="$(LINUX_DIR)" \

25
openwrt/package/openswan/patches/pluto-includes.patch
View File

@ -1,25 +1,12 @@
diff -urN openswan-2.3.1dr6.old/programs/pluto/Makefile openswan-2.3.1dr6/programs/pluto/Makefile diff -Nur openswan-2.4.0.orig/programs/pluto/Makefile openswan-2.4.0/programs/pluto/Makefile
--- openswan-2.3.1dr6.old/programs/pluto/Makefile 2005-03-27 22:21:41.000000000 +0200 --- openswan-2.4.0.orig/programs/pluto/Makefile 2005-08-12 03:12:38.000000000 +0200
+++ openswan-2.3.1dr6/programs/pluto/Makefile 2005-04-05 02:58:42.000000000 +0200 +++ openswan-2.4.0/programs/pluto/Makefile 2005-09-29 13:41:14.016377750 +0200
@@ -66,7 +66,7 @@ @@ -271,7 +271,7 @@
# where to find klips headers and Openswan headers
# and 2.6 kernel's <rtnetlink.h> and <xfrm.h>
-HDRDIRS = -I${OPENSWANSRCDIR}/programs/pluto/linux26 -I${OPENSWANSRCDIR}/include -I$(KLIPSINC)
+HDRDIRS = -I${OPENSWANSRCDIR}/programs/pluto/linux26 -I${OPENSWANSRCDIR}/include -I$(KLIPSINC) $(EXTRA_INCLUDE)
# 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
diff -urN openswan-2.3.1dr6.old/programs/pluto/Makefile openswan-2.3.1dr6.dev/programs/pluto/Makefile
--- openswan-2.3.1dr6.old/programs/pluto/Makefile 2005-04-05 03:00:36.000000000 +0200
+++ openswan-2.3.1dr6.dev/programs/pluto/Makefile 2005-04-05 03:06:18.000000000 +0200
@@ -255,7 +255,7 @@
LIBSPLUTO+=$(IPSECPOLICY_LIBS) $(X509_LIBS) $(SMARTCARD_LIBS)
LIBSPLUTO+=$(HAVE_THREADS_LIBS) ${XAUTHPAM_LIBS} LIBSPLUTO+=$(HAVE_THREADS_LIBS) ${XAUTHPAM_LIBS}
LIBSPLUTO+=${CURL_LIBS} LIBSPLUTO+=${CURL_LIBS}
LIBSPLUTO+=${EXTRA_CRYPTO_LIBS}
-LIBSPLUTO+= -lgmp -lresolv # -lefence -LIBSPLUTO+= -lgmp -lresolv # -lefence
+LIBSPLUTO+= $(EXTRA_LIBS) -lgmp -lresolv # -lefence +LIBSPLUTO+=$(EXTRA_LIBS) -lgmp -lresolv # -lefence
ifneq ($(LD_LIBRARY_PATH),) ifneq ($(LD_LIBRARY_PATH),)
LDFLAGS=-L$(LD_LIBRARY_PATH) LDFLAGS=-L$(LD_LIBRARY_PATH)
Binary files openswan-2.3.1dr6.old/programs/pluto/.Makefile.swp and openswan-2.3.1dr6.dev/programs/pluto/.Makefile.swp differ

221
openwrt/package/openswan/patches/scripts.patch
View File

@ -1,56 +1,112 @@
diff -uNr openswan-2.3.0.orig/programs/loggerfix openswan-2.3.0/programs/loggerfix diff -Nur openswan-2.4.0.orig/programs/loggerfix openswan-2.4.0/programs/loggerfix
--- openswan-2.3.0.orig/programs/loggerfix 1970-01-01 00:00:00.000000000 +0000 --- openswan-2.4.0.orig/programs/loggerfix 1970-01-01 01:00:00.000000000 +0100
+++ openswan-2.3.0/programs/loggerfix 2005-02-02 20:34:54.000000000 +0000 +++ openswan-2.4.0/programs/loggerfix 2005-09-29 13:44:43.325458750 +0200
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#!/bin/sh +#!/bin/sh
+# use filename instead of /dev/null to log, but dont log to flash or ram +# use filename instead of /dev/null to log, but dont log to flash or ram
+# pref. log to nfs mount +# pref. log to nfs mount
+echo "$*" >> /dev/null +echo "$*" >> /dev/null
+exit 0 +exit 0
diff -uNr openswan-2.3.0.orig/programs/look/look.in openswan-2.3.0/programs/look/look.in diff -Nur openswan-2.4.0.orig/programs/look/look.in openswan-2.4.0/programs/look/look.in
--- openswan-2.3.0.orig/programs/look/look.in 2003-10-31 02:32:42.000000000 +0000 --- openswan-2.4.0.orig/programs/look/look.in 2005-08-18 16:10:09.000000000 +0200
+++ openswan-2.3.0/programs/look/look.in 2005-02-02 20:34:54.000000000 +0000 +++ openswan-2.4.0/programs/look/look.in 2005-09-29 13:44:49.537847000 +0200
@@ -79,7 +79,7 @@ @@ -84,7 +84,7 @@
then then
pat="$pat|$defaultroutephys\$|$defaultroutevirt\$" pat="$pat|$defaultroutephys\$|$defaultroutevirt\$"
else else
- for i in `echo "$IPSECinterfaces" | tr '=' ' '` - for i in `echo "$IPSECinterfaces" | sed 's/=/ /'`
+ for i in `echo "$IPSECinterfaces" | sed 's/=/ /'` + for i in `echo "$IPSECinterfaces" | tr '=' ' '`
do do
pat="$pat|$i\$" pat="$pat|$i\$"
done done
diff -uNr openswan-2.3.0.orig/programs/manual/manual.in openswan-2.3.0/programs/manual/manual.in diff -Nur openswan-2.4.0.orig/programs/manual/manual.in openswan-2.4.0/programs/manual/manual.in
--- openswan-2.3.0.orig/programs/manual/manual.in 2004-11-01 22:49:01.000000000 +0000 --- openswan-2.4.0.orig/programs/manual/manual.in 2005-04-18 00:57:12.000000000 +0200
+++ openswan-2.3.0/programs/manual/manual.in 2005-02-02 20:34:54.000000000 +0000 +++ openswan-2.4.0/programs/manual/manual.in 2005-09-29 13:44:52.446028750 +0200
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
sub(/:/, " ", $0) sub(/:/, " ", $0)
if (interf != "") if (interf != "")
print $3 "@" interf print $3 "@" interf
- }' | tr '\n' ' '`" - }' | sed ':a;N;$!ba;s/\n/ /g'`"
+ }' | sed ':a;N;$!ba;s/\n/ /g'`" + }' | tr '\n' ' '`"
;; ;;
esac esac
diff -uNr openswan-2.3.0.orig/programs/_startklips/_startklips.in openswan-2.3.0/programs/_startklips/_startklips.in
--- openswan-2.3.0.orig/programs/_startklips/_startklips.in 2004-12-10 12:38:28.000000000 +0000 diff -Nur openswan-2.4.0.orig/programs/_plutorun/_plutorun.in openswan-2.4.0/programs/_plutorun/_plutorun.in
+++ openswan-2.3.0/programs/_startklips/_startklips.in 2005-02-02 20:34:54.000000000 +0000 --- openswan-2.4.0.orig/programs/_plutorun/_plutorun.in 2005-04-21 23:57:16.000000000 +0200
@@ -292,7 +292,12 @@ +++ openswan-2.4.0/programs/_plutorun/_plutorun.in 2005-09-29 13:44:53.442091000 +0200
@@ -147,7 +147,7 @@
exit 1
fi fi
unset MODPATH MODULECONF # no user overrides! else
depmod -a >/dev/null 2>&1 - if test ! -w "`dirname $stderrlog`"
- modprobe -v ipsec + if test ! -w "`echo $stderrlog | sed -r 's/(^.*\/)(.*$)/\1/'`"
+ if [ -f modprobe ]
+ then modprobe -v ipsec
+ elif [ -f insmod ]
+ then insmod ipsec
+ fi
+
fi
if test ! -f $ipsecversion
then then
diff -uNr openswan-2.3.0.orig/programs/setup/setup.in openswan-2.3.0/programs/setup/setup.in echo Cannot write to directory to create \"$stderrlog\".
--- openswan-2.3.0.orig/programs/setup/setup.in 2004-03-22 00:24:06.000000000 +0000 exit 1
+++ openswan-2.3.0/programs/setup/setup.in 2005-02-02 20:34:54.000000000 +0000 diff -Nur openswan-2.4.0.orig/programs/_realsetup/_realsetup.in openswan-2.4.0/programs/_realsetup/_realsetup.in
@@ -110,12 +110,22 @@ --- openswan-2.4.0.orig/programs/_realsetup/_realsetup.in 2005-07-28 02:23:48.000000000 +0200
+++ openswan-2.4.0/programs/_realsetup/_realsetup.in 2005-09-29 13:44:53.442091000 +0200
@@ -235,7 +235,7 @@
# misc pre-Pluto setup
- perform test -d `dirname $subsyslock` "&&" touch $subsyslock
+ perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock
if test " $IPSECforwardcontrol" = " yes"
then
@@ -347,7 +347,7 @@
lsmod 2>&1 | grep "^xfrm_user" > /dev/null && rmmod -s xfrm_user
fi
- perform test -d `dirname $subsyslock` "&&" rm -f $subsyslock
+ perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock "&&" rm -f $subsyslock
perform rm -f $info $lock $plutopid
perform echo "...Openswan IPsec stopped" "|" $LOGONLY
diff -Nur openswan-2.4.0.orig/programs/send-pr/send-pr.in openswan-2.4.0/programs/send-pr/send-pr.in
--- openswan-2.4.0.orig/programs/send-pr/send-pr.in 2005-04-18 01:04:46.000000000 +0200
+++ openswan-2.4.0/programs/send-pr/send-pr.in 2005-09-29 13:44:53.442091000 +0200
@@ -402,7 +402,7 @@
else
if [ "$fieldname" != "Category" ]
then
- values=`${BINDIR}/query-pr --valid-values $fieldname | sed ':a;N;$!ba;s/\n/ /g' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
+ values=`${BINDIR}/query-pr --valid-values $fieldname | tr '\n' ' ' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
valslen=`echo "$values" | wc -c`
else
values="choose from a category listed above"
@@ -414,7 +414,7 @@
else
desc="<${values} (one line)>";
fi
- dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
+ dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
fi
echo "${fmtname}${desc}" >> $file
@@ -425,7 +425,7 @@
desc=" $default_val";
else
desc=" <`${BINDIR}/query-pr --field-description $fieldname` (multiple lines)>";
- dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
+ dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
echo "s/^${dpat}//" >> $FIXFIL
fi
echo "${fmtname}" >> $file;
@@ -437,7 +437,7 @@
desc="${default_val}"
else
desc="<`${BINDIR}/query-pr --field-description $fieldname` (one line)>"
- dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
+ dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
fi
echo "${fmtname}${desc}" >> $file
diff -Nur openswan-2.4.0.orig/programs/setup/setup.in openswan-2.4.0/programs/setup/setup.in
--- openswan-2.4.0.orig/programs/setup/setup.in 2005-07-25 21:17:03.000000000 +0200
+++ openswan-2.4.0/programs/setup/setup.in 2005-09-29 13:44:52.446028750 +0200
@@ -117,12 +117,22 @@
# do it # do it
case "$1" in case "$1" in
start|--start|stop|--stop|_autostop|_autostart) start|--start|stop|--stop|_autostop|_autostart)
@ -74,9 +130,9 @@ diff -uNr openswan-2.3.0.orig/programs/setup/setup.in openswan-2.3.0/programs/se
tmp=/var/run/pluto/ipsec_setup.st tmp=/var/run/pluto/ipsec_setup.st
outtmp=/var/run/pluto/ipsec_setup.out outtmp=/var/run/pluto/ipsec_setup.out
( (
diff -uNr openswan-2.3.0.orig/programs/showhostkey/showhostkey.in openswan-2.3.0/programs/showhostkey/showhostkey.in diff -Nur openswan-2.4.0.orig/programs/showhostkey/showhostkey.in openswan-2.4.0/programs/showhostkey/showhostkey.in
--- openswan-2.3.0.orig/programs/showhostkey/showhostkey.in 2004-11-14 13:40:41.000000000 +0000 --- openswan-2.4.0.orig/programs/showhostkey/showhostkey.in 2004-11-14 14:40:41.000000000 +0100
+++ openswan-2.3.0/programs/showhostkey/showhostkey.in 2005-02-02 20:34:54.000000000 +0000 +++ openswan-2.4.0/programs/showhostkey/showhostkey.in 2005-09-29 13:44:52.446028750 +0200
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
exit 1 exit 1
fi fi
@ -85,81 +141,10 @@ diff -uNr openswan-2.3.0.orig/programs/showhostkey/showhostkey.in openswan-2.3.0
+host="`cat /proc/sys/kernel/hostname`" +host="`cat /proc/sys/kernel/hostname`"
awk ' BEGIN { awk ' BEGIN {
inkey = 0
diff -uNr openswan-2.3.0.orig/programs/send-pr/send-pr.in openswan-2.3.0/programs/send-pr/send-pr.in diff -Nur openswan-2.4.0.orig/programs/_startklips/_startklips.in openswan-2.4.0/programs/_startklips/_startklips.in
--- openswan-2.3.0.orig/programs/send-pr/send-pr.in 2003-07-14 12:26:17.000000000 +0000 --- openswan-2.4.0.orig/programs/_startklips/_startklips.in 2005-03-31 23:07:27.000000000 +0200
+++ openswan-2.3.0/programs/send-pr/send-pr.in 2005-02-02 20:34:54.000000000 +0000 +++ openswan-2.4.0/programs/_startklips/_startklips.in 2005-09-29 13:44:53.442091000 +0200
@@ -402,7 +402,7 @@
else
if [ "$fieldname" != "Category" ]
then
- values=`${BINDIR}/query-pr --valid-values $fieldname | tr '\n' ' ' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
+ values=`${BINDIR}/query-pr --valid-values $fieldname | sed ':a;N;$!ba;s/\n/ /g' | sed 's/ *$//g;s/ / | /g;s/^/[ /;s/$/ ]/;'`
valslen=`echo "$values" | wc -c`
else
values="choose from a category listed above"
@@ -414,7 +414,7 @@
else
desc="<${values} (one line)>";
fi
- dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
+ dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
fi
echo "${fmtname}${desc}" >> $file
@@ -425,7 +425,7 @@
desc=" $default_val";
else
desc=" <`${BINDIR}/query-pr --field-description $fieldname` (multiple lines)>";
- dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
+ dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
echo "s/^${dpat}//" >> $FIXFIL
fi
echo "${fmtname}" >> $file;
@@ -437,7 +437,7 @@
desc="${default_val}"
else
desc="<`${BINDIR}/query-pr --field-description $fieldname` (one line)>"
- dpat=`echo "$desc" | tr '\]\[*+^$|\()&/' '............'`
+ dpat=`echo "$desc" | sed 's/[][*+^$|\()&/]/./g'`
echo "/^>${fieldname}:/ s/${dpat}//" >> $FIXFIL
fi
echo "${fmtname}${desc}" >> $file
diff -uNr openswan-2.3.0.orig/programs/_realsetup/_realsetup.in openswan-2.3.0/programs/_realsetup/_realsetup.in
--- openswan-2.3.0.orig/programs/_realsetup/_realsetup.in 2004-12-10 13:10:04.000000000 +0000
+++ openswan-2.3.0/programs/_realsetup/_realsetup.in 2005-02-02 20:34:54.000000000 +0000
@@ -209,7 +209,7 @@
# misc pre-Pluto setup
- perform test -d `dirname $subsyslock` "&&" touch $subsyslock
+ perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock
if test " $IPSECforwardcontrol" = " yes"
then
@@ -313,7 +313,7 @@
lsmod 2>&1 | grep "^xfrm_user" > /dev/null && rmmod -s xfrm_user
fi
- perform test -d `dirname $subsyslock` "&&" rm -f $subsyslock
+ perform test -d `echo $subsyslock | sed -r 's/(^.*\/)(.*$)/\1/'` "&&" touch $subsyslock "&&" rm -f $subsyslock
perform rm -f $info $lock $plutopid
perform echo "...Openswan IPsec stopped" "|" $LOGONLY
--- openswan-2.3.0.orig/programs/_plutorun/_plutorun.in 2004-11-03 20:21:08.000000000 +0000
+++ openswan-2.3.0/programs/_plutorun/_plutorun.in 2005-02-02 20:34:54.000000000 +0000
@@ -140,7 +140,7 @@
exit 1
fi
else
- if test ! -w "`dirname $stderrlog`"
+ if test ! -w "`echo $stderrlog | sed -r 's/(^.*\/)(.*$)/\1/'`"
then
echo Cannot write to directory to create \"$stderrlog\".
exit 1
diff -urN openswan-2.3.1.old/programs/_startklips/_startklips.in openswan-2.3.1/programs/_startklips/_startklips.in
--- openswan-2.3.1.old/programs/_startklips/_startklips.in 2005-04-10 23:57:51.000000000 +0200
+++ openswan-2.3.1/programs/_startklips/_startklips.in 2005-04-11 00:00:36.000000000 +0200
@@ -262,15 +262,15 @@ @@ -262,15 +262,15 @@
echo "FATAL ERROR: Both KLIPS and NETKEY IPsec code is present in kernel" echo "FATAL ERROR: Both KLIPS and NETKEY IPsec code is present in kernel"
exit exit
@ -207,3 +192,17 @@ diff -urN openswan-2.3.1.old/programs/_startklips/_startklips.in openswan-2.3.1/
fi fi
fi fi
@@ -305,7 +305,12 @@
fi
unset MODPATH MODULECONF # no user overrides!
depmod -a >/dev/null 2>&1
- modprobe -v ipsec
+ if [ -f modprobe ]
+ then modprobe -v ipsec
+ elif [ -f insmod ]
+ then insmod ipsec
+ fi
+
fi
if test ! -f $ipsecversion
then

4
openwrt/target/linux/package/openswan/Makefile
View File

@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk
include ../../rules.mk include ../../rules.mk
PKG_NAME:=openswan PKG_NAME:=openswan
PKG_VERSION:=2.3.1 PKG_VERSION:=2.4.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MD5SUM:=3dcf1cd7efcbe8db3148fc288d429db1 PKG_MD5SUM:=6cbba783658eb62b87cbf4937f5e8464
PKG_SOURCE_URL:=http://www.openswan.org/download PKG_SOURCE_URL:=http://www.openswan.org/download
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

13
openwrt/target/linux/package/openswan/patches/fix-compile-pfkey.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Nur openswan-2.4.0.orig/linux/net/ipsec/pfkey_v2.c openswan-2.4.0/linux/net/ipsec/pfkey_v2.c
--- openswan-2.4.0.orig/linux/net/ipsec/pfkey_v2.c 2005-09-06 04:10:03.000000000 +0200
+++ openswan-2.4.0/linux/net/ipsec/pfkey_v2.c 2005-09-21 09:32:49.214628750 +0200
@@ -821,7 +821,9 @@
return 0; /* -EINVAL; */
}
+#ifdef NET_26
write_lock_bh(&pfkey_sock_lock);
+#endif
KLIPS_PRINT(debug_pfkey,
"klips_debug:pfkey_release: "