OBS User unknown 2006-12-19 16:17:30 +00:00 committed by Git OBS Bridge
commit 24ead714ff
35 changed files with 2682 additions and 0 deletions

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

18
chap-secrets.template Normal file
View File

@ -0,0 +1,18 @@
# Secrets for authentication using CHAP
# client server secret IP addresses
# OUTBOUND CONNECTIONS
# Here you should add your PPP Login and PPP password to connect to your
# provider via pap. The * means that the entry(login and passoword may 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.
#hostname * password
# PREDIFINED CONNECTIONS
# These are user and password entries for publically accessible call-by-call
# Internet providers in Germany. If they confict with your config, remove them.
# READ_IN_CALLBYCALL_SECRETS
# INBOUND CONNECTIONS
#client hostname <password> 192.168.1.1

14
filters Normal file
View File

@ -0,0 +1,14 @@
#
# These filter rules should prevent unwanted internet services to
# keep your connections up by ignoring their connection requests
# and your 'go way' responses.
#
# This file should be included by the line 'file /etc/ppp/filters' in
# /etc/ppp/options.
#
# Note: This has nothing to do with firewall rules. It only affects
# the idle time calculation of the kernel/pppd.
#
active-filter 'outbound and not icmp[0] == 3 and not tcp[13] & 4 != 0'

199
options Normal file
View File

@ -0,0 +1,199 @@
# /etc/ppp/options
#
# Not every option is listed here, see man pppd for more details. This file
# is read by the pppd, it is an error when it is not present.
#
# Use the following command to see the active options:
# grep -v ^# /etc/ppp/options | grep -v ^$
#
# 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
# 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
# noauth means do not require the peer to authenticate itself, this must
# be set if you want to use pppd to connect to the internet. In this case
# *you* must authenicate yourself to the peer(internet provider), so do
# not disable this setting unless you are the dial-in server which where
# the peer has to autenticate to.
noauth
# 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.(is default)
modem
# The opposite: local
#
# Description:
# Don't use the modem control lines. With this option, pppd will ignore the
# state of the CD (Carrier Detect) signal from the modem and will not change
# the state of the DTR (Data Terminal Ready) signal.
#
# You need to disable modem and enable local if you want to connect to anoter
# system without using a modem:
#local
# 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
# needed for some ISDN Terminaladaters, namely ELSA, those seem to have
# problems with asyncmap negotiation, so you can turn off this procedure
# in case your ISDN box has trouble with it, by enabling this option.
# You have to disable the asyncmap <x> option to be sure to have it
# active. If you use wvdial, set the ISDN parameter in /etc/wvdial.conf
# instead.
#default-asyncmap
# 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). The value 1492 is for DSL connections (PPP Default -
# PPPoE Header: 1500 - 8 = 1492)
# mru 1492
# 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. The value 1492 is for DSL connections
# (PPP Default - PPPoE Header: 1500 - 8 = 1492)
# mtu 1492
# 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
# 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
# Send up to 60 LCP configure-request during negotiation. With a value
# of 2 for lcp-restart below, this might take up to 2 minutes.
lcp-max-configure 60
# Resend unanswered LCP requests after 2 seconds.
lcp-restart 2
# Specifies that pppd should disconnect if the link is idle for n seconds.
idle 600
# Specifies the maximal number of attempts to connect to the server. This
# is useful for dial on demand. Default value is 10.
#maxfail 3
# Disable the IPXCP and IPX protocols.
noipx
# In the file /etc/ppp/filters are some active-filter rules. See man pppd
# and man tcpdump for more informations.
file /etc/ppp/filters
#-------------------------------------------------------------------------
# The next two options are only interesting for you if you are admin of
# a system with other users that use ppp, and those users are normally
# never allowed to add default route, or you do not want users to
# replace the default route.
#-------------------------------------------------------------------------
# enable this to prevent users from attempting to add a default route.
# Use this option with caution: If the user needs to use a program like
# wvdial, he will not be able to connect because wvdial forces defaulroute
# but this is rejected by this option and the user will not be able to
# connect to the internet.
#nodefaultroute
# enable this to prevent users from replacing an existing default route.
#noreplacedefaultroute
#-------------------------------------------------------------------------
# All options below only make sense if you configure pppd to be a dial-in
# server, so don't touch these if you want dial into your provider with
# PPP!
#-------------------------------------------------------------------------
# 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
# 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
#ms-wins 192.168.1.50
#ms-wins 192.168.1.51

33
pap-secrets.template Normal file
View File

@ -0,0 +1,33 @@
# Secrets for authentication using PAP
# client server secret IP addresses
# OUTBOUND CONNECTIONS
# Here you should add your PPP Login and PPP password to connect to your
# provider via pap. The * means that the entry(login and passoword may 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.
#hostname * password
# PREDIFINED CONNECTIONS
# These are user and password entries for publically accessible call-by-call
# Internet providers in Germany. If they confict with your config, remove them.
# READ_IN_CALLBYCALL_SECRETS
# 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 "*" -

View File

@ -0,0 +1,27 @@
--- ./pppd/sys-linux.c.orig 2004-01-26 13:39:25.078464083 +0000
+++ ./pppd/sys-linux.c 2004-01-26 13:53:34.279569785 +0000
@@ -752,6 +752,24 @@
#ifdef B921600
{ 921600, B921600 },
#endif
+#ifdef B1500000
+ { 1500000, B1500000 },
+#endif
+#ifdef B2000000
+ { 2000000, B2000000 },
+#endif
+#ifdef B2500000
+ { 2500000, B2500000 },
+#endif
+#ifdef B3000000
+ { 3000000, B3000000 },
+#endif
+#ifdef B3500000
+ { 3500000, B3500000 },
+#endif
+#ifdef B4000000
+ { 4000000, B4000000 },
+#endif
{ 0, 0 }
};

20
ppp-2.4.2-__P.diff Normal file
View File

@ -0,0 +1,20 @@
--- pppd/pppd.h
+++ pppd/pppd.h 2004/09/12 07:31:44
@@ -57,14 +57,17 @@
#include <net/ppp_defs.h>
#include "patchlevel.h"
+#undef __P
#if defined(__STDC__)
#include <stdarg.h>
#define __V(x) x
+#define __P(args) args
#else
#include <varargs.h>
#define __V(x) (va_alist) va_dcl
#define const
#define volatile
+#define __P(args)
#endif
#ifdef INET6

288
ppp-2.4.2-cifdefroute.diff Normal file
View File

