| 1 |
commit: 4536c53b0352be6fa69b5de684af7dcac36df3e0 |
| 2 |
Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 26 17:41:54 2017 +0000 |
| 4 |
Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 26 17:42:24 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4536c53b |
| 7 |
|
| 8 |
net-misc/sks-1.1.6-r1: Update build patch |
| 9 |
|
| 10 |
Switching to the official upstream patch brought in from Debian |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 13 |
|
| 14 |
.../sks/files/sks-1.1.6-unbundle-cryptokit.patch | 65 ++++++++++------------ |
| 15 |
1 file changed, 29 insertions(+), 36 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index da11839fa12..bf3d1901033 100644 |
| 19 |
--- a/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch |
| 20 |
+++ b/net-misc/sks/files/sks-1.1.6-unbundle-cryptokit.patch |
| 21 |
@@ -1,21 +1,26 @@ |
| 22 |
-diff -r 4af75b3526d9 Makefile |
| 23 |
---- a/Makefile Sun Jun 25 20:39:45 2017 +0000 |
| 24 |
-+++ b/Makefile Mon Jun 26 00:27:10 2017 +0200 |
| 25 |
-@@ -53,10 +53,11 @@ |
| 26 |
+From: Christoph Martin <christoph.martin@×××××××××.de> |
| 27 |
+Date: Fri, 6 May 2016 14:55:01 -0400 |
| 28 |
+Subject: use system cryptokit |
| 29 |
+ |
| 30 |
+Use the system cryptokit instead of the one shipped in upstream source |
| 31 |
+--- |
| 32 |
+ Makefile | 31 ++----------------------------- |
| 33 |
+ 1 file changed, 2 insertions(+), 29 deletions(-) |
| 34 |
+ |
| 35 |
+diff --git a/Makefile b/Makefile |
| 36 |
+index 15ab3ea..eb56758 100644 |
| 37 |
+--- a/Makefile |
| 38 |
++++ b/Makefile |
| 39 |
+@@ -55,7 +55,7 @@ WARNERR=-warn-error A |
| 40 |
endif |
| 41 |
|
| 42 |
CAMLP4=-pp $(CAMLP4O) |
| 43 |
-CAMLINCLUDE= -I lib -I bdb |
| 44 |
-+CRYPTOKIT=$(shell ocamlfind query cryptokit) |
| 45 |
-+CAMLINCLUDE= -I lib -I bdb -I $(CRYPTOKIT) |
| 46 |
++CAMLINCLUDE= -I lib -I bdb -I +cryptokit |
| 47 |
COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) $(CAMLLDFLAGS) -ccopt -Lbdb -dtypes $(WARNERR) |
| 48 |
OCAMLDEP=ocamldep $(CAMLP4) |
| 49 |
--CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma |
| 50 |
-+CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma $(CRYPTOKIT)/cryptokit.cma |
| 51 |
- OCAMLFLAGS=$(COMMONCAMLFLAGS) -g $(CAMLLIBS) |
| 52 |
- OCAMLOPTFLAGS=$(COMMONCAMLFLAGS) -inline 40 $(CAMLLIBS:.cma=.cmxa) |
| 53 |
- |
| 54 |
-@@ -107,7 +108,7 @@ |
| 55 |
+ CAMLLIBS=unix.cma str.cma bdb.cma nums.cma bigarray.cma cryptokit.cma |
| 56 |
+@@ -109,7 +109,7 @@ ALLOBJS=$(ALLOBJS.bc:.cmo=.cmx) |
| 57 |
|
| 58 |
EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo |
| 59 |
|
| 60 |
@@ -24,18 +29,18 @@ diff -r 4af75b3526d9 Makefile |
| 61 |
LIBS=$(LIBS.bc:.cma=.cmxa) |
| 62 |
|
| 63 |
VERSION := $(shell cat VERSION) |
| 64 |
-@@ -278,32 +279,11 @@ |
| 65 |
+@@ -280,32 +280,6 @@ prepared: |
| 66 |
touch prepared |
| 67 |
|
| 68 |
|
| 69 |
-CKVER=cryptokit-1.7 |
| 70 |
-CKDIR=$(CKVER)/src |
| 71 |
- |
| 72 |
- $(CKVER)/README.txt: |
| 73 |
- tar xmvfz $(CKVER).tar.gz |
| 74 |
- patch -p 0 < $(CKVER)-sks.patch |
| 75 |
- patch -p 0 < $(CKVER)-sks-custom_compare.patch |
| 76 |
- |
| 77 |
+-$(CKVER)/README.txt: |
| 78 |
+- tar xmvfz $(CKVER).tar.gz |
| 79 |
+- patch -p 0 < $(CKVER)-sks.patch |
| 80 |
+- patch -p 0 < $(CKVER)-sks-custom_compare.patch |
| 81 |
+- |
| 82 |
-$(CKDIR)/cryptokit.cma: $(CKVER)/README.txt |
| 83 |
- cd $(CKDIR) && $(MAKE) all |
| 84 |
- |
| 85 |
@@ -57,23 +62,11 @@ diff -r 4af75b3526d9 Makefile |
| 86 |
################################ |
| 87 |
# old stuff |
| 88 |
################################ |
| 89 |
-@@ -340,16 +320,16 @@ |
| 90 |
- dumbloop: $(LIBS) $(ALLOBJS) dumbloop.cmo |
| 91 |
- $(OCAMLC) -o dumbloop $(OCAMLFLAGS) $(ALLOBJS) dumbloop.cmo |
| 92 |
- |
| 93 |
--scan: $(OBJS) cryptokit dblib scan.ml |
| 94 |
-+scan: $(OBJS) dblib scan.ml |
| 95 |
- $(OCAMLC) -o scan $(OCAMLFLAGS) $(OBJS) scan.ml |
| 96 |
- |
| 97 |
- query: $(LIBS) $(ALLOBJS) query.cmo |
| 98 |
- $(OCAMLC) -o query $(OCAMLFLAGS) $(ALLOBJS) query.cmo |
| 99 |
- |
| 100 |
--printids: $(OBJS:.cmo=.cmx) cryptokit printids.ml |
| 101 |
-+printids: $(OBJS:.cmo=.cmx) printids.ml |
| 102 |
- $(OCAMLOPT) -o printids $(OCAMLOPTFLAGS) $(OBJS:.cmo=.cmx) printids.ml |
| 103 |
+@@ -404,7 +378,6 @@ clean: mlclean |
| 104 |
|
| 105 |
--printids.bc: $(OBJS) cryptokit printids.ml |
| 106 |
-+printids.bc: $(OBJS) printids.ml |
| 107 |
- $(OCAMLC) -o printids $(OCAMLFLAGS) $(OBJS) printids.ml |
| 108 |
+ cleanall: clean bdbclean |
| 109 |
+ rm -f lib/* |
| 110 |
+- rm -rf $(CKVER) |
| 111 |
|
| 112 |
- krecode: $(ALLOBJS.opt) $(LIBS) recode.ml |
| 113 |
+ distclean: cleanall |
| 114 |
+ rm -rf Makefile.local |
Archives