Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • lts-team/packages/samba
  • thctlo/samba-lintianfix
  • arnaudr/samba
  • jrwren/samba
  • paride/samba
  • athos/samba
  • henrich/samba
  • cnotin/samba
  • mimi89999/samba
  • samba-team/samba
  • ahasenack/samba
  • jrtc27/samba
  • noel/samba
13 results
Show changes
Commits on Source (7)
samba (2:4.17.4+dfsg-4) UNRELEASED; urgency=medium
* d/control: Standards-Version: 4.6.2 (no changes)
* d/control: put all doc-generating build-deps into one line
* little prep for cross-compilation
- build-depend on python3:any and python3-dev:any
- build-depend on libpython3-dev for actual module building,
and use arch-specific python3-config from there
- set and export _PYTHON_SYSCONFIGDATA_NAME to get foreign-arch values
provided by libpython3-dev (also helps when python itself is foreign)
- depend on perl:any not just perl
- export CC/CPP/LD/PKGCONFIG for ./configure (buildtools.mk)
* d/gbp.conf: unignore branch
* d/control: samba, ctdb, winbind: do not depend on lsb-base
(the script is in sysvinit-utils now)
* d/control: drop unused build-dep on libncurses5-dev
-- Michael Tokarev <mjt@tls.msk.ru> Thu, 26 Jan 2023 23:21:18 +0300
samba (2:4.17.4+dfsg-3) unstable; urgency=medium
* +rpc_server_srvsvc-retrieve_share_ACL_via_root_context.patch
......
......@@ -8,7 +8,7 @@ Uploaders: Steve Langasek <vorlon@debian.org>,
Andrew Bartlett <abartlet+debian@catalyst.net.nz>,
Michael Tokarev <mjt@tls.msk.ru>
Homepage: https://www.samba.org
Standards-Version: 4.6.1
Standards-Version: 4.6.2
Build-Depends:
debhelper-compat (= 13),
dh-exec,
......@@ -16,12 +16,10 @@ Build-Depends-Arch:
dh-sequence-python3,
# tools:
bison,
docbook-xml,
docbook-xsl,
docbook-xml, docbook-xsl, xsltproc,
flex,
perl,
perl:any,
po-debconf,
xsltproc,
# libraries which we embed but use system versions of:
libtalloc-dev (>= 2.3.4~),
python3-talloc-dev (>= 2.3.4~),
......@@ -50,7 +48,6 @@ Build-Depends-Arch:
libkrb5-dev (>= 1.19.0~) <pkg.samba.mitkrb5>,
libldap2-dev,
liblmdb-dev,
libncurses5-dev,
libpam0g-dev,
libparse-yapp-perl,
libpcap-dev [hurd-i386 kfreebsd-any],
......@@ -64,8 +61,8 @@ Build-Depends-Arch:
xfslibs-dev [linux-any],
zlib1g-dev (>= 1:1.2.3),
# python:
python3,
python3-dev,
python3:any,
python3-dev:any, libpython3-dev,
python3-dnspython,
python3-etcd,
python3-markdown,
......@@ -87,7 +84,6 @@ Pre-Depends: ${misc:Pre-Depends}
Depends: passwd,
libpam-modules,
libpam-runtime (>= 1.0.1-11),
lsb-base (>= 4.1+Debian),
procps,
python3,
python3-dnspython,
......@@ -387,8 +383,7 @@ Package: winbind
Pre-Depends: ${misc:Pre-Depends}
Architecture: any
Multi-Arch: allowed
Depends: lsb-base (>= 3.0-6),
samba-common (= ${source:Version}),
Depends: samba-common (= ${source:Version}),
samba-common-bin (=${binary:Version}),
# wbinfo (linked with libwbclient) which should use the same protocol
libwbclient0 (=${binary:Version}),
......@@ -492,7 +487,6 @@ Package: ctdb
Architecture: any
Multi-Arch: foreign
Depends: iproute2 [linux-any],
lsb-base (>= 3.0-6),
psmisc,
samba-libs (= ${binary:Version}),
sudo,
......
......@@ -2,6 +2,3 @@
sign-tags = True
pristine-tar = True
upstream-branch = upstream_4.17
# don't hardcode the debian branch
ignore-branch = True
......@@ -6,6 +6,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
ifeq (${DEB_HOST_MULTIARCH},)
$(foreach d, $(shell dpkg-architecture | sed 's/=/?=/'), $(eval export $d))
endif
include /usr/share/dpkg/buildtools.mk
include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/pkg-info.mk
include /usr/share/dpkg/vendor.mk
......@@ -13,6 +14,9 @@ V := $(if $(filter terse, ${DEB_BUILD_OPTIONS}),,1)
WAF := PYTHONHASHSEED=1 ./buildtools/bin/waf \
$(patsubst parallel=%,-j%,$(filter parallel=%,${DEB_BUILD_OPTIONS}))
# for cross-build or build with foreign python binary
export _PYTHON_SYSCONFIGDATA_NAME = _sysconfigdata__${DEB_HOST_ARCH_OS}_${DEB_HOST_MULTIARCH}
DESTDIR = ${CURDIR}/debian/tmp
LDB_EPOCH = 2:
......@@ -140,6 +144,7 @@ bin/configured.stamp:
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}" \
${WAF} -j1 -C configure ${config-args} || \
{ $(if ${V},echo "==== contents of config.log:"; cat bin/config.log;) false; }
......@@ -319,7 +324,7 @@ execute_after_dh_fixperms-arch:
override_dh_makeshlibs:
# generate symbols file with correct cpython suffix in there
{ \
suff=$$(python3-config --extension-suffix | tr _ -); \
suff=$$(${DEB_HOST_GNU_TYPE}-python3-config --extension-suffix | tr _ -); \
SUFF=$$(echo "$${suff%.so}" | tr a-z- A-Z_); \
echo "libpyldb-util$${suff}.2 python3-ldb #MINVER#"; \
echo "* Build-Depends-Package: python3-ldb-dev" ; \
......