starlingx/integ
Code Issues Proposed changes

debian: python-nss: add build scripts + patches

Browse Source 
Python NSS module is not buildable by pip on Debian/bullseye and
requires patches. The debian package for this module contains the
required fixes, but contains 2 other problems:
- it builds only the PY3-version of itself
- it (incorrectly) doesn't install pip metadata, making it "invisible"
  by pip

Solution: import python-nss from debian/bullseye + add patches that fix
the above problems.

TESTS
================
Build package in debian environment

Story: 2009897
Task: 44691

Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
Change-Id: I65ab9b967e38340939bd99c389b72820ee17571b
This commit is contained in:
Davlet Panech 2022-04-11 15:01:28 -04:00
parent ce6e078c8f
commit 242e6630af
5 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian_pkg_dirs
View File

@ -62,6 +62,7 @@ ostree/mttyexec
ostree/ostree
ostree/ostree-upgrade-mgr
python/dh-python
python/python-nss
python/python3-setuptools
security/keyrings.alt
security/python-keyring

25
python/python-nss/debian/deb_patches/0001-Don-t-delete-module-metadata-in-deb-package.patch Normal file
View File

@ -0,0 +1,25 @@
From 364a0606c58f100bbec4447fb34e03fcba2821e3 Mon Sep 17 00:00:00 2001
From: Davlet Panech <davlet.panech@windriver.com>
Date: Tue, 29 Mar 2022 15:26:11 -0400
Subject: [PATCH 1/2] Don't delete module metadata in deb package
Pip requires module metadata to be present for installed modules,
otherwise it can't "see" it.
Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
---
debian/rules | 1 -
1 file changed, 1 deletion(-)
diff --git a/debian/rules b/debian/rules
index 7955ffd..ef6314b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,4 +13,3 @@ override_dh_auto_clean:
override_dh_auto_install:
dh_auto_install
- rm -rf debian/python*-nss/usr/lib/python*/dist-packages/python_nss-*.egg-info
--
2.30.2

57
python/python-nss/debian/deb_patches/0002-Build-the-python2-variant.patch Normal file
View File

@ -0,0 +1,57 @@
From 58830c2a305e6d1b931b46700e9af04647c85198 Mon Sep 17 00:00:00 2001
From: Davlet Panech <davlet.panech@windriver.com>
Date: Wed, 6 Apr 2022 01:01:17 +0000
Subject: [PATCH 2/2] Build the python2 variant
Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
---
debian/control | 15 +++++++++++++++
debian/rules | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index c42e324..fb407b1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian FreeIPA Team <pkg-freeipa-devel@lists.alioth.debian.org>
Uploaders: Timo Aaltonen <tjaalton@debian.org>
Build-Depends: debhelper-compat (= 12),
dh-python,
+ python-all-dev,
python3-all-dev,
libnss3-dev,
Standards-Version: 4.5.1
@@ -25,3 +26,17 @@ Description: Python3 bindings for Network Security Services (NSS)
and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
certificates, and other security standards. Specific NSS
implementations have been FIPS-140 certified.
+
+Package: python-nss
+Architecture: any
+Provides: ${python:Provides}, ${python-nss:Provides}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Description: Python2 bindings for Network Security Services (NSS)
+ This package provides Python2 bindings for Network Security Services (NSS)
+ and the Netscape Portable Runtime (NSPR).
+ .
+ NSS is a set of libraries supporting security-enabled client and
+ server applications. Applications built with NSS can support SSL v2
+ and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3
+ certificates, and other security standards. Specific NSS
+ implementations have been FIPS-140 certified.
diff --git a/debian/rules b/debian/rules
index ef6314b..fa4eb42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
export PYBUILD_NAME=nss
%:
- dh $@ --with python3 --buildsystem=pybuild
+ dh $@ --with python2,python3 --buildsystem=pybuild
override_dh_auto_clean:
--
2.30.2

2
python/python-nss/debian/deb_patches/series Normal file
View File

@ -0,0 +1,2 @@
0001-Don-t-delete-module-metadata-in-deb-package.patch
0002-Build-the-python2-variant.patch

10
python/python-nss/debian/meta_data.yaml Normal file
View File

@ -0,0 +1,10 @@
debver: 1.0.1-1
debname: python-nss
dl_path:
name: python-nss-debian-1.0.1-1.tar.gz
url: https://salsa.debian.org/freeipa-team/python-nss/-/archive/debian/1.0.1-1/python-nss-debian-1.0.1-1.tar.gz
md5sum: 2f61d8b9b23ab0649e61e066518c91dd
sha256sum: b95d3f57f51e51412ff8abd3cd0bb7c8fa70bdafe6ff4c61eaad26b065d3c5ae
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: