diff options
Diffstat (limited to 'abs/core/ppp')
| -rw-r--r-- | abs/core/ppp/PKGBUILD | 64 | ||||
| -rw-r--r-- | abs/core/ppp/ppp-2.4.6-makefiles.patch | 270 |
2 files changed, 300 insertions, 34 deletions
diff --git a/abs/core/ppp/PKGBUILD b/abs/core/ppp/PKGBUILD index fb099a3..e7b4a00 100644 --- a/abs/core/ppp/PKGBUILD +++ b/abs/core/ppp/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 188844 2013-06-22 15:33:40Z thomas $ +# $Id$ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp -pkgver=2.4.5 -pkgrel=8 +pkgver=2.4.6 +pkgrel=2 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64) url="http://www.samba.org/ppp/" license=('custom:GPL/BSD') depends=('glibc' 'libpcap>=1.0.0') backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down,ip-down.d/00-dns.sh,ip-up.d/00-dns.sh,ipv6-up.d/00-iface-config.sh}) -source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz +source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz{,.asc} + ppp-2.4.6-makefiles.patch options ip-up ip-down @@ -19,35 +20,43 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz ipv6-down ipv6-up.d.iface-config.sh ppp.systemd) +sha256sums=('1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d' + 'SKIP' + 'f04f47318226c79594f45b8b75877c30710d22fe0fb1e2e17db3b4257dc4218c' + '0933fecb9e0adaddd88ee1e049a5f3a0508e83b81dc1aa333df784e729ab4b6e' + 'ddef42b2cc5d49e81556dc9dbacf5ee3bf8dc32704f3670c2233eed42c4a4efd' + '658630ba4c5cb583df80af6d4df81df8ae20798f63cc4b9cec8d4dad13a6a897' + 'aafb75b978aa13225444dc6b914fab324d686821be93c49e893800e647aa7648' + '17b486fa69a71dafcbe543dc4f2b8cb9ed31e675aabc5f6c98ef94dbc1561c85' + 'bb3f44a4f2c4b8dbe7f84d77feae90a71caa9fa3c252a20c390e015d4f8ea248' + '77292b79f99f97a01aa9a75cd7cd93da70d746d3b8cc60f35b31dfe0568544c0' + '20780cf4bd0774bebb55ecb3bdae7667c9ae5cbe003a52a1ecb0bbc77d46260f' + 'eb8ab2e2d71c3bb9c4297cf847b6e9d52616a3fdbf2257c479cc43dff318c831') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix CFLAGS - # -D_GNU_SOURCE is needed for IPv6 to work apparently - export CFLAGS="$CFLAGS -D_GNU_SOURCE" - sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux - sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux - sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux - sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux - sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux + patch -p1 -i "${srcdir}/ppp-2.4.6-makefiles.patch" # enable active filter sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux # enable ipv6 support sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux # Enable Microsoft proprietary Callback Control Protocol sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux - - # Fix build error with recent kernels - rm include/linux/if_pppol2tp.h +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + # -D_GNU_SOURCE is needed for IPv6 to work apparently + CFLAGS="$CPPFLAGS $CFLAGS -D_GNU_SOURCE" LDFLAGS="$LDFLAGS" ./configure --prefix=/usr make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/usr" install + make INSTROOT="${pkgdir}" install + install -D -m644 ../options "${pkgdir}/etc/ppp/options" install -D -m755 ../ip-up "${pkgdir}/etc/ppp/ip-up" install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down" @@ -60,28 +69,15 @@ package() { install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d" install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d" install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh" + install -D -m755 scripts/pon "${pkgdir}/usr/bin/pon" install -D -m755 scripts/poff "${pkgdir}/usr/bin/poff" - install -D -m755 scripts/plog "${pkgdir}/usr/sbin/plog" + install -D -m755 scripts/plog "${pkgdir}/usr/bin/plog" install -D -m644 scripts/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets" install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets" install -d -m755 "${pkgdir}/etc/ppp/peers" chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so - install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service - # usrmove - cd "$pkgdir"/usr - mv sbin/* bin/ - rmdir sbin + install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service } -md5sums=('4621bc56167b6953ec4071043fe0ec57' - '7a9259a8f038073eeea7e4552ff1849f' - 'e4beb16ed600b61336d50b2bd2df7cd5' - '529b924f644f80cf30d72a966abc7419' - '0e2eeb1af125a46291999162dcc9004a' - '3a5d56ac23e36cdbf48187813c8ec981' - '4cbd0a9af01c27067450ec7d3f5fa673' - 'b75c2fbc4afa9f2d8108b680c88c7036' - '9dde53aa5a931ebe1c7e3469199777c5' - '37401eb0c3dcccb87f5ac4716d0f9f2c') diff --git a/abs/core/ppp/ppp-2.4.6-makefiles.patch b/abs/core/ppp/ppp-2.4.6-makefiles.patch new file mode 100644 index 0000000..5fc7bcc --- /dev/null +++ b/abs/core/ppp/ppp-2.4.6-makefiles.patch @@ -0,0 +1,270 @@ +diff -Nur ppp-2.4.6.orig/chat/Makefile.linux ppp-2.4.6/chat/Makefile.linux +--- ppp-2.4.6.orig/chat/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/chat/Makefile.linux 2014-02-24 09:00:16.666577906 +0100 +@@ -1,7 +1,7 @@ + # $Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $ + + DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin ++BINDIR = $(DESTDIR)/bin + MANDIR = $(DESTDIR)/share/man/man8 + + CDEF1= -DTERMIOS # Use the termios structure +@@ -10,7 +10,8 @@ + CDEF4= -DFNDELAY=O_NDELAY # Old name value + CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) + +-COPTS= -O2 -g -pipe ++COPTS= @CFLAGS@ ++LDFLAGS= @LDFLAGS@ + CFLAGS= $(COPTS) $(CDEFS) + + INSTALL= install +@@ -21,7 +22,7 @@ + $(CC) -o chat chat.o + + chat.o: chat.c +- $(CC) -c $(CFLAGS) -o chat.o chat.c ++ $(CC) -c $(CFLAGS) $(LDFLAGS) -o chat.o chat.c + + install: chat + mkdir -p $(BINDIR) $(MANDIR) +diff -Nur ppp-2.4.6.orig/configure ppp-2.4.6/configure +--- ppp-2.4.6.orig/configure 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/configure 2014-02-24 09:00:16.743242620 +0100 +@@ -185,7 +185,10 @@ + rm -f $2 + if [ -f $1 ]; then + echo " $2 <= $1" +- sed -e "s,@DESTDIR@,$DESTDIR,g" -e "s,@SYSCONF@,$SYSCONF,g" $1 >$2 ++ sed -e "s|@DESTDIR@|$DESTDIR|g" \ ++ -e "s|@SYSCONF@|$SYSCONF|g" \ ++ -e "s|@CFLAGS@|$CFLAGS|g" \ ++ -e "s|@LDFLAGS@|$LDFLAGS|g" $1 >$2 + fi + } + +diff -Nur ppp-2.4.6.orig/linux/Makefile.top ppp-2.4.6/linux/Makefile.top +--- ppp-2.4.6.orig/linux/Makefile.top 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/linux/Makefile.top 2014-02-24 09:00:16.743242620 +0100 +@@ -1,7 +1,7 @@ + # PPP top-level Makefile for Linux. + + DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin ++BINDIR = $(DESTDIR)/bin + INCDIR = $(DESTDIR)/include + MANDIR = $(DESTDIR)/share/man + ETCDIR = $(INSTROOT)@SYSCONF@/ppp +diff -Nur ppp-2.4.6.orig/pppd/Makefile.linux ppp-2.4.6/pppd/Makefile.linux +--- ppp-2.4.6.orig/pppd/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/pppd/Makefile.linux 2014-02-24 09:00:16.743242620 +0100 +@@ -5,7 +5,7 @@ + + # Default installation locations + DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin ++BINDIR = $(DESTDIR)/bin + MANDIR = $(DESTDIR)/share/man/man8 + INCDIR = $(DESTDIR)/include + +@@ -32,7 +32,8 @@ + + # CC = gcc + # +-COPTS = -O2 -pipe -Wall -g ++COPTS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ + LIBS = + + # Uncomment the next 2 lines to include support for Microsoft's +diff -Nur ppp-2.4.6.orig/pppd/plugins/Makefile.linux ppp-2.4.6/pppd/plugins/Makefile.linux +--- ppp-2.4.6.orig/pppd/plugins/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/pppd/plugins/Makefile.linux 2014-02-24 09:00:16.779908379 +0100 +@@ -1,11 +1,11 @@ + #CC = gcc +-COPTS = -O2 -g ++COPTS = @CFLAGS@ + CFLAGS = $(COPTS) -I.. -I../../include -fPIC +-LDFLAGS = -shared ++LDFLAGS = @LDFLAGS@ -shared + INSTALL = install + + DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin ++BINDIR = $(DESTDIR)/bin + MANDIR = $(DESTDIR)/share/man/man8 + LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) + +diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux +--- ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 +@@ -1,7 +1,7 @@ + #CC = gcc +-COPTS = -O2 -g ++COPTS = @CFLAGS@ + CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC +-LDFLAGS = -shared ++LDFLAGS = @LDFLAGS@ + INSTALL = install + + #*********************************************************************** +@@ -33,7 +33,7 @@ + all: $(PLUGIN) + + $(PLUGIN): $(PLUGIN_OBJS) +- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) ++ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) -shared $^ $(LIBS) + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux +--- ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux 2014-02-24 09:01:06.325349425 +0100 +@@ -1,12 +1,12 @@ + #CC = gcc +-COPTS = -O2 -g ++COPTS = @CFLAGS@ + CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC +-LDFLAGS = -shared ++LDFLAGS = @LDFLAGS@ + INSTALL = install + + #*********************************************************************** + +-DESTDIR = @DESTDIR@ ++DESTDIR = $(INSTROOT)@DESTDIR@ + LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION) + + VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) +@@ -16,7 +16,7 @@ + all: $(PLUGINS) + + %.so: %.o +- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) ++ $(CC) $(CFLAGS) -o $@ $(LDFLAGS) -shared $^ $(LIBS) + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +diff -Nur ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.6/pppd/plugins/radius/Makefile.linux +--- ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/pppd/plugins/radius/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 +@@ -12,7 +12,8 @@ + INSTALL = install + + PLUGIN=radius.so radattr.so radrealms.so +-CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON ++CFLAGS=@CFLAGS@ -I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON ++LDFLAGS=@LDFLAGS@ + + # Uncomment the next line to include support for Microsoft's + # MS-CHAP authentication protocol. +@@ -43,13 +44,13 @@ + $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) + + radius.so: radius.o libradiusclient.a +- $(CC) -o radius.so -shared radius.o libradiusclient.a ++ $(CC) -o radius.so -shared $(LDFLAGS) radius.o libradiusclient.a + + radattr.so: radattr.o +- $(CC) -o radattr.so -shared radattr.o ++ $(CC) -o radattr.so -shared $(LDFLAGS) radattr.o + + radrealms.so: radrealms.o +- $(CC) -o radrealms.so -shared radrealms.o ++ $(CC) -o radrealms.so -shared $(LDFLAGS) radrealms.o + + CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \ + clientid.o sendserver.o lock.o util.o md5.o +diff -Nur ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux +--- ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 +@@ -15,7 +15,7 @@ + #*********************************************************************** + + DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin ++BINDIR = $(DESTDIR)/bin + LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION) + + PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h) +@@ -25,12 +25,14 @@ + # Version is set ONLY IN THE MAKEFILE! Don't delete this! + RP_VERSION=3.8p + +-COPTS=-O2 -g ++COPTS=@CFLAGS@ + CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' ++LDFLAGS=@LDFLAGS@ ++ + all: rp-pppoe.so pppoe-discovery + + pppoe-discovery: pppoe-discovery.o debug.o +- $(CC) -o pppoe-discovery pppoe-discovery.o debug.o ++ $(CC) -o pppoe-discovery $(LDFLAGS) pppoe-discovery.o debug.o + + pppoe-discovery.o: pppoe-discovery.c + $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c +@@ -39,7 +41,7 @@ + $(CC) $(CFLAGS) -c -o debug.o debug.c + + rp-pppoe.so: plugin.o discovery.o if.o common.o +- $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o ++ $(CC) -o rp-pppoe.so -shared $(LDFLAGS) plugin.o discovery.o if.o common.o + + install: all + $(INSTALL) -d -m 755 $(LIBDIR) +diff -Nur ppp-2.4.6.orig/pppdump/Makefile.linux ppp-2.4.6/pppdump/Makefile.linux +--- ppp-2.4.6.orig/pppdump/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/pppdump/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 +@@ -1,8 +1,9 @@ + DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin ++BINDIR = $(DESTDIR)/bin + MANDIR = $(DESTDIR)/share/man/man8 + +-CFLAGS= -O -I../include/net ++CFLAGS = @CFLAGS@ -I../include/net ++LDFLAGS = @LDFLAGS@ + OBJS = pppdump.o bsd-comp.o deflate.o zlib.o + + INSTALL= install +@@ -10,7 +11,7 @@ + all: pppdump + + pppdump: $(OBJS) +- $(CC) -o pppdump $(OBJS) ++ $(CC) $(LDFLAGS) -o pppdump $(OBJS) + + clean: + rm -f pppdump $(OBJS) *~ +diff -Nur ppp-2.4.6.orig/pppstats/Makefile.linux ppp-2.4.6/pppstats/Makefile.linux +--- ppp-2.4.6.orig/pppstats/Makefile.linux 2014-01-02 05:42:08.000000000 +0100 ++++ ppp-2.4.6/pppstats/Makefile.linux 2014-02-24 09:00:16.809907637 +0100 +@@ -3,14 +3,15 @@ + # $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $ + # + DESTDIR = $(INSTROOT)@DESTDIR@ +-BINDIR = $(DESTDIR)/sbin ++BINDIR = $(DESTDIR)/bin + MANDIR = $(DESTDIR)/share/man/man8 + + PPPSTATSRCS = pppstats.c + PPPSTATOBJS = pppstats.o + + #CC = gcc +-COPTS = -O ++COPTS = @CFLAGS@ ++LDFLAGS = @LDFLAGS@ + COMPILE_FLAGS = -I../include + LIBS = + +@@ -26,7 +27,7 @@ + $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) + + pppstats: $(PPPSTATSRCS) +- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS) + + clean: + rm -f pppstats *~ #* core |