Gentoo Archives: gentoo-commits

From: "Kristian Fiskerstrand (k_f)" <k_f@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/ekeyd/files: ekeyd-1.1.5-misc.patch ekeyd-1.1.5-const_char_usage.patch ekeyd-1.1.5-path-fixes.patch ekeyd-1.1.5-remove-werror.patch ekeyd-1.1.5-enoent.patch 90-ekeyd.rules ekeyd.service ekeyd-1.1.5-udev-rule.patch
Date: Sat, 30 Aug 2014 13:04:21
Message-Id: 20140830130417.9277A441C@oystercatcher.gentoo.org
1 k_f 14/08/30 13:04:17
2
3 Added: ekeyd-1.1.5-misc.patch
4 ekeyd-1.1.5-const_char_usage.patch
5 ekeyd-1.1.5-path-fixes.patch
6 ekeyd-1.1.5-remove-werror.patch
7 ekeyd-1.1.5-enoent.patch 90-ekeyd.rules
8 ekeyd.service ekeyd-1.1.5-udev-rule.patch
9 Log:
10 Version bump: Bringing in 1.1.5 from overlay
11
12 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xFC3B17DE05E136A0!)
13
14 Revision Changes Path
15 1.1 app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch?rev=1.1&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-misc.patch?rev=1.1&content-type=text/plain
19
20 Index: ekeyd-1.1.5-misc.patch
21 ===================================================================
22 diff -r 724cf5abf164 host/Makefile
23 --- a/host/Makefile Mon Oct 28 00:43:49 2013 +0100
24 +++ b/host/Makefile Mon Oct 28 00:54:01 2013 +0100
25 @@ -19,7 +19,7 @@
26 RM ?= rm -f
27 LUA_V ?= 5.1
28 EXTRA_INC ?=
29 -LUA_INC ?= -I/usr/include/lua5.1
30 +LUA_INC ?= -I/usr/include
31 LIBDL ?= -ldl
32 PTHFLAGS ?=
33 PTHLIBS ?= -lpthread
34 @@ -31,7 +31,7 @@
35 MANZEXT := .gz
36
37 # Current tool version as returned from tools
38 -EKEYD_VERSION_S="1.1.4"
39 +EKEYD_VERSION_S="1.1.5"
40
41 # Attempt to detect an OS and set build options as appropriate
42 OSNAME=$(shell uname -s | tr A-Z a-z | tr -d /)
43 @@ -91,10 +91,7 @@
44 override MANZCMD:=cat
45 override MANZEXT:=
46 endif
47 -override LUA_INC:=-I/usr/local/include/lua51
48 override LIBDL:=
49 -LIBDIRS += -L/usr/local/lib
50 -INCLUDES += -I/usr/local/include
51 endif
52 endif
53 endif
54 @@ -114,7 +111,7 @@
55 CFLAGS += '-DEKEYD_VERSION_S=""$(EKEYD_VERSION_S)""'
56 CFLAGS += $(EXTRA_CFLAGS)
57
58 -LIBS += -llua$(LUA_V) -lm $(LIBDL)
59 +LIBS += -llua -lm $(LIBDL)
60 LDFLAGS += $(LIBDIRS)
61
62
63 @@ -157,7 +154,7 @@
64 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
65
66 control.inc: bin2c.lua control.lua
67 - lua$(LUA_V) bin2c.lua +control.lua result > control.inc.new
68 + lua bin2c.lua +control.lua result > control.inc.new
69 mv control.inc.new control.inc
70
71 lstate.o: lstate.c control.inc
72
73
74
75 1.1 app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch
76
77 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch?rev=1.1&view=markup
78 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-const_char_usage.patch?rev=1.1&content-type=text/plain
79
80 Index: ekeyd-1.1.5-const_char_usage.patch
81 ===================================================================
82 # HG changeset patch
83 # User kristianf
84 # Date 1382916823 -3600
85 # Mon Oct 28 00:33:43 2013 +0100
86 # Node ID 0d99149615ec5ec70a6d03c685291ddc55babff6
87 # Parent fd192324ff9ae4c4c92cdb9c27f5ae100da136a6
88 Rewrite static const char *usage
89
90 diff -r fd192324ff9a -r 0d99149615ec host/ekey-setkey.c
91 --- a/host/ekey-setkey.c Mon Oct 28 00:31:59 2013 +0100
92 +++ b/host/ekey-setkey.c Mon Oct 28 00:33:43 2013 +0100
93 @@ -79,7 +79,7 @@
94 return mac;
95 }
96
97 -static const char *usage =
98 +static const char usage[] =
99 "This is a low level tool. You probably wanted to use ekey-rekey instead.\n\n"
100 "Usage: %s [-d] [-h] [-n] [-f <keyring>] [-m <master>]\n"
101 " [-s <serial>] <path>\n"
102 diff -r fd192324ff9a -r 0d99149615ec host/ekeyd.c
103 --- a/host/ekeyd.c Mon Oct 28 00:31:59 2013 +0100
104 +++ b/host/ekeyd.c Mon Oct 28 00:33:43 2013 +0100
105 @@ -209,7 +209,7 @@
106 return (output_stream != NULL);
107 }
108
109 -static const char *usage=
110 +static const char usage[] =
111 "Usage: %s [-f <configfile>] [-p <pidfile>] [-v] [-h]\n"
112 "Entropy Key Daemon\n\n"
113 "\t-f Read configuration from configfile\n"
114
115
116
117 1.1 app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch
118
119 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch?rev=1.1&view=markup
120 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-path-fixes.patch?rev=1.1&content-type=text/plain
121
122 Index: ekeyd-1.1.5-path-fixes.patch
123 ===================================================================
124 # HG changeset patch
125 # User kristianf
126 # Date 1382917171 -3600
127 # Mon Oct 28 00:39:31 2013 +0100
128 # Node ID d96c42b36cb125e6e52cff623b7bdad1910284b4
129 # Parent 0a9e41a05aafb98cc8c21562931cb1cbb5e30c1f
130 entropykey.sh
131
132 diff -r 0a9e41a05aaf -r d96c42b36cb1 udev/entropykey.sh
133 --- a/udev/entropykey.sh Mon Oct 28 00:35:46 2013 +0100
134 +++ b/udev/entropykey.sh Mon Oct 28 00:39:31 2013 +0100
135 @@ -19,9 +19,10 @@
136 COUNTER=$(( ${COUNTER} + 1 ))
137 test ${COUNTER} -ge 10 && exit 1
138 done
139 - $BINPATH/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid -p/var/run/entropykeys/${ENTROPY_KEY_SERIAL} -D
140 + /usr/libexec/ekey-ulusbd -b${BUSNUM} -d${DEVNUM} -P/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid -p/dev/entropykey/${ENTROPY_KEY_SERIAL} -D
141 +
142 sleep 1
143 - $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
144 + $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
145 exit 0
146 }
147
148 @@ -34,18 +35,18 @@
149 if test "x${BUSNUM}" = "x" -o "x${DEVNUM}" = "x"; then
150 exit 0
151 fi
152 - if test -r "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid"; then
153 - kill $(cat "/var/run/ekey-ulusbd-${ENTROPY_KEY_SERIAL}.pid") || true
154 + if test -r "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid"; then
155 + kill $(< "/dev/.ekey-ulusbd/${ENTROPY_KEY_SERIAL}.pid") || true
156 fi
157 - mkdir -p /var/run/entropykeys
158 + mkdir -p /dev/entropykey /dev/.ekeyd-ulusb
159 wait_for_usb &
160 exit 0
161 fi
162 # Update ekeyd with device operation
163 - $BINPATH/ekeydctl ${ACTION} /var/run/entropykeys/${ENTROPY_KEY_SERIAL}
164 + $BINPATH/ekeydctl ${ACTION} /dev/entropykey/${ENTROPY_KEY_SERIAL}
165 if test "x$ACTION" = "xremove"; then
166 - rm "/var/run/ekey-ulusbd-${ENTROPYKEY_KEY_SERIAL}.pid"
167 - rm "/var/run/entropykeys/${ENTROPYKEY_KEY_SERIAL}"
168 + rm "/dev/.ekey-ulusbd/${ENTROPYKEY_KEY_SERIAL}.pid"
169 + rm "/dev/entropykey/${ENTROPYKEY_KEY_SERIAL}"
170 fi
171 fi
172
173
174
175
176 1.1 app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch
177
178 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch?rev=1.1&view=markup
179 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-remove-werror.patch?rev=1.1&content-type=text/plain
180
181 Index: ekeyd-1.1.5-remove-werror.patch
182 ===================================================================
183 # HG changeset patch
184 # User kristianf
185 # Date 1382917429 -3600
186 # Mon Oct 28 00:43:49 2013 +0100
187 # Node ID 724cf5abf164dd5889a7c72916aa524c3822b8bd
188 # Parent 902b9c6908618864319835d69981f9ea902be324
189 Makefile
190
191 diff -r 902b9c690861 -r 724cf5abf164 host/Makefile
192 --- a/host/Makefile Mon Oct 28 00:41:59 2013 +0100
193 +++ b/host/Makefile Mon Oct 28 00:43:49 2013 +0100
194 @@ -107,7 +107,7 @@
195 CFLAGS += $(INCLUDES)
196 CFLAGS += -g -Wall $(OPT)
197 CFLAGS += -fno-strict-aliasing
198 -CFLAGS += -std=c99 -Wall -pedantic -Wshadow -Werror -D_GNU_SOURCE
199 +CFLAGS += -std=c99 -Wall -pedantic -Wshadow -D_GNU_SOURCE
200 CFLAGS += '-DCONFIGFILE="$(SYSCONFPREFIX)/ekeyd.conf"'
201 CFLAGS += '-DPIDFILE="$(RUNTIMEPREFIX)/ekeyd.pid"'
202 CFLAGS += '-DKEYRINGFILE="$(SYSCONFPREFIX)/keyring"'
203 @@ -148,7 +148,7 @@
204 $(COMPILE.c) $(OUTPUT_OPTION) $(PTHFLAGS) $^
205
206 egd-linux: egd-linux.o daemonise.o
207 - $(CC) $(CFLAGS) -o $@ $^
208 + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
209
210 ekeyd: ekeyd.o daemonise.o lstate.o connection.o stream.o frame.o packet.o keydb.o util.o fds.o krnlop.o foldback.o stats.o nonce.o ../device/frames/pem.o ../device/skeinwrap.o ../device/skein/skein.o ../device/skein/skein_block.o
211 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
212
213
214
215 1.1 app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch
216
217 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch?rev=1.1&view=markup
218 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-enoent.patch?rev=1.1&content-type=text/plain
219
220 Index: ekeyd-1.1.5-enoent.patch
221 ===================================================================
222 # HG changeset patch
223 # User kristianf
224 # Date 1382916946 -3600
225 # Mon Oct 28 00:35:46 2013 +0100
226 # Node ID 0a9e41a05aafb98cc8c21562931cb1cbb5e30c1f
227 # Parent 0d99149615ec5ec70a6d03c685291ddc55babff6
228 libusb_compat
229
230 diff -r 0d99149615ec -r 0a9e41a05aaf host/ekey-ulusbd.c
231 --- a/host/ekey-ulusbd.c Mon Oct 28 00:33:43 2013 +0100
232 +++ b/host/ekey-ulusbd.c Mon Oct 28 00:35:46 2013 +0100
233 @@ -100,8 +100,9 @@
234
235 #if LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP
236 if ((r = usb_detach_kernel_driver_np(devh, EKEY_IFACE)) != 0) {
237 - if (r != -ENODATA) {
238 - fprintf(stderr,
239 + /* libusb_compat-0.1.3 mistakenly translate ENODATA to ENOENT */
240 + if (r != -ENODATA && r != -ENOENT) {
241 + fprintf(stderr,
242 "Unable to detach Entropy Key at %s/%s from kernel\n",
243 busmatch, devmatch);
244 usb_close(devh);
245
246
247
248 1.1 app-crypt/ekeyd/files/90-ekeyd.rules
249
250 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/90-ekeyd.rules?rev=1.1&view=markup
251 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/90-ekeyd.rules?rev=1.1&content-type=text/plain
252
253 Index: 90-ekeyd.rules
254 ===================================================================
255 # Entropy key udev rules
256 #
257 # Centos/RHEL 6 rules for udev version 147
258 #
259 # These rules create devices under /dev/entropykey/<serialnumber>
260 #
261 # Copyright 2011-2014 Simtec Electronics
262 #
263 # For licence terms refer to the COPYING file distributed with the source.
264
265 ACTION=="add", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", SYMLINK+="entropykey/$env{ID_SERIAL_SHORT}"
266
267 ACTION=="add", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", RUN+="/usr/sbin/ekeydctl add /dev/entropykey/$env{ID_SERIAL_SHORT}"
268
269 ACTION=="remove", SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="20df", ENV{ID_MODEL_ID}=="0001", RUN+="/usr/sbin/ekeydctl remove $env{ID_SERIAL_SHORT}"
270
271
272
273
274 1.1 app-crypt/ekeyd/files/ekeyd.service
275
276 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd.service?rev=1.1&view=markup
277 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd.service?rev=1.1&content-type=text/plain
278
279 Index: ekeyd.service
280 ===================================================================
281 [Unit]
282 Description=Entropy key daemon
283
284 [Service]
285 ExecStart=/usr/libexec/ekeyd
286
287 [Install]
288 WantedBy=multi-user.target
289
290
291
292 1.1 app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch
293
294 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch?rev=1.1&view=markup
295 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/files/ekeyd-1.1.5-udev-rule.patch?rev=1.1&content-type=text/plain
296
297 Index: ekeyd-1.1.5-udev-rule.patch
298 ===================================================================
299 # HG changeset patch
300 # User kristianf
301 # Date 1382917319 -3600
302 # Mon Oct 28 00:41:59 2013 +0100
303 # Node ID 902b9c6908618864319835d69981f9ea902be324
304 # Parent d96c42b36cb125e6e52cff623b7bdad1910284b4
305 udev rule
306
307 diff -r d96c42b36cb1 -r 902b9c690861 udev/fedora15/60-entropykey-uds.rules
308 --- a/udev/fedora15/60-entropykey-uds.rules Mon Oct 28 00:39:31 2013 +0100
309 +++ b/udev/fedora15/60-entropykey-uds.rules Mon Oct 28 00:41:59 2013 +0100
310 @@ -9,7 +9,7 @@
311 # For licence terms refer to the COPYING file.
312
313 # Detect an Entropy Key being inserted and extract serial number
314 -ACTION=="add|change|remove", SUBSYSTEM=="usb", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
315 +ACTION=="add|change|remove", SUBSYSTEM=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c /bin/echo ENTROPY_KEY_SERIAL=$attr{serial}"
316
317 # And tell the ekeyd about the device action.
318 ENV{ENTROPY_KEY_SERIAL}!="", RUN+="/lib/udev/entropykey.sh"
319 diff -r d96c42b36cb1 -r 902b9c690861 udev/fedora15/60-entropykey.rules
320 --- a/udev/fedora15/60-entropykey.rules Mon Oct 28 00:39:31 2013 +0100
321 +++ b/udev/fedora15/60-entropykey.rules Mon Oct 28 00:41:59 2013 +0100
322 @@ -9,10 +9,10 @@
323 # For licence terms refer to the COPYING file distributed with the source.
324
325 # Detect an Entropy Key being inserted and add info values to environment
326 -ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", BUS=="usb", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="usb_id --export %p"
327 +ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{builtin}="usb_id"
328
329 # Detect an Entropy Key being inserted and extract serial number
330 -ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
331 +ACTION=="add|change|remove", SUBSYSTEM=="tty", KERNEL=="ttyACM[0-9]*", ATTRS{idVendor}=="20df", ATTRS{idProduct}=="0001", IMPORT{program}="/bin/sh -c /bin/echo ENTROPY_KEY_SERIAL=$env{ID_SERIAL_SHORT}"
332
333 # Add the /dev/entropykey/<serialnumber> symbolic link
334 ENV{ENTROPY_KEY_SERIAL}!="", SYMLINK+="entropykey/$env{ENTROPY_KEY_SERIAL}"