@ -0,0 +1,288 @@
--- pppd/ipcp.c
+++ pppd/ipcp.c
@@ -197,6 +197,16 @@
"disable defaultroute option", OPT_ALIAS | OPT_A2CLR,
&ipcp_wantoptions[0].default_route },
+#ifdef __linux__
+ { "replacedefaultroute", o_bool,
+ &ipcp_wantoptions[0].replace_default_route,
+ "Replace default route", 1
+ },
+ { "noreplacedefaultroute", o_bool,
+ &ipcp_allowoptions[0].replace_default_route,
+ "Never replace default route", OPT_A2COPY,
+ &ipcp_wantoptions[0].replace_default_route },
+#endif
{ "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp,
"Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp },
{ "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp,
@@ -263,7 +273,7 @@
ip_active_pkt
};
-static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t));
+static void ipcp_clear_addrs __P((int, u_int32_t, u_int32_t, bool));
static void ipcp_script __P((char *, int)); /* Run an up/down script */
static void ipcp_script_done __P((void *));
@@ -1660,7 +1670,12 @@
if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE))
return 0;
if (wo->default_route)
+#ifndef __linux__
if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr))
+#else
+ if (sifdefaultroute(u, wo->ouraddr, wo->hisaddr,
+ wo->replace_default_route))
+#endif
default_route_set[u] = 1;
if (wo->proxy_arp)
if (sifproxyarp(u, wo->hisaddr))
@@ -1742,7 +1757,8 @@
*/
if (demand) {
if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) {
- ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr);
+ ipcp_clear_addrs(f->unit, wo->ouraddr, wo->hisaddr,
+ wo->replace_default_route);
if (go->ouraddr != wo->ouraddr) {
warn("Local IP address changed to %I", go->ouraddr);
script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0);
@@ -1767,7 +1783,12 @@
/* assign a default route through the interface if required */
if (ipcp_wantoptions[f->unit].default_route)
+#ifndef __linux__
if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
+#else
+ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
+ wo->replace_default_route))
+#endif
default_route_set[f->unit] = 1;
/* Make a proxy ARP entry if requested. */
@@ -1817,7 +1838,12 @@
/* assign a default route through the interface if required */
if (ipcp_wantoptions[f->unit].default_route)
+#ifndef __linux__
if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr))
+#else
+ if (sifdefaultroute(f->unit, go->ouraddr, ho->hisaddr,
+ wo->replace_default_route))
+#endif
default_route_set[f->unit] = 1;
/* Make a proxy ARP entry if requested. */
@@ -1894,7 +1920,7 @@
sifnpmode(f->unit, PPP_IP, NPMODE_DROP);
sifdown(f->unit);
ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr,
- ipcp_hisoptions[f->unit].hisaddr);
+ ipcp_hisoptions[f->unit].hisaddr, 0);
}
/* Execute the ip-down script */
@@ -1910,16 +1936,25 @@
* proxy arp entries, etc.
*/
static void
-ipcp_clear_addrs(unit, ouraddr, hisaddr)
+ipcp_clear_addrs(unit, ouraddr, hisaddr, replacedefaultroute)
int unit;
u_int32_t ouraddr; /* local address */
u_int32_t hisaddr; /* remote address */
+ bool replacedefaultroute;
{
if (proxy_arp_set[unit]) {
cifproxyarp(unit, hisaddr);
proxy_arp_set[unit] = 0;
}
- if (default_route_set[unit]) {
+ /* If replacedefaultroute, sifdefaultroute will be called soon
+ * with replacedefaultroute set and that will overwrite the current
+ * default route. This is the case only when doing demand, otherwise
+ * during demand, this cifdefaultroute would restore the old default
+ * route which is not what we want in this case. In the non-demand
+ * case, we'll delete the default route and restore the old if there
+ * is one saved by an sifdefaultroute with replacedefaultroute.
+ */
+ if (!replacedefaultroute && default_route_set[unit]) {
cifdefaultroute(unit, ouraddr, hisaddr);
default_route_set[unit] = 0;
}
--- pppd/ipcp.h
+++ pppd/ipcp.h
@@ -70,6 +70,7 @@
bool old_addrs; /* Use old (IP-Addresses) option? */
bool req_addr; /* Ask peer to send IP address? */
bool default_route; /* Assign default route through interface? */
+ bool replace_default_route; /* Replace default route through interface? */
bool proxy_arp; /* Make proxy ARP entry for peer? */
bool neg_vj; /* Van Jacobson Compression? */
bool old_vj; /* use old (short) form of VJ option? */
--- pppd/pppd.8
+++ pppd/pppd.8
@@ -121,6 +121,13 @@
This entry is removed when the PPP connection is broken. This option
is privileged if the \fInodefaultroute\fR option has been specified.
.TP
+.B replacedefaultroute
+This option is a flag to the defaultroute option. If defaultroute is
+set and this flag is also set, pppd replaces an existing default route
+with the new default route.
+
+
+.TP
.B disconnect \fIscript
Execute the command specified by \fIscript\fR, by passing it to a
shell, after
@@ -706,7 +713,12 @@
.TP
.B nodefaultroute
Disable the \fIdefaultroute\fR option. The system administrator who
-wishes to prevent users from creating default routes with pppd
+wishes to prevent users from adding a default route with pppd
+can do so by placing this option in the /etc/ppp/options file.
+.TP
+.B noreplacedefaultroute
+Disable the \fIreplacedefaultroute\fR option. The system administrator who
+wishes to prevent users from replacing a default route with pppd
can do so by placing this option in the /etc/ppp/options file.
.TP
.B nodeflate
--- pppd/pppd.h
+++ pppd/pppd.h
@@ -642,7 +642,11 @@
int cif6addr __P((int, eui64_t, eui64_t));
/* Remove an IPv6 address from i/f */
#endif
+#ifndef __linux__
int sifdefaultroute __P((int, u_int32_t, u_int32_t));
+#else
+int sifdefaultroute __P((int, u_int32_t, u_int32_t, bool replace_default_rt));
+#endif
/* Create default route through i/f */
int cifdefaultroute __P((int, u_int32_t, u_int32_t));
/* Delete default route through i/f */
--- pppd/sys-linux.c
+++ pppd/sys-linux.c
@@ -206,6 +206,8 @@
static int if_is_up; /* Interface has been marked up */
static int have_default_route; /* Gateway for default route added */
+static struct rtentry old_def_rt; /* Old default route */
+static int default_rt_repl_rest; /* replace and restore old default rt */
static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */
static char proxy_arp_dev[16]; /* Device for proxy arp entry */
static u_int32_t our_old_addr; /* for detecting address changes */
@@ -1513,6 +1515,9 @@
p = NULL;
}
+ SET_SA_FAMILY (rt->rt_dst, AF_INET);
+ SET_SA_FAMILY (rt->rt_gateway, AF_INET);
+
SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16);
SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16);
SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16);
@@ -1582,22 +1587,53 @@
/********************************************************************
*
* sifdefaultroute - assign a default route through the address given.
- */
-
-int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway)
-{
- struct rtentry rt;
-
- if (defaultroute_exists(&rt) && strcmp(rt.rt_dev, ifname) != 0) {
- if (rt.rt_flags & RTF_GATEWAY)
- error("not replacing existing default route via %I",
- SIN_ADDR(rt.rt_gateway));
- else
- error("not replacing existing default route through %s",
- rt.rt_dev);
- return 0;
+ *
+ * If the global default_rt_repl_rest flag is set, then this function
+ * already replaced the original system defaultroute with some other
+ * route and it should just replace the current defaultroute with
+ * another one, without saving the current route. Use: demand mode,
+ * when pppd sets first a defaultroute it it's temporary ppp0 addresses
+ * and then changes the temporary addresses to the addresses for the real
+ * ppp connection when it has come up.
+ */
+
+int sifdefaultroute (int unit, u_int32_t ouraddr, u_int32_t gateway, bool replace)
+{
+ struct rtentry rt, tmp_rt;
+ struct rtentry *del_rt = NULL;
+
+ if (default_rt_repl_rest) {
+ /* We have already reclaced the original defaultroute, if we
+ * are called again, we will delete the current default route
+ * and set the new default route in this function.
+ * - this is normally only the case the doing demand: */
+ if (defaultroute_exists( &tmp_rt ))
+ del_rt = &tmp_rt;
+ } else if ( defaultroute_exists( &old_def_rt ) &&
+ strcmp( old_def_rt.rt_dev, ifname ) != 0) {
+ /* We did not yet replace an existing default route, let's
+ * check if we should save and replace a default route:
+ */
+ u_int32_t old_gateway = SIN_ADDR(old_def_rt.rt_gateway);
+
+ if (old_gateway != gateway) {
+ if (!replace) {
+ error("not replacing default route to %s [%I]",
+ old_def_rt.rt_dev, old_gateway);
+ return 0;
+ } else {
+ // we need to copy rt_dev because we need it permanent too:
+ char * tmp_dev = malloc(strlen(old_def_rt.rt_dev)+1);
+ strcpy(tmp_dev, old_def_rt.rt_dev);
+ old_def_rt.rt_dev = tmp_dev;
+
+ notice("replacing old default route to %s [%I]",
+ old_def_rt.rt_dev, old_gateway);
+ default_rt_repl_rest = 1;
+ del_rt = &old_def_rt;
+ }
+ }
}
-
memset (&rt, 0, sizeof (rt));
SET_SA_FAMILY (rt.rt_dst, AF_INET);
@@ -1614,6 +1650,12 @@
error("default route ioctl(SIOCADDRT): %m");
return 0;
}
+ if (default_rt_repl_rest && del_rt)
+ if (ioctl(sock_fd, SIOCDELRT, del_rt) < 0) {
+ if ( ! ok_error ( errno ))
+ error("del old default route ioctl(SIOCDELRT): %m(%d)", errno);
+ return 0;
+ }
have_default_route = 1;
return 1;
@@ -1647,6 +1689,16 @@
return 0;
}
}
+ if (default_rt_repl_rest) {
+ notice("restoring old default route to %s [%I]",
+ old_def_rt.rt_dev, SIN_ADDR(old_def_rt.rt_gateway));
+ if (ioctl(sock_fd, SIOCADDRT, &old_def_rt) < 0) {
+ if ( ! ok_error ( errno ))
+ error("restore default route ioctl(SIOCADDRT): %m(%d)", errno);
+ return 0;
+ }
+ default_rt_repl_rest = 0;
+ }
return 1;
}

126
ppp-2.4.2-ifname.diff Normal file
View File

@ -0,0 +1,126 @@
--- ./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;
}

95
ppp-2.4.2-logwtmp.diff Normal file
View File

@ -0,0 +1,95 @@
--- ./pppd/pppd.h.orig 2003-04-07 00:01:46.000000000 +0000
+++ ./pppd/pppd.h 2004-02-13 10:40:04.327682200 +0000
@@ -628,8 +628,6 @@
int lock __P((char *)); /* Create lock file for device */
int relock __P((int)); /* Rewrite lock file with new pid */
void unlock __P((void)); /* Delete previously-created lock file */
-void logwtmp __P((const char *, const char *, const char *));
- /* Write entry to wtmp file */
int get_host_seed __P((void)); /* Get host-dependent random number seed */
int have_route_to __P((u_int32_t)); /* Check if route to addr exists */
#ifdef PPP_FILTER
--- ./pppd/sys-linux.c.orig 2004-01-13 04:05:20.000000000 +0000
+++ ./pppd/sys-linux.c 2004-02-13 10:40:17.986855427 +0000
@@ -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
*/

89
ppp-2.4.2-misc.diff Normal file
View File

@ -0,0 +1,89 @@
--- pppd/utils.c
+++ pppd/utils.c
@@ -295,7 +295,7 @@
#if 0 /* not used, and breaks on S/390, apparently */
case 'r':
f = va_arg(args, char *);
-#ifndef __powerpc__
+#if !defined __powerpc__ && !defined __x86_64__ && !defined __s390__ && !defined __s390x__
n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list));
#else
/* On the powerpc, a va_list is an array of 1 structure */
--- pppd/auth.c
+++ pppd/auth.c
@@ -1626,9 +1626,10 @@
if (fstat(fileno(f), &sbuf) < 0) {
warn("cannot stat secret file %s: %m", filename);
- } else if ((sbuf.st_mode & (S_IRWXG | S_IRWXO)) != 0) {
- warn("Warning - secret file %s has world and/or group access",
- filename);
+ } else if ((sbuf.st_mode & S_IRWXO) != 0) {
+ warn("Warning - secret file %s has world access", filename);
+ } else if ((sbuf.st_mode & S_IRWXG) != 0 && sbuf.st_gid != 15) {
+ warn("Warning - secret file %s has group access", filename);
}
}
--- pppd/lcp.c
+++ pppd/lcp.c
@@ -1876,7 +1876,7 @@
if (lcp_gotoptions[f->unit].neg_magicnumber
&& magic == lcp_gotoptions[f->unit].magicnumber) {
warn("appear to have received our own echo-reply!");
- return;
+ /* M$-Software did get this wrong so we also accept those packets. */
}
/* Reset the number of outstanding echo frames */
--- pppd/pppd.h
+++ pppd/pppd.h
@@ -589,15 +589,7 @@
#define DEBUGCHAP 1
#endif
-#ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */
-#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
- || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
- || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
#define LOG_PPP LOG_LOCAL2
-#else
-#define LOG_PPP LOG_DAEMON
-#endif
-#endif /* LOG_PPP */
#ifdef DEBUGMAIN
#define MAINDEBUG(x) if (debug) dbglog x
--- pppdump/pppdump.c
+++ pppdump/pppdump.c
@@ -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);
}
}
}
--- pppdump/bsd-comp.c
+++ pppdump/bsd-comp.c
@@ -560,7 +560,8 @@
u_int incode, oldcode, finchar;
u_char *p, *rptr, *wptr;
int ilen;
- int dlen, space, codelen, extra;
+ int dlen = 0;
+ int space, codelen, extra;
rptr = cmsg;
if (*rptr == 0)

22
ppp-2.4.2-pie.patch Normal file
View File

@ -0,0 +1,22 @@
--- 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

13
ppp-2.4.2-smpppd.diff Normal file
View File

