diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /net-misc/sks | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'net-misc/sks')
-rw-r--r-- | net-misc/sks/Manifest | 5 | ||||
-rw-r--r-- | net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch | 72 | ||||
-rw-r--r-- | net-misc/sks/sks-1.1.6-r2.ebuild | 118 | ||||
-rw-r--r-- | net-misc/sks/sks-1.1.6_p20200624.ebuild | 4 |
4 files changed, 3 insertions, 196 deletions
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest index 6ca3ede511cd..9f011d0eddf3 100644 --- a/net-misc/sks/Manifest +++ b/net-misc/sks/Manifest @@ -1,4 +1,3 @@ -AUX sks-1.1.6-unbundle-cryptokit.patch 2051 BLAKE2B 6d9f7e499ab281f3f233fce5e8d7b18fdc05dd5f596a26c0fd2a09a9c3db846db0785c31141948e048853a947b300983757be92a5970b14ae6d3a41a41d084a2 SHA512 35428b0a6052c45e4fe03fce6474c70c8c3b72e3f611fe86ed3b6055018bbc8d90174ad07748ad42bff1f748eb6a334e09d1c64be7cd23722aa76e8e21d546f4 AUX sks-1.1.6_p20200624-QA-fixups.patch 1907 BLAKE2B ec655c5116f4d51df33ccff21dd7721be01e29e0822c5512ac8c033b215ecf3c92ea97e0f5aeae02343d5efbbba05c87c4ff28b994d0c3b7b8974210d9ca1984 SHA512 8b384f82df6348df31710de1e2c6fabc8979daee2bf6f83a87399f63adbbd4a40f7bb99247caba343b45eb30fdf2e4bbb3d769974003bda264c484f35b6c5974 AUX sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch 2664 BLAKE2B 72395bae7dc4b6de6659de53ec766e04ba7707ee72fb910aea2ca36874b023920b5ad96391fa2ca6738224b23b334ec48d864d648e960d1ff049cd7c6ffea14c SHA512 6fa55c14a345b6d9d04cce3916d82e27aafe6d2a40d766269349ad952d0c5d07f858f7829656a6759618e38ac7c25e9d32426b86a197b4d8682dd8b371cb6088 AUX sks-db.initd 520 BLAKE2B aff93d88445deb50506d778ca3e81d65a7376d637ab998f9f4d896060355fb6489990e9fe8ac916582ac18d25b582ea9407b1c9d0783ac799ecc8050de75e85d SHA512 60335298f05f9917a960b5759c4e45e0ecca53455a7cd8dc9181175bf75dc1916ce2f33663f342d7b6f5f3bfa6fc4cc41bbcdc94afcfc424e31189afd40193f6 @@ -6,8 +5,6 @@ AUX sks-db.service 174 BLAKE2B 7b41dd84e4284493ab1ce42a65da60ae24a95c016670516cb AUX sks-recon.initd 583 BLAKE2B b3cab1745c0019f2cee5e771b2685ae72e68b428079f93fdb79a8e75facbcf256dfdaff8ebf4f4f04885e0d0e52591cc0c3b1c0e0ed84fbd39c2f7ab8cd2bf4d SHA512 5d26e2196428a76bb454e2bf9e0d3813e96f894ef4f326650300874efb71a303eeb7267270327036da38960a8b68e420ce7e7e61cf21f7be85c80612c00a0f6c AUX sks-recon.service 187 BLAKE2B 8dace8512685ea3581b8de941037b00a35c955e5ec2d35fd886a50e91f2b77fde591d5820705ddf1a9dea205de69a45d24bc920c3eb9bc08de7657668db0957a SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef AUX sks.confd 87 BLAKE2B d6bbbd08e452047c33eb2248135e68fa2c09fd3753118a5dde4431beff909e6270cf2f9d5e4679e12d69db33a5c6802b0729ff751663d4b040340cfaa8193918 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660 -DIST sks-1.1.6.tgz 359499 BLAKE2B 6fb92aab93db8e19536db7df6a05bccc4c13a4859b8df8dba29da1bbfe854d65d5ed1b99d042f9f1509f07187810f25500513f2730a2c8fb579fdd4cd00c820c SHA512 f7c54194274834840b9701bf827b81add0f807dd4c6019968a6b0c755c9117519433ebb1161da38d23c465b163dd31a766700023afa13174e4dc82542fa98099 DIST sks-1.1.6_p20200624.tar.gz 213871 BLAKE2B d44dc73aa49bf1b1375acbb141dd7f62732866f87e48d25d0ed3fdae4e00f7ced42bef2fe73ea0a065772b8b33b7e9da14508b5d8591313566269c24bd9c1d6a SHA512 b0de7803afd61b45051daad67b2b63f9b4685c7820485326c63e053ce09f545ff0b9b8a91fb6543712c16e508ab20176d259c2fba3a47e0e75a862932954183a -EBUILD sks-1.1.6-r2.ebuild 3677 BLAKE2B 354a2b89fcab9050ba7551ecff8da54b5ab8011605e936157396cde5cda30855a341042a9654737b26722fba81964036be394b048d3360ad99a075c0b1145a39 SHA512 0b37213e24548699dec3874a7e2bb9185df65d701f67f13ec7584ecde220c32a95aa9b7012fe2dee2fcd8a7972541dd0c785a5b17daaca976c0ced61699e4c59 -EBUILD sks-1.1.6_p20200624.ebuild 3761 BLAKE2B 95d5e7e41d505c0ee5b8cc6fd555e4fe62bbce317c71ea71b44b5cd4ddcff1d9cf1db514a689aac4df42252edead5953eadb39dbc7513281dcbbf0a144e5b922 SHA512 5aeb17f34e1a52649c92565385d40ec892accf05f39e7fd0240c8ffa2f8d3eb6cc116bb5ab52448f3755280e25a86acb9f68c323255baa59c716ef9cda9b7bec +EBUILD sks-1.1.6_p20200624.ebuild 3760 BLAKE2B 3c4d4c7643a2a946319d5cf0010157d9b8f891813fa0bee0e76d9449fe36f1e2350a103bdb935934022d2e42cdf76eab2eb28d0bebe54dc26f04d65697149e52 SHA512 83a815ef86e5922dd9527709977b0a6eed5641a7ad871c9c098052018de6cf4c09c8ddf51a907ec272f1f1cd01f5ae2b8905d09d6b1f35637a6bd9e37e9f339a MISC metadata.xml 335 BLAKE2B ed092594d2ac680f616f62ce0081eee39d6863327bf39b3789662e49c551f59c163734b895cf42fdd8e618fd263a2b631366247ea0785a9ee058c0814df4cde5 SHA512 83db3889b38a7b5f4668c6527ab4a5fdca2bb8ccecef27090bd170a5ae5a44540f7b801133130a3a9c12b9f2f0f8af7731f41326eeb1a68b3115007d243ad0ff diff --git a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch deleted file mode 100644 index bf3d19010337..000000000000 --- a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Christoph Martin <christoph.martin@uni-mainz.de> -Date: Fri, 6 May 2016 14:55:01 -0400 -Subject: use system cryptokit - -Use the system cryptokit instead of the one shipped in upstream source ---- - Makefile | 31 ++----------------------------- - 1 file changed, 2 insertions(+), 29 deletions(-) - -diff --git a/Makefile b/Makefile -index 15ab3ea..eb56758 100644 ---- a/Makefile -+++ b/Makefile -@@ -55,7 +55,7 @@ WARNERR=-warn-error A - endif - - CAMLP4=-pp $(CAMLP4O) --CAMLINCLUDE= -I lib -I bdb -+CAMLINCLUDE= -I lib -I bdb -I +cryptokit - COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR) - OCAMLDEP=ocamldep $(CAMLP4) - CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma -@@ -109,7 +109,7 @@ ALLOBJS=$(ALLOBJS.bc:.cmo=.cmx) - - EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo - --LIBS.bc= lib/cryptokit.cma bdb/bdb.cma -+LIBS.bc= bdb/bdb.cma - LIBS=$(LIBS.bc:.cma=.cmxa) - - VERSION := $(shell cat VERSION) -@@ -280,32 +280,6 @@ prepared: - touch prepared - - --CKVER=cryptokit-1.7 --CKDIR=$(CKVER)/src -- --$(CKVER)/README.txt: -- tar xmvfz $(CKVER).tar.gz -- patch -p 0 < $(CKVER)-sks.patch -- patch -p 0 < $(CKVER)-sks-custom_compare.patch -- --$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt -- cd $(CKDIR) && $(MAKE) all -- --$(CKDIR)/cryptokit.cmxa: $(CKVER)/README.txt -- cd $(CKDIR) && $(MAKE) allopt -- --lib/cryptokit.cma: $(CKDIR)/cryptokit.cma $(CKDIR)/cryptokit.cmxa prepared -- cp $(CKDIR)/cryptokit.cmi $(CKDIR)/cryptokit.cma \ -- $(CKDIR)/cryptokit.mli lib -- cp $(CKDIR)/libcryptokit.a lib -- if test -f $(CKDIR)/dllcryptokit.so; then \ -- cp $(CKDIR)/dllcryptokit.so lib; fi -- if test -f $(CKDIR)/cryptokit.cmxa; then \ -- cp $(CKDIR)/cryptokit.cmxa $(CKDIR)/cryptokit.cmx \ -- $(CKDIR)/cryptokit.a lib; fi -- --lib/cryptokit.cmxa: lib/cryptokit.cma -- - ################################ - # old stuff - ################################ -@@ -404,7 +378,6 @@ clean: mlclean - - cleanall: clean bdbclean - rm -f lib/* -- rm -rf $(CKVER) - - distclean: cleanall - rm -rf Makefile.local diff --git a/net-misc/sks/sks-1.1.6-r2.ebuild b/net-misc/sks/sks-1.1.6-r2.ebuild deleted file mode 100644 index 0f55ebd8306c..000000000000 --- a/net-misc/sks/sks-1.1.6-r2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit multilib user readme.gentoo-r1 systemd - -DESCRIPTION="An OpenPGP keyserver which is decentralized with highly reliable synchronization" -HOMEPAGE="https://bitbucket.org/skskeyserver/sks-keyserver" -SRC_URI="https://bitbucket.org/skskeyserver/sks-keyserver/downloads/${P}.tgz" -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" - -DEPEND=">=dev-lang/ocaml-4.0:= - dev-ml/findlib - dev-ml/camlp4 - dev-ml/cryptokit:0/1.10 - sys-libs/db:5.3" -RDEPEND="${DEPEND}" - -pkg_setup() { - ebegin "Creating named group and user" - enewgroup sks - enewuser sks -1 -1 /var/lib/sks sks -} - -src_prepare() { - eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" - 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:^CAMLINCLUDE= -I lib -I bdb$:CAMLINCLUDE= -I lib -I bdb -I +cryptokit:g' \ - -e 's:-Werror-implicit-function-declaration::g' \ - Makefile bdb/Makefile || die - sed -i \ - -e 's:/usr/sbin/sks:/usr/bin/sks:g' \ - sks_build.sh || die - eapply_user -} - -src_compile() { - emake dep - # sks build fails with paralell 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 /usr/bin/sks.bc usr/bin/sks - dosym /usr/bin/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 - 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 index 7c9d13994f7d..bb6bc66f7636 100644 --- a/net-misc/sks/sks-1.1.6_p20200624.ebuild +++ b/net-misc/sks/sks-1.1.6_p20200624.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-keyserver-${COMMIT}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="optimize test" RESTRICT="!test? ( test )" |