diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/kde/kde/build/krita | 2 | ||||
-rwxr-xr-x | source/l/mlt/mlt.SlackBuild | 2 | ||||
-rw-r--r-- | source/l/mlt/mlt.deps | 4 | ||||
-rw-r--r-- | source/l/mozilla-nss/CVE-2022-3479.patch | 23 | ||||
-rwxr-xr-x | source/l/mozilla-nss/mozilla-nss.SlackBuild | 3 | ||||
-rw-r--r-- | source/l/phonon/phonon.deps | 1 | ||||
-rw-r--r-- | source/n/FTBFSlog | 3 | ||||
-rwxr-xr-x | source/n/dehydrated/dehydrated.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/s-nail/s-nail.SlackBuild | 5 | ||||
-rwxr-xr-x | source/n/ulogd/ulogd.SlackBuild | 2 |
10 files changed, 35 insertions, 12 deletions
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/krita +++ b/source/kde/kde/build/krita @@ -1 +1 @@ -2 +1 diff --git a/source/l/mlt/mlt.SlackBuild b/source/l/mlt/mlt.SlackBuild index 8a688f399..66c34e9bd 100755 --- a/source/l/mlt/mlt.SlackBuild +++ b/source/l/mlt/mlt.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mlt 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 diff --git a/source/l/mlt/mlt.deps b/source/l/mlt/mlt.deps deleted file mode 100644 index 9c0527b33..000000000 --- a/source/l/mlt/mlt.deps +++ /dev/null @@ -1,4 +0,0 @@ -frei0r-plugins -opencv -qt5 -vid.stab diff --git a/source/l/mozilla-nss/CVE-2022-3479.patch b/source/l/mozilla-nss/CVE-2022-3479.patch new file mode 100644 index 000000000..5f80fdc09 --- /dev/null +++ b/source/l/mozilla-nss/CVE-2022-3479.patch @@ -0,0 +1,23 @@ +diff --git a/lib/ssl/authcert.c b/lib/ssl/authcert.c +--- a/lib/ssl/authcert.c ++++ b/lib/ssl/authcert.c +@@ -212,17 +212,17 @@ NSS_GetClientAuthData(void *arg, + pw_arg); + } else { + int nnames = 0; + char **names = ssl_DistNamesToStrings(caNames, &nnames); + rv = CERT_FilterCertListByCANames(certList, nnames, names, + certUsageSSLClient); + ssl_FreeDistNamesStrings(names, nnames); + } +- if ((rv != SECSuccess) || CERT_LIST_EMPTY(certList)) { ++ if ((rv != SECSuccess) || (certList && CERT_LIST_EMPTY(certList))) { + CERT_DestroyCertList(certList); + certList = NULL; + } + } + if (certList == NULL) { + /* no user certs meeting the nickname/usage requirements found */ + return SECFailure; + } + diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild index faa2abea0..2dc89c522 100755 --- a/source/l/mozilla-nss/mozilla-nss.SlackBuild +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -28,7 +28,7 @@ PKGNAM=mozilla-nss SRCNAM=nss VERSION=${VERSION:-3.84} NSPR=${NSPR:-4.35} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -93,6 +93,7 @@ find . \ -exec chmod 644 {} \+ cd nss +zcat $CWD/CVE-2022-3479.patch.gz | patch -p1 --verbose || exit 1 ./build.sh -v $NUMJOBS --opt --system-sqlite --enable-libpkix --disable-tests cd - diff --git a/source/l/phonon/phonon.deps b/source/l/phonon/phonon.deps deleted file mode 100644 index bc90dbd95..000000000 --- a/source/l/phonon/phonon.deps +++ /dev/null @@ -1 +0,0 @@ -extra-cmake-modules diff --git a/source/n/FTBFSlog b/source/n/FTBFSlog index af7ad674b..ea16011c0 100644 --- a/source/n/FTBFSlog +++ b/source/n/FTBFSlog @@ -1,3 +1,6 @@ +Thu Nov 3 18:45:20 UTC 2022 + s-nail: fix build with make-4.4. Thanks to nobodino and marav. ++--------------------------+ Wed Aug 3 19:33:03 UTC 2022 php: fix alpine version. Thanks to nobodino. +--------------------------+ diff --git a/source/n/dehydrated/dehydrated.SlackBuild b/source/n/dehydrated/dehydrated.SlackBuild index 30abe9035..5ce7ab76f 100755 --- a/source/n/dehydrated/dehydrated.SlackBuild +++ b/source/n/dehydrated/dehydrated.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dehydrated VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} ARCH=noarch diff --git a/source/n/s-nail/s-nail.SlackBuild b/source/n/s-nail/s-nail.SlackBuild index ccb0f4e20..dfd396d0e 100755 --- a/source/n/s-nail/s-nail.SlackBuild +++ b/source/n/s-nail/s-nail.SlackBuild @@ -45,7 +45,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} +# Don't use parallel build: +#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -81,7 +82,7 @@ find -L . \ zcat $CWD/s-nail.no.emptystart.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ -make $NUMJOBS \ +make "${confopts[@]}" \ VAL_PREFIX=/usr \ VAL_SYSCONFDIR=/etc \ VAL_MANDIR=/usr/man \ diff --git a/source/n/ulogd/ulogd.SlackBuild b/source/n/ulogd/ulogd.SlackBuild index 27bf6d72d..0670cf25e 100755 --- a/source/n/ulogd/ulogd.SlackBuild +++ b/source/n/ulogd/ulogd.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ulogd VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} |