rpms/openswan/F-12 openswan-nm-584224.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 openswan-2.6-relpath.patch, 1.3, 1.4 openswan-ipsec-help-524146-509318.patch, 1.1, 1.2 openswan.spec, 1.86, 1.87 sources, 1.29, 1.30
avesh agarwal
avesh at fedoraproject.org
Mon Jul 19 19:20:20 UTC 2010
Author: avesh
Update of /cvs/pkgs/rpms/openswan/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24278
Modified Files:
.cvsignore openswan-2.6-relpath.patch
openswan-ipsec-help-524146-509318.patch openswan.spec sources
Added Files:
openswan-nm-584224.patch
Log Message:
* Mon Jul 19 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.27-1
- New upstream release
- NetworkManager-openswan plugin related changes
- Fixes for bz 584224
- Updated old patches
openswan-nm-584224.patch:
_realsetup/_realsetup.in | 10 ++++++----
_updown.netkey/_updown.netkey.in | 29 ++++++++++++++++++++++++-----
2 files changed, 30 insertions(+), 9 deletions(-)
--- NEW FILE openswan-nm-584224.patch ---
diff -urNp openswan-2.6.27-cvs-patched/programs/_realsetup/_realsetup.in openswan-2.6.27/programs/_realsetup/_realsetup.in
--- openswan-2.6.27-cvs-patched/programs/_realsetup/_realsetup.in 2010-07-19 14:38:37.326376037 -0400
+++ openswan-2.6.27/programs/_realsetup/_realsetup.in 2010-07-19 14:38:48.571399576 -0400
@@ -472,6 +472,12 @@ case "$1" in
exit 3
fi
echo "but..."
+ if test "$plutokind" != "no"
+ then
+ echo "An ${plutokind} Pluto is active?"
+ exit 1
+ fi
+
if test "$hassublock"
then
echo "has subsystem lock ($subsyslock)!"
@@ -481,10 +487,6 @@ case "$1" in
then
echo "has $info file!"
fi
- if test "$plutokind" != "no"
- then
- echo "An ${plutokind} Pluto is active?"
- fi
if test "$eroutes" -gt 0
then
echo "some (${eroutes}) eroutes exist!"
diff -urNp openswan-2.6.27-cvs-patched/programs/_updown.netkey/_updown.netkey.in openswan-2.6.27/programs/_updown.netkey/_updown.netkey.in
--- openswan-2.6.27-cvs-patched/programs/_updown.netkey/_updown.netkey.in 2010-07-19 14:38:37.316386615 -0400
+++ openswan-2.6.27/programs/_updown.netkey/_updown.netkey.in 2010-07-19 14:40:07.319368448 -0400
@@ -179,19 +179,26 @@ downroute() {
}
updateresolvconf() {
- echo "updating resolvconf"
if [ -z "$PLUTO_NM_CONFIGURED" -o "$PLUTO_NM_CONFIGURED" = 0 ]; then
- if [ -e "$OPENSWAN_RESOLV_CONF" ]; then
- echo "Backup resolv.conf already exists, so doing nothing"
- return 1
- fi
+ echo "updating resolvconf"
if [ ! -e "$ORIG_RESOLV_CONF" ]; then
echo "resolv.conf does not exist, so doing nothing"
return 1
fi
+ if [ -e "$OPENSWAN_RESOLV_CONF" ]; then
+ if grep 'Openswan' $ORIG_RESOLV_CONF > /dev/null 2>&1
+ then
+ echo "Current resolv.conf is generated by Openswan, and backup resolv.conf already exists, so doing nothing"
+ return 1
+ else
+ echo "backup resolv.conf exists, but current resolv.conf is not generated by Openswan"
+ fi
+ fi
+
+ rm -f $OPENSWAN_RESOLV_CONF
cp -- $ORIG_RESOLV_CONF $OPENSWAN_RESOLV_CONF
RESOLVE_CONF="#Generated by Openswan (IPSec)"
@@ -211,11 +218,23 @@ if [ -z "$PLUTO_NM_CONFIGURED" -o "$PLUT
done
fi
+ ORIG_NAMESERVER=`grep -m 1 ^nameserver $ORIG_RESOLV_CONF`
+ RESOLVE_CONF="$RESOLVE_CONF\n$ORIG_NAMESERVER"
+
rm -f -- $ORIG_RESOLV_CONF
echo -e $RESOLVE_CONF > $ORIG_RESOLV_CONF
return $?
else
echo "Updating resolv.conf is controlled by Network Manager"
+ openswan_reason=connect
+ export openswan_reason
+ export PLUTO_CISCO_DOMAIN_INFO
+ export PLUTO_CISCO_DNS_INFO
+ export PLUTO_PEER_BANNER
+ export PLUTO_MY_SOURCEIP
+ export PLUTO_PEER
+
+ /usr/libexec/nm-openswan-service-helper
return 0
fi
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-12/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- .cvsignore 30 Mar 2010 15:04:42 -0000 1.30
+++ .cvsignore 19 Jul 2010 19:20:19 -0000 1.31
@@ -1 +1,2 @@
openswan-2.6.25.tar.gz
+openswan-2.6.27.tar.gz
openswan-2.6-relpath.patch:
Makefile.inc | 2 ++
programs/setup/Makefile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
Index: openswan-2.6-relpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-12/openswan-2.6-relpath.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openswan-2.6-relpath.patch 30 Mar 2010 15:04:42 -0000 1.3
+++ openswan-2.6-relpath.patch 19 Jul 2010 19:20:19 -0000 1.4
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.25-orig/Makefile.inc openswan-2.6.25/Makefile.inc
---- openswan-2.6.25-orig/Makefile.inc 2010-03-21 13:39:35.000000000 -0400
-+++ openswan-2.6.25/Makefile.inc 2010-03-29 12:06:47.000000000 -0400
+diff -urNp openswan-2.6.27-orig/Makefile.inc openswan-2.6.27-cvs-patched/Makefile.inc
+--- openswan-2.6.27-orig/Makefile.inc 2010-06-21 11:43:35.000000000 -0400
++++ openswan-2.6.27-cvs-patched/Makefile.inc 2010-07-02 14:39:23.856116570 -0400
@@ -123,6 +123,8 @@ FINALRCDIR=$(shell for d in $(INC_RCDIRS
do if test -d $(DESTDIR)/$$d ; \
then echo $$d ; exit 0 ; \
@@ -10,9 +10,9 @@ diff -urNp openswan-2.6.25-orig/Makefile
RCDIR=$(DESTDIR)$(FINALRCDIR)
-diff -urNp openswan-2.6.25-orig/programs/setup/Makefile openswan-2.6.25/programs/setup/Makefile
---- openswan-2.6.25-orig/programs/setup/Makefile 2010-03-21 13:39:35.000000000 -0400
-+++ openswan-2.6.25/programs/setup/Makefile 2010-03-29 12:01:08.000000000 -0400
+diff -urNp openswan-2.6.27-orig/programs/setup/Makefile openswan-2.6.27-cvs-patched/programs/setup/Makefile
+--- openswan-2.6.27-orig/programs/setup/Makefile 2010-06-21 11:43:35.000000000 -0400
++++ openswan-2.6.27-cvs-patched/programs/setup/Makefile 2010-07-02 14:39:52.001360412 -0400
@@ -32,7 +32,7 @@ include ${srcdir}../Makefile.program
doinstall:: setup
@rm -f $(BINDIR)/setup
openswan-ipsec-help-524146-509318.patch:
ipsec.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: openswan-ipsec-help-524146-509318.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-12/openswan-ipsec-help-524146-509318.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openswan-ipsec-help-524146-509318.patch 30 Mar 2010 15:04:43 -0000 1.1
+++ openswan-ipsec-help-524146-509318.patch 19 Jul 2010 19:20:19 -0000 1.2
@@ -1,6 +1,6 @@
-diff -urNp openswan-2.6.25-orig/programs/ipsec/ipsec.in openswan-2.6.25/programs/ipsec/ipsec.in
---- openswan-2.6.25-orig/programs/ipsec/ipsec.in 2010-03-21 13:39:35.000000000 -0400
-+++ openswan-2.6.25/programs/ipsec/ipsec.in 2010-03-29 11:46:52.000000000 -0400
+diff -urNp openswan-2.6.27-orig/programs/ipsec/ipsec.in openswan-2.6.27-cvs-patched/programs/ipsec/ipsec.in
+--- openswan-2.6.27-orig/programs/ipsec/ipsec.in 2010-06-21 11:43:35.000000000 -0400
++++ openswan-2.6.27-cvs-patched/programs/ipsec/ipsec.in 2010-07-02 14:45:45.573355284 -0400
@@ -79,9 +79,9 @@ case "$1" in
--help)
echo "Usage: ipsec command argument ..."
Index: openswan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-12/openswan.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- openswan.spec 30 Mar 2010 15:04:43 -0000 1.86
+++ openswan.spec 19 Jul 2010 19:20:20 -0000 1.87
@@ -2,12 +2,13 @@
%define USE_FIPSCHECK 1
%define USE_LIBCAP_NG 1
%define USE_MODP_RFC5114 1
+%define USE_NM 1
%define nss_version 3.12.3-2
%define fipscheck_version 1.2.0-1
Summary: IPSEC implementation with IKEv1 and IKEv2 keying protocols
Name: openswan
-Version: 2.6.25
+Version: 2.6.27
Release: 1%{?dist}
License: GPLv2+
@@ -17,9 +18,8 @@ Source: openswan-%{version}.tar.gz
Source2: ipsec.conf
Patch1: openswan-2.6-relpath.patch
-Patch2: openswan-2.6-selinux.patch
-Patch3: openswan-ipsec-help-524146-509318.patch
-Patch4: openswan-rfc5114.patch
+Patch2: openswan-ipsec-help-524146-509318.patch
+Patch3: openswan-nm-584224.patch
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,9 +74,9 @@ find doc/examples -type f -print0 | xarg
find doc -name .gitignore -print0 | xargs -0 rm -v
%patch1 -p1 -b .relpath
-%patch2 -p1 -b .selinux
+%patch2 -p1
%patch3 -p1
-%patch4 -p1
+
%build
@@ -101,6 +101,9 @@ find doc -name .gitignore -print0 | xarg
%if %{USE_MODP_RFC5114}
USE_MODP_RFC5114=true \
%endif
+%if %{USE_NM}
+ USE_NM=true \
+%endif
programs
FS=$(pwd)
@@ -226,6 +229,12 @@ fi
chkconfig --add ipsec || :
%changelog
+* Mon Jul 19 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.27-1
+- New upstream release
+- NetworkManager-openswan plugin related changes
+- Fixes for bz 584224
+- Updated old patches
+
* Tue Mar 30 2010 Avesh Agarwal <avagarwa at redhat.com> - 2.6.25-1
- New upstream release
- Updated existing patches that could not make into this release
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openswan/F-12/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources 30 Mar 2010 15:04:43 -0000 1.29
+++ sources 19 Jul 2010 19:20:20 -0000 1.30
@@ -1 +1 @@
-c1223786c9eb58950a4be0ab2d0a84d1 openswan-2.6.25.tar.gz
+5177b7401bb89e84ca1c89029143441e openswan-2.6.27.tar.gz
More information about the scm-commits
mailing list