Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 ChangeLog                         |    1 +
 net/openl2tp/BUILD                |    3 +++
 net/openl2tp/CONFIGURE            |    5 +++++
 net/openl2tp/DEPENDS              |   13 +++++++++++++
 net/openl2tp/DETAILS              |   18 ++++++++++++++++++
 net/openl2tp/HISTORY              |    3 +++
 net/openl2tp/INSTALL              |    6 ++++++
 net/openl2tp/PRE_BUILD            |   15 +++++++++++++++
 net/openl2tp/init.d/openl2tp      |   16 ++++++++++++++++
 net/openl2tp/init.d/openl2tp.conf |    9 +++++++++
 net/openl2tp/ipparam.patch.gz     |binary
 net/openl2tp/norpc.patch          |   14 ++++++++++++++
 net/openl2tp/optionsfile.patch.gz |binary
 13 files changed, 103 insertions(+)

New commits:
commit a3e4667eb8e1545f0c06e7b1666da320dd587c60
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    openl2tp: new spell, complete implementation of RFC2661

diff --git a/ChangeLog b/ChangeLog
index 5fd0c7a..8f4c292 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2013-05-22 Vlad Glagolev <stealth AT sourcemage.org>
        * net/xl2tpd: new spell, Layer 2 Tunnelling Protocol Daemon (RFC 2661)
+       * net/openl2tp: new spell, complete implementation of RFC2661
 
 2013-05-21 Vlad Glagolev <stealth AT sourcemage.org>
        * net/pppd-chldap: new spell, pppd LDAP plugin
