rpms/ppp/devel ppp-2.4.2-dontwriteetc.patch, 1.1, 1.2 ppp.spec, 1.42, 1.43

[Martin Nagy (mnagy)]

Author: mnagy

Update of /cvs/extras/rpms/ppp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7135

Modified Files:
	ppp-2.4.2-dontwriteetc.patch ppp.spec 
Log Message:
* Mon Mar 03 2008 Martin Nagy <mnagy at redhat.com> 2.4.4-5
- put logs into /var/log/ppp (#118837)


ppp-2.4.2-dontwriteetc.patch:

Index: ppp-2.4.2-dontwriteetc.patch
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp-2.4.2-dontwriteetc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ppp-2.4.2-dontwriteetc.patch	9 Sep 2004 10:43:30 -0000	1.1
+++ ppp-2.4.2-dontwriteetc.patch	3 Mar 2008 14:55:40 -0000	1.2
@@ -1,35 +1,52 @@
---- ppp-2.4.2/chat/chat.8.dontwriteetc	2002-09-07 12:37:49.000000000 +0200
-+++ ppp-2.4.2/chat/chat.8	2004-05-07 10:45:30.000000000 +0200
-@@ -200,7 +200,7 @@
+diff -up ppp-2.4.4/chat/chat.8.dontwriteetc ppp-2.4.4/chat/chat.8
+--- ppp-2.4.4/chat/chat.8.dontwriteetc	2004-11-13 13:22:49.000000000 +0100
++++ ppp-2.4.4/chat/chat.8	2008-03-03 15:37:55.000000000 +0100
+@@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the scrip
  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.
+-/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.2/linux/Makefile.top.dontwriteetc	2002-09-07 12:37:49.000000000 +0200
-+++ ppp-2.4.2/linux/Makefile.top	2004-05-07 10:44:40.000000000 +0200
-@@ -5,6 +5,8 @@
- INCDIR = $(DESTDIR)/usr/include
- MANDIR = $(DESTDIR)/usr/man
- ETCDIR = $(DESTDIR)/etc/ppp
+diff -up ppp-2.4.4/pppd/pathnames.h.dontwriteetc ppp-2.4.4/pppd/pathnames.h
+--- ppp-2.4.4/pppd/pathnames.h.dontwriteetc	2008-03-03 15:26:51.000000000 +0100
++++ ppp-2.4.4/pppd/pathnames.h	2008-03-03 15:26:51.000000000 +0100
+@@ -28,9 +28,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"
+diff -up ppp-2.4.4/linux/Makefile.top.dontwriteetc ppp-2.4.4/linux/Makefile.top
+--- ppp-2.4.4/linux/Makefile.top.dontwriteetc	2006-06-04 07:04:14.000000000 +0200
++++ ppp-2.4.4/linux/Makefile.top	2008-03-03 15:42:10.000000000 +0100
+@@ -5,6 +5,8 @@ BINDIR = $(DESTDIR)/sbin
+ INCDIR = $(DESTDIR)/include
+ MANDIR = $(DESTDIR)/share/man
+ ETCDIR = $(INSTROOT)@SYSCONF@/ppp
 +RUNDIR = $(DESTDIR)/var/run/ppp
 +LOGDIR = $(DESTDIR)/var/log/ppp
  
  # uid 0 = root
  INSTALL= install
-@@ -16,7 +18,7 @@
+@@ -16,7 +18,7 @@ all:
  	cd pppstats; $(MAKE) $(MFLAGS) all
  	cd pppdump; $(MAKE) $(MFLAGS) all
  
--install: $(BINDIR) $(MANDIR)/man8 install-progs install-etcppp install-devel
-+install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-etcppp install-devel
+-install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel
++install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-devel
  
  install-progs:
- 	cd chat; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) $(MFLAGS) install
-@@ -44,6 +46,10 @@
+ 	cd chat; $(MAKE) $(MFLAGS) install
+@@ -44,6 +46,10 @@ $(MANDIR)/man8:
  	$(INSTALL) -d -m 755 $@
  $(ETCDIR):
  	$(INSTALL) -d -m 755 $@
@@ -40,17 +57,3 @@
  
  clean:
  	rm -f `find . -name '*.[oas]' -print`
---- ppp-2.4.2/pppd/pathnames.h.dontwriteetc	2004-05-07 10:29:29.000000000 +0200
-+++ ppp-2.4.2/pppd/pathnames.h	2004-05-07 11:40:08.000000000 +0200
-@@ -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"


Index: ppp.spec
===================================================================
RCS file: /cvs/extras/rpms/ppp/devel/ppp.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ppp.spec	11 Feb 2008 10:21:51 -0000	1.42
+++ ppp.spec	3 Mar 2008 14:55:40 -0000	1.43
@@ -1,7 +1,7 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Name: ppp
 Version: 2.4.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: distributable
 Group: System Environment/Daemons
 Source0: ftp://ftp.samba.org/pub/ppp/ppp-%{version}.tar.gz
@@ -23,6 +23,7 @@
 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
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildPrereq: pam-devel, libpcap-devel
@@ -55,6 +56,7 @@
 %patch20 -p1 -b .ipv6cp
 %patch21 -p1 -b .usepeerdns-var_run_ppp_resolv
 %patch22 -p1 -b .cbcp
+%patch23 -p1 -b .dontwriteetc
 
 rm -f scripts/*.local
 rm -f scripts/*.change_resolv_conf
@@ -116,6 +118,9 @@
 
 
 %changelog
+* Mon Mar 03 2008 Martin Nagy <mnagy at redhat.com> 2.4.4-5
+- put logs into /var/log/ppp (#118837)
+
 * Mon Feb 11 2008 Martin Nagy <mnagy at redhat.com> 2.4.4-4
 - rebuild for gcc-4.3