[Pkg-samba-maint] [Git][samba-team/samba][master] 11 commits: d/rules: set SHELL to be sh -e
Michael Tokarev (@mjt)
gitlab at salsa.debian.org
Fri Apr 15 14:23:58 BST 2022
Michael Tokarev pushed to branch master at Debian Samba Team / samba
Commits:
17c5461c by Michael Tokarev at 2022-04-12T11:33:25+03:00
d/rules: set SHELL to be sh -e
- - - - -
ba13a3e6 by Michael Tokarev at 2022-04-12T11:54:17+03:00
d/rules: error-out if LDB_VERSION<>2.5.0 to rethink its versioning scheme
- - - - -
6bab153c by Michael Tokarev at 2022-04-13T08:32:30+03:00
clean up the clean target
move build system leftovers into debian/clean, and list
only things which *should* be cleaned up in d/rules.
This way we only need to use single dh_clean invocation
which does everything (it does dh_testdir too), so we
do not need override_dh_auto_clean.
- - - - -
94791b0b by Michael Tokarev at 2022-04-13T08:32:40+03:00
d/rules: fast version of architecture.mk
- - - - -
ca87dcba by Michael Tokarev at 2022-04-13T08:32:40+03:00
d/rules: do not disable glusterfs on ubuntu
glusterfs is now in main
- - - - -
0f17603b by Michael Tokarev at 2022-04-13T08:32:40+03:00
d/rules: de-indent conf_args
- - - - -
61e7142c by Michael Tokarev at 2022-04-13T08:32:40+03:00
d/rules: rearrange configure options
- - - - -
fcc29506 by Michael Tokarev at 2022-04-13T08:32:40+03:00
d/rules: collapse --enable-ceph options
- - - - -
4af3ab82 by Michael Tokarev at 2022-04-13T08:32:40+03:00
d/rules: collapse/deindent another conf_args assignment
- - - - -
2d995f3a by Michael Tokarev at 2022-04-15T16:19:07+03:00
d/changelog: add closes for #1001053 by 4.16
- - - - -
fea4620d by Michael Tokarev at 2022-04-15T16:23:30+03:00
update changelog
- - - - -
3 changed files:
- debian/changelog
- + debian/clean
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+samba (2:4.16.0+dfsg-7) UNRELEASED; urgency=medium
+
+ * another bunch of small tweaks to d/rules:
+ - set SHELL to /bin/sh -e
+ - rework the clean target
+ - provide fast replacement of architecture.mk
+ - rearrange configure options
+ * do not disable glusterfs on ubuntu-i386 (glusterfs is now in main)
+ * mention closing of #1001053 by the 4.16 upload
+
+ -- Michael Tokarev <mjt at tls.msk.ru> Fri, 15 Apr 2022 16:20:52 +0300
+
samba (2:4.16.0+dfsg-6) unstable; urgency=medium
* another attempt to fix/work around #221618. Re-enable
@@ -80,6 +92,7 @@ samba (2:4.16.0+dfsg-1) experimental; urgency=medium
Closes: #1004692, CVE-2021-44141: UNIX extensions in SMB1 disclose whether
the outside target of a symlink exists
Closes: #1005642 (windows client data corruption due to cache poisoning)
+ Closes: #1001053 (MIT-kerberos config broken after fix for CVE-2020-25717)
Closes: #988197 (legacy printing support, 47d79d7e7e406f7dd2)
Closes: #998423 (coredump connecting from macos to shares with var substs)
Closes: #999876 (winbind allow trusted domains = no regression)
=====================================
debian/clean
=====================================
@@ -0,0 +1,9 @@
+# remove artifacts left by the build system
+.lock-wscript
+compile_commands.json
+# Waf pycache files
+buildtools/wafsamba/__pycache__/
+source3/build/__pycache__/
+third_party/waf/waflib/__pycache__/
+third_party/waf/waflib/extras/__pycache__/
+third_party/waf/waflib/Tools/__pycache__/
=====================================
debian/rules
=====================================
@@ -1,4 +1,5 @@
#!/usr/bin/make -f
+SHELL = /bin/sh -e
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
@@ -6,9 +7,10 @@ include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/buildopts.mk
include /usr/share/dpkg/pkg-info.mk
include /usr/share/dpkg/vendor.mk
-# faster version of dpkg/architecture.mk defining only vars we actually need
-$(foreach var,DEB_HOST_ARCH DEB_HOST_ARCH_OS DEB_HOST_MULTIARCH,\
- $(eval export ${var} ?= $$(call dpkg_late_eval,${var},dpkg-architecture -q${var})))
+# 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 PYTHON = python3
@@ -19,7 +21,10 @@ LDB_EPOCH := 2:
LDB_VERSION = $(call dpkg_late_eval,LDB_VERSION,grep ^VERSION lib/ldb/wscript | cut -d\' -f2)
# For 2.5.0 we uploaded wrongly versioned ldb to experimental (2.5.0+samba should be 2.5.0)
# Temporarily add a suffix so it sorts after the wrong version. Remove for 2.5.1+.
-LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}$(if $(filter ${LDB_VERSION},2.5.0),+smb)-${DEB_REVISION}+samba${DEB_VERSION_UPSTREAM}
+ifneq (${LDB_VERSION}, 2.5.0)
+$(error update LDB version number expression below:)
+endif
+LDB_DEB_VERSION := ${LDB_EPOCH}${LDB_VERSION}+smb-${DEB_REVISION}+samba${DEB_VERSION_UPSTREAM}
LDB_DEPENDS := libldb2 (= ${LDB_DEB_VERSION})
V = 1
@@ -28,41 +33,40 @@ WAF := PYTHONHASHSEED=1 ${PYTHON} ./buildtools/bin/waf \
WAFv := ${WAF} $(if $V, -v)
conf_args = \
- --prefix=/usr \
- --enable-fhs \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/libexec \
- --with-privatedir=/var/lib/samba/private \
- --with-smbpasswd-file=/etc/samba/smbpasswd \
- --with-piddir=/run/samba \
- --with-pammodulesdir=/lib/$(DEB_HOST_MULTIARCH)/security \
- --with-pam \
- --with-syslog \
- --with-utmp \
- --with-winbind \
- --with-quota \
- --with-shared-modules=idmap_rid,idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_tdb2,vfs_dfs_samba4,auth_samba4,vfs_nfs4acl_xattr \
- --with-automount \
- --with-ldap \
- --with-ads \
- --with-gpgme \
- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
- --with-modulesdir=/usr/lib/$(DEB_HOST_MULTIARCH)/samba \
- --datadir=/usr/share \
- --with-lockdir=/run/samba \
- --with-statedir=/var/lib/samba \
- --with-cachedir=/var/cache/samba \
- --enable-avahi \
- --disable-rpath \
- --disable-rpath-install \
- --bundled-libraries=NONE,pytevent,ldb \
- --with-cluster-support \
- --with-socketpath=/run/ctdb/ctdbd.socket \
- --with-logdir=/var/log/ctdb \
- --enable-etcd-reclock \
- --enable-spotlight
-
+ --prefix=/usr \
+ --enable-fhs \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --libexecdir=/usr/libexec \
+ --libdir=/usr/lib/${DEB_HOST_MULTIARCH} \
+ --datadir=/usr/share \
+ --with-modulesdir=/usr/lib/${DEB_HOST_MULTIARCH}/samba \
+ --with-pammodulesdir=/lib/${DEB_HOST_MULTIARCH}/security \
+ --with-privatedir=/var/lib/samba/private \
+ --with-smbpasswd-file=/etc/samba/smbpasswd \
+ --with-piddir=/run/samba \
+ --with-lockdir=/run/samba \
+ --with-statedir=/var/lib/samba \
+ --with-cachedir=/var/cache/samba \
+ --with-pam \
+ --with-syslog \
+ --with-utmp \
+ --with-winbind \
+ --with-quota \
+ --with-automount \
+ --with-ldap \
+ --with-ads \
+ --with-gpgme \
+ --enable-avahi \
+ --enable-spotlight \
+ --disable-rpath --disable-rpath-install \
+ --with-shared-modules=idmap_rid,idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_tdb2,vfs_dfs_samba4,auth_samba4,vfs_nfs4acl_xattr \
+ --bundled-libraries=NONE,pytevent,ldb \
+ \
+ --with-cluster-support \
+ --enable-etcd-reclock \
+ --with-socketpath=/run/ctdb/ctdbd.socket \
+ --with-logdir=/var/log/ctdb \
WITH_CEPH = yes
# Ceph is not available on all platforms
@@ -74,33 +78,23 @@ ifeq ($(DEB_VENDOR) $(DEB_HOST_ARCH), Ubuntu i386)
WITH_CEPH =
endif
-ifneq ($(WITH_CEPH),)
- conf_args += \
- --enable-ceph-reclock
-else
- conf_args += \
- --disable-cephfs
-endif
-
+conf_args += $(if ${WITH_CEPH},\
+ --enable-cephfs --enable-ceph-reclock,\
+ --disable-cephfs)
WITH_GLUSTERFS = yes
# GlusterFS is linux-only
ifneq ($(DEB_HOST_ARCH_OS), linux)
WITH_GLUSTERFS =
endif
-# GlusterFS is not in Ubuntu main
-ifeq ($(DEB_VENDOR), Ubuntu)
- WITH_GLUSTERFS =
-endif
ifeq ($(DEB_HOST_ARCH_OS), linux)
- conf_args += \
- --with-systemd \
- --systemd-install-services \
- --with-systemddir=/lib/systemd/system
+conf_args += \
+ --with-systemd \
+ --systemd-install-services \
+ --with-systemddir=/lib/systemd/system
else
- conf_args += \
- --without-systemd
+conf_args += --without-systemd
endif
# Ubuntu i386 binary compatibility only effort: Disable some i386 packages
@@ -112,7 +106,7 @@ endif
build_packages := $(shell dh_listpackages)
binary binary-arch binary-indep \
-clean install install-arch install-indep: %:
+install install-arch install-indep: %:
dh $*
configure: bin/configured.stamp
@@ -326,8 +320,6 @@ override_dh_gencontrol:
-- -v${LDB_DEB_VERSION}
dh_gencontrol --remaining-packages -- -Vldb:Depends="${LDB_DEPENDS}"
-override_dh_auto_clean:
- rm -rf bin/ testbuild/
- find -name __pycache__ -exec rm -rf {} +
- rm -f .lock-wscript
- rm -f compile_commands.json
+clean:
+ # see also debian/clean
+ dh_clean bin/ testbuild/
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/4a039a9ef0174beffc22923f26403ea39a756af7...fea4620d335f868698de5547be0cecd8c515263e
--
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/4a039a9ef0174beffc22923f26403ea39a756af7...fea4620d335f868698de5547be0cecd8c515263e
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/20220415/408a2f66/attachment-0001.htm>
More information about the Pkg-samba-maint
mailing list