@ -0,0 +1,13 @@
--- pppd/main.c
+++ pppd/main.c
@@ -1808,8 +1808,8 @@
if (WIFSIGNALED(status)) {
warn("Child process %s (pid %d) terminated with signal %d",
(chp? chp->prog: "??"), pid, WTERMSIG(status));
- } else if (debug)
- dbglog("Script %s finished (pid %d), status = 0x%x",
+ } else
+ info("Script %s finished (pid %d), status = 0x%x",
(chp? chp->prog: "??"), pid,
WIFEXITED(status) ? WEXITSTATUS(status) : status);
if (chp && chp->done)

19
ppp-2.4.3-demand-fix.diff Normal file
View File

@ -0,0 +1,19 @@
--- pppd/auth.c
+++ pppd/auth.c
@@ -546,6 +546,8 @@
int unit;
{
char *msg;
+ if (phase == PHASE_DISCONNECT) /* we are called via link_terminated, must be ignored */
+ return;
new_phase(PHASE_SERIALCONN);
@@ -658,6 +660,7 @@
the_channel->disconnect();
devfd = -1;
}
+ /* not only disconnect, cleanup should also be called to close the devices */
if (the_channel->cleanup)
(*the_channel->cleanup)();

51
ppp-2.4.3-filter.diff Normal file
View File

@ -0,0 +1,51 @@
--- ppp-2.4.4/pppd/demand.c
+++ ppp-2.4.4/pppd/demand.c
@@ -45,6 +45,7 @@
#include <sys/socket.h>
#ifdef PPP_FILTER
#include <pcap-bpf.h>
+#include <linux/if_ether.h>
#endif
#include "pppd.h"
@@ -341,6 +342,7 @@
return 0;
proto = PPP_PROTOCOL(p);
#ifdef PPP_FILTER
+ *p = 1; /* set outbound for the filter rule */
p[0] = 1; /* outbound packet indicator */
if ((pass_filter.bf_len != 0
&& bpf_filter(pass_filter.bf_insns, p, len, len) == 0)
@@ -350,6 +352,7 @@
return 0;
}
p[0] = 0xff;
+ *p = 0xff; /* restore original ppp header */
#endif
for (i = 0; (protp = protocols[i]) != NULL; ++i) {
if (protp->protocol < 0xC000 && (protp->protocol & ~0x8000) == proto) {
--- ppp-2.4.4/pppd/options.c
+++ ppp-2.4.4/pppd/options.c
@@ -1459,6 +1459,10 @@
int ret = 1;
pc = pcap_open_dead(DLT_PPP_PPPD, 65535);
+ 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) == -1) {
option_error("error in pass-filter expression: %s\n",
pcap_geterr(pc));
@@ -1480,6 +1484,11 @@
int ret = 1;
pc = pcap_open_dead(DLT_PPP_PPPD, 65535);
+ if (!pc) {
+ option_error("error in active-filter expression: pcap_open_dead failed\n");
+ return 0;
+ }
+
if (pcap_compile(pc, &active_filter, *argv, 1, netmask) == -1) {
option_error("error in active-filter expression: %s\n",
pcap_geterr(pc));

89
ppp-2.4.3-fork-fix.diff Normal file
View File

@ -0,0 +1,89 @@
diff -ur ppp-2.4.3.old/pppd/main.c ppp-2.4.3/pppd/main.c
--- ppp-2.4.3.old/pppd/main.c 2005-06-18 17:48:50.000000000 +0200
+++ ppp-2.4.3/pppd/main.c 2005-06-20 11:03:43.000000000 +0200
@@ -1457,14 +1457,6 @@
int fd, pipefd[2];
char buf[1];
- /* make sure fds 0, 1, 2 are occupied (probably not necessary) */
- while ((fd = dup(fd_devnull)) >= 0) {
- if (fd > 2) {
- close(fd);
- break;
- }
- }
-
if (pipe(pipefd) == -1)
pipefd[0] = pipefd[1] = -1;
pid = fork();
@@ -1487,24 +1479,30 @@
tdb_close(pppdb);
#endif
- /* make sure infd, outfd and errfd won't get tromped on below */
- if (infd == 1 || infd == 2)
- infd = dup(infd);
- if (outfd == 0 || outfd == 2)
- outfd = dup(outfd);
- if (errfd == 0 || errfd == 1)
- errfd = dup(errfd);
+ /* make sure fds 0, 1, 2 are occupied, so the duplicated fds always > 2 */
+ while ((fd = dup(fd_devnull)) >= 0) {
+ if (fd > 2) {
+ close(fd);
+ break;
+ }
+ }
- /* dup the in, out, err fds to 0, 1, 2 */
- if (infd != 0)
- dup2(infd, 0);
- if (outfd != 1)
- dup2(outfd, 1);
- if (errfd != 2)
- dup2(errfd, 2);
+ /* always copy fd's to avoid to use a already closed fd later */
+ {
+ int fdi = infd, fdo = outfd;
+ infd = dup(infd);
+ outfd = dup(outfd);
+ if (errfd >= 0) {
+ fd = errfd;
+ errfd = dup(errfd);
+ close(fd);
+ }
+ close(fdi);
+ close(fdo);
+ }
closelog();
- if (log_to_fd > 2)
+ if (log_to_fd >= 0)
close(log_to_fd);
if (the_channel->close)
(*the_channel->close)();
@@ -1512,12 +1510,18 @@
close(devfd); /* some plugins don't have a close function */
close(fd_ppp);
close(fd_devnull);
- if (infd != 0)
- close(infd);
- if (outfd != 1)
- close(outfd);
- if (errfd != 2)
+
+ close(0);
+ dup2(infd, 0);
+ close(infd);
+ close(1);
+ dup2(outfd, 1);
+ close(outfd);
+ if (errfd >= 0) {
+ close(2);
+ dup2(errfd, 2);
close(errfd);
+ }
notify(fork_notifier, 0);
close(pipefd[0]);

124
ppp-2.4.3-make.diff Normal file
View File

@ -0,0 +1,124 @@
unchanged:
================================================================================
--- ppp-2.4.4/chat/Makefile.linux
+++ ppp-2.4.4/chat/Makefile.linux
@@ -10,7 +10,7 @@
CDEF4= -DFNDELAY=O_NDELAY # Old name value
CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
-COPTS= -O2 -g -pipe
+COPTS = $(MY_CFLAGS) -O2 -pipe -Wall $(CDEFS)
CFLAGS= $(COPTS) $(CDEFS)
INSTALL= install
@@ -25,8 +25,8 @@
install: chat
mkdir -p $(BINDIR) $(MANDIR)
- $(INSTALL) -s -c chat $(BINDIR)
- $(INSTALL) -c -m 644 chat.8 $(MANDIR)
+ $(INSTALL) chat $(BINDIR)
+ $(INSTALL) -m 644 chat.8 $(MANDIR)
clean:
rm -f chat.o chat *~
--- ppp-2.4.4/pppd/Makefile.linux
+++ ppp-2.4.4/pppd/Makefile.linux
@@ -32,8 +32,10 @@
# CC = gcc
#
-COPTS = -O2 -pipe -Wall -g
-LIBS =
+CC = gcc
+COPTS = $(MY_CFLAGS) -O2 -pipe -Wall
+LIBS = -lutil
+
# Uncomment the next 2 lines to include support for Microsoft's
# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
@@ -200,10 +202,8 @@
install: pppd
mkdir -p $(BINDIR) $(MANDIR)
$(EXTRAINSTALL)
- $(INSTALL) -s -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)
+ $(INSTALL) -m 755 pppd $(BINDIR)/pppd
+ $(INSTALL) -m 644 pppd.8 $(MANDIR)/
pppd: $(PPPDOBJS)
$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
--- ppp-2.4.4/pppd/plugins/Makefile.linux
+++ ppp-2.4.4/pppd/plugins/Makefile.linux
@@ -1,5 +1,5 @@
CC = gcc
-COPTS = -O2 -g
+COPTS = $(MY_CFLAGS) -O2 -pipe -Wall
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
LDFLAGS = -shared
INSTALL = install
--- ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux
+++ ppp-2.4.4/pppd/plugins/rp-pppoe/Makefile.linux
@@ -24,7 +24,7 @@
# Version is set ONLY IN THE MAKEFILE! Don't delete this!
VERSION=3.3
-COPTS=-O2 -g
+COPTS = $(MY_CFLAGS) -O2 -pipe -Wall
CFLAGS=$(COPTS) -I../../../include/linux
all: rp-pppoe.so pppoe-discovery
@@ -39,7 +39,7 @@
install: all
$(INSTALL) -d -m 755 $(LIBDIR)
- $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
+ $(INSTALL) rp-pppoe.so $(LIBDIR)
$(INSTALL) -d -m 755 $(BINDIR)
$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
--- ppp-2.4.4/pppdump/Makefile.linux
+++ ppp-2.4.4/pppdump/Makefile.linux
@@ -2,7 +2,7 @@
BINDIR = $(DESTDIR)/sbin
MANDIR = $(DESTDIR)/share/man/man8
-CFLAGS= -O -I../include/net
+CFLAGS= -O2 -pipe -Wall -I../include/net
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
INSTALL= install
@@ -17,5 +17,5 @@
install:
mkdir -p $(BINDIR) $(MANDIR)
- $(INSTALL) -s -c pppdump $(BINDIR)
- $(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
+ $(INSTALL) pppdump $(BINDIR)
+ $(INSTALL) -m 444 pppdump.8 $(MANDIR)
--- ppp-2.4.4/pppstats/Makefile.linux
+++ ppp-2.4.4/pppstats/Makefile.linux
@@ -9,8 +9,8 @@
PPPSTATSRCS = pppstats.c
PPPSTATOBJS = pppstats.o
-#CC = gcc
-COPTS = -O
+CC = gcc
+COPTS = $(MY_CFLAGS) -O2 -pipe -Wall
COMPILE_FLAGS = -I../include
LIBS =
@@ -22,8 +22,8 @@
install: pppstats
-mkdir -p $(MANDIR)
- $(INSTALL) -s -c pppstats $(BINDIR)
- $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
+ $(INSTALL) pppstats $(BINDIR)
+ $(INSTALL) -m 444 pppstats.8 $(MANDIR)
pppstats: $(PPPSTATSRCS)
$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)

View File

@ -0,0 +1,22 @@
--- pppd/Makefile.linux
+++ pppd/Makefile.linux
@@ -33,7 +33,7 @@
# CC = gcc
#
CC = gcc
-COPTS = $(MY_CFLAGS) -O2 -pipe -Wall
+COPTS = $(MY_CFLAGS) -O2 -pipe -Wall -fno-strict-aliasing
LIBS = -lutil
--- pppd/plugins/radius/Makefile.linux
+++ pppd/plugins/radius/Makefile.linux
@@ -12,7 +12,7 @@
INSTALL = install
PLUGIN=radius.so radattr.so radrealms.so
-CFLAGS= $(MY_CFLAGS) -I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
+CFLAGS= $(MY_CFLAGS) -I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -fno-strict-aliasing
# Uncomment the next line to include support for Microsoft's
# MS-CHAP authentication protocol.

31
ppp-2.4.3-optflags.patch Normal file
View File

@ -0,0 +1,31 @@
--- pppd/plugins/pppoatm/Makefile.linux
+++ pppd/plugins/pppoatm/Makefile.linux
@@ -1,5 +1,5 @@
CC = gcc
-COPTS = -O2 -g
+COPTS = $(MY_CFLAGS) -O2 -g
CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
LDFLAGS = -shared
INSTALL = install
--- pppd/plugins/radius/Makefile.linux
+++ pppd/plugins/radius/Makefile.linux
@@ -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= $(MY_CFLAGS) -I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
# Uncomment the next line to include support for Microsoft's
# MS-CHAP authentication protocol.
--- pppdump/Makefile.linux
+++ pppdump/Makefile.linux
@@ -2,7 +2,7 @@
BINDIR = $(DESTDIR)/sbin
MANDIR = $(DESTDIR)/share/man/man8
-CFLAGS= -O2 -pipe -Wall -I../include/net
+CFLAGS= $(MY_CFLAGS) -O2 -pipe -Wall -I../include/net
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
INSTALL= install

13
ppp-2.4.3-pppoatm.diff Normal file
View File

@ -0,0 +1,13 @@
--- ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux
+++ ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux
@@ -36,8 +36,8 @@
$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)
install: all
- $(INSTALL) -d -m 755 $(LIBDIR)
- $(INSTALL) -c -m 4550 $(PLUGIN) $(LIBDIR)
+ $(INSTALL) -m 755 $(PLUGIN) $(LIBDIR)
+ $(INSTALL) $? $(LIBDIR)
clean:
rm -f *.o *.so

