Index: npl/internetserver/libreswan/libreswan.SlackBuild
===================================================================
--- npl/internetserver/libreswan/libreswan.SlackBuild	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/libreswan/libreswan.SlackBuild	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -16,5 +16,5 @@
 KVER=`uname -r` || exit 1
 NAME=libreswan
-VERSION=3.21
+VERSION=3.22
 CWD=`pwd`
 TMP="/tmp"
@@ -37,6 +37,6 @@
 #make KERNELSRC=/usr/src/linux INC_USRLOCAL=/usr module || exit 1
 
-make USE_DNSSEC=NO USE_SYSTEMD_WATCHDOG=false INC_USRLOCAL=/usr programs || exit 1
-make USE_DNSSEC=NO USE_SYSTEMD_WATCHDOG=false INC_USRLOCAL=/usr DESTDIR=$PKGTMP install || exit 1
+make USE_LABELED_IPSEC=false USE_DNSSEC=NO USE_SYSTEMD_WATCHDOG=false INC_USRLOCAL=/usr programs || exit 1
+make USE_LABELED_IPSEC=false USE_DNSSEC=NO USE_SYSTEMD_WATCHDOG=false INC_USRLOCAL=/usr DESTDIR=$PKGTMP install || exit 1
 #make programs || exit 1
 #make DESTDIR=$PKGTMP install || exit 1
Index: npl/internetserver/libreswan/libreswan.build
===================================================================
--- npl/internetserver/libreswan/libreswan.build	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/libreswan/libreswan.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,1 +1,1 @@
-6532
+6537
Index: npl/internetserver/libreswan/libreswan.md5
===================================================================
--- npl/internetserver/libreswan/libreswan.md5	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/libreswan/libreswan.md5	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,6 +1,5 @@
-f2abcdcdccb2ec42f226a6dbb0528cad  ./libreswan-3.19.tar.gz
-cdd455cc3a97cd975ca9c92a55970641  ./libreswan-3.21.tar.gz
-faefabcbb43cfed9eb1ec10afe48349f  ./libreswan.pkg
-61949529dcf9867f1e72f4bc20382f24  ./libreswan.SlackBuild
-a50e41be47f9492ada4a8074e77822ce  ./libreswan.SlackBuild.log.gz
+27a3fdcad3fa6c8083f2037a267aa01e  ./libreswan-3.22.tar.gz
+b2e463d0f17ba6387ddd271af2bfbf70  ./libreswan.pkg
+2e74d349b48eaafc0555e3e183661a43  ./libreswan.SlackBuild
+9fdc78bd6bb7b19b82ec160709c910eb  ./libreswan.SlackBuild.log.gz
 fe6e06b11db12940987cc2010b48a71e  ./libreswan.tar.gz
