From 941f17629193517ea9d4a3fc80e24711c40eb4e6 Mon Sep 17 00:00:00 2001 From: Rmys Date: Wed, 16 Dec 2020 20:23:00 +0300 Subject: [PATCH] core rebuild --- system/base/coreutils/pspec.xml | 9 +- system/base/diffutils/pspec.xml | 9 +- ...end-on-the-execute-bit-to-determine-.patch | 30 ++++ .../file/files/file-5.38-seccomp-tcgets.patch | 28 +++ system/base/file/pspec.xml | 13 +- system/base/findutils/actions.py | 2 +- .../files/findutils-4.7.0-leaf-opt-xfs.patch | 164 ++++++++++++++++++ .../files/findutils-4.7.0-root-tests.patch | 132 ++++++++++++++ system/base/findutils/pspec.xml | 26 ++- system/base/gawk/pspec.xml | 10 +- .../gettext-0.21-gnulib-perror-tests.patch | 44 +++++ system/base/gettext/pspec.xml | 6 +- system/base/grep/pspec.xml | 11 +- system/base/gzip/pspec.xml | 9 +- system/devel/make/actions.py | 2 +- system/devel/make/pspec.xml | 11 +- system/devel/patch/pspec.xml | 7 + 17 files changed, 489 insertions(+), 24 deletions(-) create mode 100644 system/base/file/files/0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch create mode 100644 system/base/file/files/file-5.38-seccomp-tcgets.patch create mode 100644 system/base/findutils/files/findutils-4.7.0-leaf-opt-xfs.patch create mode 100644 system/base/findutils/files/findutils-4.7.0-root-tests.patch create mode 100644 system/base/gettext/files/gettext-0.21-gnulib-perror-tests.patch diff --git a/system/base/coreutils/pspec.xml b/system/base/coreutils/pspec.xml index c00d27cd..2c4ee75f 100644 --- a/system/base/coreutils/pspec.xml +++ b/system/base/coreutils/pspec.xml @@ -58,6 +58,13 @@ + + 2020-12-09 + 8.31 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + 2020-02-22 8.31 @@ -65,7 +72,7 @@ Mustafa Cinasal muscnsl@gmail.com - + 2019-12-23 8.31 Version bump. diff --git a/system/base/diffutils/pspec.xml b/system/base/diffutils/pspec.xml index b1f80ed8..7c3145cb 100644 --- a/system/base/diffutils/pspec.xml +++ b/system/base/diffutils/pspec.xml @@ -31,7 +31,14 @@ - + + 2020-12-09 + 3.7 + Rebuild. + Mustafa Cinasal + muscnslp@gmail.com + + 2019-12-11 3.7 Version bump diff --git a/system/base/file/files/0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch b/system/base/file/files/0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch new file mode 100644 index 00000000..9c056b26 --- /dev/null +++ b/system/base/file/files/0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch @@ -0,0 +1,30 @@ +From 84221b0370a8b49e0fa2dbd88c89fb6e87ec95bd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= +Date: Fri, 24 Jan 2020 17:07:11 +0100 +Subject: [PATCH] Revert "Don't depend on the execute bit to determine pie + executable or shared object." + +This reverts commit d653309de04ed10fdeda79f2c6ca7a7e96e122f1. +--- + magic/Magdir/elf | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/magic/Magdir/elf b/magic/Magdir/elf +index b5a2e00b..a35b615d 100644 +--- a/magic/Magdir/elf ++++ b/magic/Magdir/elf +@@ -50,8 +50,9 @@ + !:mime application/x-object + >16 leshort 2 executable, + !:mime application/x-executable +->16 leshort 3 shared object, +-!:mime application/x-sharedlib ++>16 leshort 3 ${x?pie executable:shared object}, ++ ++!:mime application/x-${x?pie-executable:sharedlib} + >16 leshort 4 core file, + !:mime application/x-coredump + # OS-specific +-- +2.25.0 + diff --git a/system/base/file/files/file-5.38-seccomp-tcgets.patch b/system/base/file/files/file-5.38-seccomp-tcgets.patch new file mode 100644 index 00000000..fac29f4a --- /dev/null +++ b/system/base/file/files/file-5.38-seccomp-tcgets.patch @@ -0,0 +1,28 @@ +From 78573ec1c43346064661169c5c8df32e7c3bd6d6 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Fri, 17 Jan 2020 17:12:58 +0000 +Subject: [PATCH] PR/130: tobias: adjust seccomp for ioctl on hardwired + terminal + +--- + src/seccomp.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/seccomp.c b/src/seccomp.c +index ebf3ea1cb..0ba17233b 100644 +--- a/src/seccomp.c ++++ b/src/seccomp.c +@@ -186,8 +186,12 @@ enable_sandbox_full(void) + ALLOW_IOCTL_RULE(FIONREAD); + #endif + #ifdef TIOCGWINSZ +- // musl libc may call ioctl TIOCGWINSZ when calling stdout ++ // musl libc may call ioctl TIOCGWINSZ on stdout + ALLOW_IOCTL_RULE(TIOCGWINSZ); ++#endif ++#ifdef TCGETS ++ // glibc may call ioctl TCGETS on stdout on physical terminal ++ ALLOW_IOCTL_RULE(TCGETS); + #endif + ALLOW_RULE(lseek); + ALLOW_RULE(_llseek); diff --git a/system/base/file/pspec.xml b/system/base/file/pspec.xml index f319de6e..87ded0a6 100644 --- a/system/base/file/pspec.xml +++ b/system/base/file/pspec.xml @@ -19,6 +19,10 @@ python-setuptools + + file-5.38-seccomp-tcgets.patch + 0001-Revert-Don-t-depend-on-the-execute-bit-to-determine-.patch + @@ -38,6 +42,13 @@ + + 2020-12-09 + 5.38 + Rebuild + Mustafa Cinasal + muscnslp@gmail.com + 2020-01-13 5.38 @@ -45,7 +56,7 @@ Safa Arıman safa@ariman.gen.tr - + 2019-12-11 5.37 Version bump diff --git a/system/base/findutils/actions.py b/system/base/findutils/actions.py index 841e6a2c..b78d6d3f 100644 --- a/system/base/findutils/actions.py +++ b/system/base/findutils/actions.py @@ -11,7 +11,7 @@ from pisi.actionsapi import get def setup(): shelltools.export("CFLAGS", "%s -D_GNU_SOURCE" % get.CFLAGS()) - + autotools.autoreconf("-fiv") autotools.configure("--enable-nls \ --localstatedir=/var/lib/locate \ --without-included-regex \ diff --git a/system/base/findutils/files/findutils-4.7.0-leaf-opt-xfs.patch b/system/base/findutils/files/findutils-4.7.0-leaf-opt-xfs.patch new file mode 100644 index 00000000..ce8e93ba --- /dev/null +++ b/system/base/findutils/files/findutils-4.7.0-leaf-opt-xfs.patch @@ -0,0 +1,164 @@ +From b9f9ed14bda93ecb407129b69e6476813c250046 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 15 Apr 2020 20:50:32 -0700 +Subject: [PATCH] fts: remove NOSTAT_LEAF_OPTIMIZATION +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +It caused ‘find’ and ‘du’ to dump core, and it was useful +only for obsolescent Linux filesystems anyway. Problem reported in: +https://lists.gnu.org/r/bug-gnulib/2020-04/msg00068.html +Quite possibly there is still a serious underlying fts bug with +tight-loop-check and mutating file systems, but if so this patch +should cause the bug to be triggered less often. +* lib/fts.c (enum leaf_optimization): Remove +NOSTAT_LEAF_OPTIMIZATION, as it’s problematic. +(S_MAGIC_REISERFS, S_MAGIC_XFS): Remove; no longer needed. +(leaf_optimization): Remove special cases for ReiserFS and XFS. +(fts_read): Remove NOSTAT_LEAF_OPTIMIZATION code. +* lib/fts_.h (struct _ftsent.fts_n_dirs_remaining): +Remove. All uses removed. + +Upstream-commit: 47bf2cf3184027c1eb9c1dfeea5c5b8b2d69710d +Signed-off-by: Kamil Dudka +--- + gl/lib/fts.c | 56 ++++++++------------------------------------------- + gl/lib/fts_.h | 5 ----- + 2 files changed, 8 insertions(+), 53 deletions(-) + +diff --git a/gl/lib/fts.c b/gl/lib/fts.c +index 1093ce5..dfe3fef 100644 +--- a/gl/lib/fts.c ++++ b/gl/lib/fts.c +@@ -445,7 +445,6 @@ fts_open (char * const *argv, + if ((parent = fts_alloc(sp, "", 0)) == NULL) + goto mem2; + parent->fts_level = FTS_ROOTPARENTLEVEL; +- parent->fts_n_dirs_remaining = -1; + } + + /* The classic fts implementation would call fts_stat with +@@ -634,9 +633,8 @@ fts_close (FTS *sp) + } + + /* Minimum link count of a traditional Unix directory. When leaf +- optimization is OK and MIN_DIR_NLINK <= st_nlink, then st_nlink is +- an upper bound on the number of subdirectories (counting "." and +- ".."). */ ++ optimization is OK and a directory's st_nlink == MIN_DIR_NLINK, ++ then the directory has no subdirectories. */ + enum { MIN_DIR_NLINK = 2 }; + + /* Whether leaf optimization is OK for a directory. */ +@@ -645,12 +643,8 @@ enum leaf_optimization + /* st_nlink is not reliable for this directory's subdirectories. */ + NO_LEAF_OPTIMIZATION, + +- /* Leaf optimization is OK, but is not useful for avoiding stat calls. */ +- OK_LEAF_OPTIMIZATION, +- +- /* Leaf optimization is not only OK: it is useful for avoiding +- stat calls, because dirent.d_type does not work. */ +- NOSTAT_LEAF_OPTIMIZATION ++ /* st_nlink == 2 means the directory lacks subdirectories. */ ++ OK_LEAF_OPTIMIZATION + }; + + #if (defined __linux__ || defined __ANDROID__) \ +@@ -663,9 +657,7 @@ enum leaf_optimization + # define S_MAGIC_CIFS 0xFF534D42 + # define S_MAGIC_NFS 0x6969 + # define S_MAGIC_PROC 0x9FA0 +-# define S_MAGIC_REISERFS 0x52654973 + # define S_MAGIC_TMPFS 0x1021994 +-# define S_MAGIC_XFS 0x58465342 + + # ifdef HAVE___FSWORD_T + typedef __fsword_t fsword; +@@ -786,23 +778,15 @@ dirent_inode_sort_may_be_useful (FTSENT const *p, int dir_fd) + } + + /* Given an FTS entry P for a directory with descriptor DIR_FD, +- return true if it is both useful and valid to apply leaf optimization. +- The optimization is useful only for file systems that lack usable +- dirent.d_type info. The optimization is valid if an st_nlink value +- of at least MIN_DIR_NLINK is an upper bound on the number of +- subdirectories of D, counting "." and ".." as subdirectories. ++ return whether it is valid to apply leaf optimization. ++ The optimization is valid if a directory's st_nlink value equal ++ to MIN_DIR_NLINK means the directory has no subdirectories. + DIR_FD is negative if unavailable. */ + static enum leaf_optimization + leaf_optimization (FTSENT const *p, int dir_fd) + { + switch (filesystem_type (p, dir_fd)) + { +- /* List here the file system types that may lack usable dirent.d_type +- info, yet for which the optimization does apply. */ +- case S_MAGIC_REISERFS: +- case S_MAGIC_XFS: /* XFS lacked it until 2013-08-22 commit. */ +- return NOSTAT_LEAF_OPTIMIZATION; +- + case 0: + /* Leaf optimization is unsafe if the file system type is unknown. */ + FALLTHROUGH; +@@ -1027,26 +1011,7 @@ check_for_dir: + if (p->fts_info == FTS_NSOK) + { + if (p->fts_statp->st_size == FTS_STAT_REQUIRED) +- { +- FTSENT *parent = p->fts_parent; +- if (parent->fts_n_dirs_remaining == 0 +- && ISSET(FTS_NOSTAT) +- && ISSET(FTS_PHYSICAL) +- && (leaf_optimization (parent, sp->fts_cwd_fd) +- == NOSTAT_LEAF_OPTIMIZATION)) +- { +- /* nothing more needed */ +- } +- else +- { +- p->fts_info = fts_stat(sp, p, false); +- if (S_ISDIR(p->fts_statp->st_mode) +- && p->fts_level != FTS_ROOTLEVEL +- && 0 < parent->fts_n_dirs_remaining +- && parent->fts_n_dirs_remaining != (nlink_t) -1) +- parent->fts_n_dirs_remaining--; +- } +- } ++ p->fts_info = fts_stat(sp, p, false); + else + fts_assert (p->fts_statp->st_size == FTS_NO_STAT_REQUIRED); + } +@@ -1830,11 +1795,6 @@ err: memset(sbp, 0, sizeof(struct stat)); + } + + if (S_ISDIR(sbp->st_mode)) { +- p->fts_n_dirs_remaining +- = ((sbp->st_nlink < MIN_DIR_NLINK +- || p->fts_level <= FTS_ROOTLEVEL) +- ? -1 +- : sbp->st_nlink - (ISSET (FTS_SEEDOT) ? 0 : MIN_DIR_NLINK)); + if (ISDOT(p->fts_name)) { + /* Command-line "." and ".." are real directories. */ + return (p->fts_level == FTS_ROOTLEVEL ? FTS_D : FTS_DOT); +diff --git a/gl/lib/fts_.h b/gl/lib/fts_.h +index d40a116..2e76cc4 100644 +--- a/gl/lib/fts_.h ++++ b/gl/lib/fts_.h +@@ -227,11 +227,6 @@ typedef struct _ftsent { + + size_t fts_namelen; /* strlen(fts_name) */ + +- /* If not (nlink_t) -1, an upper bound on the number of +- remaining subdirectories of interest. If this becomes +- zero, some work can be avoided. */ +- nlink_t fts_n_dirs_remaining; +- + # define FTS_D 1 /* preorder directory */ + # define FTS_DC 2 /* directory that causes cycles */ + # define FTS_DEFAULT 3 /* none of the above */ +-- +2.21.1 + diff --git a/system/base/findutils/files/findutils-4.7.0-root-tests.patch b/system/base/findutils/files/findutils-4.7.0-root-tests.patch new file mode 100644 index 00000000..5207ac4a --- /dev/null +++ b/system/base/findutils/files/findutils-4.7.0-root-tests.patch @@ -0,0 +1,132 @@ +From 498674f70816bb380ce11e62b620e4ece7763fd0 Mon Sep 17 00:00:00 2001 +From: Bernhard Voelker +Date: Sun, 9 Feb 2020 19:58:07 +0100 +Subject: [PATCH] tests: avoid FP when run as root + +Test 'sv-bug-54171' produced a false-positive error as 'find' would +not fail for an unreadable directory when run as root. +Migrate the test to the newer shell-based tests, and add the +'skip_if_root_' guard to avoid a false-positive. + +* find/testsuite/find.posix/sv-bug-54171.exp: Remove. +* find/testsuite/find.posix/sv-bug-54171.xo: Remove. +* find/testsuite/Makefile.am (EXTRA_DIST_XO, EXTRA_DIST_EXP): Remove the +above deleted test. +* tests/find/depth-unreadable-dir.sh: Add test. +* tests/local.mk (all_tests): Reference it. + +Test FP introduced in commit v4.6.0-178-gdf4610d0. +Fixes https://savannah.gnu.org/bugs/?57762 +and https://bugzilla.redhat.com/1799064 + +Upstream-commit: 2f9fff9e1f0c0b7a9034d7c46ca197ce693c4736 +Signed-off-by: Kamil Dudka +--- + find/testsuite/Makefile.am | 2 -- + find/testsuite/find.posix/sv-bug-54171.exp | 5 --- + find/testsuite/find.posix/sv-bug-54171.xo | 1 - + tests/find/depth-unreadable-dir.sh | 39 ++++++++++++++++++++++ + tests/local.mk | 1 + + 5 files changed, 40 insertions(+), 8 deletions(-) + delete mode 100644 find/testsuite/find.posix/sv-bug-54171.exp + delete mode 100644 find/testsuite/find.posix/sv-bug-54171.xo + create mode 100755 tests/find/depth-unreadable-dir.sh + +diff --git a/find/testsuite/Makefile.am b/find/testsuite/Makefile.am +index d252451a..77a2902c 100644 +--- a/find/testsuite/Makefile.am ++++ b/find/testsuite/Makefile.am +@@ -119,7 +119,6 @@ find.posix/prune-stat.xo \ + find.posix/sizetype.xo \ + find.posix/sv-bug-15235.xo \ + find.posix/sv-bug-19613.xo \ +-find.posix/sv-bug-54171.xo \ + find.posix/typesize.xo + + +@@ -246,7 +245,6 @@ find.posix/sv-bug-15235.exp \ + find.posix/sv-bug-19605.exp \ + find.posix/sv-bug-19613.exp \ + find.posix/sv-bug-19617.exp \ +-find.posix/sv-bug-54171.exp \ + find.posix/typesize.exp \ + find.posix/user-empty.exp \ + find.posix/user-missing.exp +diff --git a/find/testsuite/find.posix/sv-bug-54171.exp b/find/testsuite/find.posix/sv-bug-54171.exp +deleted file mode 100644 +index 8e5448fb..00000000 +--- a/find/testsuite/find.posix/sv-bug-54171.exp ++++ /dev/null +@@ -1,5 +0,0 @@ +-exec rm -rf tmp +-exec mkdir tmp tmp/dir +-exec chmod 0311 tmp/dir +-find_start f {tmp -depth -name dir } +-exec rm -rf tmp +diff --git a/find/testsuite/find.posix/sv-bug-54171.xo b/find/testsuite/find.posix/sv-bug-54171.xo +deleted file mode 100644 +index 2dc4706a..00000000 +--- a/find/testsuite/find.posix/sv-bug-54171.xo ++++ /dev/null +@@ -1 +0,0 @@ +-tmp/dir +diff --git a/tests/find/depth-unreadable-dir.sh b/tests/find/depth-unreadable-dir.sh +new file mode 100755 +index 00000000..86e2fd60 +--- /dev/null ++++ b/tests/find/depth-unreadable-dir.sh +@@ -0,0 +1,39 @@ ++#!/bin/sh ++# find -depth: ensure to output an unreadable directory. ++ ++# Copyright (C) 2020 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++. "${srcdir=.}/tests/init.sh"; fu_path_prepend_ ++print_ver_ find ++ ++# Find run as root would not fail for an unreadable directory. ++skip_if_root_ ++ ++# Prepare an unreadable directory, and the expected stdout/stderr. ++mkdir tmp tmp/dir \ ++ && chmod 0311 tmp/dir \ ++ && echo 'tmp/dir' > exp \ ++ && echo "find: 'tmp/dir': Permission denied" > experr \ ++ || framework_failure_ ++ ++# Run FTS-based find with -depth; versions < 4.7.0 failed to output ++# an unreadable directory (see #54171). ++returns_ 1 find tmp -depth -name dir > out 2> err || fail=1 ++ ++compare exp out || fail=1 ++compare experr err || fail=1 ++ ++Exit $fail +diff --git a/tests/local.mk b/tests/local.mk +index dccc7342..986df55e 100644 +--- a/tests/local.mk ++++ b/tests/local.mk +@@ -106,6 +106,7 @@ check-root: + + all_tests = \ + tests/misc/help-version.sh \ ++ tests/find/depth-unreadable-dir.sh \ + tests/find/many-dir-entries-vs-OOM.sh \ + tests/find/name-lbracket-literal.sh \ + tests/find/printf_escapechars.sh \ +-- +2.21.1 + diff --git a/system/base/findutils/pspec.xml b/system/base/findutils/pspec.xml index cd2e6ea6..1342a024 100644 --- a/system/base/findutils/pspec.xml +++ b/system/base/findutils/pspec.xml @@ -16,15 +16,16 @@ gettext texinfo - glibc-devel - - findutils-fedora-4.4.2-xautofs.patch - findutils-fedora-4.5.13-warnings.patch - findutils-fedora-4.5.15-no-locate.patch - findutils-fedora-4.6.0-leaf-opt.patch - findutils-fedora-4.6.0-test-lock.patch - + + findutils-fedora-4.4.2-xautofs.patch + findutils-fedora-4.5.13-warnings.patch + findutils-fedora-4.5.15-no-locate.patch + findutils-fedora-4.6.0-leaf-opt.patch + findutils-fedora-4.6.0-test-lock.patch + findutils-4.7.0-leaf-opt-xfs.patch + findutils-4.7.0-root-tests.patch + @@ -42,7 +43,14 @@ - + + 2020-12-09 + 4.7.0 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + + 2019-12-11 4.7.0 Version bump diff --git a/system/base/gawk/pspec.xml b/system/base/gawk/pspec.xml index 98cf39a3..c5b64650 100644 --- a/system/base/gawk/pspec.xml +++ b/system/base/gawk/pspec.xml @@ -12,10 +12,9 @@ app:console GNU awk pattern-matching language The awk utility interprets a special-purpose programming language that makes it possible to handle simple data-reformatting jobs with just a few lines of code. It helps you to make changes in various text files wherever certain patterns appear, or extract data from parts of certain lines while discarding the rest. Gawk is the GNU implementation of awk. - http://mirrors.kernel.org/gnu/gawk/gawk-4.2.1.tar.xz + http://mirrors.kernel.org/gnu/gawk/gawk-5.1.0.tar.xz gettext - readline-devel gmp-devel mpfr-devel @@ -47,6 +46,13 @@ + + 2020-12-09 + 5.1.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-12-11 4.2.1 diff --git a/system/base/gettext/files/gettext-0.21-gnulib-perror-tests.patch b/system/base/gettext/files/gettext-0.21-gnulib-perror-tests.patch new file mode 100644 index 00000000..983264d2 --- /dev/null +++ b/system/base/gettext/files/gettext-0.21-gnulib-perror-tests.patch @@ -0,0 +1,44 @@ +From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 27 Aug 2020 17:52:58 -0700 +Subject: [PATCH] perror, strerror_r: remove unportable tests + +Problem reported by Florian Weimer in: +https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html +* tests/test-perror2.c (main): +* tests/test-strerror_r.c (main): Omit unportable tests. +--- + ChangeLog | 8 ++++++++ + tests/test-perror2.c | 3 --- + tests/test-strerror_r.c | 3 --- + 3 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/gettext-tools/gnulib-tests/test-perror2.c b/gettext-tools/gnulib-tests/test-perror2.c +index 1d14eda7b..c6214dd25 100644 +--- a/gettext-tools/gnulib-tests/test-perror2.c ++++ b/gettext-tools/gnulib-tests/test-perror2.c +@@ -79,9 +79,6 @@ main (void) + errno = -5; + perror (""); + ASSERT (!ferror (stderr)); +- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); +- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); +- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); + ASSERT (STREQ (msg4, str4)); + + free (str1); +diff --git a/gettext-tools/gnulib-tests/test-strerror_r.c b/gettext-tools/gnulib-tests/test-strerror_r.c +index b11d6fd9f..c1dbcf837 100644 +--- a/gettext-tools/gnulib-tests/test-strerror_r.c ++++ b/gettext-tools/gnulib-tests/test-strerror_r.c +@@ -165,9 +165,6 @@ main (void) + + strerror_r (EACCES, buf, sizeof buf); + strerror_r (-5, buf, sizeof buf); +- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1)); +- ASSERT (msg2 == msg4 || STREQ (msg2, str2)); +- ASSERT (msg3 == msg4 || STREQ (msg3, str3)); + ASSERT (STREQ (msg4, str4)); + + free (str1); + diff --git a/system/base/gettext/pspec.xml b/system/base/gettext/pspec.xml index 51e6983f..5b35ee03 100644 --- a/system/base/gettext/pspec.xml +++ b/system/base/gettext/pspec.xml @@ -20,10 +20,10 @@ ncurses-devel libunistring-devel libxml2-devel - readline-devel + - + gettext-0.21-gnulib-perror-tests.patch @@ -78,7 +78,7 @@ - 2020-10-22 + 2020-12-09 0.21 Version bump Idris Kalp diff --git a/system/base/grep/pspec.xml b/system/base/grep/pspec.xml index 23df6fd6..41fd98dd 100644 --- a/system/base/grep/pspec.xml +++ b/system/base/grep/pspec.xml @@ -12,7 +12,7 @@ app:console GNU regular expression matcher The grep command searches one or more input files for lines containing a match to a specified pattern. By default, grep prints the matching lines. - http://ftp.gnu.org/gnu/grep/grep-3.3.tar.xz + http://ftp.gnu.org/gnu/grep/grep-3.5.tar.xz gettext libpcre-devel @@ -34,7 +34,14 @@ - + + 2020-12-09 + 3.5 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + 2019-12-25 3.3 Version bump diff --git a/system/base/gzip/pspec.xml b/system/base/gzip/pspec.xml index a12336ff..a60c4172 100644 --- a/system/base/gzip/pspec.xml +++ b/system/base/gzip/pspec.xml @@ -27,7 +27,14 @@ - + + 2020-12-09 + 1.10 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + + 2019-12-25 1.10 Version bump. diff --git a/system/devel/make/actions.py b/system/devel/make/actions.py index 9c1b2b72..6d910eac 100644 --- a/system/devel/make/actions.py +++ b/system/devel/make/actions.py @@ -10,7 +10,7 @@ from pisi.actionsapi import get from pisi.actionsapi import pisitools def setup(): - #shelltools.system("sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c") + #shelltools.system("sed -i '211,217 d; 219,229 d; 232 d' lib/glob.c") autotools.configure("--enable-nls \ --program-prefix=g") diff --git a/system/devel/make/pspec.xml b/system/devel/make/pspec.xml index e8ead999..17bef163 100644 --- a/system/devel/make/pspec.xml +++ b/system/devel/make/pspec.xml @@ -12,7 +12,7 @@ app:console Standard tool to compile source trees Standard tool to compile source trees. Make gets its knowledge of how to build your program from a file called the makefile. When you write a program, you should write a makefile for it, so that it is possible to use Make to build and install the program - mirrors://gnu/make/make-4.2.1.tar.bz2 + mirrors://gnu/make/make-4.3.tar.gz texinfo gettext @@ -43,7 +43,14 @@ - + + 2020-11-25 + 4.3 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + + 2019-12-25 4.2.1 Rebuild. diff --git a/system/devel/patch/pspec.xml b/system/devel/patch/pspec.xml index 6c4e63d8..ae474521 100644 --- a/system/devel/patch/pspec.xml +++ b/system/devel/patch/pspec.xml @@ -34,6 +34,13 @@ + + 2020-12-09 + 2.7.6 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2019-12-11 2.7.6