[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ppp/devel ppp-2.4.3-dontwriteetc.patch, NONE, 1.1 ppp-2.4.3-fix.patch, NONE, 1.1 ppp-2.4.3-fix64.patch, NONE, 1.1 ppp-2.4.3-lib64.patch, NONE, 1.1 ppp-2.4.3-make.patch, NONE, 1.1 ppp-2.4.3-no_strip.patch, NONE, 1.1 ppp-2.4.3-radiusplugin.patch, NONE, 1.1 ppp.spec, 1.27, 1.28



Author: twoerner

Update of /cvs/dist/rpms/ppp/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5895

Modified Files:
	ppp.spec 
Added Files:
	ppp-2.4.3-dontwriteetc.patch ppp-2.4.3-fix.patch 
	ppp-2.4.3-fix64.patch ppp-2.4.3-lib64.patch 
	ppp-2.4.3-make.patch ppp-2.4.3-no_strip.patch 
	ppp-2.4.3-radiusplugin.patch 
Log Message:
[tw]
- new version 2.4.3
  - updated patches: make, lib64, dontwriteetc, fix, fix64, no_strip,
    radiusplugin
  - dropped patches: bpf, signal, pcap, pppoatm, pkgcheck



ppp-2.4.3-dontwriteetc.patch:
 chat/chat.8        |    2 +-
 linux/Makefile.top |   15 +++++++++------
 pppd/pathnames.h   |    4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)

--- NEW FILE ppp-2.4.3-dontwriteetc.patch ---
--- ppp-2.4.3/pppd/pathnames.h.dontwriteetc	2004-11-22 17:44:52.754705241 +0100
+++ ppp-2.4.3/pppd/pathnames.h	2004-11-22 17:44:52.757704830 +0100
@@ -27,9 +27,9 @@
 #define _PATH_AUTHUP	 _ROOT_PATH "/etc/ppp/auth-up"
 #define _PATH_AUTHDOWN	 _ROOT_PATH "/etc/ppp/auth-down"
 #define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
-#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
+#define _PATH_CONNERRS	 _ROOT_PATH "/var/log/ppp/connect-errors"
 #define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
-#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
+#define _PATH_RESOLV	 _ROOT_PATH "/var/run/ppp/resolv.conf"
 
 #define _PATH_USEROPT	 ".ppprc"
 #define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
--- ppp-2.4.3/linux/Makefile.top.dontwriteetc	2004-10-31 23:25:16.000000000 +0100
+++ ppp-2.4.3/linux/Makefile.top	2004-11-22 17:45:55.761067877 +0100
@@ -1,10 +1,9 @@
 # PPP top-level Makefile for Linux.
 
-DESTDIR = @DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-INCDIR = $(DESTDIR)/include
-MANDIR = $(DESTDIR)/share/man
-ETCDIR = @SYSCONF@/ppp
+BINDIR = $(DESTDIR)/usr/sbin
+INCDIR = $(DESTDIR)/usr/include
+MANDIR = $(DESTDIR)/usr/share/man
+ETCDIR = $(DESTDIR)@SYSCONF@/ppp
 
 # uid 0 = root
 INSTALL= install
@@ -16,7 +15,7 @@
 	cd pppstats; $(MAKE) $(MFLAGS) all
 	cd pppdump; $(MAKE) $(MFLAGS) all
 
-install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel
+install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-etcppp install-devel
 
 install-progs:
 	cd chat; $(MAKE) $(MFLAGS) install
@@ -44,6 +43,10 @@
 	$(INSTALL) -d -m 755 $@
 $(ETCDIR):
 	$(INSTALL) -d -m 755 $@
+$(RUNDIR):
+	$(INSTALL) -d -m 755 $@
+$(LOGDIR):
+	$(INSTALL) -d -m 755 $@
 
 clean:
 	rm -f `find . -name '*.[oas]' -print`
--- ppp-2.4.3/chat/chat.8.dontwriteetc	2004-11-13 13:22:49.000000000 +0100
+++ ppp-2.4.3/chat/chat.8	2004-11-22 17:44:52.759704556 +0100
@@ -200,7 +200,7 @@
 at the terminal via standard error.  If \fBchat\fR is being run by
 pppd, and pppd is running as a daemon (detached from its controlling
 terminal), standard error will normally be redirected to the file
