rpms/ppp/devel .cvsignore, 1.7, 1.8 ppp-2.4.2-pppoatm-make.patch, 1.2, 1.3 ppp-2.4.3-fix.patch, 1.1, 1.2 ppp-2.4.3-fix64.patch, 1.1, 1.2 ppp-2.4.3-make.patch, 1.1, 1.2 ppp-2.4.4-lib64.patch, 1.2, 1.3 ppp.spec, 1.52, 1.53 sources, 1.7, 1.8 ppp-2.4.2-pppoatm-mtu.patch, 1.1, NONE ppp-2.4.4-bogus_dns_addr.patch, 1.1, NONE ppp-2.4.4-closelog.patch, 1.1, NONE ppp-2.4.4-new_speeds.patch, 1.1, NONE ppp-2.4.4-response_len.patch, 1.1, NONE
Jiri Skala
jskala at fedoraproject.org
Sun Nov 22 08:01:19 UTC 2009
Author: jskala
Update of /cvs/extras/rpms/ppp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15629
Modified Files:
.cvsignore ppp-2.4.2-pppoatm-make.patch ppp-2.4.3-fix.patch
ppp-2.4.3-fix64.patch ppp-2.4.3-make.patch
ppp-2.4.4-lib64.patch ppp.spec sources
Removed Files:
ppp-2.4.2-pppoatm-mtu.patch ppp-2.4.4-bogus_dns_addr.patch
ppp-2.4.4-closelog.patch ppp-2.4.4-new_speeds.patch
ppp-2.4.4-response_len.patch
Log Message:
* Fri Nov 20 2009 Jiri Skala <jskala at redhat.com> - 2.4.5-1
- updated to latest upstream sources (#538058)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 24 Jul 2006 18:09:31 -0000 1.7
+++ .cvsignore 22 Nov 2009 08:01:15 -0000 1.8
@@ -1,3 +1 @@
-ppp-2.4.2.tar.gz
-ppp-2.4.3.tar.gz
-ppp-2.4.4.tar.gz
+ppp-2.4.5.tar.gz
ppp-2.4.2-pppoatm-make.patch:
Makefile.linux | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: ppp-2.4.2-pppoatm-make.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.2-pppoatm-make.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ppp-2.4.2-pppoatm-make.patch 28 Aug 2008 21:44:37 -0000 1.2
+++ ppp-2.4.2-pppoatm-make.patch 22 Nov 2009 08:01:15 -0000 1.3
@@ -2,7 +2,7 @@ diff -up ppp-2.4.4/pppd/plugins/pppoatm/
--- ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux.atm-make 2008-08-28 17:36:10.000000000 -0400
+++ ppp-2.4.4/pppd/plugins/pppoatm/Makefile.linux 2008-08-28 17:36:56.000000000 -0400
@@ -1,5 +1,5 @@
- CC = gcc
+ #CC = gcc
-COPTS = -O2 -g
+COPTS = $(RPM_OPT_FLAGS)
CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
ppp-2.4.3-fix.patch:
pppd/ipv6cp.c | 5 ++++-
pppd/plugins/rp-pppoe/discovery.c | 2 ++
pppdump/bsd-comp.c | 8 ++++----
pppdump/deflate.c | 5 +++--
pppdump/pppdump.c | 5 +++--
5 files changed, 16 insertions(+), 9 deletions(-)
Index: ppp-2.4.3-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.3-fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.3-fix.patch 18 Jul 2005 11:55:02 -0000 1.1
+++ ppp-2.4.3-fix.patch 22 Nov 2009 08:01:16 -0000 1.2
@@ -1,14 +1,14 @@
--- 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"
+ #include "pppd/pppd.h"
+void warn __P((char *, ...)); /* log a warning message */
+
- #ifdef HAVE_SYSLOG_H
- #include <syslog.h>
- #endif
+ #include <string.h>
+ #include <stdlib.h>
+ #include <errno.h>
--- 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 @@
@@ -30,30 +30,6 @@
/*
* 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 @@
ppp-2.4.3-fix64.patch:
sha1.c | 1 +
1 file changed, 1 insertion(+)
Index: ppp-2.4.3-fix64.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.3-fix64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.3-fix64.patch 18 Jul 2005 11:55:02 -0000 1.1
+++ ppp-2.4.3-fix64.patch 22 Nov 2009 08:01:16 -0000 1.2
@@ -5,6 +5,6 @@
#include <string.h>
#include <netinet/in.h> /* htonl() */
+#include <sys/types.h> /* u_int32_t */
+ #include <net/ppp_defs.h>
#include "sha1.h"
- static void
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(-)
Index: ppp-2.4.3-make.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.3-make.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ppp-2.4.3-make.patch 18 Jul 2005 11:55:02 -0000 1.1
+++ ppp-2.4.3-make.patch 22 Nov 2009 08:01:16 -0000 1.2
@@ -28,7 +28,7 @@
--- 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
+ #CC = gcc
-COPTS = -O2 -g
+COPTS = $(RPM_OPT_FLAGS)
CFLAGS = $(COPTS) -I.. -I../../include -fPIC
@@ -47,13 +47,13 @@
# 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 @@
+@@ -25,7 +25,7 @@
# Version is set ONLY IN THE MAKEFILE! Don't delete this!
- VERSION=3.3
+ RP_VERSION=3.8p
-COPTS=-O2 -g
+COPTS=$(RPM_OPT_FLAGS)
- CFLAGS=$(COPTS) -I../../../include/linux
+ CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
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.4-lib64.patch:
Makefile.linux | 3 ++-
pathnames.h | 2 +-
plugins/Makefile.linux | 2 +-
plugins/pppoatm/Makefile.linux | 4 ++--
plugins/radius/Makefile.linux | 2 +-
plugins/rp-pppoe/Makefile.linux | 2 +-
6 files changed, 8 insertions(+), 7 deletions(-)
Index: ppp-2.4.4-lib64.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.4-lib64.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ppp-2.4.4-lib64.patch 24 Jul 2006 18:51:38 -0000 1.2
+++ ppp-2.4.4-lib64.patch 22 Nov 2009 08:01:16 -0000 1.3
@@ -26,7 +26,7 @@
#***********************************************************************
--DESTDIR = @DESTDIR@
+-DESTDIR = $(INSTROOT)@DESTDIR@
-LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
+DESTDIR = $(INSTROOT)@DESTDIR@
+LIBDIR = $(DESTDIR)/lib/$(shell gcc -print-multi-os-directory 2> /dev/null)/pppd/$(VERSION)
Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- ppp.spec 8 Oct 2009 11:48:02 -0000 1.52
+++ ppp.spec 22 Nov 2009 08:01:17 -0000 1.53
@@ -1,7 +1,7 @@
Summary: The PPP (Point-to-Point Protocol) daemon.
Name: ppp
-Version: 2.4.4
-Release: 14%{?dist}
+Version: 2.4.5
+Release: 1%{?dist}
License: BSD and LGPLv2+ and GPLv2+ and Public Domain
Group: System Environment/Daemons
URL: http://www.samba.org/ppp
@@ -18,17 +18,12 @@ Patch8: ppp-2.4.3-fix.patch
Patch9: ppp-2.4.3-fix64.patch
Patch11: ppp-2.4.2-change_resolv_conf.patch
Patch13: ppp-2.4.4-no_strip.patch
-Patch16: ppp-2.4.2-pppoatm-mtu.patch
Patch17: ppp-2.4.2-pppoatm-make.patch
Patch19: ppp-2.4.3-local.patch
Patch20: ppp-2.4.3-ipv6-accept-remote.patch
Patch21: ppp-2.4.3-usepeerdns-var_run_ppp_resolv.conf.patch
Patch22: ppp-2.4.4-cbcp.patch
Patch23: ppp-2.4.2-dontwriteetc.patch
-Patch24: ppp-2.4.4-closelog.patch
-Patch25: ppp-2.4.4-response_len.patch
-Patch26: ppp-2.4.4-new_speeds.patch
-Patch27: ppp-2.4.4-bogus_dns_addr.patch
BuildRoot: %{_tmppath}/%{name}-root
BuildPrereq: pam-devel, libpcap-devel
@@ -62,17 +57,12 @@ This package contains the header files f
%patch9 -p1 -b .fix64
%patch11 -p1 -b .change_resolv_conf
%patch13 -p1 -b .no_strip
-%patch16 -p1 -b .atm-mtu
%patch17 -p1 -b .atm-make
%patch19 -p1 -b .local
%patch20 -p1 -b .ipv6cp
%patch21 -p1 -b .usepeerdns-var_run_ppp_resolv
%patch22 -p1 -b .cbcp
%patch23 -p1 -b .dontwriteetc
-%patch24 -p1 -b .closelog
-%patch25 -p1 -b .response_len
-%patch26 -p1 -b .new_speeds
-%patch27 -p1 -b .bogus_dns_addr
rm -f scripts/*.local
rm -f scripts/*.change_resolv_conf
@@ -137,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
%doc PLUGINS
%changelog
+* Fri Nov 20 2009 Jiri Skala <jskala at redhat.com> - 2.4.5-1
+- updated to latest upstream sources (#538058)
+
* Thu Oct 08 2009 Jiri Skala <jskala at redhat.com> - 2.4.4-14
- fixed #519042 - ppp package is missing URL in spec
- fixed #524575 - ppp: no_strip patch modifies backup files created by previous patches
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 24 Jul 2006 18:09:32 -0000 1.7
+++ sources 22 Nov 2009 08:01:17 -0000 1.8
@@ -1,2 +1 @@
-848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz
-183800762e266132218b204dfb428d29 ppp-2.4.4.tar.gz
+4621bc56167b6953ec4071043fe0ec57 ppp-2.4.5.tar.gz
--- ppp-2.4.2-pppoatm-mtu.patch DELETED ---
--- ppp-2.4.4-bogus_dns_addr.patch DELETED ---
--- ppp-2.4.4-closelog.patch DELETED ---
--- ppp-2.4.4-new_speeds.patch DELETED ---
--- ppp-2.4.4-response_len.patch DELETED ---
More information about the fedora-extras-commits
mailing list