1 |
commit: bb11c54e4f75db6dddab315fb3db6117959b5882 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 31 01:15:24 2017 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 31 01:23:53 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb11c54e |
7 |
|
8 |
net-vpn/peervpn: revbump to 0.044-r3 with patch for 512 byte passwords |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
.../peervpn-0.044-strncpy-null-terminator.patch | 91 ++++++++++++++++++++++ |
13 |
...vpn-0.044-r2.ebuild => peervpn-0.044-r3.ebuild} | 6 +- |
14 |
2 files changed, 96 insertions(+), 1 deletion(-) |
15 |
|
16 |
diff --git a/net-vpn/peervpn/files/peervpn-0.044-strncpy-null-terminator.patch b/net-vpn/peervpn/files/peervpn-0.044-strncpy-null-terminator.patch |
17 |
new file mode 100644 |
18 |
index 00000000000..e16d0ef8023 |
19 |
--- /dev/null |
20 |
+++ b/net-vpn/peervpn/files/peervpn-0.044-strncpy-null-terminator.patch |
21 |
@@ -0,0 +1,91 @@ |
22 |
+From 5dda3477ed31888b86792ed05c17d80a77fe0b03 Mon Sep 17 00:00:00 2001 |
23 |
+From: Zac Medico <zmedico@g.o> |
24 |
+Date: Thu, 30 Mar 2017 16:03:27 -0700 |
25 |
+Subject: [PATCH] config.ic: fix strncpy calls to copy null terminator for 512 |
26 |
+ byte strings |
27 |
+ |
28 |
+This problem caused a 512 byte psk setting to trigger authentication |
29 |
+failure, since the strlen call used to set password_len would return |
30 |
+an unpredictable result on each peer. |
31 |
+ |
32 |
+https://github.com/peervpn/peervpn/pull/20 |
33 |
+--- |
34 |
+ config.ic | 26 +++++++++++++------------- |
35 |
+ 1 file changed, 13 insertions(+), 13 deletions(-) |
36 |
+ |
37 |
+diff --git a/config.ic b/config.ic |
38 |
+index e0eba35..405e9de 100644 |
39 |
+--- a/config.ic |
40 |
++++ b/config.ic |
41 |
+@@ -147,55 +147,55 @@ static int parseConfigLine(char *line, int len, struct s_initconfig *cs) { |
42 |
+ return 1; |
43 |
+ } |
44 |
+ else if(parseConfigLineCheckCommand(line,len,"local",&vpos)) { |
45 |
+- strncpy(cs->sourceip,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
46 |
++ strncpy(cs->sourceip,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
47 |
+ return 1; |
48 |
+ } |
49 |
+ else if(parseConfigLineCheckCommand(line,len,"port",&vpos)) { |
50 |
+- strncpy(cs->sourceport,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
51 |
++ strncpy(cs->sourceport,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
52 |
+ return 1; |
53 |
+ } |
54 |
+ else if(parseConfigLineCheckCommand(line,len,"user",&vpos)) { |
55 |
+- strncpy(cs->userstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
56 |
++ strncpy(cs->userstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
57 |
+ return 1; |
58 |
+ } |
59 |
+ else if(parseConfigLineCheckCommand(line,len,"group",&vpos)) { |
60 |
+- strncpy(cs->groupstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
61 |
++ strncpy(cs->groupstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
62 |
+ return 1; |
63 |
+ } |
64 |
+ else if(parseConfigLineCheckCommand(line,len,"chroot",&vpos)) { |
65 |
+- strncpy(cs->chrootstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
66 |
++ strncpy(cs->chrootstr,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
67 |
+ return 1; |
68 |
+ } |
69 |
+ else if(parseConfigLineCheckCommand(line,len,"networkname",&vpos)) { |
70 |
+- strncpy(cs->networkname,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
71 |
++ strncpy(cs->networkname,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
72 |
+ return 1; |
73 |
+ } |
74 |
+ else if(parseConfigLineCheckCommand(line,len,"interface",&vpos)) { |
75 |
+- strncpy(cs->tapname,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
76 |
++ strncpy(cs->tapname,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
77 |
+ return 1; |
78 |
+ } |
79 |
+ else if(parseConfigLineCheckCommand(line,len,"ifconfig4",&vpos)) { |
80 |
+- strncpy(cs->ifconfig4,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
81 |
++ strncpy(cs->ifconfig4,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
82 |
+ return 1; |
83 |
+ } |
84 |
+ else if(parseConfigLineCheckCommand(line,len,"ifconfig6",&vpos)) { |
85 |
+- strncpy(cs->ifconfig6,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
86 |
++ strncpy(cs->ifconfig6,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
87 |
+ return 1; |
88 |
+ } |
89 |
+ else if(parseConfigLineCheckCommand(line,len,"upcmd",&vpos)) { |
90 |
+- strncpy(cs->upcmd,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
91 |
++ strncpy(cs->upcmd,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
92 |
+ return 1; |
93 |
+ } |
94 |
+ else if(parseConfigLineCheckCommand(line,len,"initpeers",&vpos)) { |
95 |
+- strncpy(cs->initpeers,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
96 |
++ strncpy(cs->initpeers,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
97 |
+ return 1; |
98 |
+ } |
99 |
+ else if(parseConfigLineCheckCommand(line,len,"engine",&vpos)) { |
100 |
+- strncpy(cs->engines,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
101 |
++ strncpy(cs->engines,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
102 |
+ return 1; |
103 |
+ } |
104 |
+ else if(parseConfigLineCheckCommand(line,len,"psk",&vpos)) { |
105 |
+- strncpy(cs->password,&line[vpos],CONFPARSER_NAMEBUF_SIZE); |
106 |
++ strncpy(cs->password,&line[vpos],CONFPARSER_NAMEBUF_SIZE+1); |
107 |
+ cs->password_len = strlen(cs->password); |
108 |
+ return 1; |
109 |
+ } |
110 |
+-- |
111 |
+2.10.2 |
112 |
+ |
113 |
|
114 |
diff --git a/net-vpn/peervpn/peervpn-0.044-r2.ebuild b/net-vpn/peervpn/peervpn-0.044-r3.ebuild |
115 |
similarity index 90% |
116 |
rename from net-vpn/peervpn/peervpn-0.044-r2.ebuild |
117 |
rename to net-vpn/peervpn/peervpn-0.044-r3.ebuild |
118 |
index 47b338de404..14ae94d7c02 100644 |
119 |
--- a/net-vpn/peervpn/peervpn-0.044-r2.ebuild |
120 |
+++ b/net-vpn/peervpn/peervpn-0.044-r3.ebuild |
121 |
@@ -1,4 +1,4 @@ |
122 |
-# Copyright 1999-2016 Gentoo Foundation |
123 |
+# Copyright 1999-2017 Gentoo Foundation |
124 |
# Distributed under the terms of the GNU General Public License v2 |
125 |
|
126 |
EAPI=6 |
127 |
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND}" |
128 |
|
129 |
S=${WORKDIR}/${PN}-${EGIT_COMMIT} |
130 |
|
131 |
+PATCHES=( |
132 |
+ "${FILESDIR}/${P}-strncpy-null-terminator.patch" |
133 |
+) |
134 |
+ |
135 |
pkg_setup() { |
136 |
enewgroup ${PN} |
137 |
enewuser ${PN} -1 -1 -1 ${PN} |