diff options
Diffstat (limited to 'net-misc/sks')
| -rw-r--r-- | net-misc/sks/Manifest | 11 | ||||
| -rw-r--r-- | net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch | 39 | ||||
| -rw-r--r-- | net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch | 19 | ||||
| -rw-r--r-- | net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch | 21 | ||||
| -rw-r--r-- | net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch | 71 | ||||
| -rw-r--r-- | net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch | 81 | ||||
| -rw-r--r-- | net-misc/sks/metadata.xml | 2 | ||||
| -rw-r--r-- | net-misc/sks/sks-1.1.6-r4.ebuild | 115 | ||||
| -rw-r--r-- | net-misc/sks/sks-1.1.6_p20200624.ebuild (renamed from net-misc/sks/sks-1.1.6-r5.ebuild) | 59 |
9 files changed, 194 insertions, 224 deletions
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest index a2d499dd22ca..6ca3ede511cd 100644 --- a/net-misc/sks/Manifest +++ b/net-misc/sks/Manifest @@ -1,14 +1,13 @@ AUX sks-1.1.6-unbundle-cryptokit.patch 2051 BLAKE2B 6d9f7e499ab281f3f233fce5e8d7b18fdc05dd5f596a26c0fd2a09a9c3db846db0785c31141948e048853a947b300983757be92a5970b14ae6d3a41a41d084a2 SHA512 35428b0a6052c45e4fe03fce6474c70c8c3b72e3f611fe86ed3b6055018bbc8d90174ad07748ad42bff1f748eb6a334e09d1c64be7cd23722aa76e8e21d546f4 -AUX sks-1.1.6-use-ocamlfind.patch 1259 BLAKE2B 1c1539612b70ad0f35478bd8952926b7bd9bb8d9864fa9964668e315a4488a9ecb8debbecb8892566abd83a081175aba0335d01de4885421c018c3cc52430aad SHA512 7fff2dbcad7f3c73e53b99d856cb1da52125e5dc51b84959be9ddc555dc34e1e39a049aa3946f350a15d9a5ed74f4bc0a58f2ea3523c4cc3675bf3901db11238 -AUX sks-1.1.6-use-ocamlfind2.patch 671 BLAKE2B 04c36f4f2955b7f3256fed668f945966cdddf8f67054031589bf1efedb486ca03b4746269ff314571fff32013613b45d751bb0b9cd0605c1ec808cfc3fc29bdb SHA512 555a688be1e4bb1c7fb2e1bbeb4661e6dd0bc04d94a2ff3c5a12e7979549efc79531ee8cba01f6150610b633cce20072367a42eda2870f0755adf69b24cfaa7f -AUX sks-1.1.6-use-ocamlfind3.patch 665 BLAKE2B 011922893b145d2d619e93ec3baf5117e0273289256228b895c54f9ef48300ef524640faec5f037393ab7f3880774a306b0033d03e545874a9f14f6d8523591b SHA512 cae267036bbe65701f06a1aec4f3cfb30d7a8f5bd8859d8eaa73b2d66438b5fe0c6ceb42cc810951dd4233b0b162091dcfd760ff9c22b3a3e39ed99e239ca13a +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 AUX sks-db.service 174 BLAKE2B 7b41dd84e4284493ab1ce42a65da60ae24a95c016670516cbeaf22e6278922ef34daf9dbda14217377f12c831836a64b4e1a9b4868be41db834fa024a59be35b SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e 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-r4.ebuild 3546 BLAKE2B 8be2010b861536d6ac2307648728e54e5d2b9cc254252ffc3d88de1ef93cf38fa4bbd4a512ccf75378987319bddf142e8d91a2d656191f1f15904e9aae38a372 SHA512 2dbc5eb84b4d4b00c6ec2b01bd7f2323ab916337f9bdf10f06ba9b7d500c4b64b4625613cbd3e1755275ff44ff85d366c824b42fa51c18b88ef6985a537f8cce -EBUILD sks-1.1.6-r5.ebuild 3689 BLAKE2B 5b1b9cb2b694b8e8415e29e93c0276d42e81f22873c721f67676a82f5da3de0d4b4026e72fd9275f70d2e3375ac974ac6a5597317d43c54654678600b4277afc SHA512 b9f0db5da7805b6748ca118c3feaf88f84ab1fa8a12ad7cf6d47547557a414d8240398577b5e6beaf8d2d08ea0a1c02f34685a1071c1a72df2a1b9c528830580 -MISC metadata.xml 337 BLAKE2B 136350a55fd572e1bec89457974f2d2722af1a74ae710bab541f1979d3294e6f44b1519e13ddcba242807d6d2f96ac11071126facdec62597d3201327e84e7f9 SHA512 977596797db2915f728f8c6661a5c90a3348691b357f0e2c9ddab662cc50bd8e426bc35f14e9a8ffa3ad6938fc206859e865fd9f4f6a02f45f377a1adec7d38b +EBUILD sks-1.1.6_p20200624.ebuild 3761 BLAKE2B 95d5e7e41d505c0ee5b8cc6fd555e4fe62bbce317c71ea71b44b5cd4ddcff1d9cf1db514a689aac4df42252edead5953eadb39dbc7513281dcbbf0a144e5b922 SHA512 5aeb17f34e1a52649c92565385d40ec892accf05f39e7fd0240c8ffa2f8d3eb6cc116bb5ab52448f3755280e25a86acb9f68c323255baa59c716ef9cda9b7bec +MISC metadata.xml 335 BLAKE2B ed092594d2ac680f616f62ce0081eee39d6863327bf39b3789662e49c551f59c163734b895cf42fdd8e618fd263a2b631366247ea0785a9ee058c0814df4cde5 SHA512 83db3889b38a7b5f4668c6527ab4a5fdca2bb8ccecef27090bd170a5ae5a44540f7b801133130a3a9c12b9f2f0f8af7731f41326eeb1a68b3115007d243ad0ff diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch deleted file mode 100644 index c9afc2594091..000000000000 --- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch +++ /dev/null @@ -1,39 +0,0 @@ -Use ocamlfind for finding dependencies, esp. for doing their transitive closure. - -Ideally the build system should be converted to something more modern like -jbuilder. - -Index: sks-1.1.6/Makefile -=================================================================== ---- sks-1.1.6.orig/Makefile -+++ sks-1.1.6/Makefile -@@ -21,10 +21,10 @@ CFLAGS=-O3 $(CINCLUDES) -I . - CXXFLAGS=-O3 $(CINCLUDES) -I . - - ifndef OCAMLC -- OCAMLC=ocamlc -+ OCAMLC=ocamlfind ocamlc - endif - ifndef OCAMLOPT -- OCAMLOPT=ocamlopt -+ OCAMLOPT=ocamlfind ocamlopt - endif - ifndef CAMLP4O - CAMLP4O=camlp4o -@@ -55,12 +55,12 @@ WARNERR=-warn-error A - endif - - CAMLP4=-pp $(CAMLP4O) --CAMLINCLUDE= -I lib -I bdb -I +cryptokit -+CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb - COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR) - OCAMLDEP=ocamldep $(CAMLP4) --CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma --OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS) --OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa) -+CAMLLIBS=bdb.cma nums.cma -+OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS) -+OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa) - - EXE=sks sks_add_mail - ALL=$(EXE) sks.8.gz diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch deleted file mode 100644 index 1fba250fd4b3..000000000000 --- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User Kristian Fiskerstrand <kf@sumptuouscapital.com> -# Date 1499610580 -7200 -# Node ID 719ffdf628a81a2f052f3b6dc746a3e1d37afe30 -# Parent 6352f0dbcadf35aac29c2fbf10fb218ae50d9c77 -Fix nums specification - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -56,7 +56,7 @@ - CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb - COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR) - OCAMLDEP=ocamldep $(CAMLP4) --CAMLLIBS=bdb.cma nums.cma -+CAMLLIBS=bdb.cma - OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS) - OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa) - diff --git a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch b/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch deleted file mode 100644 index ea5a82db6530..000000000000 --- a/net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch +++ /dev/null @@ -1,21 +0,0 @@ -# HG changeset patch -# User Kristian Fiskerstrand <kf@sumptuouscapital.com> -# Date 1499612080 -7200 -# Node ID 0106ba2f6abc8ee2f685026d3f218730114a60fa -# Parent 719ffdf628a81a2f052f3b6dc746a3e1d37afe30 -Add num to findlib packages - -Although nums is detected, making this explicit - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -53,7 +53,7 @@ - endif - - CAMLP4=-pp $(CAMLP4O) --CAMLINCLUDE= -package cryptokit,unix,str,bigarray -I lib -I bdb -+CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I lib -I bdb - COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR) - OCAMLDEP=ocamldep $(CAMLP4) - CAMLLIBS=bdb.cma diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch new file mode 100644 index 000000000000..3657a8bd5f07 --- /dev/null +++ b/net-misc/sks/files/sks-1.1.6_p20200624-QA-fixups.patch @@ -0,0 +1,71 @@ +diff --git a/Makefile b/Makefile +index f182225..c84368e 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,8 +15,8 @@ + # USA + # + CINCLUDES=-I$(shell ocamlc -where) +-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I . +-CXXFLAGS+=-O3 $(CINCLUDES) -I . ++CFLAGS+=$(CINCLUDES) -I . ++CXXFLAGS+=$(CINCLUDES) -I . + + ifndef OCAMLC + OCAMLC=ocamlfind ocamlc +@@ -60,8 +60,8 @@ OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS) + OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -linkpkg -inline 40 $(CAMLLIBS:.cma=.cmxa) + + EXE=sks sks_add_mail +-ALL=$(EXE) sks.8.gz +-ALL.bc=$(EXE:=.bc) sks.8.gz ++ALL=$(EXE) sks.8 ++ALL.bc=$(EXE:=.bc) sks.8 + + all: $(ALL) + all.bc: $(ALL.bc) +@@ -132,13 +132,13 @@ install: + mkdir -p $(DESTDIR)$(PREFIX)/bin + install sks_build.sh sks sks_add_mail $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(MANDIR)/man8 +- install sks.8.gz $(DESTDIR)$(MANDIR)/man8 ++ install sks.8 $(DESTDIR)$(MANDIR)/man8 + + install.bc: + mkdir -p $(DESTDIR)$(PREFIX)/bin + install sks_build.bc.sh sks.bc sks_add_mail.bc $(DESTDIR)$(PREFIX)/bin + mkdir -p $(DESTDIR)$(MANDIR)/man8 +- install sks.8.gz $(DESTDIR)$(MANDIR)/man8 ++ install sks.8 $(DESTDIR)$(MANDIR)/man8 + + + Makefile.local: +@@ -151,9 +151,6 @@ src: + + # Ordinary targets + +-sks.8.gz: sks.8 +- gzip -9nf sks.8 +- + sks.8: sks.pod + pod2man -c "SKS OpenPGP Key server" --section 8 -r 0.1 -name sks sks.pod sks.8 + +diff --git a/bdb/Makefile b/bdb/Makefile +index 0913014..4a68399 100644 +--- a/bdb/Makefile ++++ b/bdb/Makefile +@@ -15,11 +15,11 @@ + -include ../Makefile.local + + CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE) +-CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I . +-CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I . ++CFLAGS+=$(CINCLUDES) $(BDBLIB) -I . ++CXXFLAGS+=$(CINCLUDES) $(BDBLIB) -I . + + MKLIB=ocamlmklib +-RANLIB=ranlib ++RANLIB?=ranlib + OCAMLDEP=ocamldep $(PP) + CAMLINCLUDE= + COMMONCAMLFLAGS= $(CAMLINCLUDE) $(PP) #-thread diff --git a/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch new file mode 100644 index 000000000000..02da8d2d2e76 --- /dev/null +++ b/net-misc/sks/files/sks-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch @@ -0,0 +1,81 @@ +https://sources.debian.org/src/sks/1.1.6+git20200620.9e9d504-1/debian/patches/0008-accept-and-use-CFLAGS-and-CPPFLAGS-from-environment.patch/ +---- +From: Daniel Kahn Gillmor <dkg@fifthhorseman.net> +Date: Mon, 8 Aug 2016 13:20:38 -0400 +Subject: accept and use CFLAGS and CPPFLAGS from environment + +--- + Makefile | 9 +++++---- + bdb/Makefile | 14 ++++++++------ + 2 files changed, 13 insertions(+), 10 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -14,7 +14,7 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + # USA + # +-CINCLUDES=-I`ocamlc -where` ++CINCLUDES=-I$(shell ocamlc -where) + CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) -I . + CXXFLAGS+=-O3 $(CINCLUDES) -I . + +@@ -43,6 +43,7 @@ else + endif + + CAMLLDFLAGS=$(foreach x, $(LDFLAGS), -ccopt $(x)) ++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x)) + + SKSVS=$(shell grep 'version_suffix = "+"' common.ml) + ifeq ($(strip $(SKSVS)),) +@@ -52,7 +53,7 @@ WARNERR=-warn-error A + endif + + CAMLINCLUDE= -package cryptokit,unix,str,bigarray,num -I bdb +-COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR) ++COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLCFLAGS) $(CAMLLDFLAGS) -ccopt -Lbdb -annot -bin-annot $(WARNERR) + OCAMLDEP=ocamldep + CAMLLIBS=bdb.cma + OCAMLFLAGS=$(COMMONCAMLFLAGS) -linkpkg -g $(CAMLLIBS) +--- a/bdb/Makefile ++++ b/bdb/Makefile +@@ -14,7 +14,7 @@ + # $Id: Makefile,v 1.6 2003/07/05 15:16:29 yminsky Exp $ + -include ../Makefile.local + +-CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE) ++CINCLUDES=-I$(shell ocamlc -where) $(BDBINCLUDE) + CFLAGS+=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I . + CXXFLAGS+=-O3 $(CINCLUDES) $(BDBLIB) -I . + +@@ -27,6 +27,8 @@ CAMLLIBS=unix.cma str.cma mylibs.cma + OCAMLFLAGS=$(COMMONCAMLFLAGS) -g + OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 + ++CAMLCFLAGS=$(foreach x, $(CFLAGS), -ccopt $(x)) $(foreach x, $(CPPFLAGS), -ccopt $(x)) ++ + ifndef LIBDB + LIBDB=-ldb-4.6 + endif +@@ -37,7 +39,7 @@ ocextr: ocextr.ml + $(OCAMLC) -o ocextr ocextr.ml + + libbdb.a: $(COBJS) +- $(MKLIB) -custom -o bdb $(COBJS) ++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb $(COBJS) + + bdb_stubs.o: bdb_stubs.h bdb_stubs.c + +@@ -45,10 +47,10 @@ bdb.ml: ocextr bdb_stubs.c + ./ocextr bdb_stubs.c > bdb.ml + + bdb.cma: bdb.cmo libbdb.a +- $(MKLIB) -custom -o bdb bdb.cmo -lbdb $(LIBDB) ++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmo -lbdb $(LIBDB) + + bdb.cmxa: bdb.cmx libbdb.a +- $(MKLIB) -custom -o bdb bdb.cmx -lbdb $(LIBDB) ++ $(MKLIB) $(CAMLCFLAGS) -custom -o bdb bdb.cmx -lbdb $(LIBDB) + + bdbcaml: bdb.cma + ocamlmktop -o bdbcaml -custom unix.cma bdb.cma $^ diff --git a/net-misc/sks/metadata.xml b/net-misc/sks/metadata.xml index 7bc958a5ed9b..5b240d62d857 100644 --- a/net-misc/sks/metadata.xml +++ b/net-misc/sks/metadata.xml @@ -6,6 +6,6 @@ <flag name="optimize">Enables bytecode optimization</flag> </use> <upstream> - <remote-id type="bitbucket">skskeyserver/sks-keyserver</remote-id> + <remote-id type="github">SKS-Keyserver/sks-keyserver</remote-id> </upstream> </pkgmetadata> diff --git a/net-misc/sks/sks-1.1.6-r4.ebuild b/net-misc/sks/sks-1.1.6-r4.ebuild deleted file mode 100644 index 89cc2ec999a4..000000000000 --- a/net-misc/sks/sks-1.1.6-r4.ebuild +++ /dev/null @@ -1,115 +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" - -RDEPEND=">=dev-lang/ocaml-4.0:= - dev-ml/camlp4:= - dev-ml/cryptokit:= - sys-libs/db:5.3" -DEPEND="${RDEPEND} - dev-ml/findlib" - -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" \ - "${FILESDIR}/${P}-use-ocamlfind.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:/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-r5.ebuild b/net-misc/sks/sks-1.1.6_p20200624.ebuild index 6555ea2c8bf6..7c9d13994f7d 100644 --- a/net-misc/sks/sks-1.1.6-r5.ebuild +++ b/net-misc/sks/sks-1.1.6_p20200624.ebuild @@ -1,18 +1,22 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit multilib user readme.gentoo-r1 systemd +inherit readme.gentoo-r1 systemd toolchain-funcs +COMMIT="591a7834dc9f1dff3d336d769a6561138a5befe7" 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" +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 @@ -30,25 +34,28 @@ 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=">=dev-lang/ocaml-4.0:= +RDEPEND=" + acct-user/sks + acct-group/sks + >=dev-lang/ocaml-4.0:= dev-ml/camlp4:= dev-ml/cryptokit:= - sys-libs/db:5.3" + dev-ml/num:= + sys-libs/db:5.3 +" DEPEND="${RDEPEND} dev-ml/findlib" -pkg_setup() { - ebegin "Creating named group and user" - enewgroup sks - enewuser sks -1 -1 /var/lib/sks sks -} +PATCHES=( + "${FILESDIR}/${PN}-1.1.6_p20200624-respect-CFLAGS-CXXFLAGS.patch" + "${FILESDIR}/${PN}-1.1.6_p20200624-QA-fixups.patch" +) -src_prepare() { - eapply "${FILESDIR}/${P}-unbundle-cryptokit.patch" \ - "${FILESDIR}/${P}-use-ocamlfind.patch" \ - "${FILESDIR}/${P}-use-ocamlfind2.patch" \ - "${FILESDIR}/${P}-use-ocamlfind3.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" \ @@ -60,13 +67,16 @@ src_prepare() { sed -i \ -e 's:/usr/sbin/sks:/usr/bin/sks:g' \ sks_build.sh || die - dosym /usr/bin/sks_build.sh /usr/bin/sks_build.bc.sh - eapply_user + + dosym sks_build.sh /usr/bin/sks_build.bc.sh + default } src_compile() { + tc-export CC CXX RANLIB + emake dep - # sks build fails with paralell build in module Bdb + # sks build fails with parallel build in module Bdb emake -j1 all if use optimize; then emake all.bc @@ -80,8 +90,8 @@ src_test() { 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 + dosym sks.bc usr/bin/sks + dosym sks_add_mail.bc usr/bin/sks_add_mail else emake install fi @@ -95,7 +105,10 @@ src_install() { 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 @@ -108,7 +121,7 @@ src_install() { pkg_postinst() { readme.gentoo_print_elog - if [[ -n ${REPLACING_VERSIONS} ]]; then + 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" |