From: Peter Michael Green Date: Thu, 20 Mar 2025 20:37:46 +0000 (+0000) Subject: Manual merge of version 2:4.20.2+dfsg-6+rpi1 and 2:4.22.0+dfsg-1 to produce 2:4.22... X-Git-Tag: raspbian/2%4.22.0+dfsg-1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e03dead69c231a480265a2d5ece48ecb867fff08;p=samba.git Manual merge of version 2:4.20.2+dfsg-6+rpi1 and 2:4.22.0+dfsg-1 to produce 2:4.22.0+dfsg-1+rpi1 --- 8f4ebbf8ead7a504b66e8d182e5fdc7f09e7f9d6 diff --cc debian/changelog index 1b92ffaf,99ee58df..dabe7895 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,336 +1,343 @@@ - samba (2:4.20.2+dfsg-6+rpi1) trixie-staging; urgency=medium ++samba (2:4.22.0+dfsg-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 2:4.19.1+dfsg-4+rpi1 by Peter Michael Green at Thu, 12 Oct 2023 15:37:21 +0000] + * Link with libatomic on armhf too. + - -- Raspbian forward porter Mon, 15 Jul 2024 19:59:21 +0000 ++ -- Peter Michael Green Thu, 20 Mar 2025 20:37:19 +0000 ++ + samba (2:4.22.0+dfsg-1) unstable; urgency=medium + + * new upstream release + * samba-libs: provide libndr5 too (with a compat symlink) + * add libsamba-security-private.so link for freeipa testsuite + (Closes: #1099340) + * d/samba-vfs-ceph.install: install also ceph_new vfs module + (Closes: #1098670) + * d/*.install: s@/*/@/${DEB_HOST_MULTIARCH}/@ + * d/source/lintian-overrides: add dh-exec-useless-usage *DEB_HOST_MULTIARCH* + + -- Michael Tokarev Fri, 07 Mar 2025 00:02:26 +0300 + + samba (2:4.22.0~rc1+dfsg-1) experimental; urgency=medium + + * d/control: remove vorlon@ from Uploaders. + Thank you, dear friend, for all the work you've done. RIP! + * new upstream release candidate + Closes: #1084559 (crypt module removal in python 3.13) + * remove patches which has been applied upstream + * fix-nfs-service-name-to-nfs-kernel-server.patch: + refresh, remove now-unneeded hunk + * revert-ldb-use-hexchars_upper-from-replace.h.patch + to avoid linking libldb2 with libreplace + * replace-xpg-strerror.patch + to avoid linking other libs with libreplace + * d/rules: fixup component versions + * libtalloc, libtevent, libtdb, libldb: symbols: add new versions + * libldb2.symbols: add new version + * samba-libs: libndr.so soname bump to 6, add new symbols + * samba-libs: add libutil-crypt-private-samba.so.0 + + -- Michael Tokarev Fri, 07 Feb 2025 12:37:12 +0300 + + samba (2:4.21.3+dfsg-6) unstable; urgency=medium + + * d/genshlibs: remove the special-case for libsmbclient0 since + we expand t64:Provides in d/control directly + * d/control: add ${t64:Provides} comments + * d/control: more t64 work: for libtevent0t64, break libtevent0 + not <<${source:Version} but <<${binary:Version}, because source + is samba not tevent (Closes: #1092881) + + -- Michael Tokarev Sun, 12 Jan 2025 23:16:00 +0300 + + samba (2:4.21.3+dfsg-5) unstable; urgency=medium + + * the Fixing Big Mishaps release. + + * d/rules: fix talloc, tevent, tdb subpackages version numbers, add epoch + + Due to a mistake, I screwed up sub-packages versions completely, + by using the wrong variable when generating the versions, - so + all mentioned packages had version number of ldb, not their own. + + Fix this. + + Unfortunately, the wrong version is larger than all the correct ones. + To compensate, use the same epoch number as is already used by current + samba package (2:). + + While at it, use common variable to hold the +samba version suffix. + + * d/*.symbols: mark most recent version markers with 2: epoch too + + * d/control,d/rules: ensure we use the most recent libtalloc/libtevent/libtdb + for now, to compensate for the wrong versions. + + * d/control: add explicit Provides of non-t64 libs + + Apparentlty due to usage of both t64 and pre-t64 packages + (with different build profiles), debhelper is not populating + necessary values for ${t64:Provides}. So libtevent0t64 is + not providing libtevent0 on the relevant architectures. + Ditto for libsmbclient0 providing libsmbclient. + + Add explicit arch-specific Provides: for libsmbclient0 and + libtevent0t64. + + List only the affected release architectures in there. + + This removes the only user of X-Time64-Compat control field + in debian. + + * d/rules: do not install wscript_build in examples + + * d/control: fix libtevent wrong build profile when building for mjt's + repository. Does not affect debian thankfully. The problem is that + libtevent0t64 slipped into the repository for older (before-trixie) + distributions, where t64 migration hasn't been completed. This should + not cause actual problems as a problem is only possible when upgrading + to the new debian (or ubuntu) release where t64 transition has happened, + and during such upgrade, new libtevent0t64 will be pulled in - thanks to + the first big mistake above, since it now has 2: epoch. + * d/control: add Breaks for libtevent0t64 on mjt repo. This also + does not affect debian, but makes my life definitely easier. + + -- Michael Tokarev Sun, 12 Jan 2025 00:17:49 +0300 + + samba (2:4.21.3+dfsg-4) unstable; urgency=medium + + * Revert "d/control: mark arch-all perl and python packages with :native + for now" - it worked just fine on local build but fails on buildds? + * d/control: add :native alternative for arch-all perl & python packages + for now, to help cross-building samba on bookworm and before + (no difference for trixie). Use foo:native|foo alternative to work + around dpkg/apt disparity in handling :native deps. + + -- Michael Tokarev Sat, 11 Jan 2025 11:47:04 +0300 + + samba (2:4.21.3+dfsg-2) unstable; urgency=medium + + * ctdb-failover-statd_callout-PATH_MAX-workaround.patch + another tweak for hurd (for missing PATH_MAX) + * d/control: add a note about ntp & signd socket, replace ntp with ntpsec + * d/control: provide ability to cross-build samba finally + (using qemu-user helper) + * d/control: mark arch-all perl and python packages with :native for now + (to help cross-building on bookworm) + + -- Michael Tokarev Fri, 10 Jan 2025 23:23:31 +0300 + + samba (2:4.21.3+dfsg-1) unstable; urgency=medium + + * new upstream stable/bugfix release: + - https://bugzilla.samba.org/show_bug.cgi?id=6750: + After 'machine password timeout' /etc/krb5.keytab is not updated + - https://bugzilla.samba.org/show_bug.cgi?id=15697: + Compound rename from Mac clients can fail with + NT_STATUS_INTERNAL_ERROR if the file has a lease + - https://bugzilla.samba.org/show_bug.cgi?id=15701: + More possible replication loops against Azure AD + - https://bugzilla.samba.org/show_bug.cgi?id=15724: + vfs crossrename seems not work correctly + - https://bugzilla.samba.org/show_bug.cgi?id=15755: + Avoid event failure race when disabling an event script + - https://bugzilla.samba.org/show_bug.cgi?id=15758: + Segfault in vfs_btrfs + - https://bugzilla.samba.org/show_bug.cgi?id=15765: + Fix heap-user-after-free with association groups + - https://bugzilla.samba.org/show_bug.cgi?id=15771: + Memory leak wbcCtxLookupSid + * d/patches/: specify more Forwarded: urls + * d/patches/: source3-lib-util_sec.c-include-grp.h-for-setgroups.patch > + include-grp.h-for-setgroups-in-a-few-places.patch: + add 1 more place for setgroups() + * d/rules: remember last versions of ldb/talloc/tevent/tdb, reality check + * d/control: since we don't use debconf anymore, no need + to (build-)depend on po-debconf either + + -- Michael Tokarev Mon, 06 Jan 2025 21:20:31 +0300 + + samba (2:4.21.2+dfsg-4) unstable; urgency=medium + + * d/rules: guard building compile_et target with !mitkrb5 + * source3-lib-util_sec.c-include-grp.h-for-setgroups.patch for hurd ftbfs + * build talloc/tevent/tdb from samba source: + - import talloc, tevent and tdb packaging into samba + - stop shipping internal-to-samba libpytalloc-util development files + * d/copyright: mention myself for d/* + + -- Michael Tokarev Sun, 01 Dec 2024 22:28:05 +0300 + + samba (2:4.21.2+dfsg-3) unstable; urgency=medium + + * Revert "d/rules: as of 4.17, no need to explicitly build intermediate + targets anymore". It is still a problem with samba 4.21, it just were + hidden. + * ldb-no-replace.diff: avoid embedding rpath to private samba libs + for libldb.so + * heimdal-spelling.patch: remove (forgotten, applied upstream) + * d/patches/* update dep3 metadata + * add-missing-libs-deps.diff: update to include more missing deps + (as submitted upstream) + + -- Michael Tokarev Thu, 28 Nov 2024 22:28:27 +0300 + + samba (2:4.21.2+dfsg-2) unstable; urgency=medium + + * resurrect python3-ldb (removed in previous release) + The removal of python3-ldb were unwarranted, as long as libldb + itself is stand-alone, lets keep its python bindings stand-alone + too. + * d/rules: s/execute_after_dh_install/execute_after_dh_install-arch/ + since it is arch-specific + + -- Michael Tokarev Tue, 26 Nov 2024 18:56:17 +0300 + + samba (2:4.21.2+dfsg-1) unstable; urgency=medium + + * new upstream stable/bugfix release: + - https://bugzilla.samba.org/show_bug.cgi?id=14356 + protocol error - Unclear debug message "pad length mismatch" + for invalid bind packet + - https://bugzilla.samba.org/show_bug.cgi?id=15320 + Update CTDB to track all TCP connections to public IP addresses + - https://bugzilla.samba.org/show_bug.cgi?id=15425 + NetrGetLogonCapabilities QueryLevel 2 needs to be implemented + - https://bugzilla.samba.org/show_bug.cgi?id=15732 + smbd fails to correctly check sharemode against OVERWRITE dispositions + - https://bugzilla.samba.org/show_bug.cgi?id=15740 + gss_accept_sec_context() from Heimdal does not imply GSS_C_MUTUAL_FLAG + with GSS_C_DCE_STYLE + - https://bugzilla.samba.org/show_bug.cgi?id=15749 + winbindd should call process_set_title() for locator child + - https://bugzilla.samba.org/show_bug.cgi?id=15752 + winexe no longer works with samba 4.21 + - https://bugzilla.samba.org/show_bug.cgi?id=15754 + Panic in close_directory + * d/control: add python3-cryptography to python3-samba Depends + (Closes: #1086768) + * d/control: move python3-gpg recommends from python3-samba to samba-ad-dc + * d/control: extend libpcap-dev from hurd-i386 to hurd-any (Closes: #1087409) + * ship winexe binary (Closes: #1081269). + New Build-Depends: gcc-mingw-w64-i686-win32 gcc-mingw-w64-x86-64-win32 + * d/control: provide Breaks/Replaces for winexe in kali linux (#1081269) + * swallow python3-ldb by python3-samba (and remove python3-ldb-dev) + * d/rules: drop mis-using --bundled-libraries configure option + * d/samba.postinst: replace test for /usr/bin/deb-systemd-helper file + with "command -v" (lintian) + * d/libldb2.lintian-overrides: remove overrides which were needed for compat + symlink (compat for older ldb in separate source) + * d/samba.install: stop shipping log2pcap.1 (the tool is not installed) + * d/rules: rename LDB_* vars to ldb-, and use common var for -Vldb:Version + * move-msg.sock-from-var-lib-samba-to-run-samba.patch: update + to cover failing tests too + + -- Michael Tokarev Mon, 25 Nov 2024 21:38:17 +0300 + + samba (2:4.21.1+dfsg-2) unstable; urgency=medium + + * d/control: add Recommends: samba-ad-dc for samba for now + to avoid breaking existing installs + * d/samba.postrm: stop unmasking of samba-ad-dc + (it is already done in postinst) + * d/samba.postinst,d/samba.maintscripts: remove samba-ad-dc + startup files and stop the service (Closes: #1085617) + + -- Michael Tokarev Fri, 25 Oct 2024 12:30:52 +0300 + + samba (2:4.21.1+dfsg-1) unstable; urgency=medium + + * new upstream stable/bugfix release + * d/salsa-ci.yml: disable reprotest vary build_path + * d/control: Build-Depend on python3-setuptools (Closes: #1080851) + * d/rules: stop providing compat symlink for old ldb + modules location for old sssd + * d/changelog: mention closing of #835404 by 4.21.0-1 + + -- Michael Tokarev Mon, 14 Oct 2024 21:21:50 +0300 + + samba (2:4.21.0+dfsg-1) unstable; urgency=medium + + * switch to 4.21 branch + * update to 4.21.0 (new upstream) + (Closes: #835404) + * fix-nfs-service-name-to-nfs-kernel-server.patch: refresh + * Force-LDB-as-standalone.patch: remove (ldb is always internal now) + * d/rules: ldb lib is now private by default, expose it as public + * d/rules: ldb uses LDB_VERSION variable now, not VERSION + * tilde-in-version.diff: remove (applied upstream) + * heimdal-spelling.patch: disable for now + * d/rules: s/vendor-name/vendor-suffix/ + * d/ctdb.install: no more sudoers file + * d/samba-libs.symbols, d/control, d/samba-libs.install: libndr4=>libndr5 + This requires sssd to be rebuilt + * samba-{libs,dev}.install, python3-{samba,ldb).install: refresh libs + (with lintian-overrides) + * samba-libs.install, samba-dev.install: new (semi-public) library: + libsamba-policy.so (used by the python stuff only, for now) + * samba-libs.install: new private library: libsamba-net-private-samba.so.0 + * libldb2.symbols: add new symbols & 2.10.0 version + (and remove 2.9.1 minor version) + * d/control: bump libtdb version dependency to 1.4.12 + * d/ctdb.install: install winbind_ctdb_updatekeytab.sh file + + -- Michael Tokarev Mon, 02 Sep 2024 17:48:34 +0300 + + samba (2:4.20.4+dfsg-1) unstable; urgency=medium + + * new upstream (minor/bugfix) release fixing the ABI symbol generation + (Closes: #1078008) + * mention d/*.symbols change in previous changelog entry + * revert: d/*.symbols: add new variant of version marks (with underscore) + + -- Michael Tokarev Tue, 06 Aug 2024 16:58:18 +0300 + + samba (2:4.20.3+dfsg-1) unstable; urgency=medium + + * update to the new upstream stable/bugfix release (4.20.3). + See WHATSNEW.txt for details. + * tilde-in-version.diff: remove, an equivalent is applied upstream + * d/rules: s/vendor-name/vendor-suffix/ as per new upstream option + * d/samba-ad-dc.lintian-overrides: add systemd-diversion override too + * d/*.symbols: add new variant of version marks (with underscore) + + -- Michael Tokarev Fri, 02 Aug 2024 18:33:51 +0300 + + samba (2:4.20.2+dfsg-11) unstable; urgency=medium + + * d/control: remove Andrew Bartlett email from Uploaders per his request + * samba-common-bin.lintian-override: fixup python3-script-but-no-python3-dep + override + * fix name of samba-common-bin.lintian-overrides (it is plural) + + -- Michael Tokarev Tue, 30 Jul 2024 15:54:36 +0300 + + 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 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 + * d/samba-log-parser: python3-minimal is enough + * d/rules: define dpkg_late_eval macro since dpkg 1.22.8 does not define + it anymore (Closes: #1076920) + + -- Michael Tokarev Wed, 24 Jul 2024 16:54:54 +0300 + + samba (2:4.20.2+dfsg-7) unstable; urgency=medium + + * d/samba-common-bin.lintian-override: update samba-log-parser override + * d/control: add Breaks: older samba-ad-dc by samba (Closes: #1076196) + + -- Michael Tokarev Sun, 14 Jul 2024 19:42:39 +0300 samba (2:4.20.2+dfsg-6) unstable; urgency=medium diff --cc debian/rules index cafea77a,99a32a72..bf472939 --- a/debian/rules +++ b/debian/rules @@@ -6,6 -5,34 +5,34 @@@ SHELL = /bin/sh - 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})) ++ifneq (,$(filter armel armhf 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 + # #define heim_base_atomic_load(x) atomic_load((x)) + # include a workaround for now + # (-latomic and 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