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. ef14d8a064af141a1f1c4acccd6cf70ccc443304 Date: Tue, 24 Nov 2020 11:32:33 +0000 Message-ID: <4CgMM60Pkdz2xnZ@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7530607702092932781==" List-Id: --===============7530607702092932781== 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 ef14d8a064af141a1f1c4acccd6cf70ccc443304 (commit) via 76da59bba60fa3d3012b6e026fb5451d0c3a7bfe (commit) via 27023de9317001140f12aaa07d09ddd2408fb007 (commit) from e4f287a268c490e393e2e7ffd5bdd8246c3d3f76 (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 ef14d8a064af141a1f1c4acccd6cf70ccc443304 Author: Arne Fitzenreiter Date: Tue Nov 24 11:08:13 2020 +0100 core153: ship strongswan =20 Signed-off-by: Arne Fitzenreiter commit 76da59bba60fa3d3012b6e026fb5451d0c3a7bfe Author: Arne Fitzenreiter Date: Tue Nov 24 10:52:45 2020 +0100 strongswan: update to 5.9.1 =20 Signed-off-by: Arne Fitzenreiter commit 27023de9317001140f12aaa07d09ddd2408fb007 Author: Arne Fitzenreiter Date: Tue Nov 24 08:18:09 2020 +0100 vdr-dvbapi: fix rootfile =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/106 =3D> core/153}/filelists/strongswan | 0 config/rootfiles/core/153/update.sh | 4 ++++ config/rootfiles/packages/aarch64/vdr_dvbapi | 2 +- config/rootfiles/packages/armv5tel/vdr_dvbapi | 2 +- config/rootfiles/packages/i586/vdr_dvbapi | 4 ++-- config/rootfiles/packages/x86_64/vdr_dvbapi | 2 +- lfs/strongswan | 4 ++-- 7 files changed, 11 insertions(+), 7 deletions(-) copy config/rootfiles/{oldcore/106 =3D> core/153}/filelists/strongswan (100%) Difference in files: diff --git a/config/rootfiles/core/153/filelists/strongswan b/config/rootfile= s/core/153/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/153/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/core/153/= update.sh index af85c1794..f94cf4925 100644 --- a/config/rootfiles/core/153/update.sh +++ b/config/rootfiles/core/153/update.sh @@ -89,6 +89,7 @@ rm -rf /lib/modules # Remove files =20 # Stop services +/etc/init.d/ipsec stop =20 # Extract files extract_files @@ -111,6 +112,9 @@ sed -e "s/^%hourly,random \* \* \*/%hourly,random */g" \ fcrontab -z =20 # Start services +if grep -q "ENABLED=3Don" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec start +fi /etc/init.d/suricata restart =20 # Reload sysctl.conf diff --git a/config/rootfiles/packages/aarch64/vdr_dvbapi b/config/rootfiles/= packages/aarch64/vdr_dvbapi index 2dd21fe99..40e2e15ff 100644 --- a/config/rootfiles/packages/aarch64/vdr_dvbapi +++ b/config/rootfiles/packages/aarch64/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.1 +usr/lib/vdr/libvdr-dvbapi.so.2.4.4 diff --git a/config/rootfiles/packages/armv5tel/vdr_dvbapi b/config/rootfiles= /packages/armv5tel/vdr_dvbapi index 2dd21fe99..40e2e15ff 100644 --- a/config/rootfiles/packages/armv5tel/vdr_dvbapi +++ b/config/rootfiles/packages/armv5tel/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.1 +usr/lib/vdr/libvdr-dvbapi.so.2.4.4 diff --git a/config/rootfiles/packages/i586/vdr_dvbapi b/config/rootfiles/pac= kages/i586/vdr_dvbapi index db2bc1ee6..f6b0fbfa2 100644 --- a/config/rootfiles/packages/i586/vdr_dvbapi +++ b/config/rootfiles/packages/i586/vdr_dvbapi @@ -1,4 +1,4 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.1 -usr/lib/vdr/libvdr-dvbapi.so.2.4.1-sse +usr/lib/vdr/libvdr-dvbapi.so.2.4.4 +usr/lib/vdr/libvdr-dvbapi.so.2.4.4-sse diff --git a/config/rootfiles/packages/x86_64/vdr_dvbapi b/config/rootfiles/p= ackages/x86_64/vdr_dvbapi index 2dd21fe99..40e2e15ff 100644 --- a/config/rootfiles/packages/x86_64/vdr_dvbapi +++ b/config/rootfiles/packages/x86_64/vdr_dvbapi @@ -1,3 +1,3 @@ etc/sysconfig/vdr-plugins.d/dvbapi.conf etc/vdr/plugins/dvbapi -usr/lib/vdr/libvdr-dvbapi.so.2.4.1 +usr/lib/vdr/libvdr-dvbapi.so.2.4.4 diff --git a/lfs/strongswan b/lfs/strongswan index d62a37c81..421541369 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 5.9.0 +VER =3D 5.9.1 =20 THISAPP =3D strongswan-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 705628cddd5b7683ef8a688acd9514d8 +$(DL_FILE)_MD5 =3D 1f4db969d072e120dc12d1c116a0f658 =20 install : $(TARGET) =20 hooks/post-receive -- IPFire 2.x development tree --===============7530607702092932781==--