[SM-Commit] GIT changes to stable-rc-0.57 grimoire by George Sherwood (80772435f98de8e6857168bf9c4ee5e7143872f7)

George Sherwood scm at sourcemage.org
Mon Jun 20 21:16:59 EDT 2011


GIT changes to stable-rc-0.57 grimoire by George Sherwood <gsherwood at sourcemage.org>:

 net/openswan/DEPENDS      |   26 ++++++++++++++++----------
 net/openswan/DETAILS      |   15 ++++++++-------
 net/openswan/FINAL        |    1 +
 net/openswan/HISTORY      |    9 ++++++++-
 net/openswan/INSTALL      |    8 +++++---
 net/openswan/PRE_BUILD    |    6 +++---
 net/openswan/init.d/ipsec |    9 ++++++---
 7 files changed, 47 insertions(+), 27 deletions(-)

New commits:
commit 80772435f98de8e6857168bf9c4ee5e7143872f7
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: George Sherwood <gsherwood at sourcemage.org>

    openswan: => 2.6.34
    (cherry picked from commit f1ce2bf2cc24e2cff220d1a9b4e1e7131ae799a6)

diff --git a/net/openswan/DEPENDS b/net/openswan/DEPENDS
index a1f1d47..5b0a16b 100755
--- a/net/openswan/DEPENDS
+++ b/net/openswan/DEPENDS
@@ -1,10 +1,16 @@
-depends gmp 			&&
-depends iproute2		&&
-depends iptables		&&
-depends ipsec-tools
-# from the readme from openswan
-#* For the moment, users wishing to test Openswan with 2.6 will require
-#  ipsec-tools' "setkey" program. Though Openswan's keying daemon, Pluto,
-#  directly sets IPsec policy, setkey is currently required to reset kernel SPD 
-#  (Security Policy Database) states when Pluto restarts. We will likely add 
-#  this basic functionality to an upcoming Openswan release.
+depends gmp &&
+depends iproute2 &&
+depends iptables &&
+
+local IPR2REV=$(installed_version iproute2 | cut -d. -f3) &&
+
+if spell_ok iproute2 && [[ $IPR2REV -le 8 ]]; then
+  force_depends iproute2
+fi &&
+
+. "$GRIMOIRE/FUNCTIONS" &&
+local KREV=$(get_kernel_version | cut -d. -f3) &&
+
+if [[ $KREV -le 9 ]]; then
+  depends ipsec-tools
+fi
diff --git a/net/openswan/DETAILS b/net/openswan/DETAILS
index 1f38525..d656b5f 100755
--- a/net/openswan/DETAILS
+++ b/net/openswan/DETAILS
@@ -1,8 +1,9 @@
             SPELL=openswan
-          VERSION=2.6.29
+          VERSION=2.6.34
+   SECURITY_PATCH=1
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SOURCE.asc
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
     SOURCE_URL[0]=http://www.openswan.org/download/$SOURCE
    SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
        SOURCE_GPG=B7E82DF8.gpg:$SOURCE2:UPSTREAM_KEY
@@ -11,12 +12,12 @@
          WEB_SITE=http://www.openswan.org/
           ENTERED=20040819
          KEYWORDS="net"
-            SHORT="An implementation of IPsec for Linux"
+            SHORT="implementation of IPsec for Linux"
 cat << EOF
 Openswan is an implementation of IPsec for Linux. It supports kernels 2.0,
-2.2, 2.4 and 2.6, and runs on many different platforms, including x86, ia64, 
-mips and arm. It is a code fork of the FreeS/WAN project, started by a few of 
-the developers who were growing frustrated with the politics surrounding the 
+2.2, 2.4 and 2.6, and runs on many different platforms, including x86, ia64,
+mips and arm. It is a code fork of the FreeS/WAN project, started by a few of
+the developers who were growing frustrated with the politics surrounding the
 FreeS/WAN project.
 
 IPSEC is Internet Protocol SECurity. It uses strong cryptography to provide
@@ -29,5 +30,5 @@ Everything passing through the untrusted net is encrypted by the IPSEC gateway
 machine and decrypted by the gateway at the other end. The result is Virtual
 Private Network or VPN. This is a network which is effectively private even
 though it includes machines at several different sites connected by the
-insecure Internet. 
+insecure Internet.
 EOF
diff --git a/net/openswan/FINAL b/net/openswan/FINAL
new file mode 100755
index 0000000..ce41770
--- /dev/null
+++ b/net/openswan/FINAL
@@ -0,0 +1 @@
+depmod -a
diff --git a/net/openswan/HISTORY b/net/openswan/HISTORY
index 2256de3..4ad39c1 100644
--- a/net/openswan/HISTORY
+++ b/net/openswan/HISTORY
@@ -1,3 +1,11 @@
+2011-06-19 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.6.34; SECURITY_PATCH++ (several security
+	  patches on the version update)
+	* INSTALL: use INSTALL_ROOT
+	* PRE_BUILD: cleaned up; corrected man path
+	* FINAL: moved depmod here
+	* init.d/ipsec: unified spaces
+
 2010-10-11 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: updated spell to 2.6.29
 	  converted to upstream signature checking
@@ -38,4 +46,3 @@
 
 2004-08-19 David Kowis <dkowis at sourcemage.org>
 	* Created the spell
-
diff --git a/net/openswan/INSTALL b/net/openswan/INSTALL
index 0ecfb7f..b30d8ff 100755
--- a/net/openswan/INSTALL
+++ b/net/openswan/INSTALL
@@ -1,4 +1,6 @@
 default_install &&
-install -v -m644 programs/setup/setup.8 /usr/share/man/man8/ipsec_setup.8 &&
-install -v -m755 programs/setup/setup /usr/libexec/ipsec/                 &&
-depmod -ae
+
+install -v -m644 programs/setup/setup.8 \
+    "$INSTALL_ROOT/usr/share/man/man8/ipsec_setup.8" &&
+install -v -m755 programs/setup/setup \
+    "$INSTALL_ROOT/usr/libexec/ipsec/setup"
diff --git a/net/openswan/PRE_BUILD b/net/openswan/PRE_BUILD
index a0240ab..614043a 100755
--- a/net/openswan/PRE_BUILD
+++ b/net/openswan/PRE_BUILD
@@ -1,6 +1,6 @@
-default_pre_build  &&
-
-cd $SOURCE_DIRECTORY  &&
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
 
 sedit 's!/usr/local!/usr!g' Makefile.inc &&     # Install to /usr
+sedit 's:=man:=share/man:' Makefile.inc &&      # Install manpages to /usr/share
 sedit 's/ setup / /' programs/Makefile          # Don't install init scripts.
diff --git a/net/openswan/init.d/ipsec b/net/openswan/init.d/ipsec
index 5ce1117..18fe740 100644
--- a/net/openswan/init.d/ipsec
+++ b/net/openswan/init.d/ipsec
@@ -6,15 +6,18 @@ RUNLEVEL=3
 NEEDS="+network +remote_fs"
 
 . /etc/init.d/smgl_init
+
 status()
 {
-	$PROGRAM $ARGS status
+  $PROGRAM $ARGS status
 }
+
 start()
 {
-	$PROGRAM $ARGS start
+  $PROGRAM $ARGS start
 }
+
 stop()
 {
-	$PROGRAM $ARGS stop
+  $PROGRAM $ARGS stop
 }


More information about the SM-Commit mailing list