Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ppp for openSUSE:Factory checked in 
at 2022-05-24 20:31:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ppp (Old)
 and      /work/SRC/openSUSE:Factory/.ppp.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ppp"

Tue May 24 20:31:08 2022 rev:47 rq:978760 version:2.4.9

Changes:
--------
--- /work/SRC/openSUSE:Factory/ppp/ppp.changes  2022-03-15 19:04:40.072937860 
+0100
+++ /work/SRC/openSUSE:Factory/.ppp.new.2254/ppp.changes        2022-05-24 
20:31:25.954922923 +0200
@@ -1,0 +2,42 @@
+Mon May 23 14:07:58 UTC 2022 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 2.4.9
+  * Support for new EAP (Extensible Authentication Protocol) methods
+    * Support for EAP-TLS
+    * Support for EAP-MSCHAPv2
+  * New pppd options:
+    * chap-timeout
+    * chapms-strip-domain
+    * replacedefaultroute
+    * noreplacedefaultroute
+    * ipv6cp-accept-remote
+    * lcp-echo-adaptive
+    * ip-up-script
+    * ip-down-script
+    * ca
+    * capath
+    * cert
+    * key
+    * crl-dir
+    * crl
+    * max-tls-version
+  *  need-peer-eap
+  * Fixes for CVE-2020-8597 and CVE-2015-3310.
+  * The rp-pppoe plugin has been renamed to pppoe, to distinguish it
+    from the upstream rp-pppoe code.  Its options have changed names,
+    but the old names are kept as aliases.
+  * Many bug fixes and cleanups.
+- Drop upstream fixed patches
+  * ppp-2.4.3-winbind-setuidfix.patch
+  * fix-header-conflict.patch
+  * ppp-CVE-2015-3310.patch
+  * ppp-CVE-2020-8597.patch
+  * ppp-cifdefroute.patch
+  * ppp-higher-speeds.patch
+  * ppp-2.4.3-strip.diff
+  * ppp-filter.patch
+  * ppp-__P.patch
+- Drop upstream resolved ppp-make.patch use `--cflags` configure
+  switch instead
+
+-------------------------------------------------------------------

Old:
----
  fix-header-conflict.patch
  ppp-2.4.3-strip.diff
  ppp-2.4.3-winbind-setuidfix.patch
  ppp-2.4.8.tar.gz
  ppp-2.4.8.tar.gz.asc
  ppp-CVE-2015-3310.patch
  ppp-CVE-2020-8597.patch
  ppp-__P.patch
  ppp-cifdefroute.patch
  ppp-filter.patch
  ppp-higher-speeds.patch
  ppp-make.patch

New:
----
  ppp-2.4.9.tar.gz
  ppp-2.4.9.tar.gz.asc

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ppp.spec ++++++
--- /var/tmp/diff_new_pack.px5vsr/_old  2022-05-24 20:31:27.066923915 +0200
+++ /var/tmp/diff_new_pack.px5vsr/_new  2022-05-24 20:31:27.070923919 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ppp
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,18 +18,19 @@
 
 %define _group dialout
 Name:           ppp
-Version:        2.4.8
+Version:        2.4.9
 Release:        0
 Summary:        The Point to Point Protocol for Linux
 License:        BSD-3-Clause AND LGPL-2.1-or-later AND GPL-2.0-or-later
 Group:          Productivity/Networking/PPP
 URL:            https://ppp.samba.org
-Source0:        
https://download.samba.org/pub/%{name}/%{name}-%{version}.tar.gz
-# config for pam
-Source1:        ppp.pamd
+Source0:        https://download.samba.org/pub/ppp/ppp-%{version}.tar.gz
+Source1:        https://download.samba.org/pub/ppp/ppp-%{version}.tar.gz.asc
 # templates for secrets
 Source2:        pap-secrets.template
 Source3:        chap-secrets.template
+# config for pam
+Source4:        ppp.pamd
 # options and filters files
 Source5:        options
 Source6:        filters
@@ -47,32 +48,22 @@
 Source16:       modem.rules
 # https://www.kernel.org/doc/wot/paulus.html
 Source17:       %{name}.keyring
