diff -pruN 0.8.0-0.3/debian/changelog 0.8.0-0.3ubuntu8/debian/changelog --- 0.8.0-0.3/debian/changelog 2019-12-07 18:57:05.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/changelog 2022-03-17 20:57:51.000000000 +0000 @@ -1,3 +1,72 @@ +python-scrypt (0.8.0-0.3ubuntu8) jammy; urgency=medium + + * No-change rebuild with Python 3.10 only + + -- Graham Inggs Thu, 17 Mar 2022 20:57:51 +0000 + +python-scrypt (0.8.0-0.3ubuntu7) jammy; urgency=medium + + * No-change rebuild against openssl3 + + -- Simon Chopin Thu, 25 Nov 2021 14:28:08 +0200 + +python-scrypt (0.8.0-0.3ubuntu6) jammy; urgency=medium + + * No-change rebuild to add python3.10. + + -- Matthias Klose Sat, 16 Oct 2021 06:59:18 +0000 + +python-scrypt (0.8.0-0.3ubuntu5) impish; urgency=medium + + * No-change rebuild to build packages with zstd compression. + + -- Matthias Klose Thu, 07 Oct 2021 12:23:15 +0200 + +python-scrypt (0.8.0-0.3ubuntu4) hirsute; urgency=medium + + * No-change rebuild to drop python3.8 extensions. + + -- Matthias Klose Mon, 07 Dec 2020 18:39:20 +0100 + +python-scrypt (0.8.0-0.3ubuntu3) hirsute; urgency=medium + + * No-change rebuild to build with python3.9 as supported. + + -- Matthias Klose Sat, 24 Oct 2020 10:55:18 +0200 + +python-scrypt (0.8.0-0.3ubuntu2) groovy; urgency=medium + + [ Corey Bryant ] + * d/gbp.conf: Update gbp configuration file. + * d/control: Update Vcs-* links and maintainers. + + [ Chris MacNaughton ] + * d/p/add-missing-rfc-test-vector.patch: Apply patch to enable additional + test vectors from the scrypt RFC (LP: #1695899). + * d/rules: Enable DEB_BUILD_MAINT_OPTIONS hardening at build time (LP: #1695899). + + -- Chris MacNaughton Tue, 08 Sep 2020 13:06:52 +0000 + +python-scrypt (0.8.0-0.3ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/watch: Add watch file. + - d/p/add-missing-test-module.patch: Patch in missing test module + that is missing from the upstream source release. + - d/rules: Add some extra cleaning of .so files to dh_auto_clean. + - d/source/options: Set a sensible exclusion for .egg-info/* + mutations. + - d/rules: install README.rst in the docs. + * Dropped changes, included in Debian: + - d/control: Add Python 3 support. + - d/rules: Switch build to use pybuild. + - d/*: wrap-and-sort. + - d/control: Bumped Standards-Version to 3.9.8, no changes. + * d/rules: re-enable build-time tests, which have been made to pass in + Ubuntu. + + -- Steve Langasek Tue, 18 Feb 2020 12:03:02 -0800 + python-scrypt (0.8.0-0.3) unstable; urgency=medium * Non-maintainer upload. @@ -26,6 +95,52 @@ python-scrypt (0.8.0-0.1) unstable; urge -- Thomas Goirand Thu, 05 Oct 2017 17:07:52 +0200 +python-scrypt (0.8.0-0ubuntu6) focal; urgency=medium + + * No-change rebuild to build with python3.8. + + -- Matthias Klose Fri, 18 Oct 2019 18:11:43 +0000 + +python-scrypt (0.8.0-0ubuntu5) disco; urgency=medium + + * No-change rebuild to build without python3.6 support. + + -- Matthias Klose Sat, 03 Nov 2018 12:09:52 +0000 + +python-scrypt (0.8.0-0ubuntu4) cosmic; urgency=medium + + * No-change rebuild to build for python3.7. + + -- Matthias Klose Thu, 28 Jun 2018 06:55:16 +0000 + +python-scrypt (0.8.0-0ubuntu3) bionic; urgency=high + + * No change rebuild against openssl1.1. + + -- Dimitri John Ledkov Mon, 05 Feb 2018 16:52:17 +0000 + +python-scrypt (0.8.0-0ubuntu2) artful; urgency=medium + + * No change rebuild to drop Python 3.5 support. + + -- Michael Hudson-Doyle Fri, 04 Aug 2017 18:56:18 +1200 + +python-scrypt (0.8.0-0ubuntu1) artful; urgency=medium + + * New upstream release + * d/watch: Add watch file. + * d/control: Add Python 3 support. + * d/rules: Switch build to use pybuild. + * d/*: wrap-and-sort. + * d/control: Bumped Standards-Version to 3.9.8, no changes. + * d/p/add-missing-test-module.patch: Patch in missing test module + that is missing from the upstream source release. + * d/rules: Add some extra cleaning of .so files to dh_auto_clean. + * d/source/options: Set a sensible exclusion for .egg-info/* + mutations. + + -- James Page Mon, 05 Jun 2017 10:33:44 +0100 + python-scrypt (0.6.1-5.1) unstable; urgency=low * NMU: as suggested by Dejan Latinovic there is only a dependency on @@ -62,3 +177,4 @@ python-scrypt (0.6.1-1) unstable; urgenc * Initial package (Closes: #710464) -- Micah Anderson Thu, 30 May 2013 15:30:06 -0400 + diff -pruN 0.8.0-0.3/debian/control 0.8.0-0.3ubuntu8/debian/control --- 0.8.0-0.3/debian/control 2019-12-07 18:56:10.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/control 2020-09-08 13:06:52.000000000 +0000 @@ -1,5 +1,6 @@ Source: python-scrypt -Maintainer: Micah Anderson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Micah Anderson Section: python Priority: optional Build-Depends: @@ -9,8 +10,8 @@ Build-Depends: python3-all-dev:any, python3-setuptools, Standards-Version: 4.4.1 -Vcs-Git: https://salsa.debian.org/python-team/modules/python-scrypt.git -Vcs-Browser: https://salsa.debian.org/python-team/modules/python-scrypt +Vcs-Git: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-scrypt +Vcs-Browser: https://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/python-scrypt Package: python3-scrypt Architecture: any diff -pruN 0.8.0-0.3/debian/gbp.conf 0.8.0-0.3ubuntu8/debian/gbp.conf --- 0.8.0-0.3/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/gbp.conf 2020-09-08 13:06:52.000000000 +0000 @@ -0,0 +1,7 @@ +[DEFAULT] +debian-branch = master +upstream-tag = %(version)s +pristine-tar = True + +[buildpackage] +export-dir = ../build-area diff -pruN 0.8.0-0.3/debian/patches/add-missing-rfc-test-vector.patch 0.8.0-0.3ubuntu8/debian/patches/add-missing-rfc-test-vector.patch --- 0.8.0-0.3/debian/patches/add-missing-rfc-test-vector.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/patches/add-missing-rfc-test-vector.patch 2020-09-08 13:06:52.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Add missing test vector from RFC +Author: Chris MacNaughton +Forwarded: https://github.com/holgern/py-scrypt/pull/3 + +--- a/tests/hashvectors.csv ++++ b/tests/hashvectors.csv +@@ -2,4 +2,5 @@ password,salt,n,r,p,hexhash + ,,16,1,1,77d6576238657b203b19ca42c18a0497f16b4844e3074ae8dfdffa3fede21442fcd0069ded0948f8326a753a0fc81f17e8d3e0fb2e0d3628cf35e20c38d18906 + password,NaCl,1024,8,16,fdbabe1c9d3472007856e7190d01e9fe7c6ad7cbc8237830e77376634b3731622eaf30d92e22a3886ff109279d9830dac727afb94a83ee6d8360cbdfa2cc0640 + pleaseletmein,SodiumChloride,16384,8,1,7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887 +-pleaseletmein,SodiumChloride,32768,16,4,cbc397a9b5f5a53048c5b9f039ee1246d9532c8089fb346a4ab47cd0701febf18652b1ee042e070d1b6c631c43fd05ececd5b165ee1c2ffc1a2e98406fc2cd52 +\ No newline at end of file ++pleaseletmein,SodiumChloride,32768,16,4,cbc397a9b5f5a53048c5b9f039ee1246d9532c8089fb346a4ab47cd0701febf18652b1ee042e070d1b6c631c43fd05ececd5b165ee1c2ffc1a2e98406fc2cd52 ++pleaseletmein,SodiumChloride,1048576,8,1,2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4 diff -pruN 0.8.0-0.3/debian/patches/add-missing-test-module.patch 0.8.0-0.3ubuntu8/debian/patches/add-missing-test-module.patch --- 0.8.0-0.3/debian/patches/add-missing-test-module.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/patches/add-missing-test-module.patch 2020-09-08 13:06:52.000000000 +0000 @@ -0,0 +1,30 @@ +Description: Re-add missing test module + The test_scrypt_c_module is not included in the upstream + source distribution on pypi; re-add the file as a patch + until resolved upstream. +Author: James Page + +--- /dev/null ++++ python-scrypt-0.8.0/tests/test_scrypt_c_module.py +@@ -0,0 +1,21 @@ ++from sys import version_info, exit ++ ++if ((version_info > (3, 2, 0, 'final', 0)) or ++ (version_info > (2, 7, 0, 'final', 0) and ++ version_info < (3, 0, 0, 'final', 0))): ++ import unittest as testm ++else: ++ try: ++ import unittest2 as testm ++ except ImportError: ++ print("Please install unittest2 to run the test suite") ++ exit(-1) ++ ++ ++class TestScryptCModule(testm.TestCase): ++ def test_import_module(self): ++ """Test importing the _scrypt module""" ++ ++ import _scrypt ++ ++ self.assertTrue(_scrypt) diff -pruN 0.8.0-0.3/debian/patches/series 0.8.0-0.3ubuntu8/debian/patches/series --- 0.8.0-0.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/patches/series 2020-09-08 13:06:52.000000000 +0000 @@ -0,0 +1,2 @@ +add-missing-test-module.patch +add-missing-rfc-test-vector.patch diff -pruN 0.8.0-0.3/debian/rules 0.8.0-0.3ubuntu8/debian/rules --- 0.8.0-0.3/debian/rules 2019-12-07 18:53:17.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/rules 2020-09-08 13:06:52.000000000 +0000 @@ -1,7 +1,13 @@ #!/usr/bin/make -f +export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow + %: dh $@ --with python3 --buildsystem=pybuild -override_dh_auto_test: - : # TODO: skip tests, they were never run before anyway +override_dh_installdocs: + dh_installdocs -A README.rst + +override_dh_auto_clean: + dh_auto_clean --buildsystem=pybuild + rm -f *.so diff -pruN 0.8.0-0.3/debian/source/options 0.8.0-0.3ubuntu8/debian/source/options --- 0.8.0-0.3/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/source/options 2020-09-08 13:06:52.000000000 +0000 @@ -0,0 +1 @@ +extend-diff-ignore = "^[^/]*[.]egg-info/" diff -pruN 0.8.0-0.3/debian/watch 0.8.0-0.3ubuntu8/debian/watch --- 0.8.0-0.3/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ 0.8.0-0.3ubuntu8/debian/watch 2020-09-08 13:06:52.000000000 +0000 @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +https://pypi.debian.net/scrypt/scrypt-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))