[Python-modules-commits] r4590 - in packages/pyopenssl/trunk (12 files)
morph-guest at users.alioth.debian.org
morph-guest at users.alioth.debian.org
Thu Feb 21 22:11:21 UTC 2008
Date: Thursday, February 21, 2008 @ 22:11:19
Author: morph-guest
Revision: 4590
[svn-inject] Applying Debian modifications to trunk
Added:
packages/pyopenssl/trunk/debian/
packages/pyopenssl/trunk/debian/changelog
packages/pyopenssl/trunk/debian/compat
packages/pyopenssl/trunk/debian/control
packages/pyopenssl/trunk/debian/copyright
packages/pyopenssl/trunk/debian/patches/
packages/pyopenssl/trunk/debian/patches/00list
packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch
packages/pyopenssl/trunk/debian/python-pyopenssl-doc.doc-base
packages/pyopenssl/trunk/debian/python-pyopenssl-doc.docs
packages/pyopenssl/trunk/debian/python-pyopenssl-doc.examples
packages/pyopenssl/trunk/debian/rules
Property changes on: packages/pyopenssl/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/pyopenssl/trunk/debian/changelog
===================================================================
--- packages/pyopenssl/trunk/debian/changelog (rev 0)
+++ packages/pyopenssl/trunk/debian/changelog 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1,234 @@
+pyopenssl (0.6-3) UNRELEASED; urgency=low
+
+ * Adopting package (Closes: #465988)
+ * Acknowledging NMUs (Closes: #373548, #355947, #351133, #347541)
+ * debian/control
+ - set DPMT as maintainer
+ - set myself as uploader
+ - bump Standards-Version to 3.7.3
+ - added Vcs-{Svn,Browser} tag
+ - added misc:Depends
+ - updated versioned build-dep on python-support
+ - renamed doc package to python-pyopenssl-doc
+ - added Homepage field
+ - added dpatch build-dep
+ * debian/pycompat
+ - removed
+ * debian/rules
+ - removed comment header
+ - removed commented dh_* calls
+ - removed dh_python calls
+ - removed DH_COMPAT variable set
+ - added dpatch stuff
+ * debian/python-pyopenssl-doc.doc-base
+ - renamed from debian/pyopenssl-doc.doc-base
+ - corrected files location
+ - reformatted description
+ * debian/pyopenssl-doc.docs
+ - removed
+ * debian/python-pyopenssl-doc.examples
+ - renamed from debian/pyopenssl-doc.examples
+ * debian/README.Debian
+ - removed
+ * debian/compat
+ - created with value 5
+ * doc/pyOpenSSL.ps
+ - restored to upstream file (changes only in generation dates)
+ * debian/patches/01_restore_pristine_code.dpatch
+ - added to restore upstream source code
+ * debian/copyright
+ - clear separation of copyright and license
+ - upstream author, copyright and license indented with 4 spaces
+ - added copyright info for 3 files, different from the main one
+
+ -- Sandro Tosi <matrixhasu at gmail.com> Sat, 16 Feb 2008 22:46:47 +0100
+
+pyopenssl (0.6-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update Package for last python policy (Closes: #373548).
+
+ -- Pierre Habouzit <madcoder at debian.org> Fri, 30 Jun 2006 13:31:10 +0200
+
+pyopenssl (0.6-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Include patch from Cyril Lacoux <clacoux at easter-eggs.com>,
+ fixing Segmentation fault when creating x509 extension.
+ (Closes: #355947)
+
+ -- Julien Danjou <acid at debian.org> Fri, 12 May 2006 16:42:47 +0200
+
+pyopenssl (0.6-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Stop building modules for python2.2. (Closes: #351133)
+ * Also rebuild module using libssl0.9.8. (Closes: #347541)
+
+ -- Pierre Habouzit <madcoder at debian.org> Sun, 9 Apr 2006 19:45:16 +0200
+
+pyopenssl (0.6-2) unstable; urgency=low
+
+ * Add support for python 2.4. (Closes: #297870)
+ * Build-depend on v0.9.7 of openssl.
+
+ -- Martin Sjogren <sjogren at debian.org> Mon, 14 Mar 2005 08:56:27 +0100
+
+pyopenssl (0.6-1) unstable; urgency=low
+
+ * New upstream release, including:
+ - Add Netscape SPKI extensions. (Closes: #205132)
+ - Add X509.subject_name_hash, X509.digest. (Closes: #205136)
+ - Fix full names of exceptions. (Closes: #250342)
+ - Add SSL.Context.use_certificate_chain_file. (Closes: #260134)
+ * Docs are built upstream, so the build-deps have been trimmed.
+ This also means that HTML and text documentation are back.
+ * Bumped standards-version.
+ * Use dh_python.
+
+ -- Martin Sjogren <sjogren at debian.org> Fri, 13 Aug 2004 20:53:27 +0200
+
+pyopenssl (0.5.1-4) unstable; urgency=low
+
+ * Drop HTML and text documentation since latex2html moved to non-free.
+ This is a temporary solution, until I can hack mkhowto to use something
+ else. (Closes: #221344)
+ * Fix the copyright file to mention the copyright holder.
+
+ -- Martin Sjogren <sjogren at debian.org> Mon, 15 Dec 2003 20:16:25 +0100
+
+pyopenssl (0.5.1-3) unstable; urgency=low
+
+ * MANIFEST.in: Include the src/RATIONALE file. (Closes: #197401)
+ * doc/pyOpenSSL.tex: Fix typo. (Closes: #197435)
+ * Drop Python 1.5 and 2.1 support.
+ * Make python-pyopenssl depend on python2.3-pyopenssl, which is no longer
+ "experimental".
+
+ -- Martin Sjogren <sjogren at debian.org> Mon, 11 Aug 2003 18:37:07 +0200
+
+pyopenssl (0.5.1-2) unstable; urgency=low
+
+ * Make sure names in control and changelog match. Stupid changelogs, bleh.
+ * Change section to 'python'.
+ * Rebuild with openssl 0.9.7. (Closes: #189826)
+ * __init__.py: Import tsafe module.
+ * tsafe.py: Add some missing methods.
+ * debian/copyright: Fix Author(s) boilerplate thingy to shut lintian up.
+
+ -- Martin Sjogren <sjogren at debian.org> Sun, 20 Apr 2003 17:50:24 +0200
+
+pyopenssl (0.5.1-1) unstable; urgency=low
+
+ * New upstream version. (Closes: #159530)
+ * Added a python-pyopenssl dummy package.
+ * Added an experimental python2.3-pyopenssl package.
+
+ -- Martin Sjögren <martin at strakt.com> Sun, 25 Aug 2002 12:08:31 +0200
+
+pyopenssl (0.5-1) unstable; urgency=low
+
+ * New upstream version
+ * Support for python1.5.
+ * Fix stupid mistakes for python 1.5 and python 2.1.
+
+ -- Martin Sjögren <martin at strakt.com> Wed, 24 Jul 2002 09:05:28 +0200
+
+pyopenssl (0.4.1-8) unstable; urgency=low
+
+ * Added examples to pyopenssl-doc
+
+ -- Martin Sjögren <martin at strakt.com> Wed, 5 Jun 2002 14:58:04 +0200
+
+pyopenssl (0.4.1-7) unstable; urgency=low
+
+ * The cute arrow icons in the HTML documentation should be there now too.
+
+ -- Martin Sjögren <martin at strakt.com> Thu, 30 May 2002 00:53:44 +0200
+
+pyopenssl (0.4.1-6) unstable; urgency=low
+
+ * Commented out some unused things in debian/rules
+
+ -- Martin Sjögren <martin at strakt.com> Wed, 29 May 2002 11:20:33 +0200
+
+pyopenssl (0.4.1-5) unstable; urgency=low
+
+ * Adding to the build-depends.
+ * Initial upload (Closes: #140687)
+
+ -- Martin Sjögren <martin at strakt.com> Sat, 6 Apr 2002 14:15:49 +0200
+
+pyopenssl (0.4.1-4) unstable; urgency=low
+
+ * Fixes in packaging, it shouldn't be regarded a native package now.
+
+ -- Martin Sjögren <martin at strakt.com> Sat, 6 Apr 2002 11:26:39 +0200
+
+pyopenssl (0.4.1-3) unstable; urgency=low
+
+ * Moved from non-US to main/devel
+
+ -- Martin Sjögren <martin at strakt.com> Fri, 5 Apr 2002 22:44:10 +0200
+
+pyopenssl (0.4.1-2) unstable; urgency=low
+
+ * Fixes in the packaging, dependencies and build dependencies should be
+ all right now.
+
+ -- Martin Sjögren <martin at strakt.com> Thu, 10 Jan 2002 10:00:06 +0100
+
+pyopenssl (0.4.1-1) unstable; urgency=low
+
+ * New "upstream" release
+ * New packaging, python2.1-pyopenssl, python2.2-pyopenssl, pyopenssl-doc
+
+ -- Martin Sjögren <martin at strakt.com> Mon, 7 Jan 2002 15:38:51 +0100
+
+pyopenssl (0.4-4) unstable; urgency=low
+
+ * Grrr, this time then...
+
+ -- Martin Sjögren <martin at strakt.com> Fri, 17 Aug 2001 14:53:19 +0200
+
+pyopenssl (0.4-3) unstable; urgency=low
+
+ * Fixed a big nasty bug
+
+ -- Martin Sjögren <martin at strakt.com> Fri, 17 Aug 2001 14:33:06 +0200
+
+pyopenssl (0.4-2) unstable; urgency=low
+
+ * Fixes
+
+ -- Martin Sjögren <martin at strakt.com> Fri, 17 Aug 2001 13:53:11 +0200
+
+pyopenssl (0.4-1) unstable; urgency=low
+
+ * New "upstream" version
+
+ -- Martin Sjögren <martin at strakt.com> Thu, 9 Aug 2001 12:32:47 +0200
+
+pyopenssl (0.3-3) unstable; urgency=low
+
+ * X509 objects now has a has_expired method
+
+ -- Martin Sjögren <martin at strakt.com> Tue, 7 Aug 2001 14:16:13 +0200
+
+pyopenssl (0.3-2) unstable; urgency=low
+
+ * X509Name objects now has a compare method
+
+ -- Martin Sjögren <martin at strakt.com> Tue, 7 Aug 2001 10:53:58 +0200
+
+pyopenssl (0.3-1) unstable; urgency=low
+
+ * New "upstream" version
+
+ -- Martin Sjögren <martin at strakt.com> Fri, 3 Aug 2001 16:36:26 +0200
+
+pyopenssl (0.1-1) unstable; urgency=low
+
+ * Initial version.
+
+ -- Anders Hammarquist <iko at strakt.com> Mon, 23 Jul 2001 15:17:38 +0200
Added: packages/pyopenssl/trunk/debian/compat
===================================================================
--- packages/pyopenssl/trunk/debian/compat (rev 0)
+++ packages/pyopenssl/trunk/debian/compat 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1 @@
+5
Added: packages/pyopenssl/trunk/debian/control
===================================================================
--- packages/pyopenssl/trunk/debian/control (rev 0)
+++ packages/pyopenssl/trunk/debian/control 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1,33 @@
+Source: pyopenssl
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Sandro Tosi <matrixhasu at gmail.com>
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), python-support (>= 0.6.4), libssl-dev (>= 0.9.8), dpatch
+Standards-Version: 3.7.3
+Homepage: http://pyopenssl.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/pycg/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/pycg/trunk/?op=log
+XS-Python-Version: all
+
+Package: python-pyopenssl
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Provides: ${python:Provides}
+Suggests: pyopenssl-doc
+Replaces: python2-pyopenssl, python2.3-pyopenssl (<< 0.6-2.3), python2.4-pyopenssl (<< 0.6-2.3)
+Conflicts: python2-pyopenssl, python2.3-pyopenssl (<< 0.6-2.3), python2.4-pyopenssl (<< 0.6-2.3)
+XB-Python-Version: ${python:Versions}
+Description: Python wrapper around the OpenSSL library (dummy package)
+ Includes: SSL Context objects, SSL Connection objects, using
+ Python sockets as transport layer. The Connection object
+ wraps all the socket methods and can therefore be used
+ interchangeably.
+
+Package: python-pyopenssl-doc
+Section: doc
+Architecture: all
+Suggests: python-pyopenssl
+Description: Documentation for pyOpenSSL
+ This package provides documentation for the pyOpenSSL package,
+ in HTML, postscript and text formats.
Added: packages/pyopenssl/trunk/debian/copyright
===================================================================
--- packages/pyopenssl/trunk/debian/copyright (rev 0)
+++ packages/pyopenssl/trunk/debian/copyright 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1,35 @@
+This package was debianized by Martin Sjögren <sjogren at debian.org> on
+Mon, 7 Jan 2002 16:25:58 +0100.
+
+It was downloaded from pyopenssl.sourceforge.net
+
+Upstream Author:
+
+ Martin Sjögren <msjogren at gmail.com>
+
+Copyright:
+
+ Copyright (C) 2001-2004 AB Strakt
+
+License:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser 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
+ Lesser General Public License for more details.
+
+A copy of the GNU Lesser General Public License (version 2.1)
+can be found in /usr/share/common-licenses/LGPL on Debian systems.
+
+The following files have different copyright info:
+
+File: /src/crypto/netscape_spki.{c,h}
+ Copyright (C) Tollef Fog Heen 2003
+
+File: /src/crypto/x509ext.h
+ Copyright (C) Awanim 2002
Added: packages/pyopenssl/trunk/debian/patches/00list
===================================================================
--- packages/pyopenssl/trunk/debian/patches/00list (rev 0)
+++ packages/pyopenssl/trunk/debian/patches/00list 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1 @@
+01_restore_pristine_code
Added: packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch
===================================================================
--- packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch (rev 0)
+++ packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_restore_pristine_code.dpatch by Sandro Tosi <matrixhasu at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: New patch generated from pyopenssl 0.6-3 diff.gz
+
+ at DPATCH@
+
+--- pyopenssl-0.6.orig/src/crypto/x509ext.c
++++ pyopenssl-0.6/src/crypto/x509ext.c
+@@ -57,7 +57,7 @@
+ {
+ crypto_X509ExtensionObj *self;
+ int ext_len, ext_nid;
+- unsigned char *ext_der, *p;
++ unsigned char *ext_der;
+ X509V3_EXT_METHOD *ext_method = NULL;
+ ASN1_OCTET_STRING *ext_oct;
+ STACK_OF(CONF_VALUE) *nval;
+@@ -110,17 +110,29 @@
+ sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
+
+ /* Find out how much memory we need */
+- ext_len = ext_method->i2d(ext_struct, NULL);
+-
+- /* Allocate */
+- if(!(ext_der = malloc(ext_len))) {
+- PyErr_SetString(PyExc_MemoryError, "Could not allocate memory");
+- return NULL;
++
++
++ /* Convert internal representation to DER */
++ /* and Allocate */
++ if (ext_method->it) {
++ ext_der = NULL;
++ ext_len = ASN1_item_i2d(ext_struct, &ext_der, ASN1_ITEM_ptr(ext_method->it));
++ if (ext_len < 0) {
++ PyErr_SetString(PyExc_MemoryError, "Could not allocate memory");
++ return NULL;
++ }
++ } else {
++ unsigned char *p;
++ ext_len = ext_method->i2d(ext_struct, NULL);
++ if(!(ext_der = malloc(ext_len))) {
++ PyErr_SetString(PyExc_MemoryError, "Could not allocate memory");
++ return NULL;
++ }
++ p = ext_der;
++ ext_method->i2d(ext_struct, &p);
+ }
+
+ /* And create the ASN1_OCTET_STRING */
+- p = ext_der;
+- ext_method->i2d(ext_struct, &p);
+ if(!(ext_oct = M_ASN1_OCTET_STRING_new())) {
+ exception_from_error_queue();
+ return NULL;
+@@ -140,7 +152,7 @@
+ }
+
+ M_ASN1_OCTET_STRING_free(ext_oct);
+- ext_method->ext_free(ext_struct);
++ //ext_method->ext_free(ext_struct);
+
+ self->x509_extension = extension;
+ self->dealloc = 1;
Property changes on: packages/pyopenssl/trunk/debian/patches/01_restore_pristine_code.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/pyopenssl/trunk/debian/python-pyopenssl-doc.doc-base
===================================================================
--- packages/pyopenssl/trunk/debian/python-pyopenssl-doc.doc-base (rev 0)
+++ packages/pyopenssl/trunk/debian/python-pyopenssl-doc.doc-base 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1,10 @@
+Document: pyopenssl-manual
+Title: Python OpenSSL Manual
+Author: Martin Sjögren
+Abstract: Manual for the pyOpenSSL package.
+ This module is a rather thin wrapper around (a subset of) the OpenSSL library. With thin wrapper I mean that a lot of the object methods do nothing more than calling a corresponding function in the OpenSSL library.
+Section: Apps/programming
+
+Format: HTML
+Index: /usr/share/doc/python-pyopenssl-doc/html/index.html
+Files: /usr/share/doc/python-pyopenssl-doc/html/*
Added: packages/pyopenssl/trunk/debian/python-pyopenssl-doc.docs
===================================================================
--- packages/pyopenssl/trunk/debian/python-pyopenssl-doc.docs (rev 0)
+++ packages/pyopenssl/trunk/debian/python-pyopenssl-doc.docs 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1,3 @@
+doc/pyOpenSSL.ps
+doc/pyOpenSSL.txt
+doc/html
Added: packages/pyopenssl/trunk/debian/python-pyopenssl-doc.examples
===================================================================
--- packages/pyopenssl/trunk/debian/python-pyopenssl-doc.examples (rev 0)
+++ packages/pyopenssl/trunk/debian/python-pyopenssl-doc.examples 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1 @@
+examples/*
Added: packages/pyopenssl/trunk/debian/rules
===================================================================
--- packages/pyopenssl/trunk/debian/rules (rev 0)
+++ packages/pyopenssl/trunk/debian/rules 2008-02-21 22:11:19 UTC (rev 4590)
@@ -0,0 +1,79 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+include /usr/share/dpatch/dpatch.make
+
+PYVERS := $(shell pyversions -r)
+
+build: patch build-stamp
+build-stamp:
+ dh_testdir
+
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py build; \
+ done
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ -for py in $(PYVERS); do \
+ $$py setup.py clean --all; done
+ rm -rf build version.pyc
+
+ dh_clean
+
+install: DH_OPTIONS=
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ set -e; \
+ for py in $(PYVERS); do \
+ $$py setup.py install --root=$(CURDIR)/debian/python-pyopenssl; \
+ done
+
+# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i
+ dh_installexamples -i
+ dh_installchangelogs ChangeLog -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_pysupport -i
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installchangelogs ChangeLog -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_pysupport -a
+ dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: packages/pyopenssl/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Python-modules-commits
mailing list