26
ppp-2.4.3-strip.diff Normal file
View File

@ -0,0 +1,26 @@
--- pppd/plugins/radius/Makefile.linux
+++ pppd/plugins/radius/Makefile.linux
@@ -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)
--- pppd/plugins/rp-pppoe/Makefile.linux
+++ pppd/plugins/rp-pppoe/Makefile.linux
@@ -41,7 +41,7 @@
$(INSTALL) -d -m 755 $(LIBDIR)
$(INSTALL) rp-pppoe.so $(LIBDIR)
$(INSTALL) -d -m 755 $(BINDIR)
- $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
clean:
rm -f *.o *.so

View File

@ -0,0 +1,28 @@
--- pppd/plugins/winbind.c
+++ pppd/plugins/winbind.c
@@ -296,16 +296,23 @@
if (forkret == 0) {
/* child process */
- uid_t uid;
+ uid_t uid = getuid();
close(child_out[0]);
close(child_in[1]);
/* run winbind as the user that invoked pppd */
setgid(getgid());
- uid = getuid();
if (setuid(uid) == -1 || getuid() != uid)
+ {
fatal("pppd/winbind: could not setuid to %d: %m", uid);
+ exit(1);
+ }
+ if (getuid() != uid) {
+ perror("pppd/winbind: could not setuid to orig uid");
+ exit(1);
+ }
+
execl("/bin/sh", "sh", "-c", ntlm_auth, NULL);
fatal("pppd/winbind: could not exec /bin/sh: %m");
}

View File

@ -0,0 +1,11 @@
--- ppp-2.4.4/pppd/plugins/radius/clientid.c.xx 2006-12-19 10:25:19.000000000 +0100
+++ ppp-2.4.4/pppd/plugins/radius/clientid.c 2006-12-19 10:25:45.000000000 +0100
@@ -110,7 +110,7 @@
if (*name != '/')
strcpy(ttyname, "/dev/");
- strncat(ttyname, name, sizeof(ttyname));
+ strncat(ttyname, name, sizeof(ttyname)-strlen(ttyname)-1);
for(p = map2id_list; p; p = p->next)
if (!strcmp(ttyname, p->name)) return p->id;

3
ppp-2.4.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ebe6eacd8e16876d9004c6fafc9d9e2647c7c7f9b3be9b42e8bf56666b1dea03
size 555915

19
ppp-makedevice.patch Normal file
View File

