[Pkg-gnutls-commits] r674 - in /packages/gnutls26/trunk/debian: ./ patches/
ametzler at users.alioth.debian.org
ametzler at users.alioth.debian.org
Sun Feb 15 17:07:50 UTC 2009
Author: ametzler
Date: Sun Feb 15 17:07:49 2009
New Revision: 674
URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=674
Log:
merge experimental (branch2.5.x) to trunk
Removed:
packages/gnutls26/trunk/debian/patches/20_GNUTLS-SA-2008-3.patch
packages/gnutls26/trunk/debian/patches/21_GNUTLS-SA-2008-3.fix.patch
packages/gnutls26/trunk/debian/patches/22_deprecate_md2_md5_x509_validation.diff
packages/gnutls26/trunk/debian/patches/22_whitespace.patch
packages/gnutls26/trunk/debian/patches/23_permit_v1_CA.diff
packages/gnutls26/trunk/debian/patches/24_intermedcert.patch
packages/gnutls26/trunk/debian/patches/25_bufferoverrun.patch
Modified:
packages/gnutls26/trunk/debian/changelog
packages/gnutls26/trunk/debian/control
packages/gnutls26/trunk/debian/rules
Modified: packages/gnutls26/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/changelog?rev=674&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/changelog (original)
+++ packages/gnutls26/trunk/debian/changelog Sun Feb 15 17:07:49 2009
@@ -1,8 +1,58 @@
-gnutls26 (2.4.2-7) UNRELEASED; urgency=low
+gnutls26 (2.6.4-2) experimental; urgency=low
* NOT RELEASED YET
-- Andreas Metzler <ametzler at debian.org> Sat, 07 Feb 2009 13:25:05 +0100
+
+gnutls26 (2.6.4-1) experimental; urgency=low
+
+ * New upstream version.
+
+ -- Andreas Metzler <ametzler at debian.org> Sat, 07 Feb 2009 14:32:57 +0100
+
+gnutls26 (2.6.3-1) experimental; urgency=low
+
+ * New upstream version.
+ + Corrects bug gnutls-cli which caused a rehandshake request
+ to be ignored. Closes: #396867
+ * Drop debian/patches/21_GNUTLS-SA-2008-3.fix.patch (included upstream)
+
+ -- Andreas Metzler <ametzler at debian.org> Sun, 21 Dec 2008 10:46:38 +0100
+
+gnutls26 (2.6.2-2) experimental; urgency=low
+
+ * 21_GNUTLS-SA-2008-3.fix.patch Another fix for the verification fix. Some
+ correct certificate chains were not recognized as verified.
+ Closes: #507633
+ * [lintian] Add ${misc:Depends} to multiple dendency lines.
+
+ -- Andreas Metzler <ametzler at debian.org> Sat, 06 Dec 2008 13:31:58 +0100
+
+gnutls26 (2.6.2-1) experimental; urgency=low
+
+ * New upstream version.
+ + Fixes certification verifaction error CVE-2008-4989. Closes: #505360
+ + Drop 20_fix_501077.diff.
+ * ia64 has guile-1.8 nowadays, let's try building the guile-gnutls wrappper
+ there.
+ * Add Simon Josefsson to uploaders.
+
+ -- Andreas Metzler <ametzler at debian.org> Thu, 13 Nov 2008 19:30:06 +0100
+
+gnutls26 (2.6.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * Add debian/patches/20_fix_501077.diff to fix an out of bound access in
+ gnutls-openssl. (Thanks, Thomas Viehmann). Closes: #501077
+
+ -- Andreas Metzler <ametzler at debian.org> Sat, 25 Oct 2008 09:59:03 +0200
+
+gnutls26 (2.5.9-1) experimental; urgency=low
+
+ * New upstream development version.
+ * Bump shlibs.
+
+ -- Andreas Metzler <ametzler at debian.org> Sat, 04 Oct 2008 12:40:01 +0200
gnutls26 (2.4.2-6) unstable; urgency=medium
Modified: packages/gnutls26/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/control?rev=674&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/control (original)
+++ packages/gnutls26/trunk/debian/control Sun Feb 15 17:07:49 2009
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian GnuTLS Maintainers <pkg-gnutls-maint at lists.alioth.debian.org>
Uploaders: Andreas Metzler <ametzler at debian.org>, Eric Dorland <eric at debian.org>, James Westby <jw+debian at jameswestby.net>, Simon Josefsson <simon at josefsson.org>
-Build-Depends: debhelper (>= 5.0.0), libgcrypt11-dev (>= 1.3.2), zlib1g-dev, cdbs, gtk-doc-tools, texinfo (>= 4.8), libtasn1-3-dev (>= 0.3.4-0), autotools-dev, guile-1.8-dev [!ia64]
+Build-Depends: debhelper (>= 5.0.0), libgcrypt11-dev (>= 1.3.2), zlib1g-dev, cdbs, gtk-doc-tools, texinfo (>= 4.8), libtasn1-3-dev (>= 0.3.4-0), autotools-dev, guile-1.8-dev
Build-Conflicts: libgnutls-dev
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/gnutls26/trunk
@@ -15,7 +15,7 @@
Section: libdevel
Architecture: any
Provides: gnutls-dev
-Depends: libgnutls26 (= ${binary:Version}), libgcrypt11-dev (>= 1.3.0), libc6-dev | libc-dev, zlib1g-dev, libtasn1-3-dev (>= 0.3.4)
+Depends: libgnutls26 (= ${binary:Version}), libgcrypt11-dev (>= 1.3.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
@@ -36,7 +36,7 @@
Priority: important
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: gnutls0, gnutls3, gnutls0.4
Conflicts: gnutls0, gnutls0.4
Suggests: gnutls-bin
@@ -57,7 +57,7 @@
Priority: extra
Architecture: any
Section: devel
-Depends: libgnutls26 (= ${binary:Version})
+Depends: libgnutls26 (= ${binary:Version}), ${misc:Depends}
Conflicts: libgnutls13-dbg
Description: GNU TLS library - debugger symbols
gnutls is a portable library which implements the Transport Layer
@@ -76,7 +76,7 @@
Priority: optional
Architecture: any
Section: net
-Depends: ${shlibs:Depends}
+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
@@ -99,7 +99,7 @@
Package: guile-gnutls
Priority: optional
-Architecture: alpha amd64 arm armel hppa i386 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc s390 sparc
+Architecture: any
Section: libs
Depends: ${misc:Depends},${shlibs:Depends}, guile-1.8
Description: the GNU TLS library - GNU Guile bindings
Modified: packages/gnutls26/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls26/trunk/debian/rules?rev=674&op=diff
==============================================================================
--- packages/gnutls26/trunk/debian/rules (original)
+++ packages/gnutls26/trunk/debian/rules Sun Feb 15 17:07:49 2009
@@ -10,19 +10,14 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script --disable-cxx --without-lzo
+DEB_CONFIGURE_EXTRA_FLAGS = --with-mcrypt=no --enable-ld-version-script --disable-cxx --without-lzo --enable-guile --with-guile-site-dir=/usr/share/guile/site
DEB_MAKE_CHECK_TARGET = check
DEB_DH_STRIP_ARGS = --dbg-package=libgnutls26-dbg
-DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>=2.4.0-0)'
+DEB_DH_MAKESHLIBS_ARGS_libgnutls26 := -V 'libgnutls26 (>=2.5.9-0)'
DEB_DH_MAKESHLIBS_ARGS_guile-gnutls := -Xusr/lib/libguile-gnutls-
DEB_COMPRESS_EXCLUDE := gnutls.pdf
-# No guile on ia64; do not build gnutls wrapper there.
-ifeq ($(DEB_BUILD_ARCH),ia64)
- DEB_CONFIGURE_EXTRA_FLAGS += --disable-guile
-else
- DEB_CONFIGURE_EXTRA_FLAGS += --enable-guile --with-guile-site-dir=/usr/share/guile/site
-endif
+
#build/libgnutls-doc::
# $(DEB_MAKE_INVOKE) -C libextra/openpgp pgp-api.tex
More information about the Pkg-gnutls-commits
mailing list