Skip to content

Commit 0e86190

Browse files
committed
Include FIPS version in openssl version
1 parent da385c0 commit 0e86190

3 files changed

Lines changed: 15 additions & 1 deletion

File tree

patches-debian/rules.patch.tpl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/debian/rules
2+
+++ b/debian/rules
3+
@@ -30,7 +30,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
4+
endif
5+
6+
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 \
7+
- enable-tfo enable-zstd enable-zlib enable-fips
8+
+ enable-tfo enable-zstd enable-zlib enable-fips '-DGL_FIPS_VERSION="\"$(VERSION)-SED_MARKER_FOR_FIPS_VERSION\""'
9+
#OPT_alpha = ev4 ev5
10+
ARCHOPTS = OPT_$(DEB_HOST_ARCH)
11+
OPTS = $($(ARCHOPTS))

patches-debian/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
symbols.patch
2+
rules.patch

prepare_source

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
git_src -b debian/openssl-3.5.5-1 https://salsa.debian.org/debian/openssl.git
22
import_upstream_patches
3+
fips_version_suffix="${version_suffix}"
4+
sed "s/SED_MARKER_FOR_FIPS_VERSION/$fips_version_suffix/" <patches-debian/rules.patch.tpl > patches-debian/rules.patch
35
apply_patches patches-debian
4-
version_suffix="gl21~bp2150"
6+
version_suffix="gl51~bp2150"

0 commit comments

Comments
 (0)