aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@cn.fujitsu.com>2020-11-20 21:14:26 +0800
committerKhem Raj <raj.khem@gmail.com>2020-11-23 07:09:33 -0800
commit9a77c8d8f09c588e07ae3721f59bf2b4e4f2a2f3 (patch)
treee0db5350316f3c8ab206463ca13a7f18bbf49b33 /meta-networking
parentf682696a05c7f6c8e7124e9f0973eab34fdae1cb (diff)
downloadmeta-openembedded-contrib-9a77c8d8f09c588e07ae3721f59bf2b4e4f2a2f3.tar.gz
strongswan: upgrade 5.8.4 -> 5.9.1
0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch Removed since this is included in 5.9.1 Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r--meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch34
-rw-r--r--meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb (renamed from meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb)5
2 files changed, 2 insertions, 37 deletions
diff --git a/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch b/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
deleted file mode 100644
index 78adcf8130..0000000000
--- a/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7b1e376d7d22244feab466e9889ba77561117357 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Wed, 23 Sep 2020 16:20:22 +0800
-Subject: [PATCH] Remove obsolete setting regarding the Standard Output
-
-The Standard output type "syslog" is obsolete, causing a warning since systemd
-version 246 [1].
-
-Please consider using "journal" or "journal+console"
-
-[1] https://github.com/systemd/systemd/blob/master/NEWS#L202
-
-Upstream-Status: Submitted [https://github.com/strongswan/strongswan/pull/181]
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- init/systemd-starter/strongswan-starter.service.in | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/init/systemd-starter/strongswan-starter.service.in b/init/systemd-starter/strongswan-starter.service.in
-index 474284a19..6a0672352 100644
---- a/init/systemd-starter/strongswan-starter.service.in
-+++ b/init/systemd-starter/strongswan-starter.service.in
-@@ -4,7 +4,6 @@ After=syslog.target network-online.target
-
- [Service]
- ExecStart=@SBINDIR@/@IPSEC_SCRIPT@ start --nofork
--StandardOutput=syslog
- Restart=on-abnormal
-
- [Install]
---
-2.17.1
-
diff --git a/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb b/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb
index bd3e87a3f1..095a93df35 100644
--- a/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb
+++ b/meta-networking/recipes-support/strongswan/strongswan_5.9.1.bb
@@ -10,11 +10,10 @@ DEPENDS = "gmp openssl flex-native flex bison-native"
SRC_URI = "http://download.strongswan.org/strongswan-${PV}.tar.bz2 \
file://fix-funtion-parameter.patch \
file://0001-memory.h-Include-stdint.h-for-uintptr_t.patch \
- file://0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch \
"
-SRC_URI[md5sum] = "0634e7f40591bd3f6770e583c3f27d29"
-SRC_URI[sha256sum] = "2d9a57e33813b62d58cba07531c4d5a35c6b823dfe9b8ff7c623b6571f02553c"
+SRC_URI[md5sum] = "1f4db969d072e120dc12d1c116a0f658"
+SRC_URI[sha256sum] = "a337c9fb63d973b8440827755c784031648bf423b7114a04918b0b00fd42cafb"
UPSTREAM_CHECK_REGEX = "strongswan-(?P<pver>\d+(\.\d+)+)\.tar"