From 15cd70d8180c2a45287e4bd8ce01a2a9248e8d62 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Mon, 24 Feb 2014 03:17:10 +0000 Subject: Mon Feb 24 03:14:11 UTC 2014 --- core/crda/0001-Makefile-Don-t-run-ldconfig.patch | 24 ++ ...Link-libreg.so-against-the-crypto-library.patch | 55 +++++ ...e-linking-order-to-avoid-compilation-erro.patch | 52 ++++ ...STDIR-support-in-install-libreg-rules-in-.patch | 37 +++ core/crda/PKGBUILD | 34 ++- core/crda/libnl32.patch | 12 - core/ed/PKGBUILD | 8 +- core/iw/PKGBUILD | 6 +- core/ppp/PKGBUILD | 64 +++-- core/ppp/ppp-2.4.6-makefiles.patch | 264 +++++++++++++++++++++ 10 files changed, 494 insertions(+), 62 deletions(-) create mode 100644 core/crda/0001-Makefile-Don-t-run-ldconfig.patch create mode 100644 core/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch create mode 100644 core/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch create mode 100644 core/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch delete mode 100644 core/crda/libnl32.patch create mode 100644 core/ppp/ppp-2.4.6-makefiles.patch (limited to 'core') diff --git a/core/crda/0001-Makefile-Don-t-run-ldconfig.patch b/core/crda/0001-Makefile-Don-t-run-ldconfig.patch new file mode 100644 index 000000000..e9f102dc4 --- /dev/null +++ b/core/crda/0001-Makefile-Don-t-run-ldconfig.patch @@ -0,0 +1,24 @@ +From 15bc8065e9dc5485c650c528f8d80f7536e378d6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:30:24 +0100 +Subject: [PATCH] Makefile: Don't run ldconfig + +--- + Makefile | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 80f4946..c003195 100644 +--- a/Makefile ++++ b/Makefile +@@ -130,7 +130,6 @@ install-libreg: + $(NQ) ' INSTALL libreg' + $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) + $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ +- $(Q)ldconfig + + %.o: %.c regdb.h $(LIBREG) + $(NQ) ' CC ' $@ +-- +1.9.0 + diff --git a/core/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch b/core/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch new file mode 100644 index 000000000..10dae5850 --- /dev/null +++ b/core/crda/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch @@ -0,0 +1,55 @@ +From e2e519730c33de4503ac5dda28863d029e3cf578 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Thomas=20B=C3=A4chler?= +Date: Fri, 21 Feb 2014 20:15:32 +0100 +Subject: [PATCH] Makefile: Link libreg.so against the crypto library. + +--- + Makefile | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index 1f25509..80f4946 100644 +--- a/Makefile ++++ b/Makefile +@@ -33,6 +33,7 @@ LDLIBS += $(LDLIBREG) + LDLIBS += -lm + LIBREG += libreg.so + LDFLAGS += -L ./ ++LIBREG_LDFLAGS += -lm + + all: all_noverify verify + +@@ -40,17 +41,19 @@ all_noverify: $(LIBREG) crda intersect regdbdump db2rd optimize + + ifeq ($(USE_OPENSSL),1) + CFLAGS += -DUSE_OPENSSL -DPUBKEY_DIR=\"$(RUNTIME_PUBKEY_DIR)\" `pkg-config --cflags openssl` +-LDLIBS += `pkg-config --libs openssl` ++LDCRYPTOLIB := `pkg-config --libs openssl` + + $(LIBREG): keys-ssl.c + + else + CFLAGS += -DUSE_GCRYPT +-LDLIBS += -lgcrypt ++LDCRYPTOLIB := -lgcrypt + + $(LIBREG): keys-gcrypt.c + + endif ++LDLIBS += $(LDCRYPTOLIB) ++LIBREG_LDFLAGS += $(LDCRYPTOLIB) + MKDIR ?= mkdir -p + INSTALL ?= install + +@@ -116,7 +119,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) + + $(LIBREG): regdb.h reglib.h reglib.c + $(NQ) ' CC ' $@ +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREG_LDFLAGS) + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +-- +1.9.0 + diff --git a/core/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch b/core/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch new file mode 100644 index 000000000..6807e99f8 --- /dev/null +++ b/core/crda/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch @@ -0,0 +1,52 @@ +From fefefdb2c52c8fbedbb339b4badb8226cad7e7e0 Mon Sep 17 00:00:00 2001 +From: Krishna Chaitanya +Date: Mon, 16 Dec 2013 21:57:39 +0530 +Subject: [PATCH] crda: Fix the linking order to avoid compilation error + +While linking the crda.o and libreg.so, first put crda.o +and then -lreg. This fixed the below error: + + GEN keys-gcrypt.c + Trusted pubkeys: pubkeys/linville.key.pub.pem + CC libreg.so + CC crda.o + LD crda +crda.o: In function `main': +crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2' +collect2: ld returned 1 exit status +make: *** [crda] Error 1 + +Note: This still doesn't fix the below error (will send another mail) + + CHK /usr/lib/crda/regulatory.bin +Database signature verification failed. +Invalid or empty regulatory file, note: a binary regulatory file should be used. +make: *** [verify] Error 234 + +Signed-off-by: Luis R. Rodriguez +Signed-off-by: Chaitanya T K +--- + Makefile | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 4a351c6..0b2f0d7 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys + CFLAGS += -O2 -fpic + CFLAGS += -std=gnu99 -Wall -Werror -pedantic + CFLAGS += -Wall -g +-LDLIBS += -lm + LDLIBREG += -lreg ++LDLIBS += $(LDLIBREG) ++LDLIBS += -lm + LIBREG += libreg.so +-LDFLAGS += -L ./ $(LDLIBREG) ++LDFLAGS += -L ./ + + all: all_noverify verify + +-- +1.9.0 + diff --git a/core/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch b/core/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch new file mode 100644 index 000000000..c69f8f7cb --- /dev/null +++ b/core/crda/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch @@ -0,0 +1,37 @@ +From 2cabb2588da56735369131b709f191453c080be0 Mon Sep 17 00:00:00 2001 +From: "John W. Linville" +Date: Fri, 14 Feb 2014 13:58:44 -0500 +Subject: [PATCH 2/2] crda: Add DESTDIR support in install-libreg* rules in + Makefile + +Signed-off-by: John W. Linville +Signed-off-by: Luis R. Rodriguez +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 0b2f0d7..1f25509 100644 +--- a/Makefile ++++ b/Makefile +@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c + + install-libreg-headers: + $(NQ) ' INSTALL libreg-headers' +- $(Q)mkdir -p $(INCLUDE_DIR) +- $(Q)cp *.h $(INCLUDE_DIR)/ ++ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) ++ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ + + install-libreg: + $(NQ) ' INSTALL libreg' +- $(Q)mkdir -p $(LIBDIR) +- $(Q)cp $(LIBREG) $(LIBDIR)/ ++ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) ++ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ + $(Q)ldconfig + + %.o: %.c regdb.h $(LIBREG) +-- +1.9.0 + diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index 358600e04..5862cccb4 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 203561 2014-01-13 17:11:37Z andyrtr $ +# $Id: PKGBUILD 206324 2014-02-23 22:56:35Z thomas $ # Maintainer: Thomas Bächler pkgname=crda -pkgver=1.1.3 -pkgrel=3 +pkgver=3.13 +pkgrel=1 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" @@ -11,15 +11,31 @@ license=('custom') depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd' 'iw') makedepends=('python2-m2crypto') install=crda.install -source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 - set-wireless-regdom) -md5sums=('29579185e06a75675507527243d28e5c' - '65c93f2ff2eb1b29d9e9fa102ae2dd45') +source=(https://kernel.org/pub/software/network/crda/${pkgname}-${pkgver}.tar.xz + set-wireless-regdom + 0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch + 0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch + 0001-Makefile-Link-libreg.so-against-the-crypto-library.patch + 0001-Makefile-Don-t-run-ldconfig.patch) +sha256sums=('2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59' + '603ce97da5cce3f5337e99007ce04e2f295bb33a36b308794884011f7bcabaf3' + '8920b5988eb1befe13f88ce5c0dbbf30c294796d613681a2b0925f6f8534c51b' + 'ced0a372b06ffd64f90be77d7267c9d8cc10413bc017c3154b7208dbf69be3cb' + '96b2068b27202f8bc78009869520e396cb3f3ac7a826efef06d0fc41047f2520' + 'ff52990cf9295e5cebcf07ebbf2a96e225d97088573edcc898b29ce33a0fb663') -build() { +prepare() { cd "${srcdir}"/${pkgname}-${pkgver} sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py - make crda regdbdump + patch -p1 -i "${srcdir}"/0001-crda-Fix-the-linking-order-to-avoid-compilation-erro.patch + patch -p1 -i "${srcdir}"/0002-crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch + patch -p1 -i "${srcdir}"/0001-Makefile-Link-libreg.so-against-the-crypto-library.patch + patch -p1 -i "${srcdir}"/0001-Makefile-Don-t-run-ldconfig.patch +} + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + make } package() { diff --git a/core/crda/libnl32.patch b/core/crda/libnl32.patch deleted file mode 100644 index 682b6c5de..000000000 --- a/core/crda/libnl32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile ---- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200 -+++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100 -@@ -51,7 +51,7 @@ - - ifeq ($(NL3FOUND),Y) - CFLAGS += -DCONFIG_LIBNL30 --NLLIBS += -lnl-genl -+NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) - NLLIBNAME = libnl-3.0 - else - ifeq ($(NL2FOUND),Y) diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index 96ba7fe0e..dea39dc3b 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189480 2013-07-03 11:36:49Z dreisner $ +# $Id: PKGBUILD 206312 2014-02-23 20:01:31Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Andreas Radke pkgname=ed -pkgver=1.9 +pkgver=1.10 pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') @@ -11,9 +11,9 @@ license=('GPL') url="http://www.gnu.org/software/ed/ed.html" depends=('glibc' 'sh') options=('!emptydirs') -source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig}) +source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.lz"{,.sig}) install='ed.install' -md5sums=('565b6d1d5a9a8816b9b304fc4ed9405d' +md5sums=('d1e51bb6e78417af8fb12684c31fd9eb' 'SKIP') build() { diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD index 6e5700409..ed743d241 100644 --- a/core/iw/PKGBUILD +++ b/core/iw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 204472 2014-01-20 18:47:27Z thomas $ +# $Id: PKGBUILD 206325 2014-02-23 22:56:38Z thomas $ # Maintainer: Thomas Bächler pkgname=iw -pkgver=3.13 +pkgver=3.14 pkgrel=1 pkgdesc="nl80211 based CLI configuration utility for wireless devices" arch=("i686" "x86_64") @@ -11,7 +11,7 @@ license=("GPL") depends=("libnl") makedepends=("linux-api-headers") source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('70c1c0f5145542b4d04dd52ad637920718515245e3dd3b4dc4c8e3b57b110dc6') +sha256sums=('871cb28aa554581ed3508b296071051cecbbbbdd8f62e95313e00840d908d999') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 75c85e092..2ff9af87f 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 188844 2013-06-22 15:33:40Z thomas $ +# $Id: PKGBUILD 206326 2014-02-23 23:01:58Z thomas $ # Maintainer: Thomas Baechler pkgname=ppp -pkgver=2.4.5 -pkgrel=8 +pkgver=2.4.6 +pkgrel=1 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,45 +20,43 @@ source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz ipv6-down ipv6-up.d.iface-config.sh ppp.systemd) -md5sums=('4621bc56167b6953ec4071043fe0ec57' - '7a9259a8f038073eeea7e4552ff1849f' - 'e4beb16ed600b61336d50b2bd2df7cd5' - '529b924f644f80cf30d72a966abc7419' - '0e2eeb1af125a46291999162dcc9004a' - '3a5d56ac23e36cdbf48187813c8ec981' - '4cbd0a9af01c27067450ec7d3f5fa673' - 'b75c2fbc4afa9f2d8108b680c88c7036' - '9dde53aa5a931ebe1c7e3469199777c5' - '37401eb0c3dcccb87f5ac4716d0f9f2c') +sha256sums=('1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d' + 'SKIP' + '811059427fb4240c29712782a7bb3f3e860450efe554ecbe094b78c9af6028cd' + '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" @@ -70,18 +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 } diff --git a/core/ppp/ppp-2.4.6-makefiles.patch b/core/ppp/ppp-2.4.6-makefiles.patch new file mode 100644 index 000000000..3e328d8c6 --- /dev/null +++ b/core/ppp/ppp-2.4.6-makefiles.patch @@ -0,0 +1,264 @@ +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-21 23:55:33.256988585 +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-21 23:56:43.732151365 +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-21 23:55:33.336986730 +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-21 23:55:33.336986730 +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-21 23:55:33.336986730 +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-21 23:55:33.336986730 +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-21 23:55:33.336986730 +0100 +@@ -1,7 +1,7 @@ + #CC = gcc +-COPTS = -O2 -g ++COPTS = @CFLAGS@ + CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC +-LDFLAGS = -shared ++LDFLAGS = @LDFLAGS@ + INSTALL = install + + #*********************************************************************** +@@ -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-21 23:55:33.336986730 +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-21 23:55:33.336986730 +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-21 23:55:33.336986730 +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-21 23:55:33.336986730 +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 -- cgit v1.2.3-54-g00ecf