-/etc/ppp/connect\-errors.
+/var/log/ppp/connect\-errors.
 .LP
 \fBSAY\fR strings must be enclosed in single or double quotes. If
 carriage return and line feed are needed in the string to be output,

ppp-2.4.3-fix.patch:
 include/linux/if_pppox.h          |    6 +++---
 pppd/ipv6cp.c                     |    5 ++++-
 pppd/plugins/rp-pppoe/discovery.c |    2 ++
 pppdump/bsd-comp.c                |    8 ++++----
 pppdump/deflate.c                 |    5 +++--
 pppdump/pppdump.c                 |    5 +++--
 6 files changed, 19 insertions(+), 12 deletions(-)

--- NEW FILE ppp-2.4.3-fix.patch ---
--- ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c.fix	2004-11-04 11:07:37.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/discovery.c	2004-11-22 16:00:24.522462124 +0100
@@ -13,6 +13,8 @@
 
 #include "pppoe.h"
 
+void warn __P((char *, ...));   /* log a warning message */
+
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif
--- ppp-2.4.3/pppd/ipv6cp.c.fix	2004-11-13 03:28:15.000000000 +0100
+++ ppp-2.4.3/pppd/ipv6cp.c	2004-11-22 16:00:27.049114044 +0100
@@ -151,6 +151,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <netdb.h>
@@ -1064,7 +1065,9 @@
     return (rc);			/* Return final code */
 }
 
-
+#if defined(SOL2) || defined(__linux__)
+int ether_to_eui64(eui64_t *p_eui64);
+#endif
 /*
  * ipv6_check_options - check that any IP-related options are OK,
  * and assign appropriate defaults.
--- ppp-2.4.3/include/linux/if_pppox.h.fix	2001-12-15 01:34:24.000000000 +0100
+++ ppp-2.4.3/include/linux/if_pppox.h	2004-11-22 16:00:27.049114044 +0100
@@ -18,7 +18,7 @@
 
 
 #include <asm/types.h>
-#include <asm/byteorder.h>
+#include <endian.h>
 
 #ifdef  __KERNEL__
 #include <linux/if_ether.h>
@@ -97,10 +97,10 @@
 #define PTT_GEN_ERR  	__constant_htons(0x0203)
 
 struct pppoe_hdr {
-#if defined(__LITTLE_ENDIAN_BITFIELD)
+#if __BYTE_ORDER == __LITTLE_ENDIAN
 	__u8 ver : 4;
 	__u8 type : 4;
-#elif defined(__BIG_ENDIAN_BITFIELD)
+#elif __BYTE_ORDER == __BIG_ENDIAN
 	__u8 type : 4;
 	__u8 ver : 4;
 #else
--- ppp-2.4.3/pppdump/deflate.c.fix	2004-02-02 04:36:46.000000000 +0100
+++ ppp-2.4.3/pppdump/deflate.c	2004-11-22 16:02:18.071820020 +0100
@@ -39,6 +39,7 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "ppp_defs.h"
@@ -237,8 +238,8 @@
 {
     struct deflate_state *state = (struct deflate_state *) arg;
     u_char *rptr, *wptr;
-    int rlen, olen, ospace;
-    int seq, i, flush, r, decode_proto;
+    int rlen, olen;
+    int seq, r;
 
     rptr = mi;
     if (*rptr == 0)
--- ppp-2.4.3/pppdump/bsd-comp.c.fix	2004-02-02 04:36:46.000000000 +0100
+++ ppp-2.4.3/pppdump/bsd-comp.c	2004-11-22 16:00:27.052113631 +0100
@@ -383,7 +383,7 @@
 	|| options[0] != CI_BSD_COMPRESS || options[1] != CILEN_BSD_COMPRESS
 	|| BSD_VERSION(options[2]) != BSD_CURRENT_VERSION
 	|| BSD_NBITS(options[2]) != db->maxbits
-	|| decomp && db->lens == NULL)
+	|| (decomp && db->lens == NULL))
 	return 0;
 
     if (decomp) {
@@ -556,11 +556,11 @@
     u_int n_bits = db->n_bits;
     u_int tgtbitno = 32-n_bits;	/* bitno when we have a code */
     struct bsd_dict *dictp;
-    int explen, i, seq, len;
+    int explen, seq, len;
     u_int incode, oldcode, finchar;
     u_char *p, *rptr, *wptr;
     int ilen;
