Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/
Date: Thu, 08 Oct 2020 22:41:52
Message-Id: 1602196890.2a2b43460a172a3e31d3fc3a295501ec93aa23a5.sam@gentoo
1 commit: 2a2b43460a172a3e31d3fc3a295501ec93aa23a5
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 8 22:41:30 2020 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 8 22:41:30 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2b4346
7
8 net-misc/sks: cleanup old
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 net-misc/sks/sks-1.1.6-r4.ebuild | 115 -------------------------------------
14 net-misc/sks/sks-1.1.6-r5.ebuild | 119 ---------------------------------------
15 2 files changed, 234 deletions(-)
16
17 diff --git a/net-misc/sks/sks-1.1.6-r4.ebuild b/net-misc/sks/sks-1.1.6-r4.ebuild
18 deleted file mode 100644
19 index 89cc2ec999a..00000000000
20 --- a/net-misc/sks/sks-1.1.6-r4.ebuild
21 +++ /dev/null
22 @@ -1,115 +0,0 @@
23 -# Copyright 1999-2019 Gentoo Authors
24 -# Distributed under the terms of the GNU General Public License v2
25 -
26 -EAPI=6
27 -
28 -inherit multilib user readme.gentoo-r1 systemd
29 -
30 -DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
31 -HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
32 -SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
33 -LICENSE="GPL-2"
34 -SLOT="0"
35 -KEYWORDS="~amd64 ~x86"
36 -IUSE="optimize test"
37 -RESTRICT="!test? ( test )"
38 -DOC_CONTENTS="To get sks running, first build the database,
39 -start the database, import atleast one key, then
40 -run a cleandb. See the sks man page for more information
41 -Typical DB_CONFIG file and sksconf has been installed
42 -in /var/lib/sks and can be used as templates by renaming
43 -to remove the .typical extension. The DB_CONFIG file has
44 -to be in place before doing the database build, or the BDB
45 -environment has to be manually cleared from both KDB and PTree.
46 -The same applies if you are upgrading to this version with an existing KDB/Ptree,
47 -using another version of BDB than 4.8; you need to clear the environment
48 -using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
49 -Additionally a sample web interface has been installed as
50 -web.typical in /var/lib/sks that can be used by renaming it to web
51 -Important: It is strongly recommended to set up SKS behind a
52 -reverse proxy. Instructions on properly configuring SKS can be
53 -found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
54 -
55 -RDEPEND=">=dev-lang/ocaml-4.0:=
56 - dev-ml/camlp4:=
57 - dev-ml/cryptokit:=
58 - sys-libs/db:5.3"
59 -DEPEND="${RDEPEND}
60 - dev-ml/findlib"
61 -
62 -pkg_setup() {
63 - ebegin "Creating named group and user"
64 - enewgroup sks
65 - enewuser sks -1 -1 /var/lib/sks sks
66 -}
67 -
68 -src_prepare() {
69 - eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
70 - "${FILESDIR}/${P}-use-ocamlfind.patch"
71 - cp Makefile.local.unused Makefile.local || die
72 - sed -i \
73 - -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
74 - -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
75 - -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
76 - -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
77 - -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
78 - Makefile.local || die
79 - sed -i \
80 - -e 's:/usr/sbin/sks:/usr/bin/sks:g' \
81 - sks_build.sh || die
82 - eapply_user
83 -}
84 -
85 -src_compile() {
86 - emake dep
87 - # sks build fails with paralell build in module Bdb
88 - emake -j1 all
89 - if use optimize; then
90 - emake all.bc
91 - fi
92 -}
93 -
94 -src_test() {
95 - ./sks unit_test || die
96 -}
97 -
98 -src_install() {
99 - if use optimize; then
100 - emake install.bc
101 - dosym /usr/bin/sks.bc usr/bin/sks
102 - dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
103 - else
104 - emake install
105 - fi
106 -
107 - dodoc README.md
108 -
109 - newinitd "${FILESDIR}/sks-db.initd" sks-db
110 - newinitd "${FILESDIR}/sks-recon.initd" sks-recon
111 - newconfd "${FILESDIR}/sks.confd" sks
112 - systemd_dounit "${FILESDIR}"/sks-db.service
113 - systemd_dounit "${FILESDIR}"/sks-recon.service
114 -
115 - dodir "/var/lib/sks/web.typical"
116 - insinto /var/lib/sks
117 - newins sampleConfig/DB_CONFIG DB_CONFIG.typical
118 - newins sampleConfig/sksconf.typical sksconf.typical
119 - insinto /var/lib/sks/web.typical
120 - doins sampleWeb/HTML5/*
121 -
122 - keepdir /var/lib/sks
123 - readme.gentoo_create_doc
124 -}
125 -
126 -pkg_postinst() {
127 - readme.gentoo_print_elog
128 -
129 - if [[ -n ${REPLACING_VERSIONS} ]]; then
130 - einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
131 - einfo "The default values for pagesize settings have changed. To continue"
132 - einfo "using an existing DB without rebuilding, explicit settings have to be"
133 - einfo "added to the sksconf file."
134 - einfo "pagesize: 4"
135 - einfo "ptree_pagesize: 1"
136 - fi;
137 -}
138
139 diff --git a/net-misc/sks/sks-1.1.6-r5.ebuild b/net-misc/sks/sks-1.1.6-r5.ebuild
140 deleted file mode 100644
141 index f47c3888abe..00000000000
142 --- a/net-misc/sks/sks-1.1.6-r5.ebuild
143 +++ /dev/null
144 @@ -1,119 +0,0 @@
145 -# Copyright 1999-2020 Gentoo Authors
146 -# Distributed under the terms of the GNU General Public License v2
147 -
148 -EAPI=6
149 -
150 -inherit multilib user readme.gentoo-r1 systemd
151 -
152 -DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization"
153 -HOMEPAGE="https://github.com/SKS-Keyserver/sks-keyserver"
154 -SRC_URI="https://github.com/SKS-Keyserver/sks-keyserver/releases/download/${PV}/${P}.tgz"
155 -LICENSE="GPL-2"
156 -SLOT="0"
157 -KEYWORDS="~amd64 ~x86"
158 -IUSE="optimize test"
159 -RESTRICT="!test? ( test )"
160 -DOC_CONTENTS="To get sks running, first build the database,
161 -start the database, import atleast one key, then
162 -run a cleandb. See the sks man page for more information
163 -Typical DB_CONFIG file and sksconf has been installed
164 -in /var/lib/sks and can be used as templates by renaming
165 -to remove the .typical extension. The DB_CONFIG file has
166 -to be in place before doing the database build, or the BDB
167 -environment has to be manually cleared from both KDB and PTree.
168 -The same applies if you are upgrading to this version with an existing KDB/Ptree,
169 -using another version of BDB than 4.8; you need to clear the environment
170 -using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
171 -Additionally a sample web interface has been installed as
172 -web.typical in /var/lib/sks that can be used by renaming it to web
173 -Important: It is strongly recommended to set up SKS behind a
174 -reverse proxy. Instructions on properly configuring SKS can be
175 -found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
176 -
177 -RDEPEND=">=dev-lang/ocaml-4.0:=
178 - dev-ml/camlp4:=
179 - dev-ml/cryptokit:=
180 - sys-libs/db:5.3"
181 -DEPEND="${RDEPEND}
182 - dev-ml/findlib"
183 -
184 -pkg_setup() {
185 - ebegin "Creating named group and user"
186 - enewgroup sks
187 - enewuser sks -1 -1 /var/lib/sks sks
188 -}
189 -
190 -src_prepare() {
191 - eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \
192 - "${FILESDIR}/${P}-use-ocamlfind.patch" \
193 - "${FILESDIR}/${P}-use-ocamlfind2.patch" \
194 - "${FILESDIR}/${P}-use-ocamlfind3.patch"
195 -
196 - cp Makefile.local.unused Makefile.local || die
197 - sed -i \
198 - -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
199 - -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \
200 - -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \
201 - -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
202 - -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
203 - Makefile.local || die
204 - sed -i \
205 - -e 's:/usr/sbin/sks:/usr/bin/sks:g' \
206 - sks_build.sh || die
207 - dosym /usr/bin/sks_build.sh /usr/bin/sks_build.bc.sh
208 - eapply_user
209 -}
210 -
211 -src_compile() {
212 - emake dep
213 - # sks build fails with paralell build in module Bdb
214 - emake -j1 all
215 - if use optimize; then
216 - emake all.bc
217 - fi
218 -}
219 -
220 -src_test() {
221 - ./sks unit_test || die
222 -}
223 -
224 -src_install() {
225 - if use optimize; then
226 - emake install.bc
227 - dosym /usr/bin/sks.bc usr/bin/sks
228 - dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
229 - else
230 - emake install
231 - fi
232 -
233 - dodoc README.md
234 -
235 - newinitd "${FILESDIR}/sks-db.initd" sks-db
236 - newinitd "${FILESDIR}/sks-recon.initd" sks-recon
237 - newconfd "${FILESDIR}/sks.confd" sks
238 - systemd_dounit "${FILESDIR}"/sks-db.service
239 - systemd_dounit "${FILESDIR}"/sks-recon.service
240 -
241 - dodir "/var/lib/sks/web.typical"
242 - insinto /var/lib/sks
243 - newins sampleConfig/DB_CONFIG DB_CONFIG.typical
244 - newins sampleConfig/sksconf.typical sksconf.typical
245 - insinto /var/lib/sks/web.typical
246 - doins sampleWeb/HTML5/*
247 -
248 - keepdir /var/lib/sks
249 - readme.gentoo_create_doc
250 -}
251 -
252 -pkg_postinst() {
253 - readme.gentoo_print_elog
254 -
255 - if [[ -n ${REPLACING_VERSIONS} ]]; then
256 - einfo "Note when upgrading from versions of SKS earlier than 1.1.4"
257 - einfo "The default values for pagesize settings have changed. To continue"
258 - einfo "using an existing DB without rebuilding, explicit settings have to be"
259 - einfo "added to the sksconf file."
260 - einfo "pagesize: 4"
261 - einfo "ptree_pagesize: 1"
262 - fi;
263 -}