diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2019-01-02 11:40:21 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2019-01-02 11:40:21 +0100 |
| commit | b832ef5d09a9fc8c5f6bfe24b01ba98a01b7d5d6 (patch) | |
| tree | 9e6a11fd34b72f894e50483a2d631569ad54f93c | |
| parent | a612725b0b1bd3a0cde37d94151058139b4199f9 (diff) | |
| download | vyos-strongswan-b832ef5d09a9fc8c5f6bfe24b01ba98a01b7d5d6.tar.gz vyos-strongswan-b832ef5d09a9fc8c5f6bfe24b01ba98a01b7d5d6.zip | |
d/patches: import patches in gbp pq
| -rw-r--r-- | debian/patches/01_fix-manpages.patch | 10 | ||||
| -rw-r--r-- | debian/patches/02_disable-bypass-lan.patch | 10 | ||||
| -rw-r--r-- | debian/patches/03_systemd-service.patch | 13 | ||||
| -rw-r--r-- | debian/patches/04_disable-libtls-tests.patch | 13 |
4 files changed, 42 insertions, 4 deletions
diff --git a/debian/patches/01_fix-manpages.patch b/debian/patches/01_fix-manpages.patch index f1de0a3ac..de3971de0 100644 --- a/debian/patches/01_fix-manpages.patch +++ b/debian/patches/01_fix-manpages.patch @@ -1,3 +1,13 @@ +From: Yves-Alexis Perez <corsac@debian.org> +Date: Wed, 2 Jan 2019 11:35:11 +0100 +Subject: Fix typo in ipsec-scepclient(8) manpage name + +--- + src/scepclient/scepclient.8 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scepclient/scepclient.8 b/src/scepclient/scepclient.8 +index 78ce5c6..1267364 100644 --- a/src/scepclient/scepclient.8 +++ b/src/scepclient/scepclient.8 @@ -1,7 +1,7 @@ diff --git a/debian/patches/02_disable-bypass-lan.patch b/debian/patches/02_disable-bypass-lan.patch index 19333714e..303a4a5ac 100644 --- a/debian/patches/02_disable-bypass-lan.patch +++ b/debian/patches/02_disable-bypass-lan.patch @@ -1,5 +1,13 @@ +From: Yves-Alexis Perez <corsac@debian.org> +Date: Wed, 2 Jan 2019 11:35:52 +0100 +Subject: Don't load bypass-lan plugin by default + +--- + conf/plugins/bypass-lan.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/conf/plugins/bypass-lan.conf b/conf/plugins/bypass-lan.conf -index ad496db67..e470ce68e 100644 +index ad496db..e470ce6 100644 --- a/conf/plugins/bypass-lan.conf +++ b/conf/plugins/bypass-lan.conf @@ -11,7 +11,7 @@ bypass-lan { diff --git a/debian/patches/03_systemd-service.patch b/debian/patches/03_systemd-service.patch index 5eee9a9b8..3941e6490 100644 --- a/debian/patches/03_systemd-service.patch +++ b/debian/patches/03_systemd-service.patch @@ -1,6 +1,15 @@ -diff --git a/debian/patches/03_systemd-service.patch b/debian/patches/03_systemd-service.patch +From: Romain Francoise <rfrancoise@debian.org> +Date: Wed, 2 Jan 2019 11:37:27 +0100 +Subject: Tune the ipsec systemd service file + +- add a reload argument +- don't wait on syslog +--- + init/systemd/strongswan.service.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + diff --git a/init/systemd/strongswan.service.in b/init/systemd/strongswan.service.in -index 474284a19..8060d1ea2 100644 +index 474284a..8060d1e 100644 --- a/init/systemd/strongswan.service.in +++ b/init/systemd/strongswan.service.in @@ -1,9 +1,10 @@ diff --git a/debian/patches/04_disable-libtls-tests.patch b/debian/patches/04_disable-libtls-tests.patch index a0b421596..1b127e5fc 100644 --- a/debian/patches/04_disable-libtls-tests.patch +++ b/debian/patches/04_disable-libtls-tests.patch @@ -1,6 +1,17 @@ +From: Romain Francoise <rfrancoise@debian.org> +Date: Wed, 2 Jan 2019 11:34:18 +0100 +Subject: Disable libtls tests + +They're too intensive for the buildd network and cause FTBFS +--- + src/libtls/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libtls/Makefile.am b/src/libtls/Makefile.am +index b649636..635be38 100644 --- a/src/libtls/Makefile.am +++ b/src/libtls/Makefile.am -@@ -26,4 +26,4 @@ +@@ -26,4 +26,4 @@ nobase_tls_include_HEADERS = \ tls_server.h tls_handshake.h tls_application.h tls_aead.h tls.h endif |