[Pkg-gnutls-commits] r1137 - in /packages/gnutls26/trunk/debian: ./ patches/
ametzler at users.alioth.debian.org
ametzler at users.alioth.debian.org
Sun Aug 7 07:21:02 UTC 2011
Author: ametzler
Date: Sun Aug 7 07:21:01 2011
New Revision: 1137
URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1137
Log:
Merge branch2.11.x to trunk
Added:
packages/gnutls26/trunk/debian/libgnutls-openssl27.install
- copied unchanged from r1136, packages/gnutls26/branches/branch2.11.x/debian/libgnutls-openssl27.install
packages/gnutls26/trunk/debian/libgnutlsxx27.install
- copied unchanged from r1136, packages/gnutls26/branches/branch2.11.x/debian/libgnutlsxx27.install
packages/gnutls26/trunk/debian/patches/17_ignoretestsuitteerrors.diff
- copied unchanged from r1136, packages/gnutls26/branches/branch2.11.x/debian/patches/17_ignoretestsuitteerrors.diff
Removed:
packages/gnutls26/trunk/debian/libgnutlsxx26.install
Modified:
packages/gnutls26/trunk/debian/changelog
packages/gnutls26/trunk/debian/control
packages/gnutls26/trunk/debian/copyright
packages/gnutls26/trunk/debian/gnutls-bin.install
packages/gnutls26/trunk/debian/guile-gnutls.install
packages/gnutls26/trunk/debian/libgnutls-dev.install
packages/gnutls26/trunk/debian/libgnutls26.install
packages/gnutls26/trunk/debian/patches/20_gcrypt15compat.diff
packages/gnutls26/trunk/debian/patches/series
packages/gnutls26/trunk/debian/rules
packages/gnutls26/trunk/debian/watch
Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sun Aug 7 07:21:01 2011
@@ -1,8 +1,156 @@
-gnutls26 (2.10.5-4) UNRELEASED; urgency=low
+gnutls26 (2.12.7-4) UNRELEASED; urgency=low
* NOT RELEASED YET
- -- Andreas Metzler <ametzler at debian.org> Mon, 25 Jul 2011 19:57:04 +0200
+ -- Andreas Metzler <ametzler at debian.org> Mon, 25 Jul 2011 20:10:02 +0200
+
+gnutls26 (2.12.7-3) experimental; urgency=low
+
+ [ Simon Josefsson ]
+ * Fix Debian BTS URL in --with-packager-bug-reports option.
+
+ [ Andreas Metzler ]
+ * [20_gcrypt15compat.diff] Fix compatibility with gcrypt 1.5.
+
+ -- Andreas Metzler <ametzler at debian.org> Mon, 25 Jul 2011 19:59:36 +0200
+
+gnutls26 (2.12.7-2) experimental; urgency=low
+
+ * Stop shipping libtool la files.
+ * Convert to multi-arch. (Partial merge from Ubuntu 2.10.5-1ubuntu2):
+ + configure with --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH), update
+ *.install accordingly.
+ + Bump cdbs Build-Depends to 0.4.93 (required for expanding
+ $(DEB_HOST_MULTIARCH)).
+ + Bump debhelper b-d to 8.1.3 (for ${misc:Pre-Depends}).
+ + runtime libraries and guile-wrapper are Multi-Arch: same with
+ Pre-Depends: ${misc:Pre-Depends}, -bin (helper binaries) and -doc are
+ Multi-Arch: foreign, -dev and -dbg remain unchanged.
+ + Diverge from Ubuntu patch by not settting Multi-Arch: same on -dbg
+ package. It contains debugging symbols for both library and helper
+ binaries ( e.g. /usr/lib/debug/usr/bin/gnutls-cli) and is therefore not
+ co-installable with itself.
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 26 Jun 2011 15:01:58 +0200
+
+gnutls26 (2.12.7-1) experimental; urgency=low
+
+ * New upstream version.
+ * Update 17_ignoretestsuitteerrors.diff.
+ * A new version of pokerth has been uploaded to sid, update libgnutls26
+ Breaks accordingly.
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 19 Jun 2011 08:49:01 +0200
+
+gnutls26 (2.12.6.1-1) experimental; urgency=low
+
+ * New upstream version.
+ * Bump shlibs, global_set_time_function() was added.
+ * Stop setting CFLAGS += -Wall, it is set by default again.
+ * [17_ignoretestsuitteerrors.diff] Ignore two (not serious) testsuite
+ errors.
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 05 Jun 2011 13:18:50 +0200
+
+gnutls26 (2.12.5-1) experimental; urgency=low
+
+ * New upstream version.
+ * Bump shlibs, gnutls_x509_crq_verify() was added.
+
+ -- Andreas Metzler <ametzler at debian.org> Sat, 14 May 2011 13:21:12 +0200
+
+gnutls26 (2.12.4-1) experimental; urgency=low
+
+ * New upstream version.
+ * Bump shlibs. (gnutls_certificate_get_issuer() added).
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 08 May 2011 15:19:18 +0200
+
+gnutls26 (2.12.3-1) experimental; urgency=low
+
+ * New upstream version.
+ * Drop patches included upstream: [18_restoreHMAC-MD5.diff]
+
+ -- Andreas Metzler <ametzler at debian.org> Fri, 22 Apr 2011 18:26:11 +0200
+
+gnutls26 (2.12.2-2) experimental; urgency=low
+
+ * [18_restoreHMAC-MD5.diff], pulled from upstream git, restore HMAC-MD5
+ for compatibility. Closes: #623001
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 17 Apr 2011 15:44:30 +0200
+
+gnutls26 (2.12.2-1) experimental; urgency=low
+
+ * New upstream version.
+ * [lintian] Drop article from short package descriptions.
+
+ -- Andreas Metzler <ametzler at debian.org> Fri, 08 Apr 2011 19:36:27 +0200
+
+gnutls26 (2.12.1-1) experimental; urgency=low
+
+ * New upstream version.
+ + certtool: Generated certificate request with stricter permissions.
+ Closes: #619746
+ * Drop superfluous patches:
+ 17_sizeof_gnutls_openpgp_keyid_t.diff 18_ext_mod_iadef.diff
+ 19_uninitializedvar.diff 20_access_freedmemory.diff
+ * Add Breaks for all packages using the GnuTLS OpenSSL wrapper. They will
+ need a binNMU when gnutls 2.12.x uploaded to unstable.
+
+ -- Andreas Metzler <ametzler at debian.org> Sat, 02 Apr 2011 15:22:46 +0200
+
+gnutls26 (2.12.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ + Drop superceded patches 17_goldhotfix.patch
+ 18_libgnutls-openssl_soname.diff.
+ * Pull a couple of post release fixes from upstream gnutls_2_12_x branch:
+ 17_sizeof_gnutls_openpgp_keyid_t.diff 18_ext_mod_iadef.diff
+ 19_uninitializedvar.diff 20_access_freedmemory.diff
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 27 Mar 2011 10:23:11 +0200
+
+gnutls26 (2.11.7-2) experimental; urgency=low
+
+ * 18_libgnutls-openssl_soname.diff. Bump libgnutls-openssl soname (libtool
+ versioning: 27:0:0).
+ * Split off libgnutls-openssl to a separate package, since the sonames are
+ not in sync anymore.
+
+ -- Andreas Metzler <ametzler at debian.org> Fri, 11 Mar 2011 17:48:47 +0100
+
+gnutls26 (2.11.7-1) experimental; urgency=low
+
+ * New upstream version (rc for 2.12)
+ + Drop superfluous patches (15_fixgnutlspc.diff 17_endian.diff)
+ + Bump shlibs.
+ * debian/patches/17_goldhotfix.patch Link gnutls-extra gainst gcrypt.
+
+ -- Andreas Metzler <ametzler at debian.org> Thu, 10 Mar 2011 12:12:01 +0100
+
+gnutls26 (2.11.6-2) experimental; urgency=low
+
+ * 17_endian.diff - Pulled from upstream. Fix testsuite error (./tests/resume)
+ on big endian architectures.
+
+ -- Andreas Metzler <ametzler at debian.org> Wed, 23 Feb 2011 19:20:40 +0100
+
+gnutls26 (2.11.6-1) experimental; urgency=low
+
+ * Development release.
+ * Continue building against libgcrypt, run configure with --with-libgcrypt.
+ * Refresh patches/15_fixgnutlspc.diff.
+ * Set --with-packager* options.
+ * Install newly available p11tool binary.
+ * Bump libgcrypt11-dev Build-Depends.
+ * C++ wrapper soname bump, change package name accordingly.
+ * Bump shlibs.
+ * Update debian/copyright.
+ * Set CFLAGS += -Wall, the latest combination of cdbs + dpkg-dev does not
+ seem to set it by default.
+
+ -- Andreas Metzler <ametzler at debian.org> Sat, 19 Feb 2011 15:29:43 +0100
gnutls26 (2.10.5-3) unstable; urgency=medium
Modified: packages/gnutls26/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/control?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/control (original)
+++ packages/gnutls26/trunk/debian/control Sun Aug 7 07:21:01 2011
@@ -6,11 +6,11 @@
Eric Dorland <eric at debian.org>,
James Westby <jw+debian at jameswestby.net>,
Simon Josefsson <simon at josefsson.org>
-Build-Depends: debhelper (>= 7.0.14), libgcrypt11-dev (>= 1.3.2), zlib1g-dev,
- cdbs (>= 0.4.53), gtk-doc-tools, texinfo (>= 4.8),
+Build-Depends: debhelper (>= 8.1.3), libgcrypt11-dev (>= 1.4.0), zlib1g-dev,
+ cdbs (>= 0.4.93), gtk-doc-tools, texinfo (>= 4.8),
libtasn1-3-dev (>= 0.3.4-0), autotools-dev, guile-1.8-dev, datefudge
Build-Conflicts: libgnutls-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/gnutls26/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/
Homepage: http://www.gnutls.org/
@@ -20,11 +20,14 @@
Section: libdevel
Architecture: any
Provides: gnutls-dev
-Depends: libgnutls26 (= ${binary:Version}), libgnutlsxx26 (= ${binary:Version}), libgcrypt11-dev (>= 1.3.0), libc6-dev | libc-dev, zlib1g-dev, libtasn1-3-dev (>= 0.3.4), ${misc:Depends}
+Depends: libgnutls26 (= ${binary:Version}),
+ libgnutlsxx27 (= ${binary:Version}),libgnutls-openssl27 (= ${binary:Version}),
+ libgcrypt11-dev (>= 1.4.0), libc6-dev | libc-dev, zlib1g-dev,
+ libtasn1-3-dev (>= 0.3.4), ${misc:Depends}
Suggests: gnutls-doc, gnutls-bin, guile-gnutls
Conflicts: libgnutls11-dev, gnutls-dev (<< 0.4.0-0), gnutls0.4-dev
Replaces: libgnutls11-dev, gnutls-dev (<< 0.4.0-0), gnutls0.4-dev
-Description: the GNU TLS library - development files
+Description: GNU TLS library - development files
GnuTLS is a portable library which implements the Transport Layer
Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
.
@@ -49,10 +52,19 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: gnutls0, gnutls3, gnutls0.4
Conflicts: gnutls0, gnutls0.4
-# Bug 587755. - This could be removed after a libgnutls soname bump.
-Breaks: libsoup2.4-1 (<= 2.30.1-1), libsoup2.4-1 (= 2.31.2-1)
+Pre-Depends: ${misc:Pre-Depends}
+# libsoup* Bug 587755. - This could be removed after a libgnutls soname bump.
+# The others are using the gnutls openssl wrapper.
+Breaks: libsoup2.4-1 (<= 2.30.1-1), libsoup2.4-1 (= 2.31.2-1),
+ ccbuild (<= 2.0.1-1), csync2 (<= 1.34-2.2), freewheeling (<= 0.6-1.1),
+ gkrellm (<= 2.3.4-1), macopix-gtk2 (<= 1.7.4-3), pokerth (<= 0.8.3-3+b1),
+ pokerth-server (<= 0.8.3-3+b1), sipsak (<= 0.9.6-2.1),
+ slrn (<= 1.0.0~pre18-1.1), slrnpull (<= 1.0.0~pre18-1.1),
+ snowdrop (<= 0.02b-8), ssmtp (<= 2.64-4), tf5 (<= 5.0beta8-4),
+ wput (<= 0.6.2-2), zoneminder (<= 1.24.2-9)
Suggests: gnutls-bin
-Description: the GNU TLS library - runtime library
+Multi-Arch: same
+Description: GNU TLS library - runtime library
GnuTLS is a portable library which implements the Transport Layer
Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
.
@@ -89,7 +101,8 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libgnutls5-dev, gnutls0.4-dev, gnutls-dev (<< 0.4.0-0)
Replaces: libgnutls5-dev, gnutls0.4-dev, gnutls-dev (<< 0.4.0-0)
-Description: the GNU TLS library - commandline utilities
+Multi-Arch: foreign
+Description: GNU TLS library - commandline utilities
GnuTLS is a portable library which implements the Transport Layer
Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
.
@@ -114,7 +127,8 @@
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Description: the GNU TLS library - documentation and examples
+Multi-Arch: foreign
+Description: GNU TLS library - documentation and examples
GnuTLS is a portable library which implements the Transport Layer
Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
.
@@ -137,7 +151,9 @@
Architecture: any
Section: lisp
Depends: ${misc:Depends},${shlibs:Depends}, guile-1.8
-Description: the GNU TLS library - GNU Guile bindings
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: GNU TLS library - GNU Guile bindings
GnuTLS is a portable library which implements the Transport Layer
Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
.
@@ -155,12 +171,14 @@
.
This package contains the GNU Guile 1.8 modules.
-Package: libgnutlsxx26
+Package: libgnutlsxx27
Priority: extra
Architecture: any
Section: libs
Depends: libgnutls26 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: the GNU TLS library - C++ runtime library
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: GNU TLS library - C++ runtime library
GnuTLS is a portable library which implements the Transport Layer
Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
.
@@ -177,3 +195,28 @@
Camellia (RFC 4132)).
.
This package contains the C++ runtime libraries.
+
+Package: libgnutls-openssl27
+Priority: standard
+Architecture: any
+Section: libs
+Depends: libgnutls26 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: GNU TLS library - OpenSSL wrapper
+ GnuTLS is a portable library which implements the Transport Layer
+ Security (TLS 1.0, 1.1, 1.2) and Secure Sockets Layer (SSL) 3.0 protocols.
+ .
+ GnuTLS features support for:
+ - TLS extensions: server name indication, max record size, opaque PRF
+ input, etc.
+ - authentication using the SRP protocol.
+ - authentication using both X.509 certificates and OpenPGP keys.
+ - TLS Pre-Shared-Keys (PSK) extension.
+ - Inner Application (TLS/IA) extension.
+ - X.509 and OpenPGP certificate handling.
+ - X.509 Proxy Certificates (RFC 3820).
+ - all the strong encryption algorithms (including SHA-256/384/512 and
+ Camellia (RFC 4132)).
+ .
+ This package contains the runtime library of the GnuTLS OpenSSL wrapper.
Modified: packages/gnutls26/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/copyright?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/copyright (original)
+++ packages/gnutls26/trunk/debian/copyright Sun Aug 7 07:21:01 2011
@@ -23,18 +23,25 @@
Joe Orton <jorton at redhat.com>
Daniel Kahn Gillmor <dkg-debian.org at fifthhorseman.net>
David MarÃn Carreño <davefx at gmail.com>
+ Daiki Ueno <ueno at unixuser.org>
+ Brad Hards <bradh at frogmouth.net>
+ Boyan Kasarov <bkasarov at gmail.com>
+ Steve Dispensa <dispensa at phonefactor.com>
+ Jonathan Bastien-Filiatrault <joe at x2a.org>
License: The main library is licensed under GNU Lesser General Public
License (LGPL) version 2.1+, Gnutls Extra (i.e. openssl wrapper library,
-and library for code for "GnuTLS Inner Application" support) and commandline
- utilities are licenced under the GNU General Public License version 3+. The
- Guile bindings use the same license as the respective underlying library,
-i.e. LGPLv2.1+ for the main library and GPLv3+ for Gnutls extra.
+and library for code for "GnuTLS Inner Application" support) build system,
+testsuite and commandline utilities are licenced under the GNU General
+Public License version 3+. The Guile bindings use the same license as the
+respective underlying library, i.e. LGPLv2.1+ for the main library and
+GPLv3+ for Gnutls extra.
Copyright:
--------------------
- * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ * 2010 Free Software Foundation
*
* Author: Nikos Mavrogiannopoulos
*
@@ -56,32 +63,33 @@
* USA
--------------------
/*
- * Copyright (C) 2001, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free
+ * Software Foundation, Inc.
*
* Author: Nikos Mavrogiannopoulos
*
- * This file is part of GNUTLS-EXTRA.
+ * This file is part of GnuTLS-EXTRA.
*
- * GNUTLS-EXTRA is free software: you can redistribute it and/or
+ * GnuTLS-extra is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
+ * published by the Free Software Foundation; either version 3 of the
* License, or (at your option) any later version.
*
- * GNUTLS-EXTRA is distributed in the hope that it will be useful, but
+ * GnuTLS-extra is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
+ * along with GnuTLS-EXTRA; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
--------------------
The documentation is distributed under the terms of the GNU Free
Documentation License (FDL):
--------------------
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -123,3 +131,49 @@
contains the code for "GnuTLS Inner Application" support and the
OpenSSL compatibility layer. The gnutls library is located in the
lib/ directory, while the gnutls-extra library is at libextra/.
+
+=========== Foreign code included in tarball ==================
+
+/lib/pakchois/ includes a modified copy of the PaKChoiS library.
+The original library was downloaded from
+http://www.manyfish.co.uk/pakchois/ and is also licensed under
+LGPLv2.1+.
+
+Copyright:
+/*
+ pakchois PKCS#11 interface -- error mapping
+ Copyright (C) 2008, Joe Orton <joe at manyfish.co.uk>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ MA 02111-1307, USA
+*/
+
+/*
+ This code is directly derived from the scute.org PKCS#11 cryptoki
+ interface, which is:
+
+ Copyright 2006, 2007 g10 Code GmbH
+ Copyright 2006 Andreas Jellinghaus
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even
+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.
+*/
+
Modified: packages/gnutls26/trunk/debian/gnutls-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/gnutls-bin.install?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/gnutls-bin.install (original)
+++ packages/gnutls26/trunk/debian/gnutls-bin.install Sun Aug 7 07:21:01 2011
@@ -1,4 +1,1 @@
-debian/tmp/usr/bin/gnutls-* usr/bin
-debian/tmp/usr/bin/certtool usr/bin
-debian/tmp/usr/bin/srptool usr/bin
-debian/tmp/usr/bin/psktool usr/bin
+debian/tmp/usr/bin/* usr/bin
Modified: packages/gnutls26/trunk/debian/guile-gnutls.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/guile-gnutls.install?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/guile-gnutls.install (original)
+++ packages/gnutls26/trunk/debian/guile-gnutls.install Sun Aug 7 07:21:01 2011
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libguile-gnutls*.so* usr/lib
-debian/tmp/usr/share/guile/site usr/share/guile
+debian/tmp/usr/lib/*/libguile-gnutls*.so*
+debian/tmp/usr/share/guile/site
Modified: packages/gnutls26/trunk/debian/libgnutls-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/libgnutls-dev.install?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/libgnutls-dev.install (original)
+++ packages/gnutls26/trunk/debian/libgnutls-dev.install Sun Aug 7 07:21:01 2011
@@ -1,6 +1,6 @@
-debian/tmp/usr/include/* usr/include
-debian/tmp/usr/lib/libgnutls*.so usr/lib
-debian/tmp/usr/lib/libgnutls*.a usr/lib
-debian/tmp/usr/lib/pkgconfig/gnutls.pc usr/lib/pkgconfig
-debian/tmp/usr/lib/pkgconfig/gnutls-extra.pc usr/lib/pkgconfig
+debian/tmp/usr/include/*
+debian/tmp/usr/lib/*/libgnutls*.so
+debian/tmp/usr/lib/*/libgnutls*.a
+debian/tmp/usr/lib/*/pkgconfig/gnutls.pc
+debian/tmp/usr/lib/*/pkgconfig/gnutls-extra.pc
Modified: packages/gnutls26/trunk/debian/libgnutls26.install
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/libgnutls26.install?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/libgnutls26.install (original)
+++ packages/gnutls26/trunk/debian/libgnutls26.install Sun Aug 7 07:21:01 2011
@@ -1,3 +1,3 @@
-debian/tmp/usr/lib/libgnutls.so.* usr/lib
-debian/tmp/usr/lib/libgnutls-*.so.* usr/lib
-debian/tmp/usr/share/locale/* /usr/share/locale
+debian/tmp/usr/lib/*/libgnutls.so.*
+debian/tmp/usr/lib/*/libgnutls-e*.so.*
+debian/tmp/usr/share/locale/*
Modified: packages/gnutls26/trunk/debian/patches/20_gcrypt15compat.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/20_gcrypt15compat.diff?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/20_gcrypt15compat.diff (original)
+++ packages/gnutls26/trunk/debian/patches/20_gcrypt15compat.diff Sun Aug 7 07:21:01 2011
@@ -3,8 +3,8 @@
Author: Andreas Metzler <ametzler at debian.org>
Forwarded: http://lists.gnu.org/archive/html/gnutls-devel/2011-07/msg00020.html
---- gnutls26-2.10.5.orig/lib/pk-libgcrypt.c
-+++ gnutls26-2.10.5/lib/pk-libgcrypt.c
+--- gnutls26-2.12.7.orig/lib/gcrypt/pk.c
++++ gnutls26-2.12.7/lib/gcrypt/pk.c
@@ -112,7 +112,7 @@ _wrap_gcry_pk_encrypt (gnutls_pk_algorit
goto cleanup;
}
@@ -24,32 +24,32 @@
{
gnutls_assert ();
@@ -327,7 +327,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_
- goto cleanup;
- }
+ goto cleanup;
+ }
-- res[0] = gcry_sexp_nth_mpi (list, 1, 0);
-+ res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
- gcry_sexp_release (list);
+- res[0] = gcry_sexp_nth_mpi (list, 1, 0);
++ res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
+ gcry_sexp_release (list);
- list = gcry_sexp_find_token (s_sig, "s", 0);
+ list = gcry_sexp_find_token (s_sig, "s", 0);
@@ -338,7 +338,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_
- goto cleanup;
- }
+ goto cleanup;
+ }
-- res[1] = gcry_sexp_nth_mpi (list, 1, 0);
-+ res[1] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
- gcry_sexp_release (list);
+- res[1] = gcry_sexp_nth_mpi (list, 1, 0);
++ res[1] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
+ gcry_sexp_release (list);
- ret = _gnutls_encode_ber_rs (signature, res[0], res[1]);
+ ret = _gnutls_encode_ber_rs (signature, res[0], res[1]);
@@ -360,7 +360,7 @@ _wrap_gcry_pk_sign (gnutls_pk_algorithm_
- goto cleanup;
- }
+ goto cleanup;
+ }
-- res[0] = gcry_sexp_nth_mpi (list, 1, 0);
-+ res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
- gcry_sexp_release (list);
+- res[0] = gcry_sexp_nth_mpi (list, 1, 0);
++ res[0] = gcry_sexp_nth_mpi (list, 1, GCRYMPI_FMT_USG);
+ gcry_sexp_release (list);
- ret = _gnutls_mpi_dprint (res[0], signature);
+ ret = _gnutls_mpi_dprint (res[0], signature);
@@ -559,7 +559,7 @@ _dsa_generate_params (bigint_t * resarr,
return GNUTLS_E_INTERNAL_ERROR;
}
@@ -95,7 +95,7 @@
gcry_sexp_release (list);
gcry_sexp_release (key);
-@@ -653,7 +653,7 @@ _rsa_generate_params (bigint_t * resarr,
+@@ -660,7 +660,7 @@ _rsa_generate_params (bigint_t * resarr,
return GNUTLS_E_INTERNAL_ERROR;
}
@@ -104,7 +104,7 @@
gcry_sexp_release (list);
list = gcry_sexp_find_token (key, "e", 0);
-@@ -664,7 +664,7 @@ _rsa_generate_params (bigint_t * resarr,
+@@ -671,7 +671,7 @@ _rsa_generate_params (bigint_t * resarr,
return GNUTLS_E_INTERNAL_ERROR;
}
@@ -113,7 +113,7 @@
gcry_sexp_release (list);
list = gcry_sexp_find_token (key, "d", 0);
-@@ -675,7 +675,7 @@ _rsa_generate_params (bigint_t * resarr,
+@@ -682,7 +682,7 @@ _rsa_generate_params (bigint_t * resarr,
return GNUTLS_E_INTERNAL_ERROR;
}
@@ -122,7 +122,7 @@
gcry_sexp_release (list);
list = gcry_sexp_find_token (key, "p", 0);
-@@ -686,7 +686,7 @@ _rsa_generate_params (bigint_t * resarr,
+@@ -693,7 +693,7 @@ _rsa_generate_params (bigint_t * resarr,
return GNUTLS_E_INTERNAL_ERROR;
}
@@ -131,7 +131,7 @@
gcry_sexp_release (list);
-@@ -698,7 +698,7 @@ _rsa_generate_params (bigint_t * resarr,
+@@ -705,7 +705,7 @@ _rsa_generate_params (bigint_t * resarr,
return GNUTLS_E_INTERNAL_ERROR;
}
@@ -140,7 +140,7 @@
gcry_sexp_release (list);
-@@ -710,7 +710,7 @@ _rsa_generate_params (bigint_t * resarr,
+@@ -717,7 +717,7 @@ _rsa_generate_params (bigint_t * resarr,
return GNUTLS_E_INTERNAL_ERROR;
}
Modified: packages/gnutls26/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/patches/series?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/patches/series (original)
+++ packages/gnutls26/trunk/debian/patches/series Sun Aug 7 07:21:01 2011
@@ -1,3 +1,4 @@
14_version_gettextcat.diff
16_unnecessarydep.diff
+17_ignoretestsuitteerrors.diff
20_gcrypt15compat.diff
Modified: packages/gnutls26/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/rules?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/rules (original)
+++ packages/gnutls26/trunk/debian/rules Sun Aug 7 07:21:01 2011
@@ -4,14 +4,18 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx --without-lzo --enable-guile --with-guile-site-dir=/usr/share/guile/site --cache-file=$(CURDIR)/config.cache
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-ld-version-script --enable-cxx \
+ --without-lzo --enable-guile \
+ --with-guile-site-dir=/usr/share/guile/site \
+ --cache-file=$(CURDIR)/config.cache --with-libgcrypt \
+ --with-packager=Debian \
+ --with-packager-bug-reports=http://bugs.debian.org/ \
+ --with-packager-version="$(DEB_VERSION)" \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
DEB_MAKE_CHECK_TARGET = check
-DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>=2.9.11-0)'
-DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -V 'guile-gnutls (>=2.9.11-0)'
+DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>= 2.12.6.1-0)'
+DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -V 'guile-gnutls (>= 2.12.6.1-0)'
DEB_COMPRESS_EXCLUDE := gnutls.pdf
-
-CFLAGS += -Wall
-CXXFLAGS += -Wall
# pre-clean rule: save gnutls.pdf since it is expensive to regenerate.
# See README.source
Modified: packages/gnutls26/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/watch?rev=1137&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/watch (original)
+++ packages/gnutls26/trunk/debian/watch Sun Aug 7 07:21:01 2011
@@ -1,2 +1,2 @@
version=3
-ftp://ftp.gnutls.org/pub/gnutls/gnutls-(.*)\.tar\.bz2 debian uupdate
+ftp://ftp.gnutls.org/pub/gnutls/devel/gnutls-(.*)\.tar\.bz2 debian uupdate
More information about the Pkg-gnutls-commits
mailing list