summaryrefslogtreecommitdiffstats
path: root/source/a
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-07-28 19:47:22 +0000
committer Eric Hameleers <alien@slackware.com>2023-07-28 22:29:29 +0200
commit78600998862393eb6d3ce28347224eb6d7c23e87 (patch)
tree2b3e1295024e3c126bdb3ec0b34896de32f74453 /source/a
parent6d151ae8bcdaf19a684139de072b53c1b3955b2a (diff)
downloadcurrent-78600998862393eb6d3ce28347224eb6d7c23e87.tar.gz
current-78600998862393eb6d3ce28347224eb6d7c23e87.tar.xz
Fri Jul 28 19:47:22 UTC 202320230728194722
a/file-5.45-x86_64-1.txz: Upgraded. l/mozilla-nss-3.92-x86_64-1.txz: Upgraded. l/pipewire-0.3.76-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a')
-rwxr-xr-xsource/a/file/file.SlackBuild6
-rw-r--r--source/a/file/upstream.mute-debug-warning.patch27
2 files changed, 1 insertions, 32 deletions
diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild
index d42a44f6a..0a4d05e03 100755
--- a/source/a/file/file.SlackBuild
+++ b/source/a/file/file.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=file
VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -100,10 +100,6 @@ zcat $CWD/file.crdaregbin.magic.gz >> magic/Magdir/crdaregbin
# Add some regression fixes from upstream:
# (none currently)
-# Quell this debug message: mozes@kitt $ file /lib/firmware/lgs8g75.fw
-#lhs/off overflow 4294967295 0
-#/lib/firmware/lgs8g75.fw: data
-xzcat $CWD/upstream.mute-debug-warning.patch.xz | patch --verbose -p1 || exit 1
# This is needed after the default data directory patch above:
autoreconf -vif || exit 1
diff --git a/source/a/file/upstream.mute-debug-warning.patch b/source/a/file/upstream.mute-debug-warning.patch
deleted file mode 100644
index 74ba3f1fd..000000000
--- a/source/a/file/upstream.mute-debug-warning.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://deb.debian.org/debian/pool/main/f/file/file_5.44-3.debian.tar.xz
-
-Subject: Disable debug messages
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: 2022-12-20
-Forwarded: https://mailman.astron.com/pipermail/file/2022-December/001018.html
-
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -1461,7 +1461,7 @@
- // On purpose not INTMAX_MAX
- if (lhs >= UINT_MAX || lhs <= INT_MIN ||
- off >= UINT_MAX || off <= INT_MIN) {
-- fprintf(stderr, "lhs/off overflow %jd %jd\n", lhs, off);
-+/* fprintf(stderr, "lhs/off overflow %jd %jd\n", lhs, off); */
- return 1;
- }
-
-@@ -1497,7 +1497,7 @@
- if (m->in_op & FILE_OPINVERSE)
- offset = ~offset;
- if (offset >= UINT_MAX) {
-- fprintf(stderr, "offset overflow %jd\n", offset);
-+/* fprintf(stderr, "offset overflow %jd\n", offset); */
- return 1;
- }
- *rv = CAST(uint32_t, offset);