Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (15bdff717faf1a1364e286adde3b66b5b3f16206)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (15bdff717faf1a1364e286adde3b66b5b3f16206)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (15bdff717faf1a1364e286adde3b66b5b3f16206)
  • Date: Mon, 20 May 2013 17:43:12 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/ppp/CONFIGURE | 7 ++++---
net/ppp/DEPENDS | 6 +++++-
net/ppp/DETAILS | 3 ++-
net/ppp/HISTORY | 10 ++++++++++
net/ppp/INSTALL | 25 +++++++------------------
net/ppp/PRE_BUILD | 15 +++++++++++++++
net/ppp/chap-secrets | 3 ---
net/ppp/mppe-header.patch | 11 +++++++++++
net/ppp/options | 6 ------
net/ppp/pap-secrets | 2 --
10 files changed, 54 insertions(+), 34 deletions(-)

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

ppp: added mppe.h header into build; added missing dependencies

diff --git a/net/ppp/CONFIGURE b/net/ppp/CONFIGURE
index deb43f7..8d92584 100755
--- a/net/ppp/CONFIGURE
+++ b/net/ppp/CONFIGURE
@@ -1,4 +1,5 @@
-config_query USE_PEER_DNS "Use peer DNS" y &&
+config_query USE_PEER_DNS "Use peer DNS?" y &&

-config_query HAVE_CBCP \
- "Would you like CBCP support (for callback possibility) ?" n
+config_query HAVE_CBCP "Would you like CBCP support (for callback
possibility)?" n &&
+
+config_query HAVE_INET6 "Enable IPv6 support?" n
diff --git a/net/ppp/DEPENDS b/net/ppp/DEPENDS
index 02ab40a..6c9cc72 100755
--- a/net/ppp/DEPENDS
+++ b/net/ppp/DEPENDS
@@ -1 +1,5 @@
-depends libpcap
+depends openssl &&
+depends libpcap &&
+
+optional_depends shadow "" "" "for shadow password support" &&
+optional_depends linux-pam "" "" "for PAM password support"
diff --git a/net/ppp/DETAILS b/net/ppp/DETAILS
index 4e8c149..f9008a2 100755
--- a/net/ppp/DETAILS
+++ b/net/ppp/DETAILS
@@ -1,11 +1,12 @@
SPELL=ppp
VERSION=2.4.5
+ SECURITY_PATCH=1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.samba.org/pub/ppp/$SOURCE

SOURCE_HASH=sha512:3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e
LICENSE[0]=http://va.samba.org/ppp/README.html
- SECURITY_PATCH=1
WEB_SITE=http://www.samba.org/ppp/
ENTERED=20010922
KEYWORDS="net"
diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY
index e88366b..c6cb7e1 100644
--- a/net/ppp/HISTORY
+++ b/net/ppp/HISTORY
@@ -1,3 +1,13 @@
+2013-05-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * CONFIGURE: added selector for IPv6 option
+ * DEPENDS: added missing dependencies
+ * INSTALL: cleaned up
+ * PRE_BUILD: apply mppe-header patch; handle options and dependencies
+ * options, pap-secrets, chap-secrets: replaced by versions in tarball
+ * mppe-header.patch: added, to fix building of modules which might
+ require MPPE support
+
2011-01-05 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: leave group-creation only here; moved all source
modifications
to PRE_BUILD; use CFLAGS
diff --git a/net/ppp/INSTALL b/net/ppp/INSTALL
index e6f50f7..16279ec 100755
--- a/net/ppp/INSTALL
+++ b/net/ppp/INSTALL
@@ -1,6 +1,12 @@
default_install &&

-install -d -m 0755 -o root -g ppp $INSTALL_ROOT/etc/ppp &&
+make install-etcppp &&
+
+for conf in options pap-secrets chap-secrets; do
+ chown root:ppp "$INSTALL_ROOT/etc/ppp/$conf" &&
+ chmod 0600 "$INSTALL_ROOT/etc/ppp/$conf"
+done &&
+
install -d -m 0755 -o root -g ppp $INSTALL_ROOT/etc/ppp/peers &&
install -d -m 0755 -o root -g ppp $INSTALL_ROOT/etc/ppp/chat &&

@@ -17,11 +23,6 @@ if install_config_file $SCRIPT_DIRECTORY/resolv.conf
\
chown root:ppp $INSTALL_ROOT/etc/ppp/resolv.conf
fi &&

