From: Marco d'Itri <md@linux.it>
Date: Fri, 2 Jun 2017 11:28:30 +0200
Subject: [PATCH] Debian-specific changes.

---
 pppd/Makefile.linux    | 6 ++----
 pppd/pathnames.h       | 2 +-
 pppd/pppd.h            | 2 +-
 pppdump/Makefile.linux | 4 ++--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index a8694fccd85e..a90cbdcf8bb1 100644
--- a/pppd/Makefile.linux
+++ b/pppd/Makefile.linux
@@ -61,14 +61,14 @@ HAVE_MULTILINK=y
 USE_TDB=y
 
 HAS_SHADOW=y
-#USE_PAM=y
+USE_PAM=y
 HAVE_INET6=y
 
 # Enable plugins
 PLUGIN=y
 
 # Enable Microsoft proprietary Callback Control Protocol
-#CBCP=y
+CBCP=y
 
 # Enable EAP SRP-SHA1 authentication (requires libsrp)
 #USE_SRP=y
@@ -182,11 +182,9 @@ LIBS	+= -ldl
 endif
 
 ifdef FILTER
-ifneq ($(wildcard /usr/include/pcap-bpf.h),)
 LIBS    += -lpcap
 CFLAGS  += -DPPP_FILTER
 endif
-endif
 
 ifdef HAVE_INET6
      PPPDSRCS += ipv6cp.c eui64.c
diff --git a/pppd/pathnames.h b/pppd/pathnames.h
index a33f0466c9d6..46972601fc92 100644
--- a/pppd/pathnames.h
+++ b/pppd/pathnames.h
@@ -28,7 +28,7 @@
 #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"
 
diff --git a/pppd/pppd.h b/pppd/pppd.h
index b11670586244..567d702181ca 100644
--- a/pppd/pppd.h
+++ b/pppd/pppd.h
@@ -870,7 +870,7 @@ extern void (*snoop_send_hook) __P((unsigned char *p, int len));
   || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
 #define LOG_PPP LOG_LOCAL2
 #else
-#define LOG_PPP LOG_DAEMON
+#define LOG_PPP LOG_LOCAL2
 #endif
 #endif /* LOG_PPP */
 
diff --git a/pppdump/Makefile.linux b/pppdump/Makefile.linux
index 87777fab5e94..1eeeafe20111 100644
--- a/pppdump/Makefile.linux
+++ b/pppdump/Makefile.linux
@@ -2,9 +2,9 @@ DESTDIR = $(INSTROOT)@DESTDIR@
 BINDIR = $(DESTDIR)/sbin
 MANDIR = $(DESTDIR)/share/man/man8
 
-DO_DEFLATE=y
+#DO_DEFLATE=y
 DO_BSD_COMPRESS=y
-HAVE_ZLIB=n
+HAVE_ZLIB=y
 
 COPTS=-O2 -g
 CFLAGS= $(COPTS) -I../include/net