-    int dlen, space, codelen, extra;
+    int dlen=0, codelen, extra;
 
     rptr = cmsg;
     if (*rptr == 0)
@@ -616,7 +616,7 @@
 	}
 
 	if (incode > max_ent + 2 || incode > db->maxmaxcode
-	    || incode > max_ent && oldcode == CLEAR) {
+	    || (incode > max_ent && oldcode == CLEAR)) {
 	    if (db->debug) {
 		printf("bsd_decomp%d: bad code 0x%x oldcode=0x%x ",
 		       db->unit, incode, oldcode);
--- ppp-2.4.3/pppdump/pppdump.c.fix	2004-02-02 04:36:46.000000000 +0100
+++ ppp-2.4.3/pppdump/pppdump.c	2004-11-22 16:00:27.054113356 +0100
@@ -34,6 +34,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <time.h>
@@ -191,7 +192,7 @@
 	    show_time(f, c);
 	    break;
 	default:
-	    printf("?%.2x\n");
+	    printf("?%.2x\n", c);
 	}
     }
 }
@@ -421,7 +422,7 @@
 	    show_time(f, c);
 	    break;
 	default:
-	    printf("?%.2x\n");
+	    printf("?%.2x\n", c);
 	}
     }
 }

ppp-2.4.3-fix64.patch:
 sha1.c |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE ppp-2.4.3-fix64.patch ---
--- ppp-2.4.3/pppd/sha1.c.fix64	2004-10-25 01:28:02.000000000 +0200
+++ ppp-2.4.3/pppd/sha1.c	2004-11-22 16:44:16.850768926 +0100
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <netinet/in.h>	/* htonl() */
+#include <sys/types.h>	/* u_int32_t */
 #include "sha1.h"
 
 static void

ppp-2.4.3-lib64.patch:
 Makefile.linux         |   12 ++++++------
 pathnames.h            |    2 +-
 plugins/Makefile.linux |    7 +++----
 3 files changed, 10 insertions(+), 11 deletions(-)

--- NEW FILE ppp-2.4.3-lib64.patch ---
--- ppp-2.4.3/pppd/Makefile.linux.lib64	2004-11-22 17:07:26.486824492 +0100
+++ ppp-2.4.3/pppd/Makefile.linux	2004-11-22 17:21:43.935247758 +0100
@@ -4,10 +4,10 @@
 #
 
 # Default installation locations
-DESTDIR = @DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
-INCDIR = $(DESTDIR)/include
+BINDIR = $(DESTDIR)/usr/sbin
+MANDIR = $(DESTDIR)/usr/share/man/man8
+INCDIR = $(DESTDIR)/usr/include
+LIBDIR = $(DESTDIR)/usr/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)
 
 TARGETS = pppd
 
@@ -32,7 +32,7 @@
 
 CC = gcc
 #
-COPTS = -Wall $(RPM_OPT_FLAGS)
+COPTS = -Wall $(RPM_OPT_FLAGS) -DLIBDIR=\""$(LIBDIR)"\"
 LIBS = -lutil
 
 # Uncomment the next 2 lines to include support for Microsoft's
@@ -120,7 +120,7 @@
 ifneq ($(wildcard /usr/include/crypt.h),)
 CFLAGS   += -DHAVE_CRYPT_H=1
 endif
-ifneq ($(wildcard /usr/lib/libcrypt.*),)
+ifneq ($(wildcard $(LIBDIR)/libcrypt.*),)
 LIBS	+= -lcrypt
 endif
 
--- ppp-2.4.3/pppd/plugins/Makefile.linux.lib64	2004-11-22 17:07:26.435831502 +0100
+++ ppp-2.4.3/pppd/plugins/Makefile.linux	2004-11-22 17:25:24.649975243 +0100
@@ -4,10 +4,9 @@
 LDFLAGS	= -shared
 INSTALL	= install
 
