Djam/ppp
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/ppp.git synced 2025-02-23 14:12:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New version 2.4.7, spec cleanup

Browse source
This commit is contained in:
Andrey Bondrov 2014-08-11 16:51:51 +11:00
parent 3d7bdb3787
commit a0c9c7039c
9 changed files with 312 additions and 2328 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.abf.yml
View file

@ -1,4 +1,4 @@
sources: sources:
"ppp-2.4.1-mppe-crypto.tar.bz2": 9652e5a21131239f6e8499d4dbc448a9eeee132f ppp-2.4.1-mppe-crypto.tar.bz2: 9652e5a21131239f6e8499d4dbc448a9eeee132f
"ppp-2.4.5.tar.bz2": 07dab8969674f44519971013749fcc1d3e280b3c ppp-dhcpc.tar.bz2: 8b49c9b8ccde83f69c4b0c9cae6454cdba0845ca
"ppp-dhcpc.tar.bz2": 8b49c9b8ccde83f69c4b0c9cae6454cdba0845ca ppp-2.4.7.tar.gz: 808b023172ea7189bc0d49935bf37a5382a1fe13

100
ppp-2.4.2-wtmp.patch
View file

@ -1,100 +0,0 @@
diff -urN ppp-2.4.2/pppd/pppd.h ppp-2.4.2-modified/pppd/pppd.h
--- ppp-2.4.2/pppd/pppd.h 2003-04-07 02:01:46.000000000 +0200
+++ ppp-2.4.2-modified/pppd/pppd.h 2004-05-24 13:10:50.944576379 +0200
@@ -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
diff -urN ppp-2.4.2/pppd/sys-linux.c ppp-2.4.2-modified/pppd/sys-linux.c
--- ppp-2.4.2/pppd/sys-linux.c 2004-01-13 05:05:20.000000000 +0100
+++ ppp-2.4.2-modified/pppd/sys-linux.c 2004-05-24 13:12:34.770451144 +0200
@@ -2149,83 +2149,7 @@
return ok;
}
-/********************************************************************
- *
- * 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
*/

1490
ppp-2.4.4-mppe-mppc-1.1.patch
View file

File diff suppressed because it is too large Load diff

116
ppp-2.4.5-make.patch
View file

@ -1,116 +0,0 @@
diff -Naur ppp-2.4.5/chat/Makefile.linux ppp-2.4.5.tpg/chat/Makefile.linux
--- ppp-2.4.5/chat/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/chat/Makefile.linux 2009-12-31 21:12:07.000000000 +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
diff -Naur ppp-2.4.5/pppd/Makefile.linux ppp-2.4.5.tpg/pppd/Makefile.linux
--- ppp-2.4.5/pppd/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/pppd/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
@@ -30,10 +30,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.
@@ -61,7 +61,7 @@
USE_TDB=y
HAS_SHADOW=y
-#USE_PAM=y
+USE_PAM=y
#HAVE_INET6=y
# Enable plugins
diff -Naur ppp-2.4.5/pppd/plugins/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/Makefile.linux
--- ppp-2.4.5/pppd/plugins/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/pppd/plugins/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
@@ -1,5 +1,5 @@
#CC = gcc
-COPTS = -O2 -g
+COPTS = $(RPM_OPT_FLAGS)
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
LDFLAGS = -shared
INSTALL = install
diff -Naur ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/pppoatm/Makefile.linux
--- ppp-2.4.5/pppd/plugins/pppoatm/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/pppd/plugins/pppoatm/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
@@ -1,5 +1,5 @@
#CC = gcc
-COPTS = -O2 -g
+COPTS = $(RPM_OPT_FLAGS)
CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
LDFLAGS = -shared
INSTALL = install
diff -Naur ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/pppol2tp/Makefile.linux
--- ppp-2.4.5/pppd/plugins/pppol2tp/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/pppd/plugins/pppol2tp/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
@@ -1,5 +1,5 @@
#CC = gcc
-COPTS = -O2 -g
+COPTS = $(RPM_OPT_FLAGS)
CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
LDFLAGS = -shared
INSTALL = install
diff -Naur ppp-2.4.5/pppd/plugins/radius/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/radius/Makefile.linux
--- ppp-2.4.5/pppd/plugins/radius/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/pppd/plugins/radius/Makefile.linux 2009-12-31 21:19:47.000000000 +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.
diff -Naur ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.5.tpg/pppd/plugins/rp-pppoe/Makefile.linux
--- ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/pppd/plugins/rp-pppoe/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
@@ -25,7 +25,7 @@
# Version is set ONLY IN THE MAKEFILE! Don't delete this!
RP_VERSION=3.8p
-COPTS=-O2 -g
+COPTS=$(RPM_OPT_FLAGS)
CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
all: rp-pppoe.so pppoe-discovery
diff -Naur ppp-2.4.5/pppdump/Makefile.linux ppp-2.4.5.tpg/pppdump/Makefile.linux
--- ppp-2.4.5/pppdump/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/pppdump/Makefile.linux 2009-12-31 21:12:07.000000000 +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
diff -Naur ppp-2.4.5/pppstats/Makefile.linux ppp-2.4.5.tpg/pppstats/Makefile.linux
--- ppp-2.4.5/pppstats/Makefile.linux 2009-11-16 22:26:07.000000000 +0000
+++ ppp-2.4.5.tpg/pppstats/Makefile.linux 2009-12-31 21:12:07.000000000 +0000
@@ -10,7 +10,7 @@
PPPSTATOBJS = pppstats.o
#CC = gcc
-COPTS = -O
+COPTS = $(RPM_OPT_FLAGS)
COMPILE_FLAGS = -I../include
LIBS =

48
ppp-2.4.5-pppol2tpv3.patch
View file

@ -1,48 +0,0 @@
--- ppp-2.4.5/include/linux/if_pppol2tp.h.pppol2tpv3 2009-11-17 01:26:07.000000000 +0300
+++ ppp-2.4.5/include/linux/if_pppol2tp.h 2012-09-03 19:24:54.203084593 +0400
@@ -32,6 +32,45 @@ struct pppol2tp_addr
__u16 d_tunnel, d_session; /* For sending outgoing packets */
};
+/* Structure used to connect() the socket to a particular tunnel UDP
+ * * socket over IPv6.
+ * */
+struct pppol2tpin6_addr {
+ __kernel_pid_t pid; /* pid that owns the fd.
+ * 0 => current */
+ int fd; /* FD of UDP socket to use */
+
+ __u16 s_tunnel, s_session; /* For matching incoming packets */
+ __u16 d_tunnel, d_session; /* For sending outgoing packets */
+
+ struct sockaddr_in6 addr; /* IP address and port to send to */
+};
+
+/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32
+ * bits. So we need a different sockaddr structure.
+ */
+struct pppol2tpv3_addr {
+ pid_t pid; /* pid that owns the fd.
+ * 0 => current */
+ int fd; /* FD of UDP or IP socket to use */
+
+ struct sockaddr_in addr; /* IP address and port to send to */
+
+ __u32 s_tunnel, s_session; /* For matching incoming packets */
+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
+};
+
+struct pppol2tpv3in6_addr {
+ __kernel_pid_t pid; /* pid that owns the fd.
+ * 0 => current */
+ int fd; /* FD of UDP or IP socket to use */
+
+ __u32 s_tunnel, s_session; /* For matching incoming packets */
+ __u32 d_tunnel, d_session; /* For sending outgoing packets */
+
+ struct sockaddr_in6 addr; /* IP address and port to send to */
+};
+
/* Socket options:
* DEBUG - bitmask of debug message categories
* SENDSEQ - 0 => don't send packets with sequence numbers

116
ppp-2.4.7-make.patch Normal file
View file

@ -0,0 +1,116 @@
diff -urN ppp-2.4.7/chat/Makefile.linux ppp-2.4.7-patched/chat/Makefile.linux
--- ppp-2.4.7/chat/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/chat/Makefile.linux 2014-08-11 16:19:06.400359190 +1100
@@ -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
diff -urN ppp-2.4.7/pppd/Makefile.linux ppp-2.4.7-patched/pppd/Makefile.linux
--- ppp-2.4.7/pppd/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppd/Makefile.linux 2014-08-11 16:19:35.206814899 +1100
@@ -30,10 +30,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.
@@ -61,7 +61,7 @@
USE_TDB=y
HAS_SHADOW=y
-#USE_PAM=y
+USE_PAM=y
HAVE_INET6=y
# Enable plugins
diff -urN ppp-2.4.7/pppd/plugins/Makefile.linux ppp-2.4.7-patched/pppd/plugins/Makefile.linux
--- ppp-2.4.7/pppd/plugins/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppd/plugins/Makefile.linux 2014-08-11 16:19:06.400359190 +1100
@@ -1,5 +1,5 @@
#CC = gcc
-COPTS = -O2 -g
+COPTS = $(RPM_OPT_FLAGS)
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
LDFLAGS = -shared
INSTALL = install
diff -urN ppp-2.4.7/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.7-patched/pppd/plugins/pppoatm/Makefile.linux
--- ppp-2.4.7/pppd/plugins/pppoatm/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppd/plugins/pppoatm/Makefile.linux 2014-08-11 16:19:06.400359190 +1100
@@ -1,5 +1,5 @@
#CC = gcc
-COPTS = -O2 -g
+COPTS = $(RPM_OPT_FLAGS)
CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
LDFLAGS = -shared
INSTALL = install
diff -urN ppp-2.4.7/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.7-patched/pppd/plugins/pppol2tp/Makefile.linux
--- ppp-2.4.7/pppd/plugins/pppol2tp/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppd/plugins/pppol2tp/Makefile.linux 2014-08-11 16:19:06.401359205 +1100
@@ -1,5 +1,5 @@
#CC = gcc
-COPTS = -O2 -g
+COPTS = $(RPM_OPT_FLAGS)
CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
LDFLAGS = -shared
INSTALL = install
diff -urN ppp-2.4.7/pppd/plugins/radius/Makefile.linux ppp-2.4.7-patched/pppd/plugins/radius/Makefile.linux
--- ppp-2.4.7/pppd/plugins/radius/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppd/plugins/radius/Makefile.linux 2014-08-11 16:19:06.401359205 +1100
@@ -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.
diff -urN ppp-2.4.7/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.7-patched/pppd/plugins/rp-pppoe/Makefile.linux
--- ppp-2.4.7/pppd/plugins/rp-pppoe/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppd/plugins/rp-pppoe/Makefile.linux 2014-08-11 16:19:06.401359205 +1100
@@ -25,7 +25,7 @@
# Version is set ONLY IN THE MAKEFILE! Don't delete this!
RP_VERSION=3.8p
-COPTS=-O2 -g
+COPTS=$(RPM_OPT_FLAGS)
CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
all: rp-pppoe.so pppoe-discovery
diff -urN ppp-2.4.7/pppdump/Makefile.linux ppp-2.4.7-patched/pppdump/Makefile.linux
--- ppp-2.4.7/pppdump/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppdump/Makefile.linux 2014-08-11 16:19:06.401359205 +1100
@@ -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
diff -urN ppp-2.4.7/pppstats/Makefile.linux ppp-2.4.7-patched/pppstats/Makefile.linux
--- ppp-2.4.7/pppstats/Makefile.linux 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppstats/Makefile.linux 2014-08-11 16:19:06.401359205 +1100
@@ -10,7 +10,7 @@
PPPSTATOBJS = pppstats.o
#CC = gcc
-COPTS = -O
+COPTS = $(RPM_OPT_FLAGS)
COMPILE_FLAGS = -I../include
LIBS =

74
ppp-2.4.3-noexttraffic.patch → ppp-2.4.7-noexttraffic.patch
View file

@ -1,30 +1,7 @@
diff -Naurp ppp-2.4.4/pppd/Makefile.linux ppp-2.4.4.oden/pppd/Makefile.linux diff -urN ppp-2.4.7/pppd/auth.c ppp-2.4.7-patched/pppd/auth.c
--- ppp-2.4.4/pppd/Makefile.linux 2008-12-17 18:25:33.000000000 +0100 --- ppp-2.4.7/pppd/auth.c 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.4.oden/pppd/Makefile.linux 2008-12-17 18:25:46.000000000 +0100 +++ ppp-2.4.7-patched/pppd/auth.c 2014-08-11 16:25:36.701647610 +1100
@@ -60,6 +60,8 @@ HAVE_MULTILINK=y @@ -243,6 +243,11 @@
# Linux distributions: Please leave TDB ENABLED in your builds.
USE_TDB=y
+NOEXT_TRAFFIC=y
+
HAS_SHADOW=y
USE_PAM=y
#HAVE_INET6=y
@@ -94,6 +96,10 @@ CFLAGS += -DMPPE=1
endif
endif
+ifdef NOEXT_TRAFFIC
+CFLAGS += -DNOEXT_TRAFFIC
+endif
+
# EAP SRP-SHA1
ifdef USE_SRP
CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
diff -Naurp ppp-2.4.4/pppd/auth.c ppp-2.4.4.oden/pppd/auth.c
--- ppp-2.4.4/pppd/auth.c 2006-06-18 13:26:00.000000000 +0200
+++ ppp-2.4.4.oden/pppd/auth.c 2008-12-17 18:25:46.000000000 +0100
@@ -242,6 +242,11 @@ static char *uafname; /* name of most r
extern char *crypt __P((const char *, const char *)); extern char *crypt __P((const char *, const char *));
@ -36,7 +13,7 @@ diff -Naurp ppp-2.4.4/pppd/auth.c ppp-2.4.4.oden/pppd/auth.c
/* Prototypes for procedures local to this file. */ /* Prototypes for procedures local to this file. */
static void network_phase __P((int)); static void network_phase __P((int));
@@ -1182,6 +1187,14 @@ check_idle(arg) @@ -1189,6 +1194,14 @@
tlim = idle_time_hook(&idle); tlim = idle_time_hook(&idle);
} else { } else {
itime = MIN(idle.xmit_idle, idle.recv_idle); itime = MIN(idle.xmit_idle, idle.recv_idle);
@ -51,10 +28,33 @@ diff -Naurp ppp-2.4.4/pppd/auth.c ppp-2.4.4.oden/pppd/auth.c
tlim = idle_time_limit - itime; tlim = idle_time_limit - itime;
} }
if (tlim <= 0) { if (tlim <= 0) {
diff -Naurp ppp-2.4.4/pppd/options.c ppp-2.4.4.oden/pppd/options.c diff -urN ppp-2.4.7/pppd/Makefile.linux ppp-2.4.7-patched/pppd/Makefile.linux
--- ppp-2.4.4/pppd/options.c 2006-06-18 13:26:00.000000000 +0200 --- ppp-2.4.7/pppd/Makefile.linux 2014-08-11 16:25:19.064360401 +1100
+++ ppp-2.4.4.oden/pppd/options.c 2008-12-17 18:25:46.000000000 +0100 +++ ppp-2.4.7-patched/pppd/Makefile.linux 2014-08-11 16:25:36.702647626 +1100
@@ -127,6 +127,10 @@ int maxoctets_timeout = 1; /* default @@ -60,6 +60,8 @@
# Linux distributions: Please leave TDB ENABLED in your builds.
USE_TDB=y
+NOEXT_TRAFFIC=y
+
HAS_SHADOW=y
USE_PAM=y
HAVE_INET6=y
@@ -97,6 +99,10 @@
endif
endif
+ifdef NOEXT_TRAFFIC
+CFLAGS += -DNOEXT_TRAFFIC
+endif
+
# EAP SRP-SHA1
ifdef USE_SRP
CFLAGS += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
diff -urN ppp-2.4.7/pppd/options.c ppp-2.4.7-patched/pppd/options.c
--- ppp-2.4.7/pppd/options.c 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.7-patched/pppd/options.c 2014-08-11 16:25:36.702647626 +1100
@@ -129,6 +129,10 @@
#endif #endif
@ -65,7 +65,7 @@ diff -Naurp ppp-2.4.4/pppd/options.c ppp-2.4.4.oden/pppd/options.c
extern option_t auth_options[]; extern option_t auth_options[];
extern struct stat devstat; extern struct stat devstat;
@@ -307,6 +311,9 @@ option_t general_options[] = { @@ -325,6 +329,9 @@
{ "active-filter", o_special, setactivefilter, { "active-filter", o_special, setactivefilter,
"set filter for active pkts", OPT_PRIO }, "set filter for active pkts", OPT_PRIO },
#endif #endif
@ -75,10 +75,10 @@ diff -Naurp ppp-2.4.4/pppd/options.c ppp-2.4.4.oden/pppd/options.c
#ifdef MAXOCTETS #ifdef MAXOCTETS
{ "maxoctets", o_int, &maxoctets, { "maxoctets", o_int, &maxoctets,
diff -Naurp ppp-2.4.4/pppd/pppd.8 ppp-2.4.4.oden/pppd/pppd.8 diff -urN ppp-2.4.7/pppd/pppd.8 ppp-2.4.7-patched/pppd/pppd.8
--- ppp-2.4.4/pppd/pppd.8 2006-06-16 02:01:23.000000000 +0200 --- ppp-2.4.7/pppd/pppd.8 2014-08-09 23:31:39.000000000 +1100
+++ ppp-2.4.4.oden/pppd/pppd.8 2008-12-17 18:25:46.000000000 +0100 +++ ppp-2.4.7-patched/pppd/pppd.8 2014-08-11 16:25:36.703647643 +1100
@@ -292,6 +292,20 @@ logged through syslog with facility \fId @@ -295,6 +295,20 @@
\fIdebug\fR. This information can be directed to a file by setting up \fIdebug\fR. This information can be directed to a file by setting up
/etc/syslog.conf appropriately (see syslog.conf(5)). /etc/syslog.conf appropriately (see syslog.conf(5)).
.TP .TP

92
ppp-2.4.3-nostrip.patch → ppp-2.4.7-nostrip.patch
View file

@ -1,16 +1,39 @@
--- ppp-2.4.3/chat/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200 diff -urN ppp-2.4.7/chat/Makefile.linux ppp-2.4.7-patched/chat/Makefile.linux
+++ ppp-2.4.3/chat/Makefile.linux 2005-08-28 12:29:54.000000000 +0200 --- ppp-2.4.7/chat/Makefile.linux 2014-08-11 16:36:30.888408015 +1100
+++ ppp-2.4.7-patched/chat/Makefile.linux 2014-08-11 16:36:51.996758000 +1100
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
install: chat install: chat
mkdir -p $(BINDIR) mkdir -p $(BINDIR) $(MANDIR)
- $(INSTALL) -s -c chat $(BINDIR) - $(INSTALL) -s -c chat $(BINDIR)
+ $(INSTALL) -c chat $(BINDIR) + $(INSTALL) -c chat $(BINDIR)
$(INSTALL) -c -m 644 chat.8 $(MANDIR) $(INSTALL) -c -m 644 chat.8 $(MANDIR)
clean: clean:
--- ppp-2.4.3/pppd/plugins/radius/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200 diff -urN ppp-2.4.7/pppd/Makefile.linux ppp-2.4.7-patched/pppd/Makefile.linux
+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2005-08-28 12:29:54.000000000 +0200 --- ppp-2.4.7/pppd/Makefile.linux 2014-08-11 16:36:30.888408015 +1100
+++ ppp-2.4.7-patched/pppd/Makefile.linux 2014-08-11 16:36:51.997758017 +1100
@@ -108,7 +108,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
@@ -214,7 +214,7 @@
install: pppd
mkdir -p $(BINDIR) $(MANDIR)
$(EXTRAINSTALL)
- $(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+ $(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
chmod o-rx,u+s $(BINDIR)/pppd; fi
$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
diff -urN ppp-2.4.7/pppd/plugins/radius/Makefile.linux ppp-2.4.7-patched/pppd/plugins/radius/Makefile.linux
--- ppp-2.4.7/pppd/plugins/radius/Makefile.linux 2014-08-11 16:36:30.877407833 +1100
+++ ppp-2.4.7-patched/pppd/plugins/radius/Makefile.linux 2014-08-11 16:36:51.997758017 +1100
@@ -36,9 +36,9 @@ @@ -36,9 +36,9 @@
install: all install: all
@ -24,9 +47,10 @@
$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR) $(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR) $(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
--- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200 diff -urN ppp-2.4.7/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.7-patched/pppd/plugins/rp-pppoe/Makefile.linux
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2005-08-28 12:29:54.000000000 +0200 --- ppp-2.4.7/pppd/plugins/rp-pppoe/Makefile.linux 2014-08-11 16:36:30.877407833 +1100
@@ -39,9 +39,9 @@ +++ ppp-2.4.7-patched/pppd/plugins/rp-pppoe/Makefile.linux 2014-08-11 16:36:51.997758017 +1100
@@ -43,9 +43,9 @@
install: all install: all
$(INSTALL) -d -m 755 $(LIBDIR) $(INSTALL) -d -m 755 $(LIBDIR)
@ -37,49 +61,10 @@
+ $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) + $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
clean: clean:
rm -f *.o *.so rm -f *.o *.so pppoe-discovery
--- ppp-2.4.3/pppd/plugins/dhcp/Makefile.linux.nostrip 2005-08-28 12:38:09.000000000 +0200 diff -urN ppp-2.4.7/pppdump/Makefile.linux ppp-2.4.7-patched/pppdump/Makefile.linux
+++ ppp-2.4.3/pppd/plugins/dhcp/Makefile.linux 2005-08-28 12:38:09.000000000 +0200 --- ppp-2.4.7/pppdump/Makefile.linux 2014-08-11 16:36:30.882407916 +1100
@@ -11,7 +11,7 @@ +++ ppp-2.4.7-patched/pppdump/Makefile.linux 2014-08-11 16:37:15.211143063 +1100
install: all
$(INSTALL) -d -m 755 $(LIBDIR)
- $(INSTALL) -s -c -m 755 dhcpc.so $(LIBDIR)
+ $(INSTALL) -c -m 755 dhcpc.so $(LIBDIR)
$(PLUGIN): $(LTLIB)
gcc -o $@ $(OBJS:%.lo=.libs/%.o) $(LIBS)
--- ppp-2.4.3/pppd/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200
+++ ppp-2.4.3/pppd/Makefile.linux 2005-08-28 12:29:54.000000000 +0200
@@ -64,7 +64,7 @@
HAS_SHADOW=y
USE_PAM=y
-#HAVE_INET6=y
+HAVE_INET6=y
# Enable plugins
PLUGIN=y
@@ -105,7 +105,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
@@ -208,7 +208,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/pppdump/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200
+++ ppp-2.4.3/pppdump/Makefile.linux 2005-08-28 12:29:54.000000000 +0200
@@ -17,5 +17,5 @@ @@ -17,5 +17,5 @@
install: install:
@ -87,8 +72,9 @@
- $(INSTALL) -s -c pppdump $(BINDIR) - $(INSTALL) -s -c pppdump $(BINDIR)
+ $(INSTALL) -c pppdump $(BINDIR) + $(INSTALL) -c pppdump $(BINDIR)
$(INSTALL) -c pppdump.8 $(MANDIR) $(INSTALL) -c pppdump.8 $(MANDIR)
--- ppp-2.4.3/pppstats/Makefile.linux.nostrip 2005-08-28 12:29:54.000000000 +0200 diff -urN ppp-2.4.7/pppstats/Makefile.linux ppp-2.4.7-patched/pppstats/Makefile.linux
+++ ppp-2.4.3/pppstats/Makefile.linux 2005-08-28 12:29:54.000000000 +0200 --- ppp-2.4.7/pppstats/Makefile.linux 2014-08-11 16:36:30.877407833 +1100
+++ ppp-2.4.7-patched/pppstats/Makefile.linux 2014-08-11 16:36:51.998758034 +1100
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
install: pppstats install: pppstats

652
ppp.spec
View file

@ -1,69 +1,38 @@
%define major 0 %bcond_without inet6
%define libname %mklibname radiusclient %{major}
%define develname %mklibname radiusclient -d
%define name ppp Summary: The PPP daemon and documentation
%define version 2.4.5 Name: ppp
%define release 11 Version: 2.4.7
Release: 1
%define enable_inet6 1
%{?_with_inet6: %{expand: %%global enable_inet6 1}}
%{?_without_inet6: %{expand: %%global enable_inet6 0}}
%define enable_debug 0
%{?_with_debug: %global enable_debug 1}
%{?_without_debug: %global use_debug 0}
%define enable_radiusclient 0
%{?_with_radiusclient: %{expand: %%global enable_radiusclient 1}}
%{?_without_radiusclient: %{expand: %%global enable_radiusclient 0}}
Summary: The PPP daemon and documentation for Linux 1.3.xx and greater
Name: %{name}
Version: %{version}
Release: %{release}
License: BSD-like License: BSD-like
Url: http://www.samba.org/ppp/
Group: System/Servers Group: System/Servers
Source0: ftp://ftp.samba.org/pub/ppp/%{name}-%{version}.tar.bz2 Url: http://www.samba.org/ppp/
Source0: ftp://ftp.samba.org/pub/ppp/%{name}-%{version}.tar.gz
Source1: ppp-2.4.3-pam.conf Source1: ppp-2.4.3-pam.conf
Source2: ppp-2.4.1-mppe-crypto.tar.bz2 Source2: ppp-2.4.1-mppe-crypto.tar.bz2
Source3: README.pppoatm Source3: README.pppoatm
Source4: ppp.logrotate Source4: ppp.logrotate
Source5: ppp-dhcpc.tar.bz2 Source5: ppp-dhcpc.tar.bz2
Patch0: ppp-2.4.5-make.patch Patch0: ppp-2.4.7-make.patch
Patch1: ppp-2.3.6-sample.patch Patch1: ppp-2.3.6-sample.patch
Patch2: ppp-2.4.2-wtmp.patch Patch2: ppp-options.patch
Patch4: ppp-options.patch Patch3: ppp-2.4.3-pppdump-Makefile.patch
Patch5: ppp-2.4.3-pppdump-Makefile.patch Patch4: ppp-2.4.7-noexttraffic.patch
Patch6: ppp-2.4.3-noexttraffic.patch
# (blino) use external libatm for pppoatm plugin # (blino) use external libatm for pppoatm plugin
Patch7: ppp-2.4.3-libatm.patch Patch5: ppp-2.4.3-libatm.patch
Patch8: ppp-2.4.2-pie.patch Patch6: ppp-2.4.2-pie.patch
Patch9: ppp-2.4.4-multipledefrt.patch Patch7: ppp-2.4.4-multipledefrt.patch
Patch10: ppp-2.4.4-dontwriteetc.patch Patch8: ppp-2.4.4-dontwriteetc.patch
# (blino) http://orakel.tznetz.com/dload/ppp-2.4.4-mppe-mppc-1.1.patch.gz Patch9: ppp-2.4.3-pic.patch
# original patch on http://mppe-mppc.alphacron.de/ Patch10: ppp-2.4.3-etcppp.patch
# (tpg) disable this patch, because it need a rediff and also there are some legal issues Patch11: ppp-2.4.5-includes-sha1.patch
# Although the module's source code is completely free, MPPC itself is patented algorithm. Patch12: ppp-2.4.5-makeopt2.patch
#Patent for *Microsoft* PPC is holded by the Hifn Inc. This is obvious ;-). Patch13: ppp-2.4.7-nostrip.patch
#Furthermore, MPPE uses RC4[1] encryption algorithm which itself isn't patented,
#but RC4 is trademark of RSA Data Security Inc.
#To avoid legal problems, US citizens shouldn't use this module.
Patch11: ppp-2.4.4-mppe-mppc-1.1.patch
Patch15: ppp-2.4.3-pic.patch
Patch16: ppp-2.4.3-etcppp.patch
Patch18: ppp-2.4.5-includes-sha1.patch
Patch19: ppp-2.4.5-makeopt2.patch
Patch20: ppp-2.4.3-nostrip.patch
Patch21: ppp-2.4.5-pppol2tpv3.patch
BuildRequires: libatm-devel
BuildRequires: libpcap-devel
BuildRequires: openssl-devel >= 0.9.7
BuildRequires: pam-devel
BuildRequires: libtool BuildRequires: libtool
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: atm-devel
Requires: glibc >= 2.0.6 BuildRequires: pcap-devel
BuildRequires: pkgconfig(openssl)
BuildRequires: pam-devel
%description %description
The ppp package contains the PPP (Point-to-Point Protocol) daemon The ppp package contains the PPP (Point-to-Point Protocol) daemon
@ -73,221 +42,7 @@ method for transmitting datagrams over serial point-to-point links.
The ppp package should be installed if your machine need to support The ppp package should be installed if your machine need to support
the PPP protocol. the PPP protocol.
%package devel
Summary: PPP devel files
Group: Development/C
Requires: %{name} = %{version}
%description devel
PPP over ATM plugin for %{name}.
%package pppoatm
Summary: PPP over ATM plugin for %{name}
Group: System/Servers
Requires: %{name} = %{version}
%description pppoatm
PPP over ATM plugin for %{name}.
%package pppoe
Summary: PPP over ethernet plugin for %{name}
Group: System/Servers
Requires: %{name} = %{version}
%description pppoe
PPP over ethernet plugin for %{name}.
%package radius
Summary: Radius plugin for %{name}
Group: System/Servers
Requires: %{name} = %{version}
Requires: radiusclient-utils
%description radius
Radius plugin for %{name}.
%package dhcp
Summary: DHCP plugin for %{name}
Group: System/Servers
Requires: %{name} = %{version}
%description dhcp
DHCP plugin for %{name}.
%if %enable_radiusclient
%package -n radiusclient-utils
Summary: Radiusclient library
Group: System/Servers
Requires: %{libname} = %{version}-%{release}
Conflicts: radiusclient
%description -n radiusclient-utils
Radiusclient is a /bin/login replacement which gets called by a getty
to log in a user and to setup the user's login environment. Normal
login programs just check the login name and password which the user
entered against the local password file (/etc/passwd, /etc/shadow). In
contrast to that Radiusclient also uses the RADIUS protocol to
authenticate the user.
%package -n %{libname}
Summary: Radiusclient library
Group: System/Libraries
%description -n %{libname}
Libraries required for Radiusclient
%package -n %{develname}
Summary: Header files and development documentation for radiusclient
Group: Development/C
Requires: %{libname} = %{version}-%{release}
Provides: radiusclient-devel = %{version}-%{release}
Provides: libradiusclient-devel = %{version}-%{release}
%description -n %{develname}
Header files and development documentation for radiusclient.
%package -n %{staticname}
Summary: Static libraries for radiusclient
Group: Development/C
Requires: %{libname}-devel = %{version}-%{release}
%description -n %{staticname}
Radiusclient static library.
%endif
%prep
%setup -q
find -type d -name CVS|xargs rm -rf
%patch0 -p1 -b .make
%patch1 -p1 -b .sample
%patch2 -p1 -b .wtmp
%patch4 -p1 -b .options
%patch5 -p1 -b .pppdump-Makefile
# (gg) add noext-traffic option
%patch6 -p1 -b .noext
%patch7 -p1 -b .libatm
%patch8 -p1 -b .pie
%patch9 -p1 -b .multipledefrt
tar -xjf %{SOURCE2}
pushd pppd/plugins
tar -xjf %{SOURCE5}
popd
%patch10 -p1 -b .dontwriteetc
#%patch11 -p1 -b .mppe_mppc
%patch15 -p1 -b .pic
%patch16 -p1 -b .etcppp
%patch18 -p1 -b .incsha1
%patch19 -p1 -b .dhcp
%if %enable_debug
%patch20 -p1 -b .nostrip
%endif
%patch21 -p1 -b .pppol2tpv3
# lib64 fixes
perl -pi -e "s|^(LIBDIR.*)\\\$\(DESTDIR\)/lib|\1\\\$(INSTROOT)%{_libdir}|g" pppd/Makefile.linux pppd/plugins/Makefile.linux pppd/plugins/{pppoatm,radius,rp-pppoe,pppol2tp}/Makefile.linux
perl -pi -e "s|(--prefix=/usr)|\1 --libdir=%{_libdir}|g" pppd/plugins/radius/Makefile.linux
perl -pi -e "/_PATH_PLUGIN/ and s,(?:/usr/lib|DESTDIR (\")/lib),\$1%{_libdir}," pppd/pathnames.h
# enable the dhcp plugin
perl -p -i -e "s|^(PLUGINS :=)|SUBDIRS += dhcp\n\$1|g" pppd/plugins/Makefile.linux
# fix /usr/local in scripts path
perl -pi -e "s|/usr/local/bin/pppd|%{_sbindir}/pppd|g;
s|/usr/local/bin/ssh|%{_bindir}/ssh|g;
s|/usr/local/bin/expect|%{_bindir}/expect|g" \
scripts/ppp-on-rsh \
scripts/ppp-on-ssh \
scripts/secure-card
%if %enable_inet6
perl -pi -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
%endif
%build
# stpcpy() is a GNU extension
%if %enable_debug
OPT_FLAGS="%{optflags} -g -D_GNU_SOURCE"
%else
OPT_FLAGS="%{optflags} -D_GNU_SOURCE"
%endif
perl -pi -e "s/openssl/openssl -DOPENSSL_NO_SHA1/;" openssl/crypto/sha/Makefile
CFLAGS="$OPT_FLAGS" CXXFLAGS="$OPT_FLAGS" %configure2_5x
# remove the following line when rebuilding against kernel 2.4 for multilink
#perl -pi -e "s|-DHAVE_MULTILINK||" pppd/Makefile
%make RPM_OPT_FLAGS="$OPT_FLAGS" LIBDIR=%{_libdir}
%make -C pppd/plugins -f Makefile.linux
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}{%{_sbindir},%{_bindir},/usr/X11R6/bin/,%{_mandir}/man8,%{_sysconfdir}/{ppp/peers,pam.d}}
%makeinstall LIBDIR=%{buildroot}%{_libdir}/pppd/%{version}/ INSTALL=install -C pppd/plugins/dhcp
%makeinstall INSTROOT=%{buildroot} SUBDIRS="pppoatm rp-pppoe radius pppol2tp"
%multiarch_includes %{buildroot}%{_includedir}/pppd/pathnames.h
# (gg) Allow stripping
chmod u+w %{buildroot}%{_sbindir}/*
%if !%enable_debug
# (florin) strip the binary
strip %{buildroot}%{_sbindir}/pppd
%endif
chmod go+r scripts/*
install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/ppp
install -m 644 %{SOURCE3} %{_builddir}/%{name}-%{version}/
# (stew) fix permissions
chmod 0755 `find %{buildroot} -name "*\.so"`
# Provide pointers for people who expect stuff in old places
touch %{buildroot}/var/log/ppp/connect-errors
touch %{buildroot}/var/run/ppp/resolv.conf
ln -s ../../var/log/ppp/connect-errors %{buildroot}/etc/ppp/connect-errors
ln -s ../../var/run/ppp/resolv.conf %{buildroot}/etc/ppp/resolv.conf
# Logrotate script
mkdir -p %{buildroot}/etc/logrotate.d
install -m 644 %{SOURCE4} %{buildroot}/etc/logrotate.d/ppp
%if !%enable_radiusclient
rm -rf %{buildroot}%{_sbindir}/*rad*
rm -rf %{buildroot}%{_sysconfdir}/*rad*
rm -rf %{buildroot}%{_includedir}/*rad*
rm -rf %{buildroot}%{_libdir}/*rad*
%endif
%if %enable_debug
export DONT_STRIP=1
%endif
%if %enable_radiusclient
%if %mdkversion < 200900
%post -n %{libname} -p /sbin/ldconfig
%endif
%if %mdkversion < 200900
%postun -n %{libname} -p /sbin/ldconfig
%endif
%if %mdkversion < 200900
%post -n %{develname} -p /sbin/ldconfig
%endif
%if %mdkversion < 200900
%postun -n %{develname} -p /sbin/ldconfig
%endif
%endif
%clean
rm -rf %{buildroot}
%files %files
%defattr(-,root,root)
%doc FAQ PLUGINS README* scripts sample %doc FAQ PLUGINS README* scripts sample
%{_sbindir}/chat %{_sbindir}/chat
%{_sbindir}/pppdump %{_sbindir}/pppdump
@ -315,281 +70,162 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/pam.d/ppp %config(noreplace) %{_sysconfdir}/pam.d/ppp
%config(noreplace) /etc/logrotate.d/ppp %config(noreplace) /etc/logrotate.d/ppp
#----------------------------------------------------------------------------
%package devel
Summary: PPP devel files
Group: Development/C
Requires: %{name} = %{EVRD}
%description devel
PPP over ATM plugin for %{name}.
%files devel %files devel
%defattr(-,root,root)
%doc README* %doc README*
%{_includedir}/pppd/* %{_includedir}/pppd/*
%{multiarch_includedir}/pppd/pathnames.h %{multiarch_includedir}/pppd/pathnames.h
#----------------------------------------------------------------------------
%package pppoatm
Summary: PPP over ATM plugin for %{name}
Group: System/Servers
Requires: %{name} = %{EVRD}
%description pppoatm
PPP over ATM plugin for %{name}.
%files pppoatm %files pppoatm
%defattr(-,root,root)
%doc README %doc README
%{_libdir}/pppd/%{version}/pppoatm.so %{_libdir}/pppd/%{version}/pppoatm.so
#----------------------------------------------------------------------------
%package pppoe
Summary: PPP over ethernet plugin for %{name}
Group: System/Servers
Requires: %{name} = %{EVRD}
%description pppoe
PPP over ethernet plugin for %{name}.
%files pppoe %files pppoe
%defattr(-,root,root)
%doc README %doc README
%{_libdir}/pppd/%{version}/rp-pppoe.so %{_libdir}/pppd/%{version}/rp-pppoe.so
%attr(755,root,root) %{_sbindir}/pppoe-discovery %{_sbindir}/pppoe-discovery
#----------------------------------------------------------------------------
%package radius
Summary: Radius plugin for %{name}
Group: System/Servers
Requires: %{name} = %{EVRD}
Requires: radiusclient-utils
%description radius
Radius plugin for %{name}.
%files radius %files radius
%defattr(-,root,root)
%doc README %doc README
%{_libdir}/pppd/%{version}/rad*.so %{_libdir}/pppd/%{version}/rad*.so
%{_mandir}/man8/*rad* %{_mandir}/man8/*rad*
#----------------------------------------------------------------------------
%package dhcp
Summary: DHCP plugin for %{name}
Group: System/Servers
Requires: %{name} = %{EVRD}
%description dhcp
DHCP plugin for %{name}.
%files dhcp %files dhcp
%defattr(-,root,root)
%doc pppd/plugins/dhcp/README %doc pppd/plugins/dhcp/README
%doc pppd/plugins/dhcp/AUTHORS %doc pppd/plugins/dhcp/AUTHORS
%doc pppd/plugins/dhcp/COPYING %doc pppd/plugins/dhcp/COPYING
%{_libdir}/pppd/%{version}/dhcpc.so %{_libdir}/pppd/%{version}/dhcpc.so
%if %enable_radiusclient #----------------------------------------------------------------------------
%files -n radiusclient-utils
%defattr(644,root,root,755)
%doc pppd/plugins/radius/radiusclient/BUGS
%doc pppd/plugins/radius/radiusclient/CHANGES
%doc pppd/plugins/radius/radiusclient/README
%doc pppd/plugins/radius/radiusclient/doc/*.html
%dir %{_sysconfdir}/radiusclient
%attr(644,root,root) %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/radiusclient/*
%attr(755,root,root) %{_sbindir}/*rad*
%files -n %{libname} %prep
%defattr(-,root,root) %setup -q
%attr(755,root,root) %{_libdir}/lib*.so.%{major}* %patch0 -p1 -b .make
%patch1 -p1 -b .sample
%patch2 -p1 -b .options
%patch3 -p1 -b .pppdump-Makefile
%files -n %{develname} # (gg) add noext-traffic option
%defattr(644,root,root,755) %patch4 -p1 -b .noext
%attr(755,root,root) %{_libdir}/lib*.so
%attr(755,root,root) %{_libdir}/lib*.la
%{_includedir}/*rad*
%files -n %{staticname} %patch5 -p1 -b .libatm
%defattr(644,root,root,755) %patch6 -p1 -b .pie
%{_libdir}/lib*.a %patch7 -p1 -b .multipledefrt
tar -xjf %{SOURCE2}
pushd pppd/plugins
tar -xjf %{SOURCE5}
popd
%patch8 -p1 -b .dontwriteetc
%patch9 -p1 -b .pic
%patch10 -p1 -b .etcppp
%patch11 -p1 -b .incsha1
%patch12 -p1 -b .dhcp
%patch13 -p1 -b .nostrip
# lib64 fixes
perl -pi -e "s|^(LIBDIR.*)\\\$\(DESTDIR\)/lib|\1\\\$(INSTROOT)%{_libdir}|g" pppd/Makefile.linux pppd/plugins/Makefile.linux pppd/plugins/{pppoatm,radius,rp-pppoe,pppol2tp}/Makefile.linux
perl -pi -e "s|(--prefix=/usr)|\1 --libdir=%{_libdir}|g" pppd/plugins/radius/Makefile.linux
perl -pi -e "/_PATH_PLUGIN/ and s,(?:/usr/lib|DESTDIR (\")/lib),\$1%{_libdir}," pppd/pathnames.h
# enable the dhcp plugin
perl -p -i -e "s|^(PLUGINS :=)|SUBDIRS += dhcp\n\$1|g" pppd/plugins/Makefile.linux
# fix /usr/local in scripts path
perl -pi -e "s|/usr/local/bin/pppd|%{_sbindir}/pppd|g;
s|/usr/local/bin/ssh|%{_bindir}/ssh|g;
s|/usr/local/bin/expect|%{_bindir}/expect|g" \
scripts/ppp-on-rsh \
scripts/ppp-on-ssh \
scripts/secure-card
%if %{with inet6}
perl -pi -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux
%endif %endif
%build
perl -pi -e "s/openssl/openssl -DOPENSSL_NO_SHA1/;" openssl/crypto/sha/Makefile
%changelog %configure2_5x
* Mon Jul 04 2011 Ð<EFBFBD>лекÑ<EFBFBD>андр Казанцев <kazancas@mandriva.org> 2.4.5-6mdv2011.0 %make RPM_OPT_FLAGS="%{optflags}" LIBDIR=%{_libdir}
+ Revision: 688624 %make -C pppd/plugins -f Makefile.linux
- fix spec due missing install openl2tp plugins
* Mon May 02 2011 Oden Eriksson <oeriksson@mandriva.com> 2.4.5-5 %install
+ Revision: 661713 mkdir -p %{buildroot}{%{_sbindir},%{_bindir},/usr/X11R6/bin/,%{_mandir}/man8,%{_sysconfdir}/{ppp/peers,pam.d}}
- multiarch fixes
* Mon Apr 18 2011 Eugeni Dodonov <eugeni@mandriva.com> 2.4.5-4 %makeinstall LIBDIR=%{buildroot}%{_libdir}/pppd/%{version}/ INSTALL=install -C pppd/plugins/dhcp
+ Revision: 655830 %makeinstall INSTROOT=%{buildroot} SUBDIRS="pppoatm rp-pppoe radius pppol2tp"
- Disable mppe-mppc patch as it breaks networkmanager (#16737)
* Sat Dec 04 2010 Funda Wang <fwang@mandriva.org> 2.4.5-3mdv2011.0 %multiarch_includes %{buildroot}%{_includedir}/pppd/pathnames.h
+ Revision: 608655
- patch to build with latest kernel
+ Oden Eriksson <oeriksson@mandriva.com> # (gg) Allow stripping
- rebuild chmod u+w %{buildroot}%{_sbindir}/*
* Fri Jun 11 2010 Eugeni Dodonov <eugeni@mandriva.com> 2.4.5-2mdv2010.1 chmod go+r scripts/*
+ Revision: 547901 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/ppp
- Rediffed P11 (required for #16737). install -m 644 %{SOURCE3} %{_builddir}/%{name}-%{version}/
* Thu Dec 31 2009 Tomasz Pawel Gajc <tpg@mandriva.org> 2.4.5-1mdv2010.1 # (stew) fix permissions
+ Revision: 484614 chmod 0755 `find %{buildroot} -name "*\.so"`
- fix compiling on x86_64 by adding -fPIC flag
- update to new version 2.4.5
- merge makeopt patches into one patch 3
- diable patch 11
- rediff patch 18 and 19
- drop patches 12(fixed upstream), 21(unknown status) and 22(fixed upstream)
- update to new version 2.4.5
* Tue May 26 2009 Nicolas Lécureuil <nlecureuil@mandriva.com> 2.4.4-10mdv2010.0 # Provide pointers for people who expect stuff in old places
+ Revision: 380029 touch %{buildroot}/var/log/ppp/connect-errors
- Fix build touch %{buildroot}/var/run/ppp/resolv.conf
ln -s ../../var/log/ppp/connect-errors %{buildroot}/etc/ppp/connect-errors
ln -s ../../var/run/ppp/resolv.conf %{buildroot}/etc/ppp/resolv.conf
* Wed Dec 17 2008 Oden Eriksson <oeriksson@mandriva.com> 2.4.4-9mdv2009.1 # Logrotate script
+ Revision: 315253 mkdir -p %{buildroot}/etc/logrotate.d
- rediffed fuzzy patches install -m 644 %{SOURCE4} %{buildroot}/etc/logrotate.d/ppp
* Wed Oct 29 2008 Oden Eriksson <oeriksson@mandriva.com> 2.4.4-8mdv2009.1
+ Revision: 298351
- rebuilt against libpcap-1.0.0
* Thu Aug 07 2008 Thierry Vignaud <tv@mandriva.org> 2.4.4-7mdv2009.0
+ Revision: 265533
- rebuild early 2009.0 package (before pixel changes)
+ Pixel <pixel@mandriva.com>
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
* Tue Jun 03 2008 Olivier Blin <oblin@mandriva.com> 2.4.4-6mdv2009.0
+ Revision: 214490
- rename new keepdefaultroute option as multipledefaultroutes
* Mon Jun 02 2008 Olivier Blin <oblin@mandriva.com> 2.4.4-5mdv2009.0
+ Revision: 214331
- delete route for current ppp interface only (when shutting down the connection)
* Mon Jun 02 2008 Olivier Blin <oblin@mandriva.com> 2.4.4-4mdv2009.0
+ Revision: 214300
- add keepdefaultroute option (to keep existing default routes)
* Fri Apr 04 2008 Olivier Blin <oblin@mandriva.com> 2.4.4-3mdv2008.1
+ Revision: 192326
- fix plugins path on x86_64 (#31794)
* Fri Feb 01 2008 Tomasz Pawel Gajc <tpg@mandriva.org> 2.4.4-2mdv2008.1
+ Revision: 160951
- new license policy
- spec file clean
- change buildrequires to libatm-devel
+ Olivier Blin <oblin@mandriva.com>
- restore BuildRoot
+ Thierry Vignaud <tv@mandriva.org>
- kill re-definition of %%buildroot on Pixel's request
* Mon Aug 20 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 2.4.4-1mdv2008.0
+ Revision: 68088
- rebuild
* Mon Nov 27 2006 Olivier Blin <oblin@mandriva.com> 2.4.4-1mdv2007.0
+ Revision: 87708
- use common make install for pppoatm plugin
- run lib64 fixes on plugin sub-makefiles as well
- adapt lib64 to latest ppp makefiles
- fix plugins installation
- really enable the dhcp plugin
- remove useless mkdir commands
- use updated mppe-mppc patch (from Michael Gschwandtner)
- drop cve-2006-2194 patch (merged upstream)
- drop passargv patch (merged upstream)
- rediff dontwriteetc patch
- use new INSTROOT variable for make install
- remove lcp_close patch (merged upstream, and our version looks incorrect BTW)
- 2.4.4
- drop merged patch13
* Thu Aug 10 2006 Olivier Blin <oblin@mandriva.com> 2.4.3-12mdv2007.0
+ Revision: 54763
- P23: security fix for CVE-2006-2194 (from Vincent Danen)
- import ppp-2.4.3-11mdv2007.0
* Tue Jul 11 2006 Olivier Blin <oblin@mandriva.com> 2.4.3-11mdv2007.0
- drop ppp-prompt package since it depends on gtk1
(from Crispin Boylan, #23521)
- don't try to uncompress Source6, it's dropped
(and duplicated official tarball parts...)
- drop Patch12, we don't want to build contrib stuff
- don't use pam_stack in pam.d config file
* Wed Jan 11 2006 Christiaan Welvaart <cjw@daneel.dyndns.org> 2.4.3-10mdk
- add BuildRequires: libtool
* Sun Aug 28 2005 Giuseppe Ghibò <ghibo@mandriva.com> 2.4.3-9mdk
- /etc/ppp/peers is not a file, removed from
%%config(noreplace) list.
- Added missed CFLAGS to Patch3 (makeopt) and Patch19.
- Added Patch17 (make room for argv[4]).
- Added Patch18 (fix includes, merged from RH).
- Added Patch20 (don't let install scripts do strip of binaries).
- Added Patch21 (fix some function prototype and include, merged from RH).
- Added Patch22 (add support for higher speeds according to bits/termios.h).
* Sat Aug 06 2005 Olivier Blin <oblin@mandriva.com> 2.4.3-8mdk
- do an lcp_close whenever the link terminates, not just if it
terminates because of an error, this is needed for persist
to work properly (Patch9 from CVS, possible fix for #16748)
- removes Requires on release
* Thu Jul 14 2005 Oden Eriksson <oeriksson@mandriva.com> 2.4.3-7mdk
- rebuilt against new libpcap-0.9.1 (aka. a "play safe" rebuild)
* Fri Jun 03 2005 Pascal Terjan <pterjan@mandriva.org> 2.4.3-6mdk
- allow building with ipv6 support and enable it by default
* Sat Apr 23 2005 Olivier Blin <oblin@mandriva.com> 2.4.3-5mdk
- really use 2.4.3 tarball !
- rediff Patch0, Patch3, Patch5, Patch6, Patch10, Patch12, Patch15
- update man path in Patch12
- drop Patch9, Patch14 (merged upstream)
- use new internal pppoatm (drop Patch7)
- use external libatm for pppoatm (new Patch7)
- drop Patch16 since we use the real ppp-2.4.3 now ...
- drop radiusclient workaround
(no more radiusclient subdir with configure stuff)
- fix install in MANDIR, INCDIR, RUNDIR and LOGDIR
- really install ppp files in etc (Patch16)
- ship pppoe-discovery in ppp-pppoe
- remove spurious man8 dir
* Wed Feb 02 2005 Olivier Blin <oblin@mandrakesoft.com> 2.4.3-4mdk
- do not mark symbolic links as config files (#13090)
- really ship README.pppoatm
* Tue Feb 01 2005 Olivier Blin <blino@mandrake.org> 2.4.3-3mdk
- multiarch support
* Tue Jan 18 2005 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 2.4.3-2mdk
- fix patchlevel (P16), pppd reported versions as 2.4.2 and not 2.4.3
* Mon Jan 17 2005 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 2.4.3-1mdk
- 2.4.3
- update mppe/mppc patch (P11)
- drop P13( merged upstream)
- pppgetpass has been silently dropped from upstream, ship it in own source (S6)
- fix summary-ended-with-dot
- fix cvs-internal-file
* Thu Oct 07 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.4.2-9mdk
- lib64 fixes
* Tue Sep 21 2004 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 2.4.2-8mdk
- build DSO with PIC
- -pie & 64-bit fixes
* Wed Aug 25 2004 Olivier Blin <blino@mandrake.org> 2.4.2-7mdk
- fix infinite loop in pty program kill
* Sat Jun 19 2004 Florin <florin@mandrakesoft.com> 2.4.2-6mdk
- move the prompt program to ppp-prompt package (depends on gtk)
- add resolv.conf and connect-errors files
- the mppe syntax has changed (see the www.polbox.com/h/hs001/ page
for more info on this)
* Fri Jun 18 2004 Christiaan Welvaart <cjw@daneel.dyndns.org> 2.4.2-5mdk
- add BuildRequires: libgtk+-devel
* Thu Jun 17 2004 Florin <florin@mandrakesoft.com> 2.4.2-4mdk
- fix peers permissions
* Sun Jun 13 2004 Florin <florin@mandrakesoft.com> 2.4.2-3mdk
- enable the radius plugin/package
- strip the binary
- add the existing radiusclient files
- spec file cleaning
- add the dhcp plugin (source 5)
- build the password prompt (contrib patch)
* Wed Jun 02 2004 Florin <florin@mandrakesoft.com> 2.4.2-2mdk
- use a different pppoatm patch
* Tue May 25 2004 Florin <florin@mandrakesoft.com> 2.4.2-1mdk
- 2.4.2
- update the make, makeopt, wtmp patch
- remove the pam_session, zfree, mppe, includes, libdir, filter
- pppoe, disconnect, gcc, pcap, varargs obsolete patches
- add the includes files
- add the README.pppoatm FAQ PLUGINS files
- add the logrotate patch and file (rh)
- add the pie, dontwriteetc patches (rh)
* Fri Feb 27 2004 Olivier Thauvin <thauvin@aerov.jussieu.fr> 2.4.1-13mdk
- Own dir (distlint)
- patch31 - fix build against pcap