Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,44 @@
python-nacl (1.5.0-8) unstable; urgency=medium

* Team upload.
* Fix d/watch for new PyPi archive naming convention
* Use dh-sequence-python3
* Bump Standards-Version to 4.7.2

-- Alexandre Detiste <[email protected]> Wed, 24 Sep 2025 18:05:00 +0200

python-nacl (1.5.0-7) unstable; urgency=medium

* Fix documentation build for Sphinx 8.0 (closes: #1090152).

-- Colin Watson <[email protected]> Mon, 16 Dec 2024 23:26:27 +0000

python-nacl (1.5.0-6) unstable; urgency=medium

* Build bindings reproducibly.

-- Colin Watson <[email protected]> Mon, 26 Aug 2024 18:16:49 +0100

python-nacl (1.5.0-5) unstable; urgency=medium

[ Alexandre Detiste ]
* Remove extraneous python3-six build dependency.

[ Colin Watson ]
* Switch to autopkgtest-pkg-pybuild.

-- Colin Watson <[email protected]> Mon, 26 Aug 2024 15:33:11 +0100

python-nacl (1.5.0-4) unstable; urgency=medium

[ Scott Kitterman ]
* Remove dh-clean override which deleted the vendored libsodium, no longer
needed and left source tree dirty after clean
* Add d/source/options extend-diff-ignore to fix dpkg-source failure due to
local changes (python package metadata regeneration; closes: #1045310)

-- Colin Watson <[email protected]> Mon, 14 Aug 2023 11:51:47 +0100

python-nacl (1.5.0-3) unstable; urgency=medium

* Team upload.
Expand Down
6 changes: 3 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ Section: python
Priority: optional
Build-Depends:
debhelper-compat (= 13),
dh-python,
dh-sequence-python3,
pybuild-plugin-pyproject,
libsodium-dev (>= 1.0.16),
python3-all-dev,
python3-cffi (>= 1.0.0),
python3-hypothesis (>= 4.36.2),
python3-pytest,
python3-setuptools,
python3-six,
python3-sphinx,
python3-wheel,
Standards-Version: 4.6.2
Standards-Version: 4.7.2
Homepage: https://github.com/pyca/pynacl/
Vcs-Git: https://salsa.debian.org/python-team/packages/python-nacl.git
Vcs-Browser: https://salsa.debian.org/python-team/packages/python-nacl
Testsuite: autopkgtest-pkg-pybuild

Package: python3-nacl
Architecture: any
Expand Down
12 changes: 6 additions & 6 deletions debian/patches/0001-remove-privacy-breach-images.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ Date: Tue, 26 May 2020 03:53:46 -0400
Subject: remove privacy-breach images

---
README.rst | 14 --------------
1 file changed, 14 deletions(-)
README.rst | 11 -----------
1 file changed, 11 deletions(-)

Index: python-nacl/README.rst
===================================================================
--- python-nacl.orig/README.rst
+++ python-nacl/README.rst
diff --git a/README.rst b/README.rst
index 89014db..32c1e1e 100644
--- a/README.rst
+++ b/README.rst
@@ -2,17 +2,6 @@
PyNaCl: Python binding to the libsodium library
===============================================
Expand Down
38 changes: 38 additions & 0 deletions debian/patches/reproducible-bindings.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From: Colin Watson <[email protected]>
Date: Mon, 26 Aug 2024 17:48:49 +0100
Subject: Build bindings reproducibly

`glob` output isn't guaranteed to be in any particular order, so
`_sodium.*.so` wasn't always reproducible.

Forwarded: https://github.com/pyca/pynacl/pull/836
Last-Update: 2024-08-26
---
src/bindings/build.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/bindings/build.py b/src/bindings/build.py
index 9634237..777237b 100644
--- a/src/bindings/build.py
+++ b/src/bindings/build.py
@@ -22,12 +22,16 @@ from cffi import FFI
__all__ = ["ffi"]


-HEADERS = glob.glob(
- os.path.join(os.path.abspath(os.path.dirname(__file__)), "*.h")
+HEADERS = sorted(
+ glob.glob(os.path.join(os.path.abspath(os.path.dirname(__file__)), "*.h"))
)

-MINIMAL_HEADERS = glob.glob(
- os.path.join(os.path.abspath(os.path.dirname(__file__)), "minimal", "*.h")
+MINIMAL_HEADERS = sorted(
+ glob.glob(
+ os.path.join(
+ os.path.abspath(os.path.dirname(__file__)), "minimal", "*.h"
+ )
+ )
)


2 changes: 2 additions & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
0001-remove-privacy-breach-images.patch
reproducible-bindings.patch
sphinx-8.0.patch
25 changes: 25 additions & 0 deletions debian/patches/sphinx-8.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From: Paul Kehrer <[email protected]>
Date: Mon, 16 Dec 2024 23:21:39 +0000
Subject: Fix documentation build for Sphinx 8.0

Origin: backport, https://github.com/pyca/pynacl/pull/793
Bug-Debian: https://bugs.debian.org/1090152
Last-Update: 2024-12-16
---
docs/conf.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 3337cd2..09c8a3b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -177,8 +177,7 @@ html_static_path = ["_static"]
htmlhelp_basename = "PyNaCldoc"


-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {"http://docs.python.org/": None}
+intersphinx_mapping = {"python": ("https://docs.python.org/3", None)}

# Retry requests in the linkcheck builder so that we're resilient against
# transient network errors.
12 changes: 2 additions & 10 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,7 @@ export SODIUM_INSTALL=system


%:
dh $@ --with python3,sphinxdoc --buildsystem=pybuild


override_dh_clean:
dh_clean
# Remove the vendored libsodium just to make sure we don't build
# against it
rm -rf src/libsodium
dh $@ --with sphinxdoc --buildsystem=pybuild


override_dh_auto_clean:
Expand All @@ -40,6 +33,5 @@ ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
endif


override_dh_python3:
dh_python3
execute_after_dh_python3:
rm -rf debian/python3-nacl/usr/lib/python3.?
1 change: 1 addition & 0 deletions debian/source/options
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extend-diff-ignore = "^src/[^/]*[.]egg-info/"
3 changes: 0 additions & 3 deletions debian/tests/control

This file was deleted.

8 changes: 0 additions & 8 deletions debian/tests/python3

This file was deleted.

2 changes: 1 addition & 1 deletion debian/watch
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=4
opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ https://pypi.debian.net/PyNaCl/PyNaCl-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
opts=uversionmangle=s/(rc|a|b|c)/~$1/,pgpsigurlmangle=s/$/.asc/ https://pypi.debian.net/PyNaCl/pynacl-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
Loading