a few improvements
Bernd Wurst commited on 2010-04-01 10:56:22
Zeige 5 geänderte Dateien mit 52 Einfügungen und 29 Löschungen.
- app-crypt/sks/Manifest 138d807..d16b7db
- app-crypt/sks/files/sks.confd 0000000..d9ce47e
- app-crypt/sks/files/sks.init 08ea079..0000000
- app-crypt/sks/files/sks.initd 0000000..8979daf
- app-crypt/sks/sks-1.1.1.ebuild 59507aa..86b9152
| ... | ... |
@@ -1,3 +1,4 @@ |
| 1 |
-AUX sks.init 334 RMD160 dbd4b530002fa08af9476ca792a4a1b7dfc9d2c6 SHA1 edfaa81cf89e7ea1ace517600b4a422a5d95e883 SHA256 fa6165990286b0fc521b17c16f5fa7b8d16f69bbbc6ccc36c78acc43533ae1f6 |
|
| 1 |
+AUX sks.confd 195 RMD160 1b91b333fdccc0788a9c9e0ddace55c443d4766f SHA1 8b719db98d814e1d599e757cb3c8e2ea9971c565 SHA256 282ef385f5d0988c3590d82dd38499ca881957b7b288311064e0682bb10916da |
|
| 2 |
+AUX sks.initd 824 RMD160 c40b3ecc637dc84d36939ba48a9299ea4911a0d2 SHA1 5a8bb6ec8e1a3a0c461cd51df7ca3c016c4f45bb SHA256 440096d88619470a06bcd8f501e6691b29669c038c0b68669d2c913ee5307ae1 |
|
| 2 | 3 |
DIST sks-1.1.1.tgz 273833 RMD160 93926ba70366cdd88e07d21091e1c516a4dda701 SHA1 692d731eccf127fbb5c131d41edba29c5d1422cb SHA256 3cad29126e2d0cd904e9c92b0393ee4756f40916af33346bc5075b836fea8362 |
| 3 |
-EBUILD sks-1.1.1.ebuild 848 RMD160 2b037b3c3187467bea54d51c811db5f660c2339a SHA1 533cea1a5458644a15e60538b1205dc900bc1b89 SHA256 b3d317e0d7262d44c32db99846a3086070d812af69289888c21cf9d6a081a536 |
|
| 4 |
+EBUILD sks-1.1.1.ebuild 1100 RMD160 55b9fed76471176d07daf25b93c1cb632ada1fa2 SHA1 d0cbdddbeda3215b5aef11304b70d38ee60bb559 SHA256 3844aac78e6bcc2887f1eaba904935ea12852da01051f0755460311af2137e17 |
| ... | ... |
@@ -1,21 +0,0 @@ |
| 1 |
-#!/sbin/runscript |
|
| 2 |
- |
|
| 3 |
-opts="start stop" |
|
| 4 |
- |
|
| 5 |
-depend() {
|
|
| 6 |
- use dns net |
|
| 7 |
- provide keyserver |
|
| 8 |
-} |
|
| 9 |
- |
|
| 10 |
-start() {
|
|
| 11 |
- ebegin "Starting sks keyserver" |
|
| 12 |
- start-stop-daemon --start --quiet --exec /usr/sbin/sks -- -p |
|
| 13 |
- eend $? |
|
| 14 |
-} |
|
| 15 |
- |
|
| 16 |
-stop() {
|
|
| 17 |
- ebegin "Shutting down sks keyserver" |
|
| 18 |
- start-stop-daemon --quiet --stop --pidfile /var/run/sks.pid |
|
| 19 |
- eend $? |
|
| 20 |
-} |
|
| 21 |
- |
| ... | ... |
@@ -0,0 +1,32 @@ |
| 1 |
+#!/sbin/runscript |
|
| 2 |
+ |
|
| 3 |
+opts="start stop" |
|
| 4 |
+ |
|
| 5 |
+depend() {
|
|
| 6 |
+ need net |
|
| 7 |
+ use dns |
|
| 8 |
+} |
|
| 9 |
+ |
|
| 10 |
+start() {
|
|
| 11 |
+ OPTS="" |
|
| 12 |
+ if [ -n "${SKSUSER}" ] ; then
|
|
| 13 |
+ OPTS="${OPTS} --chuid ${SKSUSER}"
|
|
| 14 |
+ fi |
|
| 15 |
+ if [ -n "${SKSDIR}" ] ; then
|
|
| 16 |
+ OPTS="${OPTS} --chdir ${SKSDIR}"
|
|
| 17 |
+ fi |
|
| 18 |
+ ebegin "Starting sks keyserver (sks db)" |
|
| 19 |
+ start-stop-daemon --start --background ${OPTS} --exec /usr/bin/sks --pidfile /var/run/sks-db.pid --make-pidfile -- db
|
|
| 20 |
+ ebegin "Starting sks keyserver syncer (sks recon)" |
|
| 21 |
+ start-stop-daemon --start ${OPTS} --background --exec /usr/bin/sks --pidfile /var/run/sks-recon.pid --make-pidfile -- recon
|
|
| 22 |
+ eend $? |
|
| 23 |
+} |
|
| 24 |
+ |
|
| 25 |
+stop() {
|
|
| 26 |
+ ebegin "Shutting down sks keyserver" |
|
| 27 |
+ start-stop-daemon --stop --pidfile /var/run/sks-db.pid |
|
| 28 |
+ ebegin "Shutting down sks keyserver syncer" |
|
| 29 |
+ start-stop-daemon --stop --pidfile /var/run/sks-recon.pid |
|
| 30 |
+ eend $? |
|
| 31 |
+} |
|
| 32 |
+ |
| ... | ... |
@@ -2,8 +2,6 @@ |
| 2 | 2 |
# Distributed under the terms of the GNU General Public License v2 |
| 3 | 3 |
# $Header: $ |
| 4 | 4 |
|
| 5 |
-inherit eutils |
|
| 6 |
- |
|
| 7 | 5 |
EAPI="2" |
| 8 | 6 |
|
| 9 | 7 |
DESCRIPTION="Synchronizing Key Server, a PGP keyserver written in OCAML" |
| ... | ... |
@@ -16,21 +14,29 @@ KEYWORDS="~amd64 ~x86" |
| 16 | 14 |
IUSE="" |
| 17 | 15 |
|
| 18 | 16 |
DEPEND="=dev-lang/ocaml-3.10.2 \ |
| 19 |
- sys-libs/db:4.6" |
|
| 17 |
+ sys-libs/db" |
|
| 20 | 18 |
RDEPEND="${DEPEND}"
|
| 21 | 19 |
|
| 22 | 20 |
|
| 23 | 21 |
src_compile() {
|
| 22 |
+ # compilation breaks with parallel making |
|
| 24 | 23 |
MAKEOPTS="${MAKEOPTS} -j1"
|
| 25 |
- echo -e 'LIBDB=-ldb-4.7\nexport LIBDB' > "${WORKDIR}/${P}/Makefile.local"
|
|
| 26 |
- #sed -i -e 's/LIBDB=-ldb-4\.6/LIBDB=-ldb-4.7/' "${WORKDIR}/${P}/bdb/Makefile"
|
|
| 24 |
+ |
|
| 25 |
+ # find out DB-major-version and configure Makefile.local to use it |
|
| 26 |
+ BDBVER="$(best_version sys-libs/db|sed -e 's_^sys-libs/db-\(.\..\).*$_\1_')" |
|
| 27 |
+ einfo "using sys-libs/db-${BDBVER}"
|
|
| 28 |
+ echo -e "LIBDB=-ldb-${BDBVER}\nexport LIBDB" > "${WORKDIR}/${P}/Makefile.local"
|
|
| 29 |
+ |
|
| 27 | 30 |
emake dep || die "make dep failed" |
| 28 | 31 |
emake all || die "make all failed" |
| 29 | 32 |
} |
| 30 | 33 |
|
| 31 | 34 |
src_install() {
|
| 35 |
+ # Makefile does not respect DESTDIR, so we must set up the needed variables |
|
| 32 | 36 |
emake "PREFIX=${D}/usr" "MANDIR=${D}/usr/share/man" install || die
|
| 33 |
- newinitd "${FILESDIR}"/sks.init sks
|
|
| 37 |
+ |
|
| 38 |
+ newinitd "${FILESDIR}"/sks.initd sks
|
|
| 39 |
+ newconfd "${FILESDIR}"/sks.confd sks
|
|
| 34 | 40 |
} |
| 35 | 41 |
|
| 36 | 42 |
|
| 37 | 43 |