[Pkg-gnutls-commits] r1803 - in /packages/libgcrypt11/trunk: ./ debian/ debian/patches/

ametzler at users.alioth.debian.org ametzler at users.alioth.debian.org
Sun Jun 9 11:13:04 UTC 2013


Author: ametzler
Date: Sun Jun  9 11:13:03 2013
New Revision: 1803

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1803
Log:
Merge branches/branch1.5 to trunk

Removed:
    packages/libgcrypt11/trunk/debian/patches/29_Fix-a-problem-with-select-and-high-fds.patch
    packages/libgcrypt11/trunk/debian/patches/30_Avoid-dereferencing-pointer-right-after-the-end.patch
    packages/libgcrypt11/trunk/debian/patches/31_Fix-segv-with-AES-NI-on-some-platforms.patch
    packages/libgcrypt11/trunk/debian/patches/32_libgcrypt-1.5-rinjdael-Fix-use-of-SSE2-outside-USE_A.patch
Modified:
    packages/libgcrypt11/trunk/   (props changed)
    packages/libgcrypt11/trunk/debian/changelog
    packages/libgcrypt11/trunk/debian/control
    packages/libgcrypt11/trunk/debian/copyright
    packages/libgcrypt11/trunk/debian/libgcrypt11.symbols
    packages/libgcrypt11/trunk/debian/patches/series
    packages/libgcrypt11/trunk/debian/rules
    packages/libgcrypt11/trunk/debian/watch

Propchange: packages/libgcrypt11/trunk/
------------------------------------------------------------------------------
    svn:mergeinfo = /packages/libgcrypt11/branches/branch1.5:1696-1801

Modified: packages/libgcrypt11/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/changelog?rev=1803&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/changelog (original)
+++ packages/libgcrypt11/trunk/debian/changelog Sun Jun  9 11:13:03 2013
@@ -1,8 +1,37 @@
-libgcrypt11 (1.5.0-6) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Sun, 24 Feb 2013 18:49:17 +0100
+libgcrypt11 (1.5.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * Fix vcs-field-not-canonical lintian error by refering to anonscm instead
+    of svn.debian.org.
+  * Update info in debian/copyright from upstream's README, fixing typo 'teh'.
+  * Delete some outdated and unused code in debian/rules.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 09 Jun 2013 08:54:56 +0200
+
+libgcrypt11 (1.5.2-1) experimental; urgency=low
+
+  * New upstream version.
+    + IDEA support added.
+  * Move list of supported algorithms to a separate paragraph in description
+    to decrease work-load of translators. Closes: #640261
+  * Move TeX-packages from b-d to Build-Depends-Indep. (Thanks, P. J.
+    McDermott) Closes: #682597
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 21 Apr 2013 14:31:51 +0200
+
+libgcrypt11 (1.5.1-1) experimental; urgency=low
+
+  * Point watchfile to stable release.
+  * New upstream version.
+  * Drop superfluous patches:
+    29_Fix-a-problem-with-select-and-high-fds.patch
+    30_Avoid-dereferencing-pointer-right-after-the-end.patch
+    31_Fix-segv-with-AES-NI-on-some-platforms.patch
+    32_libgcrypt-1.5-rinjdael-Fix-use-of-SSE2-outside-USE_A.patch
+  * Bump version gcry_control at GCRYPT_1.2 in debian/libgcrypt11.symbols from
+    1.4.5 to 1.5.1 since its argument enum has a new member.
+
+ -- Andreas Metzler <ametzler at debian.org>  Thu, 21 Mar 2013 19:43:39 +0100
 
 libgcrypt11 (1.5.0-5) unstable; urgency=low
 

Modified: packages/libgcrypt11/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/control?rev=1803&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/control (original)
+++ packages/libgcrypt11/trunk/debian/control Sun Jun  9 11:13:03 2013
@@ -5,12 +5,15 @@
 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 (>> 8.1.3), texlive-latex-base,
- texlive-generic-recommended, texinfo (>= 4.6-0), cdbs (>= 0.4.93),
+Build-Depends: debhelper (>> 8.1.3), cdbs (>= 0.4.93),
  libgpg-error-dev (>> 1.10-0.1), autotools-dev
-Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/libgcrypt11/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/
+Build-Depends-Indep: texlive-latex-base, texlive-generic-recommended,
+ texinfo (>= 4.6-0)
+Standards-Version: 3.9.4
+#Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/libgcrypt11/trunk
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnutls/packages/libgcrypt11/trunk
+#Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnutls/packages/libgcrypt11/trunk/
 Homepage: http://directory.fsf.org/project/libgcrypt/
 
 Package: libgcrypt11-doc
@@ -24,8 +27,9 @@
  libgcrypt contains cryptographic functions.  Many important free
  ciphers, hash algorithms and public key signing algorithms have been
  implemented:
+ .
  Arcfour, Blowfish, CAST5, DES, AES, Twofish, Serpent, rfc2268 (rc2), SEED,
- Camellia, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
+ Camellia, IDEA, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
  Whirlpool, DSA, DSA2, ElGamal, RSA, ECC.
  .
  This package contains developer documentation.
@@ -41,8 +45,9 @@
  libgcrypt contains cryptographic functions.  Many important free
  ciphers, hash algorithms and public key signing algorithms have been
  implemented:
+ .
  Arcfour, Blowfish, CAST5, DES, AES, Twofish, Serpent, rfc2268 (rc2), SEED,
- Camellia, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
+ Camellia, IDEA, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
  Whirlpool, DSA, DSA2, ElGamal, RSA, ECC.
  .
  This package contains header files and libraries for static linking.
@@ -56,8 +61,9 @@
  libgcrypt contains cryptographic functions.  Many important free
  ciphers, hash algorithms and public key signing algorithms have been
  implemented:
+ .
  Arcfour, Blowfish, CAST5, DES, AES, Twofish, Serpent, rfc2268 (rc2), SEED,
- Camellia, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
+ Camellia, IDEA, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
  Whirlpool, DSA, DSA2, ElGamal, RSA, ECC.
  .
  This package contains symbol tables for debugging.
@@ -75,8 +81,9 @@
  libgcrypt contains cryptographic functions.  Many important free
  ciphers, hash algorithms and public key signing algorithms have been
  implemented:
+ .
  Arcfour, Blowfish, CAST5, DES, AES, Twofish, Serpent, rfc2268 (rc2), SEED,
- Camellia, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
+ Camellia, IDEA, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
  Whirlpool, DSA, DSA2, ElGamal, RSA, ECC.
 
 Package: libgcrypt11-udeb
@@ -88,6 +95,7 @@
  libgcrypt contains cryptographic functions.  Many important free
  ciphers, hash algorithms and public key signing algorithms have been
  implemented:
+ .
  Arcfour, Blowfish, CAST5, DES, AES, Twofish, Serpent, rfc2268 (rc2), SEED,
- Camellia, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
+ Camellia, IDEA, CRC, MD4, MD5, RIPE-MD160, SHA-1, SHA-256, SHA-512, Tiger, 
  Whirlpool, DSA, DSA2, ElGamal, RSA, ECC.

Modified: packages/libgcrypt11/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/copyright?rev=1803&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/copyright (original)
+++ packages/libgcrypt11/trunk/debian/copyright Sun Jun  9 11:13:03 2013
@@ -7,7 +7,135 @@
 
 It was downloaded from http://ftp.gnupg.org/gcrypt/libgcrypt/.
 
-Upstream Authors: Werner Koch and others.
+Up to end of 2012 libgcrypt copyright was owned solely by FSF, since then
+contributions without copyright assignment to the FSF have been integrated. 
+
+Upstream Authors (from AUTHORS)
+--------------------------------------------
+Authors with a FSF copyright assignment
+=======================================
+
+GNUPG	Werner Koch		  1998-02-23
+Assigns GNU Privacy Guard and future changes.
+Assignment for future changes terminated on 2012-12-04.
+wk at gnupg.org
+Designed and implemented GnuPG.
+
+GNUPG	Matthew Skala		   1998-08-10
+Disclaims changes.
+mskala at ansuz.sooke.bc.ca
+Wrote cipher/twofish.c.
+
+GNUPG	Natural Resources Canada    1998-08-11
+Disclaims changes by Matthew Skala.
+
+GNUPG	Michael Roth	Germany     1998-09-17
+Assigns changes.
+mroth at nessie.de
+Wrote cipher/des.c.
+Changes and bug fixes all over the place.
+
+GNUPG	Niklas Hernaeus 	1998-09-18
+Disclaims changes.
+nh at df.lth.se
+Weak key patches.
+
+GNUPG	Rémi Guyomarch		1999-05-25
+Assigns past and future changes. (g10/compress.c, g10/encr-data.c,
+g10/free-packet.c, g10/mdfilter.c, g10/plaintext.c, util/iobuf.c)
+rguyom at mail.dotcom.fr
+
+ANY     g10 Code GmbH           2001-06-07
+Assignment for future changes in Libgcrypt terminated on 2012-12-04.
+Code marked with ChangeLog entries of g10 Code employees.
+
+LIBGCRYPT Timo Schulz           2001-08-31
+Assigns past and future changes.
+twoaday at freakmail.de
+
+LIBGCRYPT Simon Josefsson       2002-10-25
+Assigns past and future changes to FSF (cipher/{md4,crc}.c, CTR mode,
+CTS/MAC flags, self test improvements)
+simon at josefsson.org
+
+LIBGCRYPT Moritz Schulte	2003-04-17
+Assigns past and future changes.
+moritz at g10code.com
+
+GNUTLS  Nikolaos Mavrogiannopoulos  2003-11-22
+nmav at gnutls.org
+Original code for cipher/rfc2268.c.
+
+LIBGCRYPT	The Written Word	2005-04-15
+Assigns past and future changes. (new: src/libgcrypt.pc.in,
+src/Makefile.am, src/secmem.c, mpi/hppa1.1/mpih-mul3.S,
+mpi/hppa1.1/udiv-qrnnd.S, mpi/hppa1.1/mpih-mul2.S,
+mpi/hppa1.1/mpih-mul1.S, mpi/Makefile.am, tests/prime.c,
+tests/register.c, tests/ac.c, tests/basic.c, tests/tsexp.c,
+tests/keygen.c, tests/pubkey.c, configure.ac, acinclude.m4)
+
+LIBGCRYPT       Brad Hards       2006-02-09
+Assigns Past and Future Changes
+bradh at frogmouth.net
+(Added OFB mode. Changed cipher/cipher.c, test/basic.c doc/gcrypt.tex.
+ added SHA-224, changed cipher/sha256.c, added HMAC tests.)
+
+LIBGCRYPT       Hye-Shik Chang   2006-09-07
+Assigns Past and Future Changes
+perky at freebsd.org
+(SEED cipher)
+
+LIBGCRYPT       Werner Dittmann  2009-05-20
+Assigns Past and Future Changes
+werner.dittmann at t-online.de
+(mpi/amd64, tests/mpitests.c)
+
+GNUPG           David Shaw
+Assigns past and future changes.
+dshaw at jabberwocky.com
+(cipher/camellia-glue.c and related stuff)
+
+LIBGCRYPT       Andrey Jivsov    2010-12-09
+Assigns Past and Future Changes
+openpgp at brainhub.org
+(cipher/ecc.c and related files)
+
+
+Authors with a DCO
+==================
+
+DCO:2012-04-16:Tomas Mraz <tm at t8m.info>
+DCO:2012-04-20:Rafaël Carré <funman at videolan.org>
+DCO:2012-11-14:Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
+DCO:2012-12-05:Werner Koch <wk at gnupg.org>
+DCO:2012-12-14:Dmitry Kasatkin <dmitry.kasatkin at intel.com>
+DCO:2013-02-26:Christian Aistleitner <christian at quelltextlich.at>
+
+
+More credits
+============
+The ATH implementation (src/ath*) has been taken from GPGME and
+relicensed to the LGPL by the copyright holder of GPGME (g10 Code
+GmbH); it is now considered to be a part of Libgcrypt.
+
+Most of the stuff in mpi has been taken from an old GMP library
+version by Torbjorn Granlund <tege at noisy.tmg.se>.
+
+The files cipher/rndunix.c and cipher/rndw32.c are based on those
+files from Cryptlib.  Copyright Peter Gutmann, Paul Kendall, and Chris
+Wedgwood 1996-1999.
+
+The ECC code cipher/ecc.c was based on code by Sergi Blanch i Torne,
+sergi at calcurco dot org.
+
+The implementation of the Camellia cipher has been been taken from the
+original NTT provided GPL source.
+
+The CAVS testing program tests/cavs_driver.pl is not to be considered
+a part of libgcrypt proper.  We distribute it merely for convenience.
+It has a permissive license and is copyrighted by atsec information
+security corporation.  See the file for details.
+--------------------------------------------
 
 Copyright:
 
@@ -20,9 +148,9 @@
 
     The library is distributed under the terms of the GNU Lesser
     General Public License (LGPL); see the file COPYING.LIB for the
-    actual terms.  The helper programs (gcryptrnd and getrandom) as
-    well as the documentation are distributed under the terms of the
-    GNU General Public License (GPL); see the file COPYING for teh
+    actual terms.  The helper programs (e.g. gcryptrnd and getrandom)
+    as well as the documentation are distributed under the terms of
+    the GNU General Public License (GPL); see the file COPYING for the
     actual terms.
 
     This library used to be available under the GPL - this was changed

Modified: packages/libgcrypt11/trunk/debian/libgcrypt11.symbols
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/libgcrypt11.symbols?rev=1803&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/libgcrypt11.symbols (original)
+++ packages/libgcrypt11/trunk/debian/libgcrypt11.symbols Sun Jun  9 11:13:03 2013
@@ -57,7 +57,7 @@
  gcry_cipher_setiv at GCRYPT_1.2 1.4.5
  gcry_cipher_setkey at GCRYPT_1.2 1.4.5
  gcry_cipher_unregister at GCRYPT_1.2 1.4.5
- gcry_control at GCRYPT_1.2 1.4.5
+ gcry_control at GCRYPT_1.2 1.5.1
  gcry_create_nonce at GCRYPT_1.2 1.4.5
  gcry_err_code_from_errno at GCRYPT_1.2 1.4.5
  gcry_err_code_to_errno at GCRYPT_1.2 1.4.5

Modified: packages/libgcrypt11/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/patches/series?rev=1803&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/patches/series (original)
+++ packages/libgcrypt11/trunk/debian/patches/series Sun Jun  9 11:13:03 2013
@@ -1,5 +1,1 @@
 12_lessdeps_libgcrypt-config.diff
-29_Fix-a-problem-with-select-and-high-fds.patch
-30_Avoid-dereferencing-pointer-right-after-the-end.patch
-31_Fix-segv-with-AES-NI-on-some-platforms.patch
-32_libgcrypt-1.5-rinjdael-Fix-use-of-SSE2-outside-USE_A.patch

Modified: packages/libgcrypt11/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/rules?rev=1803&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/rules (original)
+++ packages/libgcrypt11/trunk/debian/rules Sun Jun  9 11:13:03 2013
@@ -16,17 +16,6 @@
 DEB_DH_MAKESHLIBS_ARGS := -V 'libgcrypt11 (>=1.5.0-0)' \
 	--add-udeb=libgcrypt11-udeb -- -c4
 
-clean::
-	if test -f ltmain.sh ; then touch ltmain.sh; else libtoolize -c -f --automake; fi
-	if test -f aclocal.m4 ; then touch aclocal.m4; else aclocal-1.9 -I m4 ; fi
-	if test -f config.h.in ; then touch config.h.in; else autoheader2.50; fi
-	if test -f Makefile.in ; then find . -name Makefile.in -exec touch {} \; ;\
-		else automake-1.9 --copy --add-missing; fi
-
-	if test -f configure ; then touch configure; else autoconf2.50; fi
-	-rm -rf autom4te.cache
-	-rm -f tests/stamp-tests
-
 common-configure-impl:: $(DEB_BUILDDIR)/doc/stamp-vti
 $(DEB_BUILDDIR)/doc/stamp-vti:
 	cd $(DEB_SRCDIR)/doc && $(MAKE) stamp-vti

Modified: packages/libgcrypt11/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/watch?rev=1803&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/watch (original)
+++ packages/libgcrypt11/trunk/debian/watch Sun Jun  9 11:13:03 2013
@@ -1,3 +1,3 @@
 version=3
 opts="pasv,uversionmangle=s/[_-]/\~/g" \
-ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/libgcrypt-(.*)\.tar\.bz2 debian uupdate
+ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-(.*)\.tar\.bz2 debian uupdate




More information about the Pkg-gnutls-commits mailing list