From 17bf48cd8443ed43694969f91eefb95fd787ae5c Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 25 Dec 2010 17:51:22 +0100
Subject: [PATCH] ppp: remove package 'ppp', remove ppp support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/linux/unpack                    | 13 ------
 packages/network/install                 |  2 -
 packages/network/ppp/build               | 12 ------
 packages/network/ppp/config/adsl.sample  | 21 ----------
 packages/network/ppp/init.d/44_adsl      | 53 ------------------------
 packages/network/ppp/install             | 37 -----------------
 packages/network/ppp/meta                | 16 -------
 packages/network/ppp/scripts/pppoe-setup | 52 -----------------------
 projects/ATV/options                     |  3 --
 projects/Generic/options                 |  3 --
 projects/ION/options                     |  3 --
 projects/Intel/options                   |  3 --
 12 files changed, 218 deletions(-)
 delete mode 100755 packages/network/ppp/build
 delete mode 100644 packages/network/ppp/config/adsl.sample
 delete mode 100755 packages/network/ppp/init.d/44_adsl
 delete mode 100755 packages/network/ppp/install
 delete mode 100644 packages/network/ppp/meta
 delete mode 100755 packages/network/ppp/scripts/pppoe-setup

diff --git a/packages/linux/unpack b/packages/linux/unpack
index a8eb97f9dc..9e154c8476 100755
--- a/packages/linux/unpack
+++ b/packages/linux/unpack
@@ -20,19 +20,6 @@ cp $KERNEL_CFG_FILE $LINUX/.config
 sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$PKG_DIR/config/initramfs\"|" \
   $LINUX/.config
 
