Attachment 1973 Details for Bug 8386 – Готовый патч из Mandriva 2007

[patch] Готовый патч из Mandriva 2007

ppp-2.4.4-dontwriteetc.patch (text/plain), 2.09 KB, created by Andrew Kornilov on 2007-05-18 05:32:56 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Kornilov

Created: 2007-05-18 05:32:56 MSD

Size: 2.09 KB

patch

obsolete

>--- ppp-2.4.4/chat/chat.8.dontwriteetc	2004-11-13 07:22:49.000000000 -0500
>+++ ppp-2.4.4/chat/chat.8	2006-11-17 12:09:28.000000000 -0500
>@@ -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.4/linux/Makefile.top.dontwriteetc	2006-06-04 01:04:14.000000000 -0400
>+++ ppp-2.4.4/linux/Makefile.top	2006-11-17 12:10:06.000000000 -0500
>@@ -5,6 +5,8 @@
> INCDIR = $(DESTDIR)/include
> MANDIR = $(DESTDIR)/share/man
> ETCDIR = $(INSTROOT)@SYSCONF@/ppp
>+RUNDIR = $(INSTROOT)/var/run/ppp
>+LOGDIR = $(INSTROOT)/var/log/ppp
> 
> # uid 0 = root
> INSTALL= install
>@@ -16,7 +18,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-devel
> 
> install-progs:
> 	cd chat; $(MAKE) $(MFLAGS) install
>@@ -44,6 +46,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.4/pppd/pathnames.h.dontwriteetc	2005-08-25 19:59:34.000000000 -0400
>+++ ppp-2.4.4/pppd/pathnames.h	2006-11-17 11:42:16.000000000 -0500
>@@ -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"

Actions: View | Diff

Attachments on bug 8386: 1973