Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/libreswan/files: ipsec.service libreswan-3.7-curl.patch libreswan-3.7-openrc.patch
Date: Sun, 05 Jan 2014 00:45:00
Message-Id: 20140105004456.28B4A2004E@flycatcher.gentoo.org
1 floppym 14/01/05 00:44:56
2
3 Added: ipsec.service libreswan-3.7-curl.patch
4 libreswan-3.7-openrc.patch
5 Log:
6 Fork of openswan, bug 471092. Thanks to Geaaru and Chistopher Camisa.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
9
10 Revision Changes Path
11 1.1 net-misc/libreswan/files/ipsec.service
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/libreswan/files/ipsec.service?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/libreswan/files/ipsec.service?rev=1.1&content-type=text/plain
15
16 Index: ipsec.service
17 ===================================================================
18 [Unit]
19 Description=Internet Key Exchange (IKE) Protocol Daemon for IPsec
20 After=syslog.target
21 After=network.target
22
23 [Service]
24 Type=simple
25 ExecStartPre=/usr/libexec/ipsec/addconn --config /etc/ipsec.conf --checkconfig
26 ExecStartPre=/usr/libexec/ipsec/_stackmanager start
27 ExecStart=/usr/libexec/ipsec/pluto --config /etc/ipsec.conf --nofork
28 ExecStop=/usr/libexec/ipsec/whack --shutdown
29 ExecStopPost=/bin/ip xfrm policy flush
30 ExecStopPost=/bin/ip xfrm state flush
31 ExecReload=/usr/libexec/ipsec/whack --listen
32
33 [Install]
34 WantedBy=multi-user.target
35 Alias=libreswan.service
36 Alias=pluto.service
37
38
39
40 1.1 net-misc/libreswan/files/libreswan-3.7-curl.patch
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/libreswan/files/libreswan-3.7-curl.patch?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/libreswan/files/libreswan-3.7-curl.patch?rev=1.1&content-type=text/plain
44
45 Index: libreswan-3.7-curl.patch
46 ===================================================================
47 diff --git a/include/secrets.h b/include/secrets.h
48 index c5ac092..92c1679 100644
49 --- a/include/secrets.h
50 +++ b/include/secrets.h
51 @@ -173,10 +173,8 @@ extern struct secret *lsw_find_secret_by_id(struct secret *secrets,
52 const struct id *his_id,
53 bool asym);
54
55 -#if defined(LIBCURL) || defined(LDAP_VER)
56 extern void lock_certs_and_keys(const char *who);
57 extern void unlock_certs_and_keys(const char *who);
58 -#endif
59
60 #include "x509.h"
61 extern const struct RSA_private_key*lsw_get_x509_private_key(
62 diff --git a/include/x509.h b/include/x509.h
63 index f85e5b9..a796f89 100644
64 --- a/include/x509.h
65 +++ b/include/x509.h
66 @@ -230,8 +230,9 @@ extern void unlock_authcert_list(const char *who); /* in secrets.c */
67 #else
68 /* WARNING empty x509 locking functions defined bypassing real locking */
69 /* not fixing this hack, see issues #1390, #1391, #1392 */
70 +#define check_crls(who) /* nothing */
71 +#define lock_crl_list(who) /* nothing */
72 #define unlock_crl_list(who) /* nothing */
73 -#define lock_cacert_list(who) /* nothing */
74 #define lock_authcert_list(who) /* nothing */
75 #define unlock_authcert_list(who) /* nothing */
76 #endif
77
78
79
80 1.1 net-misc/libreswan/files/libreswan-3.7-openrc.patch
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/libreswan/files/libreswan-3.7-openrc.patch?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/libreswan/files/libreswan-3.7-openrc.patch?rev=1.1&content-type=text/plain
84
85 Index: libreswan-3.7-openrc.patch
86 ===================================================================
87 From 2ad34532b42cfb791ed25cbf2fb9f6c964a12fcb Mon Sep 17 00:00:00 2001
88 From: Mike Gilbert <floppym@g.o>
89 Date: Sat, 4 Jan 2014 14:44:51 -0500
90 Subject: [PATCH] packaging: Fix srcdir in openrc Makfile
91
92 Signed-off-by: Paul Wouters <pwouters@××××××.com>
93 ---
94 initsystems/openrc/Makefile | 2 +-
95 1 file changed, 1 insertion(+), 1 deletion(-)
96
97 diff --git a/initsystems/openrc/Makefile b/initsystems/openrc/Makefile
98 index 837ad61..eb5515e 100644
99 --- a/initsystems/openrc/Makefile
100 +++ b/initsystems/openrc/Makefile
101 @@ -1,5 +1,5 @@
102 LIBRESWANSRCDIR?=$(shell cd ../..; pwd)
103 -srcdir?=${LIBRESWANSRCDIR}/initsystems/sysvinit/
104 +srcdir?=${LIBRESWANSRCDIR}/initsystems/openrc/
105
106 INITDFILE=ipsec.init
107 SUBDIRS=
108 --
109 1.8.5.2