@ -0,0 +1,19 @@
--- pppd/sys-linux.c
+++ pppd/sys-linux.c
@@ -2104,8 +2104,7 @@
sscanf(utsname.release, "%d.%d.%d", &osmaj, &osmin, &ospatch);
kernel_version = KVERSION(osmaj, osmin, ospatch);
fd = open("/dev/ppp", O_RDWR);
-#if 0
if (fd < 0 && errno == ENOENT) {
/* try making it and see if that helps. */
if (mknod("/dev/ppp", S_IFCHR | S_IRUSR | S_IWUSR,
@@ -2119,7 +2117,6 @@
fd = open("/dev/ppp", O_RDWR);
}
}
-#endif /* 0 */
if (fd >= 0) {
new_style_driver = 1;

9
ppp-peers Normal file
View File

@ -0,0 +1,9 @@
#
# PPP (plain old modem) options
#
# Plugin passwordfd enables us to pipe the password to pppd, thus we
# don't have to put it into pap-secrets and chap-secrets.
#
plugin passwordfd.so
#
noauth

693
ppp.changes Normal file
View File

@ -0,0 +1,693 @@
-------------------------------------------------------------------
Tue Dec 19 10:37:21 CET 2006 - meissner@suse.de
- fixed strncat usage in radius plugin.
-------------------------------------------------------------------
Wed Sep 13 13:12:17 CEST 2006 - hvogel@suse.de
- Argh, really re-enable the patch.
-------------------------------------------------------------------
Thu Sep 7 16:48:47 CEST 2006 - hvogel@suse.de
- fix and reenable "replace default route" patch
-------------------------------------------------------------------
Mon Aug 21 21:30:35 CEST 2006 - kukuk@suse.de
- Use include statements in PAM config file
-------------------------------------------------------------------
Mon Aug 7 15:45:21 CEST 2006 - mskibbe@suse.de
- update to version 2.4.4 which
o fix some bugs
o fix bug #179560 (MTU overwritten by pppoe plugin)
-------------------------------------------------------------------
Tue May 30 18:50:47 CEST 2006 - meissner@suse.de
- check return code of setuid in winbind plugin. #179660
-------------------------------------------------------------------
Fri Jan 27 02:20:20 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Tue Jan 24 18:01:20 CET 2006 - max@suse.de
- Enabled IPv6 support (#145246).
-------------------------------------------------------------------
Sat Jan 14 02:22:44 CET 2006 - schwab@suse.de
- Don't strip binaries.
-------------------------------------------------------------------
Fri Jan 13 15:04:51 CET 2006 - hvogel@suse.de
- Make use of Stack Protector
-------------------------------------------------------------------
Wed Nov 2 16:45:03 CET 2005 - hvogel@suse.de
- expand strict-aliasing patch to the radius plugin
-------------------------------------------------------------------
Mon Oct 17 15:36:06 CEST 2005 - arvin@suse.de
- fixed pptp peers file
-------------------------------------------------------------------
Wed Oct 12 12:47:38 CEST 2005 - hvogel@suse.de
- Add -fno-strict-aliasing to pppd cflags. Added
* ppp-2.4.3-no-strict-aliasing.patch
-------------------------------------------------------------------
Wed Oct 5 16:51:37 CEST 2005 - hvogel@suse.de
- fix too few arguments to a *printf function. modified
* ppp-2.4.2-misc.diff
- make use of optflags everywhere. modified
* ppp-2.4.3-optflags.patch
-------------------------------------------------------------------
Sun Aug 7 11:11:48 CEST 2005 - kkeil@suse.de
- fix filter stuff for libpcap version 0.9.3 (see #102460)
-------------------------------------------------------------------
Sat Jul 2 14:47:59 CEST 2005 - hvogel@suse.de
- use optflags also for pppoatm plugin
-------------------------------------------------------------------
Tue Jun 28 12:03:37 CEST 2005 - kkeil@suse.de
- fix some problems with 2.4.3 (#80468)
* solve not working dial on demand after a connection was shut
down first time
* fix safe_fork to not close needed file descriptors
-------------------------------------------------------------------
Thu Jun 23 02:10:05 CEST 2005 - ro@suse.de
- build with -fPIC/-pie
-------------------------------------------------------------------
Thu Apr 21 15:03:09 CEST 2005 - arvin@suse.de
- fixed compilation of pppoatm plugin (bug #79295)
-------------------------------------------------------------------
Fri Mar 18 01:05:44 CET 2005 - kkeil@suse.de
- fix filter stuff and DOD (#73663)
-------------------------------------------------------------------
Mon Feb 28 21:08:50 CET 2005 - kkeil@suse.de
- undefined fd is a bad idea, incremental fix for #66786
-------------------------------------------------------------------
Mon Feb 28 17:46:21 CET 2005 - hvogel@suse.de
- enable device creating if it does not exist (Bug #66786)
-------------------------------------------------------------------
Mon Dec 13 15:24:55 CET 2004 - hvogel@suse.de
- get rid of the pppoam patch
-------------------------------------------------------------------
Fri Dec 10 12:31:54 CET 2004 - hvogel@suse.de
- update to version 2.4.3 which includes:
o Various fixes and enhancements to the radius and rp-pppoe
plugins have been added.
o There is a new option, child-timeout, which sets the length
of time that pppd will wait for child processes
o There is a new winbind plugin, from Andrew Bartlet of the Samba
team, which provides the ability to authenticate the peer
against an NT domain controller using MS-CHAP or MS-CHAPV2.
o There is a new pppoatm plugin
-------------------------------------------------------------------
Tue Sep 21 15:16:12 CEST 2004 - kkeil@suse.de
- fix dial on demand; outbound must flagged with 1 not 0xff (#45694)
-------------------------------------------------------------------
Sun Sep 12 09:35:04 CEST 2004 - kukuk@suse.de
- Don't use __P from glibc
-------------------------------------------------------------------
Wed Aug 25 01:28:13 CEST 2004 - kkeil@suse.de
- use DLT_PPP_WITHDIRECTION for the filters to be compatible with
kernel 2.6.8
-------------------------------------------------------------------
Tue Jul 20 10:44:09 CEST 2004 - arvin@suse.de
- added option to rename ppp interface (experimental)
-------------------------------------------------------------------
Mon Jul 19 11:51:49 CEST 2004 - arvin@suse.de
- allow all names as Ethernet interfaces (bug #43048)
-------------------------------------------------------------------
Tue Jul 13 11:02:54 CEST 2004 - arvin@suse.de
- removed non-ascii character from option file
-------------------------------------------------------------------
Fri May 28 13:03:05 CEST 2004 - kkeil@suse.de
- correct fix for the DOD filter rule paket header (see bug #34724)
-------------------------------------------------------------------
Fri Apr 16 13:21:07 CEST 2004 - mmj@suse.de
- Void functions should be declared as such
-------------------------------------------------------------------
Wed Mar 31 11:14:24 CEST 2004 - arvin@suse.de
- fixed filter rules for dial on demand (see bug #34724)
-------------------------------------------------------------------
Wed Feb 18 16:08:16 CET 2004 - arvin@suse.de
- fixed setting of filter rules (bug #34569)
-------------------------------------------------------------------
Fri Feb 13 16:58:03 CET 2004 - arvin@suse.de
- updated pppoatm plugin (bug #34543)
- fixed ctl-c bug
-------------------------------------------------------------------
Fri Feb 13 15:22:11 CET 2004 - arvin@suse.de
- updated to version 2.4.2, main features:
- new upstream PPPoE plugin implementation
- new upstream MPPE implementation
- many protocols (CHAP, CBCP, EAP, ECP) added or updated
- build package as non-root user
- build sub-package ppp-devel with header files required for
extra plugins
-------------------------------------------------------------------
Thu Feb 12 17:34:57 CET 2004 - arvin@suse.de
- removed outdated samples
- some cleanup
-------------------------------------------------------------------
Thu Feb 12 01:16:20 CET 2004 - ro@suse.de
- adapt to change in libpcap: include moved to pcap_bpf.h
-------------------------------------------------------------------
Mon Jan 26 14:45:02 CET 2004 - arvin@suse.de
- allow higher serial speeds (see bug #34053)
-------------------------------------------------------------------
Fri Jan 16 12:17:50 CET 2004 - kukuk@suse.de
- Add pam-devel to neededforbuild
-------------------------------------------------------------------
Fri Jan 9 11:56:34 CET 2004 - kukuk@suse.de
- Fix compiler warnings
-------------------------------------------------------------------
Wed Aug 13 09:16:26 CEST 2003 - arvin@suse.de
- allow vlan devices for pppoe (bug #28645)
-------------------------------------------------------------------
Mon Jun 30 10:45:19 CEST 2003 - arvin@suse.de
- fixed closing of pppoatm (bug #27315)
- fixed pppoe on ppc (bug #27575)
-------------------------------------------------------------------
Thu Jun 05 12:49:28 CEST 2003 - arvin@suse.de
- converted MSCHAPv2-fix patch to unix format as new patch
doesn't like dos anymore
-------------------------------------------------------------------
Tue Jun 03 11:03:31 CEST 2003 - arvin@suse.de
- added peers file for pptp
-------------------------------------------------------------------
Mon May 26 23:06:12 CEST 2003 - arvin@suse.de
- adapted neededforbuild to linux-atm changes
-------------------------------------------------------------------
Thu May 22 15:52:07 CEST 2003 - okir@suse.de
- prevent buffer overflow in MPPE (#27062)
-------------------------------------------------------------------
Wed Mar 12 10:58:35 CET 2003 - arvin@suse.de
- activate filter rules per default (bug #25134)
-------------------------------------------------------------------
Sat Jan 18 20:00:24 CET 2003 - arvin@suse.de
- added config file with some filter rules
-------------------------------------------------------------------
Fri Jan 10 15:49:26 CET 2003 - arvin@suse.de
- Reactivated option noipdefault in default options file since
some providers can't handle a suggested local ip address. Can't
reproduce the wrong behaviour of the pppd mentioned in bug #1751
so the change is ok.
-------------------------------------------------------------------
Thu Dec 12 14:52:44 CET 2002 - arvin@suse.de
- removed absolute paths from pam configuration file
-------------------------------------------------------------------
Wed Nov 13 12:30:03 CET 2002 - arvin@suse.de
- fixed multi-line string literals
-------------------------------------------------------------------
Thu Oct 24 13:12:06 CEST 2002 - arvin@suse.de
- fixed callback phone number handling (bug #9659 and #18408)
- activated patches added on Aug. 1st
-------------------------------------------------------------------
Fri Aug 23 16:38:40 CEST 2002 - arvin@suse.de
- remove a warning message in the log (bug #18254)
- removed obsolete peers file demand
-------------------------------------------------------------------
Tue Aug 06 16:42:51 CEST 2002 - arvin@suse.de
- added "plain old modem" peers file (related to bug #17341)
-------------------------------------------------------------------
Thu Aug 1 18:16:48 CEST 2002 - bk@suse.de
- add patches recommeded for pptp which also fix bug 17097
-------------------------------------------------------------------
Thu Jul 25 13:48:16 CEST 2002 - arvin@suse.de
- disable pppoatm plugin on s390 and s390x
-------------------------------------------------------------------
Mon Jul 08 12:34:45 CEST 2002 - arvin@suse.de
- removed setuid bits from pppd (bug #16860)
-------------------------------------------------------------------
Thu May 16 16:31:03 CEST 2002 - arvin@suse.de
- compile with packet filter support
-------------------------------------------------------------------
Wed May 15 16:34:13 CEST 2002 - arvin@suse.de
- enable more debugging for pppoe if the pppd gets the debug
option
-------------------------------------------------------------------
Mon May 13 09:33:34 CEST 2002 - ro@suse.de
- fix build on x86_64
-------------------------------------------------------------------
Fri Apr 19 17:20:59 CEST 2002 - arvin@suse.de
- disable pppoatm plugin on mips (since linux-atm does not build)
-------------------------------------------------------------------
Tue Apr 16 22:20:56 CEST 2002 - arvin@suse.de
- turn off debugging by default
-------------------------------------------------------------------
Wed Mar 13 17:42:47 CET 2002 - arvin@suse.de
- better mtu handling as workaround for broken dsl providers
-------------------------------------------------------------------
Fri Feb 08 13:09:49 CET 2002 - arvin@suse.de
- fixed error handling in passwordfd plugin
-------------------------------------------------------------------
Fri Feb 8 10:36:35 CET 2002 - okir@suse.de
- applied security fix to zlib
-------------------------------------------------------------------
Tue Feb 05 16:06:22 CET 2002 - arvin@suse.de
- more log output without debug option so that the smpppd does
not require the debug option
- removed debug option from peers files
- use %{_mandir}
-------------------------------------------------------------------
Wed Jan 30 13:38:31 CET 2002 - arvin@suse.de
- use buildroot
- compile pppoatm plugin on all archs again
-------------------------------------------------------------------
Fri Jan 11 13:18:35 CET 2002 - arvin@suse.de
- added terminating NULL in options list of passwordfd plugin
-------------------------------------------------------------------
Fri Jan 11 11:30:26 CET 2002 - arvin@suse.de
- don't compile pppoatm plugin on axp and s390
-------------------------------------------------------------------
Wed Jan 09 15:41:03 CET 2002 - arvin@suse.de
- added "modprobe pppoatm" in pppoatm plugin
-------------------------------------------------------------------
Tue Jan 08 18:04:20 CET 2002 - arvin@suse.de
- fixed compiling on ia64
-------------------------------------------------------------------
Mon Jan 07 13:35:22 CET 2002 - arvin@suse.de
- added atm support
- modified peers files for new network configuration
-------------------------------------------------------------------
Mon Nov 05 14:28:15 CET 2001 - arvin@suse.de
- set MTU and MRU to 1492 (to prevent problems for DSL)
-------------------------------------------------------------------
Thu Sep 27 12:28:16 CEST 2001 - arvin@suse.de
- added rc-pppoe peers file
-------------------------------------------------------------------
Wed Sep 19 14:40:29 CEST 2001 - arvin@suse.de
- added patch only-eth.dif: makes pppoe plugin only accect eth*
as device and thus prevents kernel from trying to load dozens
of modules (bug #10845)
-------------------------------------------------------------------
Tue Aug 28 18:40:33 CEST 2001 - arvin@suse.de
- strip plugins
-------------------------------------------------------------------
Mon Aug 13 16:54:58 CEST 2001 - arvin@suse.de
- updated pppoe patch to ppp-2.4.1-pppoe.patch4
-------------------------------------------------------------------
Thu Aug 09 17:37:16 CEST 2001 - arvin@suse.de
- added Obsoletes ppp-soho
- added peers file pppoe
-------------------------------------------------------------------
Tue Jul 17 11:08:03 CEST 2001 - arvin@suse.de
- added directories to file list
-------------------------------------------------------------------
Wed Jul 11 12:56:35 CEST 2001 - arvin@suse.de
- removed obsolete generation of pap and chap secrets form
wvdial provider list
-------------------------------------------------------------------
Sun Jun 24 18:23:01 CEST 2001 - arvin@suse.de
- updated to version 2.4.1
- added peers file "demand" (from package pppoed)
-------------------------------------------------------------------
Thu May 10 01:19:25 CEST 2001 - mfabian@suse.de
- bzip2 sources
-------------------------------------------------------------------
Fri Apr 20 12:06:04 CEST 2001 - arvin@suse.de
- added options lcp-max-configure 60 and lcp-restart 2
-------------------------------------------------------------------
Fri Mar 30 18:07:15 CEST 2001 - arvin@suse.de
- added mppe patch
- search for plugins in /usr/lib/pppd/<version> (backport from
pppd 2.4.1)
- moved all plugins to /usr/lib/pppd/<version>
-------------------------------------------------------------------
Wed Feb 28 12:24:57 CET 2001 - arvin@suse.de
- moved all plugins to /usr/lib/pppd/plugins
-------------------------------------------------------------------
Thu Feb 15 13:16:41 CET 2001 - arvin@suse.de
- included pppoe patch from Michal Ostrowski
-------------------------------------------------------------------
Thu Nov 9 12:32:57 CET 2000 - arvin@suse.de
- updated to version 2.4.0
-------------------------------------------------------------------
Mon Sep 11 18:14:48 CEST 2000 - arvin@suse.de
- Fixed plugin passwordfd for chap.
-------------------------------------------------------------------
Mon Jul 31 19:15:58 CEST 2000 - arvin@suse.de
- Added (commented) option "maxfail 3" to options. Partly fix
for bug #3637.
-------------------------------------------------------------------
Thu Jul 13 15:45:31 CEST 2000 - arvin@suse.de
- removed directory /var/state/pppd from spec file. It is not
needed and only got there by accident.
-------------------------------------------------------------------
Mon Jul 10 23:03:41 CEST 2000 - bk@suse.de
- fixed bug with replacedefaultroute and dial on demand(route was lost)
- fixed Open message of demand patch for ICMP(was displayed as UDP)
-------------------------------------------------------------------
Tue Jul 4 21:52:37 CEST 2000 - arvin@suse.de
- Support for dial on demand with sync ppp.
- On dial on demand log witch packed caused the connect. Example:
Open UDP 212.185.229.193:2048 -> 216.32.74.51:22926
- Fixed plugin passwordfd for dial on demand.
-------------------------------------------------------------------
Mon Jun 5 16:52:23 CEST 2000 - arvin@suse.de
- fixed bug in plugin passwordfd
-------------------------------------------------------------------
Fri Jun 2 17:41:25 CEST 2000 - arvin@suse.de
- added plugin passwordfd to read password via a pipe
- replacedefaultroute option fixed for pppd demand
-------------------------------------------------------------------
Fri Mar 3 00:52:11 CET 2000 - ro@suse.de
- manpages ..
-------------------------------------------------------------------
Thu Mar 2 17:37:38 CET 2000 - bk@suse.de
- fixed patch path strip count for ppp-2.3.11.dif
- added comment about modem and local options to /etc/ppp/options
-------------------------------------------------------------------
Wed Mar 1 17:45:35 CET 2000 - bk@suse.de
- copied ppp-2.3.11.dif from ppp_ssl(fixes MANPATH) and filelist fixed.
-------------------------------------------------------------------
Sat Feb 26 00:41:02 CET 2000 - bk@suse.de
- removed priviledged property from (no)replacedefaultroute, this
way wvdial can set it in /etc/ppp/peers/wvdial with call wvdial.
-------------------------------------------------------------------
Fri Feb 25 19:06:41 CET 2000 - bk@suse.de
- disabled new replacedefaultroute option per default, can be controlled
thru the replacedefaultroute and noreplacedefaultroute options.
-------------------------------------------------------------------
Fri Feb 25 00:28:01 CET 2000 - bk@suse.de
- wrote patch which replaces the old defaut route on successfully
completed IPCP negotiation unless the included noreplacedefaultroute
option is given. Documented in the man page and /etc/ppp/options.
On connection shutdown, the old default route is restored automatically.
Nice feature for many people with laptops which have a default
route set trough their ethernet and want go online with their
modem if not connected to the ethernet. Should reduce support
load in this area dramatically.
-------------------------------------------------------------------
Sun Feb 20 06:59:25 CET 2000 - bk@suse.de
- only change tty perms really needed, will avoid the loosing tty
perms bug (bug #1831 and 1361)
- disabled noipdefault in the default options file for static IP addresses
and dial-in. wvdial still passes it to pppd if Force Address is not
set in wvdial.conf, so no problem. (Fix for bug #1751)
-------------------------------------------------------------------
Fri Feb 11 17:40:52 CET 2000 - bk@suse.de
- generate pap and chap secrets with callbycall.secrets
- Makefile.Linux merged into the spec file and dropped from diff
-------------------------------------------------------------------
Sun Jan 16 23:27:12 CET 2000 - bk@suse.de
- update to ppp-2.3.11
-------------------------------------------------------------------
Fri Oct 29 15:32:13 CEST 1999 - bk@suse.de
- added logins for german call-by-call providers to the secrets
- removed suse dialin scripts
-------------------------------------------------------------------
Mon Oct 25 01:38:11 CEST 1999 - olh@suse.de
- add some sample scripts, minor sample changes
-------------------------------------------------------------------
Sun Oct 24 22:21:07 CEST 1999 - bk@suse.de
- fix for empty files in /usr/doc/packages/ppp (olh: thanks for the report!!)
-------------------------------------------------------------------
Sun Oct 10 23:21:44 CEST 1999 - bk@suse.de
- update to ppp-2.3.10
- split up diff
- removed not installed ppplogin which also didn't appear in the
file list lately
- removed proxyarp from the default options file
- force pppd use the glibc's logwtmp instead of implementing its own
(patch for ppp-2.3.9, but is preferred for 2.3.10 also)
- added the samples to /usr/doc/packages/ppp
-------------------------------------------------------------------
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
-------------------------------------------------------------------
Mon Aug 30 12:51:21 MEST 1999 - kukuk@suse.de
- add pppdump.8
-------------------------------------------------------------------
Thu Aug 19 05:16:46 CEST 1999 - bk@suse.de
- added documentation
-------------------------------------------------------------------
Thu Jul 29 15:15:40 MEST 1999 - bs@suse.de
- set /etc/ppp to 750, root.dialout
- use noauth in /etc/ppp/options
-------------------------------------------------------------------
Sat Jul 17 06:39:04 MEST 1999 - bk@suse.de
- /etc/ppp/option fixed wins-addr, corrected to ms-wins
-------------------------------------------------------------------
Mon Jun 14 18:27:26 MEST 1999 - kukuk@suse.de
- Enable PAM support, add ppp.pamd
-------------------------------------------------------------------
Sat May 22 09:35:33 MEST 1999 - bk@suse.de
- update to ppp-2.3.8 using diff from jurix
- added ppp-2.3.8-patch1
- marked /etc/ppp/options as noreplace
-------------------------------------------------------------------
Mon Dec 14 15:53:13 MET 1998 - tmg@suse.de
- changed default config
-------------------------------------------------------------------
Wed Dec 9 23:32:12 MET 1998 - bs@suse.de
- marked config files as noreplace
-------------------------------------------------------------------
Tue Nov 24 15:14:04 MET 1998 - ro@suse.de
- don't pack if_ppp.h (delivered by glibc)
-------------------------------------------------------------------
Tue Oct 6 17:06:21 MEST 1998 - ro@suse.de
- update to ppp-2.3.5 using diff from jurix
- re-activate ppp_available in sys-linux.c
-------------------------------------------------------------------
Mon Nov 3 17:57:14 MET 1997 - ro@suse.de
- install include files in usr/include/net before compilation
----------------------------------------------------------------------------
Wed Apr 30 15:57:14 CEST 1997 - florian@suse.de
- create eror output file with perm 0600
- pppd is only executable for group "dialout"
----------------------------------------------------------------------------
Sat Nov 2 17:35:11 CET 1996 - florian@suse.de
- add bug-fix
- add ipx support

6
ppp.pamd Normal file
View File

@ -0,0 +1,6 @@
#%PAM-1.0
auth required pam_nologin.so
auth include common-auth
account include common-account
password include common-password
session include common-session

508
ppp.spec Normal file
View File

@ -0,0 +1,508 @@
#
# spec file for package ppp (Version 2.4.4)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: ppp
BuildRequires: libpcap linux-atm-devel pam-devel
URL: http://www.samba.org/ppp/
Version: 2.4.4
Release: 25
License: BSD License and BSD-like, Other License(s), see package
Group: Productivity/Networking/PPP
Autoreqprov: on
Provides: ppp_ssl
Obsoletes: ppp_ssl ppp-soho
Summary: The Point to Point Protocol for Linux
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: ftp://ftp.samba.org:/pub/ppp/ppp-%{PACKAGE_VERSION}.tar.bz2
# config for pam
Source1: ppp.pamd
# templates for secrets
Source2: pap-secrets.template
Source3: chap-secrets.template
# options and filters files
Source5: options
Source6: filters
# several peers file
Source8: pppoe-peers
Source9: pppoe-rp-peers
Source10: pppoatm-peers
Source11: ppp-peers
Source12: pptp-peers
# Makefile changes
Patch0: ppp-2.4.3-make.diff
# force pppd use the glibc's logwtmp instead of implementing its own
Patch1: ppp-2.4.2-logwtmp.diff
# replacedefaultroute option
Patch2: ppp-2.4.2-cifdefroute.diff
# misc tiny stuff
Patch3: ppp-2.4.2-misc.diff
# more log output for smpppd
Patch4: ppp-2.4.2-smpppd.diff
# allow higher serial speeds
Patch5: ppp-2.4.1-higher-speeds.diff
# fixed use of libpcap including dial on demand
Patch6: ppp-2.4.3-filter.diff
# option to rename ppp interface
Patch8: ppp-2.4.2-ifname.diff
# Don't use __P from glibc (pppd uses it wrong)
Patch9: ppp-2.4.2-__P.diff
Patch10: ppp-2.4.3-pppoatm.diff
Patch11: ppp-makedevice.patch
Patch12: ppp-2.4.2-pie.patch
Patch13: ppp-2.4.3-demand-fix.diff
Patch14: ppp-2.4.3-fork-fix.diff
Patch15: ppp-2.4.3-optflags.patch
Patch16: ppp-2.4.3-no-strict-aliasing.patch
Patch17: ppp-2.4.3-strip.diff
Patch18: ppp-2.4.3-winbind-setuidfix.patch
Patch19: ppp-2.4.4-strncatfix.patch
%description
The ppp package contains the PPP (Point-to-Point Protocol) daemon,
pppd, additional PPP utilities, documentation, and sample files. PPP
provides a method for transmitting IP and IPX datagrams over serial
point-to-point links, for example over a modem. The PPP daemon handles
the details of setting up a PPP link including configuring the network
interface and performing the PPP negotiations.
Authors:
--------
Paul Mackerras <paul.mackerras@cs.anu.edu.au>
Michael Callahan <callahan@maths.ox.ac.uk>
Al Longyear <longyear@netcom.com>
Brad Parker <brad@faster.fcr.com>
Greg Christy <gmc@premises1.Qutoron.COM>
Michal Ostrowski <mostrows@styx.uwaterloo.ca>
%package devel
Summary: Header Files Required for Developing Plugins for pppd
Group: Development/Libraries/C and C++
Requires: ppp = %version
%description devel
The package ppp-devel contains C header files required for developing
plugins for the pppd.
Authors:
--------
Paul Mackerras <paul.mackerras@cs.anu.edu.au>
Michael Callahan <callahan@maths.ox.ac.uk>
Al Longyear <longyear@netcom.com>
Brad Parker <brad@faster.fcr.com>
Greg Christy <gmc@premises1.Qutoron.COM>
Michal Ostrowski <mostrows@styx.uwaterloo.ca>
%prep
%setup -q
%patch0 -p1
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6 -p1
%patch8
%patch9
%patch10 -p1
%patch11
%patch12 -p1
%patch13
%patch14 -p1
%patch15
%patch16
%patch17
%patch18
%patch19 -p1
%build
%if %suse_version > 1000
SP=-fstack-protector
%endif
export MY_CFLAGS="$RPM_OPT_FLAGS -fPIC $SP"
./configure --prefix=/usr
make CHAPMS=y CBCP=y USE_CRYPT=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y
%install
make install DESTDIR=%{buildroot}%_prefix
install -d -m 750 %{buildroot}/etc/ppp
install -m 644 %{S:5} %{buildroot}/etc/ppp/options
install -m 644 %{S:6} %{buildroot}/etc/ppp/filters
install -m 600 %{S:2} %{buildroot}/etc/ppp/pap-secrets
install -m 600 %{S:3} %{buildroot}/etc/ppp/chap-secrets
install -d 755 %{buildroot}/etc/ppp/peers
install -m 644 %{S:8} %{buildroot}/etc/ppp/peers/pppoe
install -m 644 %{S:9} %{buildroot}/etc/ppp/peers/pppoe-rp
%ifnarch mips s390 s390x
install -m 644 %{S:10} %{buildroot}/etc/ppp/peers/pppoatm
%endif
install -m 644 %{S:11} %{buildroot}/etc/ppp/peers/ppp
install -m 644 %{S:12} %{buildroot}/etc/ppp/peers/pptp
install -d 755 %{buildroot}/etc/pam.d
install -m 644 %{S:1} %{buildroot}/etc/pam.d/ppp
%clean
rm -rf %{buildroot}
%files
%defattr (-, root, root)
%dir /etc/ppp/peers
%config(noreplace) /etc/ppp/options
%config(noreplace) /etc/ppp/filters
%config(noreplace) /etc/ppp/pap-secrets
%config(noreplace) /etc/ppp/chap-secrets
%config(noreplace) /etc/ppp/peers/*
%config(noreplace) /etc/pam.d/ppp
%doc FAQ README* SETUP scripts PLUGINS
%doc %{_mandir}/*/*
%attr (-, root, dialout) /usr/sbin/pppd
/usr/sbin/chat
/usr/sbin/pppdump
/usr/sbin/pppstats
/usr/sbin/pppoe-discovery
/usr/lib/pppd
%files devel
%defattr (-, root, root)
/usr/include/pppd
%changelog -n ppp
* Tue Dec 19 2006 - meissner@suse.de
- fixed strncat usage in radius plugin.
* Wed Sep 13 2006 - hvogel@suse.de
- Argh, really re-enable the patch.
* Thu Sep 07 2006 - hvogel@suse.de
- fix and reenable "replace default route" patch
* Mon Aug 21 2006 - kukuk@suse.de
- Use include statements in PAM config file
* Mon Aug 07 2006 - mskibbe@suse.de
- update to version 2.4.4 which
o fix some bugs
o fix bug #179560 (MTU overwritten by pppoe plugin)
* Tue May 30 2006 - meissner@suse.de
- check return code of setuid in winbind plugin. #179660
* Fri Jan 27 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Tue Jan 24 2006 - max@suse.de
- Enabled IPv6 support (#145246).
* Sat Jan 14 2006 - schwab@suse.de
- Don't strip binaries.
* Fri Jan 13 2006 - hvogel@suse.de
- Make use of Stack Protector
* Wed Nov 02 2005 - hvogel@suse.de
- expand strict-aliasing patch to the radius plugin
* Mon Oct 17 2005 - arvin@suse.de
- fixed pptp peers file
* Wed Oct 12 2005 - hvogel@suse.de
- Add -fno-strict-aliasing to pppd cflags. Added
* ppp-2.4.3-no-strict-aliasing.patch
* Wed Oct 05 2005 - hvogel@suse.de
- fix too few arguments to a *printf function. modified
* ppp-2.4.2-misc.diff
- make use of optflags everywhere. modified
* ppp-2.4.3-optflags.patch
* Sun Aug 07 2005 - kkeil@suse.de
- fix filter stuff for libpcap version 0.9.3 (see #102460)
* Sat Jul 02 2005 - hvogel@suse.de
- use optflags also for pppoatm plugin
* Tue Jun 28 2005 - kkeil@suse.de
- fix some problems with 2.4.3 (#80468)
* solve not working dial on demand after a connection was shut
down first time
* fix safe_fork to not close needed file descriptors
* Thu Jun 23 2005 - ro@suse.de
- build with -fPIC/-pie
* Thu Apr 21 2005 - arvin@suse.de
- fixed compilation of pppoatm plugin (bug #79295)
* Fri Mar 18 2005 - kkeil@suse.de
- fix filter stuff and DOD (#73663)
* Mon Feb 28 2005 - kkeil@suse.de
- undefined fd is a bad idea, incremental fix for #66786
* Mon Feb 28 2005 - hvogel@suse.de
- enable device creating if it does not exist (Bug #66786)
* Mon Dec 13 2004 - hvogel@suse.de
- get rid of the pppoam patch
* Fri Dec 10 2004 - hvogel@suse.de
- update to version 2.4.3 which includes:
o Various fixes and enhancements to the radius and rp-pppoe
plugins have been added.
o There is a new option, child-timeout, which sets the length
of time that pppd will wait for child processes
o There is a new winbind plugin, from Andrew Bartlet of the Samba
team, which provides the ability to authenticate the peer
against an NT domain controller using MS-CHAP or MS-CHAPV2.
o There is a new pppoatm plugin
* Tue Sep 21 2004 - kkeil@suse.de
- fix dial on demand; outbound must flagged with 1 not 0xff (#45694)
* Sun Sep 12 2004 - kukuk@suse.de
- Don't use __P from glibc
* Wed Aug 25 2004 - kkeil@suse.de
- use DLT_PPP_WITHDIRECTION for the filters to be compatible with
kernel 2.6.8
* Tue Jul 20 2004 - arvin@suse.de
- added option to rename ppp interface (experimental)
* Mon Jul 19 2004 - arvin@suse.de
- allow all names as Ethernet interfaces (bug #43048)
* Tue Jul 13 2004 - arvin@suse.de
- removed non-ascii character from option file
* Fri May 28 2004 - kkeil@suse.de
- correct fix for the DOD filter rule paket header (see bug #34724)
* Fri Apr 16 2004 - mmj@suse.de
- Void functions should be declared as such
* Wed Mar 31 2004 - arvin@suse.de
- fixed filter rules for dial on demand (see bug #34724)
* Wed Feb 18 2004 - arvin@suse.de
- fixed setting of filter rules (bug #34569)
* Fri Feb 13 2004 - arvin@suse.de
- updated pppoatm plugin (bug #34543)
- fixed ctl-c bug
* Fri Feb 13 2004 - arvin@suse.de
- updated to version 2.4.2, main features:
- new upstream PPPoE plugin implementation
- new upstream MPPE implementation
- many protocols (CHAP, CBCP, EAP, ECP) added or updated
- build package as non-root user
- build sub-package ppp-devel with header files required for
extra plugins
* Thu Feb 12 2004 - arvin@suse.de
- removed outdated samples
- some cleanup
* Thu Feb 12 2004 - ro@suse.de
- adapt to change in libpcap: include moved to pcap_bpf.h
* Mon Jan 26 2004 - arvin@suse.de
- allow higher serial speeds (see bug #34053)
* Fri Jan 16 2004 - kukuk@suse.de
- Add pam-devel to neededforbuild
* Fri Jan 09 2004 - kukuk@suse.de
- Fix compiler warnings
* Wed Aug 13 2003 - arvin@suse.de
- allow vlan devices for pppoe (bug #28645)
* Mon Jun 30 2003 - arvin@suse.de
- fixed closing of pppoatm (bug #27315)
- fixed pppoe on ppc (bug #27575)
* Thu Jun 05 2003 - arvin@suse.de
- converted MSCHAPv2-fix patch to unix format as new patch
doesn't like dos anymore
* Tue Jun 03 2003 - arvin@suse.de
- added peers file for pptp
* Mon May 26 2003 - arvin@suse.de
- adapted neededforbuild to linux-atm changes
* Thu May 22 2003 - okir@suse.de
- prevent buffer overflow in MPPE (#27062)
* Wed Mar 12 2003 - arvin@suse.de
- activate filter rules per default (bug #25134)
* Sat Jan 18 2003 - arvin@suse.de
- added config file with some filter rules
* Fri Jan 10 2003 - arvin@suse.de
- Reactivated option noipdefault in default options file since
some providers can't handle a suggested local ip address. Can't
reproduce the wrong behaviour of the pppd mentioned in bug #1751
so the change is ok.
* Thu Dec 12 2002 - arvin@suse.de
- removed absolute paths from pam configuration file
* Wed Nov 13 2002 - arvin@suse.de
- fixed multi-line string literals
* Thu Oct 24 2002 - arvin@suse.de
- fixed callback phone number handling (bug #9659 and #18408)
- activated patches added on Aug. 1st
* Fri Aug 23 2002 - arvin@suse.de
- remove a warning message in the log (bug #18254)
- removed obsolete peers file demand
* Tue Aug 06 2002 - arvin@suse.de
- added "plain old modem" peers file (related to bug #17341)
* Thu Aug 01 2002 - bk@suse.de
- add patches recommeded for pptp which also fix bug 17097
* Thu Jul 25 2002 - arvin@suse.de
- disable pppoatm plugin on s390 and s390x
* Mon Jul 08 2002 - arvin@suse.de
- removed setuid bits from pppd (bug #16860)
* Thu May 16 2002 - arvin@suse.de
- compile with packet filter support
* Wed May 15 2002 - arvin@suse.de
- enable more debugging for pppoe if the pppd gets the debug
option
* Mon May 13 2002 - ro@suse.de
- fix build on x86_64
* Fri Apr 19 2002 - arvin@suse.de
- disable pppoatm plugin on mips (since linux-atm does not build)
* Tue Apr 16 2002 - arvin@suse.de
- turn off debugging by default
* Wed Mar 13 2002 - arvin@suse.de
- better mtu handling as workaround for broken dsl providers
* Fri Feb 08 2002 - arvin@suse.de
- fixed error handling in passwordfd plugin
* Fri Feb 08 2002 - okir@suse.de
- applied security fix to zlib
* Tue Feb 05 2002 - arvin@suse.de
- more log output without debug option so that the smpppd does
not require the debug option
- removed debug option from peers files
- use %%{_mandir}
* Wed Jan 30 2002 - arvin@suse.de
- use buildroot
- compile pppoatm plugin on all archs again
* Fri Jan 11 2002 - arvin@suse.de
- added terminating NULL in options list of passwordfd plugin
* Fri Jan 11 2002 - arvin@suse.de
- don't compile pppoatm plugin on axp and s390
* Wed Jan 09 2002 - arvin@suse.de
- added "modprobe pppoatm" in pppoatm plugin
* Tue Jan 08 2002 - arvin@suse.de
- fixed compiling on ia64
* Mon Jan 07 2002 - arvin@suse.de
- added atm support
- modified peers files for new network configuration
* Mon Nov 05 2001 - arvin@suse.de
- set MTU and MRU to 1492 (to prevent problems for DSL)
* Thu Sep 27 2001 - arvin@suse.de
- added rc-pppoe peers file
* Wed Sep 19 2001 - arvin@suse.de
- added patch only-eth.dif: makes pppoe plugin only accect eth*
as device and thus prevents kernel from trying to load dozens
of modules (bug #10845)
* Tue Aug 28 2001 - arvin@suse.de
- strip plugins
* Mon Aug 13 2001 - arvin@suse.de
- updated pppoe patch to ppp-2.4.1-pppoe.patch4
* Thu Aug 09 2001 - arvin@suse.de
- added Obsoletes ppp-soho
- added peers file pppoe
* Tue Jul 17 2001 - arvin@suse.de
- added directories to file list
* Wed Jul 11 2001 - arvin@suse.de
- removed obsolete generation of pap and chap secrets form
wvdial provider list
* Sun Jun 24 2001 - arvin@suse.de
- updated to version 2.4.1
- added peers file "demand" (from package pppoed)
* Thu May 10 2001 - mfabian@suse.de
- bzip2 sources
* Fri Apr 20 2001 - arvin@suse.de
- added options lcp-max-configure 60 and lcp-restart 2
* Fri Mar 30 2001 - arvin@suse.de
- added mppe patch
- search for plugins in /usr/lib/pppd/<version> (backport from
pppd 2.4.1)
- moved all plugins to /usr/lib/pppd/<version>
* Wed Feb 28 2001 - arvin@suse.de
- moved all plugins to /usr/lib/pppd/plugins
* Thu Feb 15 2001 - arvin@suse.de
- included pppoe patch from Michal Ostrowski
* Thu Nov 09 2000 - arvin@suse.de
- updated to version 2.4.0
* Mon Sep 11 2000 - arvin@suse.de
- Fixed plugin passwordfd for chap.
* Mon Jul 31 2000 - arvin@suse.de
- Added (commented) option "maxfail 3" to options. Partly fix
for bug #3637.
* Thu Jul 13 2000 - arvin@suse.de
- removed directory /var/state/pppd from spec file. It is not
needed and only got there by accident.
* Mon Jul 10 2000 - bk@suse.de
- fixed bug with replacedefaultroute and dial on demand(route was lost)
- fixed Open message of demand patch for ICMP(was displayed as UDP)
* Tue Jul 04 2000 - arvin@suse.de
- Support for dial on demand with sync ppp.
- On dial on demand log witch packed caused the connect. Example:
Open UDP 212.185.229.193:2048 -> 216.32.74.51:22926
- Fixed plugin passwordfd for dial on demand.
* Mon Jun 05 2000 - arvin@suse.de
- fixed bug in plugin passwordfd
* Fri Jun 02 2000 - arvin@suse.de
- added plugin passwordfd to read password via a pipe
- replacedefaultroute option fixed for pppd demand
* Fri Mar 03 2000 - ro@suse.de
- manpages ..
* Thu Mar 02 2000 - bk@suse.de
- fixed patch path strip count for ppp-2.3.11.dif
- added comment about modem and local options to /etc/ppp/options
* Wed Mar 01 2000 - bk@suse.de
- copied ppp-2.3.11.dif from ppp_ssl(fixes MANPATH) and filelist fixed.
* Sat Feb 26 2000 - bk@suse.de
- removed priviledged property from (no)replacedefaultroute, this
way wvdial can set it in /etc/ppp/peers/wvdial with call wvdial.
* Fri Feb 25 2000 - bk@suse.de
- disabled new replacedefaultroute option per default, can be controlled
thru the replacedefaultroute and noreplacedefaultroute options.
* Fri Feb 25 2000 - bk@suse.de
- wrote patch which replaces the old defaut route on successfully
completed IPCP negotiation unless the included noreplacedefaultroute
option is given. Documented in the man page and /etc/ppp/options.
On connection shutdown, the old default route is restored automatically.
Nice feature for many people with laptops which have a default
route set trough their ethernet and want go online with their
modem if not connected to the ethernet. Should reduce support
load in this area dramatically.
* Sun Feb 20 2000 - bk@suse.de
- only change tty perms really needed, will avoid the loosing tty
perms bug (bug #1831 and 1361)
- disabled noipdefault in the default options file for static IP addresses
and dial-in. wvdial still passes it to pppd if Force Address is not
set in wvdial.conf, so no problem. (Fix for bug #1751)
* Fri Feb 11 2000 - bk@suse.de
- generate pap and chap secrets with callbycall.secrets
- Makefile.Linux merged into the spec file and dropped from diff
* Sun Jan 16 2000 - bk@suse.de
- update to ppp-2.3.11
* Fri Oct 29 1999 - bk@suse.de
- added logins for german call-by-call providers to the secrets
- removed suse dialin scripts
* Mon Oct 25 1999 - olh@suse.de
- add some sample scripts, minor sample changes
* Sun Oct 24 1999 - bk@suse.de
- fix for empty files in /usr/doc/packages/ppp (olh: thanks for the report!!)
* Sun Oct 10 1999 - bk@suse.de
- update to ppp-2.3.10
- split up diff
- removed not installed ppplogin which also didn't appear in the
file list lately
- removed proxyarp from the default options file
- force pppd use the glibc's logwtmp instead of implementing its own
(patch for ppp-2.3.9, but is preferred for 2.3.10 also)
- added the samples to /usr/doc/packages/ppp
* Mon Sep 13 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Mon Aug 30 1999 - kukuk@suse.de
- add pppdump.8
* Thu Aug 19 1999 - bk@suse.de
- added documentation
* Thu Jul 29 1999 - bs@suse.de
- set /etc/ppp to 750, root.dialout
- use noauth in /etc/ppp/options
* Sat Jul 17 1999 - bk@suse.de
- /etc/ppp/option fixed wins-addr, corrected to ms-wins
* Mon Jun 14 1999 - kukuk@suse.de
- Enable PAM support, add ppp.pamd
* Sat May 22 1999 - bk@suse.de
- update to ppp-2.3.8 using diff from jurix
- added ppp-2.3.8-patch1
- marked /etc/ppp/options as noreplace
* Mon Dec 14 1998 - tmg@suse.de
- changed default config
* Wed Dec 09 1998 - bs@suse.de
- marked config files as noreplace
* Tue Nov 24 1998 - ro@suse.de
- don't pack if_ppp.h (delivered by glibc)
* Tue Oct 06 1998 - ro@suse.de
- update to ppp-2.3.5 using diff from jurix
- re-activate ppp_available in sys-linux.c
* Mon Nov 03 1997 - ro@suse.de
- install include files in usr/include/net before compilation
* Wed Apr 30 1997 - florian@suse.de
- create eror output file with perm 0600
- pppd is only executable for group "dialout"
* Thu Jan 02 1997 - florian@suse.de
- add bug-fix
- add ipx support

11
pppoatm-peers Normal file
View File

@ -0,0 +1,11 @@
#
# PPP over ATM options
#
plugin pppoatm.so
#
# Plugin passwordfd enables us to pipe the password to pppd, thus we
# don't have to put it into pap-secrets and chap-secrets.
#
plugin passwordfd.so
#
noauth

19
pppoe-peers Normal file
View File

@ -0,0 +1,19 @@
#
# PPP over Ethernet options (using roaring pinguin plugin)
#
plugin rp-pppoe.so
#
# Plugin passwordfd enables us to pipe the password to pppd, thus we
# don't have to put it into pap-secrets and chap-secrets.
#
plugin passwordfd.so
#
noauth
# pppoe has a lower mtu/mru
mtu 1492
mru 1492
# switch off all compressions (this is a must)
nopcomp
# this is recommended
novjccomp
noccp

17
pppoe-rp-peers Normal file
View File

@ -0,0 +1,17 @@
#
# PPP over Ethernet options (using roaring pinguin external program)
#
# Plugin passwordfd enables us to pipe the password to pppd, thus we
# don't have to put it into pap-secrets and chap-secrets.
#
plugin passwordfd.so
#
noauth
# pppoe has a lower mtu/mru
mtu 1492
mru 1492
# switch off all compressions (this is a must)
nopcomp
# this is recommended
novjccomp
noccp

15
pptp-peers Normal file
View File

@ -0,0 +1,15 @@
#
# PPTP options
#
# Plugin passwordfd enables us to pipe the password to pppd, thus we
# don't have to put it into pap-secrets and chap-secrets.
#
plugin passwordfd.so
#
noauth
linkname adsl
nocrtscts
local
# switch off all compressions (this is a must)
noaccomp
nopcomp

0
ready Normal file
View File