[Pkg-sks-commit] r112 - in sks/trunk/sks: . debian debian/patches
chrism at alioth.debian.org
chrism at alioth.debian.org
Thu Jun 19 15:00:22 UTC 2008
Author: chrism
Date: 2008-06-19 15:00:21 +0000 (Thu, 19 Jun 2008)
New Revision: 112
Added:
sks/trunk/sks/sks-1.0.5+1.0.6-pre3.debian.tgz
Removed:
sks/trunk/sks/debian/patches/101_fix_vindex_alignment
sks/trunk/sks/debian/patches/102_show_hostname_in_status
sks/trunk/sks/debian/patches/103_recognize_critical
sks/trunk/sks/sks-1.0.5+1.0.6-pre2.debian.tgz
Modified:
sks/trunk/sks/debian/control
sks/trunk/sks/debian/patches/501_makefile_cflags
Log:
[project @ 113]
swithing to use nums, numerix and cryptokit from debian,
updated upstream cvs snapshot to 2004-02-17
Original author: fabbione
Date: 2004-02-17 12:14:22.937585+00:00
Modified: sks/trunk/sks/debian/control
===================================================================
--- sks/trunk/sks/debian/control 2008-06-19 15:00:09 UTC (rev 111)
+++ sks/trunk/sks/debian/control 2008-06-19 15:00:21 UTC (rev 112)
@@ -4,7 +4,7 @@
Standards-Version: 3.6.1
Maintainer: Debian SKS Maintainers Team <debian-sks at mirror.positive-internet.com>
Uploaders: Fabio M. Di Nitto <fabbione at fabbione.net>, Peter Palfrader <weasel at debian.org>
-Build-Depends: ocaml (= 3.07-7) | ocaml (= 3.07-7.0.pp1), dbs, libdb4.1-dev (>= 4.1.25), debhelper (>= 4.0), zlib1g-dev
+Build-Depends: ocaml (>= 3.07), dbs, libdb4.1-dev, debhelper (>= 4.0), zlib1g-dev, libcryptokit-ocaml-dev, libnumerix-ocaml-dev, libnums-ocaml-dev
Package: sks
Architecture: any
Deleted: sks/trunk/sks/debian/patches/101_fix_vindex_alignment
===================================================================
--- sks/trunk/sks/debian/patches/101_fix_vindex_alignment 2008-06-19 15:00:09 UTC (rev 111)
+++ sks/trunk/sks/debian/patches/101_fix_vindex_alignment 2008-06-19 15:00:21 UTC (rev 112)
@@ -1,33 +0,0 @@
-diff -ruN sks-1.0.6-old/htmlTemplates.ml sks-1.0.6/htmlTemplates.ml
---- sks-1.0.6-old/htmlTemplates.ml 2003-12-09 22:31:28.000000000 +0100
-+++ sks-1.0.6/htmlTemplates.ml 2003-12-09 23:36:19.000000000 +0100
-@@ -69,7 +69,7 @@
- (if revoked then " *** KEY REVOKED *** [not verified]\r\n "
- else "")
- in
-- let uidstr = String.concat ~sep:"\r\n " userids in
-+ let uidstr = String.concat ~sep:"\r\n " userids in
- base ^ uidstr
-
- let fingerprint ~fp =
-diff -ruN sks-1.0.6-old/index.ml sks-1.0.6/index.ml
---- sks-1.0.6-old/index.ml 2003-12-09 22:32:55.000000000 +0100
-+++ sks-1.0.6/index.ml 2003-12-09 23:34:52.000000000 +0100
-@@ -202,7 +202,7 @@
- | 0x11 -> " sig1"
- | 0x12 -> " sig2"
- | 0x13 -> " sig3"
-- | 0x20 | 0x28 | 0x30 -> "<font color=\"red\"><b>revok</b></font>"
-+ | 0x20 | 0x28 | 0x30 -> "<font color=\"red\"><b>revok </b></font>"
- | 0x1f -> "dirct"
- | 0x18 -> "sbind"
- | x -> sprintf " 0x%02x" x
-@@ -248,7 +248,7 @@
- "no keyid"
- in
-
-- let firstline = sprintf "sig %s %s %s %s %s %s"
-+ let firstline = sprintf "sig %-6s %s %s %s %s %s"
- sigtype_string keyid_string
- sig_creation_string sig_expiration_string
- key_expiration_string
Deleted: sks/trunk/sks/debian/patches/102_show_hostname_in_status
===================================================================
--- sks/trunk/sks/debian/patches/102_show_hostname_in_status 2008-06-19 15:00:09 UTC (rev 111)
+++ sks/trunk/sks/debian/patches/102_show_hostname_in_status 2008-06-19 15:00:21 UTC (rev 112)
@@ -1,18 +0,0 @@
-diff -ruN sks-1.0.6-old/stats.ml sks-1.0.6/stats.ml
---- sks-1.0.6-old/stats.ml Sun Oct 12 22:20:19 2003
-+++ sks-1.0.6/stats.ml Thu Dec 11 20:27:45 2003
-@@ -133,12 +133,13 @@
- sprintf
- "<h2>Settings</h2>
- <table>
-+ <tr><td>Hostname:<td>%s
- <tr><td>Version:<td>%s
- <tr><td>HTTP port:<td>%d
- <tr><td>Recon port:<td>%d
- <tr><td>Debug level:<td>%d
- </table><br>"
-- (let (v1,v2,v3) = version_tuple in sprintf "%d.%d.%d" v1 v2 v3)
-+ !Settings.hostname Common.version
- http_port recon_port !Settings.debuglevel
- in
- let gossip_peers =
Deleted: sks/trunk/sks/debian/patches/103_recognize_critical
===================================================================
--- sks/trunk/sks/debian/patches/103_recognize_critical 2008-06-19 15:00:09 UTC (rev 111)
+++ sks/trunk/sks/debian/patches/103_recognize_critical 2008-06-19 15:00:21 UTC (rev 112)
@@ -1,14 +0,0 @@
-diff -ruN sks-1.0.6-old/parsePGP.ml sks-1.0.6/parsePGP.ml
---- sks-1.0.6-old/parsePGP.ml Sun Oct 12 22:20:19 2003
-+++ sks-1.0.6/parsePGP.ml Thu Jan 22 12:07:56 2004
-@@ -159,7 +159,9 @@
-
- let read_sigsubpacket cin =
- let length = parse_sigsubpacket_length cin in
-- let ssp_type = cin#read_byte in
-+ let ssp_type_byte = cin#read_byte in
-+ let ssp_type = ssp_type_byte land 0x7f in
-+ let ssp_critical = ssp_type_byte land 0x80 in
- let body = cin#read_string (length - 1) in
- { ssp_length = length - 1;
- ssp_type = ssp_type;
Modified: sks/trunk/sks/debian/patches/501_makefile_cflags
===================================================================
--- sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 15:00:09 UTC (rev 111)
+++ sks/trunk/sks/debian/patches/501_makefile_cflags 2008-06-19 15:00:21 UTC (rev 112)
@@ -1,6 +1,20 @@
+diff -ruN sks-1.0.6-old/bdb/Makefile sks-1.0.6/bdb/Makefile
+--- sks-1.0.6-old/bdb/Makefile 2003-07-05 17:16:29.000000000 +0200
++++ sks-1.0.6/bdb/Makefile 2004-02-17 11:35:25.000000000 +0100
+@@ -16,8 +16,8 @@
+ CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
+ CC=gcc
+ CXX=g++
+-CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
+-CXXFLAGS=-O3 $(CINCLUDES) $(BDBLIB) -I .
++CFLAGS=$(DEBCFLAGS) -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
++CXXFLAGS=$(DEBCFLAGS) $(CINCLUDES) $(BDBLIB) -I .
+
+ MKLIB=ocamlmklib
+ RANLIB=ranlib
diff -ruN sks-1.0.6-old/Makefile sks-1.0.6/Makefile
---- sks-1.0.6-old/Makefile 2003-12-04 14:47:11.000000000 +0100
-+++ sks-1.0.6/Makefile 2003-12-09 23:14:37.000000000 +0100
+--- sks-1.0.6-old/Makefile 2004-02-01 18:51:19.000000000 +0100
++++ sks-1.0.6/Makefile 2004-02-17 13:01:00.000000000 +0100
@@ -17,8 +17,8 @@
CINCLUDES=-I`ocamlc -where`
CC=gcc
@@ -12,6 +26,24 @@
ifndef OCAMLC
OCAMLC=ocamlc
+@@ -46,7 +46,7 @@
+ endif
+
+ CAMLP4=-pp $(CAMLP4O)
+-CAMLINCLUDE= -I lib -I bdb
++CAMLINCLUDE= -I lib -I bdb -I +numerix -I +cryptokit
+ COMMONCAMLFLAGS=$(CAMLINCLUDE) $(OCAMLLIB) -ccopt -Lbdb -dtypes
+ OCAMLDEP=ocamldep $(CAMLP4)
+ CAMLLIBS=unix.cma str.cma bdb.cma nums.cma numerix.cma bigarray.cma cryptokit.cma
+@@ -98,7 +98,7 @@
+
+ EXEOBJS.bc=$(RSERVOBJS.bc) build.cmo fastbuild.cmo dbserver.cmo pdiskTest.cmo
+
+-LIBS.bc= lib/cryptokit.cma lib/numerix.cma bdb/bdb.cma
++LIBS.bc= bdb/bdb.cma
+ LIBS=$(LIBS.bc:.cma=.cmxa)
+
+ VERSION := $(shell cat VERSION)
@@ -235,10 +235,10 @@
##################################
@@ -25,46 +57,64 @@
bdbclean:
cd bdb && $(MAKE) clean
-diff -ruN sks-1.0.6-old/bdb/Makefile sks-1.0.6/bdb/Makefile
---- sks-1.0.6-old/bdb/Makefile 2003-07-05 17:16:29.000000000 +0200
-+++ sks-1.0.6/bdb/Makefile 2003-12-09 23:14:37.000000000 +0100
-@@ -16,8 +16,8 @@
- CINCLUDES=-I`ocamlc -where` $(BDBINCLUDE)
- CC=gcc
- CXX=g++
--CFLAGS=-O3 -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
--CXXFLAGS=-O3 $(CINCLUDES) $(BDBLIB) -I .
-+CFLAGS=$(DEBCFLAGS) -Werror-implicit-function-declaration $(CINCLUDES) $(BDBLIB) -I .
-+CXXFLAGS=$(DEBCFLAGS) $(CINCLUDES) $(BDBLIB) -I .
+@@ -253,51 +253,6 @@
+ touch prepared
- MKLIB=ocamlmklib
- RANLIB=ranlib
-diff -ruN sks-1.0.6-old/cryptokit-1.0/Makefile sks-1.0.6/cryptokit-1.0/Makefile
---- sks-1.0.6-old/cryptokit-1.0/Makefile 2002-04-04 14:27:31.000000000 +0200
-+++ sks-1.0.6/cryptokit-1.0/Makefile 2003-12-09 23:14:37.000000000 +0100
-@@ -13,7 +13,7 @@
- INSTALLDIR=`$(OCAMLC) -where`
- # Flags for the C compiler.
--CFLAGS=-O -I$(ZLIB_INCLUDE)
-+CFLAGS=$(DEBCFLAGS)
+-CKDIR=cryptokit-1.0
+-
+-$(CKDIR)/README:
+- tar xmvfz $(CKDIR).tar.gz
+-
+-$(CKDIR)/cryptokit.cma: $(CKDIR)/README
+- cd $(CKDIR) && $(MAKE) all
+-
+-$(CKDIR)/cryptokit.cmxa: $(CKDIR)/README
+- 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
+-
+-
+-################################
+-
+-NXDIR=numerix-0.19
+-
+-$(NXDIR)/READ.ME:
+- tar xvmfz $(NXDIR)-3.tar.gz
+-
+-$(NXDIR)/config.status: $(NXDIR)/READ.ME
+- cd $(NXDIR) && \
+- ./configure --libdir=`pwd`/../lib \
+- --bindir=`pwd`/../tmp/bin --includedir=`pwd`/../tmp/include
+-
+-lib/numerix.cma: $(NXDIR)/config.status prepared
+- cd $(NXDIR) && \
+- $(MAKE) lib; \
+- $(MAKE) install
+- touch -c lib/*num*
+-
+-lib/numerix.cmxa: lib/numerix.cma
+-
+-
+ ################################
+ # old stuff
+ ################################
+@@ -393,8 +348,6 @@
- ### End of configuration section
+ cleanall: clean bdbclean
+ rm -f lib/*
+- rm -rf $(CKDIR)
+- rm -rf $(NXDIR)
+ rm -rf
-@@ -40,13 +40,13 @@
- allopt: libcryptokit.a cryptokit.cmi cryptokit.cmxa
-
- libcryptokit.a: $(C_OBJS)
-- $(MKLIB) -o cryptokit $(C_OBJS) -L$(ZLIB_LIBDIR) $(ZLIB_LIB)
-+ $(MKLIB) -o cryptokit $(C_OBJS) $(ZLIB_LIB)
-
- cryptokit.cma: $(CAML_OBJS)
-- $(MKLIB) -o cryptokit $(CAML_OBJS) -L$(ZLIB_LIBDIR) $(ZLIB_LIB)
-+ $(MKLIB) -o cryptokit $(CAML_OBJS) $(ZLIB_LIB)
-
- cryptokit.cmxa: $(CAML_OBJS:.cmo=.cmx)
-- $(MKLIB) -o cryptokit $(CAML_OBJS:.cmo=.cmx) -L$(ZLIB_LIBDIR) $(ZLIB_LIB)
-+ $(MKLIB) -o cryptokit $(CAML_OBJS:.cmo=.cmx) $(ZLIB_LIB)
-
- test: test.byt
- $(OCAMLRUN) -I . ./test.byt
+ # Dependencies
Deleted: sks/trunk/sks/sks-1.0.5+1.0.6-pre2.debian.tgz
===================================================================
(Binary files differ)
Added: sks/trunk/sks/sks-1.0.5+1.0.6-pre3.debian.tgz
===================================================================
(Binary files differ)
Property changes on: sks/trunk/sks/sks-1.0.5+1.0.6-pre3.debian.tgz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-sks-commit
mailing list