From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f30ce49b3c2375d52e7358d12a6235c3e35997d Date: Mon, 08 Apr 2019 20:51:01 +0100 Message-ID: <20190408195102.2826F84FDAF@people01.i.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2741076539832832668==" List-Id: --===============2741076539832832668== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 4f30ce49b3c2375d52e7358d12a6235c3e35997d (commit) via f2afd5e70dc1c95c13aa75b0acf3da072d714af8 (commit) via 47204d12f1387502612e8a66b4a1a8a853e33ebf (commit) via 5f9bf17d76e43b1ee0bb4b880a9aa001844e4d4a (commit) from 918ee4a4cf5bb8d2a3ade16aac0dd643215c47e2 (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 4f30ce49b3c2375d52e7358d12a6235c3e35997d Author: Arne Fitzenreiter Date: Mon Apr 8 21:49:20 2019 +0200 rename core130 -> core131 =20 we need to insert a core update to fix urgent bugs =20 Signed-off-by: Arne Fitzenreiter commit f2afd5e70dc1c95c13aa75b0acf3da072d714af8 Author: Arne Fitzenreiter Date: Mon Apr 8 21:47:23 2019 +0200 kernel: update to 4.14.111 =20 Signed-off-by: Arne Fitzenreiter commit 47204d12f1387502612e8a66b4a1a8a853e33ebf Merge: 5f9bf17d7 918ee4a4c Author: Arne Fitzenreiter Date: Mon Apr 8 21:47:12 2019 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next =20 Signed-off-by: Arne Fitzenreiter commit 5f9bf17d76e43b1ee0bb4b880a9aa001844e4d4a Author: Arne Fitzenreiter Date: Mon Apr 8 16:18:00 2019 +0200 core130: update pakfire database after version change =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 2 +- config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 2 +- config/kernel/kernel.config.armv5tel-ipfire-multi | 2 +- config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/core/{130 =3D> 131}/exclude | 0 config/rootfiles/core/{130 =3D> 131}/filelists/Net_SSLeay | 0 config/rootfiles/core/{130 =3D> 131}/filelists/aarch64/linux | 0 config/rootfiles/core/{130 =3D> 131}/filelists/aarch64/linux-initrd | 0 config/rootfiles/core/{130 =3D> 131}/filelists/apache2 | 0 .../core/{130 =3D> 131}/filelists/armv5tel/linux-initrd-kirkwood | 0 .../core/{130 =3D> 131}/filelists/armv5tel/linux-initrd-multi | 0 .../rootfiles/core/{130 =3D> 131}/filelists/armv5tel/linux-kirkwood | 0 config/rootfiles/core/{130 =3D> 131}/filelists/armv5tel/linux-multi | 0 config/rootfiles/core/{130 =3D> 131}/filelists/collectd | 0 config/rootfiles/core/{130 =3D> 131}/filelists/files | 0 config/rootfiles/core/{130 =3D> 131}/filelists/gnutls | 0 config/rootfiles/core/{130 =3D> 131}/filelists/i586/linux | 0 config/rootfiles/core/{130 =3D> 131}/filelists/i586/linux-initrd | 0 config/rootfiles/core/{130 =3D> 131}/filelists/ids-ruleset-sources | 0 config/rootfiles/core/{130 =3D> 131}/filelists/libcap-ng | 0 config/rootfiles/core/{130 =3D> 131}/filelists/libhtp | 0 config/rootfiles/core/{130 =3D> 131}/filelists/lua | 0 config/rootfiles/core/{130 =3D> 131}/filelists/nettle | 0 config/rootfiles/core/{130 =3D> 131}/filelists/ntp | 0 config/rootfiles/core/{130 =3D> 131}/filelists/oinkmaster | 0 config/rootfiles/core/{130 =3D> 131}/filelists/rrdtool | 0 config/rootfiles/core/{130 =3D> 131}/filelists/suricata | 0 config/rootfiles/core/{130 =3D> 131}/filelists/unbound | 0 config/rootfiles/core/{130 =3D> 131}/filelists/wget | 0 config/rootfiles/core/{130 =3D> 131}/filelists/x86_64/linux | 0 config/rootfiles/core/{130 =3D> 131}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/{130 =3D> 131}/filelists/yaml | 0 config/rootfiles/core/{130 =3D> 131}/update.sh | 5 ++= ++- lfs/linux | 6 +++-= -- 36 files changed, 13 insertions(+), 10 deletions(-) rename config/rootfiles/core/{130 =3D> 131}/exclude (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/Net_SSLeay (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/aarch64/linux (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/aarch64/linux-initrd (= 100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/apache2 (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/armv5tel/linux-initrd-= kirkwood (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/armv5tel/linux-initrd-= multi (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/armv5tel/linux-kirkwoo= d (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/armv5tel/linux-multi (= 100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/collectd (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/files (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/gnutls (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/i586/linux (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/i586/linux-initrd (100= %) rename config/rootfiles/core/{130 =3D> 131}/filelists/ids-ruleset-sources (1= 00%) rename config/rootfiles/core/{130 =3D> 131}/filelists/libcap-ng (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/libhtp (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/lua (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/nettle (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/ntp (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/oinkmaster (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/rrdtool (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/suricata (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/unbound (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/wget (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/x86_64/linux (100%) rename config/rootfiles/core/{130 =3D> 131}/filelists/x86_64/linux-initrd (1= 00%) rename config/rootfiles/core/{130 =3D> 131}/filelists/yaml (100%) rename config/rootfiles/core/{130 =3D> 131}/update.sh (98%) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kerne= l.config.aarch64-ipfire index c48cc541b..3944b0eba 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.110-ipfire Kernel Configuration +# Linux/arm64 4.14.111-ipfire Kernel Configuration # CONFIG_ARM64=3Dy CONFIG_64BIT=3Dy diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/ke= rnel/kernel.config.armv5tel-ipfire-kirkwood index ceda6d989..ad9c07ecc 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.110-ipfire-kirkwood Kernel Configuration +# Linux/arm 4.14.111-ipfire-kirkwood Kernel Configuration # CONFIG_ARM=3Dy CONFIG_ARM_HAS_SG_CHAIN=3Dy diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kerne= l/kernel.config.armv5tel-ipfire-multi index efb20624e..2969e2344 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.110-ipfire-multi Kernel Configuration +# Linux/arm 4.14.111-ipfire-multi Kernel Configuration # CONFIG_ARM=3Dy CONFIG_ARM_HAS_SG_CHAIN=3Dy diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.c= onfig.i586-ipfire index 004b3895f..8065f4088 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.110-ipfire-pae Kernel Configuration +# Linux/x86 4.14.111-ipfire Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=3Dy diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kern= el.config.i586-ipfire-pae index e29e67cc3..f7dec8e1f 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.110-ipfire-pae Kernel Configuration +# Linux/x86 4.14.111-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=3Dy diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel= .config.x86_64-ipfire index e4dee86ed..92f8c862c 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.110-ipfire Kernel Configuration +# Linux/x86 4.14.111-ipfire Kernel Configuration # CONFIG_64BIT=3Dy CONFIG_X86_64=3Dy diff --git a/config/rootfiles/core/130/exclude b/config/rootfiles/core/131/ex= clude similarity index 100% rename from config/rootfiles/core/130/exclude rename to config/rootfiles/core/131/exclude diff --git a/config/rootfiles/core/130/filelists/Net_SSLeay b/config/rootfile= s/core/131/filelists/Net_SSLeay similarity index 100% rename from config/rootfiles/core/130/filelists/Net_SSLeay rename to config/rootfiles/core/131/filelists/Net_SSLeay diff --git a/config/rootfiles/core/130/filelists/aarch64/linux b/config/rootf= iles/core/131/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/130/filelists/aarch64/linux rename to config/rootfiles/core/131/filelists/aarch64/linux diff --git a/config/rootfiles/core/130/filelists/aarch64/linux-initrd b/confi= g/rootfiles/core/131/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/130/filelists/aarch64/linux-initrd rename to config/rootfiles/core/131/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/130/filelists/apache2 b/config/rootfiles/c= ore/131/filelists/apache2 similarity index 100% rename from config/rootfiles/core/130/filelists/apache2 rename to config/rootfiles/core/131/filelists/apache2 diff --git a/config/rootfiles/core/130/filelists/armv5tel/linux-initrd-kirkwo= od b/config/rootfiles/core/131/filelists/armv5tel/linux-initrd-kirkwood similarity index 100% rename from config/rootfiles/core/130/filelists/armv5tel/linux-initrd-kirkwood rename to config/rootfiles/core/131/filelists/armv5tel/linux-initrd-kirkwood diff --git a/config/rootfiles/core/130/filelists/armv5tel/linux-initrd-multi = b/config/rootfiles/core/131/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/130/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/core/131/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/130/filelists/armv5tel/linux-kirkwood b/co= nfig/rootfiles/core/131/filelists/armv5tel/linux-kirkwood similarity index 100% rename from config/rootfiles/core/130/filelists/armv5tel/linux-kirkwood rename to config/rootfiles/core/131/filelists/armv5tel/linux-kirkwood diff --git a/config/rootfiles/core/130/filelists/armv5tel/linux-multi b/confi= g/rootfiles/core/131/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/130/filelists/armv5tel/linux-multi rename to config/rootfiles/core/131/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/130/filelists/collectd b/config/rootfiles/= core/131/filelists/collectd similarity index 100% rename from config/rootfiles/core/130/filelists/collectd rename to config/rootfiles/core/131/filelists/collectd diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/cor= e/131/filelists/files similarity index 100% rename from config/rootfiles/core/130/filelists/files rename to config/rootfiles/core/131/filelists/files diff --git a/config/rootfiles/core/130/filelists/gnutls b/config/rootfiles/co= re/131/filelists/gnutls similarity index 100% rename from config/rootfiles/core/130/filelists/gnutls rename to config/rootfiles/core/131/filelists/gnutls diff --git a/config/rootfiles/core/130/filelists/i586/linux b/config/rootfile= s/core/131/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/130/filelists/i586/linux rename to config/rootfiles/core/131/filelists/i586/linux diff --git a/config/rootfiles/core/130/filelists/i586/linux-initrd b/config/r= ootfiles/core/131/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/130/filelists/i586/linux-initrd rename to config/rootfiles/core/131/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/130/filelists/ids-ruleset-sources b/config= /rootfiles/core/131/filelists/ids-ruleset-sources similarity index 100% rename from config/rootfiles/core/130/filelists/ids-ruleset-sources rename to config/rootfiles/core/131/filelists/ids-ruleset-sources diff --git a/config/rootfiles/core/130/filelists/libcap-ng b/config/rootfiles= /core/131/filelists/libcap-ng similarity index 100% rename from config/rootfiles/core/130/filelists/libcap-ng rename to config/rootfiles/core/131/filelists/libcap-ng diff --git a/config/rootfiles/core/130/filelists/libhtp b/config/rootfiles/co= re/131/filelists/libhtp similarity index 100% rename from config/rootfiles/core/130/filelists/libhtp rename to config/rootfiles/core/131/filelists/libhtp diff --git a/config/rootfiles/core/130/filelists/lua b/config/rootfiles/core/= 131/filelists/lua similarity index 100% rename from config/rootfiles/core/130/filelists/lua rename to config/rootfiles/core/131/filelists/lua diff --git a/config/rootfiles/core/130/filelists/nettle b/config/rootfiles/co= re/131/filelists/nettle similarity index 100% rename from config/rootfiles/core/130/filelists/nettle rename to config/rootfiles/core/131/filelists/nettle diff --git a/config/rootfiles/core/130/filelists/ntp b/config/rootfiles/core/= 131/filelists/ntp similarity index 100% rename from config/rootfiles/core/130/filelists/ntp rename to config/rootfiles/core/131/filelists/ntp diff --git a/config/rootfiles/core/130/filelists/oinkmaster b/config/rootfile= s/core/131/filelists/oinkmaster similarity index 100% rename from config/rootfiles/core/130/filelists/oinkmaster rename to config/rootfiles/core/131/filelists/oinkmaster diff --git a/config/rootfiles/core/130/filelists/rrdtool b/config/rootfiles/c= ore/131/filelists/rrdtool similarity index 100% rename from config/rootfiles/core/130/filelists/rrdtool rename to config/rootfiles/core/131/filelists/rrdtool diff --git a/config/rootfiles/core/130/filelists/suricata b/config/rootfiles/= core/131/filelists/suricata similarity index 100% rename from config/rootfiles/core/130/filelists/suricata rename to config/rootfiles/core/131/filelists/suricata diff --git a/config/rootfiles/core/130/filelists/unbound b/config/rootfiles/c= ore/131/filelists/unbound similarity index 100% rename from config/rootfiles/core/130/filelists/unbound rename to config/rootfiles/core/131/filelists/unbound diff --git a/config/rootfiles/core/130/filelists/wget b/config/rootfiles/core= /131/filelists/wget similarity index 100% rename from config/rootfiles/core/130/filelists/wget rename to config/rootfiles/core/131/filelists/wget diff --git a/config/rootfiles/core/130/filelists/x86_64/linux b/config/rootfi= les/core/131/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/130/filelists/x86_64/linux rename to config/rootfiles/core/131/filelists/x86_64/linux diff --git a/config/rootfiles/core/130/filelists/x86_64/linux-initrd b/config= /rootfiles/core/131/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/130/filelists/x86_64/linux-initrd rename to config/rootfiles/core/131/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/130/filelists/yaml b/config/rootfiles/core= /131/filelists/yaml similarity index 100% rename from config/rootfiles/core/130/filelists/yaml rename to config/rootfiles/core/131/filelists/yaml diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/131/= update.sh similarity index 98% rename from config/rootfiles/core/130/update.sh rename to config/rootfiles/core/131/update.sh index a3a888663..c809ed0ef 100644 --- a/config/rootfiles/core/130/update.sh +++ b/config/rootfiles/core/131/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 =20 -core=3D130 +core=3D131 =20 exit_with_error() { # Set last succesfull installed core. @@ -130,6 +130,9 @@ rm -rfv \ /etc/init.d/unbound restart /etc/init.d/suricata start =20 +# Update pakfire database +/usr/local/bin/pakfire update --force + # Search sensors again after reboot into the new kernel rm -f /etc/sysconfig/lm_sensors =20 diff --git a/lfs/linux b/lfs/linux index 042cd3f32..ef612fe10 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ =20 include Config =20 -VER =3D 4.14.110 -ARM_PATCHES =3D 4.14.110-ipfire0 +VER =3D 4.14.111 +ARM_PATCHES =3D 4.14.111-ipfire0 =20 THISAPP =3D linux-$(VER) DL_FILE =3D linux-$(VER).tar.xz @@ -82,7 +82,7 @@ objects =3D$(DL_FILE) \ $(DL_FILE) =3D $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz =3D $(URL_IPFIRE)/arm-multi-patche= s-$(ARM_PATCHES).patch.xz =20 -$(DL_FILE)_MD5 =3D ce0b04955349ba75bfb8afa83abe6de8 +$(DL_FILE)_MD5 =3D d1ef2ffcf41ca1cb58ba4fd6f2872ccf arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 =3D ed976ae7954c36b715fdb6b836= 30d0b6 =20 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree --===============2741076539832832668==--