From d01033c79d90e64b18c0e2d8412d4fe517b2350d Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Wed, 23 Sep 2020 16:45:05 +0800 Subject: strongswan: 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 Signed-off-by: Mingli Yu Signed-off-by: Khem Raj (cherry picked from commit e61b73e6d388006375c6fe84cc194299c094a526) Signed-off-by: Armin Kuster --- ...lete-setting-regarding-the-Standard-Outpu.patch | 34 ++++++++++++++++++++++ .../recipes-support/strongswan/strongswan_5.8.4.bb | 1 + 2 files changed, 35 insertions(+) create mode 100644 meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch 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 new file mode 100644 index 0000000000..78adcf8130 --- /dev/null +++ b/meta-networking/recipes-support/strongswan/files/0001-Remove-obsolete-setting-regarding-the-Standard-Outpu.patch @@ -0,0 +1,34 @@ +From 7b1e376d7d22244feab466e9889ba77561117357 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +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 +--- + 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.8.4.bb index 0a2733195b..8a8809243a 100644 --- a/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb +++ b/meta-networking/recipes-support/strongswan/strongswan_5.8.4.bb @@ -10,6 +10,7 @@ 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" -- cgit 1.2.3-korg