[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 92cf4b356785022b855c0be9f3da4d9e2afc9445
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 92cf4b356785022b855c0be9f3da4d9e2afc9445 (commit) via ddfc741138caf925fadb1bb49c003562fe9f7c55 (commit) via 3216d0cb4d0964f92c6b2c1ddafbc813148a34bb (commit) via e6ec25adc75bd3e64b8916d4d997e1735b1fa737 (commit) via 1f19062817d229ba6d688382545a971b5877d909 (commit) via 973a051de8c8e95327a6368dc3f4d1dd4f3baf20 (commit) via 818d2fc192a158bf785ea13c7b8e39f6b87587f7 (commit) via 483e48a6d221644f95acf5a258af6ddaefe40a41 (commit) via e3bf486fde5fbfd5f3b3d18af359ef95d50eb96f (commit) via 78958582e8cc35f1fae07e623c22d71c5e2268db (commit) via 3b05a4809c6ecd1aa5146d9ceb41c2984ab5b6be (commit) from ebccda91e95868a86170cd937d0d8da489d01d52 (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 92cf4b356785022b855c0be9f3da4d9e2afc9445 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 17:24:26 2022 +0000
gcc: Update to 12.2.0
This disables bootstrapping GCC, because for some reason this won't work.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ddfc741138caf925fadb1bb49c003562fe9f7c55 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 17:15:02 2022 +0000
libnetfilter_conntrack: Update to 1.0.9
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3216d0cb4d0964f92c6b2c1ddafbc813148a34bb Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 17:11:21 2022 +0000
libnetfilter_acct: Update to 1.0.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e6ec25adc75bd3e64b8916d4d997e1735b1fa737 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 16:33:11 2022 +0000
iproute2: Update to 6.0.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1f19062817d229ba6d688382545a971b5877d909 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 16:19:13 2022 +0000
nftables: Update to 1.0.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 973a051de8c8e95327a6368dc3f4d1dd4f3baf20 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 15:44:42 2022 +0000
libnftl: Update to 1.2.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 818d2fc192a158bf785ea13c7b8e39f6b87587f7 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 15:39:20 2022 +0000
libmnl: Update to 1.0.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 483e48a6d221644f95acf5a258af6ddaefe40a41 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 15:27:55 2022 +0000
tmux: Update to 3.3a
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e3bf486fde5fbfd5f3b3d18af359ef95d50eb96f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 15:17:07 2022 +0000
libtasn1: Update to 4.19.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 78958582e8cc35f1fae07e623c22d71c5e2268db Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 15:09:04 2022 +0000
pcre: Update to 8.45
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3b05a4809c6ecd1aa5146d9ceb41c2984ab5b6be Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Nov 22 15:01:10 2022 +0000
pcre2: Update to 10.40
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: gcc/gcc.nm | 80 +++--------- gcc/patches/40_all_gcc49_config_esp.patch0 | 140 --------------------- .../gcc-6.1-compile-compiler-with-pic.patch | 17 --- gcc/patches/gcc49-aarch64-async-unw-tables.patch0 | 35 ------ gcc/patches/gcc49-libtool-no-rpath.patch0 | 27 ---- iproute2/iproute2.nm | 6 +- libmnl/libmnl.nm | 6 +- libnetfilter_acct/libnetfilter_acct.nm | 6 +- libnetfilter_conntrack/libnetfilter_conntrack.nm | 6 +- libnftnl/libnftnl.nm | 7 +- libtasn1/libtasn1.nm | 4 +- nftables/nftables.nm | 21 ++-- pcre/pcre.nm | 6 +- pcre2/pcre2.nm | 8 +- tmux/tmux.nm | 7 +- 15 files changed, 53 insertions(+), 323 deletions(-) delete mode 100644 gcc/patches/40_all_gcc49_config_esp.patch0 delete mode 100644 gcc/patches/gcc-6.1-compile-compiler-with-pic.patch delete mode 100644 gcc/patches/gcc49-aarch64-async-unw-tables.patch0 delete mode 100644 gcc/patches/gcc49-libtool-no-rpath.patch0
Difference in files: diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 64831ef3a..485abbe12 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -7,7 +7,7 @@ build_graphite = 1
name = gcc -version = 9.1.0 +version = 12.2.0 release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org @@ -22,7 +22,7 @@ description end
# This is the at least required version of binutils. -binutils_version = 2.24 +binutils_version = 2.35
source_dl = http://ftp.gnu.org/gnu/gcc/%%7Bthisapp%7D/ source_dl += ftp://gcc.gnu.org/pub/gcc/infrastructure/ @@ -38,13 +38,15 @@ build filesystem >= 002 flex glibc-devel >= 2.16 - gmp-devel + gmp-devel >= 4.3.2 + isl-devel >= 0.15 libffi-devel - libmpc-devel >= 0.8.1 - mpfr-devel + libmpc-devel >= 1.0.1 + mpfr-devel >= 3.1.0 perl texinfo zlib-devel + zstd-devel end
# If graphite support is enabled, we require the devel packages for build. @@ -68,7 +70,7 @@ build # configuration. configure_options =
- make_bootstrap = profiledbootstrap + #make_bootstrap = profiledbootstrap
if "%{DISTRO_ARCH}" == "x86_64" configure_options = --disable-multilib @@ -79,41 +81,10 @@ build build_libubsan = 1 end
- if "%{DISTRO_ARCH}" == "i686" - configure_options = --with-arch=%{DISTRO_ARCH} --with-tune=generic - - build_libquadmath = 1 - build_libubsan = 1 - end - if "%{DISTRO_ARCH}" == "aarch64" build_libubsan = 1 end
- if "%{DISTRO_ARCH}" == "armv7hl" - make_bootstrap = bootstrap - - configure_options += --disable-sjlj-exceptions - - configure_options += \ - --with-tune=cortex-a8 \ - --with-arch=armv7-a \ - --with-float=hard \ - --with-fpu=vfpv3-d16 \ - --with-abi=aapcs-linux - - build_libubsan = 1 - end - - if "%{DISTRO_ARCH}" == "armv5tel" - make_bootstrap = bootstrap - - configure_options += --disable-sjlj-exceptions - configure_options += --with-float=soft - - build_libubsan = 1 - end - if "%{build_graphite}" == "1" configure_options += \ --with-isl @@ -192,13 +163,13 @@ build --enable-__cxa_atexit \ --enable-clocale=gnu \ --enable-languages=c,c++,lto \ - --enable-bootstrap \ + --disable-bootstrap \ --enable-checking=release \ --enable-default-pie \ --disable-werror \ --disable-libssp \ --with-system-zlib \ - --with-bugurl=http://bugtracker.ipfire.org \ + --with-bugurl=https://bugzilla.ipfire.org/ \ --disable-libunwind-exceptions \ --enable-gnu-unique-object \ --enable-linker-build-id \ @@ -213,7 +184,7 @@ build # XXX disabled flags: --disable-static
# GCC does not support a parallel build. - make %{make_bootstrap} BOOT_CFLAGS="${CFLAGS}" + make %{make_bootstrap} BOOT_CFLAGS="${CFLAGS}" %{PARALLELISMFLAGS}
# Generate man pages. perl -pi -e 's/head3/head2/' ../contrib/texi2pod.pl @@ -243,42 +214,19 @@ build
# Fix libgcc_s symlinks. rm -f ${FULLPATH}/libgcc_s.so %{BUILDROOT}%{libdir}/libgcc_s.so - case "%{DISTRO_ARCH}" in - arm*) - cat <<EOF >${FULLPATH}/libgcc_s.so - /* GNU ld script - Use the shared library, but some functions are only in - the static library, so try that secondarily. */ - OUTPUT_FORMAT(elf32-littlearm) - GROUP ( %{libdir}/libgcc_s.so.1 libgcc.a ) - EOF - ;; - *) - ln -svf ../../../../..%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so - ;; - esac + ln -svf ../../../../..%{libdir}/libgcc_s.so.1 ${FULLPATH}/libgcc_s.so chmod 755 %{BUILDROOT}%{libdir}/libgcc_s.so.1
# Remove some GNU debugger stuff. rm -vf %{BUILDROOT}%{libdir}/lib*.py
- # Install missing header file(s) on ARM. - case "%{DISTRO_ARCH}" in - arm*) - cp -vf %{DIR_APP}/gcc/config/vxworks-dummy.h \ - ${FULLPATH}/plugin/include/config/ - cp -vf %{DIR_APP}/gcc/config/arm/arm-cores.def \ - ${FULLPATH}/plugin/include/config/arm/ - ;; - esac - # libgomp mv -vf %{BUILDROOT}%{libdir}/libgomp.spec ${FULLPATH}/ ln -svf ../../../libgomp.so.1.0.0 ${FULLPATH}/libgomp.so chmod 755 %{BUILDROOT}%{libdir}/libgomp.so.1.*
# libstdc++ - ln -svf ../../../libstdc++.so.6.0.26 ${FULLPATH}/libstdc++.so + ln -svf ../../../libstdc++.so.6.0.30 ${FULLPATH}/libstdc++.so mv -vf %{BUILDROOT}%{libdir}/lib{std,sup}c++.a ${FULLPATH}
# libquadmath @@ -300,7 +248,7 @@ build
# libtsan if [ "%{build_libtsan}" = "1" ]; then - ln -svf ../../../libtsan.so.0.0.0 ${FULLPATH}/libtsan.so + ln -svf ../../../libtsan.so.2.0.0 ${FULLPATH}/libtsan.so chmod 755 %{BUILDROOT}%{libdir}/libtsan.so.* fi
diff --git a/gcc/patches/40_all_gcc49_config_esp.patch0 b/gcc/patches/40_all_gcc49_config_esp.patch0 deleted file mode 100644 index 16cc2b4d1..000000000 --- a/gcc/patches/40_all_gcc49_config_esp.patch0 +++ /dev/null @@ -1,140 +0,0 @@ -2014-05-12 Magnus Granberg zorry@gentoo.org - - * gcc/esp.h New file to support --enable-esp - Version 20140512.1 - ---- gcc/config/esp.h 2010-04-09 16:14:00.000000000 +0200 -+++ gcc/config/esp.h 2012-06-23 01:00:31.248348491 +0200 -@@ -0,0 +1,132 @@ -+/* License terms see GNU GENERAL PUBLIC LICENSE Version 3. -+ * Version 20140512.1 -+ * Magnus Granberg (Zorry) zorry@gentoo.org */ -+#ifndef GCC_ESP_H -+#define GCC_ESP_H -+ -+/* This file will add -fstack-protector-all, -fstack-check, -fPIE, -pie and -z now -+ as default if the defines and the spec allow it. -+ Added a hack for gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass -+ to support older hardened GCC patches and we don't need to change the code on gcc-specs-* and _filter-hardened. -+ This will add some unsupported upstream commands options as -nopie and -nonow. -+ -D__KERNEL__ is added so we don't have -fPIE, -pie and -fstack-protector-all and -fstack-check when building kernels. -+ ESP_CC1_SPEC is added to CC1_SPEC. -+ ESP_CC1_STRICT_OVERFLOW_SPEC is added so we don't disable the strict-overflow check. -+ ESP_LINK_PIE_CHECK_SPEC check for -pie, -p, -pg, -profile and -static. -+ ENABLE_CRTBEGINP add support for crtbeginP.o, build -static with -fPIE or -fpie. -+*/ -+#ifdef ENABLE_ESP -+ -+ /* Hack to support gcc-specs-* in toolchain-funcs.eclass and _filter-hardened in flag-o-matic.eclass */ -+ #define ESP_CC1_SPEC " %(esp_cc1_ssp) %(esp_cc1_pie) %(esp_cc1_strict_overflow)" -+ #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP ) -+ #define ESP_CC1_SSP_SPEC "%{!fno-stack-protector: %{!fno-stack-protector-all: %{!fno-stack-check: }}}" -+ #else -+ #define ESP_CC1_SSP_SPEC "" -+ #endif -+ #if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP ) -+ #define ESP_CC1_PIE_SPEC "%{!nopie: }" -+ #else -+ #define ESP_CC1_PIE_SPEC "" -+ #endif -+ #define ESP_CC1_STRICT_OVERFLOW_SPEC "%{!fstrict-overflow:%{!fno-strict-overflow: -fno-strict-overflow}}" -+ -+ /* ESP_LINK_SPEC is added to LINK_PIE_SPEC if esp is enable -+ -z now will be added if we don't have -vanilla spec. We do a -pie incompatible check -+ Don't remove the specs in the end */ -+ #define ESP_LINK_SPEC "%(esp_link_now) %(esp_link_pie_check) " -+ #define ESP_LINK_NOW_SPEC "%{!nonow:-z now}" -+ -+ /* We use ESP_DRIVER_SELF_SPEC to add pie and ssp command-line options. */ -+ #define ESP_DRIVER_SELF_SPEC "%{D__KERNEL__:;:%{!nopie:%(esp_options_pie) \ -+ %(esp_link_pie)} %(esp_options_ssp) }" -+ -+ /* This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector -+ -fstack-protector-all and we have EFAULT_SSP or EFAULT_PIE_SSP defined. */ -+ #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP ) -+ #ifdef ESP_NO_STACK_CHECK -+ #define ESP_OPTIONS_STACK_CHECK_SPEC -+ #else -+ #define ESP_OPTIONS_STACK_CHECK_SPEC "%{fstack-check|fstack-check=*:;: -fstack-check}" -+ #endif -+ #define ESP_OPTIONS_SSP_SPEC \ -+ "%{nostdlib|ffreestanding|fno-stack-protector|fstack-protector| \ -+ fstack-protector-all|fstack-protector-strong:;:-fstack-protector-all} " \ -+ ESP_OPTIONS_STACK_CHECK_SPEC -+ #else -+ #define ESP_OPTIONS_SSP_SPEC "" -+ #endif -+ -+ /* If EFAULT_PIE or EFAULT_PIE_SSP is defined we will add -fPIE -pie */ -+ #if defined ( EFAULT_PIE ) || defined ( EFAULT_PIE_SSP ) -+ -+ /* This will add -fPIE if we don't have -pie -fpic -fPIC -fpie -fPIE -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -+ -nostdlib -nostartfiles. */ -+ /* With ENABLE_CRTBEGINP we don't need to check for -static */ -+ #ifdef ENABLE_CRTBEGINP -+ #define ESP_OPTIONS_PIE_SPEC \ -+ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \ -+ %{!shared: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }" -+ #else -+ #define ESP_OPTIONS_PIE_SPEC \ -+ "%{!pie: %{!fpic:%{!fPIC:%{!fpie:%{!fPIE: %{!fno-pic:%{!fno-PIC:%{!fno-pie:%{!fno-PIE: \ -+ %{!shared: %{!static: %{!nostdlib: %{!nostartfiles:-fPIE}} } }}}} }}}} }}" -+ #endif -+ -+ /* This will add -pie if we don't have -pie -A -fno-pic -fno-PIC -fno-pie -fno-PIE -shared -static -r -nostdlib -+ -nostartfiles */ -+ /* With ENABLE_CRTBEGINP we don't need to check for -static -+ and we add -pie only to get the start and endfiles. -pie will not go to the linker. */ -+ #ifdef ENABLE_CRTBEGINP -+ #define ESP_LINK_PIE_SPEC \ -+ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!r: \ -+ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}" -+ #else -+ #define ESP_LINK_PIE_SPEC \ -+ "%{!pie:%{!A:%{!fno-pie:%{!fno-PIE:%{!fno-pic:%{!fno-PIC:%{!shared:%{!static:%{!r: \ -+ %{!nostdlib:%{!nostartfiles:-pie}}}}}}}}}}}" -+ #endif -+ -+ /* This will check if -pie is set when (-static) -pg -p -profile. If set it will make gcc print out -+ "-pie and (static)|pg|p|profile are incompatible when linking" */ -+ /* With ENABLE_CRTBEGINP we don't need to check for -static */ -+ #ifdef ENABLE_CRTBEGINP -+ #define ESP_LINK_PIE_CHECK_SPEC \ -+ "%{pie:%{pg|p|profile:%e-pie and -pg|p|profile are incompatible when linking}}" -+ #else -+ #define ESP_LINK_PIE_CHECK_SPEC \ -+ "%{pie:%{static|pg|p|profile:%e-pie and -static|pg|p|profile are incompatible when linking}}" -+ #endif -+ -+ /* We don't pass -pie to the linker when -static. */ -+ #ifdef ENABLE_CRTBEGINP -+ #define LINK_PIE_SPEC "%{!static:%{pie:-pie}} %(esp_link)" -+ #else -+ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)" -+ #endif -+ -+ #else -+ #define ESP_OPTIONS_PIE_SPEC "" -+ #define ESP_LINK_PIE_CHECK_SPEC "" -+ #define ESP_LINK_PIE_SPEC "" -+ #define LINK_PIE_SPEC "%{pie:-pie} %(esp_link)" -+ #endif -+ -+ /* We add extra spec name's to the EXTRA_SPECS list */ -+ #define ESP_EXTRA_SPECS \ -+ { "esp_cc1", ESP_CC1_SPEC }, \ -+ { "esp_cc1_pie", ESP_CC1_PIE_SPEC }, \ -+ { "esp_cc1_ssp", ESP_CC1_SSP_SPEC }, \ -+ { "esp_cc1_strict_overflow", ESP_CC1_STRICT_OVERFLOW_SPEC }, \ -+ { "esp_link", ESP_LINK_SPEC }, \ -+ { "esp_link_now", ESP_LINK_NOW_SPEC }, \ -+ { "esp_link_pie", ESP_LINK_PIE_SPEC }, \ -+ { "esp_link_pie_check", ESP_LINK_PIE_CHECK_SPEC }, \ -+ { "esp_driver_self", ESP_DRIVER_SELF_SPEC }, \ -+ { "esp_options_pie", ESP_OPTIONS_PIE_SPEC }, \ -+ { "esp_options_ssp", ESP_OPTIONS_SSP_SPEC } -+ -+ static const char *cc1_spec = CC1_SPEC ESP_CC1_SPEC; -+ -+#endif -+#endif /* End GCC_ESP_H */ diff --git a/gcc/patches/gcc-6.1-compile-compiler-with-pic.patch b/gcc/patches/gcc-6.1-compile-compiler-with-pic.patch deleted file mode 100644 index cb59c3db7..000000000 --- a/gcc/patches/gcc-6.1-compile-compiler-with-pic.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 6c5adc0..73d817d 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -261,12 +261,6 @@ endif - NO_PIE_CFLAGS = @NO_PIE_CFLAGS@ - NO_PIE_FLAG = @NO_PIE_FLAG@ - --# We don't want to compile the compilers with -fPIE, it make PCH fail. --COMPILER += $(NO_PIE_CFLAGS) -- --# Link with -no-pie since we compile the compiler with -fno-PIE. --LINKER += $(NO_PIE_FLAG) -- - # Like LINKER, but use a mutex for serializing front end links. - ifeq (@DO_LINK_MUTEX@,true) - LLINKER = $(SHELL) $(srcdir)/lock-and-run.sh linkfe.lck $(LINKER) diff --git a/gcc/patches/gcc49-aarch64-async-unw-tables.patch0 b/gcc/patches/gcc49-aarch64-async-unw-tables.patch0 deleted file mode 100644 index feec149f3..000000000 --- a/gcc/patches/gcc49-aarch64-async-unw-tables.patch0 +++ /dev/null @@ -1,35 +0,0 @@ -2014-04-07 Richard Henderson rth@redhat.com - - * common/config/aarch64/aarch64-common.c (TARGET_OPTION_INIT_STRUCT): - Define. - (aarch64_option_init_struct): New function. - ---- gcc/common/config/aarch64/aarch64-common.c -+++ gcc/common/config/aarch64/aarch64-common.c -@@ -39,6 +39,9 @@ - #undef TARGET_OPTION_OPTIMIZATION_TABLE - #define TARGET_OPTION_OPTIMIZATION_TABLE aarch_option_optimization_table - -+#undef TARGET_OPTION_INIT_STRUCT -+#define TARGET_OPTION_INIT_STRUCT aarch64_option_init_struct -+ - /* Set default optimization options. */ - static const struct default_options aarch_option_optimization_table[] = - { -@@ -47,6 +50,16 @@ static const struct default_options aarch_option_optimization_table[] = - { OPT_LEVELS_NONE, 0, NULL, 0 } - }; - -+/* Implement TARGET_OPTION_INIT_STRUCT. */ -+ -+static void -+aarch64_option_init_struct (struct gcc_options *opts) -+{ -+ /* By default, always emit DWARF-2 unwind info. This allows debugging -+ without maintaining a stack frame back-chain. */ -+ opts->x_flag_asynchronous_unwind_tables = 1; -+} -+ - /* Implement TARGET_HANDLE_OPTION. - This function handles the target specific options for CPU/target selection. - diff --git a/gcc/patches/gcc49-libtool-no-rpath.patch0 b/gcc/patches/gcc49-libtool-no-rpath.patch0 deleted file mode 100644 index 466c661e0..000000000 --- a/gcc/patches/gcc49-libtool-no-rpath.patch0 +++ /dev/null @@ -1,27 +0,0 @@ -libtool sucks. ---- ltmain.sh.jj 2007-12-07 14:53:21.000000000 +0100 -+++ ltmain.sh 2008-09-05 21:51:48.000000000 +0200 -@@ -5394,6 +5394,7 @@ EOF - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do -+ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then -@@ -6071,6 +6072,7 @@ EOF - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do -+ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then -@@ -6120,6 +6122,7 @@ EOF - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do -+ case "$libdir" in /usr/lib|/usr/lib64|/usr/lib/../lib|/usr/lib/../lib64) continue;; esac - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 6582385e3..33b6d99c9 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -4,7 +4,7 @@ ###############################################################################
name = iproute2 -version = 4.18.0 +version = 6.0.0 release = 1
groups = Networking/Tools @@ -26,7 +26,9 @@ build bison flex libdb-devel + libmnl-devel libnl-devel + libcap-devel linux-atm-devel >= 2.5.1 end
@@ -49,8 +51,6 @@ end
packages package %{name} - groups += Base - configfiles = %{sysconfdir}/iproute2 end
diff --git a/libmnl/libmnl.nm b/libmnl/libmnl.nm index 88fddd5e9..9038712b5 100644 --- a/libmnl/libmnl.nm +++ b/libmnl/libmnl.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libmnl -version = 1.0.4 +version = 1.0.5 release = 1
groups = System/Libraries -url = http://www.netfilter.org/projects/libmnl/ +url = https://www.netfilter.org/projects/libmnl/ license = LGPLv2.1+ summary = Minimalistic user-space Netlink library.
@@ -20,7 +20,7 @@ description and to avoid re-inventing the wheel. end
-source_dl = http://www.netfilter.org/projects/%%7Bname%7D/files/ +source_dl = https://www.netfilter.org/projects/%%7Bname%7D/files/ sources = %{thisapp}.tar.bz2
build diff --git a/libnetfilter_acct/libnetfilter_acct.nm b/libnetfilter_acct/libnetfilter_acct.nm index 8051aec4b..edae31490 100644 --- a/libnetfilter_acct/libnetfilter_acct.nm +++ b/libnetfilter_acct/libnetfilter_acct.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libnetfilter_acct -version = 1.0.1 +version = 1.0.3 release = 1
groups = System/Libraries -url = http://www.netfilter.org/projects/libnetfilter_acct/index.html +url = https://www.netfilter.org/projects/libnetfilter_acct/index.html license = GPL summary = The libnetfilter_acct userspace library.
@@ -17,7 +17,7 @@ description extended accounting infrastructure. end
-source_dl = http://www.netfilter.org/projects/libnetfilter_acct/files/ +source_dl = https://www.netfilter.org/projects/libnetfilter_acct/files/ sources = %{thisapp}.tar.bz2
build diff --git a/libnetfilter_conntrack/libnetfilter_conntrack.nm b/libnetfilter_conntrack/libnetfilter_conntrack.nm index 3edf5ba60..b3026d51c 100644 --- a/libnetfilter_conntrack/libnetfilter_conntrack.nm +++ b/libnetfilter_conntrack/libnetfilter_conntrack.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libnetfilter_conntrack -version = 1.0.4 +version = 1.0.9 release = 1
groups = System/Libraries -url = http://www.netfilter.org/projects/libnetfilter_conntrack/index.html +url = https://www.netfilter.org/projects/libnetfilter_conntrack/index.html license = GPL summary = libnetfilter_conntrack is a userspace library.
@@ -18,7 +18,7 @@ description the netfilter subsystem in the Linux kernel. end
-source_dl = http://www.netfilter.org/projects/libnetfilter_conntrack/files/ +source_dl = https://www.netfilter.org/projects/libnetfilter_conntrack/files/ sources = %{thisapp}.tar.bz2
build diff --git a/libnftnl/libnftnl.nm b/libnftnl/libnftnl.nm index dfe8de89e..6c3523627 100644 --- a/libnftnl/libnftnl.nm +++ b/libnftnl/libnftnl.nm @@ -4,12 +4,11 @@ ###############################################################################
name = libnftnl -version = 1.1.3 +version = 1.2.4 release = 1 -thisapp = %{name}-%{version}
groups = Networking/Tools -url = http://netfilter.org/projects/libnftnl +url = https://netfilter.org/projects/libnftnl license = GPLv2 summary = Library for low-level interaction with nftables
@@ -18,7 +17,7 @@ description libmnl. end
-source_dl = http://ftp.netfilter.org/pub/libnftnl/ +source_dl = https://netfilter.org/projects/libnftnl/files/ sources = %{thisapp}.tar.bz2
build diff --git a/libtasn1/libtasn1.nm b/libtasn1/libtasn1.nm index f5ca1ff9c..49ea9cd33 100644 --- a/libtasn1/libtasn1.nm +++ b/libtasn1/libtasn1.nm @@ -4,11 +4,11 @@ ###############################################################################
name = libtasn1 -version = 4.13 +version = 4.19.0 release = 1
groups = System/Libraries -url = http://www.gnu.org/software/libtasn1/ +url = https://www.gnu.org/software/libtasn1/ license = GPLv3+ and LGPLv2+ summary = The ASN.1 library used in GNUTLS.
diff --git a/nftables/nftables.nm b/nftables/nftables.nm index 20b5947ac..315040f97 100644 --- a/nftables/nftables.nm +++ b/nftables/nftables.nm @@ -4,13 +4,11 @@ ###############################################################################
name = nftables -version = 0.9.0 -snapshot = 20190622 -release = 1.%{snapshot} -thisapp = %{name}-%{snapshot} +version = 1.0.5 +release = 1
groups = Networking/Tools -url = http://netfilter.org/projects/nftables/ +url = https://netfilter.org/projects/nftables/ license = GPLv2 summary = Netfilter Tables userspace utillites
@@ -18,29 +16,24 @@ description %{summary} end
-source_dl = http://ftp.netfilter.org/pub/nftables/snapshot/ +source_dl = https://netfilter.org/projects/nftables/files/ sources = %{thisapp}.tar.bz2
build requires asciidoc - autoconf autogen - automake bison docbook2X docbook-xsl flex gmp-devel libtool - libmnl-devel - libnftnl-devel >= 1.0.5 + libedit-devel + libmnl-devel >= 1.0.4 + libnftnl-devel >= 1.2.3 readline-devel end - - prepare_cmds - ./autogen.sh - end end
packages diff --git a/pcre/pcre.nm b/pcre/pcre.nm index cc845faf2..61107539c 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -4,8 +4,8 @@ ###############################################################################
name = pcre -version = 8.41 -release = 2 +version = 8.45 +release = 1
groups = System/Libraries url = http://www.pcre.org/ @@ -18,7 +18,7 @@ description API are also supplied in the library libpcreposix. end
-source_dl = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +source_dl = https://sourceforge.net/projects/pcre/files/pcre/%%7Bversion%7D/
build requires diff --git a/pcre2/pcre2.nm b/pcre2/pcre2.nm index 4d890ea5c..9843fe4e8 100644 --- a/pcre2/pcre2.nm +++ b/pcre2/pcre2.nm @@ -1,6 +1,10 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +###############################################################################
name = pcre2 -version = 10.30 +version = 10.40 release = 1
groups = System/Libraries @@ -27,7 +31,7 @@ description restricted, and does not give full access to all of PCRE2's facilities. end
-source_dl = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ +source_dl = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-%%7Bversion%7D...
build requires diff --git a/tmux/tmux.nm b/tmux/tmux.nm index 276e5207b..8dce37f02 100644 --- a/tmux/tmux.nm +++ b/tmux/tmux.nm @@ -4,7 +4,7 @@ ###############################################################################
name = tmux -version = 2.8 +version = 3.3a release = 1
groups = Application/System @@ -23,9 +23,14 @@ source_dl = https://github.com/tmux/tmux/releases/download/%%7Bversion%7D
build requires + bison ncurses-devel libevent-devel + #systemd-devel end + + #configure_options += \ + # --enable-systemd end
packages
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer