From 3e99129ce30e9474c935b340011d77bf3e72842b Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Jan 2021 20:42:50 +0000
Subject: Mon Jan 25 20:42:50 UTC 2021

a/openssl10-solibs-1.0.2u-x86_64-2.txz:  Removed.
d/make-4.3-x86_64-2.txz:  Rebuilt.
  We'll upgrade to make-4.3 again (with a few patches from Fedora) since this
  is now working with all the sources that we ship.
l/gst-plugins-base0-0.10.36-x86_64-4.txz:  Removed.
l/gst-plugins-good0-0.10.31-x86_64-4.txz:  Removed.
l/gstreamer0-0.10.36-x86_64-3.txz:  Removed.
l/libcap-2.47-x86_64-1.txz:  Upgraded.
l/libsamplerate-0.2.1-x86_64-1.txz:  Upgraded.
l/libvisual-plugins-0.4.0-x86_64-6.txz:  Rebuilt.
  Drop actor_gstreamer.so (requires gstreamer0).
l/mozjs78-78.7.0esr-x86_64-1.txz:  Upgraded.
l/talloc-2.3.2-x86_64-1.txz:  Upgraded.
n/NetworkManager-1.28.0-x86_64-4.txz:  Rebuilt.
  Rebuilt for ppp-2.4.9.
n/openssl10-1.0.2u-x86_64-2.txz:  Removed.
n/ppp-2.4.9-x86_64-1.txz:  Upgraded.
n/rp-pppoe-3.14-x86_64-3.txz:  Rebuilt.
  Rebuilt for ppp-2.4.9.
x/ibus-libpinyin-1.12.0-x86_64-1.txz:  Upgraded.
x/ibus-table-1.12.4-x86_64-1.txz:  Upgraded.
x/libpinyin-2.6.0-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-78.7.0esr-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/firefox/78.7.0/releasenotes/
  (* Security fix *)
xfce/xfce4-whiskermenu-plugin-2.5.3-x86_64-1.txz:  Upgraded.
---
 source/n/ppp/ppp.SlackBuild | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'source/n/ppp/ppp.SlackBuild')

diff --git a/source/n/ppp/ppp.SlackBuild b/source/n/ppp/ppp.SlackBuild
index d7f3722cb..c1de9c39a 100755
--- a/source/n/ppp/ppp.SlackBuild
+++ b/source/n/ppp/ppp.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2013, 2015, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2013, 2015, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,10 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=ppp
-VERSION=2.4.8
+VERSION=2.4.9
 RADVER=1.1.7
 PPPVER=1.98
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -65,8 +65,8 @@ echo "| ppp-$VERSION |"
 echo "+============+"
 cd $TMP
 rm -rf ppp-$VERSION ppp-ppp-$VERSION
-tar xvf $CWD/ppp-$VERSION.tar.xz || exit 1
-cd ppp-ppp-$VERSION || ppp-$VERSION || exit 1
+tar xvf $CWD/ppp-$VERSION.tar.?z || exit 1
+cd ppp-$VERSION || cd ppp-ppp-$VERSION || exit 1
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -81,7 +81,6 @@ sed -i -e "s#lib/pppd#lib${LIBDIRSUFFIX}/pppd#g" $(grep -lr 'lib/pppd' *)
 rm -f include/linux/if_pppol2tp.h
 
 zcat $CWD/ppp.CVE-2015-3310.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/ppp.CVE-2020-8597.patch.gz | patch -p1 --verbose || exit 1
 
 # Choose correct options depending on whether PAM is installed:
 if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
@@ -134,7 +133,7 @@ echo "| freeradius-client-$RADVER |"
 echo "+====================+"
 cd $TMP
 rm -rf freeradius-client-$RADVER
-tar xf $CWD/freeradius-client-$RADVER.tar.xz || exit 1
+tar xf $CWD/freeradius-client-$RADVER.tar.?z || exit 1
 cd freeradius-client-$RADVER || exit 1
 chown -R root:root .
 ./configure \
@@ -158,13 +157,15 @@ cp -a \
   BUGS CHANGES COPYRIGHT README README.radexample doc/instop.html \
   $PKG/usr/doc/freeradius-client-$RADVER
 chmod 644 $PKG/usr/doc/freeradius-client-$RADVER/*
+# Don't ship the static library:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libfreeradius-client.a
 
 echo "+===============+"
 echo "| pppsetup-$PPPVER |"
 echo "+===============+"
 cd $TMP
 rm -rf pppsetup-$PPPVER
-tar xvf $CWD/pppsetup-$PPPVER.tar.xz || exit 1
+tar xvf $CWD/pppsetup-$PPPVER.tar.?z || exit 1
 cd pppsetup-$PPPVER || exit 1
 chown -R root:root .
 zcat $CWD/pppsetup-1.98.slack.diff.gz | patch -p1 --backup || exit
-- 
cgit v1.2.3-65-gdbad