diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-09-21 18:51:07 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-09-22 09:00:39 +0200 |
commit | 48e09f463d219d8975a3fb82f2d7d52a88472a9f (patch) | |
tree | b664168d83cb02a14256d4ecce13202a59834b20 /source/n/ppp | |
parent | a22d1843900f65ede3f87d55207ca0b8f2a38b98 (diff) | |
download | current-48e09f463d219d8975a3fb82f2d7d52a88472a9f.tar.gz |
Fri Sep 21 18:51:07 UTC 201820180921185107
a/eudev-3.2.6-x86_64-1.txz: Upgraded.
a/glibc-solibs-2.28-x86_64-2.txz: Upgraded.
a/grub-2.02-x86_64-3.txz: Rebuilt.
Patched to fix compatibility with recent xfsprogs. Thanks to Markus Wiesner.
a/kernel-generic-4.14.71-x86_64-1.txz: Upgraded.
a/kernel-huge-4.14.71-x86_64-1.txz: Upgraded.
a/kernel-modules-4.14.71-x86_64-1.txz: Upgraded.
ap/opus-tools-0.2-x86_64-1.txz: Upgraded.
ap/sqlite-3.25.1-x86_64-1.txz: Upgraded.
d/icecream-20180905_cdc6ff8-x86_64-1.txz: Upgraded.
d/kernel-headers-4.14.71-x86-1.txz: Upgraded.
d/llvm-7.0.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
k/kernel-source-4.14.71-noarch-1.txz: Upgraded.
l/ffmpeg-3.4.4-x86_64-2.txz: Rebuilt.
Don't try to link with Samba since the latest version is not compatible.
l/glibc-2.28-x86_64-2.txz: Upgraded.
All packages have been patched where needed for glibc-2.28 and compile
tested here. Thanks to nobodino for the help.
l/glibc-i18n-2.28-x86_64-2.txz: Upgraded.
l/glibc-profile-2.28-x86_64-2.txz: Upgraded.
l/gst-plugins-base-1.14.3-x86_64-1.txz: Upgraded.
l/gst-plugins-good-1.14.3-x86_64-1.txz: Upgraded.
l/gst-plugins-libav-1.14.3-x86_64-1.txz: Upgraded.
l/gstreamer-1.14.3-x86_64-1.txz: Upgraded.
l/imagemagick-6.9.10_11-x86_64-1.txz: Upgraded.
l/libopusenc-0.2-x86_64-1.txz: Added.
l/librsvg-2.44.3-x86_64-1.txz: Upgraded.
l/opus-1.3_rc2-x86_64-1.txz: Upgraded.
l/opusfile-0.11-x86_64-1.txz: Upgraded.
l/soprano-2.9.4-x86_64-3.txz: Rebuilt.
Recompiled to drop virtuoso dependency.
l/virtuoso-ose-6.1.8-x86_64-9.txz: Removed.
Even KDE4 has migrated away from actually using this for anything. The last
thing in Slackware that was dependent on it was Soprano, which has been
recompiled to no longer use it.
n/postfix-3.3.1-x86_64-2.txz: Rebuilt.
Recompiled so that it quits whining about OpenSSL. Thanks to shastah.
x/mesa-18.2.1-x86_64-1.txz: Upgraded.
Compiled against llvm-7.0.0.
x/xf86-video-vmware-13.3.0-x86_64-2.txz: Rebuilt.
Recompiled against llvm-7.0.0.
x/xterm-336-x86_64-1.txz: Upgraded.
extra/pure-alsa-system/ffmpeg-3.4.4-x86_64-2_alsa.txz: Rebuilt.
Don't try to link with Samba since the latest version is not compatible.
extra/pure-alsa-system/gst-plugins-good-1.14.3-x86_64-1_alsa.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/n/ppp')
-rwxr-xr-x | source/n/ppp/ppp.SlackBuild | 4 | ||||
-rw-r--r-- | source/n/ppp/ppp.glibc228.diff | 74 |
2 files changed, 77 insertions, 1 deletions
diff --git a/source/n/ppp/ppp.SlackBuild b/source/n/ppp/ppp.SlackBuild index a427e469..23550c12 100755 --- a/source/n/ppp/ppp.SlackBuild +++ b/source/n/ppp/ppp.SlackBuild @@ -28,7 +28,7 @@ RADVER=1.1.6 PPPVER=1.98 BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -84,6 +84,8 @@ zcat $CWD/ppp.CVE-2015-3310.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/0028-pppoe-include-netinet-in.h-before-linux-in.h.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/ppp.glibc228.diff.gz | patch -p1 --verbose || exit 1 + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} || exit 1 diff --git a/source/n/ppp/ppp.glibc228.diff b/source/n/ppp/ppp.glibc228.diff new file mode 100644 index 00000000..6faed287 --- /dev/null +++ b/source/n/ppp/ppp.glibc228.diff @@ -0,0 +1,74 @@ +--- ./pppd/pppcrypt.c.orig 2014-08-09 07:31:39.000000000 -0500 ++++ ./pppd/pppcrypt.c 2018-09-18 18:59:26.393068817 -0500 +@@ -110,7 +110,7 @@ + } + + bool +-DesSetkey(key) ++setkey(key) + u_char *key; + { + u_char des_key[8]; +@@ -126,7 +126,7 @@ + } + + bool +-DesEncrypt(clear, cipher) ++encrypt(clear, cipher) + u_char *clear; /* IN 8 octets */ + u_char *cipher; /* OUT 8 octets */ + { +@@ -161,7 +161,7 @@ + static des_key_schedule key_schedule; + + bool +-DesSetkey(key) ++setkey(key) + u_char *key; + { + des_cblock des_key; +@@ -171,7 +171,7 @@ + } + + bool +-DesEncrypt(clear, key, cipher) ++encrypt(clear, key, cipher) + u_char *clear; /* IN 8 octets */ + u_char *cipher; /* OUT 8 octets */ + { +--- ./pppd/chap_ms.c.orig 2014-08-09 07:31:39.000000000 -0500 ++++ ./pppd/chap_ms.c 2018-09-18 18:59:26.391068817 -0500 +@@ -518,12 +518,12 @@ + sizeof(ZPasswordHash), ZPasswordHash); + #endif + +- (void) DesSetkey(ZPasswordHash + 0); +- DesEncrypt(challenge, response + 0); +- (void) DesSetkey(ZPasswordHash + 7); +- DesEncrypt(challenge, response + 8); +- (void) DesSetkey(ZPasswordHash + 14); +- DesEncrypt(challenge, response + 16); ++ (void) setkey(ZPasswordHash + 0); ++ encrypt(challenge, response + 0); ++ (void) setkey(ZPasswordHash + 7); ++ encrypt(challenge, response + 8); ++ (void) setkey(ZPasswordHash + 14); ++ encrypt(challenge, response + 16); + + #if 0 + dbglog("ChallengeResponse - response %.24B", response); +@@ -640,10 +640,10 @@ + BZERO(UcasePassword, sizeof(UcasePassword)); + for (i = 0; i < secret_len; i++) + UcasePassword[i] = (u_char)toupper(secret[i]); +- (void) DesSetkey(UcasePassword + 0); +- DesEncrypt( StdText, PasswordHash + 0 ); +- (void) DesSetkey(UcasePassword + 7); +- DesEncrypt( StdText, PasswordHash + 8 ); ++ (void) setkey(UcasePassword + 0); ++ encrypt( StdText, PasswordHash + 0 ); ++ (void) setkey(UcasePassword + 7); ++ encrypt( StdText, PasswordHash + 8 ); + ChallengeResponse(rchallenge, PasswordHash, &response[MS_CHAP_LANMANRESP]); + } + #endif |