diff --git a/net/openl2tp/BUILD b/net/openl2tp/BUILD
new file mode 100755
index 0000000..4e35af2
--- /dev/null
+++ b/net/openl2tp/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+make OPT_CFLAGS="$CFLAGS" $OPTS &&
+make_normal
diff --git a/net/openl2tp/CONFIGURE b/net/openl2tp/CONFIGURE
new file mode 100755
index 0000000..cfc83d5
--- /dev/null
+++ b/net/openl2tp/CONFIGURE
@@ -0,0 +1,5 @@
+message "${MESSAGE_COLOR}Several small but quite useful 'features' are 
available through community patches:" &&
+message "- IP param patch adds ability to pass peer IP to pppd as ipparam" &&
+message "- PPP options file patch allows to use custom options file for pppd 
(like /etc/ppp/options.l2tpd.client)${DEFAULT_COLOR}" &&
+
+config_query OPENL2TP_FEATURES "Apply these patches?" n
diff --git a/net/openl2tp/DEPENDS b/net/openl2tp/DEPENDS
new file mode 100755
index 0000000..d10322e
--- /dev/null
+++ b/net/openl2tp/DEPENDS
@@ -0,0 +1,13 @@
+depends flex &&
+depends bison &&
+
+optional_depends PORT-MAPPER \
+                 "L2TP_FEATURE_RPC_MANAGEMENT=y" \
+                 "L2TP_FEATURE_RPC_MANAGEMENT=n" \
+                 "for RPC management interface" &&
+
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL PORT-MAPPER); then
+  depends readline
+fi &&
+
+runtime_depends ppp
diff --git a/net/openl2tp/DETAILS b/net/openl2tp/DETAILS
new file mode 100755
index 0000000..880974ab
--- /dev/null
+++ b/net/openl2tp/DETAILS
@@ -0,0 +1,18 @@
+           SPELL=openl2tp
+         VERSION=1.8
+          SOURCE=${SPELL}-${VERSION}.tar.gz
+   
SOURCE_URL[0]=ftp://ftp.openl2tp.org/releases/${SPELL}-${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha512:360f9032b2bb104cfaa41a18fc37005510ab604b31a34a3412563e0de3e8dad946ca61840cd41a19f0202d92d758d812f45479659c9fa4d4e9e13dd226f03fda
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE=http://www.openl2tp.org/
+         ENTERED=20130522
+            DOCS="doc/README.* doc/rfc*.txt ipsec/*.conf $DOCS"
+        DOC_DIRS=""
+      LICENSE[0]=GPL
+      LICENSE[1]=LGPL
+        KEYWORDS="ppp l2tp"
+           SHORT="complete implementation of RFC2661"
+cat << EOF
+OpenL2TP is a complete implementation of RFC2661 - Layer Two Tunneling 
Protocol
+Version 2, able to operate as both a server and a client.
+EOF
diff --git a/net/openl2tp/HISTORY b/net/openl2tp/HISTORY
new file mode 100644
index 0000000..1e17fa5
--- /dev/null
+++ b/net/openl2tp/HISTORY
@@ -0,0 +1,3 @@
+2013-05-22 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, CONFIGURE,
+         init.d/openl2tp{,.conf}, norpc.patch: spell created
diff --git a/net/openl2tp/INSTALL b/net/openl2tp/INSTALL
new file mode 100755
index 0000000..029a954
--- /dev/null
+++ b/net/openl2tp/INSTALL
@@ -0,0 +1,6 @@
+make DESTDIR="$INSTALL_ROOT" $OPTS install &&
+
+if [[ $INIT_INSTALLED ]]; then
+  install_config_file "$SPELL_DIRECTORY/init.d/openl2tp.conf" \
+                      "$INSTALL_ROOT/etc/sysconfig/openl2tp"
+fi
diff --git a/net/openl2tp/PRE_BUILD b/net/openl2tp/PRE_BUILD
new file mode 100755
index 0000000..2ed5e1e
--- /dev/null
+++ b/net/openl2tp/PRE_BUILD
@@ -0,0 +1,15 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:/usr/lib64:$INSTALL_ROOT/usr/lib:" Makefile &&
+sed -i "s:-Werror::g" cli/Makefile usl/Makefile Makefile &&
+
+if ! is_depends_enabled $SPELL $(get_spell_provider $SPELL PORT-MAPPER); then
+  patch -p0 < "$SPELL_DIRECTORY/norpc.patch" &&
+  sedit "s:L2TP_USE_ASYNC_RPC=:#L2TP_USE_ASYNC_RPC=:" Makefile
+fi &&
+
+if [ "$OPENL2TP_FEATURES" == "y" ]; then
+  zcat "$SPELL_DIRECTORY/optionsfile.patch.gz" | patch -p1 &&
+  zcat "$SPELL_DIRECTORY/ipparam.patch.gz" | patch -p1
+fi
diff --git a/net/openl2tp/init.d/openl2tp b/net/openl2tp/init.d/openl2tp
new file mode 100755
index 0000000..b93556f
--- /dev/null
+++ b/net/openl2tp/init.d/openl2tp
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+. /etc/sysconfig/openl2tp
+
+PROGRAM=/usr/sbin/openl2tpd
+PIDFILE="/var/run/openl2tpd.pid"
+ARGS="$OPENL2TPD_ARGS"
+RUNLEVEL=3
+
+if [ -x /usr/bin/l2tpconfig ]; then
+  NEEDS="+network +local_fs +portmap"
+else
+  NEEDS="+network +local_fs"
+fi
+
+. /etc/init.d/smgl_init
diff --git a/net/openl2tp/init.d/openl2tp.conf 
b/net/openl2tp/init.d/openl2tp.conf
new file mode 100644
index 0000000..6d35533
--- /dev/null
+++ b/net/openl2tp/init.d/openl2tp.conf
@@ -0,0 +1,9 @@
+# Settings for the OpenL2TP daemon.
+# OPENL2TPD_ARGS= :  any extra command-line startup arguments for crond
+#       -R              - allow remote management using RPC
+#       -d nnn          - set debug trace mask to nnn
+#       -L log-facility - set syslog facility (default LOG_DAEMON)
+
+# Use ipsec.so plugin for IPSec setups.
+#OPENL2TPD_ARGS="-p ipsec.so"
+OPENL2TPD_ARGS=""
diff --git a/net/openl2tp/ipparam.patch.gz b/net/openl2tp/ipparam.patch.gz
new file mode 100644
index 0000000..d586ef0
Binary files /dev/null and b/net/openl2tp/ipparam.patch.gz differ
diff --git a/net/openl2tp/norpc.patch b/net/openl2tp/norpc.patch
new file mode 100644
index 0000000..367085e
--- /dev/null
+++ b/net/openl2tp/norpc.patch
@@ -0,0 +1,14 @@
+--- plugins/ppp_unix.c.orig
++++ plugins/ppp_unix.c
+@@ -894,11 +894,9 @@ static int ppp_unix_pppd_spawn(struct pp
+ 
+               argv[arg++] = "plugin";
+               argv[arg++] = "pppol2tp.so";
+-#ifdef L2TP_FEATURE_RPC_MANAGEMENT
+               /* This plugin requires pppol2tp.so to be loaded first */
+               argv[arg++] = "plugin";
+               argv[arg++] = "openl2tp.so";
+-#endif
+ 
+               if (!ppp_unix_use_dummy_pppd()) {
+                       int flags;
diff --git a/net/openl2tp/optionsfile.patch.gz 
b/net/openl2tp/optionsfile.patch.gz
new file mode 100644
index 0000000..484e1ec
Binary files /dev/null and b/net/openl2tp/optionsfile.patch.gz differ