-if [ "$PPP_DAEMON" = yes ]; then
- echo  "CONFIG_PPP=m" >> $LINUX/.config
- echo  "CONFIG_PPP_MULTILINK=n" >> $LINUX/.config
- echo  "CONFIG_PPP_FILTER=n"    >> $LINUX/.config
- echo  "CONFIG_PPP_ASYNC=m"     >> $LINUX/.config
- echo  "CONFIG_PPP_SYNC_TTY=m"  >> $LINUX/.config
- echo  "CONFIG_PPP_DEFLATE=n"   >> $LINUX/.config
- echo  "CONFIG_PPP_BSDCOMP=n"   >> $LINUX/.config
- echo  "CONFIG_PPP_MPPE=n"      >> $LINUX/.config
- echo  "CONFIG_PPPOE=y"         >> $LINUX/.config
- echo  "CONFIG_PPPOL2TP=n"      >> $LINUX/.config
-fi 
-
 # copy some extra firmware to linux tree
   cp -R $PKG_DIR/firmware/* $LINUX/firmware
 
diff --git a/packages/network/install b/packages/network/install
index 77f0aedc80..055c5ac3ca 100755
--- a/packages/network/install
+++ b/packages/network/install
@@ -9,5 +9,3 @@ $SCRIPTS/install ethtool
 if [ "$NETMOUNT" = "yes" ]; then
   $SCRIPTS/install netmount
 fi
-
-#[ "$PPP_DAEMON" = yes ] && $SCRIPTS/install ppp
diff --git a/packages/network/ppp/build b/packages/network/ppp/build
deleted file mode 100755
index 8182a769d9..0000000000
--- a/packages/network/ppp/build
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-cd $PKG_BUILD
-
-./configure
-
-sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile
-
-make CC="$TARGET_CC" COPTS="$TARGET_CFLAGS"
-
diff --git a/packages/network/ppp/config/adsl.sample b/packages/network/ppp/config/adsl.sample
deleted file mode 100644
index 057795f72c..0000000000
--- a/packages/network/ppp/config/adsl.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-plugin /etc/ppp/plugins/rp-pppoe.so 
-# Ethernet interface name
-eth0
-# Your username at the ISP
-#user ""
-
-# What should be in the second column in /etc/ppp/*-secrets
-remotename "chap"
-# If needed, specify the service and the access concentrator name
-# rp_pppoe_service "internet"
-# rp_pppoe_ac "ac1"
-
-# The settings below usually don't need to be changed
-noauth
-hide-password
-updetach
-debug
-defaultroute
-noipdefault
-usepeerdns
-
diff --git a/packages/network/ppp/init.d/44_adsl b/packages/network/ppp/init.d/44_adsl
deleted file mode 100755
index c3b6dcb561..0000000000
--- a/packages/network/ppp/init.d/44_adsl
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.openelec.tv
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# start pppoe connection
-#
-# runlevels: openelec, textmode
-
-. /etc/profile
-
-progress "Starting pppoe connection"
-
-
-ifconfig eth0 up
-echo "nameserver 8.8.8.8" >> /var/cache/resolv.conf
-echo "nameserver 8.8.4.4" >> /var/cache/resolv.conf
-
-cp /etc/ppp/chap-secrets.sample /storage/.config/
-cp /etc/ppp/pap-secrets.sample /storage/.config/
-cp /etc/ppp/peers/adsl.sample  /storage/.config/
-
-
-
-      
-
-cp /storage/.config/chap-secrets /var/cache
-cp /storage/.config/pap-secrets  /var/cache
-cp /storage/.config/adsl 	 /var/cache
-
-modprobe ppp_generic
-modprobe ppp_async
-modprobe pppoe
-pppd call adsl
-   
-sleep 5 
diff --git a/packages/network/ppp/install b/packages/network/ppp/install
deleted file mode 100755
index 97529c4e3a..0000000000
--- a/packages/network/ppp/install
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-mkdir -p $INSTALL/etc/ppp
-  cp $PKG_BUILD/etc.ppp/chap-secrets $INSTALL/etc/ppp/chap-secrets.sample
-  cp $PKG_BUILD/etc.ppp/pap-secrets $INSTALL/etc/ppp/pap-secrets.sample
-
-# /etc/ppp/chap-secrets and /etc/ppp/pap-secets must be writeable
-  ln -sf /var/cache/chap-secrets $INSTALL/etc/ppp/chap-secrets
-  ln -sf /var/cache/pap-secrets  $INSTALL/etc/ppp/pap-secrets
-
-mkdir -p $INSTALL/etc/ppp/peers
-  cp $PKG_DIR/config/adsl.sample $INSTALL/etc/ppp/peers/
-
-# /etc/ppp/peers/adsl must be writeable
-  ln -sf /var/cache/adsl  $INSTALL/etc/ppp/peers/adsl
-
-mkdir -p $INSTALL/etc/ppp/plugins
-  cp $PKG_BUILD/pppd/plugins/rp-pppoe/rp-pppoe.so $INSTALL/etc/ppp/plugins
-
-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_DIR/scripts/pppoe-setup $INSTALL/usr/sbin
-
-  cp $PKG_BUILD/scripts/ppp-on  $INSTALL/usr/sbin/pon
-  cp $PKG_BUILD/scripts/ppp-off  $INSTALL/usr/sbin/poff
-  cp $PKG_BUILD/scripts/ppp-on-dialer  $INSTALL/usr/sbin
-  cp $PKG_BUILD/scripts/plog  $INSTALL/usr/sbin
-  cp $PKG_BUILD/chat/chat  $INSTALL/usr/sbin
-  cp $PKG_BUILD/pppd/pppd  $INSTALL/usr/sbin
-  cp $PKG_BUILD/pppd/plugins/rp-pppoe/pppoe-discovery $INSTALL/usr/sbin/
-  cp $PKG_BUILD/pppdump/pppdump  $INSTALL/usr/sbin
-  cp $PKG_BUILD/pppstats/pppstats    $INSTALL/usr/sbin
-
-mkdir -p $INSTALL/usr/lib/pppd/2.4.5
-  cp $PKG_BUILD/pppd/plugins/*.so $INSTALL/usr/lib/pppd/2.4.5
-
diff --git a/packages/network/ppp/meta b/packages/network/ppp/meta
deleted file mode 100644
index e75f30a220..0000000000
--- a/packages/network/ppp/meta
+++ /dev/null
@@ -1,16 +0,0 @@
-PKG_NAME="ppp"
-PKG_VERSION="2.4.5"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.samba.org/ppp/"
-PKG_URL="http://ppp.samba.org/ftp/ppp/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="ppp: The PPP user level programs"
-PKG_LONGDESC="The Point-to-Point Protocol (PPP) provides a standard way to establish a network connection over a serial link. At present, this package supports IP and the protocols layered above IP, such as TCP and UDP. The Linux port of this package also has support for IPX."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
diff --git a/packages/network/ppp/scripts/pppoe-setup b/packages/network/ppp/scripts/pppoe-setup
deleted file mode 100755
index bdb588f3dd..0000000000
--- a/packages/network/ppp/scripts/pppoe-setup
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-echo "Adsl configure........."
-
-while [ true ] ; do
-    echo ""
-    echo "USER NAME"
-    echo ""
-    printf "%s" ">>> Enter your PPPoE user name (default $user): "
-    read Uu
-
-    if [ "$Uu" = "" ] ; then
-	Uu="$user"
-    fi
-  
-    U=`echo $Uu | sed -e "s/&/\\\\\&/g"`
-
- while [ true ] ; do
-	echo ""
-	echo "PASSWORD"
-	echo ""
-	
-	printf "%s" ">>> Please enter your PPPoE password:    "
-	read PWD1
-	echo ""
-	printf "%s" ">>> Please re-enter your PPPoE password: "
-	read PWD2
-	echo ""
-	
-	if [ "$PWD1" = "$PWD2" ] ; then
-	    break
-	fi
-
-	printf "%s" ">>> Sorry, the passwords do not match.  Try again? (y/n)"
-	read ANS
-	case "$ANS" in
-	    N|No|NO|Non|n|no|non)
-		echo "OK, quitting.  Bye."
-		exit 1
-	esac
-    done
-
-
-
-echo "\"$Uu\"	*	\"$PWD1\"" > /storage/.config/chap-secrets 
-cp /storage/.config/chap-secrets /var/cache/
-
-echo "\"$Uu\"	*	\"$PWD1\"" > /storage/.config/pap-secrets
-cp /storage/.config/pap-secrets  /var/cache/
-exit  0
-done
-
diff --git a/projects/ATV/options b/projects/ATV/options
index 161e30eb51..bd2cde097f 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -99,9 +99,6 @@
 # build with netmount (mounting network drives on boot) support (yes / no)
   NETMOUNT="yes"
 
-# build ppp daemon (for configuring adsl etc...) (yes / no)
-  PPP_DAEMON="no"
-
 # build and install with XBMC webfrontend (yes / no)
   WEBSERVER="yes"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index fec09ac6f0..0834e595ad 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -98,9 +98,6 @@
 # build with netmount (mounting network drives on boot) support (yes / no)
   NETMOUNT="yes"
 
-# build ppp daemon (for configuring adsl etc...) (yes / no)
-  PPP_DAEMON="no"
-
 # build and install with XBMC webfrontend (yes / no)
   WEBSERVER="yes"
 
diff --git a/projects/ION/options b/projects/ION/options
index c9a130c222..92c6c944de 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -98,9 +98,6 @@
 # build with netmount (mounting network drives on boot) support (yes / no)
   NETMOUNT="yes"
 
-# build ppp daemon (for configuring adsl etc...) (yes / no)
-  PPP_DAEMON="no"
-
 # build and install with XBMC webfrontend (yes / no)
   WEBSERVER="yes"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index 17f26fbe0c..ca5926d49a 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -98,9 +98,6 @@
 # build with netmount (mounting network drives on boot) support (yes / no)
   NETMOUNT="yes"
 
-# build ppp daemon (for configuring adsl etc...) (yes / no)
-  PPP_DAEMON="no"
-
 # build and install with XBMC webfrontend (yes / no)
   WEBSERVER="yes"