diff options
| author | Adrien Nader <adrien@notk.org> | 2018-04-21 21:40:10 +0200 |
|---|---|---|
| committer | Adrien Nader <adrien@notk.org> | 2018-04-21 21:40:10 +0200 |
| commit | d21c8df34b5689d8c5d8caf970ecc0d993f4c88e (patch) | |
| tree | 4320d1ccfc9f3441126f90caf8d70888387c8de2 /slackware64-current/source/n/ppp | |
| parent | cdece968a570e1ca688f564cac70ecafdd407913 (diff) | |
Sat Apr 21 17:39:25 UTC 2018
a/lvm2-2.02.177-x86_64-1.txz: Upgraded.
a/pkgtools-15.0-noarch-9.txz: Rebuilt.
installpkg: fixed occasional lack of package size reported by the installer.
d/binutils-2.30-x86_64-3.txz: Rebuilt.
Fixed /usr/$TARGET/lib directory. Thanks to GazL.
n/gpgme-1.11.1-x86_64-1.txz: Upgraded.
n/ppp-2.4.7-x86_64-3.txz: Rebuilt.
Fixed rp-pppoe build. Thanks to voegelas for the bug report.
xfce/xfce4-settings-4.12.3-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'slackware64-current/source/n/ppp')
| -rw-r--r-- | slackware64-current/source/n/ppp/0028-pppoe-include-netinet-in.h-before-linux-in.h.patch.gz | 1 | ||||
| -rwxr-xr-x | slackware64-current/source/n/ppp/ppp.SlackBuild | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/slackware64-current/source/n/ppp/0028-pppoe-include-netinet-in.h-before-linux-in.h.patch.gz b/slackware64-current/source/n/ppp/0028-pppoe-include-netinet-in.h-before-linux-in.h.patch.gz new file mode 100644 index 000000000..8b49b51ed --- /dev/null +++ b/slackware64-current/source/n/ppp/0028-pppoe-include-netinet-in.h-before-linux-in.h.patch.gz @@ -0,0 +1 @@ +0e1e6b86551e6999a21d9e9930b65bca93157c64 diff --git a/slackware64-current/source/n/ppp/ppp.SlackBuild b/slackware64-current/source/n/ppp/ppp.SlackBuild index 24f927cac..6995c1892 100755 --- a/slackware64-current/source/n/ppp/ppp.SlackBuild +++ b/slackware64-current/source/n/ppp/ppp.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=ppp VERSION=2.4.7 RADVER=1.1.6 PPPVER=1.98 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -82,6 +82,8 @@ rm -f include/linux/if_pppol2tp.h 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 + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} || exit 1 @@ -105,6 +107,12 @@ zcat $CWD/options.new.gz > $PKG/etc/ppp/options.new # Since they are only runnable by group root, the risk really isn't much... chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/pppd/*/*.so +# The Makefile doesn't error out if building rp-pppoe.so fails, so check for it: +if [ ! -r $PKG/usr/lib${LIBDIRSUFFIX}/pppd/${VERSION}/rp-pppoe.so ]; then + echo "FATAL: /usr/lib${LIBDIRSUFFIX}/pppd/${VERSION}/rp-pppoe.so failed to build." + exit 1 +fi + mkdir -p $PKG/usr/doc/ppp-$VERSION cp -a \ FAQ PLUGINS README* SETUP scripts \ |