Thu May 28 18:20:36 UTC 202020200528182036

a/cryptsetup-2.3.3-x86_64-1.txz:  Upgraded.
a/kernel-generic-5.4.43-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.43-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.43-x86_64-1.txz:  Upgraded.
d/cmake-3.17.3-x86_64-1.txz:  Upgraded.
d/kernel-headers-5.4.43-x86-1.txz:  Upgraded.
d/python-setuptools-47.1.0-x86_64-1.txz:  Upgraded.
k/kernel-source-5.4.43-noarch-1.txz:  Upgraded.
l/babl-0.1.76-x86_64-1.txz:  Upgraded.
n/openssh-8.3p1-x86_64-1.txz:  Upgraded.
n/rp-pppoe-3.14-x86_64-1.txz:  Upgraded.
x/libdrm-2.4.102-x86_64-1.txz:  Upgraded.
x/mesa-20.1.0-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

2 files changed, 19 insertions, 21 deletions

diff --git a/source/n/rp-pppoe/rp-pppoe-3.12-ip-allocation.patch b/source/n/rp-pppoe/rp-pppoe-3.14-ip-allocation.patch
index 512913745..0fc03e753 100644
--- a/source/n/rp-pppoe/rp-pppoe-3.12-ip-allocation.patch
+++ b/source/n/rp-pppoe/rp-pppoe-3.14-ip-allocation.patch
@@ -1,7 +1,6 @@
-diff -up rp-pppoe-3.12/man/pppoe-server.8.ip-allocation rp-pppoe-3.12/man/pppoe-server.8
---- rp-pppoe-3.12/man/pppoe-server.8.ip-allocation	2015-11-11 16:10:01.000000000 +0100
-+++ rp-pppoe-3.12/man/pppoe-server.8	2015-11-16 16:48:52.457927211 +0100
-@@ -96,6 +96,11 @@ valid remote IP address to \fBpppd\fR.
+--- ./man/pppoe-server.8.orig	2020-05-26 19:29:37.000000000 -0500
++++ ./man/pppoe-server.8	2020-05-27 17:54:43.214892590 -0500
+@@ -96,6 +96,11 @@
  of 10.67.15.1 is used.
  
  .TP
@@ -13,10 +12,9 @@ diff -up rp-pppoe-3.12/man/pppoe-server.8.ip-allocation rp-pppoe-3.12/man/pppoe-
  .B \-N \fInum\fR
  Allows at most \fInum\fR concurrent PPPoE sessions.  If not specified,
  the default is 64.
-diff -up rp-pppoe-3.12/src/pppoe-server.c.ip-allocation rp-pppoe-3.12/src/pppoe-server.c
---- rp-pppoe-3.12/src/pppoe-server.c.ip-allocation	2015-11-11 16:10:04.000000000 +0100
-+++ rp-pppoe-3.12/src/pppoe-server.c	2015-11-16 16:50:53.209195100 +0100
-@@ -176,6 +176,9 @@ char PppoeOptions[SMALLBUF] = "";
+--- ./src/pppoe-server.c.orig	2020-05-26 19:29:37.000000000 -0500
++++ ./src/pppoe-server.c	2020-05-27 17:56:43.228890338 -0500
+@@ -182,6 +182,9 @@
  unsigned char LocalIP[IPV4ALEN] = {10, 0, 0, 1}; /* Counter optionally STARTS here */
  unsigned char RemoteIP[IPV4ALEN] = {10, 67, 15, 1}; /* Counter STARTS here */
  
@@ -26,7 +24,7 @@ diff -up rp-pppoe-3.12/src/pppoe-server.c.ip-allocation rp-pppoe-3.12/src/pppoe-
  /* Do we increment local IP for each connection? */
  int IncrLocalIP = 0;
  
