Source Mage code commit list

[Treeve Jelbert <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

 database/libdbi-drivers/BUILD   |    2 --
 database/libdbi-drivers/HISTORY |    3 +++
 net/strongswan/BUILD            |    6 +++++-
 net/strongswan/CONFIGURE        |    2 ++
 net/strongswan/DEPENDS          |   13 +++++++++++++
 net/strongswan/DETAILS          |   15 +++++++++------
 net/strongswan/HISTORY          |    8 ++++++++
 net/strongswan/PREPARE          |    2 +-
 net/strongswan/PRE_BUILD        |    4 +++-
 net/strongswan/swan.gpg         |binary
 10 files changed, 44 insertions(+), 11 deletions(-)

New commits:
commit 289459d2b44fc6e7b23653f0e43e22c9a45f0f43
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

    strongswan - 2.8.3 / 4.0.7

commit cc499af892b601f61235b6958db5780bddab7050
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

    libdbi-drivers - minor fix

diff --git a/database/libdbi-drivers/BUILD b/database/libdbi-drivers/BUILD
deleted file mode 100755
index 82fed88..0000000
--- a/database/libdbi-drivers/BUILD
+++ /dev/null
@@ -1,2 +0,0 @@
-OPTS="--disable-docs $OPTS" &&
-default_build
diff --git a/database/libdbi-drivers/HISTORY b/database/libdbi-drivers/HISTORY
index a324dbe..b338d3f 100755
--- a/database/libdbi-drivers/HISTORY
+++ b/database/libdbi-drivers/HISTORY
@@ -1,4 +1,7 @@
 2007-02-22 Treeve Jelbert <treeve AT pi.be>
+       * BUILD: deleted
+
+2007-02-22 Treeve Jelbert <treeve AT pi.be>
        * DETAILS: version 0.8.2-1
        * BUILD: remove fix for missing doc dirs
 
diff --git a/net/strongswan/BUILD b/net/strongswan/BUILD
index 5774fd4..3bc8064 100755
--- a/net/strongswan/BUILD
+++ b/net/strongswan/BUILD
@@ -1 +1,5 @@
-make programs
+if [ "$STRONGSWAN_IKEV2" = "n" ]; then
+  make programs
+else
+  default_build
+fi
diff --git a/net/strongswan/CONFIGURE b/net/strongswan/CONFIGURE
index a24824e..a242720 100755
--- a/net/strongswan/CONFIGURE
+++ b/net/strongswan/CONFIGURE
@@ -1,3 +1,5 @@
+if [ "$STRONGSWAN_IKEV2" = "n" ]; then
 config_query STRONGSWAN_CURL 'Do you want to use curl for downloading of 
certificates?' y &&
 config_query STRONGSWAN_LDAP 'Do you want to use openldap to fetch 
revocation lists?' y &&
 config_query STRONGSWAN_OPSC 'Do you want to use opensc to enable the use of 
smartcards and USB tokens?' n
+fi
diff --git a/net/strongswan/DEPENDS b/net/strongswan/DEPENDS
index 792b225..fb2f2aa 100755
--- a/net/strongswan/DEPENDS
+++ b/net/strongswan/DEPENDS
@@ -1,4 +1,6 @@
 depends gmp &&
+if [ "$STRONGSWAN_IKEV2" = "n" ]; then
+
 if [ STRONGSWAN_CURL == 'y' ]; then
   depends curl
 fi &&
@@ -8,3 +10,14 @@ fi &&
 if [ "$STRONGSWAN_OPSC" == 'y' ]; then
   depends opensc
 fi
+else
+  optional_depends curl     '--enable-http'  \
+                            '' \
+                            'fetch Certificates and CRLs via http'  &&
+  optional_depends openldap '--enable-ldap'  \
+                            '' \
+                            'fetch CRLs from LDAP'   &&
+  optional_depends opensc   '--enable-smartcard'  \
+                            '' \
+                            'enable smartcard support'
+fi    
diff --git a/net/strongswan/DETAILS b/net/strongswan/DETAILS
index a049fbc..437d652 100755
--- a/net/strongswan/DETAILS
+++ b/net/strongswan/DETAILS
@@ -1,15 +1,18 @@
            SPELL=strongswan
-if [ "$STRONGSWAN_DEVEL" = "y" ]; then
-         VERSION=4.0.0
-     
SOURCE_HASH=sha512:2c7e7d741739fa33ad5dc745c0ccea90d7a0126304427c839a77802f473b64b6d0d7ef20df8a8b34b6c87c09f69bed02f63a1d1f5a62b7705450982872b46fa0
+if [ "$STRONGSWAN_IKEV2" = "y" ]; then
+         VERSION=4.0.7
 else
-         VERSION=2.7.0
-     
SOURCE_HASH=sha512:91f0f4c1891a48cfdd6590d10044cb095737c04fe7cbdbde3ab9e50c8f8476c1e9caa9664541d151809aec922019a77f49894942d48bf367aed2e7466caa582a
+         VERSION=2.8.3
 fi
           SOURCE=${SPELL}-${VERSION}.tar.bz2
    SOURCE_URL[0]=http://download.strongswan.org/${SOURCE}
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-        WEB_SITE=http://www.strongswan.org
+         SOURCE2=$SOURCE.sig
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+      SOURCE_GPG=swan.gpg:$SOURCE.sig:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
+        
+WEB_SITE=http://www.strongswan.org
          ENTERED=20060530
       LICENSE[0]=GPL
            SHORT="IPsec software"
diff --git a/net/strongswan/HISTORY b/net/strongswan/HISTORY
index 242d5a9..f2555ac 100644
--- a/net/strongswan/HISTORY
+++ b/net/strongswan/HISTORY
@@ -1,3 +1,11 @@
+2007-02-22 Treeve Jelbert <treeve AT pi.be>
+       * DETAILS: version 2.6.3 / 4.0.7
+         convert to upstream key check
+       * PRE_BUILD: fix typo
+       * BUILD, CONFIGURE, PREPARE, PRE_BUILD, DEPENDS:
+         version 4 has a standard configure script, so use standard spell 
+         features
+
 2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
        * DETAILS: [automated] Removed BUILD_API=2.
 
diff --git a/net/strongswan/PREPARE b/net/strongswan/PREPARE
index 2b4e36d..3112957 100755
--- a/net/strongswan/PREPARE
+++ b/net/strongswan/PREPARE
@@ -1 +1 @@
-config_query STRONGSWAN_DEVEL 'Do you want the development version instead 
of the stable version?' n
+config_query STRONGSWAN_IKEV2 'Do want IKEv2 support (devel)?' y
diff --git a/net/strongswan/PRE_BUILD b/net/strongswan/PRE_BUILD
index bdefcca..81980eb 100755
--- a/net/strongswan/PRE_BUILD
+++ b/net/strongswan/PRE_BUILD
@@ -1,5 +1,6 @@
 default_pre_build      &&
 cd ${SOURCE_DIRECTORY} &&
+if [ "$STRONGSWAN_IKEV2" = "n" ]; then
 sedit 's#INC_USRLOCAL=/usr/local#INC_USRLOCAL=/usr#' Makefile.inc
 if [ "${STRONGSWAN_CURL}" = "y" ]; then
   sedit 's/USE_LIBCURL\?=false/USE_LIBCURL\?=true/' Makefile.inc
@@ -7,6 +8,7 @@ fi                     &&
 if [ "${STRONGSWAN_LDAP}" = "y" ]; then
   sedit 's/USE_LDAP\?=false/USE_LDAP\?=true/' Makefile.inc
 fi                     &&
-if [ "${STRONGSWAN_CURL}" = "y" ]; then
+if [ "${STRONGSWAN_OPSC}" = "y" ]; then
   sedit 's/USE_SMARTCARD\?=false/USE_SMARTCARD\?=true/' Makefile.inc
 fi
+fi
diff --git a/net/strongswan/swan.gpg b/net/strongswan/swan.gpg
new file mode 100644
index 0000000..b0402d1
Binary files /dev/null and b/net/strongswan/swan.gpg differ