Index: npl/internetserver/libreswan/libreswan.version
===================================================================
--- npl/internetserver/libreswan/libreswan.version	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/libreswan/libreswan.version	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,1 +1,1 @@
-3.21
+3.22
Index: l/internetserver/poptop_ppp/patches/mppe_lower_mtu.diff
===================================================================
--- npl/internetserver/poptop_ppp/patches/mppe_lower_mtu.diff	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,71 +1,0 @@
---- ppp-2.4.3/pppd/ccp.c	2004-11-13 02:28:15.000000000 +0000
-+++ ppp-2.4.3/pppd/ccp.c	2004-11-22 16:36:21.654092711 +0000
-@@ -67,6 +67,7 @@
-  */
- #ifdef MPPE
- bool refuse_mppe_stateful = 1;		/* Allow stateful mode? */
-+bool mppe_lower_mtu = 1; /* Set to 0 to disable dropping the MTU by 4 */
- #endif
- 
- static option_t ccp_option_list[] = {
-@@ -156,6 +157,15 @@
-       "allow MPPE stateful mode", OPT_PRIO },
-     { "nomppe-stateful", o_bool, &refuse_mppe_stateful,
-       "disallow MPPE stateful mode", OPT_PRIO | 1 },
-+    
-+    /* Option to avoid lowering our MTU by 4 (as should be done) to avoid
-+     * breakage with devices that don't handle PMTUD
-+     */
-+    { "mppe-lower-mtu", o_bool, &mppe_lower_mtu,
-+      "lower the MTU by 4 bytes for MPPE connections", OPT_PRIO | 1 },
-+    { "nomppe-lower-mtu", o_bool, &mppe_lower_mtu,
-+      "don't lower the MTU by 4 bytes for MPPE connections", OPT_PRIO },
-+
- #endif /* MPPE */
- 
-     { NULL }
-@@ -1185,9 +1195,16 @@
- 		     * allocate MPPE_PAD extra bytes in xmit buffers.
- 		     */
- 		    mtu = netif_get_mtu(f->unit);
--		    if (mtu)
--			netif_set_mtu(f->unit, mtu - MPPE_PAD);
--		    else
-+		    if (mtu) {
-+			/* Dropping the MTU seems to break Path MTU discovery
-+			 * particularly where load-balancers are involved.
-+			 * Not dropping the MTU may mean the occasional packet
-+			 * goes unencrypted due to them being 4 bytes larger
-+			 * and CCP thinking it's not worth encrypting.
-+			 */
-+			if (mppe_lower_mtu)
-+			    netif_set_mtu(f->unit, mtu - MPPE_PAD);
-+		    } else
- 			newret = CONFREJ;
- 		}
- 
---- ppp-2.4.3/pppd/pppd.8	2004-11-22 16:36:21.663090491 +0000
-+++ ppp-2.4.3/pppd/pppd.8	2004-11-22 16:43:15.169028425 +0000
-@@ -622,6 +622,10 @@
- Enables the use of PPP multilink; this is an alias for the `multilink'
- option.  This option is currently only available under Linux.
- .TP
-+.B mppe\-lower\-mtu
-+Lowers the MTU by 4 bytes for MPPE connections. This is the correct
-+behaviour but breaks accessing some sites. This is the default.
-+.TP
- .B mppe\-stateful
- Allow MPPE to use stateful mode.  Stateless mode is still attempted first.
- The default is to disallow stateful mode.  
-@@ -766,6 +770,11 @@
- .B nomppe\-128
- Disable 128-bit encryption with MPPE.
- .TP
-+.TP
-+.B nomppe\-lower\-mtu
-+Disables lowering the MTU by 4 bytes for MPPE connections. This is sometimes
-+required to access servers behind load balancing devices that break Path
-+MTU Discovery.
- .B nomppe\-stateful
- Disable MPPE stateful mode.  This is the default.
- .TP
Index: l/internetserver/poptop_ppp/patches/ppp-2.3.6-sample.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.3.6-sample.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,295 +1,0 @@
---- ppp-2.3.3/sample/auth-down.sample	Tue Jan  6 17:53:27 1998
-+++ ppp-2.3.3/sample/auth-down	Tue Jan  6 17:53:27 1998
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+#
-+# A program or script which is executed after the remote system
-+# successfully authenticates itself. It is executed with the parameters
-+# <interface-name> <peer-name> <user-name> <tty-device> <speed>
-+#
-+
-+#
-+# The environment is cleared before executing this script
-+# so the path must be reset
-+#
-+PATH=/usr/sbin:/sbin:/usr/bin:/bin
-+export PATH
-+
-+echo auth-down `date +'%y/%m/%d %T'` $* >> /var/log/pppstats
-+
-+# last line
---- ppp-2.3.3/sample/auth-up.sample	Tue Jan  6 17:53:27 1998
-+++ ppp-2.3.3/sample/auth-up	Tue Jan  6 17:53:27 1998
-@@ -0,0 +1,17 @@
-+#!/bin/sh
-+#
-+# A program or script which is executed after the remote system
-+# successfully authenticates itself. It is executed with the parameters
-+# <interface-name> <peer-name> <user-name> <tty-device> <speed>
-+#
-+
-+#
-+# The environment is cleared before executing this script
-+# so the path must be reset
-+#
-+PATH=/usr/sbin:/sbin:/usr/bin:/bin
-+export PATH
-+
-+echo auth-up `date +'%y/%m/%d %T'` $* >> /var/log/pppstats
-+
-+# last line
---- ppp-2.3.3/sample/ip-down.sample	Tue Jan  6 17:53:27 1998
-+++ ppp-2.3.3/sample/ip-down	Tue Jan  6 17:53:27 1998
-@@ -0,0 +1,22 @@
-+#!/bin/sh
-+#
-+# This script is run by the pppd _after_ the link is brought down.
-+# It should be used to delete routes, unset IP addresses etc.
-+#
-+# This script is called with the following arguments:
-+#    Arg  Name               Example
-+#    $1   Interface name     ppp0
-+#    $2   The tty            ttyS1
-+#    $3   The link speed     38400
-+#    $4   Local IP number    12.34.56.78
-+#    $5   Peer  IP number    12.34.56.99
-+#
-+
-+#
-+# The  environment is cleared before executing this script
-+# so the path must be reset
-+#
-+PATH=/usr/sbin:/sbin:/usr/bin:/bin
-+export PATH
-+
-+# last line
---- ppp-2.3.3/sample/ip-up.sample	Tue Jan  6 17:53:27 1998
-+++ ppp-2.3.3/sample/ip-up	Tue Jan  6 17:53:27 1998
-@@ -0,0 +1,23 @@
-+#!/bin/sh
-+#
-+# This script is run by the pppd after the link is established.
-+# It should be used to add routes, set IP address, run the mailq 
-+# etc.
-+#
-+# This script is called with the following arguments:
-+#    Arg  Name               Example
-+#    $1   Interface name     ppp0
-+#    $2   The tty            ttyS1
-+#    $3   The link speed     38400
-+#    $4   Local IP number    12.34.56.78
-+#    $5   Peer  IP number    12.34.56.99
-+#
-+
-+#
-+# The  environment is cleared before executing this script
-+# so the path must be reset
-+#
-+PATH=/usr/sbin:/sbin:/usr/bin:/bin
-+export PATH
-+
-+# last line
---- ppp-2.3.3/sample/options.sample	Tue Jan  6 17:53:27 1998
-+++ ppp-2.3.3/sample/options	Tue Jan  6 17:53:27 1998
-@@ -0,0 +1,153 @@
-+# /etc/ppp/options
-+
-+# The name of this server. Often, the FQDN is used here.
-+#name <host>
-+
-+# Enforce the use of the hostname as the name of the local system for
-+# authentication purposes (overrides the name option).
-+usehostname
-+
-+# If no local IP address is given, pppd will use the first IP address
-+# that belongs to the local hostname. If "noipdefault" is given, this
-+# is disabled and the peer will have to supply an IP address.
-+noipdefault
-+
-+# With this option, pppd will accept the peer's idea of our local IP
-+# address, even if the local IP address was specified in an option.
-+#ipcp-accept-local
-+
-+# With this option, pppd will accept the peer's idea of its (remote) IP
-+# address, even if the remote IP address was specified in an option.
-+#ipcp-accept-remote
-+
-+# Specify which DNS Servers the incoming Win95 or WinNT Connection should use
-+# Two Servers can be remotely configured
-+#ms-dns 192.168.1.1
-+#ms-dns 192.168.1.2
-+
-+# Specify which WINS Servers the incoming connection Win95 or WinNT should use
-+#wins-addr 192.168.1.50
-+#wins-addr 192.168.1.51
-+
-+# enable this on a server that already has a permanent default route
-+#nodefaultroute
-+
-+# Run the executable or shell command specified after pppd has terminated
-+# the link.  This script could, for example, issue commands to the modem
-+# to cause it to hang up if hardware modem control signals were not
-+# available.
-+# If mgetty is running, it will reset the modem anyway. So there is no need
-+# to do it here.
-+#disconnect "chat -- \d+++\d\c OK ath0 OK"
-+
-+# Increase debugging level (same as -d). The debug output is written
-+# to syslog LOG_LOCAL2.
-+debug
-+
-+# Enable debugging code in the kernel-level PPP driver.  The argument n
-+# is a number which is the sum of the following values: 1 to enable
-+# general debug messages, 2 to request that the contents of received
-+# packets be printed, and 4 to request that the contents of transmitted
-+# packets be printed.
-+#kdebug n
-+
-+# Require the peer to authenticate itself before allowing network
-+# packets to be sent or received.
-+# Please do not disable this setting. It is expected to be standard in
-+# future releases of pppd. Use the call option (see manpage) to disable
-+# authentication for specific peers.
-+#auth
-+
-+# authentication can either be pap or chap. As most people only want to
-+# use pap, you can also disable chap:
-+#require-pap
-+#refuse-chap
-+
-+# Use hardware flow control (i.e. RTS/CTS) to control the flow of data
-+# on the serial port.
-+crtscts
-+
-+# Specifies that pppd should use a UUCP-style lock on the serial device
-+# to ensure exclusive access to the device.
-+lock
-+
-+# Use the modem control lines.
-+modem
-+
-+# async character map -- 32-bit hex; each bit is a character
-+# that needs to be escaped for pppd to receive it.  0x00000001
-+# represents '\x01', and 0x80000000 represents '\x1f'.
-+# To allow pppd to work over a rlogin/telnet connection, ou should escape
-+# XON (^Q), XOFF  (^S) and ^]: (The peer should use "escape ff".)
-+#asyncmap  200a0000
-+asyncmap 0
-+
-+# Specifies that certain characters should be escaped on transmission
-+# (regardless of whether the peer requests them to be escaped with its
-+# async control character map).  The characters to be escaped are
-+# specified as a list of hex numbers separated by commas.  Note that
-+# almost any character can be specified for the escape option, unlike
-+# the asyncmap option which only allows control characters to be
-+# specified.  The characters which may not be escaped are those with hex
-+# values 0x20 - 0x3f or 0x5e.
-+#escape 11,13,ff
-+
-+# Set the MRU [Maximum Receive Unit] value to <n> for negotiation.  pppd
-+# will ask the peer to send packets of no more than <n> bytes. The
-+# minimum MRU value is 128.  The default MRU value is 1500.  A value of
-+# 296 is recommended for slow links (40 bytes for TCP/IP header + 256
-+# bytes of data).
-+#mru 542
-+
-+# Set the MTU [Maximum Transmit Unit] value to <n>. Unless the peer
-+# requests a smaller value via MRU negotiation, pppd will request that
-+# the kernel networking code send data packets of no more than n bytes
-+# through the PPP network interface.
-+#mtu <n>
-+
-+# Set the interface netmask to <n>, a 32 bit netmask in "decimal dot"
-+# notation (e.g. 255.255.255.0).
-+#netmask 255.255.255.0
-+
-+# Don't fork to become a background process (otherwise pppd will do so
-+# if a serial device is specified).
-+nodetach
-+
-+# Set the assumed name of the remote system for authentication purposes
-+# to <n>.
-+#remotename <n>
-+
-+# Add an entry to this system's ARP [Address Resolution Protocol]
-+# table with the IP address of the peer and the Ethernet address of this
-+# system. {proxyarp,noproxyarp}
-+proxyarp
-+
-+# Use the system password database for authenticating the peer using
-+# PAP. Note: mgetty already provides this option. If this is specified
-+# then dialin from users using a script under Linux to fire up ppp wont work.
-+#login
-+
-+# If this option is given, pppd will send an LCP echo-request frame to
-+# the peer every n seconds. Under Linux, the echo-request is sent when
-+# no packets have been received from the peer for n seconds. Normally
-+# the peer should respond to the echo-request by sending an echo-reply.
-+# This option can be used with the lcp-echo-failure option to detect
-+# that the peer is no longer connected.
-+lcp-echo-interval 30
-+
-+# If this option is given, pppd will presume the peer to be dead if n
-+# LCP echo-requests are sent without receiving a valid LCP echo-reply.
-+# If this happens, pppd will terminate the connection.  Use of this
-+# option requires a non-zero value for the lcp-echo-interval parameter.
-+# This option can be used to enable pppd to terminate after the physical
-+# connection has been broken (e.g., the modem has hung up) in
-+# situations where no hardware modem control lines are available.
-+lcp-echo-failure 4
-+
-+# Specifies that pppd should disconnect if the link is idle for n seconds.
-+idle 600
-+
-+# Disable the IPXCP and IPX protocols.
-+noipx
-+
-+# ---<End of File>---
---- ppp-2.3.3/sample/options.ttyXX.sample	Tue Jan  6 17:53:27 1998
-+++ ppp-2.3.3/sample/options.ttyXX	Tue Jan  6 17:53:27 1998
-@@ -0,0 +1,14 @@
-+# If you need to set up multiple serial lines then copy this file to
-+# options.<ttyname> for each tty with a modem on it.
-+#
-+# The options.tty file will assign an IP address to each PPP connection
-+# as it comes up. They must all be distinct!
-+#
-+# Example:
-+# options.ttyS1		for com2 under DOS.
-+#
-+# Edit the following line so that the first IP address
-+# mentioned is the ip address of the serial port while the second
-+# is the IP address of your host
-+#
-+hostname-s1:hostname
---- ppp-2.3.3/sample/pap-secrets.sample	Tue Jan  6 17:53:27 1998
-+++ ppp-2.3.3/sample/pap-secrets	Tue Jan  6 17:53:27 1998
-@@ -0,0 +1,28 @@
-+# Secrets for authentication using PAP
-+# client	server	secret			IP addresses
-+
-+# OUTBOUND CONNECTIONS
-+# Here you should add your userid password to connect to your providers via
-+# pap. The * means that the password is to be used for ANY host you connect
-+# to. Thus you do not have to worry about the foreign machine name. Just
-+# replace password with your password.
-+# If you have different providers with different passwords then you better
-+# remove the following line.
-+#hostname	*	password
-+
-+# INBOUND CONNECTIONS
-+#client		hostname	<password>	192.168.1.1
-+
-+# If you add "auth login -chap +pap" to /etc/mgetty+sendfax/login.config,
-+# all users in /etc/passwd can use their password for pap-authentication.
-+#
-+# Every regular user can use PPP and has to use passwords from /etc/passwd
-+#*	hostname	""
-+# UserIDs that cannot use PPP at all. Check your /etc/passwd and add any
-+# other accounts that should not be able to use pppd! Replace hostname
-+# with your local hostname.
-+#guest		hostname	"*"	-
-+#master		hostname	"*"	-
-+#root		hostname	"*"	-
-+#support	hostname	"*"	-
-+#stats		hostname	"*"	-
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.1-varargs.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.1-varargs.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- ppp-2.4.1/pppd/utils.c	Thu Jun  6 16:22:58 2002
-+++ ppp-2.4.1/pppd/utils.c	Thu Jun  6 16:22:00 2002
-@@ -254,7 +254,7 @@
- 	    break;
- 	case 'r':
- 	    f = va_arg(args, char *);
--#ifndef __powerpc__
-+#if !defined(__powerpc__) && !defined(__s390__) && !defined(__s390x__) && !defined(__x86_64__)
- 	    n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
- #else
- 	    /* On the powerpc, a va_list is an array of 1 structure */
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.2-argv.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.2-argv.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- ppp-2.4.2/pppd/plugins/passprompt.c.argv	2004-09-16 12:06:19.773788846 +0200
-+++ ppp-2.4.2/pppd/plugins/passprompt.c	2004-09-16 12:06:24.203178380 +0200
-@@ -50,7 +50,7 @@
-     }
-     if (!kid) {
- 	/* we are the child, exec the program */
--	char *argv[4], fdstr[32];
-+	char *argv[5], fdstr[32];
- 	sys_close();
- 	closelog();
- 	close(p[0]);
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.2-change_resolv_conf.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.2-change_resolv_conf.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,49 +1,0 @@
---- ppp-2.4.2/scripts/ip-down.local.add.change_resolv_conf	1999-02-27 05:32:42.000000000 +0100
-+++ ppp-2.4.2/scripts/ip-down.local.add	2004-09-14 14:36:20.058008752 +0200
-@@ -9,12 +9,13 @@
- #
- # Nick Walker (nickwalker@email.com)
- #
-+. /etc/sysconfig/network-scripts/network-functions
- 
--if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
--	if [ -f /etc/ppp/resolv.prev ]; then
--		cp -f /etc/ppp/resolv.prev /etc/resolv.conf
-+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
-+	if [ -f /var/run/ppp/resolv.prev ]; then
-+		change_resolv_conf /var/run/ppp/resolv.prev
- 	else
--		rm -f /etc/resolv.conf
-+		change_resolv_conf
- 	fi
- fi
- 
---- ppp-2.4.2/scripts/ip-up.local.add.change_resolv_conf	1999-11-15 04:28:10.000000000 +0100
-+++ ppp-2.4.2/scripts/ip-up.local.add	2004-09-14 14:37:39.129061828 +0200
-@@ -9,16 +9,19 @@
- #
- # Nick Walker (nickwalker@email.com)
- #
-+. /etc/sysconfig/network-scripts/network-functions
- 
--if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then
--	rm -f /etc/ppp/resolv.prev
-+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then
-+	rm -f /var/run/ppp/resolv.prev
- 	if [ -f /etc/resolv.conf ]; then
--		cp /etc/resolv.conf /etc/ppp/resolv.prev
--		grep domain /etc/ppp/resolv.prev > /etc/resolv.conf
--		grep search /etc/ppp/resolv.prev >> /etc/resolv.conf
--		cat /etc/ppp/resolv.conf >> /etc/resolv.conf
-+		cp /etc/resolv.conf /var/run/ppp/resolv.prev
-+		rscf=/var/run/ppp/resolv.new
-+		grep domain /var/run/ppp/resolv.prev > $rscf
-+		grep search /var/run/ppp/resolv.prev >> $rscf
-+		change_resolv_conf $rscf
-+		rm -f $rscf
- 	else
--		cp /etc/ppp/resolv.conf /etc
-+		change_resolv_conf /var/run/ppp/resolv.conf
- 	fi
- fi
- 
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.2-ifname.diff
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.2-ifname.diff	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,126 +1,0 @@
---- ./pppd/main.c.orig	2004-07-19 12:35:22.000000000 +0000
-+++ ./pppd/main.c	2004-07-19 14:34:38.542120946 +0000
-@@ -98,7 +98,7 @@
- static const char rcsid[] = RCSID;
- 
- /* interface vars */
--char ifname[32];		/* Interface name */
-+char ifname[MAXIFNAMELEN];	/* Interface name */
- int ifunit;			/* Interface unit number */
- 
- struct channel *the_channel;
-@@ -261,13 +261,6 @@
-     NULL
- };
- 
--/*
-- * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
-- */
--#if !defined(PPP_DRV_NAME)
--#define PPP_DRV_NAME	"ppp"
--#endif /* !defined(PPP_DRV_NAME) */
--
- int
- main(argc, argv)
-     int argc;
-@@ -777,8 +770,11 @@
- set_ifunit(iskey)
-     int iskey;
- {
--    info("Using interface %s%d", PPP_DRV_NAME, ifunit);
-+    if (req_ifname[0] != '\0')
-+	slprintf(ifname, sizeof(ifname), req_ifname);
-+    else
-     slprintf(ifname, sizeof(ifname), "%s%d", PPP_DRV_NAME, ifunit);
-+    info("Using interface %s", ifname);
-     script_setenv("IFNAME", ifname, iskey);
-     if (iskey) {
- 	create_pidfile(getpid());	/* write pid to file */
---- ./pppd/options.c.orig	2004-07-19 12:59:21.000000000 +0000
-+++ ./pppd/options.c	2004-07-19 14:35:04.253865964 +0000
-@@ -102,6 +102,7 @@
- bool	tune_kernel;		/* may alter kernel settings */
- int	connect_delay = 1000;	/* wait this many ms after connect script */
- int	req_unit = -1;		/* requested interface unit */
-+char	req_ifname[MAXIFNAMELEN];	/* requested interface name */
- bool	multilink = 0;		/* Enable multilink operation */
- char	*bundle_name = NULL;	/* bundle name for multilink */
- bool	dump_options;		/* print out option values */
-@@ -259,6 +260,10 @@
-       "PPP interface unit number to use if possible",
-       OPT_PRIO | OPT_LLIMIT, 0, 0 },
- 
-+    { "ifname", o_string, req_ifname,
-+      "Set PPP interface name",
-+      OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXIFNAMELEN },
-+
-     { "dump", o_bool, &dump_options,
-       "Print out option values after parsing all options", 1 },
-     { "dryrun", o_bool, &dryrun,
---- ./pppd/pppd.8.orig	2004-07-19 14:39:06.639320497 +0000
-+++ ./pppd/pppd.8	2004-07-19 15:00:37.339448432 +0000
-@@ -1020,7 +1020,12 @@
- .TP
- .B unit \fInum
- Sets the ppp unit number (for a ppp0 or ppp1 etc interface name) for outbound
--connections.
-+connections.  If the unit is already in use a dynamically allocated will be
-+used.
-+.TP
-+.B ifname \fIstring
-+Set the ppp interface name for outbound connections.  A failure to set the
-+name will terminate the pppd.
- .TP
- .B updetach
- With this option, pppd will detach from its controlling terminal once
---- ./pppd/pppd.h.orig	2004-07-19 12:59:16.000000000 +0000
-+++ ./pppd/pppd.h	2004-07-19 15:02:08.792752747 +0000
-@@ -80,6 +80,16 @@
- #define MAXARGS		1	/* max # args to a command */
- #define MAXNAMELEN	256	/* max length of hostname or name for auth */
- #define MAXSECRETLEN	256	/* max length of password or secret */
-+#define MAXIFNAMELEN	32	/* max length of interface name; or use IFNAMSIZ, can we
-+				   always include net/if.h? */
-+
-+/*
-+ * If PPP_DRV_NAME is not defined, use the default "ppp" as the device name.
-+ * Where should PPP_DRV_NAME come from? Do we include it here?
-+ */
-+#if !defined(PPP_DRV_NAME)
-+#define PPP_DRV_NAME	"ppp"
-+#endif /* !defined(PPP_DRV_NAME) */
- 
- /*
-  * Option descriptor structure.
-@@ -304,6 +314,7 @@
- extern int	connect_delay;	/* Time to delay after connect script */
- extern int	max_data_rate;	/* max bytes/sec through charshunt */
- extern int	req_unit;	/* interface unit number to use */
-+extern char	req_ifname[MAXIFNAMELEN];	/* interface name to use */
- extern bool	multilink;	/* enable multilink operation */
- extern bool	noendpoint;	/* don't send or accept endpt. discrim. */
- extern char	*bundle_name;	/* bundle name for multilink */
---- ./pppd/sys-linux.c.orig	2004-07-19 12:33:29.000000000 +0000
-+++ ./pppd/sys-linux.c	2004-07-19 14:37:36.463754450 +0000
-@@ -649,6 +649,21 @@
- 	}
- 	if (x < 0)
- 		error("Couldn't create new ppp unit: %m");
-+
-+	if (x == 0 && req_ifname[0] != '\0') {
-+		struct ifreq ifr;
-+		char t[MAXIFNAMELEN];
-+		memset(&ifr, 0, sizeof(struct ifreq));
-+		slprintf(t, sizeof(t), "%s%d", PPP_DRV_NAME, ifunit);
-+		strncpy(ifr.ifr_name, t, IF_NAMESIZE);
-+		strncpy(ifr.ifr_newname, req_ifname, IF_NAMESIZE);
-+		x = ioctl(sock_fd, SIOCSIFNAME, &ifr);
-+		if (x < 0)
-+		    error("Couldn't rename interface %s to %s: %m", t, req_ifname);
-+		else
-+		    info("Renamed interface %s to %s", t, req_ifname);
-+	}
-+
- 	return x;
- }
- 
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.2-libutil.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.2-libutil.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,86 +1,0 @@
-glibc provides logwtmp in libutil, so we'll use that instead.
-
---- ppp-2.4.2/pppd/sys-linux.c	2004-03-10 18:26:53.000000000 -0500
-+++ ppp-2.4.2/pppd/sys-linux.c	2004-03-10 18:26:40.000000000 -0500
-@@ -2151,81 +2151,6 @@
- 
- /********************************************************************
-  *
-- * Update the wtmp file with the appropriate user name and tty device.
-- */
--
--void logwtmp (const char *line, const char *name, const char *host)
--{
--    struct utmp ut, *utp;
--    pid_t  mypid = getpid();
--#if __GLIBC__ < 2
--    int    wtmp;
--#endif
--
--/*
-- * Update the signon database for users.
-- * Christoph Lameter: Copied from poeigl-1.36 Jan 3, 1996
-- */
--    utmpname(_PATH_UTMP);
--    setutent();
--    while ((utp = getutent()) && (utp->ut_pid != mypid))
--	/* nothing */;
--
--    if (utp)
--	memcpy(&ut, utp, sizeof(ut));
--    else
--	/* some gettys/telnetds don't initialize utmp... */
--	memset(&ut, 0, sizeof(ut));
--
--    if (ut.ut_id[0] == 0)
--	strncpy(ut.ut_id, line + 3, sizeof(ut.ut_id));
--
--    strncpy(ut.ut_user, name, sizeof(ut.ut_user));
--    strncpy(ut.ut_line, line, sizeof(ut.ut_line));
--
--    time(&ut.ut_time);
--
--    ut.ut_type = USER_PROCESS;
--    ut.ut_pid  = mypid;
--
--    /* Insert the host name if one is supplied */
--    if (*host)
--	strncpy (ut.ut_host, host, sizeof(ut.ut_host));
--
--    /* Insert the IP address of the remote system if IP is enabled */
--    if (ipcp_protent.enabled_flag && ipcp_hisoptions[0].neg_addr)
--	memcpy(&ut.ut_addr, (char *) &ipcp_hisoptions[0].hisaddr,
--		 sizeof(ut.ut_addr));
--
--    /* CL: Makes sure that the logout works */
--    if (*host == 0 && *name==0)
--	ut.ut_host[0]=0;
--
--    pututline(&ut);
--    endutent();
--/*
-- * Update the wtmp file.
-- */
--#if __GLIBC__ >= 2
--    updwtmp(_PATH_WTMP, &ut);
--#else
--    wtmp = open(_PATH_WTMP, O_APPEND|O_WRONLY);
--    if (wtmp >= 0) {
--	flock(wtmp, LOCK_EX);
--
--	if (write (wtmp, (char *)&ut, sizeof(ut)) != sizeof(ut))
--	    warn("error writing %s: %m", _PATH_WTMP);
--
--	flock(wtmp, LOCK_UN);
--
--	close (wtmp);
--    }
--#endif
--}
--
--
--/********************************************************************
-- *
-  * sifvjcomp - config tcp header compression
-  */
- 
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.2-pcap.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.2-pcap.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,64 +1,0 @@
---- ppp-2.4.2/pppd/options.c.pcap	2004-01-13 05:02:07.000000000 +0100
-+++ ppp-2.4.2/pppd/options.c	2004-09-15 11:39:34.832772935 +0200
-@@ -56,7 +56,6 @@
- #endif
- #ifdef PPP_FILTER
- #include <pcap.h>
--#include <pcap-int.h>	/* XXX: To get struct pcap */
- #endif
- 
- #include "pppd.h"
-@@ -122,7 +121,6 @@
- #ifdef PPP_FILTER
- struct	bpf_program pass_filter;/* Filter program for packets to pass */
- struct	bpf_program active_filter; /* Filter program for link-active pkts */
--pcap_t  pc;			/* Fake struct pcap so we can compile expr */
- #endif
- 
- char *current_option;		/* the name of the option being parsed */
-@@ -1439,12 +1437,18 @@
- setpassfilter(argv)
-     char **argv;
- {
--    pc.linktype = DLT_PPP;
--    pc.snapshot = PPP_HDRLEN;
-+    pcap_t* pc = pcap_open_dead (DLT_PPP, PPP_HDRLEN);
-+    if (!pc) {
-+        option_error("error in pass-filter expression: pcap_open_dead failed\n");
-+	return 0;
-+    }
-  
--    if (pcap_compile(&pc, &pass_filter, *argv, 1, netmask) == 0)
-+    if (pcap_compile(pc, &pass_filter, *argv, 1, netmask) == 0) {
-+        pcap_close(pc);
- 	return 1;
--    option_error("error in pass-filter expression: %s\n", pcap_geterr(&pc));
-+    }
-+    option_error("error in pass-filter expression: %s\n", pcap_geterr(pc));
-+    pcap_close(pc);
-     return 0;
- }
- 
-@@ -1455,12 +1459,18 @@
- setactivefilter(argv)
-     char **argv;
- {
--    pc.linktype = DLT_PPP;
--    pc.snapshot = PPP_HDRLEN;
-+    pcap_t* pc = pcap_open_dead (DLT_PPP, PPP_HDRLEN);
-+    if (!pc) {
-+        option_error("error in pass-filter expression: pcap_open_dead failed\n");
-+	return 0;
-+    }
-  
--    if (pcap_compile(&pc, &active_filter, *argv, 1, netmask) == 0)
-+    if (pcap_compile(pc, &active_filter, *argv, 1, netmask) == 0) {
-+        pcap_close(pc);
- 	return 1;
--    option_error("error in active-filter expression: %s\n", pcap_geterr(&pc));
-+    }
-+    option_error("error in active-filter expression: %s\n", pcap_geterr(pc));
-+    pcap_close(pc);
-     return 0;
- }
- #endif
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.2-pie.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.2-pie.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,22 +1,0 @@
---- ppp-2.4.2/pppd/Makefile.linux.pie	2004-05-14 13:46:14.188327258 +0200
-+++ ppp-2.4.2/pppd/Makefile.linux	2004-05-14 13:46:16.147058249 +0200
-@@ -206,7 +206,7 @@
- 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
- 
- pppd: $(PPPDOBJS)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
-+	$(CC) $(CFLAGS) -pie $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
- 
- srp-entry:	srp-entry.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
---- ppp-2.4.2/chat/Makefile.linux.pie	2004-05-14 13:46:32.699784925 +0200
-+++ ppp-2.4.2/chat/Makefile.linux	2004-05-14 13:46:45.071085866 +0200
-@@ -14,7 +14,7 @@
- all:	chat
- 
- chat:	chat.o
--	$(CC) -o chat chat.o
-+	$(CC) -pie -o chat chat.o
- 
- chat.o:	chat.c
- 	$(CC) -c $(CFLAGS) -o chat.o chat.c
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.2-pppoatm-make.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.2-pppoatm-make.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,9 +1,0 @@
---- ppp-2.4.2/pppd/plugins/pppoatm/Makefile.linux.make	2004-10-04 11:37:28.331818344 +0100
-+++ ppp-2.4.2/pppd/plugins/pppoatm/Makefile.linux	2004-10-04 11:37:54.884781680 +0100
-@@ -1,5 +1,5 @@
- CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= $(RPM_OPT_FLAGS)
- CFLAGS	= $(COPTS) -I../.. -I../../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install -o root
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.2-pppoatm-mtu.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.2-pppoatm-mtu.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,28 +1,0 @@
---- ppp-2.4.2/pppd/plugins/pppoatm/pppoatm.c.mtu	2004-10-07 13:32:05.660910432 +0100
-+++ ppp-2.4.2/pppd/plugins/pppoatm/pppoatm.c	2004-10-07 13:58:20.096559832 +0100
-@@ -175,8 +175,10 @@
- {
- 	int sock;
- 	struct ifreq ifr;
--	if (mtu > pppoatm_max_mtu)
--		error("Couldn't increase MTU to %d", mtu);
-+	if (pppoatm_max_mtu && mtu > pppoatm_max_mtu) {
-+		warn("Couldn't increase MTU to %d. Using %d", mtu, pppoatm_max_mtu);
-+		mtu = pppoatm_max_mtu;
-+	}
- 	sock = socket(AF_INET, SOCK_DGRAM, 0);
- 	if (sock < 0)
- 		fatal("Couldn't create IP socket: %m");
-@@ -192,8 +194,10 @@
- 			      int pcomp,
- 			      int accomp)
- {
--	if (mru > pppoatm_max_mru)
--		error("Couldn't increase MRU to %d", mru);
-+	if (pppoatm_max_mru && mru > pppoatm_max_mru) {
-+		warn("Couldn't increase MRU to %d. Using %d", mru, pppoatm_max_mru);
-+		mru = pppoatm_max_mru;
-+	}
- }
- 
- void plugin_init(void)
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-atm_backend.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-atm_backend.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,14 +1,0 @@
---- ppp-2.4.3/pppd/pppd.h	2004-11-23 12:49:43.000000000 +0000
-+++ ppp-2.4.3/pppd/pppd.h	2004-11-23 12:59:54.000000000 +0000
-@@ -217,6 +217,11 @@
- };
- 
- /*
-+ * atm_backend_t definition missing from system headers in Fedora Core 2
-+ */
-+typedef unsigned short atm_backend_t;
-+
-+/*
-  * Global variables.
-  */
- 
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-bpf.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-bpf.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,57 +1,0 @@
-Fix up header file names for old libpcap versions
-
---- ppp-2.4.3/pppd/demand.c	2004-11-04 10:02:26.000000000 +0000
-+++ ppp-2.4.3/pppd/demand.c	2004-11-23 11:42:09.000000000 +0000
-@@ -44,7 +44,7 @@
- #include <sys/stat.h>
- #include <sys/socket.h>
- #ifdef PPP_FILTER
--#include <pcap-bpf.h>
-+#include <net/bpf.h>
- #endif
- 
- #include "pppd.h"
---- ppp-2.4.3/pppd/sys-linux.c	2004-11-23 11:28:35.000000000 +0000
-+++ ppp-2.4.3/pppd/sys-linux.c	2004-11-23 11:42:59.000000000 +0000
-@@ -136,7 +136,7 @@
- #endif /* IPX_CHANGE */
- 
- #ifdef PPP_FILTER
--#include <pcap-bpf.h>
-+#include <net/bpf.h>
- #include <linux/filter.h>
- #endif /* PPP_FILTER */
- 
---- ppp-2.4.3/pppd/Makefile.linux	2005-02-10 10:28:50.000000000 +0000
-+++ ppp-2.4.3/pppd/Makefile.linux	2005-02-10 10:29:46.000000000 +0000
-@@ -172,7 +172,7 @@
- endif
- 
- ifdef FILTER
--ifneq ($(wildcard /usr/include/pcap-bpf.h),)
-+ifneq ($(wildcard /usr/include/net/bpf.h),)
- LIBS    += -lpcap
- CFLAGS  += -DPPP_FILTER
- endif
---- ppp-2.4.3/pppd/Makefile.linux.lib64	2005-02-10 10:28:55.000000000 +0000
-+++ ppp-2.4.3/pppd/Makefile.linux.lib64	2005-02-10 10:29:57.000000000 +0000
-@@ -171,7 +171,7 @@
- endif
- 
- ifdef FILTER
--ifneq ($(wildcard /usr/include/pcap-bpf.h),)
-+ifneq ($(wildcard /usr/include/net/bpf.h),)
- LIBS    += -lpcap
- CFLAGS  += -DPPP_FILTER
- endif
---- ppp-2.4.3/pppd/Makefile.linux.make	2005-02-10 10:29:04.000000000 +0000
-+++ ppp-2.4.3/pppd/Makefile.linux.make	2005-02-10 10:30:10.000000000 +0000
-@@ -171,7 +171,7 @@
- endif
- 
- ifdef FILTER
--ifneq ($(wildcard /usr/include/pcap-bpf.h),)
-+ifneq ($(wildcard /usr/include/net/bpf.h),)
- LIBS    += -lpcap
- CFLAGS  += -DPPP_FILTER
- endif
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-dontwriteetc.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-dontwriteetc.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,58 +1,0 @@
---- ppp-2.4.3/chat/chat.8	2004-11-13 12:22:49.000000000 +0000
-+++ ppp-2.4.3/chat/chat.8	2004-11-22 15:07:28.071470928 +0000
-@@ -200,7 +200,7 @@
- at the terminal via standard error.  If \fBchat\fR is being run by
- pppd, and pppd is running as a daemon (detached from its controlling
- terminal), standard error will normally be redirected to the file
--/etc/ppp/connect\-errors.
-+/var/log/ppp/connect\-errors.
- .LP
- \fBSAY\fR strings must be enclosed in single or double quotes. If
- carriage return and line feed are needed in the string to be output,
---- ppp-2.4.3/linux/Makefile.top	2004-10-31 22:25:16.000000000 +0000
-+++ ppp-2.4.3/linux/Makefile.top	2004-11-22 15:11:32.147417077 +0000
-@@ -4,7 +4,9 @@
- BINDIR = $(DESTDIR)/sbin
- INCDIR = $(DESTDIR)/include
- MANDIR = $(DESTDIR)/share/man
--ETCDIR = @SYSCONF@/ppp
-+ETCDIR = $(DESTDIR)@SYSCONF@/ppp
-+RUNDIR = $(DESTDIR)/../var/run/ppp
-+LOGDIR = $(DESTDIR)/../var/log/ppp
- 
- # uid 0 = root
- INSTALL= install
-@@ -16,7 +18,7 @@
- 	cd pppstats; $(MAKE) $(MFLAGS) all
- 	cd pppdump; $(MAKE) $(MFLAGS) all
- 
--install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel
-+install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-devel
- 
- install-progs:
- 	cd chat; $(MAKE) $(MFLAGS) install
-@@ -44,6 +46,10 @@
- 	$(INSTALL) -d -m 755 $@
- $(ETCDIR):
- 	$(INSTALL) -d -m 755 $@
-+$(RUNDIR):
-+	$(INSTALL) -d -m 755 $@
-+$(LOGDIR):
-+	$(INSTALL) -d -m 755 $@
- 
- clean:
- 	rm -f `find . -name '*.[oas]' -print`
---- ppp-2.4.3/pppd/pathnames.h	2004-11-13 12:02:22.000000000 +0000
-+++ ppp-2.4.3/pppd/pathnames.h	2004-11-22 15:12:54.812072782 +0000
-@@ -27,9 +27,9 @@
- #define _PATH_AUTHUP	 _ROOT_PATH "/etc/ppp/auth-up"
- #define _PATH_AUTHDOWN	 _ROOT_PATH "/etc/ppp/auth-down"
- #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
--#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
-+#define _PATH_CONNERRS	 _ROOT_PATH "/var/log/ppp/connect-errors"
- #define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
--#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
-+#define _PATH_RESOLV	 _ROOT_PATH "/var/run/ppp/resolv.conf"
- 
- #define _PATH_USEROPT	 ".ppprc"
- #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-fix.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-fix.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,123 +1,0 @@
---- ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2004-11-04 10:07:37.000000000 +0000
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2004-11-22 15:18:56.546019577 +0000
-@@ -13,6 +13,8 @@
- 
- #include "pppoe.h"
- 
-+void warn __P((char *, ...));   /* log a warning message */
-+
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
- #endif
---- ppp-2.4.3/pppd/ipv6cp.c	2004-11-13 02:28:15.000000000 +0000
-+++ ppp-2.4.3/pppd/ipv6cp.c	2004-11-22 15:22:27.469116775 +0000
-@@ -151,6 +151,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- #include <netdb.h>
-@@ -1064,7 +1065,9 @@
-     return (rc);			/* Return final code */
- }
- 
--
-+#if defined(SOL2) || defined(__linux__)
-+int ether_to_eui64(eui64_t *p_eui64);
-+#endif
- /*
-  * ipv6_check_options - check that any IP-related options are OK,
-  * and assign appropriate defaults.
---- ppp-2.4.3/include/linux/if_pppox.h	2001-12-15 00:34:24.000000000 +0000
-+++ ppp-2.4.3/include/linux/if_pppox.h	2004-11-22 15:24:19.080661226 +0000
-@@ -18,7 +18,7 @@
- 
- 
- #include <asm/types.h>
--#include <asm/byteorder.h>
-+#include <endian.h>
- 
- #ifdef  __KERNEL__
- #include <linux/if_ether.h>
-@@ -97,10 +97,10 @@
- #define PTT_GEN_ERR  	__constant_htons(0x0203)
- 
- struct pppoe_hdr {
--#if defined(__LITTLE_ENDIAN_BITFIELD)
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- 	__u8 ver : 4;
- 	__u8 type : 4;
--#elif defined(__BIG_ENDIAN_BITFIELD)
-+#elif __BYTE_ORDER == __BIG_ENDIAN
- 	__u8 type : 4;
- 	__u8 ver : 4;
- #else
---- ppp-2.4.3/pppdump/deflate.c	2004-02-02 03:36:46.000000000 +0000
-+++ ppp-2.4.3/pppdump/deflate.c	2004-11-22 15:26:09.473500830 +0000
-@@ -237,8 +237,8 @@
- {
-     struct deflate_state *state = (struct deflate_state *) arg;
-     u_char *rptr, *wptr;
--    int rlen, olen, ospace;
--    int seq, i, flush, r, decode_proto;
-+    int rlen, olen;
-+    int seq, r;
- 
-     rptr = mi;
-     if (*rptr == 0)
---- ppp-2.4.3/pppdump/bsd-comp.c	2004-02-02 03:36:46.000000000 +0000
-+++ ppp-2.4.3/pppdump/bsd-comp.c	2004-11-22 15:29:02.169002889 +0000
-@@ -383,7 +383,7 @@
- 	|| options[0] != CI_BSD_COMPRESS || options[1] != CILEN_BSD_COMPRESS
- 	|| BSD_VERSION(options[2]) != BSD_CURRENT_VERSION
- 	|| BSD_NBITS(options[2]) != db->maxbits
--	|| decomp && db->lens == NULL)
-+	|| (decomp && db->lens == NULL))
- 	return 0;
- 
-     if (decomp) {
-@@ -556,11 +556,11 @@
-     u_int n_bits = db->n_bits;
-     u_int tgtbitno = 32-n_bits;	/* bitno when we have a code */
-     struct bsd_dict *dictp;
--    int explen, i, seq, len;
-+    int explen, seq, len;
-     u_int incode, oldcode, finchar;
-     u_char *p, *rptr, *wptr;
-     int ilen;
--    int dlen, space, codelen, extra;
-+    int dlen=0, codelen, extra;
- 
-     rptr = cmsg;
-     if (*rptr == 0)
-@@ -616,7 +616,7 @@
- 	}
- 
- 	if (incode > max_ent + 2 || incode > db->maxmaxcode
--	    || incode > max_ent && oldcode == CLEAR) {
-+	    || (incode > max_ent && oldcode == CLEAR)) {
- 	    if (db->debug) {
- 		printf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ",
- 		       db->unit, incode, oldcode);
---- ppp-2.4.3/pppdump/pppdump.c	2004-02-02 03:36:46.000000000 +0000
-+++ ppp-2.4.3/pppdump/pppdump.c	2004-11-22 17:18:49.340165228 +0000
-@@ -191,7 +191,7 @@
- 	    show_time(f, c);
- 	    break;
- 	default:
--	    printf("?%.2x\n");
-+	    printf("?%.2x\n", c);
- 	}
-     }
- }
-@@ -421,7 +421,7 @@
- 	    show_time(f, c);
- 	    break;
- 	default:
--	    printf("?%.2x\n");
-+	    printf("?%.2x\n", c);
- 	}
-     }
- }
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-fix64.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-fix64.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,10 +1,0 @@
---- ppp-2.4.3/pppd/sha1.c	2004-10-25 00:28:02.000000000 +0100
-+++ ppp-2.4.3/pppd/sha1.c	2004-11-22 15:36:46.929580681 +0000
-@@ -18,6 +18,7 @@
- 
- #include <string.h>
- #include <netinet/in.h>	/* htonl() */
-+#include <sys/types.h> /* u_int32_t */
- #include "sha1.h"
- 
- static void
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-lib64.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-lib64.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,54 +1,0 @@
-If CC supports the "-print-multi-os-directory" option, use it to determine
-where to check for the existence libcrypt.  If it doesn't, then we get /usr/lib.
-
---- ppp-2.4.3/pppd/Makefile.linux	2004-11-22 14:43:58.522728670 +0000
-+++ ppp-2.4.3/pppd/Makefile.linux	2004-11-22 14:47:09.054728322 +0000
-@@ -8,6 +8,7 @@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
- INCDIR = $(DESTDIR)/include
-+LIBDIR = $(DESTDIR)/usr/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
- 
- TARGETS = pppd
- 
-@@ -32,7 +33,7 @@
- 
- CC = gcc
- #
--COPTS = -Wall $(RPM_OPT_FLAGS)
-+COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
- LIBS = -lutil
- 
- # Uncomment the next 2 lines to include support for Microsoft's
-@@ -120,7 +121,7 @@
- ifneq ($(wildcard /usr/include/crypt.h),)
- CFLAGS   += -DHAVE_CRYPT_H=1
- endif
--ifneq ($(wildcard /usr/lib/libcrypt.*),)
-+ifneq ($(wildcard $(LIBDIR)/libcrypt.*),)
- LIBS	+= -lcrypt
- endif
- 
---- ppp-2.4.3/pppd/plugins/Makefile.linux	2004-11-22 14:43:58.528727189 +0000
-+++ ppp-2.4.3/pppd/plugins/Makefile.linux	2004-11-22 14:54:10.108012609 +0000
-@@ -7,7 +7,7 @@
- DESTDIR = @DESTDIR@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
--LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
-+LIBDIR = $(DESTDIR)/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
- 
- SUBDIRS := rp-pppoe pppoatm radius
- # Uncomment the next line to include the radius authentication plugin
-If CC supports the "-print-multi-os-directory" option, use it to determine
-where to check for the existence libcrypt.  If it doesn't, then we get /usr/lib.
-
---- ppp-2.4.3/pppd/pathnames.h	2004-03-10 18:52:15.000000000 -0500
-+++ ppp-2.4.3/pppd/pathnames.h	2004-03-10 18:52:10.000000000 -0500
-@@ -55,5 +55,5 @@
- #endif /* __STDC__ */
- 
- #ifdef PLUGIN
--#define _PATH_PLUGIN	"/usr/lib/pppd/" VERSION
-+#define _PATH_PLUGIN	LIBDIR "/pppd/" VERSION
- #endif /* PLUGIN */
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-make.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-make.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,92 +1,0 @@
-Obey RPM_OPT_FLAGS, link with pppd with libutil to get logwtmp(), and enable
-PAM support.
---- ppp-2.4.3/chat/Makefile.linux	2004-11-03 11:51:47.000000000 +0000
-+++ ppp-2.4.3/chat/Makefile.linux	2004-11-22 14:28:51.100642512 +0000
-@@ -10,7 +10,7 @@
- CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
- CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
- 
--COPTS=	-O2 -g -pipe
-+COPTS=	$(RPM_OPT_FLAGS)
- CFLAGS=	$(COPTS) $(CDEFS)
- 
- INSTALL= install
---- ppp-2.4.3/pppd/Makefile.linux	2003-11-27 16:55:19.000000000 -0500
-+++ ppp-2.4.3/pppd/Makefile.linux	2004-03-10 18:32:46.000000000 -0500
-@@ -29,10 +29,10 @@
- include .depend
- endif
- 
--# CC = gcc
-+CC = gcc
- #
--COPTS = -O2 -pipe -Wall -g
--LIBS =
-+COPTS = -Wall $(RPM_OPT_FLAGS)
-+LIBS = -lutil
- 
- # Uncomment the next 2 lines to include support for Microsoft's
- # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
-@@ -60,7 +60,7 @@
- USE_TDB=y
- 
- HAS_SHADOW=y
--#USE_PAM=y
-+USE_PAM=y
--#HAVE_INET6=y
-+HAVE_INET6=y
- 
- # Enable plugins
---- ppp-2.4.3/pppdump/Makefile.linux	2004-10-31 01:36:52.000000000 +0100
-+++ ppp-2.4.3/pppdump/Makefile.linux	2004-11-22 14:31:17.128620741 +0000
-@@ -2,7 +2,7 @@
- BINDIR = $(DESTDIR)/sbin
- MANDIR = $(DESTDIR)/share/man/man8
- 
--CFLAGS= -O -I../include/net
-+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
- OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
- 
- INSTALL= install
---- ppp-2.4.2/pppstats/Makefile.linux	2002-11-09 06:24:43.000000000 -0500
-+++ ppp-2.4.2/pppstats/Makefile.linux	2004-03-10 18:32:55.000000000 -0500
-@@ -7,7 +7,7 @@
- PPPSTATOBJS = pppstats.o
- 
- #CC = gcc
--COPTS = -O
-+COPTS = $(RPM_OPT_FLAGS)
- COMPILE_FLAGS = -I../include
- LIBS =
- 
---- ppp-2.4.3/pppd/plugins/Makefile.linux	2004-01-12 22:56:24.000000000 -0500
-+++ ppp-2.4.3/pppd/plugins/Makefile.linux	2004-03-10 18:41:20.000000000 -0500
-@@ -1,5 +1,5 @@
- CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= $(RPM_OPT_FLAGS)
- CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS	= -shared
- INSTALL	= install -o root
---- ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2004-11-14 07:02:31.000000000 +0000
-+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2004-11-22 14:32:51.512336114 +0000
-@@ -12,7 +12,7 @@
- INSTALL	= install
- 
- PLUGIN=radius.so radattr.so radrealms.so
--CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
-+CFLAGS=-I. -I../.. -I../../../include $(RPM_OPT_FLAGS) -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
- 
- # Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol.
---- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2004-03-10 18:46:52.000000000 -0500
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2004-03-10 18:46:58.000000000 -0500
-@@ -16,7 +16,7 @@
- # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
- VERSION=3.3
- 
--COPTS=-O2 -g
-+COPTS=$(RPM_OPT_FLAGS)
- CFLAGS=$(COPTS) -I../../../include/linux
- all: rp-pppoe.so
- 
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-no_strip.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-no_strip.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,211 +1,0 @@
---- ppp-2.4.3/pppd/Makefile.linux.make	2004-11-13 12:02:22.000000000 +0000
-+++ ppp-2.4.3/pppd/Makefile.linux.make	2004-11-22 15:53:21.400562989 +0000
-@@ -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
-@@ -202,7 +202,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)
---- ppp-2.4.3/pppd/Makefile.linux	2004-11-22 15:51:53.253291549 +0000
-+++ ppp-2.4.3/pppd/Makefile.linux	2004-11-22 15:54:18.119580551 +0000
-@@ -100,7 +100,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
-@@ -203,7 +203,7 @@
- install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
- 	$(EXTRAINSTALL)
--	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 755 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)
---- ppp-2.4.3/pppd/plugins/radius/Makefile.linux.make	2004-11-14 07:02:31.000000000 +0000
-+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux.make	2004-11-22 15:55:27.701428927 +0000
-@@ -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)
- 
---- ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2004-11-22 15:51:53.130321861 +0000
-+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2004-11-22 15:56:26.269991739 +0000
-@@ -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)
- 
---- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.make	2004-11-14 07:58:37.000000000 +0000
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.make	2004-11-22 15:57:38.188262672 +0000
-@@ -39,9 +39,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 755 pppoe-discovery $(BINDIR)
- 
- clean:
- 	rm -f *.o *.so
---- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-22 15:51:53.131321614 +0000
-+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-22 15:58:40.461910148 +0000
-@@ -39,9 +39,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 755 pppoe-discovery $(BINDIR)
- 
- clean:
- 	rm -f *.o *.so
---- ppp-2.4.3/pppd/Makefile.linux.lib64	2004-11-22 15:51:53.126322846 +0000
-+++ ppp-2.4.3/pppd/Makefile.linux.lib64	2004-11-22 16:00:07.275506152 +0000
-@@ -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
-@@ -202,7 +202,7 @@
- install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
- 	$(EXTRAINSTALL)
--	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 755 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)
---- ppp-2.4.3/pppd/Makefile.linux.pie	2004-11-22 15:51:53.227297957 +0000
-+++ ppp-2.4.3/pppd/Makefile.linux.pie	2004-11-22 16:01:23.690664430 +0000
-@@ -100,7 +100,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
-@@ -203,7 +203,7 @@
- install: pppd
- 	mkdir -p $(BINDIR) $(MANDIR)
- 	$(EXTRAINSTALL)
--	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-+	$(INSTALL) -c -m 755 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)
---- ppp-2.4.3/pppdump/Makefile.linux.make	2004-10-31 01:36:52.000000000 +0100
-+++ ppp-2.4.3/pppdump/Makefile.linux.make	2004-11-22 16:02:38.024334648 +0000
-@@ -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)
---- ppp-2.4.3/pppdump/Makefile.linux	2004-11-22 15:51:53.127322600 +0000
-+++ ppp-2.4.3/pppdump/Makefile.linux	2004-11-22 16:03:25.914524837 +0000
-@@ -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)
---- ppp-2.4.3/pppstats/Makefile.linux.make	2004-10-31 22:09:03.000000000 +0000
-+++ ppp-2.4.3/pppstats/Makefile.linux.make	2004-11-22 16:04:21.262875190 +0000
-@@ -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)
---- ppp-2.4.3/pppstats/Makefile.linux	2004-11-22 15:51:53.128322353 +0000
-+++ ppp-2.4.3/pppstats/Makefile.linux	2004-11-22 16:04:37.569853540 +0000
-@@ -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)
---- ppp-2.4.3/chat/Makefile.linux.make	2004-11-03 11:51:47.000000000 +0000
-+++ ppp-2.4.3/chat/Makefile.linux.make	2004-11-22 16:07:30.251263054 +0000
-@@ -25,7 +25,7 @@
- 
- install: chat
- 	mkdir -p $(BINDIR)
--	$(INSTALL) -s -c chat $(BINDIR)
-+	$(INSTALL) -c chat $(BINDIR)
- 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
- 
- clean:
---- ppp-2.4.3/chat/Makefile.linux	2004-11-22 15:51:53.254291303 +0000
-+++ ppp-2.4.3/chat/Makefile.linux	2004-11-22 16:07:46.477260716 +0000
-@@ -25,7 +25,7 @@
- 
- install: chat
- 	mkdir -p $(BINDIR)
--	$(INSTALL) -s -c chat $(BINDIR)
-+	$(INSTALL) -c chat $(BINDIR)
- 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
- 
- clean:
---- ppp-2.4.3/chat/Makefile.linux.pie	2004-11-22 15:51:53.125323093 +0000
-+++ ppp-2.4.3/chat/Makefile.linux.pie	2004-11-22 16:08:06.491323922 +0000
-@@ -25,7 +25,7 @@
- 
- install: chat
- 	mkdir -p $(BINDIR)
--	$(INSTALL) -s -c chat $(BINDIR)
-+	$(INSTALL) -c chat $(BINDIR)
- 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
- 
- clean:
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-pkgcheck.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-pkgcheck.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,12 +1,0 @@
---- ppp-2.4.3/pppd/cbcp.c	2004-10-28 01:15:36.000000000 +0100
-+++ ppp-2.4.3/pppd/cbcp.c	2004-11-22 16:32:59.042090959 +0000
-@@ -146,7 +146,8 @@
- cbcp_open(unit)
-     int unit;
- {
--    dbglog("cbcp_open");
-+    if (debug)
-+        dbglog("cbcp_open");
- }
- 
- /* process an incomming packet */
Index: l/internetserver/poptop_ppp/patches/ppp-2.4.3-winbind.base64.patch
===================================================================
--- npl/internetserver/poptop_ppp/patches/ppp-2.4.3-winbind.base64.patch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,80 +1,0 @@
---- ppp-2.4.3/pppd/plugins/winbind.c.orig	2005-05-12 14:18:10.000000000 -0700
-+++ ppp-2.4.3/pppd/plugins/winbind.c	2005-05-12 14:37:59.000000000 -0700
-@@ -200,50 +200,41 @@
- 	return num_chars;
- }
- 
--static const char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-+static const char *codes = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- 
- /**
-  * Encode a base64 string into a malloc()ed string caller to free.
-- *
-- *From SQUID: adopted from http://ftp.sunet.se/pub2/gnu/vm/base64-encode.c with adjustments
-  **/
- char * base64_encode(const char *data)
- {
--	int bits = 0;
--	int char_count = 0;
--	size_t out_cnt = 0;
--	size_t len = strlen(data);
--	size_t output_len = strlen(data) * 2;
--	char *result = malloc(output_len); /* get us plenty of space */
--
--	while (len-- && out_cnt < (output_len) - 5) {
--		int c = (unsigned char) *(data++);
--		bits += c;
--		char_count++;
--		if (char_count == 3) {
--			result[out_cnt++] = b64[bits >> 18];
--			result[out_cnt++] = b64[(bits >> 12) & 0x3f];
--			result[out_cnt++] = b64[(bits >> 6) & 0x3f];
--	    result[out_cnt++] = b64[bits & 0x3f];
--	    bits = 0;
--	    char_count = 0;
--	} else {
--	    bits <<= 8;
--	}
-+    int i;
-+    size_t len = strlen(data);
-+    size_t leven = 3*(len / 3);
-+    size_t output_len = 4 * ((len + 2) / 3) + 1;
-+    char *p, *result = malloc(output_len); /* get us plenty of space */
-+    const char *in;
-+    p = result;
-+    in = data;
-+    for (i = 0; i < leven; i += 3)
-+    {
-+        *p++ = codes[(in[0] >> 2) & 0x3F];
-+        *p++ = codes[(((in[0] & 3) << 4) + (in[1] >> 4)) & 0x3F];
-+        *p++ = codes[(((in[1] & 0xf) << 2) + (in[2] >> 6)) & 0x3F];
-+        *p++ = codes[in[2] & 0x3F];
-+        in += 3;
-     }
--    if (char_count != 0) {
--	bits <<= 16 - (8 * char_count);
--	result[out_cnt++] = b64[bits >> 18];
--	result[out_cnt++] = b64[(bits >> 12) & 0x3f];
--	if (char_count == 1) {
--	    result[out_cnt++] = '=';
--	    result[out_cnt++] = '=';
--	} else {
--	    result[out_cnt++] = b64[(bits >> 6) & 0x3f];
--	    result[out_cnt++] = '=';
--	}
-+    /* Pad it if necessary...  */
-+    if (i < len)
-+    {
-+        unsigned a = in[0];
-+        unsigned b = (i+1 < len) ? in[1] : 0;
-+        *p++ = codes[(a >> 2) & 0x3F];
-+        *p++ = codes[(((a & 3) << 4) + (b >> 4)) & 0x3F];
-+        *p++ = (i+1 < len) ? codes[(((b & 0xf) << 2)) & 0x3F] : '=';
-+        *p++ = '=';
-     }
--    result[out_cnt] = '\0';	/* terminate */
-+    /* append a NULL byte */
-+    *p = '\0';
-     return result;
- }
- 
Index: l/internetserver/poptop_ppp/poptop_ppp.SlackBuild
===================================================================
--- npl/internetserver/poptop_ppp/poptop_ppp.SlackBuild	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,75 +1,0 @@
-#!/bin/sh
-#DEP:Linux_PAM
-
-CWD=`pwd`
-TMP=/$CWD/tmp
-PKG=$TMP/package-poptop-ppp
-rm -rf $PKG
-mkdir -p $PKG
-
-VERSION=2.4.3
-ARCH=${ARCH:-i486}
-BUILD=1DatuX
-
-cd $TMP
-rm -rf *
-
-tar xzvf $CWD/ppp-2.4.3.tar.gz
-cd ppp-2.4.3 || exit 1
-
-#deze patches komen uit de .spec file die in de src archive staat en zijn blijkbaar hard nodig :)
-patch="patch -p1 "
-$patch < $CWD/patches/ppp-2.4.3-make.patch 	|| exit 1
-$patch < $CWD/patches/ppp-2.3.6-sample.patch || exit 1
-$patch < $CWD/patches/ppp-2.4.2-libutil.patch || exit 1
-$patch < $CWD/patches/ppp-2.4.1-varargs.patch || exit 1
-#link error. $patch < $CWD/patches/ppp-2.4.3-lib64.patch || exit 1
-#applied niet? $patch < $CWD/patches/ppp-2.4.3-bpf.patch || exit 1
-$patch < $CWD/patches/ppp-2.4.3-dontwriteetc.patch || exit 1
-#compiler error. $patch < $CWD/patches/ppp-2.4.2-pie.patch || exit 1
-$patch < $CWD/patches/ppp-2.4.3-fix.patch || exit 1
-$patch < $CWD/patches/ppp-2.4.3-fix64.patch || exit 1
-# Patch10: ppp-2.4.2-signal.patch already included upstream
-$patch < $CWD/patches/ppp-2.4.2-change_resolv_conf.patch || exit 1
-#applied niet? $patch < $CWD/patches/ppp-2.4.2-pcap.patch || exit 1
-#applied niet? $patch < $CWD/patches/ppp-2.4.3-no_strip.patch || exit 1
-$patch < $CWD/patches/ppp-2.4.2-argv.patch || exit 1
-# Patch15: ppp-2.4.2-pppoatm.patch already included upstream, but may need bodges to get old distros to work
-$patch < $CWD/patches/ppp-2.4.2-pppoatm-mtu.patch || exit 1
-$patch < $CWD/patches/ppp-2.4.2-pppoatm-make.patch || exit 1
-$patch < $CWD/patches/ppp-2.4.3-pkgcheck.patch || exit 1
-
-#non-redhat
-$patch < $CWD/patches/mppe_lower_mtu.diff  || exit 1
-$patch < $CWD/patches/ppp-2.4.2-ifname.diff  || exit 1
-$patch < $CWD/patches/ppp-2.4.3-atm_backend.patch  || exit 1
-
-./configure || exit 1
-make -j 1 || exit 1
-make -j 1 install DESTDIR=$PKG || exit 1
-
-# En uiteraard mag de vette postinstall niet ontbreken.
-mkdir -p $PKG/etc/postinst.d/
-cp $CWD/post.poptop_ppp $PKG/etc/postinst.d/post.poptop_ppp
-chmod +x $PKG/etc/postinst.d/post.poptop_ppp
-
-#enkele dir's op de juiste plaats zetten
-#eingelijk moet dit in configure zooi, maar na veel testen nog niet gelukt (8-11-2006 pptp versie 2.4.3)
-mkdir -p $PKG/usr || exit 1
-mv $PKG/sbin $PKG/usr/sbin || exit 1
-mv $PKG/share $PKG/usr/ || exit 1
-mv $PKG/lib $PKG/usr/ || exit 1
-mv $PKG/include $PKG/usr || exit 1
-
-#radius speciefike zooi erin boppen
-mv $CWD/radiusclient $PKG/etc || exit 1
-
-#include files op de juiste plek zetten
-mv $PKG/usr/include/pppd/* $PKG/usr/include
-
-#package maken
-cd $PKG
-NAME=poptop_ppp
-makepkg -l y -c n $CWD/$NAME.pkg > /dev/null &&
-echo $VERSION > $CWD/$NAME.version &&
-arch > $CWD/$NAME.arch 
Index: l/internetserver/poptop_ppp/poptop_ppp.arch
===================================================================
--- npl/internetserver/poptop_ppp/poptop_ppp.arch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,1 +1,0 @@
-i586
Index: l/internetserver/poptop_ppp/poptop_ppp.build
===================================================================
--- npl/internetserver/poptop_ppp/poptop_ppp.build	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,1 +1,0 @@
-6526
Index: l/internetserver/poptop_ppp/poptop_ppp.depver
===================================================================
--- npl/internetserver/poptop_ppp/poptop_ppp.depver	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,1 +1,0 @@
-Linux_PAM	1
Index: l/internetserver/poptop_ppp/poptop_ppp.md5
===================================================================
--- npl/internetserver/poptop_ppp/poptop_ppp.md5	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,37 +1,0 @@
-3f2ece58d2ee9b3354138925d47b0c4e  ./patches/mppe_lower_mtu.diff
-2147d2992d49f7ddeccab623c1e83fbf  ./patches/ppp-2.3.6-sample.patch
-f0cb7f75c06664e1fa4ee3937a9d3aae  ./patches/ppp-2.4.1-varargs.patch
-8415e7c3e122731aee9024005880413d  ./patches/ppp-2.4.2-argv.patch
-def18a6c63047892ca35c5dd0446128a  ./patches/ppp-2.4.2-change_resolv_conf.patch
-a8f9a8b68f6140e9737a590a99a7ac9a  ./patches/ppp-2.4.2-ifname.diff
-05aab07bd762342dda20ecbb748f99e0  ./patches/ppp-2.4.2-libutil.patch
-b9f64298e5f6b8f8e6af1d826671e815  ./patches/ppp-2.4.2-pcap.patch
-6979625c0b0c858b50cf76f8c728794a  ./patches/ppp-2.4.2-pie.patch
-8a6ee6dca20b912749c021c66de6a3d7  ./patches/ppp-2.4.2-pppoatm-make.patch
-a6f9f134a9c9a63b821cb5b3a07a9f3e  ./patches/ppp-2.4.2-pppoatm-mtu.patch
-bf06004292886b8ff21ac2ed094aca4f  ./patches/ppp-2.4.3-atm_backend.patch
-aedb553449e146763eedf73079976c7e  ./patches/ppp-2.4.3-bpf.patch
-31e0a77192a6a894a610c9e36873bff2  ./patches/ppp-2.4.3-dontwriteetc.patch
-3f9f65a4f80c5dcb010670a055240cf4  ./patches/ppp-2.4.3-fix64.patch
-a96d1bcfa1fbd1b1152bfd66ab41affe  ./patches/ppp-2.4.3-fix.patch
-a765084efdd5504264ca69f5296d5447  ./patches/ppp-2.4.3-lib64.patch
-e79333fa4d542b3cd9e904fe8bb0b224  ./patches/ppp-2.4.3-make.patch
-bf6d75b931b404500f6deac11a9c45bc  ./patches/ppp-2.4.3-no_strip.patch
-0695fd1ddba910ff737cb0872aa411ac  ./patches/ppp-2.4.3-pkgcheck.patch
-662d783ac46f18537e3395c86196c0f6  ./patches/ppp-2.4.3-winbind.base64.patch
-45929c5759799f06ab929988762e47cb  ./poptop_ppp.pkg
-581fcda7e31c455bea5d406825167ba5  ./poptop_ppp.SlackBuild
-dea813191a810d7832e8aca981e808c1  ./poptop_ppp.SlackBuild.log.gz
-7380ebdc97a88286aa43af75161e9443  ./post.poptop_ppp
-6101b3eec90070b73010fdf89cfe2667  ./ppp-2.4.3-4.src.tar.gz
-848f6c3cafeb6074ffeb293c3af79b7c  ./ppp-2.4.3.tar.gz
-b515c46197923fe1b0726653ddabd2ab  ./radiusclient/dictionary
-0563b256ecee3cc74d9ea456f1b27b04  ./radiusclient/dictionary.ascend
-df857f4acd1f3e5b673e5a76c32033eb  ./radiusclient/dictionary.compat
-88ac9472f94481602095184c5378c561  ./radiusclient/dictionary.merit
-63d4310a3ca63e05b8d5a3118156e9ac  ./radiusclient/dictionary.microsoft
-fe15a45db37b077478185d2846c10e6f  ./radiusclient/issue
-c4bd83f8ac89c6e600b9f16d329ca656  ./radiusclient/port-id-map
-305bf9f95396f43da75ef6b7776ae220  ./radiusclient/radiusclient.conf
-d31fb4eb263b0ab3ba970cef7f7e9b58  ./radiusclient/realms
-9f2fb36c59d84c1cb52a34858a70e5dd  ./radiusclient/servers
Index: l/internetserver/poptop_ppp/poptop_ppp.version
===================================================================
--- npl/internetserver/poptop_ppp/poptop_ppp.version	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,1 +1,0 @@
-2.4.3
Index: l/internetserver/poptop_ppp/post.poptop_ppp
===================================================================
--- npl/internetserver/poptop_ppp/post.poptop_ppp	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,3 +1,0 @@
-#!/bin/bash
-#File is op dit moment nog dummy
-exit 0
Index: l/internetserver/poptop_ppp/radiusclient/dictionary
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/dictionary	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,213 +1,0 @@
-#
-# Updated 97/06/13 to livingston-radius-2.01 miquels@cistron.nl
-#
-#	This file contains dictionary translations for parsing
-#	requests and generating responses.  All transactions are
-#	composed of Attribute/Value Pairs.  The value of each attribute
-#	is specified as one of 4 data types.  Valid data types are:
-#
-#	string - 0-253 octets
-#	ipaddr - 4 octets in network byte order
-#	integer - 32 bit value in big endian order (high byte first)
-#	date - 32 bit value in big endian order - seconds since
-#					00:00:00 GMT,  Jan.  1,  1970
-#
-#	Enumerated values are stored in the user file with dictionary
-#	VALUE translations for easy administration.
-#
-#	Example:
-#
-#	ATTRIBUTE	  VALUE
-#	---------------   -----
-#	Framed-Protocol = PPP
-#	7		= 1	(integer encoding)
-#
-
-#
-#	Following are the proper new names. Use these.
-#
-ATTRIBUTE	User-Name		1	string
-ATTRIBUTE	Password		2	string
-ATTRIBUTE	CHAP-Password		3	string
-ATTRIBUTE	NAS-IP-Address		4	ipaddr
-ATTRIBUTE	NAS-Port-Id		5	integer
-ATTRIBUTE	Service-Type		6	integer
-ATTRIBUTE	Framed-Protocol		7	integer
-ATTRIBUTE	Framed-IP-Address	8	ipaddr
-ATTRIBUTE	Framed-IP-Netmask	9	ipaddr
-ATTRIBUTE	Framed-Routing		10	integer
-ATTRIBUTE	Filter-Id		11	string
-ATTRIBUTE	Framed-MTU		12	integer
-ATTRIBUTE	Framed-Compression	13	integer
-ATTRIBUTE	Login-IP-Host		14	ipaddr
-ATTRIBUTE	Login-Service		15	integer
-ATTRIBUTE	Login-TCP-Port		16	integer
-ATTRIBUTE	Reply-Message		18	string
-ATTRIBUTE	Callback-Number		19	string
-ATTRIBUTE	Callback-Id		20	string
-ATTRIBUTE	Framed-Route		22	string
-ATTRIBUTE	Framed-IPX-Network	23	ipaddr
-ATTRIBUTE	State			24	string
-ATTRIBUTE	Session-Timeout		27	integer
-ATTRIBUTE	Idle-Timeout		28	integer
-ATTRIBUTE	Termination-Action	29	integer
-ATTRIBUTE	Called-Station-Id	30	string
-ATTRIBUTE	Calling-Station-Id	31	string
-ATTRIBUTE	Acct-Status-Type	40	integer
-ATTRIBUTE	Acct-Delay-Time		41	integer
-ATTRIBUTE	Acct-Input-Octets	42	integer
-ATTRIBUTE	Acct-Output-Octets	43	integer
-ATTRIBUTE	Acct-Session-Id		44	string
-ATTRIBUTE	Acct-Authentic		45	integer
-ATTRIBUTE	Acct-Session-Time	46	integer
-ATTRIBUTE	Acct-Terminate-Cause	49	integer
-ATTRIBUTE	NAS-Port-Type		61	integer
-ATTRIBUTE	Port-Limit		62	integer
-ATTRIBUTE	Connect-Info		77	string
-
-#
-#	Experimental Non Protocol Attributes used by Cistron-Radiusd
-#
-ATTRIBUTE	Huntgroup-Name		221	string
-ATTRIBUTE	User-Category		1029	string
-ATTRIBUTE	Group-Name		1030	string
-ATTRIBUTE	Simultaneous-Use	1034	integer
-ATTRIBUTE	Strip-User-Name		1035	integer
-ATTRIBUTE	Fall-Through		1036	integer
-ATTRIBUTE	Add-Port-To-IP-Address	1037	integer
-ATTRIBUTE	Exec-Program		1038	string
-ATTRIBUTE	Exec-Program-Wait	1039	string
-ATTRIBUTE	Hint			1040	string
-
-#
-#	Non-Protocol Attributes
-#	These attributes are used internally by the server
-#
-ATTRIBUTE	Expiration		  21	date
-ATTRIBUTE	Auth-Type		1000	integer
-ATTRIBUTE	Menu			1001	string
-ATTRIBUTE	Termination-Menu	1002	string
-ATTRIBUTE	Prefix			1003	string
-ATTRIBUTE	Suffix			1004	string
-ATTRIBUTE	Group			1005	string
-ATTRIBUTE	Crypt-Password		1006	string
-ATTRIBUTE	Connect-Rate		1007	integer
-
-#
-#	Integer Translations
-#
-
-#	User Types
-
-VALUE		Service-Type		Login-User		1
-VALUE		Service-Type		Framed-User		2
-VALUE		Service-Type		Callback-Login-User	3
-VALUE		Service-Type		Callback-Framed-User	4
-VALUE		Service-Type		Outbound-User		5
-VALUE		Service-Type		Administrative-User	6
-VALUE		Service-Type		NAS-Prompt-User		7
-
-#	Framed Protocols
-
-VALUE		Framed-Protocol		PPP			1
-VALUE		Framed-Protocol		SLIP			2
-
-#	Framed Routing Values
-
-VALUE		Framed-Routing		None			0
-VALUE		Framed-Routing		Broadcast		1
-VALUE		Framed-Routing		Listen			2
-VALUE		Framed-Routing		Broadcast-Listen	3
-
-#	Framed Compression Types
-
-VALUE		Framed-Compression	None			0
-VALUE		Framed-Compression	Van-Jacobson-TCP-IP	1
-
-#	Login Services
-
-VALUE		Login-Service		Telnet			0
-VALUE		Login-Service		Rlogin			1
-VALUE		Login-Service		TCP-Clear		2
-VALUE		Login-Service		PortMaster		3
-
-#	Status Types
-
-VALUE		Acct-Status-Type	Start			1
-VALUE		Acct-Status-Type	Stop			2
-VALUE		Acct-Status-Type	Accounting-On		7
-VALUE		Acct-Status-Type	Accounting-Off		8
-
-#	Authentication Types
-
-VALUE		Acct-Authentic		RADIUS			1
-VALUE		Acct-Authentic		Local			2
-VALUE		Acct-Authentic		PowerLink128		100
-
-#	Termination Options
-
-VALUE		Termination-Action	Default			0
-VALUE		Termination-Action	RADIUS-Request		1
-
-#	NAS Port Types, available in 3.3.1 and later
-
-VALUE		NAS-Port-Type		Async			0
-VALUE		NAS-Port-Type		Sync			1
-VALUE		NAS-Port-Type		ISDN			2
-VALUE		NAS-Port-Type		ISDN-V120		3
-VALUE		NAS-Port-Type		ISDN-V110		4
-
-#	Acct Terminate Causes, available in 3.3.2 and later
-
-VALUE           Acct-Terminate-Cause    User-Request            1
-VALUE           Acct-Terminate-Cause    Lost-Carrier            2
-VALUE           Acct-Terminate-Cause    Lost-Service            3
-VALUE           Acct-Terminate-Cause    Idle-Timeout            4
-VALUE           Acct-Terminate-Cause    Session-Timeout         5
-VALUE           Acct-Terminate-Cause    Admin-Reset             6
-VALUE           Acct-Terminate-Cause    Admin-Reboot            7
-VALUE           Acct-Terminate-Cause    Port-Error              8
-VALUE           Acct-Terminate-Cause    NAS-Error               9
-VALUE           Acct-Terminate-Cause    NAS-Request             10
-VALUE           Acct-Terminate-Cause    NAS-Reboot              11
-VALUE           Acct-Terminate-Cause    Port-Unneeded           12
-VALUE           Acct-Terminate-Cause    Port-Preempted          13
-VALUE           Acct-Terminate-Cause    Port-Suspended          14
-VALUE           Acct-Terminate-Cause    Service-Unavailable     15
-VALUE           Acct-Terminate-Cause    Callback                16
-VALUE           Acct-Terminate-Cause    User-Error              17
-VALUE           Acct-Terminate-Cause    Host-Request            18
-
-#
-#	Non-Protocol Integer Translations
-#
-
-VALUE		Auth-Type		Local			0
-VALUE		Auth-Type		System			1
-VALUE		Auth-Type		SecurID			2
-VALUE		Auth-Type		Crypt-Local		3
-VALUE		Auth-Type		Reject			4
-
-#
-#	Cistron extensions
-#
-VALUE		Auth-Type		Pam			253
-VALUE		Auth-Type		None			254
-
-#
-#	Experimental Non-Protocol Integer Translations for Cistron-Radiusd
-#
-VALUE		Fall-Through		No			0
-VALUE		Fall-Through		Yes			1
-VALUE		Add-Port-To-IP-Address	No			0
-VALUE		Add-Port-To-IP-Address	Yes			1
-
-#
-#	Configuration Values
-#	uncomment these two lines to turn account expiration on
-#
-
-#VALUE		Server-Config		Password-Expiration	30
-#VALUE		Server-Config		Password-Warning	5
-
-INCLUDE /etc/radiusclient/dictionary.microsoft
Index: l/internetserver/poptop_ppp/radiusclient/dictionary.ascend
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/dictionary.ascend	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,297 +1,0 @@
-#
-# Ascend dictionary.
-#
-#		Enable by putting the line "$INCLUDE dictionary.ascend" into
-#		the main dictionary file.
-#
-# Version:	1.00  21-Jul-1997  Jens Glaser <jens@regio.net>
-#
-
-
-#
-#	Ascend specific extensions
-#	Used by ASCEND MAX/Pipeline products
-#
-ATTRIBUTE	Ascend-FCP-Parameter		119	string
-ATTRIBUTE	Ascend-Modem-PortNo		120	integer
-ATTRIBUTE	Ascend-Modem-SlotNo		121	integer
-ATTRIBUTE	Ascend-Modem-ShelfNo		122	integer
-ATTRIBUTE	Ascend-Call-Attempt-Limit	123	integer
-ATTRIBUTE	Ascend-Call-Block-Duration	124	integer
-ATTRIBUTE	Ascend-Maximum-Call-Duration	125	integer
-ATTRIBUTE	Ascend-Temporary-Rtes		126	integer
-ATTRIBUTE       Tunneling-Protocol              127     integer
-ATTRIBUTE       Ascend-Shared-Profile-Enable    128     integer
-ATTRIBUTE	Ascend-Primary-Home-Agent	129	string
-ATTRIBUTE	Ascend-Secondary-Home-Agent	130	string
-ATTRIBUTE	Ascend-Dialout-Allowed		131	integer
-ATTRIBUTE	Ascend-Client-Gateway		132	ipaddr
-ATTRIBUTE	Ascend-BACP-Enable		133	integer
-ATTRIBUTE	Ascend-DHCP-Maximum-Leases	134	integer
-ATTRIBUTE	Ascend-Client-Primary-DNS	135	ipaddr
-ATTRIBUTE	Ascend-Client-Secondary-DNS	136	ipaddr
-ATTRIBUTE	Ascend-Client-Assign-DNS	137	integer
-ATTRIBUTE	Ascend-User-Acct-Type		138	integer
-ATTRIBUTE	Ascend-User-Acct-Host		139	ipaddr
-ATTRIBUTE	Ascend-User-Acct-Port		140	integer
-ATTRIBUTE	Ascend-User-Acct-Key		141	string
-ATTRIBUTE	Ascend-User-Acct-Base		142	integer
-ATTRIBUTE	Ascend-User-Acct-Time		143	integer
-ATTRIBUTE	Ascend-Assign-IP-Client		144	ipaddr
-ATTRIBUTE	Ascend-Assign-IP-Server		145	ipaddr
-ATTRIBUTE	Ascend-Assign-IP-Global-Pool	146	string
-ATTRIBUTE	Ascend-DHCP-Reply		147	integer
-ATTRIBUTE	Ascend-DHCP-Pool-Number		148	integer
-ATTRIBUTE	Ascend-Expect-Callback		149	integer
-ATTRIBUTE	Ascend-Event-Type		150	integer
-ATTRIBUTE	Ascend-Session-Svr-Key		151	string
-ATTRIBUTE	Ascend-Multicast-Rate-Limit	152	integer
-ATTRIBUTE	Ascend-IF-Netmask		153	ipaddr
-ATTRIBUTE	Ascend-Remote-Addr		154	ipaddr
-ATTRIBUTE	Ascend-Multicast-Client		155	integer
-ATTRIBUTE	Ascend-FR-Circuit-Name		156	string
-ATTRIBUTE	Ascend-FR-LinkUp		157	integer
-ATTRIBUTE	Ascend-FR-Nailed-Grp		158	integer
-ATTRIBUTE	Ascend-FR-Type			159	integer
-ATTRIBUTE	Ascend-FR-Link-Mgt		160	integer
-ATTRIBUTE	Ascend-FR-N391			161	integer
-ATTRIBUTE	Ascend-FR-DCE-N392		162	integer
-ATTRIBUTE	Ascend-FR-DTE-N392		163	integer
-ATTRIBUTE	Ascend-FR-DCE-N393		164	integer
-ATTRIBUTE	Ascend-FR-DTE-N393		165	integer
-ATTRIBUTE	Ascend-FR-T391			166	integer
-ATTRIBUTE	Ascend-FR-T392			167	integer
-ATTRIBUTE	Ascend-Bridge-Address  	 	168	string
-ATTRIBUTE       Ascend-TS-Idle-Limit            169     integer
-ATTRIBUTE       Ascend-TS-Idle-Mode             170     integer
-ATTRIBUTE	Ascend-DBA-Monitor	 	171	integer
-ATTRIBUTE	Ascend-Base-Channel-Count 	172	integer
-ATTRIBUTE	Ascend-Minimum-Channels		173	integer
-ATTRIBUTE	Ascend-IPX-Route		174	string
-ATTRIBUTE	Ascend-FT1-Caller		175	integer
-ATTRIBUTE	Ascend-Backup			176	string
-ATTRIBUTE	Ascend-Call-Type		177	integer
-ATTRIBUTE	Ascend-Group			178	string
-ATTRIBUTE	Ascend-FR-DLCI			179	integer
-ATTRIBUTE	Ascend-FR-Profile-Name		180	string
-ATTRIBUTE	Ascend-Ara-PW			181	string
-ATTRIBUTE	Ascend-IPX-Node-Addr		182	string
-ATTRIBUTE	Ascend-Home-Agent-IP-Addr	183	ipaddr
-ATTRIBUTE	Ascend-Home-Agent-Password	184	string
-ATTRIBUTE	Ascend-Home-Network-Name	185	string
-ATTRIBUTE	Ascend-Home-Agent-UDP-Port	186	integer
-ATTRIBUTE	Ascend-Multilink-ID		187	integer
-ATTRIBUTE	Ascend-Num-In-Multilink		188	integer
-ATTRIBUTE	Ascend-First-Dest		189	ipaddr
-ATTRIBUTE	Ascend-Pre-Input-Octets		190	integer
-ATTRIBUTE	Ascend-Pre-Output-Octets	191	integer
-ATTRIBUTE	Ascend-Pre-Input-Packets	192	integer
-ATTRIBUTE	Ascend-Pre-Output-Packets	193	integer
-ATTRIBUTE	Ascend-Maximum-Time		194	integer
-ATTRIBUTE	Ascend-Disconnect-Cause		195	integer
-ATTRIBUTE	Ascend-Connect-Progress		196	integer
-ATTRIBUTE	Ascend-Data-Rate		197	integer
-ATTRIBUTE	Ascend-PreSession-Time		198	integer
-ATTRIBUTE	Ascend-Token-Idle		199	integer
-ATTRIBUTE	Ascend-Token-Immediate		200	integer
-ATTRIBUTE	Ascend-Require-Auth		201	integer
-ATTRIBUTE	Ascend-Number-Sessions		202	string
-ATTRIBUTE	Ascend-Authen-Alias		203	string
-ATTRIBUTE	Ascend-Token-Expiry		204	integer
-ATTRIBUTE	Ascend-Menu-Selector		205	string
-ATTRIBUTE	Ascend-Menu-Item		206	string
-ATTRIBUTE	Ascend-PW-Warntime		207	integer
-ATTRIBUTE	Ascend-PW-Lifetime		208	integer
-ATTRIBUTE	Ascend-IP-Direct		209	ipaddr
-ATTRIBUTE	Ascend-PPP-VJ-Slot-Comp		210	integer
-ATTRIBUTE	Ascend-PPP-VJ-1172		211	integer
-ATTRIBUTE	Ascend-PPP-Async-Map		212	integer
-ATTRIBUTE	Ascend-Third-Prompt		213	string
-ATTRIBUTE	Ascend-Send-Secret		214	string
-ATTRIBUTE	Ascend-Receive-Secret		215	string
-ATTRIBUTE	Ascend-IPX-Peer-Mode		216	integer
-ATTRIBUTE	Ascend-IP-Pool-Definition	217	string
-ATTRIBUTE	Ascend-Assign-IP-Pool		218	integer
-ATTRIBUTE	Ascend-FR-Direct		219	integer
-ATTRIBUTE	Ascend-FR-Direct-Profile	220	string
-ATTRIBUTE	Ascend-FR-Direct-DLCI		221	integer
-ATTRIBUTE	Ascend-Handle-IPX		222	integer
-ATTRIBUTE	Ascend-Netware-timeout		223	integer
-ATTRIBUTE	Ascend-IPX-Alias		224	integer
-ATTRIBUTE	Ascend-Metric			225	integer
-ATTRIBUTE	Ascend-PRI-Number-Type		226	integer
-ATTRIBUTE	Ascend-Dial-Number		227	string
-ATTRIBUTE	Ascend-Route-IP			228	integer
-ATTRIBUTE	Ascend-Route-IPX		229	integer
-ATTRIBUTE	Ascend-Bridge			230	integer
-ATTRIBUTE	Ascend-Send-Auth		231	integer
-ATTRIBUTE	Ascend-Send-Passwd		232	string
-ATTRIBUTE	Ascend-Link-Compression		233	integer
-ATTRIBUTE	Ascend-Target-Util		234	integer
-ATTRIBUTE	Ascend-Maximum-Channels		235	integer
-ATTRIBUTE	Ascend-Inc-Channel-Count	236	integer
-ATTRIBUTE	Ascend-Dec-Channel-Count	237	integer
-ATTRIBUTE	Ascend-Seconds-Of-History	238	integer
-ATTRIBUTE	Ascend-History-Weigh-Type	239	integer
-ATTRIBUTE	Ascend-Add-Seconds		240	integer
-ATTRIBUTE	Ascend-Remove-Seconds		241	integer
-ATTRIBUTE	Ascend-Idle-Limit		244	integer
-ATTRIBUTE	Ascend-Preempt-Limit		245	integer
-ATTRIBUTE	Ascend-Callback			246	integer
-ATTRIBUTE	Ascend-Data-Svc			247	integer
-ATTRIBUTE	Ascend-Force-56			248	integer
-ATTRIBUTE	Ascend-Billing-Number		249	string
-ATTRIBUTE	Ascend-Call-By-Call		250	integer
-ATTRIBUTE	Ascend-Transit-Number		251	string
-ATTRIBUTE	Ascend-Host-Info		252	string
-ATTRIBUTE	Ascend-PPP-Address		253	ipaddr
-ATTRIBUTE	Ascend-MPP-Idle-Percent		254	integer
-ATTRIBUTE	Ascend-Xmit-Rate		255	integer
-
-
-
-# Ascend protocols
-VALUE		Service-Type		Dialout-Framed-User	5
-VALUE		Framed-Protocol		ARA			255
-VALUE		Framed-Protocol		MPP			256
-VALUE		Framed-Protocol		EURAW			257
-VALUE		Framed-Protocol		EUUI			258
-VALUE		Framed-Protocol		X25			259
-VALUE		Framed-Protocol		COMB			260
-VALUE		Framed-Protocol		FR			261
-VALUE		Framed-Protocol		MP			262
-VALUE		Framed-Protocol		FR-CIR			263
-
-
-#
-#	Ascend specific extensions
-#	Used by ASCEND MAX/Pipeline products (see above)
-#
-
-VALUE		Ascend-FR-Direct	FR-Direct-No		0
-VALUE		Ascend-FR-Direct	FR-Direct-Yes		1
-VALUE		Ascend-Handle-IPX	Handle-IPX-None		0
-VALUE		Ascend-Handle-IPX	Handle-IPX-Client	1
-VALUE		Ascend-Handle-IPX	Handle-IPX-Server	2
-VALUE		Ascend-IPX-Peer-Mode	IPX-Peer-Router		0
-VALUE		Ascend-IPX-Peer-Mode	IPX-Peer-Dialin		1
-VALUE		Ascend-Call-Type	Nailed			1
-VALUE		Ascend-Call-Type	Nailed/Mpp		2
-VALUE		Ascend-Call-Type	Perm/Switched		3
-VALUE		Ascend-FT1-Caller	FT1-No			0
-VALUE		Ascend-FT1-Caller	FT1-Yes			1
-VALUE		Ascend-PRI-Number-Type	Unknown-Number		0
-VALUE		Ascend-PRI-Number-Type	Intl-Number		1
-VALUE		Ascend-PRI-Number-Type	National-Number		2
-VALUE		Ascend-PRI-Number-Type	Local-Number		4
-VALUE		Ascend-PRI-Number-Type	Abbrev-Number		5
-VALUE		Ascend-Route-IPX	Route-IPX-No		0
-VALUE		Ascend-Route-IPX	Route-IPX-Yes		1
-VALUE		Ascend-Bridge		Bridge-No		0
-VALUE		Ascend-Bridge		Bridge-Yes		1
-VALUE  		Ascend-TS-Idle-Mode     TS-Idle-None		0
-VALUE	  	Ascend-TS-Idle-Mode     TS-Idle-Input		1
-VALUE  		Ascend-TS-Idle-Mode     TS-Idle-Input-Output	2
-VALUE		Ascend-Send-Auth	Send-Auth-None		0
-VALUE		Ascend-Send-Auth	Send-Auth-PAP		1
-VALUE		Ascend-Send-Auth	Send-Auth-CHAP		2
-VALUE		Ascend-Send-Auth	Send-Auth-MS-CHAP	3
-VALUE		Ascend-Link-Compression	Link-Comp-None		0
-VALUE		Ascend-Link-Compression	Link-Comp-Stac		1
-VALUE		Ascend-Link-Compression	Link-Comp-Stac-Draft-9	2
-VALUE		Ascend-Link-Compression	Link-Comp-MS-Stac	3
-VALUE		Ascend-History-Weigh-Type	History-Constant	0
-VALUE		Ascend-History-Weigh-Type	History-Linear		1
-VALUE		Ascend-History-Weigh-Type	History-Quadratic	2
-VALUE		Ascend-Callback		Callback-No		0
-VALUE		Ascend-Callback		Callback-Yes		1
-VALUE		Ascend-Expect-Callback	Expect-Callback-No	0
-VALUE		Ascend-Expect-Callback	Expect-Callback-Yes	1
-VALUE		Ascend-Data-Svc		Switched-Voice-Bearer	0
-VALUE		Ascend-Data-Svc		Switched-56KR		1
-VALUE		Ascend-Data-Svc		Switched-64K		2
-VALUE		Ascend-Data-Svc		Switched-64KR		3
-VALUE		Ascend-Data-Svc		Switched-56K		4
-VALUE		Ascend-Data-Svc		Switched-384KR		5
-VALUE		Ascend-Data-Svc		Switched-384K		6
-VALUE		Ascend-Data-Svc		Switched-1536K		7
-VALUE		Ascend-Data-Svc		Switched-1536KR		8
-VALUE		Ascend-Data-Svc		Switched-128K		9
-VALUE		Ascend-Data-Svc		Switched-192K		10
-VALUE		Ascend-Data-Svc		Switched-256K		11
-VALUE		Ascend-Data-Svc		Switched-320K		12
-VALUE		Ascend-Data-Svc		Switched-384K-MR	13
-VALUE		Ascend-Data-Svc		Switched-448K		14
-VALUE		Ascend-Data-Svc		Switched-512K		15
-VALUE		Ascend-Data-Svc		Switched-576K		16
-VALUE		Ascend-Data-Svc		Switched-640K		17
-VALUE		Ascend-Data-Svc		Switched-704K		18
-VALUE		Ascend-Data-Svc		Switched-768K		19
-VALUE		Ascend-Data-Svc		Switched-832K		20
-VALUE		Ascend-Data-Svc		Switched-896K		21
-VALUE		Ascend-Data-Svc		Switched-960K		22
-VALUE		Ascend-Data-Svc		Switched-1024K		23
-VALUE		Ascend-Data-Svc		Switched-1088K		24
-VALUE		Ascend-Data-Svc		Switched-1152K		25
-VALUE		Ascend-Data-Svc		Switched-1216K		26
-VALUE		Ascend-Data-Svc		Switched-1280K		27
-VALUE		Ascend-Data-Svc		Switched-1344K		28
-VALUE		Ascend-Data-Svc		Switched-1408K		29
-VALUE		Ascend-Data-Svc		Switched-1472K		30
-VALUE		Ascend-Data-Svc		Switched-1600K		31
-VALUE		Ascend-Data-Svc		Switched-1664K		32
-VALUE		Ascend-Data-Svc		Switched-1728K		33
-VALUE		Ascend-Data-Svc		Switched-1792K		34
-VALUE		Ascend-Data-Svc		Switched-1856K		35
-VALUE		Ascend-Data-Svc		Switched-1920K		36
-VALUE		Ascend-Data-Svc		Switched-inherited		37
-VALUE		Ascend-Data-Svc		Switched-restricted-bearer-x30  38
-VALUE		Ascend-Data-Svc		Switched-clear-bearer-v110	39
-VALUE		Ascend-Data-Svc		Switched-restricted-64-x30	40
-VALUE		Ascend-Data-Svc		Switched-clear-56-v110		41
-VALUE		Ascend-Data-Svc		Switched-modem			42
-VALUE		Ascend-Data-Svc		Switched-atmodem		43
-VALUE		Ascend-Data-Svc		Nailed-56KR		1
-VALUE		Ascend-Data-Svc		Nailed-64K		2
-VALUE		Ascend-Force-56		Force-56-No		0
-VALUE		Ascend-Force-56		Force-56-Yes		1
-VALUE		Ascend-PW-Lifetime	Lifetime-In-Days	0
-VALUE		Ascend-PW-Warntime	Days-Of-Warning		0
-VALUE		Ascend-PPP-VJ-1172	PPP-VJ-1172		1
-VALUE		Ascend-PPP-VJ-Slot-Comp	VJ-Slot-Comp-No		1
-VALUE		Ascend-Require-Auth	Not-Require-Auth	0
-VALUE		Ascend-Require-Auth	Require-Auth		1
-VALUE		Ascend-Token-Immediate	Tok-Imm-No		0
-VALUE		Ascend-Token-Immediate	Tok-Imm-Yes		1
-VALUE		Ascend-DBA-Monitor		DBA-Transmit		0
-VALUE 		Ascend-DBA-Monitor	DBA-Transmit-Recv	1
-VALUE		Ascend-DBA-Monitor	DBA-None		2
-VALUE		Ascend-FR-Type		Ascend-FR-DTE		0
-VALUE		Ascend-FR-Type		Ascend-FR-DCE		1
-VALUE		Ascend-FR-Type		Ascend-FR-NNI		2
-VALUE		Ascend-FR-Link-Mgt	Ascend-FR-No-Link-Mgt	0
-VALUE		Ascend-FR-Link-Mgt	Ascend-FR-T1-617D	1
-VALUE		Ascend-FR-Link-Mgt	Ascend-FR-Q-933A	2
-VALUE		Ascend-FR-LinkUp	Ascend-LinkUp-Default	0
-VALUE		Ascend-FR-LinkUp	Ascend-LinkUp-AlwaysUp	1
-VALUE		Ascend-Multicast-Client	Multicast-No		0
-VALUE		Ascend-Multicast-Client	Multicast-Yes		1
-VALUE		Ascend-User-Acct-Type	Ascend-User-Acct-None	0
-VALUE		Ascend-User-Acct-Type	Ascend-User-Acct-User	1
-VALUE		Ascend-User-Acct-Type	Ascend-User-Acct-User-Default	2
-VALUE		Ascend-User-Acct-Base	Base-10			0
-VALUE		Ascend-User-Acct-Base	Base-16			1
-VALUE		Ascend-DHCP-Reply	DHCP-Reply-No		0
-VALUE		Ascend-DHCP-Reply	DHCP-Reply-Yes		1
-VALUE		Ascend-Client-Assign-DNS	DNS-Assign-No		0
-VALUE		Ascend-Client-Assign-DNS	DNS-Assign-Yes		1
-VALUE		Ascend-Event-Type	Ascend-ColdStart	1
-VALUE		Ascend-Event-Type	Ascend-Session-Event	2
-VALUE		Ascend-BACP-Enable	BACP-No			0
-VALUE		Ascend-BACP-Enable	BACP-Yes		1
-VALUE		Ascend-Dialout-Allowed	Dialout-Not-Allowed	0
-VALUE		Ascend-Dialout-Allowed	Dialout-Allowed		1
-VALUE		Ascend-Shared-Profile-Enable    Shared-Profile-No       0
-VALUE		Ascend-Shared-Profile-Enable    Shared-Profile-Yes      1
-VALUE		Ascend-Temporary-Rtes	Temp-Rtes-No		0
-VALUE		Ascend-Temporary-Rtes	Temp-Rtes-Yes		1
Index: l/internetserver/poptop_ppp/radiusclient/dictionary.compat
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/dictionary.compat	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,47 +1,0 @@
-#
-#	Obsolete names for backwards compatibility with older users files.
-#	Move the $INCLUDE in the main dictionary file to the end if you want
-#	these names to be used in the "details" logfile.
-#
-ATTRIBUTE	Client-Id		4	ipaddr
-ATTRIBUTE	Client-Port-Id		5	integer
-ATTRIBUTE	User-Service-Type	6	integer
-ATTRIBUTE	Framed-Address		8	ipaddr
-ATTRIBUTE	Framed-Netmask		9	ipaddr
-ATTRIBUTE	Framed-Filter-Id	11	string
-ATTRIBUTE	Login-Host		14	ipaddr
-ATTRIBUTE	Login-Port		16	integer
-ATTRIBUTE	Old-Password		17	string
-ATTRIBUTE	Port-Message		18	string
-ATTRIBUTE	Dialback-No		19	string
-ATTRIBUTE	Dialback-Name		20	string
-ATTRIBUTE	Challenge-State		24	string
-VALUE		Framed-Compression	Van-Jacobsen-TCP-IP	1
-VALUE		Framed-Compression	VJ-TCP-IP		1
-VALUE		Service-Type		Shell-User		6
-VALUE		Auth-Type		Unix			1
-VALUE		Service-Type		Dialback-Login-User	3
-VALUE		Service-Type		Dialback-Framed-User	4
-
-#
-#	For compatibility with MERIT users files.
-#
-ATTRIBUTE	NAS-Port		5	integer
-ATTRIBUTE	Login-Host		14	ipaddr
-ATTRIBUTE	Login-Callback-Number	19	string
-ATTRIBUTE	Framed-Callback-Id	20	string
-ATTRIBUTE	Client-Port-DNIS	30	string
-ATTRIBUTE	Caller-ID		31	string
-VALUE		Service-Type		Login			1
-VALUE		Service-Type		Framed			2
-VALUE		Service-Type		Callback-Login		3
-VALUE		Service-Type		Callback-Framed		4
-VALUE		Service-Type		Exec-User		7
-
-#
-#	For compatibility with ESVA RADIUS, Old Cistron RADIUS
-#
-ATTRIBUTE	Session			1034	integer
-ATTRIBUTE	User-Name-Is-Star	1035	integer
-VALUE		User-Name-Is-Star	No			0
-VALUE		User-Name-Is-Star	Yes			1
Index: l/internetserver/poptop_ppp/radiusclient/dictionary.merit
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/dictionary.merit	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,17 +1,0 @@
-#
-#	Experimental extensions, configuration only (for check-items)
-#	Names/numbers as per the MERIT extensions (if possible).
-#
-ATTRIBUTE	NAS-Identifier		32	string
-ATTRIBUTE	Proxy-State		33	string
-ATTRIBUTE	Login-LAT-Service	34	string
-ATTRIBUTE	Login-LAT-Node		35	string
-ATTRIBUTE	Login-LAT-Group		36	string
-ATTRIBUTE	Framed-AppleTalk-Link	37	integer
-ATTRIBUTE	Framed-AppleTalk-Network 38	integer
-ATTRIBUTE	Framed-AppleTalk-Zone	39	string
-ATTRIBUTE       Acct-Input-Packets	47	integer
-ATTRIBUTE       Acct-Output-Packets	48	integer
-# 8 is a MERIT extension.
-VALUE		Service-Type		Authenticate-Only	8
-
Index: l/internetserver/poptop_ppp/radiusclient/dictionary.microsoft
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/dictionary.microsoft	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,81 +1,0 @@
-#
-#	Microsoft's VSA's, from RFC 2548
-#
-#	$Id: dictionary.microsoft,v 1.1 2004/11/14 07:26:26 paulus Exp $
-#
-
-VENDOR		Microsoft	311	Microsoft
-
-ATTRIBUTE	MS-CHAP-Response	1	string	Microsoft
-ATTRIBUTE	MS-CHAP-Error		2	string	Microsoft
-ATTRIBUTE	MS-CHAP-CPW-1		3	string	Microsoft
-ATTRIBUTE	MS-CHAP-CPW-2		4	string	Microsoft
-ATTRIBUTE	MS-CHAP-LM-Enc-PW	5	string	Microsoft
-ATTRIBUTE	MS-CHAP-NT-Enc-PW	6	string	Microsoft
-ATTRIBUTE	MS-MPPE-Encryption-Policy 7	string	Microsoft
-# This is referred to as both singular and plural in the RFC.
-# Plural seems to make more sense.
-ATTRIBUTE	MS-MPPE-Encryption-Type 8	string	Microsoft
-ATTRIBUTE	MS-MPPE-Encryption-Types  8	string	Microsoft
-ATTRIBUTE	MS-RAS-Vendor		9	integer	Microsoft
-ATTRIBUTE	MS-CHAP-Domain		10	string	Microsoft
-ATTRIBUTE	MS-CHAP-Challenge	11	string	Microsoft
-ATTRIBUTE	MS-CHAP-MPPE-Keys	12	string	Microsoft
-ATTRIBUTE	MS-BAP-Usage		13	integer	Microsoft
-ATTRIBUTE	MS-Link-Utilization-Threshold 14 integer	Microsoft
-ATTRIBUTE	MS-Link-Drop-Time-Limit	15	integer	Microsoft
-ATTRIBUTE	MS-MPPE-Send-Key	16	string	Microsoft
-ATTRIBUTE	MS-MPPE-Recv-Key	17	string	Microsoft
-ATTRIBUTE	MS-RAS-Version		18	string	Microsoft
-ATTRIBUTE	MS-Old-ARAP-Password	19	string	Microsoft
-ATTRIBUTE	MS-New-ARAP-Password	20	string	Microsoft
-ATTRIBUTE	MS-ARAP-PW-Change-Reason 21	integer	Microsoft
-
-ATTRIBUTE	MS-Filter		22	string	Microsoft
-ATTRIBUTE	MS-Acct-Auth-Type	23	integer	Microsoft
-ATTRIBUTE	MS-Acct-EAP-Type	24	integer	Microsoft
-
-ATTRIBUTE	MS-CHAP2-Response	25	string	Microsoft
-ATTRIBUTE	MS-CHAP2-Success	26	string	Microsoft
-ATTRIBUTE	MS-CHAP2-CPW		27	string	Microsoft
-
-ATTRIBUTE	MS-Primary-DNS-Server	28	ipaddr	Microsoft
-ATTRIBUTE	MS-Secondary-DNS-Server	29	ipaddr	Microsoft
-ATTRIBUTE	MS-Primary-NBNS-Server	30	ipaddr	Microsoft
-ATTRIBUTE	MS-Secondary-NBNS-Server 31	ipaddr	Microsoft
-
-#ATTRIBUTE	MS-ARAP-Challenge	33	string	Microsoft
-
-
-#
-#	Integer Translations
-#
-
-#	MS-BAP-Usage Values
-
-VALUE		MS-BAP-Usage		Not-Allowed	0
-VALUE		MS-BAP-Usage		Allowed		1
-VALUE		MS-BAP-Usage		Required	2
-
-#	MS-ARAP-Password-Change-Reason Values
-
-VALUE	MS-ARAP-PW-Change-Reason	Just-Change-Password		1
-VALUE	MS-ARAP-PW-Change-Reason	Expired-Password		2
-VALUE	MS-ARAP-PW-Change-Reason	Admin-Requires-Password-Change	3
-VALUE	MS-ARAP-PW-Change-Reason	Password-Too-Short		4
-
-#	MS-Acct-Auth-Type Values
-
-VALUE		MS-Acct-Auth-Type	PAP		1
-VALUE		MS-Acct-Auth-Type	CHAP		2
-VALUE		MS-Acct-Auth-Type	MS-CHAP-1	3
-VALUE		MS-Acct-Auth-Type	MS-CHAP-2	4
-VALUE		MS-Acct-Auth-Type	EAP		5
-
-#	MS-Acct-EAP-Type Values
-
-VALUE		MS-Acct-EAP-Type	MD5		4
-VALUE		MS-Acct-EAP-Type	OTP		5
-VALUE		MS-Acct-EAP-Type	Generic-Token-Card	6
-VALUE		MS-Acct-EAP-Type	TLS		13
-
Index: l/internetserver/poptop_ppp/radiusclient/issue
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/issue	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,5 +1,0 @@
-(\I)
------------------------------------------------------
-\S \R (\N) (port \L)
------------------------------------------------------
-
Index: l/internetserver/poptop_ppp/radiusclient/port-id-map
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/port-id-map	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,24 +1,0 @@
-#
-# port-id-map
-#
-# This file describes the ttyname to port id mapping. The port id
-# is reported as part of a RADIUS authentication or accouting request.
-#
-#ttyname (as returned by ttyname(3))	port-id
-/dev/tty1	1
-/dev/tty2	2
-/dev/tty3	3
-/dev/tty4	4
-/dev/tty5	5
-/dev/tty6	6
-/dev/tty7	7
-/dev/tty8	8
-/dev/ttyS0	9
-/dev/ttyS1	10
-/dev/ttyS2	11
-/dev/ttyS3	12
-/dev/ttyS4	13
-/dev/ttyS5	14
-/dev/ttyS6	15
-/dev/ttyS7	16
- 
Index: l/internetserver/poptop_ppp/radiusclient/radiusclient.conf
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/radiusclient.conf	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,78 +1,0 @@
-# General settings
-
-# specify which authentication comes first respectively which
-# authentication is used. possible values are: "radius" and "local".
-# if you specify "radius,local" then the RADIUS server is asked
-# first then the local one. if only one keyword is specified only
-# this server is asked.
-auth_order	radius,local
-
-# maximum login tries a user has
-login_tries	4
-
-# timeout for all login tries
-# if this time is exceeded the user is kicked out
-login_timeout	60
-
-# name of the nologin file which when it exists disables logins.
-# it may be extended by the ttyname which will result in
-# a terminal specific lock (e.g. /etc/nologin.ttyS2 will disable
-# logins on /dev/ttyS2)
-nologin /etc/nologin
-
-# name of the issue file. it's only display when no username is passed
-# on the radlogin command line
-issue	/etc/radiusclient/issue
-
-# RADIUS settings
-
-# RADIUS server to use for authentication requests. this config
-# item can appear more then one time. if multiple servers are
-# defined they are tried in a round robin fashion if one
-# server is not answering.
-# optionally you can specify a the port number on which is remote
-# RADIUS listens separated by a colon from the hostname. if
-# no port is specified /etc/services is consulted of the radius
-# service. if this fails also a compiled in default is used.
-authserver 	localhost
-
-# RADIUS server to use for accouting requests. All that I
-# said for authserver applies, too. 
-#
-acctserver 	localhost
-
-# file holding shared secrets used for the communication
-# between the RADIUS client and server
-servers		/etc/radiusclient/servers
-
-# dictionary of allowed attributes and values
-# just like in the normal RADIUS distributions
-dictionary 	/etc/radiusclient/dictionary
-
-# program to call for a RADIUS authenticated login
-login_radius	/usr/sbin/login.radius
-
-# file which holds sequence number for communication with the
-# RADIUS server
-seqfile		/var/run/radius.seq
-
-# file which specifies mapping between ttyname and NAS-Port attribute
-mapfile		/etc/radiusclient/port-id-map
-
-# default authentication realm to append to all usernames if no
-# realm was explicitly specified by the user
-# the radiusd directly form Livingston doesnt use any realms, so leave
-# it blank then
-default_realm
-
-# time to wait for a reply from the RADIUS server
-radius_timeout	10
-
-# resend request this many times before trying the next server
-radius_retries	3
-
-# LOCAL settings
-
-# program to execute for local login
-# it must support the -f flag for preauthenticated login
-login_local	/bin/login
Index: l/internetserver/poptop_ppp/radiusclient/realms
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/realms	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,22 +1,0 @@
-# /etc/radiusclient/realms
-#
-# Handle realm @netservers.co.uk on an internal RADIUS server
-# (note the server must be told to strip the realm)
-
-#authserver netservers.co.uk 192.168.1.1:1812
-#acctserver netservers.co.uk 192.168.1.1:1813
-
-# users in realm @example.com are handled by separate servers
-
-#authserver example.com 10.0.0.1:1812
-#acctserver example.com 10.0.0.2:1813
-
-# the DEFAULT realm matches users that do not supply a realm
-
-#authserver DEFAULT 192.168.1.1:1812
-#acctserver DEFAULT 192.168.1.1:1813
-
-# Any realms that do not match in the realms file automatically fall 
-# through to the standard radius plugin which uses the servers in the 
-# radiusclient.conf file.  Note that this is different than the
-# DEFAULT realm match, above.
Index: l/internetserver/poptop_ppp/radiusclient/servers
===================================================================
--- npl/internetserver/poptop_ppp/radiusclient/servers	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,5 +1,0 @@
-#Server Name or Client/Server pair		Key
-#----------------				---------------
-#portmaster.elemental.net			hardlyasecret
-#portmaster2.elemental.net	    		donttellanyone
-localhost					testing123
Index: npl/internetserver/poptop_pptpd/poptop_pptpd.SlackBuild
===================================================================
--- npl/internetserver/poptop_pptpd/poptop_pptpd.SlackBuild	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/poptop_pptpd/poptop_pptpd.SlackBuild	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,3 +1,5 @@
 #!/bin/sh
+#DEP:ppp
+
 
 CWD=`pwd`
@@ -7,5 +9,5 @@
 mkdir -p $PKG
 
-VERSION=1.3.4
+VERSION=1.4.0
 ARCH=${ARCH:-i486}
 BUILD=1DatuX
@@ -14,6 +16,6 @@
 rm -rf *
 
-tar xzvf $CWD/pptpd-1.3.4.tar.gz
-cd pptpd-1.3.4
+tar xzvf $CWD/pptpd-$VERSION.tar.gz
+cd pptpd-$VERSION
 ./configure --with-libwrap \
     --enable-bcrelay \
@@ -24,5 +26,5 @@
     --libdir=/usr/lib \
     --libexecdir=/usr/sbin || exit 1
-     
+
 make -j 1 || exit 1
 make -j 1 install DESTDIR=$PKG || exit 1
@@ -43,7 +45,8 @@
 cat << EOF > $PKG/service/pptpd/run
 #!/bin/bash
+modprobe pptp
 exec pptpd -f -c /home/system/pptpd/pptpd.conf
 EOF
-chmod +x $PKG/service/pptpd/run	
+chmod +x $PKG/service/pptpd/run
 
 #etc config files fixxen
@@ -60,3 +63,3 @@
 makepkg -l y -c n $CWD/$NAME.pkg > /dev/null &&
 echo $VERSION > $CWD/$NAME.version &&
-arch > $CWD/$NAME.arch 
+arch > $CWD/$NAME.arch
Index: npl/internetserver/poptop_pptpd/poptop_pptpd.build
===================================================================
--- npl/internetserver/poptop_pptpd/poptop_pptpd.build	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/poptop_pptpd/poptop_pptpd.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,1 +1,1 @@
-6111
+6116
Index: npl/internetserver/poptop_pptpd/poptop_pptpd.depver
===================================================================
--- npl/internetserver/poptop_pptpd/poptop_pptpd.depver	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/poptop_pptpd/poptop_pptpd.depver	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+ppp	0
Index: npl/internetserver/poptop_pptpd/poptop_pptpd.md5
===================================================================
--- npl/internetserver/poptop_pptpd/poptop_pptpd.md5	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/poptop_pptpd/poptop_pptpd.md5	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,9 +1,8 @@
-034e83f734e7972f5df3dfa2fa607416  ./poptop_pptpd.pkg
-37b3bb7342f0b780d2a48fe32ef4355c  ./poptop_pptpd.SlackBuild
-ec84c4d192d30dcf594af4f934159543  ./poptop_pptpd.SlackBuild.log.gz
+6d2bb46234794572721edc5243861c1f  ./poptop_pptpd.pkg
+a4030ec4d35af9d5320452c87f87b9d8  ./poptop_pptpd.SlackBuild
+6a99e6cb2629e01c00382dc75127c4c5  ./poptop_pptpd.SlackBuild.log.gz
 fc5af1e56891b41a248510da94f000e8  ./post.poptop_pptpd
 0f4a089991cc119410f638f1e79cc0c6  ./ppp/chap-secrets
-57cc9aa552bb90cc59ff4e61ab2801e5  ./ppp/options.pptpd
+7dcd4595bb7bbf005723773e184a1410  ./ppp/options.pptpd
 67d71b58aebd10cafe3931b6a6870ab9  ./ppp/pptpd.conf
-b38df9c431041922c997c1148bedf591  ./pptpd-1.3.4.tar.gz
-d5b059e1ad448fd8d7ff0e226b17619f  ./readme.txt
+36f9f45c6ffa92bc3b6e24ae2d053505  ./pptpd-1.4.0.tar.gz
Index: npl/internetserver/poptop_pptpd/poptop_pptpd.version
===================================================================
--- npl/internetserver/poptop_pptpd/poptop_pptpd.version	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/poptop_pptpd/poptop_pptpd.version	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,1 +1,1 @@
-1.3.4
+1.4.0
Index: npl/internetserver/poptop_pptpd/ppp/options.pptpd
===================================================================
--- npl/internetserver/poptop_pptpd/ppp/options.pptpd	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/poptop_pptpd/ppp/options.pptpd	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -14,5 +14,5 @@
 # Authentication
 
-# Name of the local system for authentication purposes 
+# Name of the local system for authentication purposes
 # (must match the second field in /etc/ppp/chap-secrets entries)
 name pptpd
@@ -102,7 +102,7 @@
 
 # Disable BSD-Compress compression
-nobsdcomp 
+nobsdcomp
 
-# Disable Van Jacobson compression 
+# Disable Van Jacobson compression
 # (needed on some networks with Windows 9x/ME/XP clients, see posting to
 # poptop-server on 14th April 2005 by Pawel Pokrywka and followups,
@@ -111,17 +111,11 @@
 novjccomp
 
-# turn off logging to stderr, since this may be redirected to pptpd, 
+# turn off logging to stderr, since this may be redirected to pptpd,
 # which may trigger a loopback
 nologfd
 
-# put plugins here 
+# put plugins here
 # (putting them higher up may cause them to sent messages to the pty)
 plugin radius.so
 plugin radrealms.so
 plugin radattr.so
-
-# nodig om connectie problemen op te lossen met servers achter 'broken routers'
-nomppe-lower-mtu
-
-
-
Index: npl/internetserver/ppp/ppp.SlackBuild
===================================================================
--- npl/internetserver/ppp/ppp.SlackBuild	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp.SlackBuild	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Automaticly created by importpackage v1.0
+# Imported from: http://ftp.bit.nl/mirror/slackware/source/n/ppp/
+# Created at Wed Jun 28 17:52:27 CEST 2017
+
+
+########### source original slackbuild (hopefully we dont need to modify it)
+CWD=`pwd`
+set -e
+source ./ppp.SlackBuild.orig
+
+# add microsoft pptp support for poptop_pptpd:
+
+echo "INCLUDE /etc/radiusclient/dictionary.microsoft" >> /tmp/package-ppp/etc/radiusclient/dictionary
+
+echo "localhost          testing123" >> /tmp/package-ppp/etc/radiusclient/servers
+
+############ make syn3 packages
+cd $CWD
+for PKG in /tmp/package-*; do
+        NAME=`echo $PKG| sed 's/.*package-//'| sed 's/-/_/g'`
+
+        #seperate dev-package
+        syn3_move_dev $PKG $PKG""_dev
+        syn3_makepkg $PKG""_dev $NAME""_dev $VERSION $ARCH || exit 1
+
+        #make main package
+        syn3_makepkg $PKG $NAME $VERSION $ARCH || exit 1
+done
Index: npl/internetserver/ppp/ppp.SlackBuild.orig
===================================================================
--- npl/internetserver/ppp/ppp.SlackBuild.orig	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp.SlackBuild.orig	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,169 @@
+#!/bin/sh
+
+# Copyright 2008, 2009, 2010, 2013, 2015  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+VERSION=2.4.7
+RADVER=1.1.6
+PPPVER=1.98
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j7 "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-ppp
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+echo "+============+"
+echo "| ppp-$VERSION |"
+echo "+============+"
+cd $TMP
+rm -rf ppp-$VERSION
+tar xvf $CWD/ppp-$VERSION.tar.xz || exit 1
+cd ppp-$VERSION || exit 1
+chown -R root:root .
+find . \
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+  -exec chmod 644 {} \;
+
+zcat $CWD/ppp.slack.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
+sed -i -e "s#lib/pppd#lib${LIBDIRSUFFIX}/pppd#g" $(grep -lr 'lib/pppd' *)
+
+# This conflicts with the header in 3.5+ kernels:
+rm -f include/linux/if_pppol2tp.h
+
+zcat $CWD/ppp.CVE-2015-3310.diff.gz | patch -p1 --verbose || exit 1
+
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX}
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG/usr
+
+# Install PPP config files:
+mkdir -p $PKG/etc/ppp
+cp -a etc.ppp/* $PKG/etc/ppp
+chmod 600 $PKG/etc/ppp/*secrets
+( cd $PKG/etc/ppp
+  mv chap-secrets chap-secrets.new
+  mv options options.new
+  mv pap-secrets pap-secrets.new
+)
+zcat $CWD/options.new.gz > $PKG/etc/ppp/options.new
+
+# Fix what seems like an insecure default setting.
+# Feel free to "chmod 4750 pppoatm.so rp-pppoe.so" at your own risk.
+# Since they are only runnable by group root, the risk really isn't much...
+chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/pppd/*/*.so
+
+mkdir -p $PKG/usr/doc/ppp-$VERSION
+cp -a \
+  FAQ PLUGINS README* SETUP scripts \
+  $PKG/usr/doc/ppp-$VERSION
+
+echo "+====================+"
+echo "| freeradius-client-$RADVER |"
+echo "+====================+"
+cd $TMP
+rm -rf freeradius-client-$RADVER
+tar xf $CWD/freeradius-client-$RADVER.tar.xz || exit 1
+cd freeradius-client-$RADVER || exit 1
+chown -R root:root .
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --build=$ARCH-slackware-linux
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+zcat $CWD/radius.msdict.gz > $PKG/etc/radiusclient/dictionary.microsoft
+zcat $CWD/realms.gz > $PKG/etc/radiusclient/realms
+( cd $PKG/etc/radiusclient
+  chmod 600 realms servers
+  mv issue issue.new
+  mv radiusclient.conf radiusclient.conf.new
+  mv realms realms.new
+  mv servers servers.new
+)
+mkdir -p $PKG/usr/doc/freeradius-client-$RADVER
+cp -a \
+  BUGS COPYRIGHT README README.radexample doc/instop.html \
+  $PKG/usr/doc/freeradius-client-$RADVER
+chmod 644 $PKG/usr/doc/freeradius-client-$RADVER/*
+
+echo "+===============+"
+echo "| pppsetup-$PPPVER |"
+echo "+===============+"
+cd $TMP
+rm -rf pppsetup-$PPPVER
+tar xvf $CWD/pppsetup-$PPPVER.tar.xz || exit 1
+cd pppsetup-$PPPVER || exit 1
+chown -R root:root .
+zcat $CWD/pppsetup-1.98.slack.diff.gz | patch -p1 --backup || exit
+zcat $CWD/pppsetup-1.98.pppoff.diff.gz | patch -p0 --backup || exit
+zcat $CWD/pppsetup-1.98.moredevs.diff.gz | patch -p1 --backup || exit
+zcat $CWD/pppsetup-1.98.backupfiles.diff.gz | patch -p1 --backup || exit
+chmod 755 ppp-off pppsetup
+cp -a ppp-off pppsetup $PKG/usr/sbin
+mkdir -p $PKG/usr/doc/pppsetup
+cp -a \
+  README.pppsetup ppp-compile.txt pppsetup-$PPPVER.README pppsetup-$PPPVER.lsm \
+  $PKG/usr/doc/pppsetup
+
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . -name "*.a" | xargs file | grep "ar archive" | cut -f 1 -d : | xargs strip -g 2> /dev/null
+)
+
+chmod 755 $PKG/usr/sbin/*
+
+gzip -9 $PKG/usr/man/man?/*.?
+chmod 644 $PKG/usr/man/man?/*
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/ppp-$VERSION-$ARCH-$BUILD.txz
+
Index: npl/internetserver/ppp/ppp.arch
===================================================================
--- npl/internetserver/ppp/ppp.arch	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp.arch	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+i486
Index: npl/internetserver/ppp/ppp.build
===================================================================
--- npl/internetserver/ppp/ppp.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+7
Index: npl/internetserver/ppp/ppp.md5
===================================================================
--- npl/internetserver/ppp/ppp.md5	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp.md5	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,19 @@
+84d4d9f8f8d9d50145bd2ae6bc17b528  ./doinst.sh.gz
+5e49056ec09893b9febbea8465004b46  ./freeradius-client-1.1.6.tar.xz
+9467c67ee1289b53887a88a8d3af2ef9  ./options.new.gz
+36eef9589f55d85fae17327037cc0760  ./ppp-2.4.7.tar.xz
+a0e118e536a2b507a7b8d91e252a38a5  ./ppp.CVE-2015-3310.diff.gz
+97c11ce913ab37e545e79e24eb8c59ff  ./ppp_dev.pkg
+15d48705f80c04662febdf7c2edf689a  ./ppp.pkg
+cfcc8b4ba69927d23b39dc824c9b1985  ./pppsetup-1.98.backupfiles.diff.gz
+14b9880070fdd3d11a991b8a9c519932  ./pppsetup-1.98.moredevs.diff.gz
+cf7bafd178fbdadcff4c1c58949fcdbd  ./pppsetup-1.98.pppoff.diff.gz
+e566fc331419a8c2971c630b368eb9a5  ./pppsetup-1.98.slack.diff.gz
+102564222cf87f52dc503c22eb2470ad  ./pppsetup-1.98.tar.xz
+db642aa90b0ff8449eaf64bf1c583199  ./ppp.SlackBuild
+60e13e6d327eb9a7146e023ed03dc9bd  ./ppp.SlackBuild.log.gz
+9ad99dd0ecb0348d0019c4d710070590  ./ppp.SlackBuild.orig
+23dfd8e7153b715e8068e97f51ef1be1  ./ppp.slack.diff.gz
+5280465d9cf03beadb99c5698909a667  ./radius.msdict.gz
+dc57dd58690a18b7e1a8a727c8b06a96  ./realms.gz
+f77194697b48273eb7ee31b12620c622  ./slack-desc
Index: npl/internetserver/ppp/ppp.version
===================================================================
--- npl/internetserver/ppp/ppp.version	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp.version	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+2.4.7
Index: npl/internetserver/ppp/ppp_dev.arch
===================================================================
--- npl/internetserver/ppp/ppp_dev.arch	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp_dev.arch	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+i486
Index: npl/internetserver/ppp/ppp_dev.build
===================================================================
--- npl/internetserver/ppp/ppp_dev.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp_dev.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+7
Index: npl/internetserver/ppp/ppp_dev.version
===================================================================
--- npl/internetserver/ppp/ppp_dev.version	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/ppp_dev.version	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+2.4.7
Index: npl/internetserver/ppp/slack-desc
===================================================================
--- npl/internetserver/ppp/slack-desc	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/internetserver/ppp/slack-desc	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+   |-----handy-ruler------------------------------------------------------|
+ppp: ppp (Point-to-Point Protocol)
+ppp:
+ppp: The Point-to-Point Protocol (PPP) provides a method for transmitting
+ppp: data over serial links.  It's commonly used for connecting to the
+ppp: Internet using a modem.  This package includes the PPP daemon (pppd),
+ppp: which negotiates with the peer to establish the link and sets up the
+ppp: ppp network interface, and pppsetup, an easy-to-use utility for
+ppp: setting up your PPP daemon.
+ppp:
+ppp:
+ppp:
Index: npl/internetserver/pppd_ldap/pppd_ldap.SlackBuild
===================================================================
--- npl/internetserver/pppd_ldap/pppd_ldap.SlackBuild	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/internetserver/pppd_ldap/pppd_ldap.SlackBuild	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,4 +1,4 @@
 #!/bin/sh
-#DEP:poptop_ppp
+#DEP:ppp
 #DEP:openldap
 CWD=`pwd`
@@ -27,5 +27,5 @@
 chmod +x $PKG/etc/postinst.d/post.pppd_ldap
 
-#LDAP schema file voor Radius 
+#LDAP schema file voor Radius
 mkdir -p $PKG/etc/openldap/schema
 cp RADIUS-LDAPv3.schema $PKG/etc/openldap/schema || exit 1
@@ -36,3 +36,3 @@
 makepkg -l y -c n $CWD/$NAME.pkg > /dev/null &&
 echo $VERSION > $CWD/$NAME.version &&
-arch > $CWD/$NAME.arch 
+arch > $CWD/$NAME.arch
Index: l/internetserver/pptp/post.pptp
===================================================================
--- npl/internetserver/pptp/post.pptp	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,9 +1,0 @@
-#!/bin/bash
-
-#MPPE encryption requires that only MSCHAP-v2 authentication is used. So we need to disable all other authentications..
-#
-#Disable EAP authentication.
-if ! (( `grep "refuse-eap" /home/system/pptpd/options.pptpd | wc -l` > 0 )); then
-	sed -i /home/system/pptpd/options.pptpd \
-        -e 's/refuse-pap/refuse-eap\nrefuse-pap/'
-fi
Index: l/internetserver/pptp/pptp.SlackBuild
===================================================================
--- npl/internetserver/pptp/pptp.SlackBuild	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,69 +1,0 @@
-#!/bin/bash
-#Gebruik deze file als voorbeeld. Plaats de source tar.gz file in de zelfde directory als deze slackbuild
-#Met de NEED en DEP opties is het mogelijk om build dependencies aan te geven.
-#Voor de meeste packages hoeft er verder niks aan de variabellen veranderd te worden.
-##################################### Build dependency info:
-
-#Strict build-dependencies. 
-#Only use when really neccesary, this will rebuild our package if the dependencie has changed:
-##DEP:linux
-##DEP:linux_src
-
-#Loose build-dependencies.
-#Use this to specify the packages that are required to build our package:
-##NEED:libcairo
-##NEED:glib
-##NEED:gtk+
-##NEED:glib2
-##NEED:gtk+2
-##NEED:xorg_lib
-##NEED:xorg_proto
-
-#######Essential package info.
-#Change these if autodetection fails.
-
-#Name of the Syn-3 package that we are going to create
-NAME=`basename $0|sed 's/.SlackBuild//'`
-
-#Archive of the sourcefiles to unpack 
-SRC_ARC=`ls *.tar.*`
-
-#Version of the sourcefiles
-VER=`echo $SRC_ARC| sed 's/.*-//g' | sed 's/\.tar\..*$//g'`
-
-#Directory of the sourcefiles to build (after optional unpacking)
-SRC_DIR=`echo $SRC_ARC| sed 's/\.tar\..*$//g'`
-
-#Architecture that the created binaries run on.
-#Use noarch for scripts.
-ARCH=`uname -m`
-
-
-########Build and create the pacakge.
-#Uncomment the stuff that you dont want or need
-
-#Unpack source 
-#(uncomment if not needed)
-syn3_unpack $SRC_ARC || exit 1
-
-pushd $SRC_DIR || exit 1
-make || exit 1
-make DESTDIR=/tmp/pkg install || exit 1
-popd
-
-
-mkdir -p /tmp/pkg/etc/postinst.d
-cp post.pptp /tmp/pkg/etc/postinst.d || exit 1
-chmod +x /tmp/pkg/etc/postinst.d/* || exit 1
-
-#strip bins and other stuff
-syn3_strip /tmp/pkg || exit 1
-
-#move development stuff and create seperate development package
-syn3_move_dev /tmp/pkg /tmp/pkgdev || exit 1
-syn3_makepkg /tmp/pkgdev $NAME""_dev $VER $ARCH || exit 1
-
-#make main package
-syn3_makepkg /tmp/pkg $NAME $VER $ARCH || exit 1
-
-
Index: l/internetserver/pptp/pptp.arch
===================================================================
--- npl/internetserver/pptp/pptp.arch	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,1 +1,0 @@
-i586
Index: l/internetserver/pptp/pptp.build
===================================================================
--- npl/internetserver/pptp/pptp.build	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,1 +1,0 @@
-5450
Index: l/internetserver/pptp/pptp.md5
===================================================================
--- npl/internetserver/pptp/pptp.md5	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,5 +1,0 @@
-942adfee8fb8282cba869b8114d0472a  ./post.pptp
-b47735ba5d6d37dfdbccb85afc044ede  ./pptp-1.7.1.tar.gz
-151d5d73a27fc95ca3ae8edc58cf7285  ./pptp.SlackBuild
-ac2ba3e7e163c23766f3d93d4db632ad  ./pptp.SlackBuild.log.gz
-2d2b35dcbd71e45ed430d473d448712a  ./pptp.pkg
Index: l/internetserver/pptp/pptp.version
===================================================================
--- npl/internetserver/pptp/pptp.version	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ 	(revision )
@@ -1,1 +1,0 @@
-1.7.1
Index: npl/overig/ncdu/ncdu.SlackBuild
===================================================================
--- npl/overig/ncdu/ncdu.SlackBuild	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/overig/ncdu/ncdu.SlackBuild	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+##NEED:...
+#DEP:ncurses
+
+#######Essential package info.
+#Change these if autodetection fails.
+
+#Name of the Syn-3 package that we are going to create
+NAME=`basename $0|sed 's/.SlackBuild//'`
+
+#Archive of the sourcefiles to unpack 
+SRC_ARC=`ls *.tar.* *.zip 2>/dev/null`
+
+#Version of the sourcefiles
+VER=`echo $SRC_ARC| sed 's/.*-//g' | sed 's/\.tar\..*$//g' | sed 's/\.zip$//g'`
+
+#Architecture that the created binaries run on.
+#Use noarch for scripts.
+ARCH=`uname -m`
+
+#from this point on, exit on errors:
+set -e
+
+########Build and create the pacakge.
+#Uncomment the stuff that you dont want or need
+
+#Unpack source 
+#(uncomment if not needed)
+syn3_unpack $SRC_ARC 
+
+#Directory where the sourcefiles are unpacked. 
+#(you might have to adjust this if autodetection fails)
+SRC_DIR=`ls -c|head -1`
+
+#apply patches
+#patch -p1 -d $SRC_DIR < fluxkiosk.patch || exit 1
+
+pushd $SRC_DIR 
+
+#AUTOMAKE: Configure
+#Some usefull stuff you sometimes need to set:
+#export LDFLAGS="-L/usr/X11/lib/ -L/usr/lib/mysql/"
+#export LD_LIBRARY_PATH=/usr/lib/mysql
+#export VPATH=$LD_LIBRARY_PATH
+#export CFLAGS="-std=c89"
+#export CFLAGS="-fgnu89-inline" #If "multiple definition of `foo'" Also see http://gcc.gnu.org/gcc-4.3/porting_to.html
+MAKE_OPTS=""
+./configure --prefix=/usr  || exit 1
+
+#AUTOMAKE: Compile
+make $MAKE_OPTS || exit 1
+
+#AUTOMAKE: Test (optional)
+if grep ^test: Makefile; then
+	make pkgconfigdir=/usr/lib/pkgconfig $MAKE_OPTS install || exit 1
+	make $MAKE_OPTS test || exit 1
+elif grep ^check: Makefile; then
+	make pkgconfigdir=/usr/lib/pkgconfig $MAKE_OPTS install || exit 1
+	make $MAKE_OPTS check || exit 1 
+fi
+
+#AUTOMAKE: Install
+mkdir -p /tmp/pkg &>/dev/null
+make pkgconfigdir=/usr/lib/pkgconfig install_prefix=/tmp/pkg DESTDIR=/tmp/pkg INSTALL_ROOT=/tmp/pkg install_root=/tmp/pkg $MAKE_OPTS install || exit 1
+popd
+
+#strip bins and other stuff
+syn3_strip /tmp/pkg || exit 1
+
+#move development stuff and create seperate development package
+syn3_move_dev /tmp/pkg /tmp/pkgdev || exit 1
+syn3_makepkg /tmp/pkgdev $NAME""_dev $VER $ARCH || exit 1
+
+#make main package
+syn3_makepkg /tmp/pkg $NAME $VER $ARCH || exit 1
+
+
+
Index: npl/overig/ncdu/ncdu.arch
===================================================================
--- npl/overig/ncdu/ncdu.arch	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/overig/ncdu/ncdu.arch	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+i586
Index: npl/overig/ncdu/ncdu.build
===================================================================
--- npl/overig/ncdu/ncdu.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/overig/ncdu/ncdu.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+1
Index: npl/overig/ncdu/ncdu.depver
===================================================================
--- npl/overig/ncdu/ncdu.depver	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/overig/ncdu/ncdu.depver	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+ncurses	0
Index: npl/overig/ncdu/ncdu.md5
===================================================================
--- npl/overig/ncdu/ncdu.md5	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/overig/ncdu/ncdu.md5	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,4 @@
+7365ac46c420bc511621216b1747984f  ./ncdu-1.12.tar.gz
+2d16295b9497b0cb7bcee09d5df86954  ./ncdu.pkg
+552c529ea8ddb0399dee1cfeac638f16  ./ncdu.SlackBuild
+a7dcd7d42b426006bf3cf80b5c8ac4d0  ./ncdu.SlackBuild.log.gz
Index: npl/overig/ncdu/ncdu.version
===================================================================
--- npl/overig/ncdu/ncdu.version	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
+++ npl/overig/ncdu/ncdu.version	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -0,0 +1,1 @@
+1.12
Index: npl/syn3/syn3_patches/post.patches
===================================================================
--- npl/syn3/syn3_patches/post.patches	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/syn3/syn3_patches/post.patches	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -18,2 +18,5 @@
 removepkg /log/packages/python_setuptools-0* 2>/dev/null || true
 
