[gentoo-commits] repo/gentoo:master commit in: net-misc/libreswan/files/

[Mike Gilbert]

commit:     b13ffed0bd7b142553945d68cd5c1bdd254ea543
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jan 25 19:49:27 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 04:06:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b13ffed0

net-misc/libreswan: remove unused patches/file

 net-misc/libreswan/files/ipsec.service             | 19 -----------
 net-misc/libreswan/files/libreswan-3.7-curl.patch  | 30 ------------------
 .../files/libreswan-3.7-openrc-pidfile.patch       | 37 ----------------------
 .../libreswan/files/libreswan-3.7-openrc.patch     | 24 --------------
 4 files changed, 110 deletions(-)

diff --git a/net-misc/libreswan/files/ipsec.service b/net-misc/libreswan/files/ipsec.service
deleted file mode 100644
index 36e2f97d..00000000
--- a/net-misc/libreswan/files/ipsec.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Internet Key Exchange (IKE) Protocol Daemon for IPsec
-After=syslog.target
-After=network.target
-
-[Service]
-Type=simple
-ExecStartPre=/usr/libexec/ipsec/addconn --config /etc/ipsec.conf --checkconfig
-ExecStartPre=/usr/libexec/ipsec/_stackmanager start
-ExecStart=/usr/libexec/ipsec/pluto --config /etc/ipsec.conf --nofork
-ExecStop=/usr/libexec/ipsec/whack --shutdown
-ExecStopPost=/bin/ip xfrm policy flush
-ExecStopPost=/bin/ip xfrm state flush
-ExecReload=/usr/libexec/ipsec/whack --listen
-
-[Install]
-WantedBy=multi-user.target
-Alias=libreswan.service
-Alias=pluto.service

diff --git a/net-misc/libreswan/files/libreswan-3.7-curl.patch b/net-misc/libreswan/files/libreswan-3.7-curl.patch
deleted file mode 100644
index cc808ab..00000000
--- a/net-misc/libreswan/files/libreswan-3.7-curl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/include/secrets.h b/include/secrets.h
-index c5ac092..92c1679 100644
---- a/include/secrets.h
-+++ b/include/secrets.h
-@@ -173,10 +173,8 @@ extern struct secret *lsw_find_secret_by_id(struct secret *secrets,
- 					    const struct id *his_id,
- 					    bool asym);
- 
--#if defined(LIBCURL) || defined(LDAP_VER)
- extern void lock_certs_and_keys(const char *who);
- extern void unlock_certs_and_keys(const char *who);
--#endif
- 
- #include "x509.h"
- extern const struct RSA_private_key*lsw_get_x509_private_key(
-diff --git a/include/x509.h b/include/x509.h
-index f85e5b9..a796f89 100644
---- a/include/x509.h
-+++ b/include/x509.h
-@@ -230,8 +230,9 @@ extern void unlock_authcert_list(const char *who);	/* in secrets.c */
- #else
- /* WARNING empty x509 locking functions defined bypassing real locking */
- /* not fixing this hack, see issues #1390, #1391, #1392 */
-+#define check_crls(who)                 /* nothing */
-+#define lock_crl_list(who)              /* nothing */
- #define unlock_crl_list(who)            /* nothing */
--#define lock_cacert_list(who)           /* nothing */
- #define lock_authcert_list(who)         /* nothing */
- #define unlock_authcert_list(who)       /* nothing */
- #endif

diff --git a/net-misc/libreswan/files/libreswan-3.7-openrc-pidfile.patch b/net-misc/libreswan/files/libreswan-3.7-openrc-pidfile.patch
deleted file mode 100644
index ab53057..00000000
--- a/net-misc/libreswan/files/libreswan-3.7-openrc-pidfile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ee43bdf59ad20e099093a5de4a7cfe63f0c12ba0 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@g.o>
-Date: Mon, 6 Jan 2014 14:43:37 -0500
-Subject: [PATCH] packaging: Fix pidfile handling in openrc init script
-
-Variable is referenced as PLUTO_PIDFILE in start() and stop().
-
-Also, don't initialize PLUTO_OPTS to blank; this allows the sysadmin to
-set it in /etc/conf.d/ipsec.
----
- initsystems/openrc/ipsec.init.in | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/initsystems/openrc/ipsec.init.in b/initsystems/openrc/ipsec.init.in
-index f3ab2f9..c121897 100755
---- a/initsystems/openrc/ipsec.init.in
-+++ b/initsystems/openrc/ipsec.init.in
-@@ -1,7 +1,5 @@
- #!/sbin/openrc-run
- 
--PLUTO_OPTS=""
--
- name="ipsec pluto daemon"
- extra_commands="configtest"
- extra_started_commands="reload"
-@@ -12,7 +10,7 @@ description_reload="reloads the configuration - does not affect existing connect
- PLUTO_BINARY=${PLUTO_BINARY:-@FINALLIBDIR@/pluto}
- PLUTO_CONFFILE=${PLUTO_CONFFILE:-@FINALCONFFILE@}
- IPSEC_BINARY=${IPSEC_BINARY:-@FINALSBINDIR@/ipsec}
--PLUTO_PID=${PLUTO_PID:-/var/run/pluto/pluto.pid}
-+PLUTO_PIDFILE=${PLUTO_PIDFILE:-/var/run/pluto/pluto.pid}
- 
- depend() {
- 	need net
--- 
-1.8.5.2
-

diff --git a/net-misc/libreswan/files/libreswan-3.7-openrc.patch b/net-misc/libreswan/files/libreswan-3.7-openrc.patch
deleted file mode 100644
index 6bbbda5..00000000
--- a/net-misc/libreswan/files/libreswan-3.7-openrc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 2ad34532b42cfb791ed25cbf2fb9f6c964a12fcb Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@g.o>
-Date: Sat, 4 Jan 2014 14:44:51 -0500
-Subject: [PATCH] packaging: Fix srcdir in openrc Makfile
-
-Signed-off-by: Paul Wouters <pwouters@××××××.com>
----
- initsystems/openrc/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/initsystems/openrc/Makefile b/initsystems/openrc/Makefile
-index 837ad61..eb5515e 100644
---- a/initsystems/openrc/Makefile
-+++ b/initsystems/openrc/Makefile
-@@ -1,5 +1,5 @@
- LIBRESWANSRCDIR?=$(shell cd ../..; pwd)
--srcdir?=${LIBRESWANSRCDIR}/initsystems/sysvinit/
-+srcdir?=${LIBRESWANSRCDIR}/initsystems/openrc/
- 
- INITDFILE=ipsec.init
- SUBDIRS=
--- 
-1.8.5.2
-