starlingx/integ
Code Issues Proposed changes

Update Trixie packaging for following packages

Browse Source 
This change brings updates from the 'f/trixie' branch into 'master' to
ensure consistent functionality and packaging structure across both
branches.

Following packages are updated in trixie version to fix build failure
  openssl
  python-nss
  watchdog

Test Plan:
PASS  master trixie build

Story: 2011360
Task: 53216

Change-Id: Ib8a7f309363af9343e3b961a89b7a4d0ff7e0391
Signed-off-by: Abhinav Ayyapasetti <ayyapasetti.abhinav@windriver.com>
This commit is contained in:
Abhinav Ayyapasetti
2025-11-26 04:46:45 -05:00
parent 04db04771a
commit 6b6c5342bb
8 changed files with 71 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
base/openssl/debian/trixie/deb_patches/0001-Build-in-support-for-sctp.patch
View File

@@ -1,37 +1,37 @@
From 50a3ade26e25df25f9ce800195e232e6e504a79f Mon Sep 17 00:00:00 2001
From: sabyasachi nayak <sabyasachi.nayak@windriver.com>
Date: Fri, 10 Nov 2023 11:20:36 +0000
From 515dfa41c381ad5df449561335b63e353524367e Mon Sep 17 00:00:00 2001
From: Sai Lakshmi Teja Vanka <SaiLakshmiTeja.Vanka@windriver.com>
Date: Thu, 3 Jul 2025 10:14:32 +0000
Subject: [PATCH] Build-in-support-for-sctp
Signed-off-by: sabyasachi nayak <sabyasachi.nayak@windriver.com>
---
debian/control | 2 +-
debian/rules | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/debian/control b/debian/control
index 2ad5a22..6dd24bb 100644
index b9cb164..f38b8f5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: openssl
-Build-Depends: debhelper-compat (= 12), m4, bc, dpkg-dev (>= 1.15.7)
+Build-Depends: debhelper-compat (= 12), m4, bc, dpkg-dev (>= 1.15.7), libsctp-dev
-Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.22.5), libzstd-dev, zlib1g-dev
+Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.22.5), libzstd-dev, zlib1g-dev, libsctp-dev
Section: utils
Priority: optional
Maintainer: Debian OpenSSL Team <pkg-openssl-devel@lists.alioth.debian.org>
Maintainer: Debian OpenSSL Team <pkg-openssl-devel@alioth-lists.debian.net>
diff --git a/debian/rules b/debian/rules
index 9a46f89..dce8e49 100755
index 5a80970..ffad111 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -30,7 +30,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
endif
-CONFARGS = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms no-capieng
+CONFARGS = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms no-capieng enable-sctp
OPT_alpha = ev4 ev5
CONFARGS = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms no-capieng no-rdrand \
- enable-tfo enable-zstd enable-zlib enable-fips
+ enable-tfo enable-zstd enable-zlib enable-fips enable-sctp
#OPT_alpha = ev4 ev5
ARCHOPTS = OPT_$(DEB_HOST_ARCH)
OPTS = $($(ARCHOPTS))
--
2.30.2
--
2.47.2

8
base/openssl/debian/trixie/meta_data.yaml
View File

@@ -1,10 +1,10 @@
---
debver: 1.1.1w-0+deb11u4
debver: 3.5.1-1
debname: openssl
dl_path:
name: openssl-debian-openssl-1.1.1w-0+deb11u4.tar.gz
url: https://salsa.debian.org/debian/openssl/-/archive/debian/openssl-1.1.1w-0+deb11u4/openssl-debian-openssl-1.1.1w-0+deb11u4.tar.gz
sha256sum: 2a512d68a52b20e4aeec8993ca5324c25b64dc1e8ce80d612f9add90f22943c3
name: openssl-debian-openssl-3.5.1-1.tar.gz
url: https://salsa.debian.org/debian/openssl/-/archive/debian/openssl-3.5.1-1/openssl-debian-openssl-3.5.1-1.tar.gz
sha256sum: 955102ce13e6c14fcc42148736f59da25af8ad673a77d59251cece6f44bbb810
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true

3
base/watchdog/debian/trixie/dl_hook
View File

@@ -15,7 +15,8 @@ SRC_DIR=${PKG_DIR}/sources
MAJOR_VER="5.16"
REVISION="1"
VER=${MAJOR_VER}-${REVISION}
PATCH_VER="1"
VER=${MAJOR_VER}-${PATCH_VER}.${REVISION}
DSC_FILE=${PKGNAME}_${VER}.dsc
dpkg-source -x ${DSC_FILE}

4
base/watchdog/debian/trixie/meta_data.yaml
View File

@@ -1,7 +1,7 @@
---
debver: 5.16-1
debver: 5.16-1.1
dl_hook: dl_hook
archive: https://snapshot.debian.org/archive/debian/20200424T151944Z/pool/main/w/watchdog
archive: https://snapshot.debian.org/archive/debian/20250721T022532Z/pool/main/w/watchdog/
dl_files:
meta-lat.tar.gz:
topdir: null

24
python/python-nss/debian/trixie/deb_patches/0001-Fix-build-issues.patch Normal file
View File

@@ -0,0 +1,24 @@
From 4377c7dfb2e434b742fa9e94f1bd0e0b4fc25a18 Mon Sep 17 00:00:00 2001
From: Sai Lakshmi Teja Vanka <SaiLakshmiTeja.Vanka@windriver.com>
Date: Fri, 4 Jul 2025 05:15:45 +0000
Subject: [PATCH] Fix build issues
---
debian/control | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/control b/debian/control
index c42e324..9802fca 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Timo Aaltonen <tjaalton@debian.org>
Build-Depends: debhelper-compat (= 12),
dh-python,
python3-all-dev,
+ python3-setuptools,
libnss3-dev,
Standards-Version: 4.5.1
Homepage: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Python_binding_for_NSS
--
2.47.2

5
python/python-nss/debian/trixie/deb_patches/series
View File

@@ -1,2 +1,3 @@
0001-Don-t-delete-module-metadata-in-deb-package.patch
0002-Build-the-python2-variant.patch
#0001-Don-t-delete-module-metadata-in-deb-package.patch
#0002-Build-the-python2-variant.patch
0001-Fix-build-issues.patch

18
python/python-nss/debian/trixie/patches/fix-ftbfs-python3-12.patch Normal file
View File

@@ -0,0 +1,18 @@
Description: fix ftbfs on python3.12
Author: Bo YU <tsu.yubo@gmail.com>
Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1055552
Forwarded: no, no suitable upstream to submit this
Last-Update: 2023-12-06
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/py_nspr_error.c
+++ b/src/py_nspr_error.c
@@ -20,6 +20,8 @@
#include "secerr.h"
#include "sslerr.h"
+#define HAVE_STDARG_PROTOTYPES 1
+
typedef struct {
PyBaseExceptionObject base;
PyObject *error_desc;

1
python/python-nss/debian/trixie/patches/series Normal file
View File

@@ -0,0 +1 @@
fix-ftbfs-python3-12.patch