Gentoo Archives: gentoo-commits

From: "Manuel Rueger (mrueg)" <mrueg@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/sks: metadata.xml sks-1.1.4.ebuild ChangeLog
Date: Fri, 22 Nov 2013 02:35:50
Message-Id: 20131122023545.ECE1E2004F@flycatcher.gentoo.org
1 mrueg 13/11/22 02:35:45
2
3 Modified: metadata.xml ChangeLog
4 Added: sks-1.1.4.ebuild
5 Log:
6 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.
7
8 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key )
9
10 Revision Changes Path
11 1.5 net-misc/sks/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/metadata.xml?rev=1.5&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/metadata.xml?rev=1.5&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/metadata.xml?r1=1.4&r2=1.5
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-misc/sks/metadata.xml,v
20 retrieving revision 1.4
21 retrieving revision 1.5
22 diff -u -r1.4 -r1.5
23 --- metadata.xml 20 Dec 2012 21:28:08 -0000 1.4
24 +++ metadata.xml 22 Nov 2013 02:35:45 -0000 1.5
25 @@ -1,13 +1,21 @@
26 <?xml version="1.0" encoding="UTF-8"?>
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 + <herd>proxy-maintainers</herd>
30 <maintainer>
31 - <email>maintainer-needed@g.o</email>
32 + <email>kf@××××××××××××××××.com</email>
33 + <name>Kristian Fiskerstrand</name>
34 + <description>Maintainer, assign bugs to him</description>
35 + </maintainer>
36 + <maintainer>
37 + <email>mrueg@g.o</email>
38 + <name>Manuel Rüger</name>
39 + <description>Proxy-Maintainer, CC him on bugs</description>
40 </maintainer>
41 <use>
42 <flag name="optimize">Enables bytecode optimization</flag>
43 </use>
44 <upstream>
45 - <remote-id type="google-code">sks-keyserver</remote-id>
46 + <remote-id type="bitbucket">skskeyserver/sks-keyserver</remote-id>
47 </upstream>
48 </pkgmetadata>
49
50
51
52 1.7 net-misc/sks/ChangeLog
53
54 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/ChangeLog?rev=1.7&view=markup
55 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/ChangeLog?rev=1.7&content-type=text/plain
56 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/ChangeLog?r1=1.6&r2=1.7
57
58 Index: ChangeLog
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v
61 retrieving revision 1.6
62 retrieving revision 1.7
63 diff -u -r1.6 -r1.7
64 --- ChangeLog 20 Dec 2012 21:28:08 -0000 1.6
65 +++ ChangeLog 22 Nov 2013 02:35:45 -0000 1.7
66 @@ -1,6 +1,16 @@
67 # ChangeLog for net-misc/sks
68 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
69 -# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.6 2012/12/20 21:28:08 pacho Exp $
70 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
71 +# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.7 2013/11/22 02:35:45 mrueg Exp $
72 +
73 +*sks-1.1.4 (22 Nov 2013)
74 +
75 + 22 Nov 2013; Manuel Rüger <mrueg@g.o>
76 + +files/sks-1.1.4-ECC_OID_fix_x86.patch, +files/sks-db.initd,
77 + +files/sks-db.service, +files/sks-recon.initd, +files/sks-recon.service,
78 + +files/sks.confd, +sks-1.1.4.ebuild, metadata.xml:
79 + Version bump. Add initd scripts and systemd unit files by Emery Hemingway.
80 + Fixes bug #427030. Add Kristian Fiskerstrand as maintainer and proxy-
81 + maintainers as herd.
82
83 20 Dec 2012; Pacho Ramos <pacho@g.o> metadata.xml:
84 Drop maintainer as talked with him
85
86
87
88 1.1 net-misc/sks/sks-1.1.4.ebuild
89
90 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/sks-1.1.4.ebuild?rev=1.1&view=markup
91 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/sks/sks-1.1.4.ebuild?rev=1.1&content-type=text/plain
92
93 Index: sks-1.1.4.ebuild
94 ===================================================================
95 # Copyright 1999-2013 Gentoo Foundation
96 # Distributed under the terms of the GNU General Public License v2
97 # $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.4.ebuild,v 1.1 2013/11/22 02:35:45 mrueg Exp $
98
99 EAPI=5
100
101 inherit eutils multilib user readme.gentoo systemd
102
103 DESCRIPTION="An OpenPGP keyserver which is decentralized and provides highly reliable synchronization"
104 HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver"
105 SRC_URI="http://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz"
106 LICENSE="GPL-2"
107 SLOT="0"
108 KEYWORDS="~amd64 ~x86"
109 IUSE="optimize test"
110 DOC_CONTENTS="To get sks running, first build the database,
111 start the databse, import atleast one key, then
112 run a cleandb. See the sks man page for more information
113 Typical DB_CONFIG file and sksconf has been installed
114 in /var/lib/sks and can be used as templates by renaming
115 to remove the .typical extension. The DB_CONFIG file has
116 to be in place before doing the database build, or the BDB
117 environment has to be manually cleared from both KDB and PTree.
118 The same applies if you are upgrading to this version with an existing KDB/Ptree,
119 using another version of BDB than 4.8; you need to clear the environment
120 using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree
121 Additionally a sample web interface has been installed as
122 web.typical in /var/lib/sks that can be used by renaming it to web
123 Important: It is strongly recommended to set up SKS behind a
124 reverse proxy. Instructions on properly configuring SKS can be
125 found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering"
126
127 DEPEND="dev-lang/ocaml
128 dev-ml/cryptokit
129 sys-libs/db:4.8"
130 RDEPEND="${DEPEND}"
131
132 pkg_setup() {
133 ebegin "Creating named group and user"
134 enewgroup sks
135 enewuser sks -1 -1 /var/lib/sks sks
136 }
137
138 src_prepare() {
139 epatch "${FILESDIR}/${P}-ECC_OID_fix_x86.patch"
140
141 cp Makefile.local.unused Makefile.local || die
142 sed -i \
143 -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \
144 -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db4.8/:g" \
145 -e "s:^LIBDB=.*$:LIBDB=-ldb-4.8:g" \
146 -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \
147 -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \
148 Makefile.local || die
149 sed -i \
150 -e 's:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \
151 -e 's:-Werror-implicit-function-declaration::g' \
152 Makefile bdb/Makefile || die
153 sed -i \
154 -e 's:/usr/sbin/sks:/usr/bin/sks:g' \
155 sks_build.sh || die
156 }
157
158 src_compile() {
159 emake dep
160 # sks build fails with paralell build in module Bdb
161 emake -j1 all
162 if use optimize; then
163 emake all.bc
164 fi
165 }
166
167 src_test() {
168 ./sks unit_test || die
169 }
170
171 src_install() {
172 if use optimize; then
173 emake install.bc
174 dosym /usr/bin/sks.bc usr/bin/sks
175 dosym /usr/bin/sks_add_mail.bc usr/bin/sks_add_mail
176 else
177 emake install
178 fi
179
180 dodoc README.md
181
182 newinitd "${FILESDIR}/sks-db.initd" sks-db
183 newinitd "${FILESDIR}/sks-recon.initd" sks-recon
184 newconfd "${FILESDIR}/sks.confd" sks
185 systemd_dounit "${FILESDIR}/sks-db.service"
186 systemd_dounit "${FILESDIR}/sks-recon.service"
187
188 dodir "/var/lib/sks/web.typical"
189 insinto /var/lib/sks
190 newins sampleConfig/DB_CONFIG DB_CONFIG.typical
191 newins sampleConfig/sksconf.typical sksconf.typical
192 insinto /var/lib/sks/web.typical
193 doins sampleWeb/HTML5/*
194
195 keepdir /var/lib/sks
196 }
197
198 pkg_postinst() {
199 readme.gentoo_print_elog
200
201 if [[ -n ${REPLACING_VERSIONS} ]]; then
202 einfo "Note when upgrading from earlier versions of SKS"
203 einfo "The default values for pagesize settings have changed. To continue"
204 einfo "using an existing DB without rebuilding, explicit settings have to be"
205 einfo "added to the sksconf file."
206 einfo "pagesize: 4"
207 einfo "ptree_pagesize: 1"
208 fi;
209 }