From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- net-misc/sks/Manifest | 3 +- .../sks/files/sks-1.1.6_p20200624-r1-db-hang.patch | 32 +++++ net-misc/sks/sks-1.1.6_p20200624-r1.ebuild | 133 +++++++++++++++++++++ net-misc/sks/sks-1.1.6_p20200624.ebuild | 132 -------------------- 4 files changed, 167 insertions(+), 133 deletions(-) create mode 100644 net-misc/sks/files/sks-1.1.6_p20200624-r1-db-hang.patch create mode 100644 net-misc/sks/sks-1.1.6_p20200624-r1.ebuild delete mode 100644 net-misc/sks/sks-1.1.6_p20200624.ebuild (limited to 'net-misc/sks') diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest index 9f011d0eddf3..0a51c3c63153 100644 --- a/net-misc/sks/Manifest +++ b/net-misc/sks/Manifest @@ -1,4 +1,5 @@ AUX sks-1.1.6_p20200624-QA-fixups.patch 1907 BLAKE2B ec655c5116f4d51df33ccff21dd7721be01e29e0822c5512ac8c033b215ecf3c92ea97e0f5aeae02343d5efbbba05c87c4ff28b994d0c3b7b8974210d9ca1984 SHA512 8b384f82df6348df31710de1e2c6fabc8979daee2bf6f83a87399f63adbbd4a40f7bb99247caba343b45eb30fdf2e4bbb3d769974003bda264c484f35b6c5974 +AUX sks-1.1.6_p20200624-r1-db-hang.patch 1083 BLAKE2B 1a6b12638f9b870bc3f6537c1e27e426ae75931160c876d1cc5fdf395bc07cc78788b87e1dc162a11032c5519826b6440fb0678fccf43fe5117f4a6ab0f2f3de SHA512 a5d120a3b28e2a49c7db294a5a31afb364c578a9ffd8c5802e4ae95925becaa4f702e3d83480c0915b0049ce63e18de5ebd114ff5827daba894c767f9a67f1f5 AUX sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch 2664 BLAKE2B 72395bae7dc4b6de6659de53ec766e04ba7707ee72fb910aea2ca36874b023920b5ad96391fa2ca6738224b23b334ec48d864d648e960d1ff049cd7c6ffea14c SHA512 6fa55c14a345b6d9d04cce3916d82e27aafe6d2a40d766269349ad952d0c5d07f858f7829656a6759618e38ac7c25e9d32426b86a197b4d8682dd8b371cb6088 AUX sks-db.initd 520 BLAKE2B aff93d88445deb50506d778ca3e81d65a7376d637ab998f9f4d896060355fb6489990e9fe8ac916582ac18d25b582ea9407b1c9d0783ac799ecc8050de75e85d SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6 AUX sks-db.service 174 BLAKE2B 7b41dd84e4284493ab1ce42a65da60ae24a95c016670516cbeaf22e6278922ef34daf9dbda14217377f12c831836a64b4e1a9b4868be41db834fa024a59be35b SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e @@ -6,5 +7,5 @@ AUX sks-recon.initd 583 BLAKE2B b3cab1745c0019f2cee5e771b2685ae72e68b428079f93fd AUX sks-recon.service 187 BLAKE2B 8dace8512685ea3581b8de941037b00a35c955e5ec2d35fd886a50e91f2b77fde591d5820705ddf1a9dea205de69a45d24bc920c3eb9bc08de7657668db0957a SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef AUX sks.confd 87 BLAKE2B d6bbbd08e452047c33eb2248135e68fa2c09fd3753118a5dde4431beff909e6270cf2f9d5e4679e12d69db33a5c6802b0729ff751663d4b040340cfaa8193918 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660 DIST sks-1.1.6_p20200624.tar.gz 213871 BLAKE2B d44dc73aa49bf1b1375acbb141dd7f62732866f87e48d25d0ed3fdae4e00f7ced42bef2fe73ea0a065772b8b33b7e9da14508b5d8591313566269c24bd9c1d6a SHA512 b0de7803afd61b45051daad67b2b63f9b4685c7820485326c63e053ce09f545ff0b9b8a91fb6543712c16e508ab20176d259c2fba3a47e0e75a862932954183a -EBUILD sks-1.1.6_p20200624.ebuild 3760 BLAKE2B 3c4d4c7643a2a946319d5cf0010157d9b8f891813fa0bee0e76d9449fe36f1e2350a103bdb935934022d2e42cdf76eab2eb28d0bebe54dc26f04d65697149e52 SHA512 83a815ef86e5922dd9527709977b0a6eed5641a7ad871c9c098052018de6cf4c09c8ddf51a907ec272f1f1cd01f5ae2b8905d09d6b1f35637a6bd9e37e9f339a +EBUILD sks-1.1.6_p20200624-r1.ebuild 3814 BLAKE2B bd1bdb7989169ced63abe908b7316a3c76c99f0a4cb883636cf4552829f91a18b54f2b35b40250b2a4a57cb212a902f1c44f76ced03e0ecc1757c44dd0c2a068 SHA512 ea7e5f6602834eaf8560eabcfcb34aebfc64e84ffa1c862e64d6bbeca7eb99d7d9402b36719911d60f7a46928f74c24aec2d757171fb84cbe7f9532e99913595 MISC metadata.xml 335 BLAKE2B ed092594d2ac680f616f62ce0081eee39d6863327bf39b3789662e49c551f59c163734b895cf42fdd8e618fd263a2b631366247ea0785a9ee058c0814df4cde5 SHA512 83db3889b38a7b5f4668c6527ab4a5fdca2bb8ccecef27090bd170a5ae5a44540f7b801133130a3a9c12b9f2f0f8af7731f41326eeb1a68b3115007d243ad0ff diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-r1-db-hang.patch b/net-misc/sks/files/sks-1.1.6_p20200624-r1-db-hang.patch new file mode 100644 index 000000000000..a09d55c1bb89 --- /dev/null +++ b/net-misc/sks/files/sks-1.1.6_p20200624-r1-db-hang.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/780141 +https://github.com/SKS-Keyserver/sks-keyserver/commit/c3ba6d5abb525dcb84745245631c410c11c07ec1.patch + +From c3ba6d5abb525dcb84745245631c410c11c07ec1 Mon Sep 17 00:00:00 2001 +From: ygrek +Date: Thu, 4 Feb 2021 15:31:02 -0500 +Subject: [PATCH] do not set DB_DBT_READONLY (fix #82) + +it is allowed only on keys, but sks is not using any bdb functions that +might mutate keys, so it is easier to just avoid using it altogether +--- + bdb/bdb_stubs.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/bdb/bdb_stubs.c b/bdb/bdb_stubs.c +index 864f0b2..959ee27 100644 +--- a/bdb/bdb_stubs.c ++++ b/bdb/bdb_stubs.c +@@ -58,13 +58,8 @@ static void dbt_from_string(DBT *dbt, value v) { + // uninitialized stack-allocated DBT + zerob(dbt, sizeof(*dbt)); + +- // Cast away the lack of const: we set DB_DBT_READONLY to +- // indicate to bdb that it shouldn't modify this buffer + dbt->data = (void *)String_val(v); + dbt->size = string_length(v); +-#ifdef DB_DBT_READONLY +- dbt->flags = DB_DBT_READONLY; +-#endif + } + + #if OCAML_VERSION < 40600 diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild new file mode 100644 index 000000000000..12939b3ef43a --- /dev/null +++ b/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit readme.gentoo-r1 systemd toolchain-funcs + +COMMIT="591a7834dc9f1dff3d336d769a6561138a5befe7" +DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization" +HOMEPAGE="https://github.com/SKS-Keyserver/sks-keyserver" +SRC_URI="https://github.com/SKS-Keyserver/sks-keyserver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-keyserver-${COMMIT}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~x86" +IUSE="optimize test" +RESTRICT="!test? ( test )" + +DOC_CONTENTS="To get sks running, first build the database, +start the database, import atleast one key, then +run a cleandb. See the sks man page for more information +Typical DB_CONFIG file and sksconf has been installed +in /var/lib/sks and can be used as templates by renaming +to remove the .typical extension. The DB_CONFIG file has +to be in place before doing the database build, or the BDB +environment has to be manually cleared from both KDB and PTree. +The same applies if you are upgrading to this version with an existing KDB/Ptree, +using another version of BDB than 4.8; you need to clear the environment +using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree +Additionally a sample web interface has been installed as +web.typical in /var/lib/sks that can be used by renaming it to web +Important: It is strongly recommended to set up SKS behind a +reverse proxy. Instructions on properly configuring SKS can be +found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering" + +RDEPEND=" + acct-user/sks + acct-group/sks + >=dev-lang/ocaml-4.0:= + dev-ml/camlp4:= + dev-ml/cryptokit:= + dev-ml/num:= + sys-libs/db:5.3 +" +DEPEND="${RDEPEND} + dev-ml/findlib" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch + "${FILESDIR}"/${PN}-1.1.6_p20200624-QA-fixups.patch + "${FILESDIR}"/${PN}-1.1.6_p20200624-r1-db-hang.patch +) + +QA_FLAGS_IGNORED=( + /usr/bin/sks_add_mail +) + +src_prepare() { + cp Makefile.local.unused Makefile.local || die + sed -i \ + -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \ + -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \ + -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \ + -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \ + -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \ + Makefile.local || die + sed -i \ + -e 's:/usr/sbin/sks:/usr/bin/sks:g' \ + sks_build.sh || die + + dosym sks_build.sh /usr/bin/sks_build.bc.sh + default +} + +src_compile() { + tc-export CC CXX RANLIB + + emake dep + # sks build fails with parallel build in module Bdb + emake -j1 all + if use optimize; then + emake all.bc + fi +} + +src_test() { + ./sks unit_test || die +} + +src_install() { + if use optimize; then + emake install.bc + dosym sks.bc usr/bin/sks + dosym sks_add_mail.bc usr/bin/sks_add_mail + else + emake install + fi + + dodoc README.md + + newinitd "${FILESDIR}/sks-db.initd" sks-db + newinitd "${FILESDIR}/sks-recon.initd" sks-recon + newconfd "${FILESDIR}/sks.confd" sks + systemd_dounit "${FILESDIR}"/sks-db.service + systemd_dounit "${FILESDIR}"/sks-recon.service + + dodir "/var/lib/sks/web.typical" + + insinto /var/lib/sks + fowners sks:sks /var/lib/sks + + newins sampleConfig/DB_CONFIG DB_CONFIG.typical + newins sampleConfig/sksconf.typical sksconf.typical + insinto /var/lib/sks/web.typical + doins sampleWeb/HTML5/* + + keepdir /var/lib/sks + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + + if [[ -n "${REPLACING_VERSIONS}" ]]; then + einfo "Note when upgrading from versions of SKS earlier than 1.1.4" + einfo "The default values for pagesize settings have changed. To continue" + einfo "using an existing DB without rebuilding, explicit settings have to be" + einfo "added to the sksconf file." + einfo "pagesize: 4" + einfo "ptree_pagesize: 1" + fi; +} diff --git a/net-misc/sks/sks-1.1.6_p20200624.ebuild b/net-misc/sks/sks-1.1.6_p20200624.ebuild deleted file mode 100644 index bb6bc66f7636..000000000000 --- a/net-misc/sks/sks-1.1.6_p20200624.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit readme.gentoo-r1 systemd toolchain-funcs - -COMMIT="591a7834dc9f1dff3d336d769a6561138a5befe7" -DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization" -HOMEPAGE="https://github.com/SKS-Keyserver/sks-keyserver" -SRC_URI="https://github.com/SKS-Keyserver/sks-keyserver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-keyserver-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="optimize test" -RESTRICT="!test? ( test )" - -DOC_CONTENTS="To get sks running, first build the database, -start the database, import atleast one key, then -run a cleandb. See the sks man page for more information -Typical DB_CONFIG file and sksconf has been installed -in /var/lib/sks and can be used as templates by renaming -to remove the .typical extension. The DB_CONFIG file has -to be in place before doing the database build, or the BDB -environment has to be manually cleared from both KDB and PTree. -The same applies if you are upgrading to this version with an existing KDB/Ptree, -using another version of BDB than 4.8; you need to clear the environment -using e.g. db4.6_recover -h . and db4.6_checkpoint -1h . in both KDB and PTree -Additionally a sample web interface has been installed as -web.typical in /var/lib/sks that can be used by renaming it to web -Important: It is strongly recommended to set up SKS behind a -reverse proxy. Instructions on properly configuring SKS can be -found at https://bitbucket.org/skskeyserver/sks-keyserver/wiki/Peering" - -RDEPEND=" - acct-user/sks - acct-group/sks - >=dev-lang/ocaml-4.0:= - dev-ml/camlp4:= - dev-ml/cryptokit:= - dev-ml/num:= - sys-libs/db:5.3 -" -DEPEND="${RDEPEND} - dev-ml/findlib" - -PATCHES=( - "${FILESDIR}/${PN}-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch" - "${FILESDIR}/${PN}-1.1.6_p20200624-QA-fixups.patch" -) - -QA_FLAGS_IGNORED=( - /usr/bin/sks_add_mail -) - -src_prepare() { - cp Makefile.local.unused Makefile.local || die - sed -i \ - -e "s:^BDBLIB=.*$:BDBLIB=-L/usr/$(get_libdir):g" \ - -e "s:^BDBINCLUDE=.*$:BDBINCLUDE=-I/usr/include/db5.3/:g" \ - -e "s:^LIBDB=.*$:LIBDB=-ldb-5.3:g" \ - -e "s:^PREFIX=.*$:PREFIX=${D}/usr:g" \ - -e "s:^MANDIR=.*$:MANDIR=${D}/usr/share/man:g" \ - Makefile.local || die - sed -i \ - -e 's:/usr/sbin/sks:/usr/bin/sks:g' \ - sks_build.sh || die - - dosym sks_build.sh /usr/bin/sks_build.bc.sh - default -} - -src_compile() { - tc-export CC CXX RANLIB - - emake dep - # sks build fails with parallel build in module Bdb - emake -j1 all - if use optimize; then - emake all.bc - fi -} - -src_test() { - ./sks unit_test || die -} - -src_install() { - if use optimize; then - emake install.bc - dosym sks.bc usr/bin/sks - dosym sks_add_mail.bc usr/bin/sks_add_mail - else - emake install - fi - - dodoc README.md - - newinitd "${FILESDIR}/sks-db.initd" sks-db - newinitd "${FILESDIR}/sks-recon.initd" sks-recon - newconfd "${FILESDIR}/sks.confd" sks - systemd_dounit "${FILESDIR}"/sks-db.service - systemd_dounit "${FILESDIR}"/sks-recon.service - - dodir "/var/lib/sks/web.typical" - - insinto /var/lib/sks - fowners sks:sks /var/lib/sks - - newins sampleConfig/DB_CONFIG DB_CONFIG.typical - newins sampleConfig/sksconf.typical sksconf.typical - insinto /var/lib/sks/web.typical - doins sampleWeb/HTML5/* - - keepdir /var/lib/sks - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n "${REPLACING_VERSIONS}" ]]; then - einfo "Note when upgrading from versions of SKS earlier than 1.1.4" - einfo "The default values for pagesize settings have changed. To continue" - einfo "using an existing DB without rebuilding, explicit settings have to be" - einfo "added to the sksconf file." - einfo "pagesize: 4" - einfo "ptree_pagesize: 1" - fi; -} -- cgit v1.2.3