packages: ppp/ppp-lib64.patch, ppp/ppp-make.patch, ppp/ppp.spec, ppp/ppp-rp...

arekm arekm at pld-linux.org
Sun May 23 20:05:38 CEST 2010 

Author: arekm                        Date: Sun May 23 18:05:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.4.5

---- Files affected:
packages/ppp:
   ppp-lib64.patch (1.3 -> 1.4) , ppp-make.patch (1.19 -> 1.20) , ppp.spec (1.145 -> 1.146) , ppp-rp-pppoe-update.patch (1.5 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/ppp/ppp-lib64.patch
diff -u packages/ppp/ppp-lib64.patch:1.3 packages/ppp/ppp-lib64.patch:1.4
--- packages/ppp/ppp-lib64.patch:1.3	Sun Jul  9 13:35:54 2006
+++ packages/ppp/ppp-lib64.patch	Sun May 23 20:05:32 2010
@@ -31,7 +31,7 @@
 @@ -7,7 +7,7 @@
  #***********************************************************************
  
- DESTDIR = @DESTDIR@
+ DESTDIR = $(INSTROOT)@DESTDIR@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 +LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
  

================================================================
Index: packages/ppp/ppp-make.patch
diff -u packages/ppp/ppp-make.patch:1.19 packages/ppp/ppp-make.patch:1.20
--- packages/ppp/ppp-make.patch:1.19	Fri Aug  4 03:15:31 2006
+++ packages/ppp/ppp-make.patch	Sun May 23 20:05:32 2010
@@ -71,7 +71,7 @@
 --- ppp-2.4.4.orig/pppd/plugins/Makefile.linux	2006-06-04 07:04:14.000000000 +0200
 +++ ppp-2.4.4.make/pppd/plugins/Makefile.linux	2006-08-04 03:12:23.000000000 +0200
 @@ -1,7 +1,7 @@
- CC	= gcc
+ #CC	= gcc
 -COPTS	= -O2 -g
 +COPTS	= $(OPT_FLAGS) -g
  CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
@@ -134,33 +134,38 @@
 diff -Nur ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.4.make/pppd/plugins/rp-pppoe/Makefile.linux
 --- ppp-2.4.4.orig/pppd/plugins/rp-pppoe/Makefile.linux	2006-06-04 07:07:46.000000000 +0200
 +++ ppp-2.4.4.make/pppd/plugins/rp-pppoe/Makefile.linux	2006-08-04 03:14:35.000000000 +0200
-@@ -24,22 +24,22 @@
+@@ -25,12 +25,12 @@
  # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
- VERSION=3.3
+ RP_VERSION=3.8p
  
 -COPTS=-O2 -g
 +COPTS=$(OPT_FLAGS) -g
- CFLAGS=$(COPTS) -I../../../include/linux
+ CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
  all: rp-pppoe.so pppoe-discovery
  
- pppoe-discovery: libplugin.a pppoe-discovery.o
--	$(CC) -o pppoe-discovery pppoe-discovery.o libplugin.a
-+	$(CC) $(OPTLDFLAGS) -o pppoe-discovery pppoe-discovery.o libplugin.a
+ pppoe-discovery: pppoe-discovery.o debug.o
+-	$(CC) -o pppoe-discovery pppoe-discovery.o debug.o
++	$(CC) $(OPTLDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o
  
  pppoe-discovery.o: pppoe-discovery.c
- 	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c
- 
- rp-pppoe.so: libplugin.a plugin.o
--	$(CC) -o rp-pppoe.so -shared plugin.o libplugin.a
-+	$(CC) $(OPTLDFLAGS) -o rp-pppoe.so -shared plugin.o libplugin.a
+ 	$(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
+@@ -39,13 +39,13 @@
+ 	$(CC) $(CFLAGS) -c -o debug.o debug.c
+ 
+ rp-pppoe.so: plugin.o discovery.o if.o common.o
+-	$(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
++	$(CC) $(OPTLDFLAGS) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
  
  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) -s -c -m 555 pppoe-discovery $(BINDIR)
++	$(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
  
+ clean:
+ 	rm -f *.o *.so pppoe-discovery
 diff -Nur ppp-2.4.4.orig/pppdump/Makefile.linux ppp-2.4.4.make/pppdump/Makefile.linux
 --- ppp-2.4.4.orig/pppdump/Makefile.linux	2006-06-04 07:04:14.000000000 +0200
 +++ ppp-2.4.4.make/pppdump/Makefile.linux	2006-08-04 03:12:23.000000000 +0200

================================================================
Index: packages/ppp/ppp.spec
diff -u packages/ppp/ppp.spec:1.145 packages/ppp/ppp.spec:1.146
--- packages/ppp/ppp.spec:1.145	Sun Apr 11 08:28:43 2010
+++ packages/ppp/ppp.spec	Sun May 23 20:05:32 2010
@@ -16,13 +16,13 @@
 Summary(tr.UTF-8):	PPP sunucu süreci
 Summary(zh_CN.UTF-8):	PPP 配置和管理软件包.
 Name:		ppp
-Version:	2.4.4
-Release:	4
+Version:	2.4.5
+Release:	1
 Epoch:		3
 License:	distributable
 Group:		Networking/Daemons
 Source0:	ftp://ftp.samba.org/pub/ppp/%{name}-%{version}.tar.gz
-# Source0-md5:	183800762e266132218b204dfb428d29
+# Source0-md5:	4621bc56167b6953ec4071043fe0ec57
 Source1:	%{name}.pamd
 Source2:	%{name}.pon
 Source3:	%{name}.poff
@@ -34,7 +34,6 @@
 Patch2:		%{name}-debian_scripts.patch
 Patch3:		%{name}-static.patch
 Patch4:		%{name}-pidfile-owner.patch
-Patch5:		%{name}-rp-pppoe-update.patch
 Patch6:		%{name}-rp-pppoe-macaddr.patch
 #Patch7:		http://public.planetmirror.com/pub/mppe/pppd-2.4.2-chapms-strip-domain.patch.gz
 Patch7:		pppd-2.4.2-chapms-strip-domain.patch
@@ -123,7 +122,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -139,8 +137,8 @@
 %{__make} \
 	%{?with_pppoatm:HAVE_LIBATM=y} \
 	%{?with_srp:USE_SRP=y} \
-	OPT_FLAGS="%{rpmcflags}" \
-	COPTS="%{rpmcflags}" \
+	OPT_FLAGS="%{rpmcflags} %{rpmcppflags}" \
+	COPTS="%{rpmcflags} %{rpmcppflags}" \
 	OPTLDFLAGS="%{rpmldflags}" \
 	CC="%{__cc}"
 
@@ -195,6 +193,8 @@
 %dir %{_libdir}/pppd/*.*
 %{_libdir}/pppd/plugins
 %attr(755,root,root) %{_libdir}/pppd/*.*/minconn.so
+%attr(755,root,root) %{_libdir}/pppd/*.*/openl2tp.so
+%attr(755,root,root) %{_libdir}/pppd/*.*/pppol2tp.so
 %attr(755,root,root) %{_libdir}/pppd/*.*/pass*.so
 %attr(755,root,root) %{_libdir}/pppd/*.*/rp-pppoe.so
 %attr(755,root,root) %{_libdir}/pppd/*.*/rad*.so
@@ -234,6 +234,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.146  2010/05/23 18:05:32  arekm
+- up to 2.4.5
+
 Revision 1.145  2010/04/11 06:28:43  arekm
 - release 4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ppp/ppp-lib64.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ppp/ppp-make.patch?r1=1.19&r2=1.20&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ppp/ppp.spec?r1=1.145&r2=1.146&f=u

More information about the pld-cvs-commit mailing list