-Source18:       
https://download.samba.org/pub/%{name}/%{name}-%{version}.tar.gz.asc
-# Makefile changes
-Patch0:         ppp-make.patch
-# replacedefaultroute option
-Patch2:         ppp-cifdefroute.patch
+# PATCH-FEATURE-OPENSUSE ppp-smpppd.patch -- Add more log output for smpppd 
(move from debug to info log)
+Patch0:         ppp-smpppd.patch
+# PATCH-FIX-OPENSUSE ppp-pie.patch -- Build position independent code
+Patch1:         ppp-pie.patch
+# PATCH-FIX-OPENSUSE ppp-lib64.patch -- Install into lib64 on 64bit systems
+Patch2:         ppp-lib64.patch
+# PATCH-FIX-UPSTREAM ppp-var_run_resolv_conf.patch -- Move resolv.conf to 
/var/run
+Patch3:         ppp-var_run_resolv_conf.patch
+# PATCH-FIX-UPSTREAM ppp-fix-bashisms.patch -- Remove bashism from posix shell 
interpreted script https://github.com/ppp-project/ppp/issues/348
+Patch4:         ppp-fix-bashisms.patch
+# PATCH-FIX-UPSTREAM ppp-fork-fix.patch -- fix safe_fork to not close needed 
file descriptors
+Patch5:         ppp-fork-fix.patch
 # misc tiny stuff
-Patch3:         ppp-misc.patch
-# more log output for smpppd
-Patch4:         ppp-smpppd.patch
-# allow higher serial speeds
-Patch5:         ppp-higher-speeds.patch
-# fixed use of libpcap including dial on demand
-Patch6:         ppp-filter.patch
-# Don't use __P from glibc (pppd uses it wrong)
-Patch9:         ppp-__P.patch
-Patch11:        ppp-fix-bashisms.patch
-Patch12:        ppp-pie.patch
-Patch14:        ppp-fork-fix.patch
-Patch17:        ppp-2.4.3-strip.diff
-Patch18:        ppp-2.4.3-winbind-setuidfix.patch
-Patch21:        ppp-lib64.patch
-Patch22:        ppp-var_run_resolv_conf.patch
-# PATCH-FIX-UPSTREAM -- Patch for CVE-2015-3310
-Patch24:        ppp-CVE-2015-3310.patch
-Patch25:        fix-header-conflict.patch
-Patch27:        ppp-CVE-2020-8597.patch
+Patch6:         ppp-misc.patch
+# Of cause any other compatible libc would work, like musl, but 2.24 required 
for SOL_NETLINK
+BuildRequires:  glibc-devel >= 2.24
 BuildRequires:  libpcap-devel
 BuildRequires:  linux-atm-devel
 BuildRequires:  openssl-devel
@@ -100,9 +91,9 @@
 %package modem
 Summary:        Automatic redial for any USB modem supported by the kernel
 Group:          System/Kernel
-Requires:       group(dialout)
 Requires:       ppp
 Requires:       udev
+Requires:       group(dialout)
 BuildArch:      noarch
 
 %description modem
@@ -118,24 +109,16 @@
 %prep
 %setup -q
 %patch0
-%patch2
-%patch3
-%patch4
+%patch1 -p1
+%patch3 -p1
+%patch4 -p1
 %patch5
 %patch6
-%patch9
-%patch11 -p1
-%patch12
-%patch14
-%patch17
-%patch18
+
 %if "%{_lib}" == "lib64"
-%patch21
+%patch2 -p1
 %endif
-%patch22
-%patch24
-%patch25 -p1
-%patch27
+
 sed -i -e '1s/local\///' scripts/secure-card
 find scripts -type f | xargs chmod a-x
 find -type f -name '*.orig' | xargs rm -f
@@ -145,8 +128,7 @@
 sed -i '/#HAVE_LIBATM/s/#//' pppd/plugins/pppoatm/Makefile.linux
 
 %build
-export MY_CFLAGS="%{optflags} -fno-strict-aliasing -fPIC $SP"
-%configure
+%configure --cflags "%{optflags} -fno-strict-aliasing -fPIC $SP"
 %make_build CHAPMS=y CBCP=y HAS_SHADOW=y USE_PAM=y FILTER=y HAVE_INET6=y 
