summaryrefslogtreecommitdiffstats
path: root/network/pptpd/pptpd.SlackBuild
diff options
context:
space:
mode:
author Robby Workman2010-11-09 05:32:47 +0100
committer Heinz Wiesinger2010-11-22 19:44:10 +0100
commit14e7f202287225aacc38534059dc21787bf7162f (patch)
treee65aafea318e93b0a55beb561da843ee380b22b6 /network/pptpd/pptpd.SlackBuild
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/pptpd/pptpd.SlackBuild')
-rw-r--r--network/pptpd/pptpd.SlackBuild10
1 files changed, 7 insertions, 3 deletions
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 \