-@@ -241,8 +244,8 @@ childHandler(pid_t pid, int status, void
+@@ -247,8 +250,8 @@
  
      memset(&conn, 0, sizeof(conn));
      conn.hostUniq = NULL;
@@ -37,7 +35,7 @@ diff -up rp-pppoe-3.12/src/pppoe-server.c.ip-allocation rp-pppoe-3.12/src/pppoe-
  	   "Session %u closed for client "
  	   "%02x:%02x:%02x:%02x:%02x:%02x (%d.%d.%d.%d) on %s",
  	   (unsigned int) ntohs(session->sess),
-@@ -251,6 +254,15 @@ childHandler(pid_t pid, int status, void
+@@ -257,6 +260,15 @@
  	   (int) session->realpeerip[0], (int) session->realpeerip[1],
  	   (int) session->realpeerip[2], (int) session->realpeerip[3],
  	   session->ethif->name);
@@ -53,7 +51,7 @@ diff -up rp-pppoe-3.12/src/pppoe-server.c.ip-allocation rp-pppoe-3.12/src/pppoe-
      memcpy(conn.myEth, session->ethif->mac, ETH_ALEN);
      conn.discoverySocket = session->ethif->sock;
      conn.session = session->sess;
-@@ -1134,6 +1146,7 @@ usage(char const *argv0)
+@@ -1155,6 +1167,7 @@
      fprintf(stderr, "   -L ip          -- Set local IP address.\n");
      fprintf(stderr, "   -l             -- Increment local IP address for each session.\n");
      fprintf(stderr, "   -R ip          -- Set start address of remote IP pool.\n");
@@ -61,19 +59,19 @@ diff -up rp-pppoe-3.12/src/pppoe-server.c.ip-allocation rp-pppoe-3.12/src/pppoe-
      fprintf(stderr, "   -S name        -- Advertise specified service-name.\n");
      fprintf(stderr, "   -O fname       -- Use PPPD options from specified file\n");
      fprintf(stderr, "                     (default %s).\n", PPPOE_SERVER_OPTIONS);
-@@ -1200,9 +1213,9 @@ main(int argc, char **argv)
+@@ -1224,9 +1237,9 @@
  #endif
  
  #ifndef HAVE_LINUX_KERNEL_PPPOE
--    char *options = "X:ix:hI:C:L:R:T:m:FN:f:O:o:sp:lrudPc:S:1q:Q:";
-+    char *options = "X:ix:hI:C:L:R:DT:m:FN:f:O:o:sp:lrudPc:S:1q:Q:";
+-    char *options = "X:ix:hI:C:L:R:T:m:FN:f:O:o:sp:lrudPc:S:1q:Q:H:M:";
++    char *options = "X:ix:hI:C:L:R:DT:m:FN:f:O:o:sp:lrudPc:S:1q:Q:H:M:";
  #else
--    char *options = "X:ix:hI:C:L:R:T:m:FN:f:O:o:skp:lrudPc:S:1q:Q:";
-+    char *options = "X:ix:hI:C:L:R:DT:m:FN:f:O:o:skp:lrudPc:S:1q:Q:";
+-    char *options = "X:ix:hI:C:L:R:T:m:FN:f:O:o:skp:lrudPc:S:1q:Q:H:M:";
++    char *options = "X:ix:hI:C:L:R:DT:m:FN:f:O:o:skp:lrudPc:S:1q:Q:H:M:";
  #endif
  
      if (getuid() != geteuid() ||
-@@ -1401,6 +1414,10 @@ main(int argc, char **argv)
+@@ -1448,6 +1461,10 @@
  	    }
  	    break;
  
@@ -84,7 +82,7 @@ diff -up rp-pppoe-3.12/src/pppoe-server.c.ip-allocation rp-pppoe-3.12/src/pppoe-
  	case 'T':
  	case 'm':
  	    /* These just get passed to pppoe */
-@@ -1915,6 +1932,7 @@ startPPPDUserMode(ClientSession *session
+@@ -2056,6 +2073,7 @@
      argv[c++] = "file";
      argv[c++] = pppoptfile;
  
@@ -92,7 +90,7 @@ diff -up rp-pppoe-3.12/src/pppoe-server.c.ip-allocation rp-pppoe-3.12/src/pppoe-
      snprintf(buffer, SMALLBUF, "%d.%d.%d.%d:%d.%d.%d.%d",
  	    (int) session->myip[0], (int) session->myip[1],
  	    (int) session->myip[2], (int) session->myip[3],
-@@ -1930,6 +1948,16 @@ startPPPDUserMode(ClientSession *session
+@@ -2071,6 +2089,16 @@
  	   session->ethif->name,
  	   session->serviceName);
      argv[c++] = strdup(buffer);
diff --git a/source/n/rp-pppoe/rp-pppoe.SlackBuild b/source/n/rp-pppoe/rp-pppoe.SlackBuild
index 1baf50c32..d777bfebc 100755
--- a/source/n/rp-pppoe/rp-pppoe.SlackBuild
+++ b/source/n/rp-pppoe/rp-pppoe.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rp-pppoe
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -72,7 +72,7 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-zcat $CWD/rp-pppoe-3.12-ip-allocation.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/rp-pppoe-3.14-ip-allocation.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/rp-pppoe-3.12-plugin.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/rp-pppoe-3.12-pluginpath.patch.gz | patch -p1 --verbose || exit 1
 zcat $CWD/rp-pppoe-manpages.patch.gz | patch -p1 --verbose || exit 1