From a376d98ea4726db8986e5bf51902b5f5b127c793 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 19:28:48 +0200 Subject: Adding debian version 2:4.20.0+dfsg-1~exp2. Signed-off-by: Daniel Baumann --- debian/changelog | 10 ++++++++++ debian/control | 30 +++++++++++++++++++++++------- debian/libsmbclient.install | 1 + debian/libsmbclient.symbols | 1 + debian/rules | 18 +++++++++--------- 5 files changed, 44 insertions(+), 16 deletions(-) create mode 120000 debian/libsmbclient.install create mode 120000 debian/libsmbclient.symbols diff --git a/debian/changelog b/debian/changelog index 5d91751..ad24932 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +samba (2:4.20.0+dfsg-1~exp2) experimental; urgency=medium + + * implement pkg.samba.before-trixie build profile + (undo t64 changhes and drop build-dep) + * d/rules: remove Debian/Ubuntu "branding", no need in that + * d/control: samba-dsdb-modules: drop hardcoded dependency on libgpgme11 + (Closes: #1068526) + + -- Michael Tokarev Sun, 07 Apr 2024 16:04:30 +0300 + samba (2:4.20.0+dfsg-1~exp1) experimental; urgency=medium * new upstream release (4.20.0) diff --git a/debian/control b/debian/control index c01dec5..35bd1e4 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Uploaders: Steve Langasek , Homepage: https://www.samba.org Standards-Version: 4.6.2 Build-Depends: - dpkg-dev (>= 1.22.5), + dpkg-dev (>= 1.22.5) , debhelper-compat (= 13), dh-exec, Build-Depends-Arch: @@ -21,7 +21,7 @@ Build-Depends-Arch: flex, perl:any, po-debconf, - rpcsvc-proto, + rpcsvc-proto , # libraries which we embed but use system versions of: libtalloc-dev (>= 2.4.2~), python3-talloc-dev (>= 2.4.2~), @@ -195,7 +195,7 @@ Description: Samba common files used by both the server and the client . This package contains the common files that are used by both the server (provided in the samba package) and the client (provided in the smbclient - libsmbclient0 packages). + package). Package: samba-ad-dc Architecture: all @@ -333,8 +333,7 @@ Package: samba-dsdb-modules Architecture: any Multi-Arch: same Section: libs -Depends: libgpgme11, - samba-libs (= ${binary:Version}), +Depends: samba-libs (= ${binary:Version}), ${ldb:Depends}, ${misc:Depends}, ${shlibs:Depends} @@ -380,6 +379,20 @@ Provides: ${t64:Provides} X-Time64-Compat: libsmbclient Replaces: libsmbclient Breaks: libsmbclient (<< ${source:Version}) +Build-Profiles: +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: samba-libs (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Description: shared library for communication with SMB/CIFS servers + This package provides a shared library that enables client applications + to talk to Microsoft Windows and Samba servers using the SMB/CIFS + protocol. + +Package: libsmbclient +# exactly the same as libsmbclient but for older systems before t64 transition +Build-Profiles: Section: libs Architecture: any Multi-Arch: same @@ -394,8 +407,11 @@ Package: libsmbclient-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libsmbclient0 (= ${binary:Version}), ${misc:Depends} -Description: development files for libsmbclient0 +Depends: ${misc:Depends}, + libsmbclient0 (= ${binary:Version}) , + libsmbclient (= ${binary:Version}) < pkg.samba.before-trixie>, +# the library name is libsmbclient0 on trixie and up +Description: development files for libsmbclient This package provides the development files (static library and headers) required for building applications against libsmbclient, a library that enables client applications to talk to Microsoft Windows and Samba servers diff --git a/debian/libsmbclient.install b/debian/libsmbclient.install new file mode 120000 index 0000000..6a7303a --- /dev/null +++ b/debian/libsmbclient.install @@ -0,0 +1 @@ +libsmbclient0.install \ No newline at end of file diff --git a/debian/libsmbclient.symbols b/debian/libsmbclient.symbols new file mode 120000 index 0000000..2e9a31c --- /dev/null +++ b/debian/libsmbclient.symbols @@ -0,0 +1 @@ +libsmbclient0.symbols \ No newline at end of file diff --git a/debian/rules b/debian/rules index 68e77d7..b168f5f 100755 --- a/debian/rules +++ b/debian/rules @@ -119,6 +119,13 @@ config-args += $(if ${with-ceph},\ --enable-cephfs --enable-ceph-reclock,\ --disable-cephfs) +# we had t64 transition (libsmbclient => libsmbclient0) before trixie +ifneq (,$(filter pkg.samba.before-trixie, ${DEB_BUILD_PROFILES})) +libsmbclient := libsmbclient +else +libsmbclient := libsmbclient0 +endif + with_mitkrb5 = $(filter pkg.samba.mitkrb5, ${DEB_BUILD_PROFILES}) ifneq (,${with_mitkrb5}) config-args += \ @@ -130,7 +137,7 @@ mitkrb5-samba-ver = ${DEB_VERSION}mitkrb5 mitkrb5-dep-pkgs = samba-libs samba-dev mitkrb5-dep-pkgs += samba samba-common-bin python3-samba mitkrb5-dep-pkgs += samba-dsdb-modules samba-vfs-modules -mitkrb5-dep-pkgs += libsmbclient0 smbclient +mitkrb5-dep-pkgs += ${libsmbclient} smbclient mitkrb5-dep-pkgs += libnss-winbind libpam-winbind mitkrb5-dep-pkgs += winbind libwbclient0 mitkrb5-dep-pkgs += samba-testsuite @@ -152,12 +159,6 @@ install install-arch install-indep: %: configure: bin/configured.stamp .PHONY: configure bin/configured.stamp: -# branding - if [ ! -f VERSION.orig ]; then \ - mv VERSION VERSION.orig; \ - sed -r -e 's/^(SAMBA_VERSION_VENDOR_SUFFIX).*/\1=${DEB_VENDOR}/' \ - VERSION.orig > VERSION; \ - fi CC="${CC}" CPP="${CPP}" LD="${LD}" PKGCONFIG="${PKG_CONFIG}" \ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ PYTHON=python3 PYTHON_CONFIG=${DEB_HOST_MULTIARCH}-python3-config \ @@ -375,7 +376,7 @@ endif $(call depcheck, libldb2, samba|samba-libs|winbind|libwbclient0) # use-bzero-instead-of-memset_s.diff $(call depcheck, python3-samba, samba|winbind|ctdb) $(call depcheck, libwbclient0, samba|samba-libs|winbind|smbclient|ctdb) - $(call depcheck, libsmbclient0, samba|winbind|smbclient|ctdb) + $(call depcheck, ${libsmbclient}, samba|winbind|smbclient|ctdb) override_dh_gencontrol: dh_gencontrol $(addprefix -p, ${LDB_PACKAGES}) -- -v${LDB_DEB_VERSION} @@ -389,7 +390,6 @@ endif clean: # see also debian/clean dh_clean bin/ testbuild/ - [ ! -f VERSION.orig ] || mv -f VERSION.orig VERSION ifneq (,${with_mitkrb5}) [ ! -d third_party/heimdal-build-with-mitkrb5 ] || \ mv third_party/heimdal-build-with-mitkrb5 third_party/heimdal -- cgit v1.2.3