-if install_config_file $SCRIPT_DIRECTORY/options \
- $INSTALL_ROOT/etc/ppp/options; then
- chown root:ppp $INSTALL_ROOT/etc/ppp/options
-fi &&
-
if install_config_file $SCRIPT_DIRECTORY/peers \
$INSTALL_ROOT/etc/ppp/peers/isp; then
chown root:ppp $INSTALL_ROOT/etc/ppp/peers/isp
@@ -32,17 +33,5 @@ if install_config_file $SCRIPT_DIRECTORY/isp \
chown root:ppp $INSTALL_ROOT/etc/ppp/chat/isp
fi &&

-if install_config_file $SCRIPT_DIRECTORY/pap-secrets \
- $INSTALL_ROOT/etc/ppp/pap-secrets; then
- chown root:ppp $INSTALL_ROOT/etc/ppp/pap-secrets &&
- chmod 0600 $INSTALL_ROOT/etc/ppp/pap-secrets
-fi &&
-
-if install_config_file $SCRIPT_DIRECTORY/chap-secrets \
- $INSTALL_ROOT/etc/ppp/chap-secrets; then
- chown root:ppp $INSTALL_ROOT/etc/ppp/chap-secrets &&
- chmod 0600 $INSTALL_ROOT/etc/ppp/chap-secrets
-fi &&
-
chown root:ppp ${INSTALL_ROOT}/usr/sbin/pppd &&
chmod 4750 ${INSTALL_ROOT}/usr/sbin/pppd
diff --git a/net/ppp/PRE_BUILD b/net/ppp/PRE_BUILD
index 56fd526..fcd5997 100755
--- a/net/ppp/PRE_BUILD
+++ b/net/ppp/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+# include mppe.h into build
+patch -p0 < "$SPELL_DIRECTORY/mppe-header.patch" &&
+
# fixes use of 2.6.35 headers
patch -p0 < "$SPELL_DIRECTORY/l2tp.patch" &&

@@ -8,6 +11,18 @@ sedit 's:net/bpf.h:pcap-bpf.h:' pppd/demand.c &&
sedit 's:net/bpf.h:pcap-bpf.h:' pppd/sys-linux.c &&
sedit 's:/usr/man:/usr/share/man:' linux/Makefile.top &&

+if is_depends_enabled $SPELL linux-pam; then
+ sedit 's:#USE_PAM=y:USE_PAM=y:' pppd/Makefile.linux
+fi &&
+
+if ! is_depends_enabled $SPELL shadow; then
+ sedit 's:HAS_SHADOW=y:#HAS_SHADOW=y:' pppd/Makefile.linux
+fi &&
+
+if [ "$HAVE_INET6" == "y" ]; then
+ sedit 's:#HAVE_INET6=y:HAVE_INET6=y:' pppd/Makefile.linux
+fi &&
+
if [ "$HAVE_CBCP" == "y" ]; then
sedit 's:#CBCP=y:CBCP=y:' pppd/Makefile.linux
fi
diff --git a/net/ppp/chap-secrets b/net/ppp/chap-secrets
deleted file mode 100644
index d5d6455..0000000
--- a/net/ppp/chap-secrets
+++ /dev/null
@@ -1,3 +0,0 @@
-# Secrets for authentication using CHAP
-# client server secret IP addresses
-
diff --git a/net/ppp/mppe-header.patch b/net/ppp/mppe-header.patch
new file mode 100644
index 0000000..4124e3a
--- /dev/null
+++ b/net/ppp/mppe-header.patch
@@ -0,0 +1,11 @@
+--- pppd/Makefile.linux.orig 2009-11-17 01:26:07.000000000 +0300
++++ pppd/Makefile.linux 2013-05-21 01:50:23.063838264 +0400
+@@ -16,7 +16,7 @@
+ demand.c utils.c tty.c eap.c chap-md5.c session.c
+
+ HEADERS = ccp.h session.h chap-new.h ecp.h fsm.h ipcp.h \
+- ipxcp.h lcp.h magic.h md5.h patchlevel.h pathnames.h pppd.h \
++ ipxcp.h lcp.h magic.h md5.h mppe.h patchlevel.h pathnames.h pppd.h \
+ upap.h eap.h
+
+ MANPAGES = pppd.8
diff --git a/net/ppp/options b/net/ppp/options
deleted file mode 100755
index 819078b..0000000
--- a/net/ppp/options
+++ /dev/null
@@ -1,6 +0,0 @@
-lock
-mru 1280
-mtu 1280
-nobsdcomp
-deflate 15,15
-persist
diff --git a/net/ppp/pap-secrets b/net/ppp/pap-secrets
deleted file mode 100644
index c7df7ef..0000000
--- a/net/ppp/pap-secrets
+++ /dev/null
@@ -1,2 +0,0 @@
-# Secrets for authentication using PAP
-


  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (15bdff717faf1a1364e286adde3b66b5b3f16206), Vlad Glagolev, 05/20/2013

Archive powered by MHonArc 2.6.24.

Top of Page