diff --git a/packages/network/ppp/package.mk b/packages/network/ppp/package.mk deleted file mode 100644 index 3162bb90c7..0000000000 --- a/packages/network/ppp/package.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# OpenELEC is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OpenELEC. If not, see . -################################################################################ - -PKG_NAME="ppp" -PKG_VERSION="2.4.7" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://samba.org/" -PKG_URL="http://samba.org/ftp/ppp/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_PRIORITY="optional" -PKG_SECTION="network" -PKG_SHORTDESC="ppp: contains the pppd daemon and the chat program. This is used for connecting to other machines; often for connecting to the Internet via a dial-up or PPPoE connection to an ISP." -PKG_LONGDESC="The PPP package contains the pppd daemon and the chat program. This is used for connecting to other machines; often for connecting to the Internet via a dial-up or PPPoE connection to an ISP." - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -pre_configure_target() { -# ppp fails to build in subdirs - cd $ROOT/$PKG_BUILD - rm -rf .$TARGET_NAME - -# ppp-2.4.5 contains an out of date copy of the kernel header linux/if_pppol2tp.h. -# This needs to be removed to force it to use the one installed in /usr. If you don't -# remove this file the build will still succeed (thanks to a poorly written Makefile) -# but it will fail to compile the openl2tp.so, pppol2tp.so and rp-pppoe.so plugins - rm -rf include/linux/if_pppol2tp.h -} - -make_target() { - make COPTS="$CFLAGS" -} - -makeinstall_target() { - make DESTDIR=$SYSROOT_PREFIX/usr install-devel - make DESTDIR=$INSTALL/usr install -} - -post_makeinstall_target() { - rm -rf $INSTALL/usr/sbin/chat - rm -rf $INSTALL/usr/sbin/pppdump - rm -rf $INSTALL/usr/sbin/pppoe-discovery - rm -rf $INSTALL/usr/sbin/pppstats -} diff --git a/packages/network/ppp/patches/ppp-cflags.patch b/packages/network/ppp/patches/ppp-cflags.patch deleted file mode 100644 index 01b24cebb8..0000000000 --- a/packages/network/ppp/patches/ppp-cflags.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff -Naur ppp-2.4.5/chat/Makefile.linux ppp-2.4.5.patch/chat/Makefile.linux ---- ppp-2.4.5/chat/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/chat/Makefile.linux 2014-01-10 08:57:16.699478234 +0100 -@@ -10,7 +10,7 @@ - CDEF4= -DFNDELAY=O_NDELAY # Old name value - CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) - --COPTS= -O2 -g -pipe -+COPTS:= -O2 -g -pipe - CFLAGS= $(COPTS) $(CDEFS) - - INSTALL= install -diff -Naur ppp-2.4.5/pppd/Makefile.linux ppp-2.4.5.patch/pppd/Makefile.linux ---- ppp-2.4.5/pppd/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppd/Makefile.linux 2014-01-10 08:55:22.876569576 +0100 -@@ -32,7 +32,7 @@ - - # CC = gcc - # --COPTS = -O2 -pipe -Wall -g -+COPTS := -O2 -pipe -Wall -g - LIBS = - - # Uncomment the next 2 lines to include support for Microsoft's -diff -Naur ppp-2.4.5/pppd/plugins/Makefile.linux ppp-2.4.5.patch/pppd/plugins/Makefile.linux ---- ppp-2.4.5/pppd/plugins/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppd/plugins/Makefile.linux 2014-01-10 08:56:05.739471826 +0100 -@@ -1,5 +1,5 @@ - #CC = gcc --COPTS = -O2 -g -+COPTS := -O2 -g - CFLAGS = $(COPTS) -I.. -I../../include -fPIC - LDFLAGS = -shared - INSTALL = install -diff -Naur ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.5.patch/pppd/plugins/pppoatm/Makefile.linux ---- ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppd/plugins/pppoatm/Makefile.linux 2014-01-10 08:56:36.406462256 +0100 -@@ -1,5 +1,5 @@ - #CC = gcc --COPTS = -O2 -g -+COPTS := -O2 -g - CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC - LDFLAGS = -shared - INSTALL = install -diff -Naur ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.5.patch/pppd/plugins/pppol2tp/Makefile.linux ---- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppd/plugins/pppol2tp/Makefile.linux 2014-01-10 08:56:54.647468343 +0100 -@@ -1,5 +1,5 @@ - #CC = gcc --COPTS = -O2 -g -+COPTS := -O2 -g - CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC - LDFLAGS = -shared - INSTALL = install -diff -Naur ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5.patch/pppd/plugins/rp-pppoe/Makefile.linux ---- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppd/plugins/rp-pppoe/Makefile.linux 2014-01-10 08:56:20.595464447 +0100 -@@ -25,7 +25,7 @@ - # Version is set ONLY IN THE MAKEFILE! Don't delete this! - RP_VERSION=3.8p - --COPTS=-O2 -g -+COPTS:=-O2 -g - CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"' - all: rp-pppoe.so pppoe-discovery - -diff -Naur ppp-2.4.5/pppstats/Makefile.linux ppp-2.4.5.patch/pppstats/Makefile.linux ---- ppp-2.4.5/pppstats/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppstats/Makefile.linux 2014-01-10 08:57:41.568497184 +0100 -@@ -10,7 +10,7 @@ - PPPSTATOBJS = pppstats.o - - #CC = gcc --COPTS = -O -+COPTS := -O - COMPILE_FLAGS = -I../include - LIBS = - diff --git a/packages/network/ppp/patches/ppp-disable-filter-support.patch b/packages/network/ppp/patches/ppp-disable-filter-support.patch deleted file mode 100644 index 57f53baef7..0000000000 --- a/packages/network/ppp/patches/ppp-disable-filter-support.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur ppp-2.4.7/pppd/Makefile.linux ppp-2.4.7.patch/pppd/Makefile.linux ---- ppp-2.4.7/pppd/Makefile.linux 2014-08-09 14:31:39.000000000 +0200 -+++ ppp-2.4.7.patch/pppd/Makefile.linux 2014-09-10 13:31:20.731202543 +0200 -@@ -48,7 +48,7 @@ - # Uncomment the next line to include support for PPP packet filtering. - # This requires that the libpcap library and headers be installed - # and that the kernel driver support PPP packet filtering. --FILTER=y -+# FILTER=y - - # Uncomment the next line to enable multilink PPP (enabled by default) - # Linux distributions: Please leave multilink ENABLED in your builds diff --git a/packages/network/ppp/patches/ppp-dont_strip_on_makeinstall.patch b/packages/network/ppp/patches/ppp-dont_strip_on_makeinstall.patch deleted file mode 100644 index 49558c8703..0000000000 --- a/packages/network/ppp/patches/ppp-dont_strip_on_makeinstall.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -Naur ppp-2.4.5/chat/Makefile.linux ppp-2.4.5.patch/chat/Makefile.linux ---- ppp-2.4.5/chat/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/chat/Makefile.linux 2014-01-10 07:42:44.560700414 +0100 -@@ -25,7 +25,7 @@ - - install: chat - mkdir -p $(BINDIR) $(MANDIR) -- $(INSTALL) -s -c chat $(BINDIR) -+ $(INSTALL) -c chat $(BINDIR) - $(INSTALL) -c -m 644 chat.8 $(MANDIR) - - clean: -diff -Naur ppp-2.4.5/pppd/Makefile.linux ppp-2.4.5.patch/pppd/Makefile.linux ---- ppp-2.4.5/pppd/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppd/Makefile.linux 2014-01-10 07:42:44.561700278 +0100 -@@ -99,7 +99,7 @@ - CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include - LIBS += -lsrp -L/usr/local/ssl/lib -lcrypto - TARGETS += srp-entry --EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry -+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry - MANPAGES += srp-entry.8 - EXTRACLEAN += srp-entry.o - NEEDDES=y -@@ -200,7 +200,7 @@ - install: pppd - mkdir -p $(BINDIR) $(MANDIR) - $(EXTRAINSTALL) -- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd -+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd - if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \ - chmod o-rx,u+s $(BINDIR)/pppd; fi - $(INSTALL) -c -m 444 pppd.8 $(MANDIR) -diff -Naur ppp-2.4.5/pppd/plugins/radius/Makefile.linux ppp-2.4.5.patch/pppd/plugins/radius/Makefile.linux ---- ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppd/plugins/radius/Makefile.linux 2014-01-10 07:42:44.561700278 +0100 -@@ -36,9 +36,9 @@ - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 755 radius.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radattr.so $(LIBDIR) -- $(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radius.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radattr.so $(LIBDIR) -+ $(INSTALL) -c -m 755 radrealms.so $(LIBDIR) - $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) - $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) - -diff -Naur ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5.patch/pppd/plugins/rp-pppoe/Makefile.linux ---- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppd/plugins/rp-pppoe/Makefile.linux 2014-01-10 07:42:44.561700278 +0100 -@@ -43,9 +43,9 @@ - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR) -+ $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR) - $(INSTALL) -d -m 755 $(BINDIR) -- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR) -+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) - - clean: - rm -f *.o *.so pppoe-discovery -diff -Naur ppp-2.4.5/pppdump/Makefile.linux ppp-2.4.5.patch/pppdump/Makefile.linux ---- ppp-2.4.5/pppdump/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppdump/Makefile.linux 2014-01-10 07:42:44.561700278 +0100 -@@ -17,5 +17,5 @@ - - install: - mkdir -p $(BINDIR) $(MANDIR) -- $(INSTALL) -s -c pppdump $(BINDIR) -+ $(INSTALL) -c pppdump $(BINDIR) - $(INSTALL) -c -m 444 pppdump.8 $(MANDIR) -diff -Naur ppp-2.4.5/pppstats/Makefile.linux ppp-2.4.5.patch/pppstats/Makefile.linux ---- ppp-2.4.5/pppstats/Makefile.linux 2009-11-16 23:26:07.000000000 +0100 -+++ ppp-2.4.5.patch/pppstats/Makefile.linux 2014-01-10 07:42:44.561700278 +0100 -@@ -22,7 +22,7 @@ - - install: pppstats - -mkdir -p $(MANDIR) -- $(INSTALL) -s -c pppstats $(BINDIR) -+ $(INSTALL) -c pppstats $(BINDIR) - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) - - pppstats: $(PPPSTATSRCS)