IPFire-SCM September 2018

ipfire-scm@lists.ipfire.org

1 participants
40 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. aa279d21426a907aaa229d13f00b43bbd75ff5f0
by Michael Tremer 30 Sep '18

30 Sep '18

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 926daa041831e6abed89340875b3248e2fc08292
by Michael Tremer 30 Sep '18

30 Sep '18

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 926daa041831e6abed89340875b3248e2fc08292 (commit) from fe10a6758d3239acc307998ab342f223c5788328 (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 926daa041831e6abed89340875b3248e2fc08292 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Sep 30 23:35:16 2018 +0200 asciidoc: Update to 8.6.9 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: asciidoc/asciidoc.nm | 26 ++----- asciidoc/patches/asciidoc-8.4.5-datadir.patch | 86 ---------------------- ...asciidoc-8.4.5-use-unsafe-mode-by-default.patch | 38 ---------- 3 files changed, 5 insertions(+), 145 deletions(-) delete mode 100644 asciidoc/patches/asciidoc-8.4.5-datadir.patch delete mode 100644 asciidoc/patches/asciidoc-8.4.5-use-unsafe-mode-by-default.patch Difference in files: diff --git a/asciidoc/asciidoc.nm b/asciidoc/asciidoc.nm index 7cbf2b413..35c8fc434 100644 --- a/asciidoc/asciidoc.nm +++ b/asciidoc/asciidoc.nm @@ -4,7 +4,7 @@ ############################################################################### name = asciidoc -version = 8.4.5 +version = 8.6.9 release = 1 arch = noarch @@ -26,29 +26,12 @@ build python end - prepare_cmds - # Remove forbidden "env" interpreter from script. - sed -e "s@#!.*@#!/bin/bash@g" -i a2x - end + make_install_targets += docs install_cmds - # Determite python version. - PYTHON_VERSION=$(python -c "import platform; print '.'.join(platform.python_version_tuple()[:2])") - - # Create file layout. - mkdir -pv %{BUILDROOT}/etc/asciidoc - mkdir -pv %{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages - - # Move config data to /etc and link it to correct place, - # so asciidoc will work. - for dir in dblatex docbook-xsl images javascripts stylesheets ; do - mv %{BUILDROOT}/etc/asciidoc/$dir \ - %{BUILDROOT}/usr/share/asciidoc - ln -svf ../../usr/share/asciidoc/$dir %{BUILDROOT}/etc/asciidoc/ - done - # Install python API. - install -Dpm 644 asciidocapi.py %{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages/asciidocapi.py + install -Dpm 644 asciidocapi.py \ + %{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages/asciidocapi.py end end @@ -56,6 +39,7 @@ packages package %{name} requires docbook-xsl + libxslt end end end diff --git a/asciidoc/patches/asciidoc-8.4.5-datadir.patch b/asciidoc/patches/asciidoc-8.4.5-datadir.patch deleted file mode 100644 index 5e34ee2cd..000000000 --- a/asciidoc/patches/asciidoc-8.4.5-datadir.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up asciidoc-8.4.5/asciidoc.py.datadir asciidoc-8.4.5/asciidoc.py ---- asciidoc-8.4.5/asciidoc.py.datadir 2009-05-26 05:12:38.000000000 +0300 -+++ asciidoc-8.4.5/asciidoc.py 2009-09-08 00:25:23.000000000 +0300 -@@ -651,6 +651,8 @@ def filter_lines(filter_cmd, lines, attr - if not found: - found = findfilter(filtername, CONF_DIR, cmd) - if not found: -+ found = findfilter(filtername, DATA_DIR, cmd) -+ if not found: - found = findfilter(filtername, APP_DIR, cmd) - else: - if os.path.isfile(cmd): -@@ -4997,6 +4999,7 @@ APP_DIR = None # This file' - USER_DIR = None # ~/.asciidoc - # Global configuration files directory (set by Makefile build target). - CONF_DIR = '/etc/asciidoc' -+DATA_DIR = '/usr/share/asciidoc' - HELP_FILE = 'help.conf' # Default (English) help file. - - # Globals -diff -up asciidoc-8.4.5/Makefile.in.datadir asciidoc-8.4.5/Makefile.in ---- asciidoc-8.4.5/Makefile.in.datadir 2009-04-24 01:49:43.000000000 +0300 -+++ asciidoc-8.4.5/Makefile.in 2009-09-08 00:28:23.000000000 +0300 -@@ -23,6 +23,7 @@ srcdir = @srcdir@ - VPATH = @srcdir@ - - ASCIIDOCCONF = $(sysconfdir)/asciidoc -+ASCIIDOCDATA = $(datadir)/asciidoc - - prog = asciidoc.py a2x - progdir = $(bindir) -@@ -35,25 +36,26 @@ manpdir = $(mandir)/man1 - conf = $(wildcard *.conf) - confdir = $(ASCIIDOCCONF) - --filtersdir = $(ASCIIDOCCONF)/filters -+filtersdir = $(ASCIIDOCDATA)/filters -+filtersconfdir = $(ASCIIDOCCONF)/filters - - codefilter = filters/code/code-filter.py - codefilterdir = $(filtersdir)/code - codefilterconf = filters/code/code-filter.conf --codefilterconfdir = $(filtersdir)/code -+codefilterconfdir = $(filtersconfdir)/code - - graphvizfilter = filters/graphviz/graphviz2png.py - graphvizfilterdir = $(filtersdir)/graphviz - graphvizfilterconf = filters/graphviz/graphviz-filter.conf --graphvizfilterconfdir = $(filtersdir)/graphviz -+graphvizfilterconfdir = $(filtersconfdir)/graphviz - - musicfilter = filters/music/music2png.py - musicfilterdir = $(filtersdir)/music - musicfilterconf = filters/music/music-filter.conf --musicfilterconfdir = $(filtersdir)/music -+musicfilterconfdir = $(filtersconfdir)/music - - sourcefilterconf = filters/source/source-highlight-filter.conf --sourcefilterconfdir = $(filtersdir)/source -+sourcefilterconfdir = $(filtersconfdir)/source - - docbook = $(wildcard docbook-xsl/*.xsl) - docbookdir = $(ASCIIDOCCONF)/docbook-xsl -@@ -126,6 +128,13 @@ fixconfpath: - mv $$f.out $$f; \ - done - -+fixdatapath: -+ @for f in $(prog); do \ -+ echo "Fixing DATA_DIR in $$f"; \ -+ $(SED) "s#^DATA_DIR = '.*'#DATA_DIR = '$(ASCIIDOCDATA)'#; s#^DATA_DIR=.*#DATA_DIR=$(ASCIIDOCDATA)#" $$f > $$f.out; \ -+ mv $$f.out $$f; \ -+ done -+ - install-vim: - @for d in $(DESTDIR)/$(vimdir) /etc/vim; do \ - if ! test -d $$d; then continue; fi ; \ -@@ -145,7 +154,7 @@ uninstall-vim: - done - - --build: fixconfpath -+build: fixconfpath fixdatapath - - install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim - diff --git a/asciidoc/patches/asciidoc-8.4.5-use-unsafe-mode-by-default.patch b/asciidoc/patches/asciidoc-8.4.5-use-unsafe-mode-by-default.patch deleted file mode 100644 index 0d93cc67e..000000000 --- a/asciidoc/patches/asciidoc-8.4.5-use-unsafe-mode-by-default.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up asciidoc-8.4.5/asciidoc.py.default-unsafe asciidoc-8.4.5/asciidoc.py ---- asciidoc-8.4.5/asciidoc.py.default-unsafe 2009-05-25 22:12:38.000000000 -0400 -+++ asciidoc-8.4.5/asciidoc.py 2009-07-16 02:27:09.000000000 -0400 -@@ -1138,7 +1138,7 @@ class Document: - self.level = 0 # 0 => front matter. 1,2,3 => sect1,2,3. - self.has_errors = False # Set true if processing errors were flagged. - self.has_warnings = False # Set true if warnings were flagged. -- self.safe = True # Default safe mode. -+ self.safe = False # Default safe mode. - def update_attributes(self): - # Set implicit attributes. - if self.infile and os.path.exists(self.infile): -@@ -5205,8 +5205,8 @@ def execute(cmd,opts,args): - for o,v in opts: - if o in ('--help','-h'): - help_option = True -- if o == '--unsafe': -- document.safe = False -+ if o == '--safe': -+ document.safe = True - if o == '--version': - print('asciidoc %s' % VERSION) - sys.exit(0) -diff -up asciidoc-8.4.5/doc/asciidoc.1.default-unsafe asciidoc-8.4.5/doc/asciidoc.1 ---- asciidoc-8.4.5/doc/asciidoc.1.default-unsafe 2009-05-26 02:38:36.000000000 -0400 -+++ asciidoc-8.4.5/doc/asciidoc.1 2009-08-12 23:51:09.000000000 -0400 -@@ -123,9 +123,9 @@ Auto\-number HTML article section titles - \fB\-a numbered\fR\. - .RE - .PP --\fB\-\-unsafe\fR -+\fB\-\-safe\fR - .RS 4 --Disable safe mode\. Safe mode is enabled by default, disabling it is potentially dangerous\. -+Enable safe mode\. Safe mode is disabled by default\. - .RE - .PP - \fB\-v, \-\-verbose\fR hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core124, updated. 8d69198717d29492332d6695edab062e6a15f354
by Arne Fitzenreiter 29 Sep '18

29 Sep '18

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, core124 has been updated via 8d69198717d29492332d6695edab062e6a15f354 (commit) from e3ab1962ed4e129d02b6e98777ef0fe2accf2af4 (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 8d69198717d29492332d6695edab062e6a15f354 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Sep 29 14:59:15 2018 +0200 core124: fix "need reboot" display on x86_64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/124/update.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh index 17208b769..7927d9f1d 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -138,15 +138,17 @@ case "$(uname -m)" in echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae fi + else + # This update needs a reboot... + touch /var/run/need_reboot fi ;; + *) + # This update needs a reboot... + touch /var/run/need_reboot + ;; esac -# This update needs a reboot... -if [ ! -e /opt/pakfire/db/installed/meta-linux-pae ]; then - touch /var/run/need_reboot -fi - # Finish /etc/init.d/fireinfo start sendprofile hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e3ab1962ed4e129d02b6e98777ef0fe2accf2af4
by Arne Fitzenreiter 28 Sep '18

28 Sep '18

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 e3ab1962ed4e129d02b6e98777ef0fe2accf2af4 (commit) via d435f08d9b4a40817d6ae8601b20ef392253338f (commit) via 71954dcac4e29a67477f2d0d9593b60c7272c447 (commit) via ae61c74db903ac96e4c923cdb1e44add69a527a8 (commit) via eaadeb5af0173e4ed4067a650beb3802a417ca20 (commit) via 161a5b834a7bdc134996c0d24a642242f42fcc2c (commit) via 46b307324263bdf2e874701c3c5c7afc673f0eb1 (commit) from 0a5823db023c32135b1cd3fc9c8a426cd1d70b31 (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 e3ab1962ed4e129d02b6e98777ef0fe2accf2af4 Merge: d435f08d9 ae61c74db Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 28 18:43:15 2018 +0200 Merge branch 'core124' of git.ipfire.org:/pub/git/ipfire-2.x into core124 commit d435f08d9b4a40817d6ae8601b20ef392253338f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 28 17:53:03 2018 +0200 core124: add apache initskript and nsswitch.conf to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 71954dcac4e29a67477f2d0d9593b60c7272c447 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 28 17:49:10 2018 +0200 core124: don't remove network trigger script this script is still needed if /var/ipfire is on an extra partition. New installations works without this script. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ae61c74db903ac96e4c923cdb1e44add69a527a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 27 21:53:53 2018 +0200 core124: fix removing old initrd files on arm systems Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit eaadeb5af0173e4ed4067a650beb3802a417ca20 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 27 08:03:45 2018 +0200 kernel: update to 4.14.72 this commit has many important driver updates so we need to ship it fast... Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 161a5b834a7bdc134996c0d24a642242f42fcc2c Merge: 46b307324 0a5823db0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Sep 26 14:09:57 2018 +0200 Merge remote-tracking branch 'origin/master' into core124 commit 46b307324263bdf2e874701c3c5c7afc673f0eb1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 23 02:44:03 2018 +0200 core124: fix updater fix some missing files on arm remove not needed rebuild initrd because we ship it already built Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../core/124/filelists/aarch64/{files => files-aarch64} | 0 .../core/124/filelists/armv5tel/{files => files-armv5tel} | 0 config/rootfiles/core/124/filelists/files | 2 ++ config/rootfiles/core/124/update.sh | 14 +++++--------- lfs/linux | 9 ++++----- 5 files changed, 11 insertions(+), 14 deletions(-) rename config/rootfiles/core/124/filelists/aarch64/{files => files-aarch64} (100%) rename config/rootfiles/core/124/filelists/armv5tel/{files => files-armv5tel} (100%) Difference in files: diff --git a/config/rootfiles/core/124/filelists/aarch64/files b/config/rootfiles/core/124/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/files rename to config/rootfiles/core/124/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/core/124/filelists/armv5tel/files b/config/rootfiles/core/124/filelists/armv5tel/files-armv5tel similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/files rename to config/rootfiles/core/124/filelists/armv5tel/files-armv5tel diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index 25e812593..3e7153e12 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -1,6 +1,8 @@ etc/system-release etc/issue +etc/nsswitch.conf etc/rc.d/helper/aws-setup +etc/rc.d/init.d/apache etc/rc.d/init.d/aws etc/rc.d/init.d/localnet etc/rc.d/init.d/networking/red.down/10-static-routes diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh index b65bc52b8..17208b769 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -72,9 +72,9 @@ rm -rf /boot/config-* rm -rf /boot/ipfirerd-* rm -rf /boot/initramfs-* rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/zImage-ipfire-* -rm -rf /boot/uInit-ipfire-* +rm -rf /boot/uImage-*-ipfire-* +rm -rf /boot/zImage-*-ipfire-* +rm -rf /boot/uInit-*-ipfire-* rm -rf /boot/dtb-*-ipfire-* rm -rf /lib/modules rm -f /etc/sysconfig/lm_sensors @@ -82,9 +82,6 @@ rm -f /etc/sysconfig/lm_sensors # Stop services # Remove files -rm -f \ - /etc/rc.d/rcsysinit.d/S90network-trigger \ - /etc/rc.d/init.d/network-trigger # Extract files extract_files @@ -106,16 +103,15 @@ ldconfig # Reload sysctl.conf sysctl -p -# rebuild initrd to add early microcode updates -rebuild-initrd - # Remove deprecated GRUB configuration option if [ -e "/etc/default/grub" ]; then sed -e "/^GRUB_FONT/d" -i /etc/default/grub fi # Update bootloader +if [ -e /usr/bin/install-bootloader ]; then /usr/bin/install-bootloader +fi # Upadate Kernel version uEnv.txt if [ -e /boot/uEnv.txt ]; then diff --git a/lfs/linux b/lfs/linux index ad10bc8e5..814bc0b73 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.71 -ARM_PATCHES = 4.14.71-ipfire0 +VER = 4.14.72 +ARM_PATCHES = 4.14.72-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 77 +PAK_VER = 78 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,10 +82,9 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 14b21e5f11e8e195731c89a14794a0fc +$(DL_FILE)_MD5 = 450b3f5f1124442dee768eaa097fd149 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 889a8d49a63bf462067409887f8105bb - install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. e3ab1962ed4e129d02b6e98777ef0fe2accf2af4
by Arne Fitzenreiter 28 Sep '18

28 Sep '18

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, master has been updated via e3ab1962ed4e129d02b6e98777ef0fe2accf2af4 (commit) via d435f08d9b4a40817d6ae8601b20ef392253338f (commit) via 71954dcac4e29a67477f2d0d9593b60c7272c447 (commit) via ae61c74db903ac96e4c923cdb1e44add69a527a8 (commit) via eaadeb5af0173e4ed4067a650beb3802a417ca20 (commit) via 161a5b834a7bdc134996c0d24a642242f42fcc2c (commit) via 46b307324263bdf2e874701c3c5c7afc673f0eb1 (commit) from 0a5823db023c32135b1cd3fc9c8a426cd1d70b31 (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 e3ab1962ed4e129d02b6e98777ef0fe2accf2af4 Merge: d435f08d9 ae61c74db Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 28 18:43:15 2018 +0200 Merge branch 'core124' of git.ipfire.org:/pub/git/ipfire-2.x into core124 commit d435f08d9b4a40817d6ae8601b20ef392253338f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 28 17:53:03 2018 +0200 core124: add apache initskript and nsswitch.conf to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 71954dcac4e29a67477f2d0d9593b60c7272c447 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Sep 28 17:49:10 2018 +0200 core124: don't remove network trigger script this script is still needed if /var/ipfire is on an extra partition. New installations works without this script. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ae61c74db903ac96e4c923cdb1e44add69a527a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 27 21:53:53 2018 +0200 core124: fix removing old initrd files on arm systems Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit eaadeb5af0173e4ed4067a650beb3802a417ca20 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 27 08:03:45 2018 +0200 kernel: update to 4.14.72 this commit has many important driver updates so we need to ship it fast... Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 161a5b834a7bdc134996c0d24a642242f42fcc2c Merge: 46b307324 0a5823db0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Sep 26 14:09:57 2018 +0200 Merge remote-tracking branch 'origin/master' into core124 commit 46b307324263bdf2e874701c3c5c7afc673f0eb1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Sep 23 02:44:03 2018 +0200 core124: fix updater fix some missing files on arm remove not needed rebuild initrd because we ship it already built Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../core/124/filelists/aarch64/{files => files-aarch64} | 0 .../core/124/filelists/armv5tel/{files => files-armv5tel} | 0 config/rootfiles/core/124/filelists/files | 2 ++ config/rootfiles/core/124/update.sh | 14 +++++--------- lfs/linux | 9 ++++----- 5 files changed, 11 insertions(+), 14 deletions(-) rename config/rootfiles/core/124/filelists/aarch64/{files => files-aarch64} (100%) rename config/rootfiles/core/124/filelists/armv5tel/{files => files-armv5tel} (100%) Difference in files: diff --git a/config/rootfiles/core/124/filelists/aarch64/files b/config/rootfiles/core/124/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/core/124/filelists/aarch64/files rename to config/rootfiles/core/124/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/core/124/filelists/armv5tel/files b/config/rootfiles/core/124/filelists/armv5tel/files-armv5tel similarity index 100% rename from config/rootfiles/core/124/filelists/armv5tel/files rename to config/rootfiles/core/124/filelists/armv5tel/files-armv5tel diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index 25e812593..3e7153e12 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -1,6 +1,8 @@ etc/system-release etc/issue +etc/nsswitch.conf etc/rc.d/helper/aws-setup +etc/rc.d/init.d/apache etc/rc.d/init.d/aws etc/rc.d/init.d/localnet etc/rc.d/init.d/networking/red.down/10-static-routes diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh index b65bc52b8..17208b769 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -72,9 +72,9 @@ rm -rf /boot/config-* rm -rf /boot/ipfirerd-* rm -rf /boot/initramfs-* rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/zImage-ipfire-* -rm -rf /boot/uInit-ipfire-* +rm -rf /boot/uImage-*-ipfire-* +rm -rf /boot/zImage-*-ipfire-* +rm -rf /boot/uInit-*-ipfire-* rm -rf /boot/dtb-*-ipfire-* rm -rf /lib/modules rm -f /etc/sysconfig/lm_sensors @@ -82,9 +82,6 @@ rm -f /etc/sysconfig/lm_sensors # Stop services # Remove files -rm -f \ - /etc/rc.d/rcsysinit.d/S90network-trigger \ - /etc/rc.d/init.d/network-trigger # Extract files extract_files @@ -106,16 +103,15 @@ ldconfig # Reload sysctl.conf sysctl -p -# rebuild initrd to add early microcode updates -rebuild-initrd - # Remove deprecated GRUB configuration option if [ -e "/etc/default/grub" ]; then sed -e "/^GRUB_FONT/d" -i /etc/default/grub fi # Update bootloader +if [ -e /usr/bin/install-bootloader ]; then /usr/bin/install-bootloader +fi # Upadate Kernel version uEnv.txt if [ -e /boot/uEnv.txt ]; then diff --git a/lfs/linux b/lfs/linux index ad10bc8e5..814bc0b73 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.71 -ARM_PATCHES = 4.14.71-ipfire0 +VER = 4.14.72 +ARM_PATCHES = 4.14.72-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 77 +PAK_VER = 78 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,10 +82,9 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 14b21e5f11e8e195731c89a14794a0fc +$(DL_FILE)_MD5 = 450b3f5f1124442dee768eaa097fd149 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 889a8d49a63bf462067409887f8105bb - install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core124, updated. e3ab1962ed4e129d02b6e98777ef0fe2accf2af4
by Arne Fitzenreiter 28 Sep '18

28 Sep '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core124, updated. ae61c74db903ac96e4c923cdb1e44add69a527a8
by Arne Fitzenreiter 27 Sep '18

27 Sep '18

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, core124 has been updated via ae61c74db903ac96e4c923cdb1e44add69a527a8 (commit) from eaadeb5af0173e4ed4067a650beb3802a417ca20 (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 ae61c74db903ac96e4c923cdb1e44add69a527a8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 27 21:53:53 2018 +0200 core124: fix removing old initrd files on arm systems Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/124/update.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/core/124/update.sh b/config/rootfiles/core/124/update.sh index b1b862378..25a7fd68a 100644 --- a/config/rootfiles/core/124/update.sh +++ b/config/rootfiles/core/124/update.sh @@ -72,9 +72,9 @@ rm -rf /boot/config-* rm -rf /boot/ipfirerd-* rm -rf /boot/initramfs-* rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/zImage-ipfire-* -rm -rf /boot/uInit-ipfire-* +rm -rf /boot/uImage-*-ipfire-* +rm -rf /boot/zImage-*-ipfire-* +rm -rf /boot/uInit-*-ipfire-* rm -rf /boot/dtb-*-ipfire-* rm -rf /lib/modules rm -f /etc/sysconfig/lm_sensors hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core124, updated. eaadeb5af0173e4ed4067a650beb3802a417ca20
by Arne Fitzenreiter 27 Sep '18

27 Sep '18

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, core124 has been updated via eaadeb5af0173e4ed4067a650beb3802a417ca20 (commit) from 161a5b834a7bdc134996c0d24a642242f42fcc2c (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 eaadeb5af0173e4ed4067a650beb3802a417ca20 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Sep 27 08:03:45 2018 +0200 kernel: update to 4.14.72 this commit has many important driver updates so we need to ship it fast... Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/linux | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index ad10bc8e5..814bc0b73 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -VER = 4.14.71 -ARM_PATCHES = 4.14.71-ipfire0 +VER = 4.14.72 +ARM_PATCHES = 4.14.72-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 77 +PAK_VER = 78 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,10 +82,9 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 14b21e5f11e8e195731c89a14794a0fc +$(DL_FILE)_MD5 = 450b3f5f1124442dee768eaa097fd149 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 889a8d49a63bf462067409887f8105bb - install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core124, updated. 161a5b834a7bdc134996c0d24a642242f42fcc2c
by Arne Fitzenreiter 26 Sep '18

26 Sep '18

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, core124 has been updated via 161a5b834a7bdc134996c0d24a642242f42fcc2c (commit) via 0a5823db023c32135b1cd3fc9c8a426cd1d70b31 (commit) via 5bf8ff9fcc48008f2d8f4023d07bcb3f158c88ae (commit) from 46b307324263bdf2e874701c3c5c7afc673f0eb1 (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 161a5b834a7bdc134996c0d24a642242f42fcc2c Merge: 46b307324 0a5823db0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Sep 26 14:09:57 2018 +0200 Merge remote-tracking branch 'origin/master' into core124 ----------------------------------------------------------------------- Summary of changes: config/ssh/sshd_config | 2 +- lfs/nano | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config index 4a25e8383..60bb0a9e6 100644 --- a/config/ssh/sshd_config +++ b/config/ssh/sshd_config @@ -12,7 +12,7 @@ ListenAddress 0.0.0.0 # limit authentication thresholds LoginGraceTime 30s -MaxAuthTries 3 +MaxAuthTries 6 # limit maximum instanctes to prevent DoS MaxStartups 5 diff --git a/lfs/nano b/lfs/nano index 9783c2917..671cf6731 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 2.9.8 +VER = 3.1 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 23 +PAK_VER = 24 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fd58e87c20abbf029e5c4b153c89232a +$(DL_FILE)_MD5 = 2fb85e86c5b14ac9e9465d3ba7506364 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0a5823db023c32135b1cd3fc9c8a426cd1d70b31
by Arne Fitzenreiter 26 Sep '18

26 Sep '18

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, master has been updated via 0a5823db023c32135b1cd3fc9c8a426cd1d70b31 (commit) via 5bf8ff9fcc48008f2d8f4023d07bcb3f158c88ae (commit) from 0f2186725ef5cd62d1482b4482e20a6295ebf2ad (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 0a5823db023c32135b1cd3fc9c8a426cd1d70b31 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Sep 25 20:24:39 2018 +0100 ssh: Revert MaxAuthTries setting This is entirely not practicable and should have been changed before. I missed this when I tested the configuration. It is common that multiple SSH keys exist and three is common number (RSA, ECDSA & Ed25519). A key passed with ssh -i and password authentication are not even tried. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5bf8ff9fcc48008f2d8f4023d07bcb3f158c88ae Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat Sep 22 09:50:48 2018 +0200 nano: Update to 3.1 Hi, This update was published just a few days after my "3.0"-commit - running. For details see: https://www.nano-editor.org/news.php Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/ssh/sshd_config | 2 +- lfs/nano | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/ssh/sshd_config b/config/ssh/sshd_config index 4a25e8383..60bb0a9e6 100644 --- a/config/ssh/sshd_config +++ b/config/ssh/sshd_config @@ -12,7 +12,7 @@ ListenAddress 0.0.0.0 # limit authentication thresholds LoginGraceTime 30s -MaxAuthTries 3 +MaxAuthTries 6 # limit maximum instanctes to prevent DoS MaxStartups 5 diff --git a/lfs/nano b/lfs/nano index 9783c2917..671cf6731 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@ include Config -VER = 2.9.8 +VER = 3.1 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 23 +PAK_VER = 24 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = fd58e87c20abbf029e5c4b153c89232a +$(DL_FILE)_MD5 = 2fb85e86c5b14ac9e9465d3ba7506364 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM September 2018