Development April 2021

development@lists.ipfire.org

15 participants
161 discussions

[PATCH v2 1/3] lua: Update to 5.4.3
by Adolf Belka 24 Apr '21

24 Apr '21

- v2 patch version has required libraries not commented - v2 patch version has lua.pc file commented out in the rootfile pkgconfig file is only required for build or development and not for normal running of IPFire - v2 patch version has make linux changed to make all INSTALL_TOP is required - default is /usr/local INSTALL_DATA is required - default results in an empty rootfile TO_LIB is required - default results in only lua.a in rootfile - v2 patch version includes PAK_VER updates for dnsdist and haproxy due to sobump. These packages showed up as dependencies to the old lua library ncat was also linked but already had a PAK_VER change due to a package upgrade and so no longer showed up in the find-dependencies scan - Update from 5.3.5 to 5.4.3 - Autotoolize patch not update since 5.3 series Based on input from Michael Tremer implemented build approach from BLFS. This approach also used by Arch Linux. Updated lfs in line with approach. Added pkgconfig file lua.pc as used in BLFS. - Update of shared_library patch obtained from BLFS - Update of rootfile - Removal of old lua-5.3.5 patches - Changelog Main changes new generational mode for garbage collection to-be-closed variables const variables userdata can have multiple user values new implementation for math.random warning system debug information about function arguments and returns new semantics for the integer 'for' loop optional 'init' argument to 'string.gmatch' new functions 'lua_resetthread' and 'coroutine.close' string-to-number coercions moved to the string library allocation function allowed to fail when shrinking a memory block new format '%p' in 'string.format' utf8 library accepts codepoints up to 2^31 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/lua/lua.pc | 20 ++ config/rootfiles/common/lua | 11 +- lfs/lua | 23 ++- src/patches/lua-5.4.3-shared_library-1.patch | 78 +++++++ src/patches/lua/lua-5.3.5-autotoolize.patch | 192 ------------------ .../lua/lua-5.3.5-shared_library-1.patch | 61 ------ 6 files changed, 117 insertions(+), 268 deletions(-) create mode 100644 config/lua/lua.pc create mode 100644 src/patches/lua-5.4.3-shared_library-1.patch delete mode 100644 src/patches/lua/lua-5.3.5-autotoolize.patch delete mode 100644 src/patches/lua/lua-5.3.5-shared_library-1.patch diff --git a/config/lua/lua.pc b/config/lua/lua.pc new file mode 100644 index 000000000..f6d25ec33 --- /dev/null +++ b/config/lua/lua.pc @@ -0,0 +1,20 @@ +V=5.4 +R=5.4.3 + +prefix=/usr +INSTALL_BIN=${prefix}/bin +INSTALL_INC=${prefix}/include +INSTALL_LIB=${prefix}/lib +INSTALL_MAN=${prefix}/share/man/man1 +INSTALL_LMOD=${prefix}/share/lua/${V} +INSTALL_CMOD=${prefix}/lib/lua/${V} +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Lua +Description: An Extensible Extension Language +Version: ${R} +Requires: +Libs: -L${libdir} -llua -lm -ldl +Cflags: -I${includedir} diff --git a/config/rootfiles/common/lua b/config/rootfiles/common/lua index 15d5995b3..1839f7e1b 100644 --- a/config/rootfiles/common/lua +++ b/config/rootfiles/common/lua @@ -5,10 +5,13 @@ usr/bin/luac #usr/include/lua.hpp #usr/include/luaconf.h #usr/include/lualib.h -usr/lib/liblua-5.3.so -#usr/lib/liblua.a -#usr/lib/liblua.la -usr/lib/liblua.so +#usr/lib/liblua.so +usr/lib/liblua.so.5.4 +usr/lib/liblua.so.5.4.3 +#usr/lib/lua +#usr/lib/lua/5.4 #usr/lib/pkgconfig/lua.pc +#usr/share/lua +#usr/share/lua/5.4 #usr/share/man/man1/lua.1 #usr/share/man/man1/luac.1 diff --git a/lfs/lua b/lfs/lua index e70b9cd00..8fffba704 100644 --- a/lfs/lua +++ b/lfs/lua @@ -24,7 +24,7 @@ include Config -VER = 5.3.5 +VER = 5.4.3 THISAPP = lua-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4f4b4f323fd3514a68e0ab3da8ce3455 +$(DL_FILE)_MD5 = ef63ed2ecfb713646a7fcc583cf5f352 install : $(TARGET) @@ -70,14 +70,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && cp -v src/luaconf.h src/luaconf.h.template.in - - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua/lua-5.3.5-autotoolize.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua/lua-5.3.5-shared_library-1.patch - - cd $(DIR_APP) && autoreconf -vfi - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lua-5.4.3-shared_library-1.patch + # install lua pkgconfig file + install -v -m 644 ${DIR_SRC}/config/lua/lua.pc \ + /usr/lib/pkgconfig/lua.pc + cd $(DIR_APP) && make all $(MAKETUNING) + cd $(DIR_APP) && make INSTALL_TOP=/usr \ + INSTALL_DATA="cp -d" \ + INSTALL_MAN=/usr/share/man/man1 \ + TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.3" \ + install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/lua-5.4.3-shared_library-1.patch b/src/patches/lua-5.4.3-shared_library-1.patch new file mode 100644 index 000000000..f1dfad9ca --- /dev/null +++ b/src/patches/lua-5.4.3-shared_library-1.patch @@ -0,0 +1,78 @@ +Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> +Date: 2020-06-30 +Initial Package Version: 5.4.0 +Upstream Status: Rejected +Origin: Arch Linux, with some modifications +Description: Creates a shared liblua library, as well as + removes optimization since it causes SIGBUS errors, + and sets the search path to /usr from /usr/local. + The initial version of this patch was created by + Igor Zivkovic, before being rediffed for 5.4.0 by + myself with some modifications made. + +diff -Naurp lua-5.4.0.orig/Makefile lua-5.4.0/Makefile +--- lua-5.4.0.orig/Makefile 2020-04-15 07:55:07.000000000 -0500 ++++ lua-5.4.0/Makefile 2020-06-30 13:22:00.997938585 -0500 +@@ -52,7 +52,7 @@ R= $V.0 + all: $(PLAT) + + $(PLATS) help test clean: +- @cd src && $(MAKE) $@ ++ @cd src && $(MAKE) $@ V=$(V) R=$(R) + + install: dummy + cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) +diff -Naurp lua-5.4.0.orig/src/luaconf.h lua-5.4.0/src/luaconf.h +--- lua-5.4.0.orig/src/luaconf.h 2020-06-18 09:25:54.000000000 -0500 ++++ lua-5.4.0/src/luaconf.h 2020-06-30 13:24:59.294932289 -0500 +@@ -227,7 +227,7 @@ + + #else /* }{ */ + +-#define LUA_ROOT "/usr/local/" ++#define LUA_ROOT "/usr/" + #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" + #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" + +diff -Naurp lua-5.4.0.orig/src/Makefile lua-5.4.0/src/Makefile +--- lua-5.4.0.orig/src/Makefile 2020-04-15 08:00:29.000000000 -0500 ++++ lua-5.4.0/src/Makefile 2020-06-30 13:24:15.746933827 -0500 +@@ -7,7 +7,7 @@ + PLAT= guess + + CC= gcc -std=gnu99 +-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS) ++CFLAGS= -fPIC -O0 -Wall -Wextra -DLUA_COMPAT_5_3 -DLUA_COMPAT_5_2 -DLUA_COMPAT_5_1 $(SYSCFLAGS) $(MYCFLAGS) + LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) + LIBS= -lm $(SYSLIBS) $(MYLIBS) + +@@ -33,6 +33,7 @@ CMCFLAGS= -Os + PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + + LUA_A= liblua.a ++LUA_SO= liblua.so + CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o lundump.o lvm.o lzio.o + LIB_O= lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o + BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS) +@@ -44,7 +45,7 @@ LUAC_T= luac + LUAC_O= luac.o + + ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) +-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) ++ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) + ALL_A= $(LUA_A) + + # Targets start here. +@@ -60,6 +61,12 @@ $(LUA_A): $(BASE_O) + $(AR) $@ $(BASE_O) + $(RANLIB) $@ + ++$(LUA_SO): $(CORE_O) $(LIB_O) ++ $(CC) -shared -ldl -Wl,--soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm ++ $(MYLDFLAGS) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) ++ ln -sf $(LUA_SO).$(R) $(LUA_SO) ++ + $(LUA_T): $(LUA_O) $(LUA_A) + $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) + diff --git a/src/patches/lua/lua-5.3.5-autotoolize.patch b/src/patches/lua/lua-5.3.5-autotoolize.patch deleted file mode 100644 index 76747923a..000000000 --- a/src/patches/lua/lua-5.3.5-autotoolize.patch +++ /dev/null @@ -1,192 +0,0 @@ -diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac ---- lua-5.3.0/configure.ac.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/configure.ac 2015-01-15 10:20:03.826889574 -0500 -@@ -0,0 +1,69 @@ -+AC_PREREQ(2.59) -+AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org]) -+AC_SUBST([MAJOR_VERSION], [5.3]) -+ -+AC_CONFIG_HEADERS([config.h]) -+AC_CONFIG_SRCDIR([src/lapi.c]) -+ -+AM_INIT_AUTOMAKE([1.9 foreign]) -+ -+AC_PROG_CC -+AC_PROG_LIBTOOL -+ -+AC_ARG_WITH( -+ [readline], -+ [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])], -+ [use_readline=$withval], -+ [use_readline=yes] -+) -+ -+LUA_LIBS="-lm" -+ -+# Check for readline -+READLINE_DEFS="#undef LUA_USE_READLINE" -+if test "x$use_readline" == "xyes"; then -+ AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses]) -+ AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no]) -+ if test "x$use_readline" == "xno"; then -+ AC_MSG_WARN([readline headers could not be found, disabling readline support]) -+ else -+ READLINE_DEFS="#define LUA_USE_READLINE" -+ READLINE_LIBS="-lreadline -lncurses" -+ fi -+fi -+AC_SUBST(READLINE_DEFS) -+AC_SUBST(READLINE_LIBS) -+ -+case "$host" in -+ *-mingw*) use_os=win32 ;; -+ *-darwin*) use_os=macosx ;; -+ *) use_os=posix ;; -+esac -+ -+POSIX_DEFS="#undef LUA_USE_POSIX" -+LUA_DL_DEFS="#undef LUA_USE_DLOPEN" -+LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL" -+ -+if test "x$use_os" == "xwin32"; then -+ LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL" -+elif test "x$use_os" == "xmacosx"; then -+ POSIX_DEFS="#define LUA_USE_POSIX" -+ LUA_DL_DEFS="#define LUA_DL_DYLD" -+elif test "x$use_os" == "xposix"; then -+ POSIX_DEFS="#define LUA_USE_POSIX" -+ LUA_DL_DEFS="#define LUA_DL_DLOPEN" -+ LUA_LIBS="$LUA_LIBS -ldl" -+fi -+AC_SUBST(POSIX_DEFS) -+AC_SUBST(LUA_DL_DEFS) -+AC_SUBST(LUA_BUILD_AS_DLL_DEFS) -+ -+AC_SUBST(LUA_LIBS) -+ -+AC_CONFIG_FILES([Makefile -+ src/Makefile -+ src/lua.pc -+ src/luaconf.h.template -+ doc/Makefile -+]) -+AC_OUTPUT -diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am ---- lua-5.3.0/doc/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/doc/Makefile.am 2015-01-15 10:20:03.826889574 -0500 -@@ -0,0 +1,4 @@ -+man1_MANS = lua.1 luac.1 -+ -+EXTRA_DIST = \ -+ contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html -diff -up lua-5.3.0/Makefile.am.autoxxx lua-5.3.0/Makefile.am ---- lua-5.3.0/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/Makefile.am 2015-01-15 10:20:03.826889574 -0500 -@@ -0,0 +1,3 @@ -+SUBDIRS = src doc -+ -+EXTRA_DIST = README -diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore ---- lua-5.3.0/src/.gitignore.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/src/.gitignore 2015-01-15 10:20:03.826889574 -0500 -@@ -0,0 +1,5 @@ -+lua -+lua.pc -+luac -+luaconf.h -+luaconf.h.template -diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.template.in ---- lua-5.3.0/src/luaconf.h.template.in.autoxxx 2015-01-15 10:20:03.828889562 -0500 -+++ lua-5.3.0/src/luaconf.h.template.in 2015-01-15 10:22:37.420027778 -0500 -@@ -11,6 +11,11 @@ - #include <limits.h> - #include <stddef.h> - -+@POSIX_DEFS@ -+@LUA_DL_DEFS@ -+@LUA_BUILD_AS_DLL_DEFS@ -+@READLINE_DEFS@ -+ - - /* - ** =================================================================== -@@ -200,9 +205,9 @@ - - #else /* }{ */ - --#define LUA_ROOT "/usr/local/" --#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" --#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" -+#define LUA_ROOT "@prefix@/" -+#define LUA_LDIR "@pkgdatadir@/lua/" LUA_VDIR "/" -+#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/" - #define LUA_PATH_DEFAULT \ - LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \ - LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \ -diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in ---- lua-5.3.0/src/lua.pc.in.autoxxx 2015-01-15 10:20:03.827889568 -0500 -+++ lua-5.3.0/src/lua.pc.in 2015-01-15 10:20:03.827889568 -0500 -@@ -0,0 +1,13 @@ -+V= @MAJOR_VERSION@ -+R= @VERSION@ -+prefix= @prefix@ -+exec_prefix=${prefix} -+libdir= @libdir@ -+includedir=${prefix}/include -+ -+Name: Lua -+Description: An Extensible Extension Language -+Version: ${R} -+Requires: -+Libs: -llua @LUA_LIBS@ -+Cflags: -I${includedir} -diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am ---- lua-5.3.0/src/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500 -+++ lua-5.3.0/src/Makefile.am 2015-01-15 10:20:03.826889574 -0500 -@@ -0,0 +1,46 @@ -+AM_CFLAGS = -Wall -+ -+include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp -+ -+nodist_include_HEADERS = luaconf.h -+ -+lib_LTLIBRARIES = liblua.la -+liblua_la_LDFLAGS = -release @MAJOR_VERSION@ -+liblua_la_SOURCES = \ -+ lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \ -+ ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \ -+ loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \ -+ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \ -+ lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \ -+ lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \ -+ lundump.h lvm.h lzio.h -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = lua.pc -+ -+bin_PROGRAMS = lua luac -+ -+lua_SOURCES = lua.c -+lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@ -+lua_DEPENDENCIES = liblua.la -+ -+luac_SOURCES = luac.c -+# Statically link liblua against luac since luac uses symbols not exported in liblua -+luac_LDADD = .libs/liblua.a @LUA_LIBS@ -+luac_DEPENDENCIES = liblua.la -+ -+EXTRA_DIST = luaconf.h.template -+BUILT_SOURCES = luaconf.h -+CLEANFILES = luaconf.h luaconf.h.template -+ -+readline_defs = @READLINE_DEFS@ -+ -+edit = sed \ -+ -e 's,%prefix%,$(prefix),g' \ -+ -e 's,%lua_datadir%,$(datadir),g' \ -+ -e 's,%lua_libdir%,$(libdir),g' -+ -+luaconf.h : luaconf.h.template -+ rm -f $@ $@.tmp -+ $(edit) $< >$@.tmp -+ mv $@.tmp $@ diff --git a/src/patches/lua/lua-5.3.5-shared_library-1.patch b/src/patches/lua/lua-5.3.5-shared_library-1.patch deleted file mode 100644 index 857fddc6c..000000000 --- a/src/patches/lua/lua-5.3.5-shared_library-1.patch +++ /dev/null @@ -1,61 +0,0 @@ -Submitted By: Igor Živković <contact(a)igor-zivkovic.from.hr> -Date: 2013-06-19 -Initial Package Version: 5.2.2 -Upstream Status: Rejected -Origin: Arch Linux packages repository -Description: Adds the compilation of a shared library. - -diff -Naur lua-5.3.0.orig/Makefile lua-5.3.0/Makefile ---- lua-5.3.0.orig/Makefile 2014-10-30 00:14:41.000000000 +0100 -+++ lua-5.3.0/Makefile 2015-01-19 22:14:09.822290828 +0100 -@@ -52,7 +52,7 @@ - all: $(PLAT) - - $(PLATS) clean: -- cd src && $(MAKE) $@ -+ cd src && $(MAKE) $@ V=$(V) R=$(R) - - test: dummy - src/lua -v -diff -Naur lua-5.3.0.orig/src/Makefile lua-5.3.0/src/Makefile ---- lua-5.3.0.orig/src/Makefile 2015-01-05 17:04:52.000000000 +0100 -+++ lua-5.3.0/src/Makefile 2015-01-19 22:14:52.559378543 +0100 -@@ -7,7 +7,7 @@ - PLAT= none - - CC= gcc -std=gnu99 --CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) -+CFLAGS= -fPIC -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS) - LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS) - LIBS= -lm $(SYSLIBS) $(MYLIBS) - -@@ -29,6 +29,7 @@ - PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -@@ -43,7 +44,7 @@ - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) --ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) $(LUA_SO) - ALL_A= $(LUA_A) - - # Targets start here. -@@ -59,6 +60,12 @@ - $(AR) $@ $(BASE_O) - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -shared -ldl -Wl,-soname,$(LUA_SO).$(V) -o $@.$(R) $? -lm $(MYLDFLAGS) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO).$(V) -+ ln -sf $(LUA_SO).$(R) $(LUA_SO) -+ -+ - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) - -- 2.31.1