-DESTDIR = @DESTDIR@
-BINDIR = $(DESTDIR)/sbin
-MANDIR = $(DESTDIR)/share/man/man8
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+BINDIR = $(DESTDIR)/usr/sbin
+MANDIR = $(DESTDIR)/usr/share/man/man8
+LIBDIR = $(DESTDIR)/usr/lib/$(shell $(CC) -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
 
 SUBDIRS := rp-pppoe pppoatm radius
 # Uncomment the next line to include the radius authentication plugin
--- ppp-2.4.3/pppd/pathnames.h.lib64	2004-11-13 13:02:22.000000000 +0100
+++ ppp-2.4.3/pppd/pathnames.h	2004-11-22 17:07:26.459828203 +0100
@@ -55,5 +55,5 @@
 #endif /* __STDC__ */
 
 #ifdef PLUGIN
-#define _PATH_PLUGIN	"/usr/lib/pppd/" VERSION
+#define _PATH_PLUGIN	LIBDIR "/pppd/" VERSION
 #endif /* PLUGIN */

ppp-2.4.3-make.patch:
 chat/Makefile.linux                  |    2 +-
 pppd/Makefile.linux                  |   10 +++++-----
 pppd/plugins/Makefile.linux          |    2 +-
 pppd/plugins/radius/Makefile.linux   |    2 +-
 pppd/plugins/rp-pppoe/Makefile.linux |    2 +-
 pppdump/Makefile.linux               |    2 +-
 pppstats/Makefile.linux              |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

--- NEW FILE ppp-2.4.3-make.patch ---
--- ppp-2.4.3/pppd/Makefile.linux.make	2004-11-13 13:02:22.000000000 +0100
+++ ppp-2.4.3/pppd/Makefile.linux	2004-11-22 15:46:49.871309478 +0100
@@ -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,8 +61,8 @@
 USE_TDB=y
 
 HAS_SHADOW=y
-#USE_PAM=y
-#HAVE_INET6=y
+USE_PAM=y
+HAVE_INET6=y
 
 # Enable plugins
 PLUGIN=y
--- ppp-2.4.3/pppd/plugins/Makefile.linux.make	2004-11-14 08:57:35.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/Makefile.linux	2004-11-22 15:46:49.873309203 +0100
@@ -1,5 +1,5 @@
 CC	= gcc
-COPTS	= -O2 -g
+COPTS	= $(RPM_OPT_FLAGS)
 CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
 LDFLAGS	= -shared
 INSTALL	= install
--- ppp-2.4.3/pppd/plugins/radius/Makefile.linux.make	2004-11-14 08:02:31.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2004-11-22 15:49:08.858233692 +0100
@@ -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) -DRC_LOG_FACILITY=LOG_DAEMON
 
 # Uncomment the next line to include support for Microsoft's
 # MS-CHAP authentication protocol.
--- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.make	2004-11-14 08:58:37.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-22 15:46:49.875308929 +0100
@@ -24,7 +24,7 @@
 # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
 VERSION=3.3
 
-COPTS=-O2 -g
+COPTS=$(RPM_OPT_FLAGS)
 CFLAGS=$(COPTS) -I../../../include/linux
 all: rp-pppoe.so pppoe-discovery
 
--- ppp-2.4.3/pppdump/Makefile.linux.make	2004-10-31 02:36:52.000000000 +0200
+++ ppp-2.4.3/pppdump/Makefile.linux	2004-11-22 15:48:16.795379237 +0100
@@ -2,7 +2,7 @@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 
-CFLAGS= -O -I../include/net
+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
 OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
 
 INSTALL= install
--- ppp-2.4.3/pppstats/Makefile.linux.make	2004-10-31 23:09:03.000000000 +0100
+++ ppp-2.4.3/pppstats/Makefile.linux	2004-11-22 15:46:49.872309341 +0100
@@ -10,7 +10,7 @@
 PPPSTATOBJS = pppstats.o
 
 #CC = gcc
-COPTS = -O
+COPTS = $(RPM_OPT_FLAGS)
 COMPILE_FLAGS = -I../include
 LIBS =
 
--- ppp-2.4.3/chat/Makefile.linux.make	2004-11-03 12:51:47.000000000 +0100
+++ ppp-2.4.3/chat/Makefile.linux	2004-11-22 15:47:59.445760450 +0100
@@ -10,7 +10,7 @@
 CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
 CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
 
-COPTS=	-O2 -g -pipe
+COPTS=	$(RPM_OPT_FLAGS)
 CFLAGS=	$(COPTS) $(CDEFS)
 
 INSTALL= install

ppp-2.4.3-no_strip.patch:
 chat/Makefile.linux                       |    2 +-
 chat/Makefile.linux.make                  |    2 +-
 pppd/Makefile.linux                       |    4 ++--
 pppd/Makefile.linux.lib64                 |    4 ++--
 pppd/Makefile.linux.make                  |    4 ++--
 pppd/Makefile.linux.pie                   |    4 ++--
 pppd/plugins/radius/Makefile.linux        |    6 +++---
 pppd/plugins/radius/Makefile.linux.make   |    6 +++---
 pppd/plugins/rp-pppoe/Makefile.linux      |    4 ++--
 pppd/plugins/rp-pppoe/Makefile.linux.make |    4 ++--
 pppdump/Makefile.linux                    |    2 +-
 pppdump/Makefile.linux.make               |    2 +-
 pppstats/Makefile.linux                   |    2 +-
 pppstats/Makefile.linux.make              |    2 +-
 14 files changed, 24 insertions(+), 24 deletions(-)

--- NEW FILE ppp-2.4.3-no_strip.patch ---
--- ppp-2.4.3/pppd/Makefile.linux.make.no_strip	2004-11-13 13:02:22.000000000 +0100
+++ ppp-2.4.3/pppd/Makefile.linux.make	2004-11-22 16:49:31.003688141 +0100
@@ -99,7 +99,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -202,7 +202,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
--- ppp-2.4.3/pppd/Makefile.linux.no_strip	2004-11-22 16:49:30.985690610 +0100
+++ ppp-2.4.3/pppd/Makefile.linux	2004-11-22 16:49:31.004688004 +0100
@@ -100,7 +100,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -203,7 +203,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
--- ppp-2.4.3/pppd/plugins/radius/Makefile.linux.make.no_strip	2004-11-14 08:02:31.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux.make	2004-11-22 16:50:29.165709494 +0100
@@ -36,9 +36,9 @@
 
 install: all
 	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
 
--- ppp-2.4.3/pppd/plugins/radius/Makefile.linux.no_strip	2004-11-22 16:49:30.955694723 +0100
+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux	2004-11-22 16:50:48.707021813 +0100
@@ -36,9 +36,9 @@
 
 install: all
 	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radius.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radattr.so $(LIBDIR)
+	$(INSTALL) -c -m 755 radrealms.so $(LIBDIR)
 	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)
 	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
 
--- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.make.no_strip	2004-11-14 08:58:37.000000000 +0100
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.make	2004-11-22 16:51:07.550430148 +0100
@@ -39,9 +39,9 @@
 
 install: all
 	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
 	$(INSTALL) -d -m 755 $(BINDIR)
-	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
 
 clean:
 	rm -f *.o *.so
--- ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux.no_strip	2004-11-22 16:49:30.956694586 +0100
+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux	2004-11-22 16:51:25.891907542 +0100
@@ -39,9 +39,9 @@
 
 install: all
 	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
