[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: Update debian/libsmbclient.symbols
Mathieu Parent
gitlab at salsa.debian.org
Fri Mar 16 07:23:47 UTC 2018
Mathieu Parent pushed to branch master at Debian Samba Team / samba
Commits:
ff516b16 by Mathieu Parent at 2018-03-16T06:50:45+01:00
Update debian/libsmbclient.symbols
- - - - -
63da1151 by Mathieu Parent at 2018-03-16T06:50:45+01:00
Add a pkg.samba.selftest build profile
- - - - -
4 changed files:
- debian/README.source.md
- debian/control
- debian/libsmbclient.symbols
- debian/rules
Changes:
=====================================
debian/README.source.md
=====================================
--- a/debian/README.source.md
+++ b/debian/README.source.md
@@ -25,6 +25,14 @@ Each time:
gbp pull
gbp buildpackage --git-pbuilder --git-dist=sid --git-arch=amd64
+Building with selftest
+======================
+
+ DEB_BUILD_PROFILES=pkg.samba.selftest \
+ gbp buildpackage --git-pbuilder --git-dist=sid --git-arch=amd64
+
+:warning: DO NOT UPLOAD THE RESULTING PACKAGES! :warning:
+
Merging minor upstream releases
===============================
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: bison,
docbook-xsl,
flex,
glusterfs-common [linux-any],
+ ldb-tools <pkg.samba.selftest>,
libacl1-dev,
libarchive-dev,
libattr1-dev,
@@ -34,19 +35,25 @@ Build-Depends: bison,
libldap2-dev,
libldb-dev (>= 2:1.3.2~),
libncurses5-dev,
+ libnss-wrapper (>= 1.1.3) <pkg.samba.selftest>,
+ libpam-wrapper (>= 1.0.4) <pkg.samba.selftest>,
libpam0g-dev,
libparse-yapp-perl,
libpcap-dev [hurd-i386 kfreebsd-any],
libpopt-dev,
libreadline-dev,
+ libresolv-wrapper (>= 1.1.4) <pkg.samba.selftest>,
+ libsocket-wrapper (>= 1.1.9) <pkg.samba.selftest>,
libsystemd-dev [linux-any],
libtalloc-dev (>= 2.1.11~),
libtdb-dev (>= 1.3.15~),
libtevent-dev (>= 0.9.36~),
+ libuid-wrapper (>= 1.2.4) <pkg.samba.selftest>,
perl,
pkg-config,
po-debconf,
python-all-dev (>= 2.6.6-3),
+ python-crypto <pkg.samba.selftest>,
python-dnspython,
python-ldb (>= 2:1.3.2~),
python-ldb-dev (>= 2:1.3.2~),
=====================================
debian/libsmbclient.symbols
=====================================
--- a/debian/libsmbclient.symbols
+++ b/debian/libsmbclient.symbols
@@ -4,6 +4,8 @@ libsmbclient.so.0 libsmbclient #MINVER#
SMBCLIENT_0.2.1 at SMBCLIENT_0.2.1 2:4.1.1
SMBCLIENT_0.2.2 at SMBCLIENT_0.2.2 2:4.3.0+dfsg
SMBCLIENT_0.2.3 at SMBCLIENT_0.2.3 2:4.3.0+dfsg
+ SMBCLIENT_0.3.0 at SMBCLIENT_0.3.0 2:4.8.0+dfsg
+ SMBCLIENT_0.3.1 at SMBCLIENT_0.3.1 2:4.8.0+dfsg
smbc_chmod at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
smbc_close at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
smbc_closedir at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
@@ -148,6 +150,7 @@ libsmbclient.so.0 libsmbclient #MINVER#
smbc_setFunctionUnlinkPrintJob at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
smbc_setFunctionUtimes at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
smbc_setFunctionWrite at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
+ smbc_setLogCallback at SMBCLIENT_0.3.1 2:4.8.0+dfsg
smbc_setNetbiosName at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
smbc_setOptionBrowseMaxLmbCount at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
smbc_setOptionCaseSensitive at SMBCLIENT_0.1.0 2:4.0.3+dfsg1
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -68,6 +68,11 @@ conf_args = \
--with-socketpath=/var/run/ctdb/ctdbd.socket \
--with-logdir=/var/log/ctdb
+ifneq ($(filter pkg.samba.selftest,$(DEB_BUILD_PROFILES)),)
+ conf_args += \
+ --selftest
+endif
+
ifeq ($(DEB_HOST_ARCH_OS), linux)
conf_args += \
--with-systemd \
@@ -88,8 +93,19 @@ override_dh_auto_build:
DESTDIR="$(DESTDIR)" $(WAF)
override_dh_auto_test:
- # Running make test requires configuration with --enable-selftest, which
- # we don't want to do for production systems.
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+ifneq ($(filter pkg.samba.selftest,$(DEB_BUILD_PROFILES)),)
+ make quicktest
+else
+ # Running make test requires "waf configure" with --enable-selftest, which
+ # requires --with-ntvfs-fileserver which we don't want on production systems
+ @echo "** tests skipped **"
+ @echo " use DEB_BUILD_PROFILES=pkg.samba.selftest to enable"
+ @echo " but DO NOT UPLOAD!"
+endif
+else
+ @echo "** tests disabled **"
+endif
override_dh_auto_install:
DESTDIR="$(DESTDIR)" $(WAF) install
@@ -156,6 +172,12 @@ override_dh_auto_install:
$(DESTDIR)/lib/systemd/system/winbind.service
mkdir -p $(DESTDIR)/usr/lib/tmpfiles.d
echo "d /run/samba 0755 root root -" > $(DESTDIR)/usr/lib/tmpfiles.d/samba.conf
+ifneq ($(filter pkg.samba.selftest,$(DEB_BUILD_PROFILES)),)
+ # Triggers package-contains-ancient-file Lintian Reject
+ # See https://ftp-master.debian.org/#lintianrejects
+ # RIP Duke Ellington
+ touch -d 1974-05-24 $(DESTDIR)/usr/share/samba
+endif
override_dh_installdocs-arch:
cp ctdb/config/events.d/README ctdb/README.eventscripts
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/b737fd4e41e809707b217860de6b0ac3107d3a10...63da11516d1c01504cea629450f1500a75b3566c
---
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/b737fd4e41e809707b217860de6b0ac3107d3a10...63da11516d1c01504cea629450f1500a75b3566c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20180316/2d1d1455/attachment-0001.html>
More information about the Pkg-samba-maint
mailing list