HAVE_LOGWTMP=y
 
 %install
@@ -166,7 +148,7 @@
 install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/ppp/peers/ppp
 install -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/ppp/peers/pptp
 install -d 755 %{buildroot}%{_sysconfdir}/pam.d
-install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/ppp
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/pam.d/ppp
 install -m 644 %{SOURCE13} %{buildroot}%{_mandir}/man8/pppoe-discovery.8.gz
 install -Dm 644 %{SOURCE14} 
%{buildroot}%{_sysconfdir}/ppp/chatscripts/modem.chat
 install -Dm 644 %{SOURCE15} %{buildroot}%{_unitdir}/modem@.service

++++++ ppp-2.4.8.tar.gz -> ppp-2.4.9.tar.gz ++++++
++++ 22371 lines of diff (skipped)

++++++ ppp-lib64.patch ++++++
--- /var/tmp/diff_new_pack.px5vsr/_old  2022-05-24 20:31:27.410924222 +0200
+++ /var/tmp/diff_new_pack.px5vsr/_new  2022-05-24 20:31:27.414924226 +0200
@@ -1,30 +1,19 @@
---- PLUGINS.orig
-+++ PLUGINS
-@@ -14,7 +14,7 @@ plugin support only under Linux and Sola
- Plugins are loaded into pppd using the `plugin' option, which takes
- one argument, the name of a shared object file.  The plugin option is
- a privileged option.  If the name given does not contain a slash, pppd
--will look in the /usr/lib/pppd/<version> directory for the file, where
-+will look in the /usr/lib64/pppd/<version> directory for the file, where
- <version> is the version number of pppd, for example, 2.4.2.  I
- suggest that you either give the full path name of the shared object
- file or just the base name; if you don't, it may be possible for
---- README.orig
-+++ README
-@@ -261,8 +261,8 @@ What was new in ppp-2.4.1.
-   per-tty options file are parsed correctly, and don't override values
-   from the command line in most cases.
- 
--* The plugin option now looks in /usr/lib/pppd/<pppd-version> (for
--  example, /usr/lib/pppd/2.4.1b1) for shared objects for plugins if
-+* The plugin option now looks in /usr/lib64/pppd/<pppd-version> (for
-+  example, /usr/lib64/pppd/2.4.1b1) for shared objects for plugins if
-   there is no slash in the plugin name.
- 
- * When loading a plugin, pppd will now check the version of pppd for
---- pppd/pathnames.h.orig
-+++ pppd/pathnames.h
-@@ -57,9 +57,9 @@
+diff -Nur ppp-2.4.9/pppd/Makefile.linux new/pppd/Makefile.linux
+--- ppp-2.4.9/pppd/Makefile.linux      2021-01-05 00:06:37.000000000 +0100
++++ new/pppd/Makefile.linux    2022-05-23 17:42:04.835599374 +0200
+@@ -112,7 +112,7 @@
+ # EAP SRP-SHA1
+ ifdef USE_SRP
+ CFLAGS        += -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
+-LIBS  += -lsrp -L/usr/local/ssl/lib
++LIBS  += -lsrp -L/usr/local/ssl/lib6464
+ NEEDCRYPTOLIB = y
+ TARGETS       += srp-entry
+ EXTRAINSTALL = $(INSTALL) -c -m 555 srp-entry $(BINDIR)/srp-entry
+diff -Nur ppp-2.4.9/pppd/pathnames.h new/pppd/pathnames.h
+--- ppp-2.4.9/pppd/pathnames.h 2021-01-05 00:06:37.000000000 +0100
++++ new/pppd/pathnames.h       2022-05-23 17:42:04.835599374 +0200
+@@ -62,9 +62,9 @@
  
  #ifdef PLUGIN
  #ifdef __STDC__
@@ -36,21 +25,23 @@
  #endif /* __STDC__ */
  
  #endif /* PLUGIN */
---- pppd/plugins/Makefile.linux.orig
-+++ pppd/plugins/Makefile.linux
-@@ -7,7 +7,7 @@ INSTALL        = install
+diff -Nur ppp-2.4.9/pppd/plugins/Makefile.linux new/pppd/plugins/Makefile.linux
+--- ppp-2.4.9/pppd/plugins/Makefile.linux      2021-01-05 00:06:37.000000000 
+0100
++++ new/pppd/plugins/Makefile.linux    2022-05-23 17:42:04.835599374 +0200
+@@ -5,7 +5,7 @@
  DESTDIR = $(INSTROOT)@DESTDIR@
  BINDIR = $(DESTDIR)/sbin
  MANDIR = $(DESTDIR)/share/man/man8
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 +LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
  
- SUBDIRS := rp-pppoe pppoatm pppol2tp
- # Uncomment the next line to include the radius authentication plugin
---- pppd/plugins/pppoatm/Makefile.linux.orig
-+++ pppd/plugins/pppoatm/Makefile.linux
-@@ -7,7 +7,7 @@ INSTALL        = install
- #***********************************************************************
+ CFLAGS        = $(COPTS) -I.. -I../../include -fPIC
+ LDFLAGS_SHARED        = -shared
+diff -Nur ppp-2.4.9/pppd/plugins/pppoatm/Makefile.linux 
new/pppd/plugins/pppoatm/Makefile.linux
+--- ppp-2.4.9/pppd/plugins/pppoatm/Makefile.linux      2021-01-05 
00:06:37.000000000 +0100
++++ new/pppd/plugins/pppoatm/Makefile.linux    2022-05-23 17:42:04.835599374 
+0200
+@@ -4,7 +4,7 @@
+ COPTS=@CFLAGS@
  
  DESTDIR = $(INSTROOT)@DESTDIR@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
@@ -58,20 +49,34 @@
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
---- pppd/plugins/pppol2tp/Makefile.linux.orig
-+++ pppd/plugins/pppol2tp/Makefile.linux
-@@ -7,7 +7,7 @@ INSTALL        = install
- #***********************************************************************
+diff -Nur ppp-2.4.9/pppd/plugins/pppoe/Makefile.linux 
new/pppd/plugins/pppoe/Makefile.linux
+--- ppp-2.4.9/pppd/plugins/pppoe/Makefile.linux        2021-01-05 
00:06:37.000000000 +0100
++++ new/pppd/plugins/pppoe/Makefile.linux      2022-05-23 17:42:04.835599374 
+0200
+@@ -18,7 +18,7 @@
+ 
+ DESTDIR = $(INSTROOT)@DESTDIR@
+ BINDIR = $(DESTDIR)/sbin
+-LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
++LIBDIR = $(DESTDIR)/lib64/pppd/$(PPPDVERSION)
+ 
+ PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' 
../../patchlevel.h)
+ 
+diff -Nur ppp-2.4.9/pppd/plugins/pppol2tp/Makefile.linux 
new/pppd/plugins/pppol2tp/Makefile.linux
+--- ppp-2.4.9/pppd/plugins/pppol2tp/Makefile.linux     2021-01-05 
00:06:37.000000000 +0100
++++ new/pppd/plugins/pppol2tp/Makefile.linux   2022-05-23 17:42:04.835599374 
+0200
+@@ -4,7 +4,7 @@
+ COPTS=@CFLAGS@
  
- DESTDIR = @DESTDIR@
+ DESTDIR = $(INSTROOT)/@DESTDIR@
 -LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
 +LIBDIR = $(DESTDIR)/lib64/pppd/$(VERSION)
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
---- pppd/plugins/radius/Makefile.linux.orig
-+++ pppd/plugins/radius/Makefile.linux
-@@ -5,7 +5,7 @@
+diff -Nur ppp-2.4.9/pppd/plugins/radius/Makefile.linux 
new/pppd/plugins/radius/Makefile.linux
+--- ppp-2.4.9/pppd/plugins/radius/Makefile.linux       2021-01-05 
00:06:37.000000000 +0100
++++ new/pppd/plugins/radius/Makefile.linux     2022-05-23 17:42:04.835599374 
+0200
+@@ -9,7 +9,7 @@
  
  DESTDIR = $(INSTROOT)@DESTDIR@
  MANDIR = $(DESTDIR)/share/man/man8
@@ -80,20 +85,10 @@
  
  VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  
---- pppd/plugins/rp-pppoe/Makefile.linux.orig
-+++ pppd/plugins/rp-pppoe/Makefile.linux
-@@ -16,7 +16,7 @@
- 
- DESTDIR = $(INSTROOT)@DESTDIR@
- BINDIR = $(DESTDIR)/sbin
--LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
-+LIBDIR = $(DESTDIR)/lib64/pppd/$(PPPDVERSION)
- 
- PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' 
../../patchlevel.h)
- 
---- pppd/pppd.8.orig
-+++ pppd/pppd.8
-@@ -946,7 +946,7 @@ persistent connections.
+diff -Nur ppp-2.4.9/pppd/pppd.8 new/pppd/pppd.8
+--- ppp-2.4.9/pppd/pppd.8      2021-01-05 00:06:37.000000000 +0100
++++ new/pppd/pppd.8    2022-05-23 17:42:04.835599374 +0200
+@@ -995,7 +995,7 @@
  .B plugin \fIfilename
  Load the shared library object file \fIfilename\fR as a plugin.  This
  is a privileged option.  If \fIfilename\fR does not contain a slash

++++++ ppp-pie.patch ++++++
--- /var/tmp/diff_new_pack.px5vsr/_old  2022-05-24 20:31:27.446924254 +0200
+++ /var/tmp/diff_new_pack.px5vsr/_new  2022-05-24 20:31:27.450924258 +0200
@@ -1,17 +1,7 @@
---- pppd/Makefile.linux.orig
-+++ pppd/Makefile.linux
-@@ -224,7 +224,7 @@ install: pppd
-       $(INSTALL) -m 644 pppd.8 $(MANDIR)
- 
- pppd: $(PPPDOBJS)
--      $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd $(PPPDOBJS) $(LIBS)
-+      $(CC) $(CFLAGS) -pie -fPIC $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd 
$(PPPDOBJS) $(LIBS)
- 
- srp-entry:    srp-entry.c
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
---- chat/Makefile.linux.orig
-+++ chat/Makefile.linux
-@@ -18,7 +18,7 @@ INSTALL= install
+diff -Nur ppp-2.4.9/chat/Makefile.linux new/chat/Makefile.linux
+--- ppp-2.4.9/chat/Makefile.linux      2021-01-05 00:06:37.000000000 +0100
++++ new/chat/Makefile.linux    2022-05-23 17:29:53.108022140 +0200
+@@ -19,7 +19,7 @@
  all:  chat
  
  chat: chat.o
@@ -20,10 +10,23 @@
  
  chat.o:       chat.c
        $(CC) -c $(CFLAGS) -o chat.o chat.c
---- pppstats/Makefile.linux.orig
-+++ pppstats/Makefile.linux
-@@ -26,7 +26,7 @@ install: pppstats
-       $(INSTALL) -m 444 pppstats.8 $(MANDIR)
+diff -Nur ppp-2.4.9/pppd/Makefile.linux new/pppd/Makefile.linux
+--- ppp-2.4.9/pppd/Makefile.linux      2021-01-05 00:06:37.000000000 +0100
++++ new/pppd/Makefile.linux    2022-05-23 17:29:53.108022140 +0200
+@@ -245,7 +245,7 @@
+       $(INSTALL) -c -m 444 pppd.8 $(MANDIR)
+ 
+ pppd: $(PPPDOBJS)
+-      $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd $(PPPDOBJS) $(LIBS)
++      $(CC) $(CFLAGS) -pie -fPIC $(LDFLAGS) $(LDFLAGS_PLUGIN) -o pppd 
$(PPPDOBJS) $(LIBS)
+ 
+ srp-entry:    srp-entry.c
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
+diff -Nur ppp-2.4.9/pppstats/Makefile.linux new/pppstats/Makefile.linux
+--- ppp-2.4.9/pppstats/Makefile.linux  2021-01-05 00:06:37.000000000 +0100
++++ new/pppstats/Makefile.linux        2022-05-23 17:29:53.108022140 +0200
+@@ -27,7 +27,7 @@
+       $(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
  
  pppstats: $(PPPSTATSRCS)
 -      $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS)

++++++ ppp-var_run_resolv_conf.patch ++++++
--- /var/tmp/diff_new_pack.px5vsr/_old  2022-05-24 20:31:27.470924275 +0200
+++ /var/tmp/diff_new_pack.px5vsr/_new  2022-05-24 20:31:27.474924280 +0200
@@ -1,6 +1,12 @@
---- Changes-2.3.orig
-+++ Changes-2.3
-@@ -262,10 +262,10 @@ What was new in ppp-2.3.6.
+Tue Jul 22 14:16:29 CEST 2008 - hvo...@suse.de
+
+Move the resolv.conf written by pppd to /var/run [bnc#401648]
+
+
+diff -Nur ppp-2.4.9/Changes-2.3 new/Changes-2.3
+--- ppp-2.4.9/Changes-2.3      2021-01-05 00:06:37.000000000 +0100
++++ new/Changes-2.3    2022-05-23 18:30:08.827773633 +0200
+@@ -262,10 +262,10 @@
  
  * Added new option `usepeerdns', thanks to Nick Walker
    <nickwal...@email.com>.  If the peer supplies DNS addresses, these
