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 2.x development tree".

The branch, next has been updated via 7b42d2f89a59cf4efe82c46a6fc510a02cab7c6f (commit) via 6134b588a0570cf4d86ff47f63835dc5bd80a8fa (commit) via a605897cd00ca9bad90c44ed705721ae71f460e2 (commit) via 59bbf418ca18a772317d22d0a791d3c049de245f (commit) from 24c4594bef6f766261664084e7b524987ea56a54 (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 7b42d2f89a59cf4efe82c46a6fc510a02cab7c6f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 15 13:14:13 2021 +0000

core155: Ship country.cgi

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 6134b588a0570cf4d86ff47f63835dc5bd80a8fa Author: Matthias Fischer matthias.fischer@ipfire.org Date: Fri Feb 12 20:40:38 2021 +0100

country.cgi: Fix for copy&paste typo

Fixes typo in line 103 (<-> is no tab...)

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit a605897cd00ca9bad90c44ed705721ae71f460e2 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Feb 15 13:13:45 2021 +0000

core155: Ship sysvinit

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 59bbf418ca18a772317d22d0a791d3c049de245f Author: Adolf Belka adolf.belka@ipfire.org Date: Fri Feb 12 18:59:15 2021 +0100

sysvinit: Update to 2.98

- Update sysvinit from 2.88dsf to 2.98 - From version 2.89 mounpoint build was not enabled as standard - Patch created to modify Makefile to define mountpoint to be built - Update of rootfiles - Changelog is ~400 lines long from 2.88dsf to 2.98 - For details see the Changelog in the doc directory in the tarball

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/sysvinit | 4 ++++ config/rootfiles/core/155/filelists/files | 1 + config/rootfiles/{oldcore/66 => core/155}/filelists/sysvinit | 0 html/cgi-bin/country.cgi | 2 +- lfs/sysvinit | 7 ++++--- src/patches/sysvinit-2.98_build_mountpoint.patch | 12 ++++++++++++ 6 files changed, 22 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/66 => core/155}/filelists/sysvinit (100%) create mode 100644 src/patches/sysvinit-2.98_build_mountpoint.patch

Difference in files: diff --git a/config/rootfiles/common/sysvinit b/config/rootfiles/common/sysvinit index ede5aa50d..0b389a7c3 100644 --- a/config/rootfiles/common/sysvinit +++ b/config/rootfiles/common/sysvinit @@ -1,5 +1,6 @@ bin/mountpoint bin/pidof +#etc/inittab.d #sbin/bootlogd #sbin/fstab-decode sbin/halt @@ -14,6 +15,7 @@ sbin/telinit usr/bin/last usr/bin/lastb usr/bin/mesg +#usr/bin/readbootlog usr/bin/utmpdump usr/bin/wall #usr/include/initreq.h @@ -21,8 +23,10 @@ usr/bin/wall #usr/share/man/man1/lastb.1 #usr/share/man/man1/mesg.1 #usr/share/man/man1/mountpoint.1 +#usr/share/man/man1/readbootlog.1 #usr/share/man/man1/utmpdump.1 #usr/share/man/man1/wall.1 +#usr/share/man/man5/initctl.5 #usr/share/man/man5/initscript.5 #usr/share/man/man5/inittab.5 #usr/share/man/man8/bootlogd.8 diff --git a/config/rootfiles/core/155/filelists/files b/config/rootfiles/core/155/filelists/files index 23a48008d..722152c17 100644 --- a/config/rootfiles/core/155/filelists/files +++ b/config/rootfiles/core/155/filelists/files @@ -1 +1,2 @@ +srv/web/ipfire/cgi-bin/country.cgi srv/web/ipfire/cgi-bin/wirelessclient.cgi diff --git a/config/rootfiles/core/155/filelists/sysvinit b/config/rootfiles/core/155/filelists/sysvinit new file mode 120000 index 000000000..f3fb3304d --- /dev/null +++ b/config/rootfiles/core/155/filelists/sysvinit @@ -0,0 +1 @@ +../../../common/sysvinit \ No newline at end of file diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 6519aa26c..30111dc21 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -100,7 +100,7 @@ print <<END <div align='center'> <table width='80%'> <tr> -<-><td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> + <td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> </tr> </table> </div> diff --git a/lfs/sysvinit b/lfs/sysvinit index 0306b5518..e7b715ea4 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -24,10 +24,10 @@

include Config

-VER = 2.88dsf +VER = 2.98

THISAPP = sysvinit-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 6eda8a97b86e0a6f59dabbf25202aa6f +$(DL_FILE)_MD5 = e3254f7622ea5cf2322b1b386a98ba59

install : $(TARGET)

@@ -72,6 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) # Newer C libraries omit this include from sys/types.h. # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/sysvinit-2.98_build_mountpoint.patch cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \ -e "/include.*sys/stat.h/a#include <sys/sysmacros.h>\n" cd $(DIR_APP) && sed -e "s/libcrypt.a/libcrypt.so/g" -i src/Makefile diff --git a/src/patches/sysvinit-2.98_build_mountpoint.patch b/src/patches/sysvinit-2.98_build_mountpoint.patch new file mode 100644 index 000000000..719eff558 --- /dev/null +++ b/src/patches/sysvinit-2.98_build_mountpoint.patch @@ -0,0 +1,12 @@ +diff -aup sysvinit-2.98/src/Makefile.orig sysvinit-2.98/src/Makefile +--- sysvinit-2.98/src/Makefile.orig 2021-02-12 14:31:56.325112868 +0100 ++++ sysvinit-2.98/src/Makefile 2021-02-12 14:31:56.257086870 +0100 +@@ -19,7 +19,7 @@ MANDB := s@^('\\")[^*-]*-*- codin + # Leave empty if the mountpoint(1) command from util-linux 2.20 + # and above should be used, otherwise set it to yes. + # +-MNTPOINT= ++MNTPOINT=yes + + # For some known distributions we do not build all programs, otherwise we do. + BIN =

hooks/post-receive -- IPFire 2.x development tree