ppp: Update to 2.4.6.

[ipfire-3.x.git] / ppp / patches / 0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch

diff --git a/ppp/patches/ppp-2.4.4-dontwriteetc.patch b/ppp/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
similarity index 66%
rename from ppp/patches/ppp-2.4.4-dontwriteetc.patch
rename to ppp/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
index 8ab4108980a1a326ef1c61b1e9b28ef64326bfa8..f1a0d5fea52b391f61b48f5e169c98c1c3bd3663 100644 (file)
--- a/ppp/patches/ppp-2.4.4-dontwriteetc.patch
+++ b/ppp/patches/0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
@@ -1,7 +1,20 @@
-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
+From b4ef433be936c90e356da7a590b032cdee219a3f Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Fri, 4 Apr 2014 19:06:05 +0200
+Subject: [PATCH 11/25] build-sys: don't put connect-errors log to /etc/ppp/
+
+Resolves: #118837
+---
+ chat/chat.8        | 2 +-
+ linux/Makefile.top | 8 +++++++-
+ pppd/pathnames.h   | 4 ++--
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/chat/chat.8 b/chat/chat.8
+index 6d10836..78d6939 100644
+--- a/chat/chat.8
++++ b/chat/chat.8
+@@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the script to send strings to the user
  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
@@ -10,24 +23,10 @@ diff -up ppp-2.4.4/chat/chat.8.dontwriteetc ppp-2.4.4/chat/chat.8
  .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,
-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
+diff --git a/linux/Makefile.top b/linux/Makefile.top
+index f63d45e..f42efd5 100644
+--- a/linux/Makefile.top
++++ b/linux/Makefile.top
 @@ -5,6 +5,8 @@ BINDIR = $(DESTDIR)/sbin
  INCDIR = $(DESTDIR)/include
  MANDIR = $(DESTDIR)/share/man
@@ -57,3 +56,22 @@ diff -up ppp-2.4.4/linux/Makefile.top.dontwriteetc ppp-2.4.4/linux/Makefile.top
  
  clean:
        rm -f `find . -name '*.[oas]' -print`
+diff --git a/pppd/pathnames.h b/pppd/pathnames.h
+index a427cb8..bef3160 100644
+--- a/pppd/pathnames.h
++++ b/pppd/pathnames.h
+@@ -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"
+-- 
+1.8.3.1
+