1 2

[PATCH] libid3tag: Correction - comment out libid3tag.pc file in rootfile
by Adolf Belka 24 Apr '21

24 Apr '21

- In previous patch libid3tag.pc file was left uncommented in the rootfile The pkg-config files are only required during the build or for development not for the normal operation of IPFire Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/libid3tag | 2 +- lfs/libid3tag | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/packages/libid3tag b/config/rootfiles/packages/libid3tag index 0899f8702..575804c01 100644 --- a/config/rootfiles/packages/libid3tag +++ b/config/rootfiles/packages/libid3tag @@ -4,4 +4,4 @@ #usr/lib/libid3tag.so usr/lib/libid3tag.so.0 usr/lib/libid3tag.so.0.3.0 -usr/lib/pkgconfig/id3tag.pc +#usr/lib/pkgconfig/id3tag.pc diff --git a/lfs/libid3tag b/lfs/libid3tag index 9005ca94c..b0263f267 100644 --- a/lfs/libid3tag +++ b/lfs/libid3tag @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libid3tag -PAK_VER = 2 +PAK_VER = 3 DEPS = -- 2.31.1

1 0

[PATCH] xfsprogs: Update to 5.9.0
by Adolf Belka 22 Apr '21

22 Apr '21

- Update from 5.7.0 to 5.9.0 - Update of rootfile - Changelog xfsprogs-5.9.0 (20 Oct 2020) - No further changes xfsprogs-5.9.0-rc1 (13 Oct 2020) - mkfs.xfs: disallow creation of RT files from proto file (Darrick Wong) - mkfs.xfs: fix ASSERT on small device with stripe geom (Pavel Reichl) - xfs_repair: more fixes from fuzz-testing (Darrick Wong) - libhandle: fix potential unterminated string problem (Darrick Wong) - libhandle: libfrog: fix a potential null pointer deref (Darrick Wong) - man: install all manpages that redirect to another page (Darrick Wong) - man: fix ioctl_xfs_geometry manpage naming (Eric Sandeen) - xfsprogs: various realtime related fixes (Darrick Wong) - xfsprogs: ignore autofs mount table entries (Ian Kent) xfsprogs-5.9.0-rc0 (17 Sep 2020) - libxfs changes merged from kernel 5.9 - libxfs: make buffers track the per-ag structures (Darrick Wong) xfsprogs-5.8.0 (04 Sep 2020) - xfs_db: set b_ops to NULL for types without verifiers (Eric Sandeen) xfsprogs-5.8.0-rc1 (26 Aug 2020) - mkfs: allow setting dax flag on root directory (Darrick Wong) - xfs_quota: improve reporting and messages (Bill O'Donnell) - xfs_db: use correct inode to set inode type (Zorro Lang) - xfs_db: fix nlink usage in check (Darrick Wong) - xfs_db: report the inode dax flag (Darrick Wong) - man: update mkfs.xfs inode flag option documentation (Darrick Wong) - xfsprogs: move custom interface def'ns to new header (Eric Sandeen) xfsprogs-5.8.0-rc0 (10 Aug 2020) - xfs_repair: check quota counters (Darrick Wong) - xfs_io: fix -D vs -R handling (Xiao Yang) - libxfs changes merged from kernel 5.8 Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/xfsprogs | 8 +++++++- lfs/xfsprogs | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/xfsprogs b/config/rootfiles/common/xfsprogs index 11518441a..de76ca0db 100644 --- a/config/rootfiles/common/xfsprogs +++ b/config/rootfiles/common/xfsprogs @@ -12,6 +12,7 @@ sbin/xfs_repair #usr/include/xfs/xfs_da_format.h #usr/include/xfs/xfs_format.h #usr/include/xfs/xfs_fs.h +#usr/include/xfs/xfs_fs_compat.h #usr/include/xfs/xfs_log_format.h #usr/include/xfs/xfs_types.h #usr/include/xfs/xqm.h @@ -50,14 +51,19 @@ usr/sbin/xfs_spaceman #usr/share/man/man2/ioctl_xfs_bulkstat.2 #usr/share/man/man2/ioctl_xfs_fsbulkstat.2 #usr/share/man/man2/ioctl_xfs_fscounts.2 +#usr/share/man/man2/ioctl_xfs_fsgeometry.2 #usr/share/man/man2/ioctl_xfs_fsgetxattr.2 +#usr/share/man/man2/ioctl_xfs_fsgetxattra.2 #usr/share/man/man2/ioctl_xfs_fsinumbers.2 -#usr/share/man/man2/ioctl_xfs_fsop_geometry.2 +#usr/share/man/man2/ioctl_xfs_fssetxattr.2 +#usr/share/man/man2/ioctl_xfs_getbmap.2 +#usr/share/man/man2/ioctl_xfs_getbmapa.2 #usr/share/man/man2/ioctl_xfs_getbmapx.2 #usr/share/man/man2/ioctl_xfs_getresblks.2 #usr/share/man/man2/ioctl_xfs_goingdown.2 #usr/share/man/man2/ioctl_xfs_inumbers.2 #usr/share/man/man2/ioctl_xfs_scrub_metadata.2 +#usr/share/man/man2/ioctl_xfs_setresblks.2 #usr/share/man/man3/attr_list_by_handle.3 #usr/share/man/man3/attr_multi_by_handle.3 #usr/share/man/man3/fd_to_handle.3 diff --git a/lfs/xfsprogs b/lfs/xfsprogs index 219864274..327b69d3a 100644 --- a/lfs/xfsprogs +++ b/lfs/xfsprogs @@ -24,7 +24,7 @@ include Config -VER = 5.7.0 +VER = 5.9.0 THISAPP = xfsprogs-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4aeba534cf91f24169c64e1073b9ef27 +$(DL_FILE)_MD5 = 5edd6f3d34b1e9950c326c961b5b84c4 install : $(TARGET) -- 2.31.1

1 0

[PATCH] sqlite: Update to3.35.5
by Adolf Belka 22 Apr '21

22 Apr '21

- Update from 3.35.4 to 3.35.5 - Update of rootfile not required - Changelog Fix defects in the new ALTER TABLE DROP COLUMN feature that could corrupt the database file. Fix an obscure query optimizer problem that might cause an incorrect query result. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/sqlite | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/sqlite b/lfs/sqlite index 7aada7585..a68bf462b 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -24,7 +24,7 @@ include Config -VER = 3350400 +VER = 3350500 THISAPP = sqlite-autoconf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9cf453a9cd0e40cdbc8e6f008acfc4fb +$(DL_FILE)_MD5 = d1d1aba394c8e0443077dc9f1a681bb8 install : $(TARGET) -- 2.31.1

1 0

[PATCH] samba: Update to 4.14.3
by Adolf Belka 22 Apr '21

22 Apr '21

- Update from 4.13.7 to 4.14.3 Change to Samba 4.14 release series 4.13 is now in maintenance mode 4.14 is now the current stable release series - Update of x86_64 rootfile - Checked library changes with find-dependencies No linked programs found - Changelog o Trever L. Adams <trever.adams(a)gmail.com> * BUG 14671: s3:modules:vfs_virusfilter: Recent New_VFS changes break vfs_virusfilter_openat. o Andrew Bartlett <abartlet(a)samba.org> * BUG 14586: build: Notice if flex is missing at configure time. o Ralph Boehme <slow(a)samba.org> * BUG 14672: Fix smbd panic when two clients open same file. * BUG 14675: Fix memory leak in the RPC server. * BUG 14679: s3: smbd: fix deferred renames. o Samuel Cabrero <scabrero(a)samba.org> * BUG 14675: s3-iremotewinspool: Set the per-request memory context. o Volker Lendecke <vl(a)samba.org> * BUG 14675: Fix memory leak in the RPC server. o Stefan Metzmacher <metze(a)samba.org> * BUG 11899: third_party: Update socket_wrapper to version 1.3.2. * BUG 14640: third_party: Update socket_wrapper to version 1.3.3. o David Mulder <dmulder(a)suse.com> * BUG 14665: samba-gpupdate: Test that sysvol paths download in case-insensitive way. o Sachin Prabhu <sprabhu(a)redhat.com> * BUG 14662: smbd: Ensure errno is preserved across fsp destructor. o Christof Schmitt <cs(a)samba.org> * BUG 14663: idmap_rfc2307 and idmap_nss return wrong mapping for uid/gid conflict. o Martin Schwenke <martin(a)meltin.net> * BUG 14288: build: Only add -Wl,--as-needed when supported. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/x86_64/samba | 47 ++++++++++++++++---------- lfs/samba | 6 ++-- 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index 93c35b51e..34199072b 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -123,7 +123,6 @@ usr/bin/wbinfo #usr/include/samba-4.0/util/idtree.h #usr/include/samba-4.0/util/idtree_random.h #usr/include/samba-4.0/util/signal.h -#usr/include/samba-4.0/util/string_wrappers.h #usr/include/samba-4.0/util/substitute.h #usr/include/samba-4.0/util/tevent_ntstatus.h #usr/include/samba-4.0/util/tevent_unix.h @@ -155,7 +154,7 @@ usr/lib/libndr-standard.so.0 usr/lib/libndr-standard.so.0.0.1 usr/lib/libndr.so usr/lib/libndr.so.1 -usr/lib/libndr.so.1.0.0 +usr/lib/libndr.so.1.0.1 usr/lib/libnetapi.so usr/lib/libnetapi.so.0 usr/lib/libnss_winbind.so @@ -163,8 +162,8 @@ usr/lib/libnss_winbind.so.2 usr/lib/libnss_wins.so usr/lib/libnss_wins.so.2 usr/lib/libsamba-credentials.so -usr/lib/libsamba-credentials.so.0 -usr/lib/libsamba-credentials.so.0.0.1 +usr/lib/libsamba-credentials.so.1 +usr/lib/libsamba-credentials.so.1.0.0 usr/lib/libsamba-errors.so usr/lib/libsamba-errors.so.1 usr/lib/libsamba-hostconfig.so @@ -184,11 +183,12 @@ usr/lib/libsamdb.so.0 usr/lib/libsamdb.so.0.0.1 usr/lib/libsmbclient.so usr/lib/libsmbclient.so.0 -usr/lib/libsmbclient.so.0.6.0 +usr/lib/libsmbclient.so.0.7.0 usr/lib/libsmbconf.so usr/lib/libsmbconf.so.0 usr/lib/libsmbldap.so usr/lib/libsmbldap.so.2 +usr/lib/libsmbldap.so.2.1.0 usr/lib/libtevent-util.so usr/lib/libtevent-util.so.0 usr/lib/libtevent-util.so.0.0.1 @@ -221,7 +221,6 @@ usr/lib/python3.8/site-packages/samba/auth.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/auth_util.py usr/lib/python3.8/site-packages/samba/colour.py usr/lib/python3.8/site-packages/samba/common.py -usr/lib/python3.8/site-packages/samba/compat.py usr/lib/python3.8/site-packages/samba/credentials.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/crypto.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/dbchecker.py @@ -280,6 +279,7 @@ usr/lib/python3.8/site-packages/samba/forest_update.py usr/lib/python3.8/site-packages/samba/gensec.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/getopt.py usr/lib/python3.8/site-packages/samba/gp_ext_loader.py +usr/lib/python3.8/site-packages/samba/gp_msgs_ext.py #usr/lib/python3.8/site-packages/samba/gp_parse usr/lib/python3.8/site-packages/samba/gp_parse/__init__.py usr/lib/python3.8/site-packages/samba/gp_parse/gp_aas.py @@ -289,6 +289,8 @@ usr/lib/python3.8/site-packages/samba/gp_parse/gp_ini.py usr/lib/python3.8/site-packages/samba/gp_parse/gp_pol.py usr/lib/python3.8/site-packages/samba/gp_scripts_ext.py usr/lib/python3.8/site-packages/samba/gp_sec_ext.py +usr/lib/python3.8/site-packages/samba/gp_smb_conf_ext.py +usr/lib/python3.8/site-packages/samba/gp_sudoers_ext.py usr/lib/python3.8/site-packages/samba/gpclass.py usr/lib/python3.8/site-packages/samba/gpo.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/graph.py @@ -358,7 +360,8 @@ usr/lib/python3.8/site-packages/samba/registry.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/remove_dc.py #usr/lib/python3.8/site-packages/samba/samba3 usr/lib/python3.8/site-packages/samba/samba3/__init__.py -usr/lib/python3.8/site-packages/samba/samba3/libsmb_samba_internal.cpython-38-x86_64-linux-gnu.so +usr/lib/python3.8/site-packages/samba/samba3/libsmb_samba_cwrapper.cpython-38-x86_64-linux-gnu.so +usr/lib/python3.8/site-packages/samba/samba3/libsmb_samba_internal.py usr/lib/python3.8/site-packages/samba/samba3/mdscli.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/samba3/param.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/samba3/passdb.cpython-38-x86_64-linux-gnu.so @@ -398,6 +401,8 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py #usr/lib/python3.8/site-packages/samba/tests/blackbox/samba_dnsupdate.py #usr/lib/python3.8/site-packages/samba/tests/blackbox/smbcacls.py #usr/lib/python3.8/site-packages/samba/tests/blackbox/smbcacls_basic.py +#usr/lib/python3.8/site-packages/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py +#usr/lib/python3.8/site-packages/samba/tests/blackbox/smbcacls_propagate_inhertance.py #usr/lib/python3.8/site-packages/samba/tests/blackbox/smbcontrol.py #usr/lib/python3.8/site-packages/samba/tests/blackbox/smbcontrol_process.py #usr/lib/python3.8/site-packages/samba/tests/blackbox/traffic_learner.py @@ -406,11 +411,14 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py #usr/lib/python3.8/site-packages/samba/tests/common.py #usr/lib/python3.8/site-packages/samba/tests/complex_expressions.py #usr/lib/python3.8/site-packages/samba/tests/core.py +#usr/lib/python3.8/site-packages/samba/tests/cred_opt.py #usr/lib/python3.8/site-packages/samba/tests/credentials.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc #usr/lib/python3.8/site-packages/samba/tests/dcerpc/__init__.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/array.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/bare.py +#usr/lib/python3.8/site-packages/samba/tests/dcerpc/binding.py +#usr/lib/python3.8/site-packages/samba/tests/dcerpc/createtrustrelax.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/dnsserver.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/integer.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/mdssvc.py @@ -421,6 +429,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/rpc_talloc.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/rpcecho.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/sam.py +#usr/lib/python3.8/site-packages/samba/tests/dcerpc/samr_change_password.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/srvsvc.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/string_tests.py #usr/lib/python3.8/site-packages/samba/tests/dcerpc/testrpc.py @@ -462,8 +471,14 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py #usr/lib/python3.8/site-packages/samba/tests/kcc/kcc_utils.py #usr/lib/python3.8/site-packages/samba/tests/kcc/ldif_import_export.py #usr/lib/python3.8/site-packages/samba/tests/krb5 +#usr/lib/python3.8/site-packages/samba/tests/krb5/as_canonicalization_tests.py +#usr/lib/python3.8/site-packages/samba/tests/krb5/compatability_tests.py #usr/lib/python3.8/site-packages/samba/tests/krb5/kcrypto.py +#usr/lib/python3.8/site-packages/samba/tests/krb5/kdc_base_test.py +#usr/lib/python3.8/site-packages/samba/tests/krb5/kdc_tests.py +#usr/lib/python3.8/site-packages/samba/tests/krb5/kdc_tgs_tests.py #usr/lib/python3.8/site-packages/samba/tests/krb5/raw_testcase.py +#usr/lib/python3.8/site-packages/samba/tests/krb5/rfc4120_constants.py #usr/lib/python3.8/site-packages/samba/tests/krb5/rfc4120_pyasn1.py #usr/lib/python3.8/site-packages/samba/tests/krb5/s4u_tests.py #usr/lib/python3.8/site-packages/samba/tests/krb5/simple_tests.py @@ -552,6 +567,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py #usr/lib/python3.8/site-packages/samba/tests/samdb_api.py #usr/lib/python3.8/site-packages/samba/tests/security.py #usr/lib/python3.8/site-packages/samba/tests/segfault.py +#usr/lib/python3.8/site-packages/samba/tests/smb-notify.py #usr/lib/python3.8/site-packages/samba/tests/smb.py #usr/lib/python3.8/site-packages/samba/tests/smbd_base.py #usr/lib/python3.8/site-packages/samba/tests/smbd_fuzztest.py @@ -564,15 +580,11 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py #usr/lib/python3.8/site-packages/samba/tests/upgradeprovisionneeddc.py #usr/lib/python3.8/site-packages/samba/tests/usage.py #usr/lib/python3.8/site-packages/samba/tests/xattr.py -#usr/lib/python3.8/site-packages/samba/third_party -usr/lib/python3.8/site-packages/samba/third_party/__init__.py -usr/lib/python3.8/site-packages/samba/third_party/iso8601 -usr/lib/python3.8/site-packages/samba/third_party/iso8601/__init__.py -usr/lib/python3.8/site-packages/samba/third_party/iso8601/iso8601.py -usr/lib/python3.8/site-packages/samba/third_party/iso8601/test_iso8601.py +usr/lib/python3.8/site-packages/samba/trust_utils.py usr/lib/python3.8/site-packages/samba/upgrade.py usr/lib/python3.8/site-packages/samba/upgradehelpers.py usr/lib/python3.8/site-packages/samba/uptodateness.py +usr/lib/python3.8/site-packages/samba/vgp_sudoers_ext.py usr/lib/python3.8/site-packages/samba/werror.cpython-38-x86_64-linux-gnu.so usr/lib/python3.8/site-packages/samba/xattr.py usr/lib/python3.8/site-packages/samba/xattr_native.cpython-38-x86_64-linux-gnu.so @@ -590,6 +602,7 @@ usr/lib/samba/idmap/rid.so usr/lib/samba/idmap/script.so usr/lib/samba/idmap/tdb2.so #usr/lib/samba/krb5 +usr/lib/samba/krb5/async_dns_krb5_locator.so usr/lib/samba/krb5/winbind_krb5_locator.so #usr/lib/samba/ldb usr/lib/samba/ldb/asq.so @@ -667,7 +680,7 @@ usr/lib/samba/libldb-key-value-samba4.so usr/lib/samba/libldb-tdb-err-map-samba4.so usr/lib/samba/libldb-tdb-int-samba4.so usr/lib/samba/libldb.so.2 -usr/lib/samba/libldb.so.2.2.1 +usr/lib/samba/libldb.so.2.3.0 usr/lib/samba/libldbsamba-samba4.so usr/lib/samba/liblibcli-lsa3-samba4.so usr/lib/samba/liblibcli-netlogon3-samba4.so @@ -688,9 +701,9 @@ usr/lib/samba/libposix-eadb-samba4.so usr/lib/samba/libprinter-driver-samba4.so usr/lib/samba/libprinting-migrate-samba4.so usr/lib/samba/libpyldb-util.cpython-38-x86-64-linux-gnu.so.2 -usr/lib/samba/libpyldb-util.cpython-38-x86-64-linux-gnu.so.2.2.1 +usr/lib/samba/libpyldb-util.cpython-38-x86-64-linux-gnu.so.2.3.0 usr/lib/samba/libpytalloc-util.cpython-38-x86-64-linux-gnu.so.2 -usr/lib/samba/libpytalloc-util.cpython-38-x86-64-linux-gnu.so.2.3.1 +usr/lib/samba/libpytalloc-util.cpython-38-x86-64-linux-gnu.so.2.3.2 usr/lib/samba/libregistry-samba4.so usr/lib/samba/libreplace-samba4.so usr/lib/samba/libroken-samba4.so.19 @@ -719,7 +732,7 @@ usr/lib/samba/libsys-rw-samba4.so usr/lib/samba/libtalloc-report-printf-samba4.so usr/lib/samba/libtalloc-report-samba4.so usr/lib/samba/libtalloc.so.2 -usr/lib/samba/libtalloc.so.2.3.1 +usr/lib/samba/libtalloc.so.2.3.2 usr/lib/samba/libtdb-wrap-samba4.so usr/lib/samba/libtdb.so.1 usr/lib/samba/libtdb.so.1.4.3 diff --git a/lfs/samba b/lfs/samba index ea8fcd428..ee873273a 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 4.13.7 +VER = 4.14.3 THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 77 +PAK_VER = 78 DEPS = avahi cups libtirpc krb5 perl-Parse-Yapp @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1a900f45d5251b53c9bd28887e588583 +$(DL_FILE)_MD5 = 7bf4fc8a7213b04942ac91ec05f62395 install : $(TARGET) -- 2.31.1

1 0

[PATCH] libgcrypt: Update to 1.9.3
by Adolf Belka 22 Apr '21

22 Apr '21

- Update from 1.9.2 to 1.9.3 - Update of rootfile - Changelog is too long to put here. Full details can be found in the ChangeLog file in the source tarball Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/common/libgcrypt | 2 +- lfs/libgcrypt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 756940b40..5f792a323 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.3.2 +usr/lib/libgcrypt.so.20.3.3 #usr/lib/pkgconfig/libgcrypt.pc #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info diff --git a/lfs/libgcrypt b/lfs/libgcrypt index a2bc19e17..5f4a9454a 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -24,7 +24,7 @@ include Config -VER = 1.9.2 +VER = 1.9.3 THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 00121b05e1ff4cc85a4a6503e0a7d9fb +$(DL_FILE)_MD5 = 3fcb490b9b7347344708eeb7b4a95464 install : $(TARGET) -- 2.31.1

1 0

[PATCH] less: Update to version 581
by Adolf Belka 22 Apr '21

22 Apr '21

- Update from 563 to 581 - Update of rootfile not required - Changelog Change ESC-u command to toggle, not disable, highlighting per man page. Add ESC-U command. Add ctrl-W search modifier for wrapping search. F command can be interrupted by ^X. Support OSC 8 hyperlinks when -R is in effect. g command with no number will ignore -j and put first line at top of screen. Multiple + or -p command line options are handled better. Add the --incsearch option. Add the --line-num-width option. Add the --status-col-width option. Add the --use-color and --color options. Display -w highlight even if highlighted line is empty. If search result is in a long line, scroll to ensure it is visible. Editing the same file under different names now creates only one entry in the file list. Make visual bell more visible on some terminals. Ring end-of-file bell no more than once per second. Build can use either Python or Perl for Makefile.aut operations. Fix crash when using the @ search modifier. Fix crash in the 's' command due to duplicate free. Fix realpath crash on Darwin. Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- lfs/less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/less b/lfs/less index 4d6cf4877..2655e8c17 100644 --- a/lfs/less +++ b/lfs/less @@ -24,7 +24,7 @@ include Config -VER = 563 +VER = 581 THISAPP = less-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1ee44fa71447a845f6eef5b3f38d2781 +$(DL_FILE)_MD5 = 6201df5b9dae2af9767fc220471471b3 install : $(TARGET) -- 2.31.1

1 0

[PATCH] BUG12265: firewall: iptables rules are being created in the wrong chain
by Alexander Marx 22 Apr '21

22 Apr '21

Fixes: #12265 When creating a rule with a local network as source and a firewallinterface as target, the rule was created in the FORWARD instead of INPUT chain. This one fixes that and additionally checks if a manual target ip address is one of IPFire's interfaces and changes the rule accordingly. --- config/firewall/firewall-lib.pl | 4 ++-- html/cgi-bin/firewall.cgi | 42 ++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl index bc0b30ca5..26d357ea2 100644 --- a/config/firewall/firewall-lib.pl +++ b/config/firewall/firewall-lib.pl @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> # +# Copyright (C) 2021 Alexander Marx <amarx(a)ipfire.org> # # # # 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 # @@ -427,7 +427,7 @@ sub get_address } # The firewall's own IP addresses. - } elsif ($key ~~ ["ipfire", "ipfire_src"]) { + } elsif ($key ~~ ["ipfire_tgt", "ipfire_src"]) { # ALL if ($value eq "ALL") { push(@ret, ["0/0", ""]); diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi index 532f99f91..6c9b7e9a7 100644 --- a/html/cgi-bin/firewall.cgi +++ b/html/cgi-bin/firewall.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> # +# Copyright (C) 2021 Alexander Marx <amarx(a)ipfire.org> # # # # 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 # @@ -213,6 +213,7 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') &General::readhasharray("$configfwdfw", \%configfwdfw); &General::readhasharray("$configinput", \%configinputfw); &General::readhasharray("$configoutgoing", \%configoutgoingfw); + &General::readhash("/var/ipfire/ethernet/settings", \%netsettings); my $maxkey; #Set Variables according to the JQuery code in protocol section if ($fwdfwsettings{'PROT'} eq 'TCP' || $fwdfwsettings{'PROT'} eq 'UDP') @@ -231,6 +232,19 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') { $fwdfwsettings{'USESRV'} = 'ON'; } + #Check if manual targetip is one of IPFire addresses + if ($fwdfwsettings{'grp2'} eq 'tgt_addr' && $fwdfwsettings{$fwdfwsettings{'grp2'}} eq $netsettings{'GREEN_ADDRESS'}){ + $fwdfwsettings{'grp2'} = 'ipfire_tgt'; + $fwdfwsettings{$fwdfwsettings{'grp2'}} = 'GREEN'; + } + if ($fwdfwsettings{'grp2'} eq 'tgt_addr' && $fwdfwsettings{$fwdfwsettings{'grp2'}} eq $netsettings{'ORANGE_ADDRESS'}){ + $fwdfwsettings{'grp2'} = 'ipfire_tgt'; + $fwdfwsettings{$fwdfwsettings{'grp2'}} = 'ORANGE'; + } + if ($fwdfwsettings{'grp2'} eq 'tgt_addr' && $fwdfwsettings{$fwdfwsettings{'grp2'}} eq $netsettings{'BLUE_ADDRESS'}){ + $fwdfwsettings{'grp2'} = 'ipfire_tgt'; + $fwdfwsettings{$fwdfwsettings{'grp2'}} = 'BLUE'; + } $errormessage=&checksource; if(!$errormessage){&checktarget;} if(!$errormessage){&checkrule;} @@ -243,11 +257,11 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') } } #check if we try to break rules - if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){ + if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire_tgt'){ $errormessage=$Lang::tr{'fwdfw err same'}; } # INPUT part - if ($fwdfwsettings{'grp2'} eq 'ipfire' && $fwdfwsettings{$fwdfwsettings{'grp1'}} ne 'ORANGE'){ + if ($fwdfwsettings{'grp2'} eq 'ipfire_tgt'){ $fwdfwsettings{'config'}=$configinput; $fwdfwsettings{'chain'} = 'INPUTFW'; $maxkey=&General::findhasharraykey(\%configinputfw); @@ -600,7 +614,7 @@ sub checktarget } } #check empty fields - if ($fwdfwsettings{$fwdfwsettings{'grp2'}} eq ''){ $errormessage.=$Lang::tr{'fwdfw err notgt'}."<br>";} + if ($fwdfwsettings{$fwdfwsettings{'grp2'}} eq '' && !$fwdfwsettings{'grp2'}){ $errormessage.=$Lang::tr{'fwdfw err notgt'}."<br>";} #check tgt services if ($fwdfwsettings{'USESRV'} eq 'ON'){ if ($fwdfwsettings{'grp3'} eq 'cust_srv'){ @@ -1512,7 +1526,7 @@ sub newrule $checked{'USE_NAT'}{$fwdfwsettings{'USE_NAT'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; + $selected{'ipfire_tgt'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; #check if update and get values if($fwdfwsettings{'updatefwrule'} eq 'on' || $fwdfwsettings{'copyfwrule'} eq 'on' && !$errormessage){ @@ -1584,7 +1598,7 @@ sub newrule $checked{'RATE_LIMIT'}{$fwdfwsettings{'RATE_LIMIT'}} = 'CHECKED'; $selected{'TIME_FROM'}{$fwdfwsettings{'TIME_FROM'}} = 'selected'; $selected{'TIME_TO'}{$fwdfwsettings{'TIME_TO'}} = 'selected'; - $selected{'ipfire'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; + $selected{'ipfire_tgt'}{$fwdfwsettings{$fwdfwsettings{'grp2'}}} ='selected'; $selected{'ipfire_src'}{$fwdfwsettings{$fwdfwsettings{'grp1'}}} ='selected'; $selected{'dnat'}{$fwdfwsettings{'dnat'}} ='selected'; $selected{'snat'}{$fwdfwsettings{'snat'}} ='selected'; @@ -1751,18 +1765,18 @@ END &Header::openbox('100%', 'left', $Lang::tr{'fwdfw target'}); print<<END; <table width='100%' border='0'> - <tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr' checked></td><td width='60%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='18'><td width='1%'><input type='radio' name='grp2' id='ipfire' value='ipfire' $checked{'grp2'}{'ipfire'}></td><td><b>Firewall</b></td> + <tr><td width='1%'><input type='radio' name='grp2' value='tgt_addr' checked></td><td width='60%' nowrap='nowrap'>$Lang::tr{'fwdfw targetip'}<input type='TEXT' name='tgt_addr' value='$fwdfwsettings{'tgt_addr'}' size='16' maxlength='18'><td width='1%'><input type='radio' name='grp2' id='ipfire_tgt' value='ipfire_tgt' $checked{'grp2'}{'ipfire_tgt'}></td><td><b>Firewall</b></td> END - print"<td align='right'><select name='ipfire' style='width:200px;'>"; - print "<option value='ALL' $selected{'ipfire'}{'ALL'}>$Lang::tr{'all'}</option>"; - print "<option value='GREEN' $selected{'ipfire'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'}; - print "<option value='ORANGE' $selected{'ipfire'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if (&Header::orange_used()); - print "<option value='BLUE' $selected{'ipfire'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>"if (&Header::blue_used()); - print "<option value='RED1' $selected{'ipfire'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip); + print"<td align='right'><select name='ipfire_tgt' style='width:200px;'>"; + print "<option value='ALL' $selected{'ipfire_tgt'}{'ALL'}>$Lang::tr{'all'}</option>"; + print "<option value='GREEN' $selected{'ipfire_tgt'}{'GREEN'}>$Lang::tr{'green'} ($ifaces{'GREEN_ADDRESS'})</option>" if $ifaces{'GREEN_ADDRESS'}; + print "<option value='ORANGE' $selected{'ipfire_tgt'}{'ORANGE'}>$Lang::tr{'orange'} ($ifaces{'ORANGE_ADDRESS'})</option>" if (&Header::orange_used()); + print "<option value='BLUE' $selected{'ipfire_tgt'}{'BLUE'}>$Lang::tr{'blue'} ($ifaces{'BLUE_ADDRESS'})</option>"if (&Header::blue_used()); + print "<option value='RED1' $selected{'ipfire_tgt'}{'RED1'}>$Lang::tr{'red1'} ($redip)" if ($redip); if (! -z "${General::swroot}/ethernet/aliases"){ foreach my $alias (sort keys %aliases) { - print "<option value='$alias' $selected{'ipfire'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>"; + print "<option value='$alias' $selected{'ipfire_tgt'}{$alias}>$alias ($aliases{$alias}{'IPT'})</option>"; } } print<<END; -- 2.25.1

4 3

[PATCH] general-functions.pl: do not miscalculate when enumerating IPsec N2N subnet membership
by Peter Müller 22 Apr '21

22 Apr '21

Fixes: #11235 Cc: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> --- config/cfgroot/general-functions.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index a6656ccf5..00ace0361 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -530,7 +530,7 @@ sub checksubnets foreach my $key (keys %ipsecconf){ if ($ipsecconf{$key}[11] ne '' && $ipsecconf{$key}[36] eq ""){ foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) { - my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]); + my ($ipsecip,$ipsecsub) = split (/\//, $ipsecsubitem); $ipsecsub=&iporsubtodec($ipsecsub); if($ipsecconf{$key}[1] ne $ccdname){ if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){ -- 2.26.2

1 0

Re: Problems with hyperscan when building binutils
by Adolf Belka 21 Apr '21

21 Apr '21

Hi Marcel, On 21/04/2021 07:43, Marcel Lorenz wrote: > Hi Addolf, > > look here: > https://git.ipfire.org/?p=people/mlorenz/ipfire-2.x.git;a=commitdiff;h=a537… Thanks for the patch information. One of those patches was the one I had already got from Michael. I added the other patch into my build but got the same result. Hyperscan builds fine but qemu fails. The same errors have occurred, the first one being BUILD multiboot.img ld: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?) make[3]: *** [Makefile:57: multiboot.img] Error 1 and the second make[2]: *** [Makefile:206: pc-bios/optionrom/all] Error 2 make[2]: *** Waiting for unfinished jobs.... Full log for qemu from this build attached. Regards, Adolf. > > Regards, > > Marcel > > Am 20.4.2021 19:30, schrieb Adolf Belka: > >> Hi Michael, >> >> On 19/04/2021 11:55, Michael Tremer wrote: >> >>> Hello, >>> >>> Yes it is. >>> >>> I ran into this in my toolchain branch where I am collecting updates >>> for all sorts of tools related to this. >>> >>> You can cherry-pick the following commit and hyperscan builds again: >>> >>> https://git.ipfire.org/?p=people/ms/ipfire-2.x.git;a=commitdiff;h=32a72d4ca… >> I used the patch from the above commit and it solved the hyperscan >> problem but then I next hit qemu failing to build. It seems to be doing >> things around meson even though the lfs is defined with autotools and >> both can be used. Attached is the log file for the qemu build. I can >> see the error in the logfile but I can't figure out what is causing the >> error to occur and therefore can't figure out how to stop it. >> >> Any suggestions gladly welcomed. >> >> Regards, >> >> Adolf. >> -Michael >> >> On 17 Apr 2021, at 21:53, Adolf Belka <adolf.belka(a)ipfire.org> wrote: >> >> Hi All, >> >> It definitely is related to the new binutils in some way. Doing a git >> restore to the current binutils and redoing the clean and make results >> in hyperscan building without any problems. >> >> Regards, >> >> Adolf >> >> On 17/04/2021 16:11, Adolf Belka wrote: Hi All, >> >> I was building an update of binutils. That built successfully but then >> hyperscan had a lot of failures. I am not able to understand what the >> problem is from the error messages. >> >> Could this be related to my update of binutils? >> >> If yes then what do I need to change? >> >> If no then what is causing the problem? >> >> I did a git pull origin next before I did my build of binutils. >> >> Error log attached. >> >> Regards, >> >> Adolf.

2 5

← Newer
1
2
3
4
5
6
7
8
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development April 2021