Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cca8ad9c47b9f49c9cd0b4e2e983a53decfc8b4e
commit cca8ad9c47b9f49c9cd0b4e2e983a53decfc8b4e Author: James Buren <[email protected]> Date: Wed Sep 25 06:35:59 2013 -0500 ppp-2.4.5-3-x86_64 * fix build * remove rp-pppoe.so plugin. another package provides a more recent version. * fix plugin loading -- $Fprefix was not successfully passed for some reason diff --git a/source/base/ppp/FrugalBuild b/source/base/ppp/FrugalBuild index eaf630a..651dd4b 100644 --- a/source/base/ppp/FrugalBuild +++ b/source/base/ppp/FrugalBuild @@ -4,7 +4,7 @@ pkgname=ppp pkgver=2.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="The PPP (Point-to-Point Protocol) daemon" url="http://www.samba.org/ppp/"; groups=('base') @@ -12,15 +12,18 @@ archs=('i686' 'x86_64' 'arm') depends=('glibc>=2.8-3') backup=('etc/ppp/chap-secrets' 'etc/ppp/pap-secrets' 'etc/ppp/options' 'etc/ppp/ip-up' 'etc/ppp/ip-down') up2date="wget --passive-ftp -O - -q ftp://ftp.samba.org/pub/ppp/|grep ppp-.[0-9\.]*\.tar\.gz|tail -n 1|sed 's/.*ppp-\([0-9\.]*\)\.tar\.gz<.*/\1/'" -source=(http://www.samba.org/ftp/ppp/ppp-$pkgver.tar.gz ip-up ip-down) +source=(http://www.samba.org/ftp/ppp/ppp-$pkgver.tar.gz ip-up ip-down fixes.patch) sha1sums=('cb977b31584e3488e08a643aaa672fdb229d2e78' \ '52b2e62a47050498846aa769495628da2a00fb31' \ - '09472529dfcf1f47d7e7f65067291f651c7ac476') + '09472529dfcf1f47d7e7f65067291f651c7ac476' \ + '7c2ed3bcf34b750f6c29f95ddf43332d09a7a793') build() { Fcd + Fpatchall + CFLAGS="$CFLAGS -D_GNU_SOURCE" # begin patching - CFLAGS and the last one for enabling active filter @@ -28,15 +31,16 @@ build() Fsed "-g -O2" "${CFLAGS}" pppd/plugins/Makefile.linux Fsed "-g" "${CFLAGS}" pppd/plugins/rp-pppoe/Makefile.linux Fsed "-O2" "${CFLAGS}" pppstats/Makefile.linux - Fsed "-O2 -g -pipe/${CFLAGS}" chat/Makefile.linux + Fsed "-O2 -g -pipe" "${CFLAGS}" chat/Makefile.linux Fsed "-O" "${CFLAGS}" pppdump/Makefile.linux Fsed "^#FILTER=y" "FILTER=y" pppd/Makefile.linux Fsed "^#HAVE_INET6=y" "HAVE_INET6=y" pppd/Makefile.linux - Frm include/linux/if_pppol2tp.h + Fexec rm -f include/linux/if_pppol2tp.h || Fdie # end of patching - Fmake - make DESTDIR=$Fdestdir/usr install || return 1 + Fmake --prefix=$Fprefix + make DESTDIR=$Fdestdir/usr install || Fdie + Frm /usr/lib/pppd/$pkgver/rp-pppoe.so Fmkdir /etc/ppp/peers Fexe ip-{up,down} /etc/ppp/ Finstallrel 600 etc.ppp/* /etc/ppp/ diff --git a/source/base/ppp/fixes.patch b/source/base/ppp/fixes.patch new file mode 100644 index 0000000..609bbd7 --- /dev/null +++ b/source/base/ppp/fixes.patch @@ -0,0 +1,11 @@ +diff -ur a/pppd/ipv6cp.c b/pppd/ipv6cp.c +--- a/pppd/ipv6cp.c 2009-11-16 16:26:07.000000000 -0600 ++++ b/pppd/ipv6cp.c 2013-09-25 05:54:54.462298567 -0500 +@@ -151,6 +151,7 @@ + */ + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + #include <netdb.h> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
