[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e9c5740f476cb2543caf792716ef33f899c34c3e
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 e9c5740f476cb2543caf792716ef33f899c34c3e (commit) via 61c1880c0f0e4c7da7d5016212d8d055e490ca44 (commit) via 113fe5ef033039c3be229fbf0d935c914d1df862 (commit) via a239c48536053d973d272af8b9377159ade0c647 (commit) via 1f922318086d656874e8105be8ee58db198523c2 (commit) via 62c04d4fb1a50a0877eeb09554fabf65fabbb8df (commit) from bf76244de09121886272eddde4bd81caa2480400 (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 e9c5740f476cb2543caf792716ef33f899c34c3e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 19 17:28:52 2023 +0000
cifs-utils: Drop package
I have no idea what is using this at the moment.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 61c1880c0f0e4c7da7d5016212d8d055e490ca44 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 19 13:41:07 2023 +0000
jsoncpp: Update to 1.9.5
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 113fe5ef033039c3be229fbf0d935c914d1df862 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 19 13:40:42 2023 +0000
iproute2: Don't build libnetlink
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a239c48536053d973d272af8b9377159ade0c647 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 19 13:35:52 2023 +0000
duktape: New package
Required by polkit.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1f922318086d656874e8105be8ee58db198523c2 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 19 13:35:24 2023 +0000
readline: Actually add patch that fixes the crash
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 62c04d4fb1a50a0877eeb09554fabf65fabbb8df Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 19 13:34:15 2023 +0000
binutils: Update to 2.40
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: binutils/binutils.nm | 39 ++++++++++++++------------- cifs-utils/cifs-utils.nm | 42 ----------------------------- pixman/pixman.nm => duktape/duktape.nm | 27 ++++++++++--------- iproute2/iproute2.nm | 19 +++---------- jsoncpp/jsoncpp.nm | 6 +++-- readline/patches/readline-8.2-patch-1.patch | 33 +++++++++++++++++++++++ 6 files changed, 77 insertions(+), 89 deletions(-) delete mode 100644 cifs-utils/cifs-utils.nm copy pixman/pixman.nm => duktape/duktape.nm (55%) create mode 100644 readline/patches/readline-8.2-patch-1.patch
Difference in files: diff --git a/binutils/binutils.nm b/binutils/binutils.nm index 93b673334..8ac94fde4 100644 --- a/binutils/binutils.nm +++ b/binutils/binutils.nm @@ -4,14 +4,14 @@ ###############################################################################
name = binutils -version = 2.39 +version = 2.40 release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = Development/Tools -url = http://www.gnu.org/software/binutils/ +url = https://www.gnu.org/software/binutils/ license = GPLv2+ -summary = The GNU Binutils are a collection of binary tools. +summary = The GNU Binutils are a collection of binary tools
description The GNU Binary Utilities, or binutils, is a collection of programming @@ -31,8 +31,11 @@ build perl texinfo zlib-devel + zstd-devel end
+ LDFLAGS += -Wl,--enable-new-dtags + prepare_cmds mkdir -pv %{DIR_SRC}/binutils-build end @@ -43,11 +46,18 @@ build --target=%{DISTRO_BUILDTARGET} \ --disable-werror \ --disable-static \ + --enable-shared \ --enable-64-bit-bfd \ --enable-plugins \ --with-bugurl="https://bugzilla.ipfire.org/" \ --enable-relro=yes \ - --enable-lto + --enable-ld \ + --disable-gold \ + --enable-lto \ + --with-system-zlib \ + --enable-new-dtags \ + --disable-rpath \ + --enable-separate-code
build cd %{DIR_SRC}/binutils-build @@ -78,33 +88,26 @@ build # Remove Windows/Novell only man pages. rm -vf %{BUILDROOT}%{mandir}/man1/{dlltool,nlmconv,windres}* end - - # Keep static version of libiberty. - keep_libraries - %{libdir}/libiberty.a - end end
packages package %{name} - provides - bundled(libiberty) - end + + package %{name}-libs + template LIBS + + files += %{libdir}/*-%{version}.so end
package %{name}-devel template DEVEL
requires - binutils = %{thisver} + binutils-libs = %{thisver} zlib-devel end
- # Don't package libbfd and libopcodes in the -devel package. - files - /usr/include - %{libdir}/*.a - end + files += !%{libdir}/*-%{version}.so end
package %{name}-debuginfo diff --git a/cifs-utils/cifs-utils.nm b/cifs-utils/cifs-utils.nm deleted file mode 100644 index 191afdfeb..000000000 --- a/cifs-utils/cifs-utils.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = cifs-utils -version = 6.6 -release = 1 - -groups = System/Tools -url = https://wiki.samba.org/index.php/LinuxCIFS_utils -license = GPL -summary = A utility for the Common Internet File System - -description - This package of tools is called cifs-utils. Although not really part - of Samba proper, these tools were originally part of the Samba package. - For several reasons, shipping these tools as part of Samba was - problematic and it was deemed better to split them off into their own - package. -end - -source_dl = http://download.samba.org/pub/linux-cifs/cifs-utils/ -sources = %{thisapp}.tar.bz2 - -build - test - make check - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/duktape/duktape.nm b/duktape/duktape.nm new file mode 100644 index 000000000..e8ca7609f --- /dev/null +++ b/duktape/duktape.nm @@ -0,0 +1,45 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = duktape +version = 2.7.0 +release = 1 + +groups = System/Libraries +url = https://duktape.org/ +license = MIT +summary = Embeddable Javascript engine + +description + Duktape is an embeddable Javascript engine, with a focus on + portability and compact footprint. +end + +source_dl = https://duktape.org/ +sources = %{thisapp}.tar.xz + +build + make = make -f Makefile.sharedlibrary INSTALL_PREFIX=%{prefix} LIBDIR=/%{lib} + + build + %{make} %{PARALLELISMFLAGS} + end + + install + %{make} install DESTDIR=%{BUILDROOT} + end +end + +packages + package %{name} + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/iproute2/iproute2.nm b/iproute2/iproute2.nm index 33b6d99c9..12764f296 100644 --- a/iproute2/iproute2.nm +++ b/iproute2/iproute2.nm @@ -5,7 +5,7 @@
name = iproute2 version = 6.0.0 -release = 1 +release = 2
groups = Networking/Tools url = https://git.kernel.org/pub/scm/network/iproute2/iproute2.git @@ -24,29 +24,18 @@ sources = %{thisapp}.tar.xz build requires bison + elfutils-devel flex - libdb-devel + libcap-devel libmnl-devel libnl-devel - libcap-devel + libtirpc-devel linux-atm-devel >= 2.5.1 end
export RPM_OPT_FLAGS = %{CFLAGS} %{LDFLAGS} export LIBDIR = %{libdir} export SBINDIR = %{sbindir} - export IPT_LIB_DIR = %{libdir}/xtables - - install_cmds - # libnetlink - install -v -m 644 include/libnetlink.h %{BUILDROOT}%{includedir} - install -v -m 644 lib/libnetlink.a %{BUILDROOT}%{libdir} - end - - # Keep libnetlink.a - keep_libraries - %{libdir}/libnetlink.a - end end
packages diff --git a/jsoncpp/jsoncpp.nm b/jsoncpp/jsoncpp.nm index 933bd70d9..5ff2f5c28 100644 --- a/jsoncpp/jsoncpp.nm +++ b/jsoncpp/jsoncpp.nm @@ -4,7 +4,7 @@ ###############################################################################
name = jsoncpp -version = 1.7.2 +version = 1.9.5 release = 1
groups = System/Libraries @@ -23,12 +23,14 @@ end source_dl = https://github.com/open-source-parsers/%%7Bname%7D/archive/%%7Bversion%7D.ta...
build + BUILD_DIR = build + requires cmake end
build - CMAKE_CXX_FLAGS="-Wno-error" %{cmake} . + %{cmake} .. make %{PARALLELISMFLAGS} end end diff --git a/readline/patches/readline-8.2-patch-1.patch b/readline/patches/readline-8.2-patch-1.patch new file mode 100644 index 000000000..16a7d62f3 --- /dev/null +++ b/readline/patches/readline-8.2-patch-1.patch @@ -0,0 +1,33 @@ +From 7274faabe97ce53d6b464272d7e6ab6c1392837b Mon Sep 17 00:00:00 2001 +From: Chet Ramey chet.ramey@case.edu +Date: Wed, 5 Oct 2022 10:41:16 -0400 +Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with + an invalid locale specification + +diff --git a/nls.c b/nls.c +index 5c6a13b..8c027d6 100644 +--- a/nls.c ++++ b/nls.c +@@ -141,6 +141,10 @@ _rl_init_locale (void) + if (lspec == 0) + lspec = ""; + ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ ++ if (ret == 0 || *ret == 0) ++ ret = setlocale (LC_CTYPE, (char *)NULL); ++ if (ret == 0 || *ret == 0) ++ ret = RL_DEFAULT_LOCALE; + #else + ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; + #endif +diff --git a/patchlevel b/patchlevel +index d8c9df7..fdf4740 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-0 ++1 +-- +2.30.2 +
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer