diff options
Diffstat (limited to 'source')
28 files changed, 854 insertions, 22 deletions
diff --git a/source/a/pkgtools/manpages/installpkg.8 b/source/a/pkgtools/manpages/installpkg.8 index 3a0e2a2c3..9b0cd9fe7 100644 --- a/source/a/pkgtools/manpages/installpkg.8 +++ b/source/a/pkgtools/manpages/installpkg.8 @@ -16,6 +16,9 @@ installpkg \- install Slackware packages. .B \--warn ] [ +.B \--dry-run +] +[ .B \--md5sum ] [ @@ -63,6 +66,9 @@ Generate a list of files that would be overwritten to the standard output, but d not actually install the package. The list is formatted in a suitable fashion to use as a list of files to backup. .TP +.B \--dry-run packagename +This option does the same thing as --warn. +.TP .B \--md5sum packagename Record the package md5sum in the metadata written in /var/lib/pkgtools/packages. .TP diff --git a/source/a/pkgtools/manpages/removepkg.8 b/source/a/pkgtools/manpages/removepkg.8 index f9b1b9322..25a66dcaa 100644 --- a/source/a/pkgtools/manpages/removepkg.8 +++ b/source/a/pkgtools/manpages/removepkg.8 @@ -36,6 +36,9 @@ removepkg \- remove Slackware packages. [ .B \--warn ] +[ +.B \--dry-run +] .BI packagename .SH DESCRIPTION .B removepkg @@ -112,6 +115,9 @@ Remove the package displaying only a single description line to stdout. .B \--warn packagename Generate a report to the standard output about which files and directories would be removed, but does not actually remove the package. +.TP +.B \--dry-run packagename +This option does the same thing as --warn. .SH " " It's possible to remove a package from a filesystem other than / by supplying diff --git a/source/a/pkgtools/manpages/upgradepkg.8 b/source/a/pkgtools/manpages/upgradepkg.8 index 757d60031..73f204af1 100644 --- a/source/a/pkgtools/manpages/upgradepkg.8 +++ b/source/a/pkgtools/manpages/upgradepkg.8 @@ -16,6 +16,9 @@ upgradepkg \- upgrade Slackware packages. .B --dry-run ] [ +.B --warn +] +[ .B --install-new ] [ @@ -38,6 +41,9 @@ upgradepkg \- upgrade Slackware packages. .B --dry-run ] [ +.B --warn +] +[ .B --install-new ] [ @@ -84,6 +90,9 @@ ROOT=/mnt upgradepkg package.txz (or .tbz, .tgz, .tlz) Output a report about which packages would be installed or upgraded but don't actually perform the upgrades. .TP +.B \--warn +This option does the same thing as --warn. +.TP .B \--install-new Normally upgradepkg only upgrades packages that are already installed on the system, and will skip any packages that do not already have a version installed. diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index ab2f57334..38f807a1c 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.1 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index c5c6ee2af..7eea53629 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -167,6 +167,7 @@ Installpkg is used to install a .t{gz,bz,lz,xz} package like this: installpkg slackware-package-1.0.0-i486-1.tgz (or .tbz, .tlz, .txz) options: --warn (warn if files will be overwritten, but do not install) + --dry-run (same as --warn) --root /mnt (install someplace else, like /mnt) --infobox (use dialog to draw an info box) --terse (display a one-line short description for install) @@ -231,7 +232,7 @@ fi # Parse options: while [ 0 ]; do - if [ "$1" = "-warn" -o "$1" = "--warn" ]; then + if [ "$1" = "-warn" -o "$1" = "--warn" -o "$1" = "-dry-run" -o "$1" = "--dry-run" ]; then MODE=warn shift 1 elif [ "$1" = "-md5sum" -o "$1" = "--md5sum" ]; then diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg index 0113c0fd8..161057ea0 100644 --- a/source/a/pkgtools/scripts/removepkg +++ b/source/a/pkgtools/scripts/removepkg @@ -430,7 +430,7 @@ remove_packages() { } if [ "$#" = "0" ]; then - echo "Usage: $(basename $0) [--copy] [--keep] [--preserve] [--skip-douninst] [--terse] [--warn] packagename ..."; exit 1 + echo "Usage: $(basename $0) [--copy] [--keep] [--preserve] [--skip-douninst] [--terse] [--warn] [--dry-run] packagename ..."; exit 1 fi while : ; do @@ -440,8 +440,8 @@ while : ; do -preserve | --preserve) PRESERVE=true; shift;; -skip-douninst | --skip-douninst) SKIP_DOUNINST=true; shift;; -terse | --terse) TERSE=0; shift;; - -warn | --warn) WARN=true; shift;; - -* | --*) echo "Usage: $(basename $0) [-copy] [-keep] [-preserve] [-warn] packagename ..."; exit 1;; + -warn | --warn | -dry-run | --dry-run) WARN=true; shift;; + -* | --*) echo "Usage: $(basename $0) [--copy] [--keep] [--preserve] [--warn] [--dry-run] packagename ..."; exit 1;; *) break esac done diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg index 9ae3ce204..49c5d9da8 100644 --- a/source/a/pkgtools/scripts/upgradepkg +++ b/source/a/pkgtools/scripts/upgradepkg @@ -80,6 +80,7 @@ To operate on an alternate directory, such as /mnt: Options: --dry-run only display what would be done + --warn same as --dry-run --install-new install new packages also --reinstall upgrade packages of the same version --terse display a single line for each package operation @@ -155,7 +156,7 @@ while [ 0 ]; do # We're adding a --verbose mode that doesn't filter removepkg as much VERBOSE="verbose" shift 1 - elif [ "$1" = "-dry-run" -o "$1" = "--dry-run" ]; then + elif [ "$1" = "-dry-run" -o "$1" = "--dry-run" -o "$1" = "-warn" -o "$1" = "--warn" ]; then # Output a report about which packages would be installed or upgraded # but don't actually perform the upgrades. DRY_RUN="true" diff --git a/source/kde/kde/build/baloo b/source/kde/kde/build/baloo index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/baloo +++ b/source/kde/kde/build/baloo @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/cantor +++ b/source/kde/kde/build/cantor @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kde-cli-tools b/source/kde/kde/build/kde-cli-tools index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kde-cli-tools +++ b/source/kde/kde/build/kde-cli-tools @@ -1 +1 @@ -1 +2 diff --git a/source/kde/kde/build/kdepim-addons b/source/kde/kde/build/kdepim-addons index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kdepim-addons +++ b/source/kde/kde/build/kdepim-addons @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kfilemetadata b/source/kde/kde/build/kfilemetadata index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kfilemetadata +++ b/source/kde/kde/build/kfilemetadata @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kitinerary +++ b/source/kde/kde/build/kitinerary @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kross-interpreters b/source/kde/kde/build/kross-interpreters index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kross-interpreters +++ b/source/kde/kde/build/kross-interpreters @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/kservice b/source/kde/kde/build/kservice index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/kservice +++ b/source/kde/kde/build/kservice @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/marble b/source/kde/kde/build/marble index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/marble +++ b/source/kde/kde/build/marble @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/okular +++ b/source/kde/kde/build/okular @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/prison b/source/kde/kde/build/prison index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/prison +++ b/source/kde/kde/build/prison @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/solid b/source/kde/kde/build/solid index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/solid +++ b/source/kde/kde/build/solid @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/build/umbrello b/source/kde/kde/build/umbrello index 0cfbf0888..d00491fd7 100644 --- a/source/kde/kde/build/umbrello +++ b/source/kde/kde/build/umbrello @@ -1 +1 @@ -2 +1 diff --git a/source/kde/kde/patch/kde-cli-tools.patch b/source/kde/kde/patch/kde-cli-tools.patch new file mode 100644 index 000000000..5f57d6e09 --- /dev/null +++ b/source/kde/kde/patch/kde-cli-tools.patch @@ -0,0 +1 @@ +cat $CWD/patch/kde-cli-tools/726690b34c1b75307fb8c830ba05dd00b98aa85a.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/source/kde/kde/patch/kde-cli-tools/726690b34c1b75307fb8c830ba05dd00b98aa85a.patch b/source/kde/kde/patch/kde-cli-tools/726690b34c1b75307fb8c830ba05dd00b98aa85a.patch new file mode 100644 index 000000000..4fa2309c6 --- /dev/null +++ b/source/kde/kde/patch/kde-cli-tools/726690b34c1b75307fb8c830ba05dd00b98aa85a.patch @@ -0,0 +1,22 @@ +From 726690b34c1b75307fb8c830ba05dd00b98aa85a Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heiko.becker@kde.org> +Date: Tue, 9 May 2023 21:29:52 +0200 +Subject: [PATCH] kinfo: Use kcmshell5 with Plasma *5* + +--- + kinfo/kinfo | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kinfo/kinfo b/kinfo/kinfo +index ddb5de31..6f911965 100644 +--- a/kinfo/kinfo ++++ b/kinfo/kinfo +@@ -3,4 +3,4 @@ + # SPDX-FileCopyrightText: 2023 Harald Sitter <sitter@kde.org> + + export QT_LOGGING_RULES="*=false" +-exec kcmshell6 kcm_about-distro --args dump --platform offscreen ++exec kcmshell5 kcm_about-distro --args dump --platform offscreen +-- +GitLab + diff --git a/source/l/mpfr/patches.url b/source/l/mpfr/patches.url new file mode 100644 index 000000000..b477cd613 --- /dev/null +++ b/source/l/mpfr/patches.url @@ -0,0 +1,2 @@ +# Fetched like this: +https://www.mpfr.org/mpfr-current/patch01 diff --git a/source/l/mpfr/patches/patch05 b/source/l/mpfr/patches/patch05 new file mode 100644 index 000000000..ea6f1d885 --- /dev/null +++ b/source/l/mpfr/patches/patch05 @@ -0,0 +1,90 @@ +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-12 15:05:00.989811960 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-12 15:05:01.085811835 +0000 +@@ -0,0 +1 @@ ++reldiff +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-12 15:05:01.085811835 +0000 +@@ -1 +1 @@ +-4.2.0-p4 ++4.2.0-p5 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-12 15:05:01.077811846 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p4" ++#define MPFR_VERSION_STRING "4.2.0-p5" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/reldiff.c mpfr-4.2.0-b/src/reldiff.c +--- mpfr-4.2.0-a/src/reldiff.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/reldiff.c 2023-05-12 15:05:01.069811856 +0000 +@@ -30,31 +30,25 @@ + + if (MPFR_ARE_SINGULAR (b, c)) + { +- if (MPFR_IS_NAN(b) || MPFR_IS_NAN(c)) +- { +- MPFR_SET_NAN(a); +- return; +- } +- else if (MPFR_IS_INF(b)) ++ if (MPFR_IS_NAN (b) || MPFR_IS_INF (b) || MPFR_IS_NAN (c) || ++ (MPFR_IS_ZERO (b) && MPFR_IS_ZERO (c))) + { +- if (MPFR_IS_INF (c) && (MPFR_SIGN (c) == MPFR_SIGN (b))) +- MPFR_SET_ZERO(a); +- else +- MPFR_SET_NAN(a); ++ MPFR_SET_NAN (a); + return; + } +- else if (MPFR_IS_INF(c)) ++ if (MPFR_IS_ZERO (b) || MPFR_IS_INF (c)) + { + MPFR_SET_SAME_SIGN (a, b); + MPFR_SET_INF (a); + return; + } +- else if (MPFR_IS_ZERO(b)) /* reldiff = abs(c)/c = sign(c) */ +- { +- mpfr_set_si (a, MPFR_INT_SIGN (c), rnd_mode); +- return; +- } +- /* Fall through */ ++ /* The case c = 0 with b regular, which should give sign(b) exactly, ++ cannot be optimized here as it is documented in the MPFR manual ++ that this function just computes abs(b-c)/b using the precision ++ of a and the rounding mode rnd_mode for all operations. So let's ++ prefer the potentially "incorrect" result. Note that the correct ++ result is not necessarily better because if could break properties ++ (like monotonicity?) implied by the documentation. */ + } + + if (a == b) +@@ -64,8 +58,8 @@ + } + + mpfr_sub (a, b, c, rnd_mode); +- mpfr_abs (a, a, rnd_mode); /* for compatibility with MPF */ +- mpfr_div (a, a, (a == b) ? b_copy : b, rnd_mode); ++ MPFR_SET_SIGN (a, 1); ++ mpfr_div (a, a, a == b ? b_copy : b, rnd_mode); + + if (a == b) + mpfr_clear (b_copy); +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:05:01.081811839 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p4"; ++ return "4.2.0-p5"; + } diff --git a/source/l/mpfr/patches/patch06 b/source/l/mpfr/patches/patch06 new file mode 100644 index 000000000..6d6922366 --- /dev/null +++ b/source/l/mpfr/patches/patch06 @@ -0,0 +1,389 @@ +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-12 15:06:11.789722083 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-12 15:06:11.885721962 +0000 +@@ -0,0 +1 @@ ++tests-reuse +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-05-12 15:05:01.085811835 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-12 15:06:11.885721962 +0000 +@@ -1 +1 @@ +-4.2.0-p5 ++4.2.0-p6 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-05-12 15:05:01.077811846 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-12 15:06:11.877721972 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p5" ++#define MPFR_VERSION_STRING "4.2.0-p6" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-12 15:05:01.081811839 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:06:11.885721962 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p5"; ++ return "4.2.0-p6"; + } +diff -Naurd mpfr-4.2.0-a/tests/reuse.c mpfr-4.2.0-b/tests/reuse.c +--- mpfr-4.2.0-a/tests/reuse.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/reuse.c 2023-05-12 15:06:11.869721983 +0000 +@@ -78,22 +78,16 @@ + mpfr_const_pi (x, MPFR_RNDN); + MPFR_SET_EXP (x, MPFR_GET_EXP (x)-1); + break; +- default: ++ case 11: + mpfr_urandomb (x, RANDS); + if (RAND_BOOL ()) + mpfr_neg (x, x, MPFR_RNDN); + break; ++ default: ++ MPFR_ASSERTN (0); + } + } + +-/* same as mpfr_cmp, but returns 0 for both NaN's */ +-static int +-mpfr_compare (mpfr_srcptr a, mpfr_srcptr b) +-{ +- return (MPFR_IS_NAN(a)) ? !MPFR_IS_NAN(b) : +- (MPFR_IS_NAN(b) || mpfr_cmp(a, b)); +-} +- + static void + test3 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t), + const char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) +@@ -112,10 +106,10 @@ + + /* for each variable, consider each of the following 6 possibilities: + NaN, +Infinity, -Infinity, +0, -0 or a random number */ +- for (i=0; i < SPECIAL_MAX*SPECIAL_MAX ; i++) ++ for (i = 0; i < SPECIAL_MAX * SPECIAL_MAX; i++) + { +- set_special (ref2, i%SPECIAL_MAX); +- set_special (ref3, i/SPECIAL_MAX); ++ set_special (ref2, i % SPECIAL_MAX); ++ set_special (ref3, i / SPECIAL_MAX); + + /* reference call: foo(a, b, c) */ + testfunc (ref1, ref2, ref3, rnd); +@@ -124,11 +118,11 @@ + mpfr_set (res1, ref2, rnd); /* exact operation */ + testfunc (res1, res1, ref3, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a, c) with %s for ", foo, + mpfr_print_rnd_mode (rnd)); +- DISP("a=",ref2); DISP2(", c=",ref3); ++ DISP("a=", ref2); DISP2(", c=", ref3); + printf ("expected "); mpfr_dump (ref1); + printf ("got "); mpfr_dump (res1); + exit (1); +@@ -137,11 +131,12 @@ + /* foo(a, b, a) */ + mpfr_set (res1, ref3, rnd); + testfunc (res1, ref2, res1, rnd); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, b, a) for ", foo); +- DISP("b=",ref2); DISP2(", a=", ref3); +- DISP("expected ", ref1); DISP2(", got ",res1); ++ DISP("b=", ref2); DISP2(", a=", ref3); ++ printf ("expected "); mpfr_dump (ref1); ++ printf ("got "); mpfr_dump (res1); + exit (1); + } + +@@ -151,11 +146,12 @@ + mpfr_set (res1, ref2, rnd); + testfunc (res1, res1, res1, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a, a) for ", foo); +- DISP2("a=",ref2); +- DISP("expected ", ref1); DISP2(", got ", res1); ++ DISP2("a=", ref2); ++ printf ("expected "); mpfr_dump (ref1); ++ printf ("got "); mpfr_dump (res1); + exit (1); + } + } +@@ -187,13 +183,13 @@ + /* for each variable, consider each of the following 6 possibilities: + NaN, +Infinity, -Infinity, +0, -0 or a random number */ + +- for (i=0; i<SPECIAL_MAX; i++) ++ for (i = 0; i < SPECIAL_MAX; i++) + { + set_special (op1, i); +- for (j=0; j<SPECIAL_MAX; j++) ++ for (j = 0; j < SPECIAL_MAX; j++) + { + set_special (op2, j); +- for (k=0; k<SPECIAL_MAX; k++) ++ for (k = 0; k < SPECIAL_MAX; k++) + { + set_special (op3, k); + +@@ -204,11 +200,12 @@ + mpfr_set (res, op1, rnd); /* exact operation */ + testfunc (res, res, op2, op3, rnd); + +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +@@ -216,11 +213,12 @@ + mpfr_set (res, op2, rnd); + testfunc (res, op1, res, op3, rnd); + +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +@@ -228,35 +226,38 @@ + mpfr_set (res, op3, rnd); + testfunc (res, op1, op2, res, rnd); + +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", b=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +- /* foo(a, a, a,c) */ ++ /* foo(a, a, a, c) */ + testfunc (ref, op1, op1, op3, rnd); + mpfr_set (res, op1, rnd); + testfunc (res, res, res, op3, rnd); +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +- /* foo(a, a, b,a) */ ++ /* foo(a, a, b, a) */ + testfunc (ref, op1, op2, op1, rnd); + mpfr_set (res, op1, rnd); + testfunc (res, res, op2, res, rnd); +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +@@ -264,11 +265,12 @@ + testfunc (ref, op1, op2, op2, rnd); + mpfr_set (res, op2, rnd); + testfunc (res, op1, res, res, rnd); +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, b, c) for ", foo); + DISP("a=", op1); DISP(", a=", op2); DISP2(", c=", op3); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + +@@ -276,11 +278,12 @@ + testfunc (ref, op1, op1, op1, rnd); + mpfr_set (res, op1, rnd); + testfunc (res, res, res, res, rnd); +- if (mpfr_compare (res, ref)) ++ if (! SAME_VAL (res, ref)) + { + printf ("Error for %s(a, a, a, a) for ", foo); + DISP2("a=", op1); +- DISP("expected ", ref); DISP2(", got ", res); ++ printf ("expected "); mpfr_dump (ref); ++ printf ("got "); mpfr_dump (res); + exit (1); + } + } +@@ -313,10 +316,10 @@ + + /* ref2 can be NaN, +Inf, -Inf, +0, -0 or any number + ref3 can be 0 or any number */ +- for (i=0; i<SPECIAL_MAX*2; i++) ++ for (i = 0; i < SPECIAL_MAX * 2; i++) + { +- set_special (ref2, i%SPECIAL_MAX); +- ref3 = i/SPECIAL_MAX == 0 ? 0 : randlimb (); ++ set_special (ref2, i % SPECIAL_MAX); ++ ref3 = i / SPECIAL_MAX == 0 ? 0 : randlimb (); + + /* reference call: foo(a, b, c) */ + testfunc (ref1, ref2, ref3, rnd); +@@ -325,10 +328,10 @@ + mpfr_set (res1, ref2, rnd); /* exact operation */ + testfunc (res1, res1, ref3, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a, c) for c=%u\n", foo, ref3); +- DISP2("a=",ref2); ++ DISP2("a=", ref2); + printf ("expected "); mpfr_dump (ref1); + printf ("got "); mpfr_dump (res1); + exit (1); +@@ -356,10 +359,10 @@ + mpfr_init2 (ref3, prec); + mpfr_init2 (res1, prec); + +- for (i=0; i<SPECIAL_MAX*2; i++) ++ for (i = 0; i < SPECIAL_MAX * 2; i++) + { +- set_special (ref3, i%SPECIAL_MAX); +- ref2 = i/SPECIAL_MAX==0 ? 0 : randlimb (); ++ set_special (ref3, i % SPECIAL_MAX); ++ ref2 = i / SPECIAL_MAX == 0 ? 0 : randlimb (); + + /* reference call: foo(a, b, c) */ + testfunc (ref1, ref2, ref3, rnd); +@@ -367,7 +370,7 @@ + /* foo(a, b, a) */ + mpfr_set (res1, ref3, rnd); /* exact operation */ + testfunc (res1, ref2, res1, rnd); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, b, a) for b=%u \n", foo, ref2); + DISP2("a=", ref3); +@@ -397,7 +400,7 @@ + mpfr_init2 (ref2, prec); + mpfr_init2 (res1, prec); + +- for (i=0; i<SPECIAL_MAX; i++) ++ for (i = 0; i < SPECIAL_MAX; i++) + { + set_special (ref2, i); + +@@ -407,7 +410,7 @@ + /* foo(a, a) */ + mpfr_set (res1, ref2, rnd); /* exact operation */ + testfunc (res1, res1, rnd); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a) for ", foo); + DISP2("a=", ref2); +@@ -437,7 +440,7 @@ + mpfr_init2 (ref2, prec); + mpfr_init2 (res1, prec); + +- for (i=0; i<SPECIAL_MAX; i++) ++ for (i = 0; i < SPECIAL_MAX; i++) + { + set_special (ref2, i); + +@@ -447,10 +450,10 @@ + /* foo(a, a) */ + mpfr_set (res1, ref2, MPFR_RNDN); /* exact operation */ + testfunc (res1, res1); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a) for ", foo); +- DISP2("a=",ref2); ++ DISP2("a=", ref2); + DISP("expected", ref1); DISP2(", got ", res1); + exit (1); + } +@@ -479,7 +482,7 @@ + mpfr_init2 (res1, prec); + mpfr_init2 (res2, prec); + +- for (i=0; i<SPECIAL_MAX; i++) ++ for (i = 0; i < SPECIAL_MAX; i++) + { + set_special (ref3, i); + +@@ -489,12 +492,12 @@ + /* foo(a, b, a) */ + mpfr_set (res1, ref3, rnd); /* exact operation */ + testfunc (res1, res2, res1, rnd); +- if (mpfr_compare (res1, ref1) || mpfr_compare (res2, ref2)) ++ if (! SAME_VAL (res1, ref1) || ! SAME_VAL (res2, ref2)) + { + printf ("Error for %s(a, b, a) for rnd=%s, ", foo, + mpfr_print_rnd_mode (rnd)); +- DISP2("a=",ref3); +- DISP("expected (", ref1); DISP(",",ref2); ++ DISP2("a=", ref3); ++ DISP("expected (", ref1); DISP(",", ref2); + DISP("), got (", res1); DISP(",", res2); printf(")\n"); + exit (1); + } +@@ -502,11 +505,11 @@ + /* foo(a, b, b) */ + mpfr_set (res2, ref3, rnd); /* exact operation */ + testfunc (res1, res2, res2, rnd); +- if (mpfr_compare (res1, ref1) || mpfr_compare (res2, ref2)) ++ if (! SAME_VAL (res1, ref1) || ! SAME_VAL (res2, ref2)) + { + printf ("Error for %s(a, b, b) for ", foo); +- DISP2("b=",ref3); +- DISP("expected (", ref1); DISP(",",ref2); ++ DISP2("b=", ref3); ++ DISP("expected (", ref1); DISP(",", ref2); + DISP("), got (", res1); DISP(",", res2); printf(")\n"); + exit (1); + } +@@ -561,10 +564,10 @@ + mpfr_set (res1, ref2, rnd); /* exact operation */ + mpfr_pow (res1, res1, ref3, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for pow_int(a, a, c) for "); +- DISP("a=",ref2); DISP2(", c=",ref3); ++ DISP("a=", ref2); DISP2(", c=", ref3); + printf ("expected "); mpfr_dump (ref1); + printf ("got "); mpfr_dump (res1); + exit (1); diff --git a/source/l/mpfr/patches/patch07 b/source/l/mpfr/patches/patch07 new file mode 100644 index 000000000..922802c5a --- /dev/null +++ b/source/l/mpfr/patches/patch07 @@ -0,0 +1,305 @@ +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-12 15:08:39.233546717 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-12 15:08:39.325546612 +0000 +@@ -0,0 +1 @@ ++pow_general +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-05-12 15:06:11.885721962 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-12 15:08:39.325546612 +0000 +@@ -1 +1 @@ +-4.2.0-p6 ++4.2.0-p7 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-05-12 15:06:11.877721972 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-12 15:08:39.321546616 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p6" ++#define MPFR_VERSION_STRING "4.2.0-p7" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/pow.c mpfr-4.2.0-b/src/pow.c +--- mpfr-4.2.0-a/src/pow.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/pow.c 2023-05-12 15:08:39.309546630 +0000 +@@ -131,7 +131,6 @@ + /* Declaration of the size variable */ + mpfr_prec_t Nz = MPFR_PREC(z); /* target precision */ + mpfr_prec_t Nt; /* working precision */ +- mpfr_exp_t err; /* error */ + MPFR_ZIV_DECL (ziv_loop); + + MPFR_LOG_FUNC +@@ -171,12 +170,14 @@ + MPFR_ZIV_INIT (ziv_loop, Nt); + for (;;) + { ++ mpfr_exp_t err, exp_t; + MPFR_BLOCK_DECL (flags1); + + /* compute exp(y*ln|x|), using MPFR_RNDU to get an upper bound, so + that we can detect underflows. */ + mpfr_log (t, absx, MPFR_IS_NEG (y) ? MPFR_RNDD : MPFR_RNDU); /* ln|x| */ + mpfr_mul (t, y, t, MPFR_RNDU); /* y*ln|x| */ ++ exp_t = MPFR_GET_EXP (t); + if (k_non_zero) + { + MPFR_LOG_MSG (("subtract k * ln(2)\n", 0)); +@@ -188,14 +189,16 @@ + MPFR_LOG_VAR (t); + } + /* estimate of the error -- see pow function in algorithms.tex. +- The error on t is at most 1/2 + 3*2^(EXP(t)+1) ulps, which is +- <= 2^(EXP(t)+3) for EXP(t) >= -1, and <= 2 ulps for EXP(t) <= -2. ++ The error on t before the subtraction of k*log(2) is at most ++ 1/2 + 3*2^(EXP(t)+1) ulps, which is <= 2^(EXP(t)+3) for EXP(t) >= -1, ++ and <= 2 ulps for EXP(t) <= -2. + Additional error if k_no_zero: treal = t * errk, with + 1 - |k| * 2^(-Nt) <= exp(-|k| * 2^(-Nt)) <= errk <= 1, + i.e., additional absolute error <= 2^(EXP(k)+EXP(t)-Nt). +- Total error <= 2^err1 + 2^err2 <= 2^(max(err1,err2)+1). */ +- err = MPFR_NOTZERO (t) && MPFR_GET_EXP (t) >= -1 ? +- MPFR_GET_EXP (t) + 3 : 1; ++ Total ulp error <= 2^err1 + 2^err2 <= 2^(max(err1,err2)+1), ++ where err1 = EXP(t)+3 for EXP(t) >= -1, and 1 otherwise, ++ and err2 = EXP(k). */ ++ err = MPFR_NOTZERO (t) && exp_t >= -1 ? exp_t + 3 : 1; + if (k_non_zero) + { + if (MPFR_GET_EXP (k) > err) +@@ -328,11 +331,17 @@ + */ + if (rnd_mode == MPFR_RNDN && inexact < 0 && lk < 0 && + MPFR_GET_EXP (z) == __gmpfr_emin - 1 - lk && mpfr_powerof2_raw (z)) +- /* Rounding to nearest, real result > z * 2^k = 2^(emin - 2), +- * underflow case: we will obtain the correct result and exceptions +- * by replacing z by nextabove(z). +- */ +- mpfr_nextabove (z); ++ /* Rounding to nearest, exact result > z * 2^k = 2^(emin - 2), ++ * and underflow case because the rounded result assuming an ++ * unbounded exponent range is 2^(emin - 2). We need to round ++ * to 2^(emin - 1), i.e. to round toward +inf. ++ * Note: the old code was using "mpfr_nextabove (z);" instead of ++ * setting rnd_mode to MPFR_RNDU for the call to mpfr_mul_2si, but ++ * this was incorrect in precision 1 because in this precision, ++ * mpfr_nextabove gave 2^(emin - 1), which is representable, ++ * so that mpfr_mul_2si did not generate the wanted underflow ++ * (the value was correct, but the underflow flag was missing). */ ++ rnd_mode = MPFR_RNDU; + MPFR_CLEAR_FLAGS (); + inex2 = mpfr_mul_2si (z, z, lk, rnd_mode); + if (inex2) /* underflow or overflow */ +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-12 15:06:11.885721962 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:08:39.325546612 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p6"; ++ return "4.2.0-p7"; + } +diff -Naurd mpfr-4.2.0-a/tests/texp10.c mpfr-4.2.0-b/tests/texp10.c +--- mpfr-4.2.0-a/tests/texp10.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/texp10.c 2023-05-12 15:08:39.309546630 +0000 +@@ -190,6 +190,187 @@ + mpfr_clear (y); + } + ++/* Bug in mpfr_pow_general found by ofuf_thresholds (on 2023-02-13 for ++ a 32-bit exponent, changed on 2023-03-06 for a 64-bit exponent too), ++ fixed in commit b62966df913f73f08b3c5252e1d0c702bc20442f. ++ With a 32-bit exponent, failure for i=0. ++ expected 0.1111E1073741823 ++ got @Inf@ ++ expected flags = inexact (8) ++ got flags = overflow inexact (10) ++ With a 64-bit exponent, failure for i=1. ++ expected 0.11111111111111111111111E4611686018427387903 ++ got @Inf@ ++ expected flags = inexact (8) ++ got flags = overflow inexact (10) ++ Note: ofuf_thresholds was added to the master branch, but for the ++ time being, there are issues with these tests. ++*/ ++static void ++bug20230213 (void) ++{ ++ const char *s[2] = { ++ "0x1.34413504b3ccdbd5dd8p+28", ++ "0x1.34413509f79fef2c4e0dd14a7ae0ecfbacdbp+60" ++ }; ++ mpfr_t x1, x2, y1, y2; ++ mpfr_prec_t px[2] = { 74, 147 }; ++ mpfr_prec_t py[2] = { 4, 23 }; ++ mpfr_exp_t old_emax, emax; ++ mpfr_flags_t flags1, flags2; ++ int i; ++ ++ old_emax = mpfr_get_emax (); ++ ++ for (i = 0; i < 2; i++) ++ { ++ if (i != 0) ++ set_emax (MPFR_EMAX_MAX); ++ ++ emax = mpfr_get_emax (); ++ ++ mpfr_inits2 (px[i], x1, x2, (mpfr_ptr) 0); ++ mpfr_inits2 (py[i], y1, y2, (mpfr_ptr) 0); ++ ++ mpfr_setmax (y1, emax); ++ mpfr_log10 (x1, y1, MPFR_RNDD); ++ mpfr_set_str (x2, s[i], 0, MPFR_RNDN); ++ /* For i == 0, emax == 2^30, so that the value can be checked. ++ For i != 0, check the value for the case emax == 2^62. ++ The "0UL" ensures that the shifts are valid. */ ++ if (i == 0 || (((0UL + MPFR_EMAX_MAX) >> 31) >> 30) == 1) ++ { ++ /* printf ("Checking x1 for i=%d\n", i); */ ++ MPFR_ASSERTN (mpfr_equal_p (x1, x2)); ++ } ++ ++ /* Let MAXF be the maximum finite value (y1 above). ++ Since x1 < log10(MAXF), one should have exp10(x1) < MAXF, and ++ therefore, y2 = RU(exp10(x1)) <= RU(MAXF) = MAXF (no overflow). */ ++ flags1 = MPFR_FLAGS_INEXACT; ++ mpfr_clear_flags (); ++ mpfr_exp10 (y2, x1, MPFR_RNDU); ++ flags2 = __gmpfr_flags; ++ ++ if (! (mpfr_lessequal_p (y2, y1) && flags2 == flags1)) ++ { ++ printf ("Error in bug20230213 for i=%d\n", i); ++ printf ("emax = %" MPFR_EXP_FSPEC "d\n", (mpfr_eexp_t) emax); ++ printf ("expected "); mpfr_dump (y1); ++ printf ("got "); mpfr_dump (y2); ++ printf ("expected flags ="); ++ flags_out (flags1); ++ printf ("got flags ="); ++ flags_out (flags2); ++ exit (1); ++ } ++ ++ mpfr_clears (x1, x2, y1, y2, (mpfr_ptr) 0); ++ } ++ ++ set_emax (old_emax); ++} ++ ++/* Bug in mpfr_pow_general in precision 1 in the particular case of ++ rounding to nearest, z * 2^k = 2^(emin - 2) and real result larger ++ than this value; fixed in ff5012b61d5e5fee5156c57b8aa8fc1739c2a771 ++ (which is simplified in 4f5de980be290687ac1409aa02873e9e0dd1a030); ++ initially found by ofuf_thresholds (though the test was incorrect). ++ With a 32-bit exponent, failure for i=0. ++ With a 64-bit exponent, failure for i=1. ++ The result was correct, but the underflow flag was missing. ++ Note: ofuf_thresholds was added to the master branch, but for the ++ time being, there are issues with these tests. ++*/ ++static void ++bug20230427 (void) ++{ ++ const char *s[2] = { ++ "-0.1001101000100000100110101000011E29", ++ "-0.100110100010000010011010100001001111101111001111111101111001101E61" ++ }; ++ mpfr_t x, y, z, t1, t2; ++ mpfr_exp_t old_emin; ++ mpfr_flags_t flags, ex_flags; ++ int i, inex; ++ ++ old_emin = mpfr_get_emin (); ++ ++ mpfr_init2 (x, 63); ++ mpfr_inits2 (1, y, z, (mpfr_ptr) 0); ++ mpfr_inits2 (128, t1, t2, (mpfr_ptr) 0); ++ ++ for (i = 0; i < 2; i++) ++ { ++ if (i == 0) ++ { ++ /* Basic check: the default emin should be -2^30 (exactly). */ ++ if (mpfr_get_emin () != -1073741823) ++ abort (); ++ } ++ else ++ { ++ /* This test assumes that MPFR_EMIN_MIN = -2^62 (exactly). ++ The "0UL" ensures that the shifts are valid. */ ++ if ((((0UL - MPFR_EMIN_MIN) >> 31) >> 30) != 1) ++ break; ++ ++ set_emin (MPFR_EMIN_MIN); ++ } ++ ++ mpfr_set_str_binary (x, s[i]); ++ ++ /* We will test 10^x rounded to nearest in precision 1. ++ Check that 2^(emin - 2) < 10^x < (3/2) * 2^(emin - 2). ++ This is approximate, but by outputting the values, one can check ++ that one is not too close to the boundaries: ++ emin - 2 = -4611686018427387905 ++ log2(10^x) ~= -4611686018427387904.598 ++ emin - 2 + log2(3/2) ~= -4611686018427387904.415 ++ Thus the result should be the smallest positive number 2^(emin - 1) ++ because 10^x is closer to this number than to 0, the midpoint being ++ 2^(emin - 2). And there should be an underflow in precision 1 because ++ the result rounded to nearest in an unbounded exponent range should ++ have been 2^(emin - 2), the midpoint being (3/2) * 2^(emin - 2). ++ */ ++ mpfr_set_ui (t1, 10, MPFR_RNDN); ++ mpfr_log2 (t2, t1, MPFR_RNDN); ++ mpfr_mul (t1, t2, x, MPFR_RNDN); ++ inex = mpfr_set_exp_t (t2, mpfr_get_emin () - 2, MPFR_RNDN); ++ MPFR_ASSERTN (inex == 0); ++ MPFR_ASSERTN (mpfr_greater_p (t1, t2)); /* log2(10^x) > emin - 2 */ ++ inex = mpfr_sub (t1, t1, t2, MPFR_RNDN); ++ MPFR_ASSERTN (inex == 0); ++ mpfr_set_ui (t2, 3, MPFR_RNDN); ++ mpfr_log2 (t2, t2, MPFR_RNDN); ++ mpfr_sub_ui (t2, t2, 1, MPFR_RNDN); /* log2(3/2) */ ++ MPFR_ASSERTN (mpfr_less_p (t1, t2)); ++ ++ mpfr_clear_flags (); ++ mpfr_exp10 (y, x, MPFR_RNDN); ++ flags = __gmpfr_flags; ++ ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; ++ ++ mpfr_setmin (z, mpfr_get_emin ()); /* z = 0.1@emin */ ++ if (! (mpfr_equal_p (y, z) && flags == ex_flags)) ++ { ++ printf ("Error in bug20230427 for i=%d\n", i); ++ printf ("expected "); mpfr_dump (z); ++ printf ("got "); mpfr_dump (y); ++ printf ("emin = %" MPFR_EXP_FSPEC "d\n", ++ (mpfr_eexp_t) mpfr_get_emin ()); ++ printf ("expected flags ="); ++ flags_out (ex_flags); ++ printf ("got flags ="); ++ flags_out (flags); ++ exit (1); ++ } ++ } ++ ++ mpfr_clears (x, y, z, t1, t2, (mpfr_ptr) 0); ++ set_emin (old_emin); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -199,6 +380,9 @@ + + tests_start_mpfr (); + ++ bug20230213 (); ++ bug20230427 (); ++ + special_overflow (); + emax_m_eps (); + exp_range (); diff --git a/source/n/php/fetch-php.sh b/source/n/php/fetch-php.sh index a7328f95a..c985a593b 100755 --- a/source/n/php/fetch-php.sh +++ b/source/n/php/fetch-php.sh @@ -1,2 +1,2 @@ -lftpget http://us.php.net/distributions/php-8.2.5.tar.xz.asc -lftpget http://us.php.net/distributions/php-8.2.5.tar.xz +lftpget http://us.php.net/distributions/php-8.2.6.tar.xz.asc +lftpget http://us.php.net/distributions/php-8.2.6.tar.xz diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index fd0e60a14..00f49b4d7 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=php VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} ALPINE=2.26 -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |