[arch-commits] Commit in ppp/trunk (PKGBUILD ppp-2.4.6-makefiles.patch)
Thomas Bächler
thomas at nymeria.archlinux.org
Mon Feb 24 08:03:45 UTC 2014
Date: Monday, February 24, 2014 @ 09:03:44
Author: thomas
Revision: 206345
upgpkg: ppp 2.4.6-2: fix installation of l2tp plugins
Modified:
ppp/trunk/PKGBUILD
ppp/trunk/ppp-2.4.6-makefiles.patch
---------------------------+
PKGBUILD | 4 ++--
ppp-2.4.6-makefiles.patch | 30 ++++++++++++++++++------------
2 files changed, 20 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-02-24 06:30:08 UTC (rev 206344)
+++ PKGBUILD 2014-02-24 08:03:44 UTC (rev 206345)
@@ -2,7 +2,7 @@
# Maintainer: Thomas Baechler <thomas at archlinux.org>
pkgname=ppp
pkgver=2.4.6
-pkgrel=1
+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/"
@@ -22,7 +22,7 @@
ppp.systemd)
sha256sums=('1b33181a03962c8a092c055fb9980e9722728a8d98a4bb7ec7acda17c1b1b49d'
'SKIP'
- '811059427fb4240c29712782a7bb3f3e860450efe554ecbe094b78c9af6028cd'
+ 'f04f47318226c79594f45b8b75877c30710d22fe0fb1e2e17db3b4257dc4218c'
'0933fecb9e0adaddd88ee1e049a5f3a0508e83b81dc1aa333df784e729ab4b6e'
'ddef42b2cc5d49e81556dc9dbacf5ee3bf8dc32704f3670c2233eed42c4a4efd'
'658630ba4c5cb583df80af6d4df81df8ae20798f63cc4b9cec8d4dad13a6a897'
Modified: ppp-2.4.6-makefiles.patch
===================================================================
--- ppp-2.4.6-makefiles.patch 2014-02-24 06:30:08 UTC (rev 206344)
+++ ppp-2.4.6-makefiles.patch 2014-02-24 08:03:44 UTC (rev 206345)
@@ -1,6 +1,6 @@
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
++++ 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 $
@@ -31,7 +31,7 @@
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
++++ ppp-2.4.6/configure 2014-02-24 09:00:16.743242620 +0100
@@ -185,7 +185,10 @@
rm -f $2
if [ -f $1 ]; then
@@ -46,7 +46,7 @@
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
++++ 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.
@@ -58,7 +58,7 @@
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
++++ ppp-2.4.6/pppd/Makefile.linux 2014-02-24 09:00:16.743242620 +0100
@@ -5,7 +5,7 @@
# Default installation locations
@@ -80,7 +80,7 @@
# 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
++++ 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
@@ -98,7 +98,7 @@
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
++++ 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
@@ -120,8 +120,8 @@
$(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 @@
++++ 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@
@@ -131,6 +131,12 @@
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)
@@ -142,7 +148,7 @@
$(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
++++ ppp-2.4.6/pppd/plugins/radius/Makefile.linux 2014-02-24 09:00:16.809907637 +0100
@@ -12,7 +12,8 @@
INSTALL = install
@@ -172,7 +178,7 @@
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
++++ ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux 2014-02-24 09:00:16.809907637 +0100
@@ -15,7 +15,7 @@
#***********************************************************************
@@ -210,7 +216,7 @@
$(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
++++ 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
@@ -234,7 +240,7 @@
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
++++ 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 $
#
More information about the arch-commits
mailing list