From: | "Manuel Rueger (mrueg)" <mrueg@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-misc/sks/files: sks.confd sks-recon.initd sks-db.initd sks-1.1.4-ECC_OID_fix_x86.patch sks-db.service sks-recon.service |
Date: | Fri, 22 Nov 2013 02:35:49 |
Message-Id: | 20131122023545.99B492004E@flycatcher.gentoo.org |
1 | mrueg 13/11/22 02:35:45 |
2 | |
3 | Added: sks.confd sks-recon.initd sks-db.initd |
4 | sks-1.1.4-ECC_OID_fix_x86.patch sks-db.service |
5 | sks-recon.service |
6 | Log: |
7 | Version bump. Add initd scripts and systemd unit files by Emery Hemingway. Fixes bug #427030. Add Kristian Fiskerstrand as maintainer and proxy-maintainers as herd. |
8 | |
9 | (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key ) |
10 | |
11 | Revision Changes Path |
12 | 1.1 net-misc/sks/files/sks.confd |
13 | |
14 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks.confd?rev=1.1&view=markup |
15 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks.confd?rev=1.1&content-type=text/plain |
16 | |
17 | Index: sks.confd |
18 | =================================================================== |
19 | SKS_DIR="/var/lib/sks" |
20 | |
21 | # Set common options for sks db and sks recon here. |
22 | SKS_ARGS="" |
23 | |
24 | |
25 | 1.1 net-misc/sks/files/sks-recon.initd |
26 | |
27 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-recon.initd?rev=1.1&view=markup |
28 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-recon.initd?rev=1.1&content-type=text/plain |
29 | |
30 | Index: sks-recon.initd |
31 | =================================================================== |
32 | #!/sbin/runscript |
33 | source /etc/conf.d/sks |
34 | |
35 | command=/usr/bin/sks |
36 | command_args="recon ${SKS_ARGS}" |
37 | command_background=1 |
38 | description="Reconnoiters SKS peers for keys" |
39 | name="SKS recon" |
40 | pidfile="/var/run/sks-recon.pid" |
41 | required_files="${SKS_DIR}/sksconf ${SKS_DIR}/membership" |
42 | start_stop_daemon_args="--chdir ${SKS_DIR} --user sks" |
43 | |
44 | |
45 | depend() |
46 | { |
47 | after sks-db |
48 | use net |
49 | } |
50 | |
51 | start_pre() |
52 | { |
53 | checkpath --owner sks:sks --directory \ |
54 | ${SKS_DIR} ${SKS_DIR}/KDB ${SKS_DIR}/PTree |
55 | checkpath --owner sks:sks --file \ |
56 | ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/* |
57 | } |
58 | |
59 | |
60 | |
61 | 1.1 net-misc/sks/files/sks-db.initd |
62 | |
63 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-db.initd?rev=1.1&view=markup |
64 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-db.initd?rev=1.1&content-type=text/plain |
65 | |
66 | Index: sks-db.initd |
67 | =================================================================== |
68 | #!/sbin/runscript |
69 | source /etc/conf.d/sks |
70 | |
71 | command=/usr/bin/sks |
72 | command_args="db ${SKS_ARGS}" |
73 | command_background=1 |
74 | description="SKS database thread" |
75 | name="SKS db" |
76 | pidfile="/var/run/sks-db.pid" |
77 | required_files="${SKS_DIR}/sksconf" |
78 | start_stop_daemon_args="--chdir ${SKS_DIR} --user sks" |
79 | |
80 | |
81 | depend() |
82 | { |
83 | use net |
84 | } |
85 | |
86 | start_pre() |
87 | { |
88 | checkpath --owner sks:sks --directory \ |
89 | ${SKS_DIR} ${SKS_DIR}/KDB ${SKS_DIR}/PTree |
90 | checkpath --owner sks:sks --file \ |
91 | ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/* |
92 | } |
93 | |
94 | |
95 | |
96 | 1.1 net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch |
97 | |
98 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch?rev=1.1&view=markup |
99 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-1.1.4-ECC_OID_fix_x86.patch?rev=1.1&content-type=text/plain |
100 | |
101 | Index: sks-1.1.4-ECC_OID_fix_x86.patch |
102 | =================================================================== |
103 | diff -r a4fab18949f0 -r 0374b3dbc4ae dbserver.ml |
104 | --- a/dbserver.ml Fri Jan 25 18:16:13 2013 -0600 |
105 | +++ b/dbserver.ml Tue Apr 16 15:36:36 2013 -0500 |
106 | @@ -293,8 +293,8 @@ |
107 | let keys = lookup_keys request.search in |
108 | let count = List.length keys in |
109 | let keys = truncate request.limit keys in |
110 | + let keys = clean_keys request keys in |
111 | let hashes = List.map ~f:KeyHash.hash keys in |
112 | - let keys = clean_keys request keys in |
113 | if request.machine_readable then |
114 | ("text/plain", |
115 | count, |
116 | diff -r a4fab18949f0 -r 0374b3dbc4ae parsePGP.ml |
117 | --- a/parsePGP.ml Fri Jan 25 18:16:13 2013 -0600 |
118 | +++ b/parsePGP.ml Tue Apr 16 15:36:36 2013 -0500 |
119 | @@ -153,7 +153,7 @@ |
120 | |
121 | let parse_ecdh_pubkey cin = |
122 | let length = cin#read_int_size 1 in |
123 | - let oid = sprintf "%x" (cin#read_int_size length) in |
124 | + let oid = sprintf "%Lx" (cin#read_int64_size length) in |
125 | let mpi = read_mpi cin in |
126 | let kdf_length = cin#read_int_size 1 in |
127 | let kdf_res = cin#read_int_size 1 in |
128 | @@ -166,7 +166,7 @@ |
129 | |
130 | let parse_ecdsa_pubkey cin = |
131 | let length = cin#read_int_size 1 in |
132 | - let oid = sprintf "%x" (cin#read_int_size length) in |
133 | + let oid = sprintf "%Lx" (cin#read_int64_size length) in |
134 | let psize = oid_to_psize oid |
135 | in |
136 | psize |
137 | |
138 | |
139 | |
140 | 1.1 net-misc/sks/files/sks-db.service |
141 | |
142 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-db.service?rev=1.1&view=markup |
143 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-db.service?rev=1.1&content-type=text/plain |
144 | |
145 | Index: sks-db.service |
146 | =================================================================== |
147 | [Unit] |
148 | Description=SKS database thread |
149 | After=network.target |
150 | |
151 | [Service] |
152 | ExecStart=/usr/bin/sks db |
153 | User=sks |
154 | WorkingDirectory=/var/lib/sks |
155 | |
156 | [Install] |
157 | WantedBy=multi-user.target |
158 | |
159 | |
160 | |
161 | 1.1 net-misc/sks/files/sks-recon.service |
162 | |
163 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-recon.service?rev=1.1&view=markup |
164 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/files/sks-recon.service?rev=1.1&content-type=text/plain |
165 | |
166 | Index: sks-recon.service |
167 | =================================================================== |
168 | [Unit] |
169 | Description=SKS key reconnaissance thread |
170 | After=network.target |
171 | |
172 | [Service] |
173 | ExecStart=/usr/bin/sks recon |
174 | User=sks |
175 | WorkingDirectory=/var/lib/sks |
176 | |
177 | [Install] |
178 | WantedBy=multi-user.target |