lp://qastaging/~jtaylor/ubuntu/oneiric/m2crypto/cleanup

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/ubuntu/oneiric/m2crypto at revision 24

Ubuntu branches: Pending requested 2011-08-10

Diff: 783 lines (+642/-8)

15 files modified

M2Crypto/m2urllib2.py (+0/-1)
debian/README.source (+2/-0)
debian/changelog (+31/-0)
debian/control (+1/-1)
debian/patches/disable_sslv2_test.patch (+17/-0)
debian/patches/fix_build_with_new_openssl.patch (+487/-0)
debian/patches/fix_kill_signal.patch (+17/-0)
debian/patches/fix_sslv2_test.patch (+19/-0)
debian/patches/fix_sslv2_test2.patch (+54/-0)
debian/patches/series (+5/-0)
debian/rules (+1/-1)
debian/source/format (+1/-0)
debian/watch (+1/-0)
tests/test_smime.py (+4/-3)
tests/test_ssl.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #788514: python packages on the CDs not using dh_python2

Medium

Fix Released

Link a bug report

Related blueprints

29. By Julian Taylor on 2011-08-10

* repackage upstream
  - remove non-free demo/x509/proxylib.py

28. By Julian Taylor on 2011-08-10

- converted all upstream changes to patches
- fix_sslv2_test.patch: testsuite patch for sslv2 deactivation
- fix_build_with_new_openssl.patch: build fix from debian 0.20.1-1.1
- disable_sslv2_test.patch: disable sslv23_weak_crypto test as it is expected to
- fix_sslv2_test2.patch: fix testsuite with newer openssl. (LP: #600549)
- fix_kill_signal.patch: use signal 9 to kill old s_server processes

27. By Julian Taylor on 2011-08-10

switch to 3.0 (quilt)
fix_sslv2_test.patch: testsuite patch for sslv2 deactivation

26. By Julian Taylor on 2011-08-10

* tests/test_smime.py: fix testuite
  - backported from revision 739

25. By Julian Taylor on 2011-08-10

switch di dh_python2 (LP: #788514)

24. By Julian Taylor on 2011-08-10

* Merge from debian testing, remaining changes:
  - tests/test_ssl.py: disable sslv23_weak_crypto test as it is expected to
    fail with SSLv2 having been disabled in openssl 0.9.8o-1ubuntu3.
    (LP: #600549)
  - tests/test_smime.py: fix testsuite with newer openssl. (LP: #600549)
    - Backported from http://svn.osafoundation.org/viewvc/m2crypto/trunk/tests/test_smime.py?r1=698&r2=721
  - debian/control: Add openssl for FTBFS.
  - debian/rules; enable testsuite, add more files to "clean" rule.
  - tests/test_ssl.py: use signal 9 to kill old s_server processes
    to work around build HUP signal-ignore-mask (LP: #451998).
* Non-maintainer upload.
* Backport revision 721 from upstream SVN repository to fix build errors
  with libssl-dev >= 1.0.0. (Closes: #622001)
* Do not provide sslv2_method if SSLv2 is not available.

23. By Matthias Klose on 2010-12-03

Rebuild to add support for python 2.7.

22. By Marc Deslauriers on 2010-10-01

tests/test_ssl.py: disable sslv23_weak_crypto test as it is expected to
fail with SSLv2 having been disabled in openssl 0.9.8o-1ubuntu3.
(LP: #600549)

21. By Marc Deslauriers on 2010-07-09

* tests/test_smime.py: fix testsuite with newer openssl. (LP: #600549)
  - Backported from http://svn.osafoundation.org/viewvc/m2crypto/trunk/tests/test_smime.py?r1=698&r2=721

20. By Chuck Short on 2010-04-23

debian/control: Add openssl for FTBFS.