diff --git a/config/functions b/config/functions index 17c63464a6..abe54bc26d 100644 --- a/config/functions +++ b/config/functions @@ -366,8 +366,6 @@ show_config() { config_message="$config_message\n - SAMBA mounting support:\t\t $SAMBA_SUPPORT" config_message="$config_message\n - SAMBA server support:\t\t $SAMBA_SERVER" config_message="$config_message\n - SFTP server support:\t\t\t $SFTP_SERVER" - config_message="$config_message\n - PPTP support:\t\t\t $PPTP_SUPPORT" - config_message="$config_message\n - OpenVPN support:\t\t\t $OPENVPN_SUPPORT" # OS configuration diff --git a/distributions/OpenELEC/options b/distributions/OpenELEC/options index 2c068d8ae7..fa9c130178 100644 --- a/distributions/OpenELEC/options +++ b/distributions/OpenELEC/options @@ -128,12 +128,6 @@ # build and install SFTP Server (yes / no) SFTP_SERVER="yes" -# build and install PPP support (yes / no) - PPTP_SUPPORT="yes" - -# build and install OpenVPN support (yes / no) - OPENVPN_SUPPORT="yes" - # build and install diskmounter support (udevil) # this service provide auto mounting support for external drives in the # mediacenter also automount internally drives at boottime via udev (yes / no) diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index d9a5f85ce0..0dfb382bf3 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -33,29 +33,15 @@ PKG_LONGDESC="The ConnMan project provides a daemon for managing internet connec PKG_IS_ADDON="no" PKG_AUTORECONF="yes" -if [ "$PPTP_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET ppp pptp" - CONNMAN_PPTP="--enable-pptp PPPD=/usr/sbin/pppd PPTP=/usr/sbin/pptp" -else - CONNMAN_PPTP="--disable-pptp" -fi - -if [ "$OPENVPN_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET openvpn" - CONNMAN_OPENVPN="--enable-openvpn --with-openvpn=/usr/sbin/openvpn" -else - CONNMAN_OPENVPN="--disable-openvpn" -fi - PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \ --disable-gtk-doc \ --disable-debug \ --disable-hh2serial-gps \ --disable-openconnect \ - $CONNMAN_OPENVPN \ + --disable-openvpn \ --disable-vpnc \ --disable-l2tp \ - $CONNMAN_PPTP \ + --disable-pptp \ --disable-iospm \ --disable-tist \ --disable-session-policy-local \ @@ -82,7 +68,6 @@ PKG_CONFIGURE_OPTS_TARGET="WPASUPPLICANT=/usr/bin/wpa_supplicant \ PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \ - vpn_storagedir=/storage/.config/vpn-config \ statedir=/run/connman" post_makeinstall_target() { diff --git a/packages/network/connman/system.d/connman-vpn.service b/packages/network/connman/system.d/connman-vpn.service deleted file mode 100644 index 54c0ab4bcc..0000000000 --- a/packages/network/connman/system.d/connman-vpn.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=ConnMan VPN service -Requires=dbus.socket -After=dbus.socket - -[Service] -Type=dbus -BusName=net.connman.vpn -EnvironmentFile=-/run/openelec/debug/connman.conf -ExecStart=/usr/sbin/connman-vpnd -n $CONNMANVPN_DEBUG -StandardOutput=null - -[Install] -WantedBy=multi-user.target diff --git a/packages/network/connman/tmpfiles.d/z_03_connman.conf b/packages/network/connman/tmpfiles.d/z_03_connman.conf index 9937675496..cdc18d8b8e 100644 --- a/packages/network/connman/tmpfiles.d/z_03_connman.conf +++ b/packages/network/connman/tmpfiles.d/z_03_connman.conf @@ -18,4 +18,3 @@ d /run/connman 0755 root root - - d /storage/.cache/connman 0755 root root - - -d /storage/.config/vpn-config 0755 root root - - diff --git a/packages/network/openvpn/package.mk b/packages/network/openvpn/package.mk deleted file mode 100644 index 1f1a9e10c1..0000000000 --- a/packages/network/openvpn/package.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2011 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 -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -# along with OpenELEC. If not, see . -################################################################################ - -PKG_NAME="openvpn" -PKG_VERSION="2.3.5" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://openvpn.net" -PKG_URL="http://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain lzo libressl" -PKG_PRIORITY="optional" -PKG_SECTION="network" -PKG_SHORTDESC="openvpn: a full featured SSL VPN software solution that integrates OpenVPN server capabilities." -PKG_LONGDESC="OpenVPN Access Server is a full featured SSL VPN software solution that integrates OpenVPN server capabilities, enterprise management capabilities, simplified OpenVPN Connect UI, and OpenVPN Client software packages that accommodate Windows, MAC, and Linux OS environments. OpenVPN Access Server supports a wide range of configurations, including secure and granular remote access to internal network and/ or private cloud network resources and applications with fine-grained access control." - -PKG_IS_ADDON="no" -PKG_AUTORECONF="yes" - -PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_decl_TUNSETPERSIST=no \ - --disable-server \ - --enable-password-save \ - --disable-plugins \ - --enable-iproute2 IPROUTE=/sbin/ip \ - --enable-management \ - --disable-socks \ - --disable-http-proxy \ - --enable-fragment \ - --disable-multihome \ - --disable-port-share \ - --disable-debug" 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) diff --git a/packages/network/pptp/package.mk b/packages/network/pptp/package.mk deleted file mode 100644 index 07f232f076..0000000000 --- a/packages/network/pptp/package.mk +++ /dev/null @@ -1,47 +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="pptp" -PKG_VERSION="1.8.0" -PKG_REV="1" -PKG_ARCH="any" -PKG_LICENSE="GPL" -PKG_SITE="http://pptpclient.sourceforge.net" -PKG_URL="$SOURCEFORGE_SRC/project/pptpclient/pptp/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain ppp" -PKG_PRIORITY="optional" -PKG_SECTION="network" -PKG_SHORTDESC="pptp: a Linux, FreeBSD, NetBSD and OpenBSD client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP" -PKG_LONGDESC="PPTP Client is a Linux, FreeBSD, NetBSD and OpenBSD client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP. Allows connection to a PPTP based Virtual Private Network (VPN)." - -PKG_IS_ADDON="no" -PKG_AUTORECONF="no" - -make_target() { - make PPPD="/usr/sbin/pppd" \ - IP="/sbin/ip" \ - CC="$CC" \ - CFLAGS="$CFLAGS" \ - LDFLAGS="$LDFLAGS" \ - config.h pptp -} - -makeinstall_target() { - mkdir -p $INSTALL/usr/sbin - cp -P pptp $INSTALL/usr/sbin -} \ No newline at end of file