[arch-commits] Commit in ppp/trunk (3 files)

Antonio Rojas arojas at archlinux.org
Sun May 2 08:59:16 UTC 2021 

    Date: Sunday, May 2, 2021 @ 08:59:16
  Author: arojas
Revision: 414156

Update to 2.4.9

Modified:
  ppp/trunk/PKGBUILD
  ppp/trunk/ppp-2.4.6-makefiles.patch
Deleted:
  ppp/trunk/CVE-2020-8597.patch

---------------------------+
 CVE-2020-8597.patch       |   37 ----------
 PKGBUILD                  |    9 --
 ppp-2.4.6-makefiles.patch |  149 +++++---------------------------------------
 3 files changed, 20 insertions(+), 175 deletions(-)

Deleted: CVE-2020-8597.patch
===================================================================
--- CVE-2020-8597.patch	2021-05-02 08:25:10 UTC (rev 414155)
+++ CVE-2020-8597.patch	2021-05-02 08:59:16 UTC (rev 414156)
@@ -1,37 +0,0 @@
-From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001
-From: Paul Mackerras <paulus at ozlabs.org>
-Date: Mon, 3 Feb 2020 15:53:28 +1100
-Subject: [PATCH] pppd: Fix bounds check in EAP code
-
-Given that we have just checked vallen < len, it can never be the case
-that vallen >= len + sizeof(rhostname).  This fixes the check so we
-actually avoid overflowing the rhostname array.
-
-Reported-by: Ilja Van Sprundel <ivansprundel at ioactive.com>
-Signed-off-by: Paul Mackerras <paulus at ozlabs.org>
----
- pppd/eap.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pppd/eap.c b/pppd/eap.c
-index 94407f56..1b93db01 100644
---- a/pppd/eap.c
-+++ b/pppd/eap.c
-@@ -1420,7 +1420,7 @@ int len;
- 		}
- 
- 		/* Not so likely to happen. */
--		if (vallen >= len + sizeof (rhostname)) {
-+		if (len - vallen >= sizeof (rhostname)) {
- 			dbglog("EAP: trimming really long peer name down");
- 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
- 			rhostname[sizeof (rhostname) - 1] = '\0';
-@@ -1846,7 +1846,7 @@ int len;
- 		}
- 
- 		/* Not so likely to happen. */
--		if (vallen >= len + sizeof (rhostname)) {
-+		if (len - vallen >= sizeof (rhostname)) {
- 			dbglog("EAP: trimming really long peer name down");
- 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
- 			rhostname[sizeof (rhostname) - 1] = '\0';

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-02 08:25:10 UTC (rev 414155)
+++ PKGBUILD	2021-05-02 08:59:16 UTC (rev 414156)
@@ -2,7 +2,7 @@
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=ppp
-pkgver=2.4.8
+pkgver=2.4.9
 pkgrel=1
 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
 arch=(x86_64)
@@ -21,11 +21,10 @@
         ipv6-down
         ipv6-up.d.iface-config.sh
         ppp.systemd
-        CVE-2020-8597.patch
         LICENSE)
-sha512sums=('580a5856333e1149a66cfb218f7fb5e698f0f0c11d492d5c87b760827e76b5ef1e2e461c95d1abb368b9c92499c366e7ddb31dd3029d5a9026c3ab10b50bdbb6'
+sha512sums=('5721b1915f2d02b895508601120d09ff17a76cbab62cbcb7d0216837bdf84f10f345311b77f346b120bda3b488ae10d7d942c4d7d5f1e369d0a002f3071099f1'
             'SKIP'
-            'e319ae8842cf24bdaf3f9ffd9ffe792c18d6b115590174ea930b9a3518834d7f952e2dc4f6061406957d49d9c740f91bb3becfeb6f9c8feb77c2c66eb1e9c58e'
+            '90b6b7c40cece43ed90a69aa1a2fa11c23da85045105354e7440cdb0d059f9ea660b58bf9d3045e32ffb05a8e65ff3d5a101002ac1f48f3f608b1706d6bc5c81'
             '86b13a9f02cc44c5ba16d404fdb54459fcda22fb5f4c4e12b2101e47e2650b62576d6315cd41f30f103ea61fb6f86b7aa2e7d40336f849f45061f7ad9c5119fe'
             'bdaaac792dd448ff31da6da2749d8c2f9c4e0311b1d4639de7c68038fcaa333cc28e25f5a6308de0ecb24b60b2e7284a811482df990da5f54d5581a746964f3c'
             '92f3a5e383f2c888938e891ba831042e7f8c026b0ddf5ce8c3523d06ac32fa81742e638a4c665975cbc79868b98806d92574ee2ee8e034e33b065a90ee3ab28b'
@@ -35,7 +34,6 @@
             '1b8dc6300f746607c0cce835e69ed444f24ba81874ba061b2b0377f0b9c1cb41a383d6845b364dfabb249a461422972ba5010bacf55c5f85f5eb0d3c0f4c71cd'
             '5b92a05bcf3ad4b7a88434546884e088069ce7c16a10c472589ca5ecc648f86ca02c2f608fb856ac6cb6ef14b508c2e0dec146c953128693bfb6c988f1963de8'
             'b9978c4038fb764a1bbe9dea92850673e14978450c0dcd7a1b0b24c4ebd515fcc4c5cc82cd4b97d826d483261e96945208b9fe97d6fea09a7a5c7910541db24c'
-            '242915cfdeefd629287890876e233b83582b3e6094f0ad58c96027b4dc8275fa18809d68b4ff63e77ca444767ed2b4f376f5501ed4a9247a6bbb50970e9b342a'
             'ab3acd0387a7966ac3d220f2b0b6880302f827125d978991f83dd3f1a30340c2a98ca5aedf0b81ec6a9e5eb49b0b0a0a5356419f3b8415c892c2df8b52d3994a')
 validpgpkeys=('631E179E370CD727A7F2A33A9E4295D605F66CE9'  # Paul Mackerras (Signing key) <paulus at samba.org>
               'DE8E01561D8276A4DBFAEFCC040F1D49EC9DBB8C') # Paul Mackerras <paulus at ozlabs.org>
@@ -44,7 +42,6 @@
   cd $pkgname-$pkgver
 
   patch -p1 -i "$srcdir"/ppp-2.4.6-makefiles.patch
-  patch -p1 -i "$srcdir"/CVE-2020-8597.patch
 
   # enable active filter
   sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux

Modified: ppp-2.4.6-makefiles.patch
===================================================================
--- ppp-2.4.6-makefiles.patch	2021-05-02 08:25:10 UTC (rev 414155)
+++ ppp-2.4.6-makefiles.patch	2021-05-02 08:59:16 UTC (rev 414156)
@@ -1,8 +1,8 @@
 diff -Nur ppp-2.4.6.orig/chat/Makefile.linux ppp-2.4.6/chat/Makefile.linux
 --- ppp-2.4.6.orig/chat/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
 +++ ppp-2.4.6/chat/Makefile.linux	2014-02-24 09:00:16.666577906 +0100
-@@ -1,7 +1,7 @@
- #	$Id: Makefile.linux,v 1.15 2006/06/04 05:07:46 paulus Exp $
+@@ -3,7 +3,7 @@
+ COPTS=@CFLAGS@
  
  DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
@@ -10,40 +10,6 @@
  MANDIR = $(DESTDIR)/share/man/man8
  
  CDEF1=	-DTERMIOS			# Use the termios structure
-@@ -10,7 +10,8 @@
- CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
- CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
- 
--COPTS=	-O2 -g -pipe
-+COPTS=	@CFLAGS@
-+LDFLAGS=	@LDFLAGS@
- CFLAGS=	$(COPTS) $(CDEFS)
- 
- INSTALL= install
-@@ -21,7 +22,7 @@
- 	$(CC) -o chat chat.o
- 
- chat.o:	chat.c
--	$(CC) -c $(CFLAGS) -o chat.o chat.c
-+	$(CC) -c $(CFLAGS) $(LDFLAGS) -o chat.o chat.c
- 
- install: chat
- 	mkdir -p $(BINDIR) $(MANDIR)
-diff -Nur ppp-2.4.6.orig/configure ppp-2.4.6/configure
---- ppp-2.4.6.orig/configure	2014-01-02 05:42:08.000000000 +0100
-+++ ppp-2.4.6/configure	2014-02-24 09:00:16.743242620 +0100
-@@ -185,7 +185,10 @@
-     rm -f $2
-     if [ -f $1 ]; then
- 	echo "  $2 <= $1"
--	sed -e "s, at DESTDIR@,$DESTDIR,g" -e "s, at SYSCONF@,$SYSCONF,g" $1 >$2
-+	sed -e "s|@DESTDIR@|$DESTDIR|g" \
-+	    -e "s|@SYSCONF@|$SYSCONF|g" \
-+	    -e "s|@CFLAGS@|$CFLAGS|g" \
-+	    -e "s|@LDFLAGS@|$LDFLAGS|g" $1 >$2
-     fi
- }
- 
 diff -Nur ppp-2.4.6.orig/linux/Makefile.top ppp-2.4.6/linux/Makefile.top
 --- ppp-2.4.6.orig/linux/Makefile.top	2014-01-02 05:42:08.000000000 +0100
 +++ ppp-2.4.6/linux/Makefile.top	2014-02-24 09:00:16.743242620 +0100
@@ -59,7 +25,7 @@
 diff -Nur ppp-2.4.6.orig/pppd/Makefile.linux ppp-2.4.6/pppd/Makefile.linux
 --- ppp-2.4.6.orig/pppd/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
 +++ ppp-2.4.6/pppd/Makefile.linux	2014-02-24 09:00:16.743242620 +0100
-@@ -5,7 +5,7 @@
+@@ -9,7 +9,7 @@
  
  # Default installation locations
  DESTDIR = $(INSTROOT)@DESTDIR@
@@ -68,26 +34,11 @@
  MANDIR = $(DESTDIR)/share/man/man8
  INCDIR = $(DESTDIR)/include
  
-@@ -32,7 +32,8 @@
- 
- # CC = gcc
- #
--COPTS = -O2 -pipe -Wall -g
-+COPTS = @CFLAGS@
-+LDFLAGS = @LDFLAGS@
- LIBS =
- 
- # Uncomment the next 2 lines to include support for Microsoft's
 diff -Nur ppp-2.4.6.orig/pppd/plugins/Makefile.linux ppp-2.4.6/pppd/plugins/Makefile.linux
 --- ppp-2.4.6.orig/pppd/plugins/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
 +++ ppp-2.4.6/pppd/plugins/Makefile.linux	2014-02-24 09:00:16.779908379 +0100
-@@ -1,11 +1,11 @@
- #CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= @CFLAGS@
- CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
- LDFLAGS_SHARED	= -shared
- INSTALL	= install
+@@ -3,7 +3,7 @@
+ COPTS=@CFLAGS@
  
  DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
@@ -95,55 +46,12 @@
  MANDIR = $(DESTDIR)/share/man/man8
  LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
  
-diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux
---- ppp-2.4.6.orig/pppd/plugins/pppoatm/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
-+++ ppp-2.4.6/pppd/plugins/pppoatm/Makefile.linux	2014-02-24 09:00:16.809907637 +0100
-@@ -1,7 +1,7 @@
- #CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= @CFLAGS@
- CFLAGS	= $(COPTS) -I../.. -I../../../include -fPIC
- LDFLAGS_SHARED	= -shared
- INSTALL	= install
+diff -Nur ppp-2.4.6.orig/pppd/plugins/pppoe/Makefile.linux ppp-2.4.6/pppd/plugins/pppoe/Makefile.linux
+--- ppp-2.4.6.orig/pppd/plugins/pppoe/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
++++ ppp-2.4.6/pppd/plugins/pppoe/Makefile.linux	2014-02-24 09:00:16.809907637 +0100
+@@ -17,7 +17,7 @@
+ COPTS=@CFLAGS@
  
- #***********************************************************************
-diff -Nur ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux
---- ppp-2.4.6.orig/pppd/plugins/pppol2tp/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
-+++ ppp-2.4.6/pppd/plugins/pppol2tp/Makefile.linux	2014-02-24 09:01:06.325349425 +0100
-@@ -1,12 +1,12 @@
- #CC	= gcc
--COPTS	= -O2 -g
-+COPTS	= @CFLAGS@
- CFLAGS	= $(COPTS) -I. -I../.. -I../../../include -fPIC
- LDFLAGS_SHARED	= -shared
- INSTALL	= install
- 
- #***********************************************************************
- 
--DESTDIR = @DESTDIR@
-+DESTDIR = $(INSTROOT)@DESTDIR@
- LIBDIR = $(DESTDIR)/lib/pppd/$(VERSION)
- 
- VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-diff -Nur ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux ppp-2.4.6/pppd/plugins/radius/Makefile.linux
---- ppp-2.4.6.orig/pppd/plugins/radius/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
-+++ ppp-2.4.6/pppd/plugins/radius/Makefile.linux	2014-02-24 09:00:16.809907637 +0100
-@@ -12,7 +12,8 @@
- INSTALL	= install
- 
- PLUGIN=radius.so radattr.so radrealms.so
--CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
-+CFLAGS=@CFLAGS@ -I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
-+LDFLAGS=@LDFLAGS@
- 
- # Uncomment the next line to include support for Microsoft's
- # MS-CHAP authentication protocol.
-diff -Nur ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux
---- ppp-2.4.6.orig/pppd/plugins/rp-pppoe/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
-+++ ppp-2.4.6/pppd/plugins/rp-pppoe/Makefile.linux	2014-02-24 09:00:16.809907637 +0100
-@@ -15,7 +15,7 @@
- #***********************************************************************
- 
  DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
 +BINDIR = $(DESTDIR)/bin
@@ -150,39 +58,24 @@
  LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
  
  PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
-@@ -25,7 +25,9 @@
- # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
- RP_VERSION=3.8p
- 
--COPTS=-O2 -g
-+COPTS=@CFLAGS@
- CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
-+LDFLAGS=@LDFLAGS@
-+
- all: rp-pppoe.so pppoe-discovery
- 
- pppoe-discovery: pppoe-discovery.o debug.o
 diff -Nur ppp-2.4.6.orig/pppdump/Makefile.linux ppp-2.4.6/pppdump/Makefile.linux
 --- ppp-2.4.6.orig/pppdump/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
 +++ ppp-2.4.6/pppdump/Makefile.linux	2014-02-24 09:00:16.809907637 +0100
-@@ -1,8 +1,9 @@
+@@ -3,7 +3,7 @@
+ COPTS=@CFLAGS@
+ 
  DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
 +BINDIR = $(DESTDIR)/bin
  MANDIR = $(DESTDIR)/share/man/man8
  
--CFLAGS= -O -I../include/net
-+CFLAGS = @CFLAGS@ -I../include/net
-+LDFLAGS = @LDFLAGS@
- OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
- 
- INSTALL= install
+ CFLAGS = $(COPTS) -I../include/net
 diff -Nur ppp-2.4.6.orig/pppstats/Makefile.linux ppp-2.4.6/pppstats/Makefile.linux
 --- ppp-2.4.6.orig/pppstats/Makefile.linux	2014-01-02 05:42:08.000000000 +0100
 +++ ppp-2.4.6/pppstats/Makefile.linux	2014-02-24 09:00:16.809907637 +0100
-@@ -3,14 +3,15 @@
- # $Id: Makefile.linux,v 1.9 2006/06/04 05:07:46 paulus Exp $
- #
+@@ -6,7 +6,7 @@
+ COPTS=@CFLAGS@
+ 
  DESTDIR = $(INSTROOT)@DESTDIR@
 -BINDIR = $(DESTDIR)/sbin
 +BINDIR = $(DESTDIR)/bin
@@ -189,12 +82,4 @@
  MANDIR = $(DESTDIR)/share/man/man8
  
  PPPSTATSRCS = pppstats.c
- PPPSTATOBJS = pppstats.o
  
- #CC = gcc
--COPTS = -O
-+COPTS = @CFLAGS@
-+LDFLAGS = @LDFLAGS@
- COMPILE_FLAGS = -I../include
- LIBS =
- 
\ No newline at end of file

More information about the arch-commits mailing list