+#some modern packages require /run instead of /var/run:
+ln -s /var/run /  2>/dev/null || true
+
Index: npl/syn3/syn3_patches/syn3_patches.build
===================================================================
--- npl/syn3/syn3_patches/syn3_patches.build	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/syn3/syn3_patches/syn3_patches.build	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,1 +1,1 @@
-6537
+6539
Index: npl/syn3/syn3_patches/syn3_patches.md5
===================================================================
--- npl/syn3/syn3_patches/syn3_patches.md5	(revision e248cf206de78584fb5cd2702847596c07312488)
+++ npl/syn3/syn3_patches/syn3_patches.md5	(revision d6ed36a1e0392dff58e453da827776e93ed5aa3a)
@@ -1,5 +1,5 @@
-39962f1807e5f275d7a6d64bf82eb0ae  ./post.patches
+2f6fd8091ce80a54d352d27a6897d928  ./post.patches
 b173a5aec3c910b462afffd61a39aa32  ./root/var/lib/patches/README
-3460854ff7dc814052af546e013b42c5  ./syn3_patches.pkg
+659fad5bdd3da4d7660c4de1fe9b58d8  ./syn3_patches.pkg
 6c062583fe22f5aa19b6ff6593149514  ./syn3_patches.SlackBuild
-317ae5fef2ea62fc5e9c032c909fd3b3  ./syn3_patches.SlackBuild.log.gz
+936b966b557c3cf63cb6765f266be7dd  ./syn3_patches.SlackBuild.log.gz