+	$(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
 	$(INSTALL) -d -m 755 $(BINDIR)
-	$(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
+	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
 
 clean:
 	rm -f *.o *.so
--- ppp-2.4.3/pppd/Makefile.linux.lib64.no_strip	2004-11-22 16:49:30.954694860 +0100
+++ ppp-2.4.3/pppd/Makefile.linux.lib64	2004-11-22 16:49:31.010687182 +0100
@@ -99,7 +99,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -202,7 +202,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	$(INSTALL) -c -m 555 pppd $(BINDIR)/pppd
 	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
 	  chmod o-rx,u+s $(BINDIR)/pppd; fi
 	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
--- ppp-2.4.3/pppd/Makefile.linux.pie.no_strip	2004-11-22 16:49:30.976691844 +0100
+++ ppp-2.4.3/pppd/Makefile.linux.pie	2004-11-22 16:49:31.011687044 +0100
@@ -100,7 +100,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -203,7 +203,7 @@
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
+	$(INSTALL) -c -m 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.make.no_strip	2004-10-31 02:36:52.000000000 +0200
+++ ppp-2.4.3/pppdump/Makefile.linux.make	2004-11-22 16:51:49.400674286 +0100
@@ -17,5 +17,5 @@
 
 install:
 	mkdir -p $(BINDIR) $(MANDIR)
-	$(INSTALL) -s -c pppdump $(BINDIR)
+	$(INSTALL) -c pppdump $(BINDIR)
 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
--- ppp-2.4.3/pppdump/Makefile.linux.no_strip	2004-11-22 16:49:30.956694586 +0100
+++ ppp-2.4.3/pppdump/Makefile.linux	2004-11-22 16:52:01.400023982 +0100
@@ -17,5 +17,5 @@
 
 install:
 	mkdir -p $(BINDIR) $(MANDIR)
-	$(INSTALL) -s -c pppdump $(BINDIR)
+	$(INSTALL) -c pppdump $(BINDIR)
 	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)
--- ppp-2.4.3/pppstats/Makefile.linux.make.no_strip	2004-10-31 23:09:03.000000000 +0100
+++ ppp-2.4.3/pppstats/Makefile.linux.make	2004-11-22 16:52:16.654925950 +0100
@@ -22,7 +22,7 @@
 
 install: pppstats
 	-mkdir -p $(MANDIR)
-	$(INSTALL) -s -c pppstats $(BINDIR)
+	$(INSTALL) -c pppstats $(BINDIR)
 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
 
 pppstats: $(PPPSTATSRCS)
--- ppp-2.4.3/pppstats/Makefile.linux.no_strip	2004-11-22 16:49:30.957694449 +0100
+++ ppp-2.4.3/pppstats/Makefile.linux	2004-11-22 16:52:30.028086736 +0100
@@ -22,7 +22,7 @@
 
 install: pppstats
 	-mkdir -p $(MANDIR)
-	$(INSTALL) -s -c pppstats $(BINDIR)
+	$(INSTALL) -c pppstats $(BINDIR)
 	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
 
 pppstats: $(PPPSTATSRCS)
--- ppp-2.4.3/chat/Makefile.linux.make.no_strip	2004-11-03 12:51:47.000000000 +0100
+++ ppp-2.4.3/chat/Makefile.linux.make	2004-11-22 16:52:43.229271186 +0100
@@ -25,7 +25,7 @@
 
 install: chat
 	mkdir -p $(BINDIR)
-	$(INSTALL) -s -c chat $(BINDIR)
+	$(INSTALL) -c chat $(BINDIR)
 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
 
 clean:
--- ppp-2.4.3/chat/Makefile.linux.no_strip	2004-11-22 16:49:30.986690472 +0100
+++ ppp-2.4.3/chat/Makefile.linux	2004-11-22 16:53:02.913564043 +0100
@@ -25,7 +25,7 @@
 
 install: chat
 	mkdir -p $(BINDIR)
-	$(INSTALL) -s -c chat $(BINDIR)
+	$(INSTALL) -c chat $(BINDIR)
 	$(INSTALL) -c -m 644 chat.8 $(MANDIR)
 
 clean:

ppp-2.4.3-radiusplugin.patch:
 Makefile.linux |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ppp-2.4.3-radiusplugin.patch ---
--- ppp-2.4.3/pppd/plugins/Makefile.linux.radiusplugin	2005-02-11 18:05:18.722727634 +0100
+++ ppp-2.4.3/pppd/plugins/Makefile.linux	2005-02-11 18:06:06.216234854 +0100
@@ -10,7 +10,7 @@
 
 SUBDIRS := rp-pppoe pppoatm radius
 # Uncomment the next line to include the radius authentication plugin
-# SUBDIRS += radius
+SUBDIRS += radius
 PLUGINS := minconn.so passprompt.so passwordfd.so winbind.so
 
 # include dependencies if present


Index: ppp.spec
===================================================================
RCS file: /cvs/dist/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ppp.spec	2 Nov 2004 14:55:59 -0000	1.27
+++ ppp.spec	18 Jul 2005 11:55:02 -0000	1.28
@@ -1,31 +1,27 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
-Version: 2.4.2
-Release: 7
+Version: 2.4.3
+Release: 1
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
 Source1: ppp-2.3.5-pamd.conf
 Source2: ppp.logrotate
-Patch0: ppp-2.4.2-make.patch
+Patch0: ppp-2.4.3-make.patch
 Patch1: ppp-2.3.6-sample.patch
 Patch2: ppp-2.4.2-libutil.patch
 Patch3: ppp-2.4.1-varargs.patch
-Patch4: ppp-2.4.2-lib64.patch
-Patch5: ppp-2.4.2-bpf.patch
-Patch6: ppp-2.4.2-dontwriteetc.patch
+Patch4: ppp-2.4.3-lib64.patch
+Patch6: ppp-2.4.3-dontwriteetc.patch
 Patch7: ppp-2.4.2-pie.patch
-Patch8: ppp-2.4.2-fix.patch
-Patch9: ppp-2.4.2-fix64.patch
-Patch10: ppp-2.4.2-signal.patch
+Patch8: ppp-2.4.3-fix.patch
+Patch9: ppp-2.4.3-fix64.patch
 Patch11: ppp-2.4.2-change_resolv_conf.patch
-Patch12: ppp-2.4.2-pcap.patch
-Patch13: ppp-2.4.2-no_strip.patch
+Patch13: ppp-2.4.3-no_strip.patch
 Patch14: ppp-2.4.2-argv.patch
-Patch15: ppp-2.4.2-pppoatm.patch
 Patch16: ppp-2.4.2-pppoatm-mtu.patch
 Patch17: ppp-2.4.2-pppoatm-make.patch
-Patch18: ppp-2.4.1-pkgcheck.patch
+Patch18: ppp-2.4.3-radiusplugin.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: pam-devel, libpcap
@@ -47,20 +43,16 @@
 %patch3 -p1 -b .varargs
 # patch 4 depends on the -lutil in patch 0
 %patch4 -p1 -b .lib64
-%patch5 -p1 -b .bpf
 %patch6 -p1 -b .dontwriteetc
 %patch7 -p1 -b .pie
 %patch8 -p1 -b .fix
 %patch9 -p1 -b .fix64
-%patch10 -p1 -b .signal
 %patch11 -p1 -b .change_resolv_conf
-%patch12 -p1 -b .pcap
 %patch13 -p1 -b .no_strip
 %patch14 -p1 -b .argv
-%patch15 -p1 -b .atm
 %patch16 -p1 -b .atm-mtu
 %patch17 -p1 -b .atm-make
-%patch18 -p1 -b .pkgcheck
+%patch18 -p1 -b .radiusplugin
 
 
 find . -type f -name "*.sample" | xargs rm -f 
@@ -73,7 +65,7 @@
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT%{_mandir} BINDIR=$RPM_BUILD_ROOT%{_sbindir}
+make install DESTDIR=$RPM_BUILD_ROOT MANDIR=$RPM_BUILD_ROOT%{_mandir}/man8 BINDIR=$RPM_BUILD_ROOT%{_sbindir} LIBDIR=$RPM_BUILD_ROOT%{_libdir}/pppd/%{version}/
 
 ## it shouldn't be SUID root be default
 #chmod 755 $RPM_BUILD_ROOT/usr/sbin/pppd
@@ -85,8 +77,8 @@
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ppp
 
 # Provide pointers for people who expect stuff in old places
-ln -s ../../var/log/ppp/connect-errors $RPM_BUILD_ROOT/etc/ppp/connect-errors
-ln -s ../../var/run/ppp/resolv.conf $RPM_BUILD_ROOT/etc/ppp/resolv.conf
+mkdir -p $RPM_BUILD_ROOT/var/log/ppp
+mkdir -p $RPM_BUILD_ROOT/var/run/ppp
 
 # Logrotate script
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
@@ -100,10 +92,13 @@
 %{_sbindir}/chat
 %{_sbindir}/pppd
 %{_sbindir}/pppdump
+%{_sbindir}/pppoe-discovery
 %{_sbindir}/pppstats
 %{_mandir}/man8/chat.8*
 %{_mandir}/man8/pppd.8*
 %{_mandir}/man8/pppdump.8*
+%{_mandir}/man8/pppd-radattr.8*
+%{_mandir}/man8/pppd-radius.8*
 %{_mandir}/man8/pppstats.8*
 %{_includedir}/pppd
 %{_libdir}/pppd
@@ -119,6 +114,12 @@
 
 
 %changelog
+* Mon Jul 18 2005 Thomas Woerner <twoerner redhat com> 2.4.3-1
+- new version 2.4.3
+  - updated patches: make, lib64, dontwriteetc, fix, fix64, no_strip,
+    radiusplugin
+  - dropped patches: bpf, signal, pcap, pppoatm, pkgcheck
+
 * Tue Nov  2 2004 Thomas Woerner <twoerner redhat com> 2.4.2-7
 - fixed out of bounds memory access, possible DOS
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]