From 48e09f463d219d8975a3fb82f2d7d52a88472a9f Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 21 Sep 2018 18:51:07 +0000 Subject: Fri Sep 21 18:51:07 UTC 2018 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. --- source/n/ModemManager/ModemManager.SlackBuild | 2 +- source/n/NetworkManager/NetworkManager.SlackBuild | 2 +- source/n/alpine/alpine.SlackBuild | 2 +- source/n/autofs/autofs.SlackBuild | 2 +- source/n/bind/bind.SlackBuild | 2 +- source/n/bluez-firmware/bluez-firmware.SlackBuild | 2 +- source/n/bluez/bluez.SlackBuild | 2 +- source/n/bootp/bootp.SlackBuild | 2 +- source/n/bridge-utils/bridge-utils.SlackBuild | 4 +- source/n/cifs-utils/cifs-utils.SlackBuild | 2 +- .../n/conntrack-tools/conntrack-tools.SlackBuild | 2 +- source/n/curl/curl.SlackBuild | 2 +- source/n/dhcp/dhcp.SlackBuild | 2 +- source/n/dhcpcd/dhcpcd.SlackBuild | 2 +- source/n/dnsmasq/dnsmasq.SlackBuild | 2 +- source/n/dovecot/dovecot.SlackBuild | 2 +- source/n/epic5/epic5.SlackBuild | 2 +- source/n/fetchmail/fetchmail.SlackBuild | 2 +- source/n/gnupg/gnupg.SlackBuild | 2 +- source/n/gnupg2/gnupg2.SlackBuild | 2 +- source/n/gnutls/gnutls.SlackBuild | 2 +- source/n/gpa/gpa.SlackBuild | 2 +- source/n/gpgme/gpgme.SlackBuild | 2 +- source/n/htdig/htdig.SlackBuild | 2 +- source/n/httpd/httpd.SlackBuild | 2 +- source/n/icmpinfo/icmpinfo.SlackBuild | 2 +- source/n/iftop/iftop.SlackBuild | 2 +- source/n/iproute2/iproute2.SlackBuild | 2 +- source/n/ipset/ipset.SlackBuild | 2 +- source/n/iptables/iptables.SlackBuild | 2 +- source/n/iptraf-ng/iptraf-ng.SlackBuild | 2 +- source/n/iputils/iputils.SlackBuild | 2 +- source/n/irssi/irssi.SlackBuild | 2 +- source/n/iw/iw.SlackBuild | 2 +- source/n/lftp/lftp.SlackBuild | 2 +- source/n/libassuan/libassuan.SlackBuild | 2 +- source/n/libgcrypt/libgcrypt.SlackBuild | 2 +- source/n/libgpg-error/libgpg-error.SlackBuild | 2 +- source/n/libksba/libksba.SlackBuild | 2 +- source/n/libmbim/libmbim.SlackBuild | 2 +- source/n/libmnl/libmnl.SlackBuild | 2 +- source/n/libndp/libndp.SlackBuild | 2 +- .../libnetfilter_acct/libnetfilter_acct.SlackBuild | 2 +- .../libnetfilter_conntrack.SlackBuild | 2 +- .../libnetfilter_cthelper.SlackBuild | 2 +- .../libnetfilter_cttimeout.SlackBuild | 2 +- .../n/libnetfilter_log/libnetfilter_log.SlackBuild | 2 +- .../libnetfilter_queue.SlackBuild | 2 +- source/n/libnfnetlink/libnfnetlink.SlackBuild | 2 +- source/n/libnftnl/libnftnl.SlackBuild | 2 +- source/n/libqmi/libqmi.SlackBuild | 2 +- source/n/libtirpc/libtirpc.SlackBuild | 2 +- source/n/links/links.SlackBuild | 2 +- source/n/lynx/lynx.SlackBuild | 2 +- source/n/mailx/mailx.SlackBuild | 2 +- source/n/mcabber/mcabber.SlackBuild | 2 +- source/n/metamail/metamail.SlackBuild | 2 +- source/n/mtr/mtr.SlackBuild | 2 +- source/n/mutt/mutt.SlackBuild | 2 +- source/n/ncftp/ncftp.SlackBuild | 2 +- source/n/netatalk/netatalk.SlackBuild | 2 +- source/n/nettle/nettle.SlackBuild | 2 +- source/n/netwatch/netwatch.SlackBuild | 2 +- source/n/netwrite/netwrite.SlackBuild | 2 +- source/n/newspost/newspost.SlackBuild | 2 +- source/n/nfacct/nfacct.SlackBuild | 2 +- source/n/nfs-utils/nfs-utils.SlackBuild | 2 +- source/n/nftables/nftables.SlackBuild | 2 +- source/n/nghttp2/nghttp2.SlackBuild | 2 +- source/n/nmap/nmap.SlackBuild | 2 +- source/n/npth/npth.SlackBuild | 2 +- source/n/ntp/ntp.SlackBuild | 2 +- source/n/obexftp/obexftp.SlackBuild | 2 +- source/n/openobex/openobex.SlackBuild | 2 +- source/n/openssh/openssh.SlackBuild | 2 +- source/n/openssl/openssl.SlackBuild | 2 +- source/n/openssl10/openssl10.SlackBuild | 2 +- source/n/openvpn/openvpn.SlackBuild | 2 +- source/n/p11-kit/p11-kit.SlackBuild | 2 +- source/n/php/php.SlackBuild | 2 +- source/n/pidentd/pidentd.SlackBuild | 2 +- source/n/pinentry/pinentry.SlackBuild | 2 +- source/n/popa3d/popa3d.SlackBuild | 2 +- source/n/postfix/postfix.SlackBuild | 4 +- source/n/ppp/ppp.SlackBuild | 4 +- source/n/ppp/ppp.glibc228.diff | 74 ++++++++++++++++++++++ source/n/proftpd/proftpd.SlackBuild | 2 +- source/n/rdist/rdist.SlackBuild | 2 +- source/n/rp-pppoe/rp-pppoe.SlackBuild | 2 +- source/n/rpcbind/rpcbind.SlackBuild | 2 +- source/n/rsync/rsync.SlackBuild | 2 + source/n/samba/samba.SlackBuild | 2 +- source/n/slrn/slrn.SlackBuild | 2 +- source/n/snownews/snownews.SlackBuild | 2 +- source/n/sshfs/sshfs.SlackBuild | 2 +- source/n/stunnel/stunnel.SlackBuild | 2 +- source/n/tcp_wrappers/tcp_wrappers.SlackBuild | 2 +- source/n/tcpdump/tcpdump.SlackBuild | 2 +- source/n/tftp-hpa/tftp-hpa.SlackBuild | 2 +- source/n/traceroute/traceroute.SlackBuild | 2 +- source/n/ulogd/ulogd.SlackBuild | 2 +- source/n/vsftpd/vsftpd.SlackBuild | 2 +- source/n/wget/wget.SlackBuild | 2 +- source/n/wpa_supplicant/wpa_supplicant.SlackBuild | 2 +- source/n/ytalk/ytalk.SlackBuild | 2 +- 105 files changed, 183 insertions(+), 105 deletions(-) create mode 100644 source/n/ppp/ppp.glibc228.diff (limited to 'source/n') diff --git a/source/n/ModemManager/ModemManager.SlackBuild b/source/n/ModemManager/ModemManager.SlackBuild index 6b7ba2a1d..7a85c3de6 100755 --- a/source/n/ModemManager/ModemManager.SlackBuild +++ b/source/n/ModemManager/ModemManager.SlackBuild @@ -46,7 +46,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index d547ec176..5db588b52 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -49,7 +49,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild index 41e55c4b5..dd6f1de32 100755 --- a/source/n/alpine/alpine.SlackBuild +++ b/source/n/alpine/alpine.SlackBuild @@ -50,7 +50,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi # We don't use this below as it breaks the build. -NUMJOBS=${NUMJOBS:-" -j6 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/n/autofs/autofs.SlackBuild b/source/n/autofs/autofs.SlackBuild index e059b1783..e0cbeaa4d 100755 --- a/source/n/autofs/autofs.SlackBuild +++ b/source/n/autofs/autofs.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=autofs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index ec4d32269..9dca3e5c9 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/n/bluez-firmware/bluez-firmware.SlackBuild b/source/n/bluez-firmware/bluez-firmware.SlackBuild index 7249b645e..cb6337331 100755 --- a/source/n/bluez-firmware/bluez-firmware.SlackBuild +++ b/source/n/bluez-firmware/bluez-firmware.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild index 94a407d4a..86836ba59 100755 --- a/source/n/bluez/bluez.SlackBuild +++ b/source/n/bluez/bluez.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=bluez VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/bootp/bootp.SlackBuild b/source/n/bootp/bootp.SlackBuild index d3c89ee7e..cfb04f745 100755 --- a/source/n/bootp/bootp.SlackBuild +++ b/source/n/bootp/bootp.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-bootp diff --git a/source/n/bridge-utils/bridge-utils.SlackBuild b/source/n/bridge-utils/bridge-utils.SlackBuild index fc001d78e..e5789fa91 100755 --- a/source/n/bridge-utils/bridge-utils.SlackBuild +++ b/source/n/bridge-utils/bridge-utils.SlackBuild @@ -42,7 +42,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -61,7 +61,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild index 09920214a..c3f94f3fa 100755 --- a/source/n/cifs-utils/cifs-utils.SlackBuild +++ b/source/n/cifs-utils/cifs-utils.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/conntrack-tools/conntrack-tools.SlackBuild b/source/n/conntrack-tools/conntrack-tools.SlackBuild index 5221d3ca4..f78c75075 100755 --- a/source/n/conntrack-tools/conntrack-tools.SlackBuild +++ b/source/n/conntrack-tools/conntrack-tools.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=conntrack-tools VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild index 719930486..c11540346 100755 --- a/source/n/curl/curl.SlackBuild +++ b/source/n/curl/curl.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-curl diff --git a/source/n/dhcp/dhcp.SlackBuild b/source/n/dhcp/dhcp.SlackBuild index 62e65e558..9f4054f2b 100755 --- a/source/n/dhcp/dhcp.SlackBuild +++ b/source/n/dhcp/dhcp.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-2} PKG_VERSION=$(echo $VERSION | tr - _) -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild index 56c33a42d..ec3f57d44 100755 --- a/source/n/dhcpcd/dhcpcd.SlackBuild +++ b/source/n/dhcpcd/dhcpcd.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=dhcpcd VERSION=${VERSION:-$(echo dhcpcd-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild index 3ad8ca389..97968a8eb 100755 --- a/source/n/dnsmasq/dnsmasq.SlackBuild +++ b/source/n/dnsmasq/dnsmasq.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=dnsmasq VERSION=${VERSION:-$(echo dnsmasq-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild index af557472d..5f175de9b 100755 --- a/source/n/dovecot/dovecot.SlackBuild +++ b/source/n/dovecot/dovecot.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/epic5/epic5.SlackBuild b/source/n/epic5/epic5.SlackBuild index d76356020..54c038343 100755 --- a/source/n/epic5/epic5.SlackBuild +++ b/source/n/epic5/epic5.SlackBuild @@ -46,7 +46,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild index 37944c341..3b24b65b1 100755 --- a/source/n/fetchmail/fetchmail.SlackBuild +++ b/source/n/fetchmail/fetchmail.SlackBuild @@ -54,7 +54,7 @@ else SLKCFLAGS="-O2" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-fetchmail diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild index 8836b5526..2566b528e 100755 --- a/source/n/gnupg/gnupg.SlackBuild +++ b/source/n/gnupg/gnupg.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-gnupg diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild index fbb43c7b1..778094941 100755 --- a/source/n/gnupg2/gnupg2.SlackBuild +++ b/source/n/gnupg2/gnupg2.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=gnupg2 VERSION=${VERSION:-$(echo gnupg-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild index 11320730f..01710af64 100755 --- a/source/n/gnutls/gnutls.SlackBuild +++ b/source/n/gnutls/gnutls.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/gpa/gpa.SlackBuild b/source/n/gpa/gpa.SlackBuild index 7c150ab3b..b528665d4 100755 --- a/source/n/gpa/gpa.SlackBuild +++ b/source/n/gpa/gpa.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild index 3324ba4a4..69fb59059 100755 --- a/source/n/gpgme/gpgme.SlackBuild +++ b/source/n/gpgme/gpgme.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/htdig/htdig.SlackBuild b/source/n/htdig/htdig.SlackBuild index 7c817d54e..c60f4741b 100755 --- a/source/n/htdig/htdig.SlackBuild +++ b/source/n/htdig/htdig.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=htdig VERSION=${VERSION:-3.2.0b6} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 63424fba9..cb7db3d77 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.SlackBuild @@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/n/icmpinfo/icmpinfo.SlackBuild b/source/n/icmpinfo/icmpinfo.SlackBuild index b4e1a40b6..b33748a0b 100755 --- a/source/n/icmpinfo/icmpinfo.SlackBuild +++ b/source/n/icmpinfo/icmpinfo.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-icmpinfo diff --git a/source/n/iftop/iftop.SlackBuild b/source/n/iftop/iftop.SlackBuild index c66a9a63d..ccf6820ee 100755 --- a/source/n/iftop/iftop.SlackBuild +++ b/source/n/iftop/iftop.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild index 525b9472f..5fb458a8b 100755 --- a/source/n/iproute2/iproute2.SlackBuild +++ b/source/n/iproute2/iproute2.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=iproute2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -#NUMJOBS=${NUMJOBS:-" -j7 "} +#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/ipset/ipset.SlackBuild b/source/n/ipset/ipset.SlackBuild index 3cad37b5c..bddc474b5 100755 --- a/source/n/ipset/ipset.SlackBuild +++ b/source/n/ipset/ipset.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=ipset VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/iptables/iptables.SlackBuild b/source/n/iptables/iptables.SlackBuild index 65a514e56..c39bc2e0c 100755 --- a/source/n/iptables/iptables.SlackBuild +++ b/source/n/iptables/iptables.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=iptables VERSION=${VERSION:-$(echo iptables-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/iptraf-ng/iptraf-ng.SlackBuild b/source/n/iptraf-ng/iptraf-ng.SlackBuild index 1b8791739..1cb8cf130 100755 --- a/source/n/iptraf-ng/iptraf-ng.SlackBuild +++ b/source/n/iptraf-ng/iptraf-ng.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild index 238877998..c48c29a1a 100755 --- a/source/n/iputils/iputils.SlackBuild +++ b/source/n/iputils/iputils.SlackBuild @@ -54,7 +54,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-iputils diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild index d027a10fc..31dc068f3 100755 --- a/source/n/irssi/irssi.SlackBuild +++ b/source/n/irssi/irssi.SlackBuild @@ -48,7 +48,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/iw/iw.SlackBuild b/source/n/iw/iw.SlackBuild index 494bae014..3addeeb0a 100755 --- a/source/n/iw/iw.SlackBuild +++ b/source/n/iw/iw.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/lftp/lftp.SlackBuild b/source/n/lftp/lftp.SlackBuild index 865e1c4b1..900cfad72 100755 --- a/source/n/lftp/lftp.SlackBuild +++ b/source/n/lftp/lftp.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=lftp VERSION=${VERSION:-$(echo lftp-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libassuan/libassuan.SlackBuild b/source/n/libassuan/libassuan.SlackBuild index aef87965e..be72665af 100755 --- a/source/n/libassuan/libassuan.SlackBuild +++ b/source/n/libassuan/libassuan.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/libgcrypt/libgcrypt.SlackBuild b/source/n/libgcrypt/libgcrypt.SlackBuild index d78103cc7..a807927b0 100755 --- a/source/n/libgcrypt/libgcrypt.SlackBuild +++ b/source/n/libgcrypt/libgcrypt.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/libgpg-error/libgpg-error.SlackBuild b/source/n/libgpg-error/libgpg-error.SlackBuild index 8e3f05adf..a21342754 100755 --- a/source/n/libgpg-error/libgpg-error.SlackBuild +++ b/source/n/libgpg-error/libgpg-error.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/libksba/libksba.SlackBuild b/source/n/libksba/libksba.SlackBuild index 9dcfe4913..aff2b052e 100755 --- a/source/n/libksba/libksba.SlackBuild +++ b/source/n/libksba/libksba.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/n/libmbim/libmbim.SlackBuild b/source/n/libmbim/libmbim.SlackBuild index f669c963d..6066878b8 100755 --- a/source/n/libmbim/libmbim.SlackBuild +++ b/source/n/libmbim/libmbim.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libmbim VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libmnl/libmnl.SlackBuild b/source/n/libmnl/libmnl.SlackBuild index e38a471e7..ba680e013 100755 --- a/source/n/libmnl/libmnl.SlackBuild +++ b/source/n/libmnl/libmnl.SlackBuild @@ -29,7 +29,7 @@ PKGNAM=libmnl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libndp/libndp.SlackBuild b/source/n/libndp/libndp.SlackBuild index 8aae6f1be..4852c60d4 100755 --- a/source/n/libndp/libndp.SlackBuild +++ b/source/n/libndp/libndp.SlackBuild @@ -62,7 +62,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/n/libnetfilter_acct/libnetfilter_acct.SlackBuild b/source/n/libnetfilter_acct/libnetfilter_acct.SlackBuild index 0d709201e..7c230c886 100755 --- a/source/n/libnetfilter_acct/libnetfilter_acct.SlackBuild +++ b/source/n/libnetfilter_acct/libnetfilter_acct.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libnetfilter_acct VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild b/source/n/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild index 22afe73cf..cd30fb1ca 100755 --- a/source/n/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild +++ b/source/n/libnetfilter_conntrack/libnetfilter_conntrack.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libnetfilter_conntrack VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libnetfilter_cthelper/libnetfilter_cthelper.SlackBuild b/source/n/libnetfilter_cthelper/libnetfilter_cthelper.SlackBuild index 2bf3822fc..d0e301856 100755 --- a/source/n/libnetfilter_cthelper/libnetfilter_cthelper.SlackBuild +++ b/source/n/libnetfilter_cthelper/libnetfilter_cthelper.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libnetfilter_cthelper VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libnetfilter_cttimeout/libnetfilter_cttimeout.SlackBuild b/source/n/libnetfilter_cttimeout/libnetfilter_cttimeout.SlackBuild index 47168d76e..d1f9745ae 100755 --- a/source/n/libnetfilter_cttimeout/libnetfilter_cttimeout.SlackBuild +++ b/source/n/libnetfilter_cttimeout/libnetfilter_cttimeout.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libnetfilter_cttimeout VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libnetfilter_log/libnetfilter_log.SlackBuild b/source/n/libnetfilter_log/libnetfilter_log.SlackBuild index 20fecfca3..56ac99c42 100755 --- a/source/n/libnetfilter_log/libnetfilter_log.SlackBuild +++ b/source/n/libnetfilter_log/libnetfilter_log.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libnetfilter_log VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libnetfilter_queue/libnetfilter_queue.SlackBuild b/source/n/libnetfilter_queue/libnetfilter_queue.SlackBuild index 149d3180e..26d692fec 100755 --- a/source/n/libnetfilter_queue/libnetfilter_queue.SlackBuild +++ b/source/n/libnetfilter_queue/libnetfilter_queue.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libnetfilter_queue VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libnfnetlink/libnfnetlink.SlackBuild b/source/n/libnfnetlink/libnfnetlink.SlackBuild index 8d3a1446d..a8c3edd91 100755 --- a/source/n/libnfnetlink/libnfnetlink.SlackBuild +++ b/source/n/libnfnetlink/libnfnetlink.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libnfnetlink VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libnftnl/libnftnl.SlackBuild b/source/n/libnftnl/libnftnl.SlackBuild index 5dc043563..cbe2c96e6 100755 --- a/source/n/libnftnl/libnftnl.SlackBuild +++ b/source/n/libnftnl/libnftnl.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libnftnl VERSION=${VERSION:-$(echo $PKGNAM-*.tar.lz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libqmi/libqmi.SlackBuild b/source/n/libqmi/libqmi.SlackBuild index aace4c5d6..a1100465d 100755 --- a/source/n/libqmi/libqmi.SlackBuild +++ b/source/n/libqmi/libqmi.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=libqmi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/libtirpc/libtirpc.SlackBuild b/source/n/libtirpc/libtirpc.SlackBuild index 2c908841e..31384442b 100755 --- a/source/n/libtirpc/libtirpc.SlackBuild +++ b/source/n/libtirpc/libtirpc.SlackBuild @@ -55,7 +55,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" diff --git a/source/n/links/links.SlackBuild b/source/n/links/links.SlackBuild index 8b5baafe8..06b5a19ff 100755 --- a/source/n/links/links.SlackBuild +++ b/source/n/links/links.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-links diff --git a/source/n/lynx/lynx.SlackBuild b/source/n/lynx/lynx.SlackBuild index 721c4afe7..b0ff4441b 100755 --- a/source/n/lynx/lynx.SlackBuild +++ b/source/n/lynx/lynx.SlackBuild @@ -27,7 +27,7 @@ PKGVER=2.8.9dev.19 DIRVER=2.8.9dev.19 BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/mailx/mailx.SlackBuild b/source/n/mailx/mailx.SlackBuild index 5f9835b93..9a2b28795 100755 --- a/source/n/mailx/mailx.SlackBuild +++ b/source/n/mailx/mailx.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/mcabber/mcabber.SlackBuild b/source/n/mcabber/mcabber.SlackBuild index 35468c8f9..23bf58c00 100755 --- a/source/n/mcabber/mcabber.SlackBuild +++ b/source/n/mcabber/mcabber.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=mcabber VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-4} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/metamail/metamail.SlackBuild b/source/n/metamail/metamail.SlackBuild index 2062a08a9..8f2bc52c2 100755 --- a/source/n/metamail/metamail.SlackBuild +++ b/source/n/metamail/metamail.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/mtr/mtr.SlackBuild b/source/n/mtr/mtr.SlackBuild index ae69b7475..657c81c00 100755 --- a/source/n/mtr/mtr.SlackBuild +++ b/source/n/mtr/mtr.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/mutt/mutt.SlackBuild b/source/n/mutt/mutt.SlackBuild index 7abde88cc..01293eb8c 100755 --- a/source/n/mutt/mutt.SlackBuild +++ b/source/n/mutt/mutt.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi TMP=${TMP:-/tmp} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mcpu=i686" diff --git a/source/n/ncftp/ncftp.SlackBuild b/source/n/ncftp/ncftp.SlackBuild index 06a5787b1..dbfbc8c25 100755 --- a/source/n/ncftp/ncftp.SlackBuild +++ b/source/n/ncftp/ncftp.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild index 240fae066..d6a7bf93e 100755 --- a/source/n/netatalk/netatalk.SlackBuild +++ b/source/n/netatalk/netatalk.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=netatalk VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/nettle/nettle.SlackBuild b/source/n/nettle/nettle.SlackBuild index 3934f727e..8a9223458 100755 --- a/source/n/nettle/nettle.SlackBuild +++ b/source/n/nettle/nettle.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=nettle VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/netwatch/netwatch.SlackBuild b/source/n/netwatch/netwatch.SlackBuild index 93b137423..afe07aced 100755 --- a/source/n/netwatch/netwatch.SlackBuild +++ b/source/n/netwatch/netwatch.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/netwrite/netwrite.SlackBuild b/source/n/netwrite/netwrite.SlackBuild index 4027e4528..3a94326e8 100755 --- a/source/n/netwrite/netwrite.SlackBuild +++ b/source/n/netwrite/netwrite.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-netwrite diff --git a/source/n/newspost/newspost.SlackBuild b/source/n/newspost/newspost.SlackBuild index 129801399..31812215a 100755 --- a/source/n/newspost/newspost.SlackBuild +++ b/source/n/newspost/newspost.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-newspost diff --git a/source/n/nfacct/nfacct.SlackBuild b/source/n/nfacct/nfacct.SlackBuild index b7c41ff03..3541de817 100755 --- a/source/n/nfacct/nfacct.SlackBuild +++ b/source/n/nfacct/nfacct.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=nfacct VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild index 147a69b82..5b9b724f1 100755 --- a/source/n/nfs-utils/nfs-utils.SlackBuild +++ b/source/n/nfs-utils/nfs-utils.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/nftables/nftables.SlackBuild b/source/n/nftables/nftables.SlackBuild index 307a30db8..6146cb6ed 100755 --- a/source/n/nftables/nftables.SlackBuild +++ b/source/n/nftables/nftables.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=nftables VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/nghttp2/nghttp2.SlackBuild b/source/n/nghttp2/nghttp2.SlackBuild index 0e2099bb0..71aedb538 100755 --- a/source/n/nghttp2/nghttp2.SlackBuild +++ b/source/n/nghttp2/nghttp2.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/nmap/nmap.SlackBuild b/source/n/nmap/nmap.SlackBuild index f980567bf..7675a7467 100755 --- a/source/n/nmap/nmap.SlackBuild +++ b/source/n/nmap/nmap.SlackBuild @@ -61,7 +61,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-nmap diff --git a/source/n/npth/npth.SlackBuild b/source/n/npth/npth.SlackBuild index fee033f7f..a838786e6 100755 --- a/source/n/npth/npth.SlackBuild +++ b/source/n/npth/npth.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/pkg-$PKGNAM diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild index 66e472d20..1bf473b3b 100755 --- a/source/n/ntp/ntp.SlackBuild +++ b/source/n/ntp/ntp.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/obexftp/obexftp.SlackBuild b/source/n/obexftp/obexftp.SlackBuild index cf3cd415b..7f7779930 100755 --- a/source/n/obexftp/obexftp.SlackBuild +++ b/source/n/obexftp/obexftp.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=obexftp VERSION=${VERSION:-$(echo $PKGNAM-*-Source.tar.?z* | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/openobex/openobex.SlackBuild b/source/n/openobex/openobex.SlackBuild index 7f415a48d..72c656ee3 100755 --- a/source/n/openobex/openobex.SlackBuild +++ b/source/n/openobex/openobex.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=openobex VERSION=${VERSION:-$(echo $PKGNAM-*-Source.tar.?z* | rev | cut -f 3- -d . | cut -f 2 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine architecture for build & packaging: if [ -z "$ARCH" ]; then diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index b1a741036..8f15eb463 100755 --- a/source/n/openssh/openssh.SlackBuild +++ b/source/n/openssh/openssh.SlackBuild @@ -32,7 +32,7 @@ PKGNAM=openssh VERSION=${VERSION:-$(echo openssh-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild index 0d9e08e67..b32173be0 100755 --- a/source/n/openssl/openssl.SlackBuild +++ b/source/n/openssl/openssl.SlackBuild @@ -55,7 +55,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi # Parallel build doesn't link properly. -#NUMJOBS=${NUMJOBS:--j6} +#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # So that ls has the right field counts for parsing... export LC_ALL=C diff --git a/source/n/openssl10/openssl10.SlackBuild b/source/n/openssl10/openssl10.SlackBuild index c718ca8c6..ead064991 100755 --- a/source/n/openssl10/openssl10.SlackBuild +++ b/source/n/openssl10/openssl10.SlackBuild @@ -55,7 +55,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then fi # Parallel build doesn't link properly. -#NUMJOBS=${NUMJOBS:--j6} +#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # So that ls has the right field counts for parsing... export LC_ALL=C diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild index c8457f9d3..77b66799c 100755 --- a/source/n/openvpn/openvpn.SlackBuild +++ b/source/n/openvpn/openvpn.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/p11-kit/p11-kit.SlackBuild b/source/n/p11-kit/p11-kit.SlackBuild index ebfd1a6a4..9ef235a43 100755 --- a/source/n/p11-kit/p11-kit.SlackBuild +++ b/source/n/p11-kit/p11-kit.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=p11-kit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index a06233364..2e142fd8f 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -48,7 +48,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-php/ diff --git a/source/n/pidentd/pidentd.SlackBuild b/source/n/pidentd/pidentd.SlackBuild index 841d497d6..f4c927a67 100755 --- a/source/n/pidentd/pidentd.SlackBuild +++ b/source/n/pidentd/pidentd.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-pidentd diff --git a/source/n/pinentry/pinentry.SlackBuild b/source/n/pinentry/pinentry.SlackBuild index 2e55bb7fa..b37c67185 100755 --- a/source/n/pinentry/pinentry.SlackBuild +++ b/source/n/pinentry/pinentry.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/popa3d/popa3d.SlackBuild b/source/n/popa3d/popa3d.SlackBuild index 8d7a7c31d..6a9054ac9 100755 --- a/source/n/popa3d/popa3d.SlackBuild +++ b/source/n/popa3d/popa3d.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-popa3d diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild index 54304571e..e82b1d43a 100755 --- a/source/n/postfix/postfix.SlackBuild +++ b/source/n/postfix/postfix.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=postfix VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -64,7 +64,7 @@ else LIBDIRSUFFIX="" fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$(grep "^postfix:x:91:91" /etc/passwd)" = "" -o \ "$(grep "^postfix:x:91:" /etc/group)" = "" -o \ diff --git a/source/n/ppp/ppp.SlackBuild b/source/n/ppp/ppp.SlackBuild index a427e469e..23550c12f 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 000000000..6faed287e --- /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 diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild index 7d04e9e6c..6a9114033 100755 --- a/source/n/proftpd/proftpd.SlackBuild +++ b/source/n/proftpd/proftpd.SlackBuild @@ -27,7 +27,7 @@ VERSION=1.3.6 DIRVER=1.3.6 BUILD=${BUILD:-4} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin:mod_quotatab:mod_quotatab_file:mod_sftp:mod_facl" diff --git a/source/n/rdist/rdist.SlackBuild b/source/n/rdist/rdist.SlackBuild index abe19de8a..785a33a5f 100755 --- a/source/n/rdist/rdist.SlackBuild +++ b/source/n/rdist/rdist.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=rdist VERSION=${VERSION:-6.1.5} BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/rp-pppoe/rp-pppoe.SlackBuild b/source/n/rp-pppoe/rp-pppoe.SlackBuild index f392cbef3..f3b95e113 100755 --- a/source/n/rp-pppoe/rp-pppoe.SlackBuild +++ b/source/n/rp-pppoe/rp-pppoe.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/rpcbind/rpcbind.SlackBuild b/source/n/rpcbind/rpcbind.SlackBuild index 4006dfd76..e28a2ad84 100755 --- a/source/n/rpcbind/rpcbind.SlackBuild +++ b/source/n/rpcbind/rpcbind.SlackBuild @@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" diff --git a/source/n/rsync/rsync.SlackBuild b/source/n/rsync/rsync.SlackBuild index cba7a17c0..3a97cd072 100755 --- a/source/n/rsync/rsync.SlackBuild +++ b/source/n/rsync/rsync.SlackBuild @@ -44,6 +44,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index 4cfc9510f..21fa7883e 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.SlackBuild @@ -71,7 +71,7 @@ case "$ARCH" in *) TARGET=$ARCH-slackware-linux ;; esac -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-samba diff --git a/source/n/slrn/slrn.SlackBuild b/source/n/slrn/slrn.SlackBuild index 733539fb6..3981567ec 100755 --- a/source/n/slrn/slrn.SlackBuild +++ b/source/n/slrn/slrn.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/snownews/snownews.SlackBuild b/source/n/snownews/snownews.SlackBuild index ebddfdda4..66f1347bf 100755 --- a/source/n/snownews/snownews.SlackBuild +++ b/source/n/snownews/snownews.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/sshfs/sshfs.SlackBuild b/source/n/sshfs/sshfs.SlackBuild index bec5a9e61..8f4aae010 100755 --- a/source/n/sshfs/sshfs.SlackBuild +++ b/source/n/sshfs/sshfs.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=sshfs VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/stunnel/stunnel.SlackBuild b/source/n/stunnel/stunnel.SlackBuild index f464331c0..0c656d80b 100755 --- a/source/n/stunnel/stunnel.SlackBuild +++ b/source/n/stunnel/stunnel.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild index 86e1856b4..48344c267 100755 --- a/source/n/tcp_wrappers/tcp_wrappers.SlackBuild +++ b/source/n/tcp_wrappers/tcp_wrappers.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" diff --git a/source/n/tcpdump/tcpdump.SlackBuild b/source/n/tcpdump/tcpdump.SlackBuild index 5ef1bf727..101eb45eb 100755 --- a/source/n/tcpdump/tcpdump.SlackBuild +++ b/source/n/tcpdump/tcpdump.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" diff --git a/source/n/tftp-hpa/tftp-hpa.SlackBuild b/source/n/tftp-hpa/tftp-hpa.SlackBuild index ce6429b66..326363d87 100755 --- a/source/n/tftp-hpa/tftp-hpa.SlackBuild +++ b/source/n/tftp-hpa/tftp-hpa.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-tftp-hpa diff --git a/source/n/traceroute/traceroute.SlackBuild b/source/n/traceroute/traceroute.SlackBuild index a29d29fae..74f285f52 100755 --- a/source/n/traceroute/traceroute.SlackBuild +++ b/source/n/traceroute/traceroute.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX=64 diff --git a/source/n/ulogd/ulogd.SlackBuild b/source/n/ulogd/ulogd.SlackBuild index c1709aaf5..b6b45f7ad 100755 --- a/source/n/ulogd/ulogd.SlackBuild +++ b/source/n/ulogd/ulogd.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=ulogd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild index 6c38886a3..a92b89bc1 100755 --- a/source/n/vsftpd/vsftpd.SlackBuild +++ b/source/n/vsftpd/vsftpd.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=vsftpd VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-5} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/wget/wget.SlackBuild b/source/n/wget/wget.SlackBuild index 39b814192..ddbbd1c44 100755 --- a/source/n/wget/wget.SlackBuild +++ b/source/n/wget/wget.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=wget VERSION=${VERSION:-$(echo wget-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index f753cc720..d4e56cbbd 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" diff --git a/source/n/ytalk/ytalk.SlackBuild b/source/n/ytalk/ytalk.SlackBuild index d94e606be..3c34f3561 100755 --- a/source/n/ytalk/ytalk.SlackBuild +++ b/source/n/ytalk/ytalk.SlackBuild @@ -44,7 +44,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j7 "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" -- cgit v1.2.3