1 |
slords |
1.1 |
diff -up ppp-2.4.4/chat/chat.8.dontwriteetc ppp-2.4.4/chat/chat.8 |
2 |
|
|
--- ppp-2.4.4/chat/chat.8.dontwriteetc 2004-11-13 13:22:49.000000000 +0100 |
3 |
|
|
+++ ppp-2.4.4/chat/chat.8 2008-03-03 15:37:55.000000000 +0100 |
4 |
|
|
@@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the scrip |
5 |
|
|
at the terminal via standard error. If \fBchat\fR is being run by |
6 |
|
|
pppd, and pppd is running as a daemon (detached from its controlling |
7 |
|
|
terminal), standard error will normally be redirected to the file |
8 |
|
|
-/etc/ppp/connect\-errors. |
9 |
|
|
+/var/log/ppp/connect\-errors. |
10 |
|
|
.LP |
11 |
|
|
\fBSAY\fR strings must be enclosed in single or double quotes. If |
12 |
|
|
carriage return and line feed are needed in the string to be output, |
13 |
|
|
diff -up ppp-2.4.4/pppd/pathnames.h.dontwriteetc ppp-2.4.4/pppd/pathnames.h |
14 |
|
|
--- ppp-2.4.4/pppd/pathnames.h.dontwriteetc 2008-03-03 15:26:51.000000000 +0100 |
15 |
|
|
+++ ppp-2.4.4/pppd/pathnames.h 2008-03-03 15:26:51.000000000 +0100 |
16 |
|
|
@@ -28,9 +28,9 @@ |
17 |
|
|
#define _PATH_AUTHUP _ROOT_PATH "/etc/ppp/auth-up" |
18 |
|
|
#define _PATH_AUTHDOWN _ROOT_PATH "/etc/ppp/auth-down" |
19 |
|
|
#define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." |
20 |
|
|
-#define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" |
21 |
|
|
+#define _PATH_CONNERRS _ROOT_PATH "/var/log/ppp/connect-errors" |
22 |
|
|
#define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" |
23 |
|
|
-#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" |
24 |
|
|
+#define _PATH_RESOLV _ROOT_PATH "/var/run/ppp/resolv.conf" |
25 |
|
|
|
26 |
|
|
#define _PATH_USEROPT ".ppprc" |
27 |
|
|
#define _PATH_PSEUDONYM ".ppp_pseudonym" |
28 |
|
|
diff -up ppp-2.4.4/linux/Makefile.top.dontwriteetc ppp-2.4.4/linux/Makefile.top |
29 |
|
|
--- ppp-2.4.4/linux/Makefile.top.dontwriteetc 2006-06-04 07:04:14.000000000 +0200 |
30 |
|
|
+++ ppp-2.4.4/linux/Makefile.top 2008-03-03 15:42:10.000000000 +0100 |
31 |
|
|
@@ -5,6 +5,8 @@ BINDIR = $(DESTDIR)/sbin |
32 |
|
|
INCDIR = $(DESTDIR)/include |
33 |
|
|
MANDIR = $(DESTDIR)/share/man |
34 |
|
|
ETCDIR = $(INSTROOT)@SYSCONF@/ppp |
35 |
|
|
+RUNDIR = $(DESTDIR)/var/run/ppp |
36 |
|
|
+LOGDIR = $(DESTDIR)/var/log/ppp |
37 |
|
|
|
38 |
|
|
# uid 0 = root |
39 |
|
|
INSTALL= install |
40 |
|
|
@@ -16,7 +18,7 @@ all: |
41 |
|
|
cd pppstats; $(MAKE) $(MFLAGS) all |
42 |
|
|
cd pppdump; $(MAKE) $(MFLAGS) all |
43 |
|
|
|
44 |
|
|
-install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel |
45 |
|
|
+install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-devel |
46 |
|
|
|
47 |
|
|
install-progs: |
48 |
|
|
cd chat; $(MAKE) $(MFLAGS) install |
49 |
|
|
@@ -44,6 +46,10 @@ $(MANDIR)/man8: |
50 |
|
|
$(INSTALL) -d -m 755 $@ |
51 |
|
|
$(ETCDIR): |
52 |
|
|
$(INSTALL) -d -m 755 $@ |
53 |
|
|
+$(RUNDIR): |
54 |
|
|
+ $(INSTALL) -d -m 755 $@ |
55 |
|
|
+$(LOGDIR): |
56 |
|
|
+ $(INSTALL) -d -m 755 $@ |
57 |
|
|
|
58 |
|
|
clean: |
59 |
|
|
rm -f `find . -name '*.[oas]' -print` |