Subversion Repositories nettle

Compare Revisions

Ignore whitespace Rev 61 → Rev 60

/trunk/debian/libhogweed2.install
File deleted
/trunk/debian/libnettle4.install
File deleted
/trunk/debian/libhogweed2.links
File deleted
/trunk/debian/libnettle4.docs
File deleted
/trunk/debian/control
8,7 → 8,7
Vcs-Browser: http://svn.kibibyte.se/nettle
Homepage: http://www.lysator.liu.se/~nisse/nettle/
 
Package: libnettle4
Package: libnettle3
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: low level cryptographic library (symmetric and one-way cryptos)
24,7 → 24,7
cryptographic algorithms for the application to use in any environment and
in any way it needs.
 
Package: libhogweed2
Package: libhogweed1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
44,7 → 44,7
Package: nettle-dev
Section: libdevel
Architecture: any
Depends: libnettle4 (= ${binary:Version}), libhogweed2 (= ${binary:Version}),
Depends: libnettle3 (= ${binary:Version}), libhogweed1 (= ${binary:Version}),
libgmp3-dev, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
Replaces: libnettle-dev
Conflicts: libnettle-dev
94,7 → 94,7
Section: debug
Priority: extra
Architecture: any
Depends: libnettle4 (= ${binary:Version}) | libhogweed2 (= ${binary:Version}) | nettle-bin (= ${binary:Version}), ${misc:Depends}
Depends: libnettle3 (= ${binary:Version}) | libhogweed1 (= ${binary:Version}) | nettle-bin (= ${binary:Version}), ${misc:Depends}
Description: low level cryptographic library (debugging symbols)
Nettle is a cryptographic library that is designed to fit easily in more or
less any context: In crypto toolkits for object-oriented languages (C++,
/trunk/debian/changelog
1,15 → 1,3
nettle (2.1-1) experimental; urgency=low
 
* New upstream release (Closes: #594386). Thanks to Sedat Dilek for
sorting things out.
- Drop rsa2sexp_algorithm_name.dpatch, 20_link_with_gmp.dpatch;
incorporated upstream.
- The SOVERSIONs of libnettle and libhogweed have changed to 4 and 2,
respectively; update and rename debian/control, debian/libnettle3.*,
debian/libhogweed1.*, and debian/nettle-bin.links accordingly.
 
-- Magnus Holmgren <holmgren@debian.org> Sun, 16 Jan 2011 20:41:14 +0100
 
nettle (2.0-2) unstable; urgency=low
 
* rsa2sexp_algorithm_name.dpatch (new): Use a default algorithm name
/trunk/debian/patches/rsa2sexp_algorithm_name.dpatch
0,0 → 1,42
#! /bin/sh /usr/share/dpatch/dpatch-run
## rsa2sexp_algorithm_name.dpatch by Magnus Holmgren <holmgren@debian.org>
##
## DP: Use a default algorithm name that LSH understands.
 
@DPATCH@
diff -urNad trunk~/rsa2sexp.c trunk/rsa2sexp.c
--- trunk~/rsa2sexp.c 2009-06-08 20:27:10.000000000 +0200
+++ trunk/rsa2sexp.c 2009-10-11 23:11:28.000000000 +0200
@@ -37,7 +37,7 @@
const struct rsa_private_key *priv)
{
if (!algorithm_name)
- algorithm_name = "rsa";
+ algorithm_name = "rsa-pkcs1";
if (priv)
return sexp_format(buffer,
diff -urNad trunk~/testsuite/rsa2sexp-test.c trunk/testsuite/rsa2sexp-test.c
--- trunk~/testsuite/rsa2sexp-test.c 2009-06-08 20:27:12.000000000 +0200
+++ trunk/testsuite/rsa2sexp-test.c 2009-10-11 23:11:56.000000000 +0200
@@ -92,13 +92,13 @@
print_hex(buffer.size, buffer.contents);
}
ASSERT(MEMEQH(buffer.size, buffer.contents,
- "2831303a7075626c69632d6b65792833"
- "3a72736128313a6e36333a085c340898"
- "9acae4faec3cbbad91c90d34c1d259cd"
- "74121a36f38b0b51424a9b2be514a043"
- "77113a6cdafe79dd7d5f2ecc8b5e9661"
- "189b86a7b22239907c252928313a6534"
- "3a36ad4b1d292929"));
+ "2831303a7075626c69632d6b65792839"
+ "3a7273612d706b63733128313a6e3633"
+ "3a085c3408989acae4faec3cbbad91c9"
+ "0d34c1d259cd74121a36f38b0b51424a"
+ "9b2be514a04377113a6cdafe79dd7d5f"
+ "2ecc8b5e9661189b86a7b22239907c25"
+ "2928313a65343a36ad4b1d292929"));
rsa_public_key_clear(&pub);
rsa_private_key_clear(&priv);
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: debian/patches/00list
===================================================================
--- debian/patches/00list (revision 61)
+++ debian/patches/00list (revision 60)
@@ -1 +1,3 @@
01_config
+20_link_with_gmp
+rsa2sexp_algorithm_name.dpatch
Index: debian/patches/20_link_with_gmp.dpatch
===================================================================
--- debian/patches/20_link_with_gmp.dpatch (nonexistent)
+++ debian/patches/20_link_with_gmp.dpatch (revision 60)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_link_with_gmp.dpatch by <magnus@kibibyte.se>
+##
+## DP: Link libhogweed.so.1 with -lgmp
+
+@DPATCH@
+diff -urNad nettle-1.15~/config.make.in nettle-1.15/config.make.in
+--- nettle-1.15~/config.make.in 2006-11-28 16:30:24.000000000 +0100
++++ nettle-1.15/config.make.in 2007-05-15 12:53:54.000000000 +0200
+@@ -39,7 +39,7 @@
+ LIBHOGWEED_SONAME = @LIBHOGWEED_SONAME@
+ LIBHOGWEED_FILE = @LIBHOGWEED_FILE@
+ LIBHOGWEED_FORLINK = @LIBHOGWEED_FORLINK@
+-LIBHOGWEED_LIBS = @LIBHOGWEED_LIBS@
++LIBHOGWEED_LIBS = @LIBHOGWEED_LIBS@ -lgmp -L. -lnettle
+ LIBHOGWEED_LINK = @LIBHOGWEED_LINK@
+
+ AR = ar
Index: debian/nettle-bin.links
===================================================================
--- debian/nettle-bin.links (revision 61)
+++ debian/nettle-bin.links (revision 60)
@@ -1 +1 @@
-usr/share/doc/libnettle4 usr/share/doc/nettle-bin
+usr/share/doc/libnettle3 usr/share/doc/nettle-bin
Index: debian/libnettle3.docs
===================================================================
--- debian/libnettle3.docs (nonexistent)
+++ debian/libnettle3.docs (revision 60)
@@ -0,0 +1,2 @@
+NEWS
+README
Index: debian/libhogweed1.install
===================================================================
--- debian/libhogweed1.install (nonexistent)
+++ debian/libhogweed1.install (revision 60)
@@ -0,0 +1 @@
+usr/lib/libhogweed*.so.*
Index: debian/libhogweed1.links
===================================================================
--- debian/libhogweed1.links (nonexistent)
+++ debian/libhogweed1.links (revision 60)
@@ -0,0 +1 @@
+usr/share/doc/libnettle3 usr/share/doc/libhogweed1
Index: debian/libnettle3.install
===================================================================
--- debian/libnettle3.install (nonexistent)
+++ debian/libnettle3.install (revision 60)
@@ -0,0 +1 @@
+usr/lib/libnettle*.so.*