@@ -15,10 +21,11 @@
  
  * The Solaris ppp driver should now work correctly on SMP systems.
  
---- pppd/ipcp.c.orig
-+++ pppd/ipcp.c
-@@ -2148,10 +2148,13 @@ create_resolv(peerdns1, peerdns2)
-     u_int32_t peerdns1, peerdns2;
+diff -Nur ppp-2.4.9/pppd/ipcp.c new/pppd/ipcp.c
+--- ppp-2.4.9/pppd/ipcp.c      2021-01-05 00:06:37.000000000 +0100
++++ new/pppd/ipcp.c    2022-05-23 18:30:08.827773633 +0200
+@@ -2090,10 +2090,13 @@
+ create_resolv(u_int32_t peerdns1, u_int32_t peerdns2)
  {
      FILE *f;
 +    char rcfilename[MAXIFNAMELEN];
@@ -33,7 +40,7 @@
        return;
      }
  
-@@ -2162,7 +2165,7 @@ create_resolv(peerdns1, peerdns2)
+@@ -2104,7 +2107,7 @@
        fprintf(f, "nameserver %s\n", ip_ntoa(peerdns2));
  
      if (ferror(f))
@@ -42,9 +49,10 @@
  
      fclose(f);
  }
---- pppd/pathnames.h.orig
-+++ pppd/pathnames.h
-@@ -30,7 +30,7 @@
+diff -Nur ppp-2.4.9/pppd/pathnames.h new/pppd/pathnames.h
+--- ppp-2.4.9/pppd/pathnames.h 2021-01-05 00:06:37.000000000 +0100
++++ new/pppd/pathnames.h       2022-05-23 18:30:08.827773633 +0200
+@@ -35,7 +35,7 @@
  #define _PATH_TTYOPT   _ROOT_PATH "/etc/ppp/options."
  #define _PATH_CONNERRS         _ROOT_PATH "/etc/ppp/connect-errors"
  #define _PATH_PEERFILES        _ROOT_PATH "/etc/ppp/peers/"
@@ -53,9 +61,10 @@
  
  #define _PATH_USEROPT  ".ppprc"
  #define       _PATH_PSEUDONYM  ".ppp_pseudonym"
---- pppd/pppd.8.orig
-+++ pppd/pppd.8
-@@ -1143,8 +1143,8 @@ Ask the peer for up to 2 DNS server addr
+diff -Nur ppp-2.4.9/pppd/pppd.8 new/pppd/pppd.8
+--- ppp-2.4.9/pppd/pppd.8      2021-01-05 00:06:37.000000000 +0100
++++ new/pppd/pppd.8    2022-05-23 18:30:08.827773633 +0200
+@@ -1196,8 +1196,8 @@
  by the peer (if any) are passed to the /etc/ppp/ip\-up script in the
  environment variables DNS1 and DNS2, and the environment variable
  USEPEERDNS will be set to 1.  In addition, pppd will create an

Reply via email to