summaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-11-08 22:32:47 -0600
committerHeinz Wiesinger <pprkut@slackbuilds.org>2010-11-22 19:44:10 +0100
commit14e7f202287225aacc38534059dc21787bf7162f (patch)
treee65aafea318e93b0a55beb561da843ee380b22b6 /network
parent17d9337618ac97e030888a0ac39d5863934723ea (diff)
downloadslackbuilds-14e7f202287225aacc38534059dc21787bf7162f.tar.gz
network/pptpd: fix pptpd-logwtmp.so loading on x86_64
This commit also fixes the ppp patchlevel definition. Thanks to Guillermo Bonvehi for the bug report. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/pptpd/fix_plugins_patchlevel_h.diff11
-rw-r--r--network/pptpd/fix_pptpctrl_c_for_x86_64.diff12
-rw-r--r--network/pptpd/pptpd.SlackBuild10
3 files changed, 30 insertions, 3 deletions
diff --git a/network/pptpd/fix_plugins_patchlevel_h.diff b/network/pptpd/fix_plugins_patchlevel_h.diff
new file mode 100644
index 0000000000..dbcf995f79
--- /dev/null
+++ b/network/pptpd/fix_plugins_patchlevel_h.diff
@@ -0,0 +1,11 @@
+diff -Nur pptpd-1.3.4.orig//plugins/patchlevel.h pptpd-1.3.4/plugins/patchlevel.h
+--- pptpd-1.3.4.orig//plugins/patchlevel.h 2005-02-23 19:25:34.000000000 -0600
++++ pptpd-1.3.4/plugins/patchlevel.h 2010-11-08 22:26:18.989688208 -0600
+@@ -1,5 +1,5 @@
+ /* upstream patchlevel.h,v 1.60 2004/01/13 04:46:52 paulus Exp */
+ /* $Id: patchlevel.h,v 1.4 2005/02/24 01:25:34 quozl Exp $ */
+
+-#define VERSION "2.4.3"
+-#define DATE "13 Jan 2004"
++#define VERSION "2.4.5"
++#define DATE "17 Nov 2009"
diff --git a/network/pptpd/fix_pptpctrl_c_for_x86_64.diff b/network/pptpd/fix_pptpctrl_c_for_x86_64.diff
new file mode 100644
index 0000000000..d2ebfa99b3
--- /dev/null
+++ b/network/pptpd/fix_pptpctrl_c_for_x86_64.diff
@@ -0,0 +1,12 @@
+diff -Nur pptpd-1.3.4.orig//pptpctrl.c pptpd-1.3.4/pptpctrl.c
+--- pptpd-1.3.4.orig//pptpctrl.c 2006-12-07 18:01:40.000000000 -0600
++++ pptpd-1.3.4/pptpctrl.c 2010-11-08 22:29:50.111138505 -0600
+@@ -773,7 +773,7 @@
+
+ if (pptp_logwtmp) {
+ pppd_argv[an++] = "plugin";
+- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
++ pppd_argv[an++] = "/usr/lib64/pptpd/pptpd-logwtmp.so";
+ pppd_argv[an++] = "pptpd-original-ip";
+ pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
+ }
diff --git a/network/pptpd/pptpd.SlackBuild b/network/pptpd/pptpd.SlackBuild
index d81d7966ee..cb4f772203 100644
--- a/network/pptpd/pptpd.SlackBuild
+++ b/network/pptpd/pptpd.SlackBuild
@@ -25,15 +25,13 @@
PRGNAM=pptpd
VERSION=1.3.4
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
-# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
arm*) ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
*) ARCH=$( uname -m ) ;;
esac
fi
@@ -76,6 +74,12 @@ find . \
patch -p1 < $CWD/plugins_Makefile.diff
sed -i "s%@baselibdir@%$lib${LIBDIRSUFFIX}%" plugins/Makefile
+# Fix the ppp version number in plugins/patchlevel.h
+patch -p1 < $CWD/fix_plugins_patchlevel_h.diff
+
+# Fix hardcoded /usr/lib/pptpd/ in pptpctrl.c if ARCH=x86_64
+[ "$ARCH" = "x86_64" ] && patch -p1 < $CWD/fix_pptpctrl_c_for_x86_64.diff
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \