* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/
@ 2017-06-26 17:42 Kristian Fiskerstrand
0 siblings, 0 replies; 3+ messages in thread
From: Kristian Fiskerstrand @ 2017-06-26 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 4536c53b0352be6fa69b5de684af7dcac36df3e0
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 17:41:54 2017 +0000
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 17:42:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4536c53b
net-misc/sks-1.1.6-r1: Update build patch
Switching to the official upstream patch brought in from Debian
Package-Manager: Portage-2.3.6, Repoman-2.3.1
.../sks/files/sks-1.1.6-unbundle-cryptokit.patch | 65 ++++++++++------------
1 file changed, 29 insertions(+), 36 deletions(-)
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
index da11839fa12..bf3d1901033 100644
--- a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
+++ b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch
@@ -1,21 +1,26 @@
-diff -r 4af75b3526d9 Makefile
---- a/Makefile Sun Jun 25 20:39:45 2017 +0000
-+++ b/Makefile Mon Jun 26 00:27:10 2017 +0200
-@@ -53,10 +53,11 @@
+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
-+CRYPTOKIT=$(shell ocamlfind query cryptokit)
-+CAMLINCLUDE= -I lib -I bdb -I $(CRYPTOKIT)
++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
-+CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma $(CRYPTOKIT)/cryptokit.cma
- OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS)
- OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa)
-
-@@ -107,7 +108,7 @@
+ 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
@@ -24,18 +29,18 @@ diff -r 4af75b3526d9 Makefile
LIBS=$(LIBS.bc:.cma=.cmxa)
VERSION := $(shell cat VERSION)
-@@ -278,32 +279,11 @@
+@@ -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
-
+-$(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
-
@@ -57,23 +62,11 @@ diff -r 4af75b3526d9 Makefile
################################
# old stuff
################################
-@@ -340,16 +320,16 @@
- dumbloop: $(LIBS) $(ALLOBJS) dumbloop.cmo
- $(OCAMLC) -o dumbloop $(OCAMLFLAGS) $(ALLOBJS) dumbloop.cmo
-
--scan: $(OBJS) cryptokit dblib scan.ml
-+scan: $(OBJS) dblib scan.ml
- $(OCAMLC) -o scan $(OCAMLFLAGS) $(OBJS) scan.ml
-
- query: $(LIBS) $(ALLOBJS) query.cmo
- $(OCAMLC) -o query $(OCAMLFLAGS) $(ALLOBJS) query.cmo
-
--printids: $(OBJS:.cmo=.cmx) cryptokit printids.ml
-+printids: $(OBJS:.cmo=.cmx) printids.ml
- $(OCAMLOPT) -o printids $(OCAMLOPTFLAGS) $(OBJS:.cmo=.cmx) printids.ml
+@@ -404,7 +378,6 @@ clean: mlclean
--printids.bc: $(OBJS) cryptokit printids.ml
-+printids.bc: $(OBJS) printids.ml
- $(OCAMLC) -o printids $(OCAMLFLAGS) $(OBJS) printids.ml
+ cleanall: clean bdbclean
+ rm -f lib/*
+- rm -rf $(CKVER)
- krecode: $(ALLOBJS.opt) $(LIBS) recode.ml
+ distclean: cleanall
+ rm -rf Makefile.local
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/
@ 2020-11-20 13:26 Aaron Bauman
0 siblings, 0 replies; 3+ messages in thread
From: Aaron Bauman @ 2020-11-20 13:26 UTC (permalink / raw
To: gentoo-commits
commit: c0f9879fab345c4b5ab14831ebae97181604876a
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Nov 17 20:03:26 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Nov 20 13:25:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f9879f
net-misc/sks: remove unused patches
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18303
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-misc/sks/files/sks-1.1.6-use-ocamlfind.patch | 39 -----------------------
net-misc/sks/files/sks-1.1.6-use-ocamlfind2.patch | 19 -----------
net-misc/sks/files/sks-1.1.6-use-ocamlfind3.patch | 21 ------------
3 files changed, 79 deletions(-)
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 c9afc259409..00000000000
--- 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 1fba250fd4b..00000000000
--- 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 ea5a82db653..00000000000
--- 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/
@ 2021-03-18 0:17 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-03-18 0:17 UTC (permalink / raw
To: gentoo-commits
commit: b95fcfe8b717ccaa764284b435712863575dd32b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Mar 17 17:35:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 18 00:16:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95fcfe8
net-misc/sks: remove unused patch
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19980
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../sks/files/sks-1.1.6-unbundle-cryptokit.patch | 72 ----------------------
1 file changed, 72 deletions(-)
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 bf3d1901033..00000000000
--- 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-18 0:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-26 17:42 [gentoo-commits] repo/gentoo:master commit in: net-misc/sks/files/ Kristian Fiskerstrand
-- strict thread matches above, loose matches on Subject: below --
2020-11-20 13:26 Aaron Bauman
2021-03-18 0:17 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox