[Pkg-samba-maint] [Git][samba-team/samba][master] 2 commits: Revert "Add a pkg.samba.selftest build profile"
Mathieu Parent
gitlab at salsa.debian.org
Mon Mar 19 20:43:58 UTC 2018
Mathieu Parent pushed to branch master at Debian Samba Team / samba
Commits:
2a90109c by Mathieu Parent at 2018-03-19T12:55:51+01:00
Revert "Add a pkg.samba.selftest build profile"
This reverts commit 63da11516d1c01504cea629450f1500a75b3566c.
The Build-depends are not yet in sid.
- - - - -
ebc0048b by Mathieu Parent at 2018-03-19T13:03:29+01:00
Release 2:4.8.0+dfsg-1
- - - - -
4 changed files:
- debian/README.source.md
- debian/changelog
- debian/control
- debian/rules
Changes:
=====================================
debian/README.source.md
=====================================
--- a/debian/README.source.md
+++ b/debian/README.source.md
@@ -25,14 +25,6 @@ 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/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-samba (2:4.8.0+dfsg-1) UNRELEASED; urgency=medium
+samba (2:4.8.0+dfsg-1) experimental; urgency=medium
+ [ Mathieu Parent ]
* New major upstream version
- Update d/gbp.conf and d/watch for 4.8
- Update upstream source from tag 'upstream/4.8.0+dfsg'
@@ -14,11 +15,32 @@ samba (2:4.8.0+dfsg-1) UNRELEASED; urgency=medium
+ CVE-2018-1057-v4-7.metze01.patches.txt
- Bump build-depends talloc >= 2.1.11~, tdb >= 1.3.15~, tevent >= 0.9.36~
and ldb >= 2:1.3.2~
+ - Drop Build-Conflicts-Arch: libaio-dev, vfs_aio_linux was dropped
+ - Update debian/*.install and use debian/not-installed
+ - Update debian/libsmbclient.symbols
- Upload to experimental
- * Update README.source
- * Drop Build-Conflicts-Arch: libaio-dev, vfs_aio_linux was dropped
-
- -- Mathieu Parent <sathieu at debian.org> Tue, 13 Mar 2018 22:41:30 +0100
+ * debian/README.source
+ - Update instructions
+ - Convert to Markdown
+ - Add a symlink from README.source to README.source.md
+ * debian/rules:
+ - Use the new --systemd-install-services
+ - Use dh_missing --fail-missing
+ - Re-order debian/rules overrides in the order they are called
+ - Remove broken get-packaged-orig-source target
+ - Remove unused DEB_BUILD_OPT_FOO variables
+ - Add some comments
+ - Move all the custom installs from override_dh_install to
+ override_dh_auto_install
+ - Remove --sourcedir override to dh_install "since dh_install automatically
+ looks for files in debian/tmp in debhelper compatibility level 7 and
+ above"
+ - PIDFile= is now correctly set in *.service
+
+ [ Louis van Belle ]
+ * Update d/control, Relax Build-Depends to allow backport
+
+ -- Mathieu Parent <sathieu at debian.org> Mon, 19 Mar 2018 13:02:51 +0100
samba (2:4.7.4+dfsg-2) unstable; urgency=high
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: bison,
docbook-xsl,
flex,
glusterfs-common [linux-any],
- ldb-tools <pkg.samba.selftest>,
libacl1-dev,
libarchive-dev,
libattr1-dev,
@@ -35,25 +34,19 @@ 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/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -68,11 +68,6 @@ 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 \
@@ -93,19 +88,8 @@ override_dh_auto_build:
DESTDIR="$(DESTDIR)" $(WAF)
override_dh_auto_test:
-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
+ # Running make test requires configuration with --enable-selftest, which
+ # we don't want to do for production systems.
override_dh_auto_install:
DESTDIR="$(DESTDIR)" $(WAF) install
@@ -176,12 +160,6 @@ 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/c37d47281336fe165518160082ce8b0fdcdd8bd2...ebc0048b695b93385f02a3f48be7b1a0a3f8ec69
---
View it on GitLab: https://salsa.debian.org/samba-team/samba/compare/c37d47281336fe165518160082ce8b0fdcdd8bd2...ebc0048b695b93385f02a3f48be7b1a0a3f8ec69
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/20180319/42ffaab5/attachment-0001.html>
More information about the Pkg-samba-maint
mailing list