[Pkg-samba-maint] [Git][samba-team/samba][master] 5 commits: d/rules: shorten dpkg_late_eval
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Thu Jul 25 09:49:01 BST 2024
Michael Tokarev pushed to branch master at Debian Samba Team / samba
Commits:
1aa0b94d by Michael Tokarev at 2024-07-24T17:06:51+03:00
d/rules: shorten dpkg_late_eval
- - - - -
924de146 by Michael Tokarev at 2024-07-25T10:29:01+03:00
d/rules: stop renaming heimdal dir for mitkrb5 profile
- - - - -
13a64b76 by Michael Tokarev at 2024-07-25T10:29:01+03:00
d/rules: remove the only usage of ${with_mitkrb5}
- - - - -
505e4ff2 by Michael Tokarev at 2024-07-25T11:32:17+03:00
d/rules: rearrange CFLAGS/LDFLAGS settings to use DEB_*_MAINT_APPEND due to #1077005
- - - - -
822da961 by Michael Tokarev at 2024-07-25T11:35:24+03:00
update changelog; upload version 4.20.2+dfsg-10 to unstable
- - - - -
2 changed files:
- debian/changelog
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+samba (2:4.20.2+dfsg-10) unstable; urgency=medium
+
+ * d/rules: shorten dpkg_late_eval
+ * d/rules: stop renaming heimdal dir for mitkrb5 profile
+ * d/rules: remove the only usage of ${with_mitkrb5}
+ * d/rules: rearrange CFLAGS/LDFLAGS settings to use
+ DEB_*_MAINT_APPEND due to dpkg #1077005
+ * skip -9 release because of test upload to experimental
+
+ -- Michael Tokarev <mjt at tls.msk.ru> Thu, 25 Jul 2024 11:35:21 +0300
+
samba (2:4.20.2+dfsg-8) unstable; urgency=medium
* d/samba-common-bin.lintian-override: fix the typo in the last fix
=====================================
debian/rules
=====================================
@@ -1,11 +1,38 @@
#!/usr/bin/make -f
SHELL = /bin/sh -e
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# Fast version of dpkg/architecture.mk defining all vars in one go
ifeq (${DEB_HOST_MULTIARCH},)
$(foreach d, $(shell dpkg-architecture | sed 's/=/?=/'), $(eval export $d))
endif
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# build is done in bin/default/ subdir
+DEB_CFLAGS_MAINT_APPEND = -ffile-prefix-map=../../=
+
+ifneq (,$(filter armel mipsel m68k powerpc sh4,${DEB_HOST_ARCH}))
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
+# on these platforms gcc does not link with -latomic, resulting in
+# third_party/heimdal/lib/krb5/krcache.c.55.o: in function `krcc_get_principal':
+# third_party/heimdal/lib/krb5/krcache.c:1395: undefined reference to `__atomic_load_8'
+# ids.krcu_cache_and_princ_id = heim_base_atomic_load(&data->krc_cache_and_principal_id);
+# third_party/heimdal/lib/base/heimbase-atomics.h:
+# #include <stdatomic.h>
+# #define heim_base_atomic_load(x) atomic_load((x))
+# include a workaround for now
+# (-latomic and <stdatomic.h> comes from gcc, --as-needed is already in use)
+DEB_LDFLAGS_MAINT_APPEND += -latomic
+endif
+
+ifneq (,$(filter m68k ,${DEB_HOST_ARCH}))
+# without this, build fails with multiple messages like:
+# foo.s:NNN: Error: Adjusted signed .word (0xb64a) overflows: `switch'-statement too large.
+# when building third_party/heimdal/lib/asn1/asn1_rfc2459_asn1.c (generated)
+# It would be best to enable this switch for a single file only (where it is needed)
+DEB_CFLAGS_MAINT_APPEND += -mlong-jump-table-offsets
+endif
+
include /usr/share/dpkg/buildtools.mk
include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/pkg-info.mk
@@ -26,9 +53,10 @@ endif
DESTDIR = ${CURDIR}/debian/tmp
-dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
+# used to be dpkg_late_eval
+late-eval = $(or $(value cache-$1),$(eval cache-$1 := $(shell $2))$(value cache-$1))
-LDB_VERSION = $(call dpkg_late_eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
+LDB_VERSION = $(call late-eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
LDB_DEB_VERSION = 2:${LDB_VERSION}+samba${DEB_VERSION_UPSTREAM_REVISION}
LDB_PACKAGES = libldb2 libldb-dev ldb-tools python3-ldb
@@ -95,43 +123,18 @@ ifeq (${DEB_VENDOR}-${DEB_HOST_ARCH}, Ubuntu-i386)
omit-pkgs += ctdb libpam-winbind samba samba-ad-dc samba-testsuite samba-vfs-modules samba-vfs-ceph samba-vfs-glusterfs
endif
-ifneq (,$(filter armel mipsel m68k powerpc sh4,${DEB_HOST_ARCH}))
-# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81358
-# on these platforms gcc does not link with -latomic, resulting in
-# third_party/heimdal/lib/krb5/krcache.c.55.o: in function `krcc_get_principal':
-# third_party/heimdal/lib/krb5/krcache.c:1395: undefined reference to `__atomic_load_8'
-# ids.krcu_cache_and_princ_id = heim_base_atomic_load(&data->krc_cache_and_principal_id);
-# third_party/heimdal/lib/base/heimbase-atomics.h:
-# #include <stdatomic.h>
-# #define heim_base_atomic_load(x) atomic_load((x))
-# include a workaround for now
-# (-latomic and <stdatomic.h> comes from gcc, --as-needed is already in use)
-LDFLAGS += -latomic
-endif
-
-ifneq (,$(filter m68k ,${DEB_HOST_ARCH}))
-# without this, build fails with multiple messages like:
-# foo.s:NNN: Error: Adjusted signed .word (0xb64a) overflows: `switch'-statement too large.
-# when building third_party/heimdal/lib/asn1/asn1_rfc2459_asn1.c (generated)
-# It would be best to enable this switch for a single file only (where it is needed)
-CFLAGS += -mlong-jump-table-offsets
-endif
-
-# build is done in bin/default/ subdir
-CFLAGS += -ffile-prefix-map=../../=
-
# we had t64 transition (libsmbclient => libsmbclient0) for trixie
libsmbclient := $(if ${before-trixie},libsmbclient,libsmbclient0)
-with_mitkrb5 = $(filter pkg.samba.mitkrb5, ${DEB_BUILD_PROFILES})
-ifneq (,${with_mitkrb5})
+mitkrb5-dep-pkgs :=
+ifneq (,$(filter pkg.samba.mitkrb5, ${DEB_BUILD_PROFILES}))
config-args += \
--with-system-mitkrb5 \
--with-experimental-mit-ad-dc \
--with-system-mitkdc=/usr/sbin/krb5kdc
# samba packages will have its own version suffix
mitkrb5-samba-ver = ${DEB_VERSION}mitkrb5
-mitkrb5-dep-pkgs = samba-libs samba-dev
+mitkrb5-dep-pkgs += samba-libs samba-dev
mitkrb5-dep-pkgs += samba samba-common-bin python3-samba
mitkrb5-dep-pkgs += samba-vfs-ceph samba-vfs-glusterfs
mitkrb5-dep-pkgs += samba-dsdb-modules
@@ -140,8 +143,6 @@ mitkrb5-dep-pkgs += libnss-winbind libpam-winbind
mitkrb5-dep-pkgs += winbind libwbclient0
mitkrb5-dep-pkgs += samba-testsuite
mitkrb5-dep-pkgs += ctdb
-else
-mitkrb5-dep-pkgs =
endif
ifneq (,${omit-pkgs})
@@ -169,10 +170,6 @@ bin/configured.stamp:
{ $(if ${V},echo "==== contents of config.log:"; cat bin/config.log;) false; }
# #1013205: https://lists.samba.org/archive/samba-technical/2022-November/137788.html
rm -f third_party/heimdal/lib/gssapi/gssapi.h
-ifneq (,${with_mitkrb5}) # ensure we do not use embedded heimdal in any way
- [ -d third_party/heimdal-build-with-mitkrb5 ] || \
- mv third_party/heimdal third_party/heimdal-build-with-mitkrb5
-endif
touch $@
build-arch: bin/built.stamp
@@ -377,7 +374,3 @@ endif
clean:
# see also debian/clean
dh_clean bin/ testbuild/
-ifneq (,${with_mitkrb5})
- [ ! -d third_party/heimdal-build-with-mitkrb5 ] || \
- mv third_party/heimdal-build-with-mitkrb5 third_party/heimdal
-endif
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/c691fc9c08dbede958fb19771876d6653348f6ca...822da961a4b6ada9219f8bc6816781a99011a76c
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/c691fc9c08dbede958fb19771876d6653348f6ca...822da961a4b6ada9219f8bc6816781a99011a76c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20240725/bb10d895/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list