Skip to content

Commit 912ac19

Browse files
NotTheEvilOneNotTheEvilOne
committed
Build gnutls28 with version 3.8.11-3 for 1592.17
Signed-off-by: Tobias Wolf <wolf@b1-systems.de> On-behalf-of: SAP <tobias.wolf@sap.com>
1 parent cd72b6b commit 912ac19

File tree

6 files changed

+108
-10
lines changed

6 files changed

+108
-10
lines changed

‎.container‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ghcr.io/gardenlinux/repo-debian-snapshot@sha256:6bb682e9665ec7e88da709eaf6867a5045afa3b89d0afd4e8225d9dda3ff9d99

‎patches/debian-control-missing-dependencies.patch‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- a/debian/control 2026-02-12 16:42:17.002366762 +0100
2+
+++ b/debian/control 2026-02-12 18:06:04.719225698 +0100
3+
@@ -15,10 +15,12 @@ Build-Depends: dpkg-dev (>= 1.22.5),
4+
freebsd-net-tools [kfreebsd-i386 kfreebsd-amd64] <!nocheck>,
5+
gperf,
6+
libcmocka-dev <!nocheck>,
7+
+ libev-dev,
8+
libidn2-dev,
9+
libp11-kit-dev,
10+
libssl-dev <!nocheck>,
11+
libtasn1-6-dev,
12+
+ libtasn1-bin,
13+
libunbound-dev,
14+
libunistring-dev,
15+
net-tools [!kfreebsd-i386 !kfreebsd-amd64] <!nocheck>,

‎patches/debian-rules-nodoc.patch‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
--- a/debian/rules 2026-02-12 18:30:12.738690170 +0100
2+
+++ b/debian/rules 2026-02-12 18:31:38.274215991 +0100
3+
@@ -7,9 +7,7 @@ export DEB_CXXFLAGS_MAINT_APPEND := -Wal
4+
5+
include /usr/share/dpkg/pkg-info.mk
6+
7+
-AMCONFBUILDINDEP := $(shell if dh_listpackages | grep -q gnutls-doc ; \
8+
- then echo "--enable-gtk-doc" ; \
9+
- else echo "--disable-gtk-doc --disable-doc"; fi)
10+
+AMCONFBUILDINDEP := --disable-gtk-doc --disable-doc
11+
12+
CONFIGUREARGS = \
13+
--enable-ld-version-script --enable-cxx \
14+
@@ -53,13 +51,7 @@ override_dh_auto_configure:
15+
16+
override_dh_autoreconf:
17+
grep -rl --null gettext-0.20 m4/ | xargs -0r rm -v
18+
- if ! dh_listpackages | grep -q gnutls-doc ; \
19+
- then env GTKDOCIZE="echo DISABLED running gtkdocize" \
20+
- dh_autoreconf --verbose $(BDIR) ; \
21+
- else \
22+
- dh_autoreconf --verbose $(BDIR) ; \
23+
- fi
24+
- # Bug#1118328
25+
+ dh_autoreconf --verbose $(BDIR)
26+
cp -v debian/texinfo.tex build-aux/
27+
28+
override_dh_makeshlibs:
29+
@@ -92,24 +84,11 @@ endif
30+
31+
override_dh_auto_install:
32+
dh_auto_install $(BDIR) --verbose
33+
-ifneq ($(filter --disable-doc,$(AMCONFBUILDINDEP)),)
34+
$(MAKE) -C b4deb/doc/manpages DESTDIR=$(CURDIR)/debian/tmp install
35+
-else
36+
- $(MAKE) -C b4deb/doc/ DESTDIR=$(CURDIR)/debian/tmp install-html
37+
- # we symlink these
38+
- rm -vf debian/tmp/usr/share/info/*.png
39+
-endif
40+
find debian/*/usr/lib/* -name '*.so.*.*' -type f -exec \
41+
chrpath -d {} +
42+
find debian/*/usr/lib/ -name 'libgnutlsxx.*' -delete
43+
44+
-override_dh_installinfo:
45+
- dh_installinfo $(BDIR)
46+
- if test -e debian/gnutls-doc ; then \
47+
- cd debian/gnutls-doc/usr/share/info && \
48+
- sed -i -e 's:image src="\([^"]*.png"\):image src="/usr/share/doc/gnutls-doc/html/\1:g' *.info* ; \
49+
- fi
50+
-
51+
override_dh_compress:
52+
dh_compress $(BDIR) -X.pdf
53+

‎patches/fips.patch‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ diff --git a/debian/rules b/debian/rules
44
@@ -14,2 +14,5 @@ AMCONFBUILDINDEP := $(shell if dh_listpackages | grep -q gnutls-doc ; \
55
CONFIGUREARGS = \
66
+ --enable-fips140-mode \
7-
+ --with-fips140-module-name='Garaden Linux gnutls $(DEB_VERSION)' \
7+
+ --with-fips140-module-name='Garden Linux gnutls $(DEB_VERSION)' \
88
+ --with-fips140-module-version=$(DEB_VERSION) \
99
--enable-ld-version-script --enable-cxx \
1010
@@ -27,2 +30,19 @@ BDIR = -O--builddirectory=b4deb
@@ -31,15 +31,14 @@ diff --git a/debian/rules b/debian/rules
3131

3232
+
3333
execute_after_dh_auto_clean:
34-
@@ -82,9 +103,5 @@ endif
34+
@@ -82,9 +103,11 @@ endif
3535
find debian/*/usr/lib/ -name 'libgnutlsxx.*' -delete
3636
+ # We need to prepeare this, since dh_install expects to copy a file.
3737
+ touch debian/tmp/usr/lib/$(shell uname -m)-linux-gnu/.libgnutls.so.30.hmac
3838

39-
-override_dh_installinfo:
40-
- dh_installinfo $(BDIR)
41-
- if test -e debian/gnutls-doc ; then \
42-
- cd debian/gnutls-doc/usr/share/info && \
43-
- sed -i -e 's:image src="\([^"]*.png"\):image src="/usr/share/doc/gnutls-doc/html/\1:g' *.info* ; \
44-
- fi
45-
39+
override_dh_installinfo:
40+
dh_installinfo $(BDIR)
41+
if test -e debian/gnutls-doc ; then \
42+
cd debian/gnutls-doc/usr/share/info && \
43+
sed -i -e 's:image src="\([^"]*.png"\):image src="/usr/share/doc/gnutls-doc/html/\1:g' *.info* ; \
44+
fi

‎patches/series‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
fips.patch
22
libgnutls30t64.symbols.patch
33
libgnutls30t64.install.patch
4+
debian-control-missing-dependencies.patch
5+
debian-rules-nodoc.patch

‎prepare_source‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,30 @@
1-
apt_src gnutls28
1+
pkg=gnutls28
2+
version_orig=3.8.11
3+
version="${version_orig}-3"
4+
version_suffix="gl0+bp1592"
5+
6+
git_src -b "${version}" https://salsa.debian.org/gnutls-team/gnutls.git
7+
8+
apt-get install -y --no-install-recommends bison gperf gtk-doc-tools pkg-config wget
9+
10+
# Bootstrap original (Git) sources as they are modified by the script after checkout by intend and magic
11+
GNUTLS_SRC=$(mktemp -d)
12+
git clone -b "${version_orig}" --recurse-submodules https://gitlab.com/gnutls/gnutls.git $GNUTLS_SRC
13+
14+
pushd $GNUTLS_SRC
15+
./bootstrap --copy
16+
popd
17+
18+
import_src $GNUTLS_SRC
19+
rm -fR "$GNUTLS_SRC"
20+
21+
222
apply_patches
23+
24+
# Repack original (Git) sources after being modified by the bootstrap script
25+
pushd ${dir}/src
26+
27+
unlink ${dir}/orig.tar
28+
tar -cf ../orig.tar .
29+
30+
popd

0 commit comments

Comments
 (0)