[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 2c1f97395f8903765d7129afc4ee1ab9947dd069
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 2c1f97395f8903765d7129afc4ee1ab9947dd069 (commit) via 5d5a5f4d2f64c714ad62ff11d40e883974af73fc (commit) via 9f6c4072e30d7faf5caf816e67368760cf7cf275 (commit) via 988db099886b1800c5d2da96bba37b366ed4156d (commit) via 6c10b70c4bc6a6207398ce8ed5667a0cf5de9050 (commit) via 21635482436b8a51d92ed8d7e8b7d7ebae96407f (commit) via 70436f85babf8ac27168dfbad1d4e3aef9a598fb (commit) via 8c0d00c7806453bc8f0b5c59b8d9e37d9b97a910 (commit) via 4a041b2bd621a28814556fa5978fb74201d3e8b3 (commit) via 8473cdce15d2225609ccdbe306997a28af4d667d (commit) via 39401781d559ecd1144ae553ac30d282be1ab0a3 (commit) via 678f98543efec5ddca146111c188b110ca7fe683 (commit) via 8c00dee0fc7d8df3b2be836a9f6659796dc247d3 (commit) via fea1090ed192b5289a52035e63b3aab0b695f78e (commit) via 53f15303ef41f288d7ba3540a271fe9ed41ab9a7 (commit) via f7554b2ee1967b7c75140a2c72ff103b048bc503 (commit) via 462f5bb3d1cf44e171e088c7f8f6fe45600e5c0f (commit) via e50a591608098e542448bebc90a6b13282c53191 (commit) from 69b2f2ab8e05bb1b4af5e97a62b4038cb764e795 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 2c1f97395f8903765d7129afc4ee1ab9947dd069 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 20:36:58 2019 +0000
gnutls: Update to 3.6.6
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5d5a5f4d2f64c714ad62ff11d40e883974af73fc Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 20:36:29 2019 +0000
libtasn1: Update to 4.13
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9f6c4072e30d7faf5caf816e67368760cf7cf275 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 20:35:12 2019 +0000
libunistring: Update to 0.9.10
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 988db099886b1800c5d2da96bba37b366ed4156d Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 20:34:37 2019 +0000
nettle: Update to 3.4.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 6c10b70c4bc6a6207398ce8ed5667a0cf5de9050 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 17:53:23 2019 +0000
xz: Update to 5.2.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 21635482436b8a51d92ed8d7e8b7d7ebae96407f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Feb 16 17:42:28 2019 +0000
grep: Update to 3.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 70436f85babf8ac27168dfbad1d4e3aef9a598fb Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 21:33:26 2019 +0000
tcpdump: Update to 4.9.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8c0d00c7806453bc8f0b5c59b8d9e37d9b97a910 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 21:21:22 2019 +0000
transifex-client: Drop package
We no longer use this
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4a041b2bd621a28814556fa5978fb74201d3e8b3 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 21:15:38 2019 +0000
mpfr: Update to 4.0.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8473cdce15d2225609ccdbe306997a28af4d667d Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 21:02:16 2019 +0000
mtr: Update to 0.92
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 39401781d559ecd1144ae553ac30d282be1ab0a3 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 20:59:47 2019 +0000
curl: Update to 7.64.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 678f98543efec5ddca146111c188b110ca7fe683 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 20:56:40 2019 +0000
flex: Update to 2.6.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8c00dee0fc7d8df3b2be836a9f6659796dc247d3 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 20:08:21 2019 +0000
glibc: Update to 2.29
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fea1090ed192b5289a52035e63b3aab0b695f78e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 20:05:38 2019 +0000
bison: Update to 3.3.2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 53f15303ef41f288d7ba3540a271fe9ed41ab9a7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 18:03:31 2019 +0000
coreutils: Update to 8.30
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f7554b2ee1967b7c75140a2c72ff103b048bc503 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 16:33:43 2019 +0000
unbound: Update to 1.9.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 462f5bb3d1cf44e171e088c7f8f6fe45600e5c0f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 16:27:11 2019 +0000
pcre: Enable JIT
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e50a591608098e542448bebc90a6b13282c53191 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Feb 14 16:26:58 2019 +0000
htop: Update to 2.2.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: bison/bison.nm | 4 +- coreutils/coreutils.nm | 2 +- curl/curl.nm | 6 +- curl/patches/0101-curl-7.32.0-multilib.patch | 83 ---------------------- curl/patches/0102-curl-7.29.0-debug.patch | 65 ----------------- curl/patches/0104-curl-7.19.7-localhost6.patch | 51 ------------- flex/flex.nm | 9 ++- ...fixes-Do-not-use-obsolete-bison-construct.patch | 79 -------------------- .../flex-2.6.4-build-fix-reallocarray.patch | 57 +++++++++++++++ glibc/glibc.nm | 9 +-- gnutls/gnutls.nm | 12 ++-- grep/grep.nm | 2 +- htop/htop.nm | 2 +- libtasn1/libtasn1.nm | 4 +- libunistring/libunistring.nm | 4 +- mpfr/mpfr.nm | 2 +- mtr/mtr.nm | 5 +- nettle/nettle.nm | 4 +- pcre/pcre.nm | 4 +- tcpdump/tcpdump.nm | 2 +- transifex-client/transifex-client.nm | 41 ----------- unbound/unbound.nm | 2 +- xz/xz.nm | 2 +- 23 files changed, 98 insertions(+), 353 deletions(-) delete mode 100644 curl/patches/0101-curl-7.32.0-multilib.patch delete mode 100644 curl/patches/0102-curl-7.29.0-debug.patch delete mode 100644 curl/patches/0104-curl-7.19.7-localhost6.patch delete mode 100644 flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch create mode 100644 flex/patches/flex-2.6.4-build-fix-reallocarray.patch delete mode 100644 transifex-client/transifex-client.nm
Difference in files: diff --git a/bison/bison.nm b/bison/bison.nm index bedeeaed2..cbbb0da69 100644 --- a/bison/bison.nm +++ b/bison/bison.nm @@ -4,8 +4,8 @@ ###############################################################################
name = bison -version = 3.0.4 -release = 2 +version = 3.3.2 +release = 1
groups = Development/Tools url = http://www.gnu.org/software/bison/ diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index 9e3db3f30..a85b6a872 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,7 +4,7 @@ ###############################################################################
name = coreutils -version = 8.29 +version = 8.30 release = 1
groups = System/Base diff --git a/curl/curl.nm b/curl/curl.nm index ae5916283..b9e5bff9d 100644 --- a/curl/curl.nm +++ b/curl/curl.nm @@ -4,11 +4,11 @@ ###############################################################################
name = curl -version = 7.48.0 +version = 7.64.0 release = 1
groups = Application/Internet -url = http://www.curl.haxx.se/ +url = https://curl.haxx.se/ license = MIT summary = A utility for getting files from remote servers (FTP, HTTP, and others).
@@ -20,7 +20,7 @@ description user authentication, FTP upload, HTTP post, and file transfer resume. end
-source_dl = http://curl.haxx.se/download/ +source_dl = https://curl.haxx.se/download/
build requires diff --git a/curl/patches/0101-curl-7.32.0-multilib.patch b/curl/patches/0101-curl-7.32.0-multilib.patch deleted file mode 100644 index 9e9b56bae..000000000 --- a/curl/patches/0101-curl-7.32.0-multilib.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 2a4754a3a7cf60ecc36d83cbe50b8c337cb87632 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka kdudka@redhat.com -Date: Fri, 12 Apr 2013 12:04:05 +0200 -Subject: [PATCH] prevent multilib conflicts on the curl-config script - ---- - curl-config.in | 21 +++------------------ - docs/curl-config.1 | 4 +++- - libcurl.pc.in | 1 + - 3 files changed, 7 insertions(+), 19 deletions(-) - -diff --git a/curl-config.in b/curl-config.in -index 150004d..95d0759 100644 ---- a/curl-config.in -+++ b/curl-config.in -@@ -75,7 +75,7 @@ while test $# -gt 0; do - ;; - - --cc) -- echo "@CC@" -+ echo "gcc" - ;; - - --prefix) -@@ -142,29 +142,14 @@ while test $# -gt 0; do - ;; - - --libs) -- if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then -- CURLLIBDIR="-L@libdir@ " -- else -- CURLLIBDIR="" -- fi -- if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then -- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ -- else -- echo ${CURLLIBDIR}-lcurl -- fi -+ pkg-config libcurl --libs - ;; - - --static-libs) -- if test "X@ENABLE_STATIC@" != "Xno" ; then -- echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ -- else -- echo "curl was built with static libraries disabled" >&2 -- exit 1 -- fi - ;; - - --configure) -- echo @CONFIGURE_OPTIONS@ -+ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//' - ;; - - *) -diff --git a/docs/curl-config.1 b/docs/curl-config.1 -index 14a9d2b..ffcc004 100644 ---- a/docs/curl-config.1 -+++ b/docs/curl-config.1 -@@ -65,7 +65,9 @@ be listed using uppercase and are separated by newlines. There may be none, - one, or several protocols in the list. (Added in 7.13.0) - .IP "--static-libs" - Shows the complete set of libs and other linker options you will need in order --to link your application with libcurl statically. (Added in 7.17.1) -+to link your application with libcurl statically. Note that Fedora/RHEL libcurl -+packages do not provide any static libraries, thus cannot be linked statically. -+(Added in 7.17.1) - .IP "--version" - Outputs version information about the installed libcurl. - .IP "--vernum" -diff --git a/libcurl.pc.in b/libcurl.pc.in -index 2ba9c39..f8f8b00 100644 ---- a/libcurl.pc.in -+++ b/libcurl.pc.in -@@ -29,6 +29,7 @@ libdir=@libdir@ - includedir=@includedir@ - supported_protocols="@SUPPORT_PROTOCOLS@" - supported_features="@SUPPORT_FEATURES@" -+configure_options=@CONFIGURE_OPTIONS@ - - Name: libcurl - URL: http://curl.haxx.se/ diff --git a/curl/patches/0102-curl-7.29.0-debug.patch b/curl/patches/0102-curl-7.29.0-debug.patch deleted file mode 100644 index 7f7053008..000000000 --- a/curl/patches/0102-curl-7.29.0-debug.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka kdudka@redhat.com -Date: Wed, 31 Oct 2012 11:38:30 +0100 -Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778) - ---- - configure | 13 +++---------- - m4/curl-compilers.m4 | 13 +++---------- - 2 files changed, 6 insertions(+), 20 deletions(-) - -diff --git a/configure b/configure -index 8f079a3..53b4774 100755 ---- a/configure -+++ b/configure -@@ -15759,18 +15759,11 @@ $as_echo "yes" >&6; } - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -+ flags_dbg_all="" - flags_dbg_yes="-g" - flags_dbg_off="" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - - if test -z "$SED"; then -diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 -index 0cbba7a..9175b5b 100644 ---- a/m4/curl-compilers.m4 -+++ b/m4/curl-compilers.m4 -@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ - gccvhi=`echo $gccver | cut -d . -f1` - gccvlo=`echo $gccver | cut -d . -f2` - compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null` -- flags_dbg_all="-g -g0 -g1 -g2 -g3" -- flags_dbg_all="$flags_dbg_all -ggdb" -- flags_dbg_all="$flags_dbg_all -gstabs" -- flags_dbg_all="$flags_dbg_all -gstabs+" -- flags_dbg_all="$flags_dbg_all -gcoff" -- flags_dbg_all="$flags_dbg_all -gxcoff" -- flags_dbg_all="$flags_dbg_all -gdwarf-2" -- flags_dbg_all="$flags_dbg_all -gvms" -+ flags_dbg_all="" - flags_dbg_yes="-g" - flags_dbg_off="" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os" -- flags_opt_yes="-O2" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - CURL_CHECK_DEF([_WIN32], [], [silent]) - else --- -1.7.1 - diff --git a/curl/patches/0104-curl-7.19.7-localhost6.patch b/curl/patches/0104-curl-7.19.7-localhost6.patch deleted file mode 100644 index 4f664d3dc..000000000 --- a/curl/patches/0104-curl-7.19.7-localhost6.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/tests/data/test1083 b/tests/data/test1083 -index e441278..b0958b6 100644 ---- a/tests/data/test1083 -+++ b/tests/data/test1083 -@@ -33,13 +33,13 @@ ipv6 - http-ipv6 - </server> - <name> --HTTP-IPv6 GET with ip6-localhost --interface -+HTTP-IPv6 GET with localhost6 --interface - </name> - <command> ---g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost -+-g "http://%HOST6IP:%HTTP6PORT/1083" --interface localhost6 - </command> - <precheck> --perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}" -+perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 localhost6'; print 'Cannot run precheck resolve';}" - </precheck> - </client> - -diff --git a/tests/data/test241 b/tests/data/test241 -index 46eae1f..4e1632c 100644 ---- a/tests/data/test241 -+++ b/tests/data/test241 -@@ -30,13 +30,13 @@ ipv6 - http-ipv6 - </server> - <name> --HTTP-IPv6 GET (using ip6-localhost) -+HTTP-IPv6 GET (using localhost6) - </name> - <command> ---g "http://ip6-localhost:%HTTP6PORT/241" -+-g "http://localhost6:%HTTP6PORT/241" - </command> - <precheck> --./server/resolve --ipv6 ip6-localhost -+./server/resolve --ipv6 localhost6 - </precheck> - </client> - -@@ -48,7 +48,7 @@ HTTP-IPv6 GET (using ip6-localhost) - </strip> - <protocol> - GET /241 HTTP/1.1 --Host: ip6-localhost:%HTTP6PORT -+Host: localhost6:%HTTP6PORT - Accept: */* - - </protocol> diff --git a/flex/flex.nm b/flex/flex.nm index 4c5b55559..4fc7cfe88 100644 --- a/flex/flex.nm +++ b/flex/flex.nm @@ -4,8 +4,8 @@ ###############################################################################
name = flex -version = 2.5.39 -release = 2.1 +version = 2.6.4 +release = 1
groups = Development/Tools url = http://flex.sourceforge.net/ @@ -24,12 +24,15 @@ description build process. end
-source_dl = http://prdownloads.sourceforge.net/flex/ +source_dl = https://github.com/westes/flex/releases/download/v%%7Bversion%7D/
build requires + autoconf + automake bison gcc-c++ + help2man m4 end
diff --git a/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch b/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch deleted file mode 100644 index eb46be34e..000000000 --- a/flex/patches/0001-bison-test-fixes-Do-not-use-obsolete-bison-construct.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 35aba3d6e3c99fcd527c677bef8efeb59963fe8a Mon Sep 17 00:00:00 2001 -Message-Id: 35aba3d6e3c99fcd527c677bef8efeb59963fe8a.1397340102.git.srivasta@golden-gryphon.com -From: Manoj Srivastava srivasta@golden-gryphon.com -Date: Wed, 9 Apr 2014 00:23:07 -0700 -Subject: [PATCH 1/1] [bison-test-fixes] Do not use obsolete bison constructs in tests. - -In Bison 3.0, support for YYLEX_PARAM and YYPARSE_PARAM has been -removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or -%param. This commit fixes the tests so they still work. - -Signed-off-by: Manoj Srivastava srivasta@golden-gryphon.com ---- - tests/test-bison-yylloc/parser.y | 4 ++-- - tests/test-bison-yylval/parser.y | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - 50.0% tests/test-bison-yylloc/ - 50.0% tests/test-bison-yylval/ - -diff --git a/tests/test-bison-yylloc/parser.y b/tests/test-bison-yylloc/parser.y -index e8f4e56..224d252 100644 ---- a/tests/test-bison-yylloc/parser.y -+++ b/tests/test-bison-yylloc/parser.y -@@ -22,6 +22,7 @@ - */ - - %parse-param { void* scanner } -+%lex-param { void* scanner } - - /* - How to compile: -@@ -34,7 +35,6 @@ - #include "config.h" - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - extern int testget_lineno(void*); - -@@ -52,7 +52,7 @@ int process_text(char* s) { - - %} - --%pure_parser -+%pure-parser - - %union { - int lineno; -diff --git a/tests/test-bison-yylval/parser.y b/tests/test-bison-yylval/parser.y -index 0ffdb89..626c5e7 100644 ---- a/tests/test-bison-yylval/parser.y -+++ b/tests/test-bison-yylval/parser.y -@@ -26,6 +26,7 @@ - bison --defines --output-file="parser.c" --name-prefix="test" parser.y - */ - %parse-param { void* scanner } -+%lex-param { void* scanner } - %{ - #include <stdio.h> - #include <stdlib.h> -@@ -33,7 +34,6 @@ - #include "config.h" - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - - /* A dummy function. A check against seg-faults in yylval->str. */ -@@ -49,7 +49,7 @@ int process_text(char* s) { - - %} - --%pure_parser -+%pure-parser - - %union { - long unused; --- -1.9.2 - diff --git a/flex/patches/flex-2.6.4-build-fix-reallocarray.patch b/flex/patches/flex-2.6.4-build-fix-reallocarray.patch new file mode 100644 index 000000000..186e4d77a --- /dev/null +++ b/flex/patches/flex-2.6.4-build-fix-reallocarray.patch @@ -0,0 +1,57 @@ +From 23797fd0b0908dd2c5775e6135728c7384f4e952 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner wiz@NetBSD.org +Date: Fri, 19 May 2017 10:22:44 +0200 +Subject: [PATCH] Use reallocarr() when available. + +Fixes https://github.com/westes/flex/issues/219 +--- + configure.ac | 1 + + src/misc.c | 16 ++++++++++++++-- + 2 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 55e774b0..d0f3b7da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -166,6 +166,7 @@ strtol dnl + AC_CHECK_FUNCS([dnl + pow dnl Used only by "examples/manual/expr" + setlocale dnl Needed only if NLS is enabled ++reallocarr dnl NetBSD function. Use reallocarray if not available. + reallocarray dnl OpenBSD function. We have replacement if not available. + ]) + +diff --git a/src/misc.c b/src/misc.c +index ef27833c..39483ea8 100644 +--- a/src/misc.c ++++ b/src/misc.c +@@ -142,7 +142,14 @@ void add_action (const char *new_text) + void *allocate_array (int size, size_t element_size) + { + void *mem; +-#if HAVE_REALLOCARRAY ++#if HAVE_REALLOCARR ++ mem = NULL; ++ if (reallocarr(&mem, (size_t) size, element_size)) ++ flexfatal (_ ++ ("memory allocation failed in allocate_array()")); ++ ++ return mem; ++#elif HAVE_REALLOCARRAY + /* reallocarray has built-in overflow detection */ + mem = reallocarray(NULL, (size_t) size, element_size); + #else +@@ -659,7 +666,12 @@ char *readable_form (int c) + void *reallocate_array (void *array, int size, size_t element_size) + { + void *new_array; +-#if HAVE_REALLOCARRAY ++#if HAVE_REALLOCARR ++ if (reallocarr(&array, (size_t) size, element_size)) ++ flexfatal (_("attempt to increase array size failed")); ++ ++ return array; ++#elif HAVE_REALLOCARRAY + /* reallocarray has built-in overflow detection */ + new_array = reallocarray(array, (size_t) size, element_size); + #else diff --git a/glibc/glibc.nm b/glibc/glibc.nm index 012e5b3d8..eb3f7e2cc 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ###############################################################################
name = glibc -version = 2.28 -release = 2 +version = 2.29 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Base @@ -23,7 +23,7 @@ description Linux system will not function. end
-source_dl = http://ftp.gnu.org/gnu/glibc/ +source_dl = https://ftp.gnu.org/gnu/glibc/ sources = %{thisapp}.tar.xz
build @@ -38,9 +38,10 @@ build gcc >= 8 gettext kernel-headers >= %{OPTIMIZED_KERNEL} - make >= 4.0 libcap-devel libstdc++-static + make >= 4.0 + python3 >= 3.4 texinfo end
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm index f30c2b8de..0c5d68a4c 100644 --- a/gnutls/gnutls.nm +++ b/gnutls/gnutls.nm @@ -5,8 +5,8 @@
name = gnutls version = %{ver_maj}.%{ver_min} -ver_maj = 3.5 -ver_min = 4 +ver_maj = 3.6 +ver_min = 6 release = 1
groups = System/Libraries @@ -30,10 +30,11 @@ build gettext libgcrypt-devel libidn-devel - libtasn1-devel >= 3.2 + libtasn1-devel >= 4.9 + libunistring-devel lzo-devel net-tools - nettle-devel >= 3.2 + nettle-devel >= 3.4.1 perl p11-kit-devel >= 0.23.1 readline-devel @@ -47,7 +48,6 @@ build configure_options += \ --with-included-libcfg \ --disable-openssl-compatibility \ - --disable-srp-authentication \ --disable-non-suiteb-curves \ --disable-guile
@@ -61,7 +61,7 @@ end packages package %{name} requires - nettle >= 2.7 + nettle >= 3.4.1 p11-kit >= 0.14 end end diff --git a/grep/grep.nm b/grep/grep.nm index ca5db45f8..d20076202 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -4,7 +4,7 @@ ###############################################################################
name = grep -version = 3.0 +version = 3.3 release = 1
groups = Applications/Text diff --git a/htop/htop.nm b/htop/htop.nm index 186335157..03e9d8faf 100644 --- a/htop/htop.nm +++ b/htop/htop.nm @@ -4,7 +4,7 @@ ###############################################################################
name = htop -version = 1.0.3 +version = 2.2.0 release = 1
groups = Applications/System diff --git a/libtasn1/libtasn1.nm b/libtasn1/libtasn1.nm index 2f85b28be..f5ca1ff9c 100644 --- a/libtasn1/libtasn1.nm +++ b/libtasn1/libtasn1.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libtasn1 -version = 4.8 +version = 4.13 release = 1
groups = System/Libraries @@ -17,7 +17,7 @@ description be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org. end
-source_dl = http://ftp.gnu.org/gnu/libtasn1/ +source_dl = https://ftp.gnu.org/gnu/libtasn1/
build requires diff --git a/libunistring/libunistring.nm b/libunistring/libunistring.nm index d238fbdc9..6ff472274 100644 --- a/libunistring/libunistring.nm +++ b/libunistring/libunistring.nm @@ -4,7 +4,7 @@ ###############################################################################
name = libunistring -version = 0.9.6 +version = 0.9.10 release = 1
groups = System/Libraries @@ -20,7 +20,7 @@ description case folding and regular expressions). end
-source_dl = ftp://ftp.gnu.org/gnu/libunistring/ +source_dl = https://ftp.gnu.org/gnu/libunistring/
build configure_options += \ diff --git a/mpfr/mpfr.nm b/mpfr/mpfr.nm index bebcd7a0c..a2df35ee2 100644 --- a/mpfr/mpfr.nm +++ b/mpfr/mpfr.nm @@ -4,7 +4,7 @@ ###############################################################################
name = mpfr -version = 4.0.0 +version = 4.0.2 release = 1
groups = System/Libraries diff --git a/mtr/mtr.nm b/mtr/mtr.nm index 0af23d8f1..f9d292c85 100644 --- a/mtr/mtr.nm +++ b/mtr/mtr.nm @@ -4,7 +4,7 @@ ###############################################################################
name = mtr -version = 0.85 +version = 0.92 release = 1
groups = Applications/Internet @@ -21,8 +21,11 @@ source_dl = ftp://ftp.bitwizard.nl/mtr/
build requires + autoconf + automake ncurses-devel glib2-devel + libcap-devel end
configure_options += \ diff --git a/nettle/nettle.nm b/nettle/nettle.nm index 1c0695f44..330689413 100644 --- a/nettle/nettle.nm +++ b/nettle/nettle.nm @@ -4,7 +4,7 @@ ###############################################################################
name = nettle -version = 3.3 +version = 3.4.1 release = 1
groups = System/Libraries @@ -19,7 +19,7 @@ description or even in kernel space. end
-source_dl = http://www.lysator.liu.se/~nisse/archive/ +source_dl = https://ftp.gnu.org/gnu/nettle/
build requires diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 6f54208e9..cc845faf2 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -5,7 +5,7 @@
name = pcre version = 8.41 -release = 1 +release = 2
groups = System/Libraries url = http://www.pcre.org/ @@ -31,7 +31,7 @@ build configure_options += \ --disable-static \ --docdir=/usr/share/doc/pcre-%{version} \ - --disable-jit \ + --enable-jit \ --enable-pcre8 \ --enable-pcre16 \ --enable-pcre32 \ diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm index 68fc555a2..c1326d056 100644 --- a/tcpdump/tcpdump.nm +++ b/tcpdump/tcpdump.nm @@ -4,7 +4,7 @@ ###############################################################################
name = tcpdump -version = 4.7.4 +version = 4.9.2 release = 1
groups = Networking/Sniffer diff --git a/transifex-client/transifex-client.nm b/transifex-client/transifex-client.nm deleted file mode 100644 index b3f0e74a6..000000000 --- a/transifex-client/transifex-client.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = transifex-client -version = 0.7.3 -release = 2 -arch = noarch - -groups = Development/Tools -url = http://transifex.org -license = GPLv2 -summary = Command line tool for Transifex translation management. - -description - The Transifex Command-line Client is a command line tool that enables - you to easily manage your translations within a project without the - need of an elaborate UI system. -end - -source_dl = http://pypi.python.org/packages/source/t/transifex-client - -build - requires - python-devel - python-setuptools >= 0.6.28 - end - - build - python setup.py build - end - - install - python setup.py install -O1 --skip-build --root %{BUILDROOT} - end -end - -packages - package %{name} -end diff --git a/unbound/unbound.nm b/unbound/unbound.nm index f5c4e9c4e..ca4fddc0b 100644 --- a/unbound/unbound.nm +++ b/unbound/unbound.nm @@ -4,7 +4,7 @@ ###############################################################################
name = unbound -version = 1.7.3 +version = 1.9.0 release = 1
groups = System/Daemons diff --git a/xz/xz.nm b/xz/xz.nm index 9a278042f..c815baed2 100644 --- a/xz/xz.nm +++ b/xz/xz.nm @@ -4,7 +4,7 @@ ###############################################################################
name = xz -version = 5.2.3 +version = 5.2.4 release = 1
groups = Applications/Compression
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer