Ubuntu
samba package

Merge ~ahasenack/ubuntu/+source/samba:focal-samba-4116-ahead-debian into ubuntu/+source/samba:ubuntu/devel

  1. Git
  2. lp:~ahasenack/ubuntu/+source/samba
  3. focal-samba-4116-ahead-debian
  4. Merge into ubuntu/devel
Proposed by Andreas Hasenack
Status: Merged
Approved by: Andreas Hasenack
Approved revision: bb3eff39307a7f5f73dcfbffc1998875b604663b
Merged at revision: bb3eff39307a7f5f73dcfbffc1998875b604663b
Proposed branch: ~ahasenack/ubuntu/+source/samba:focal-samba-4116-ahead-debian
Merge into: ubuntu/+source/samba:ubuntu/devel
Diff against target: 4447 lines (+925/-678)
150 files modified
VERSION (+1/-1)
WHATSNEW.txt (+74/-2)
ctdb/config/functions (+6/-0)
ctdb/doc/ctdb-etcd.7 (+2/-2)
ctdb/doc/ctdb-script.options.5 (+2/-2)
ctdb/doc/ctdb-statistics.7 (+2/-2)
ctdb/doc/ctdb-tunables.7 (+2/-2)
ctdb/doc/ctdb.1 (+2/-2)
ctdb/doc/ctdb.7 (+2/-2)
ctdb/doc/ctdb.conf.5 (+2/-2)
ctdb/doc/ctdb.sysconfig.5 (+2/-2)
ctdb/doc/ctdb_diagnostics.1 (+2/-2)
ctdb/doc/ctdb_mutex_ceph_rados_helper.7 (+2/-2)
ctdb/doc/ctdbd.1 (+2/-2)
ctdb/doc/ctdbd_wrapper.1 (+2/-2)
ctdb/doc/ltdbtool.1 (+2/-2)
ctdb/doc/onnode.1 (+2/-2)
ctdb/doc/ping_pong.1 (+2/-2)
ctdb/tests/complex/60_rogueip_releaseip.sh (+10/-0)
ctdb/tests/complex/61_rogueip_takeip.sh (+14/-0)
debian/changelog (+7/-0)
debian/patches/series (+0/-2)
dev/null (+0/-39)
docs-xml/smbdotconf/winbind/winbindnssinfo.xml (+4/-5)
docs/manpages/cifsdd.8 (+3/-3)
docs/manpages/dbwrap_tool.1 (+4/-4)
docs/manpages/eventlogadm.8 (+4/-4)
docs/manpages/findsmb.1 (+4/-4)
docs/manpages/idmap_ad.8 (+3/-3)
docs/manpages/idmap_autorid.8 (+3/-3)
docs/manpages/idmap_hash.8 (+3/-3)
docs/manpages/idmap_ldap.8 (+3/-3)
docs/manpages/idmap_nss.8 (+3/-3)
docs/manpages/idmap_rfc2307.8 (+3/-3)
docs/manpages/idmap_rid.8 (+3/-3)
docs/manpages/idmap_script.8 (+3/-3)
docs/manpages/idmap_tdb.8 (+3/-3)
docs/manpages/idmap_tdb2.8 (+3/-3)
docs/manpages/libsmbclient.7 (+4/-4)
docs/manpages/lmhosts.5 (+4/-4)
docs/manpages/log2pcap.1 (+4/-4)
docs/manpages/mvxattr.1 (+4/-4)
docs/manpages/net.8 (+3/-3)
docs/manpages/nmbd.8 (+4/-4)
docs/manpages/nmblookup.1 (+4/-4)
docs/manpages/ntlm_auth.1 (+4/-4)
docs/manpages/pam_winbind.8 (+4/-4)
docs/manpages/pam_winbind.conf.5 (+4/-4)
docs/manpages/pdbedit.8 (+4/-4)
docs/manpages/profiles.1 (+4/-4)
docs/manpages/rpcclient.1 (+4/-4)
docs/manpages/samba-regedit.8 (+4/-4)
docs/manpages/samba-tool.8 (+4/-4)
docs/manpages/samba.7 (+4/-4)
docs/manpages/samba.8 (+4/-4)
docs/manpages/samba_downgrade_db.8 (+5/-5)
docs/manpages/sharesec.1 (+4/-4)
docs/manpages/smb.conf.5 (+9/-7)
docs/manpages/smbcacls.1 (+4/-4)
docs/manpages/smbclient.1 (+4/-4)
docs/manpages/smbcontrol.1 (+4/-4)
docs/manpages/smbcquotas.1 (+4/-4)
docs/manpages/smbd.8 (+4/-4)
docs/manpages/smbget.1 (+4/-4)
docs/manpages/smbgetrc.5 (+4/-4)
docs/manpages/smbpasswd.5 (+4/-4)
docs/manpages/smbpasswd.8 (+4/-4)
docs/manpages/smbspool.8 (+4/-4)
docs/manpages/smbspool_krb5_wrapper.8 (+3/-3)
docs/manpages/smbstatus.1 (+4/-4)
docs/manpages/smbtar.1 (+4/-4)
docs/manpages/smbtree.1 (+4/-4)
docs/manpages/testparm.1 (+4/-4)
docs/manpages/traffic_learner.7 (+4/-4)
docs/manpages/traffic_replay.7 (+4/-4)
docs/manpages/vfs_acl_tdb.8 (+3/-3)
docs/manpages/vfs_acl_xattr.8 (+3/-3)
docs/manpages/vfs_aio_fork.8 (+4/-4)
docs/manpages/vfs_aio_pthread.8 (+4/-4)
docs/manpages/vfs_audit.8 (+4/-4)
docs/manpages/vfs_btrfs.8 (+4/-4)
docs/manpages/vfs_cacheprime.8 (+4/-4)
docs/manpages/vfs_cap.8 (+4/-4)
docs/manpages/vfs_catia.8 (+3/-3)
docs/manpages/vfs_ceph.8 (+4/-4)
docs/manpages/vfs_ceph_snapshots.8 (+4/-4)
docs/manpages/vfs_commit.8 (+4/-4)
docs/manpages/vfs_crossrename.8 (+4/-4)
docs/manpages/vfs_default_quota.8 (+4/-4)
docs/manpages/vfs_dirsort.8 (+4/-4)
docs/manpages/vfs_extd_audit.8 (+4/-4)
docs/manpages/vfs_fake_perms.8 (+4/-4)
docs/manpages/vfs_fileid.8 (+4/-4)
docs/manpages/vfs_fruit.8 (+3/-3)
docs/manpages/vfs_full_audit.8 (+4/-4)
docs/manpages/vfs_glusterfs.8 (+4/-4)
docs/manpages/vfs_glusterfs_fuse.8 (+4/-4)
docs/manpages/vfs_gpfs.8 (+4/-4)
docs/manpages/vfs_linux_xfs_sgid.8 (+4/-4)
docs/manpages/vfs_media_harmony.8 (+4/-4)
docs/manpages/vfs_netatalk.8 (+4/-4)
docs/manpages/vfs_nfs4acl_xattr.8 (+3/-3)
docs/manpages/vfs_offline.8 (+4/-4)
docs/manpages/vfs_prealloc.8 (+4/-4)
docs/manpages/vfs_preopen.8 (+4/-4)
docs/manpages/vfs_readahead.8 (+4/-4)
docs/manpages/vfs_readonly.8 (+4/-4)
docs/manpages/vfs_recycle.8 (+4/-4)
docs/manpages/vfs_shadow_copy.8 (+4/-4)
docs/manpages/vfs_shadow_copy2.8 (+4/-4)
docs/manpages/vfs_shell_snap.8 (+4/-4)
docs/manpages/vfs_snapper.8 (+4/-4)
docs/manpages/vfs_streams_depot.8 (+3/-3)
docs/manpages/vfs_streams_xattr.8 (+3/-3)
docs/manpages/vfs_syncops.8 (+4/-4)
docs/manpages/vfs_time_audit.8 (+4/-4)
docs/manpages/vfs_tsmsm.8 (+4/-4)
docs/manpages/vfs_unityed_media.8 (+4/-4)
docs/manpages/vfs_virusfilter.8 (+2/-2)
docs/manpages/vfs_worm.8 (+4/-4)
docs/manpages/vfs_xattr_tdb.8 (+3/-3)
docs/manpages/vfs_zfsacl.8 (+4/-4)
docs/manpages/vfstest.1 (+4/-4)
docs/manpages/wbinfo.1 (+4/-4)
docs/manpages/winbind_krb5_localauth.8 (+4/-4)
docs/manpages/winbind_krb5_locator.8 (+4/-4)
docs/manpages/winbindd.8 (+4/-4)
lib/ldb/tests/ldb_key_value_sub_txn_test.c (+1/-0)
lib/ldb/tests/ldb_key_value_test.c (+1/-0)
lib/ldb/tests/ldb_lmdb_size_test.c (+1/-0)
lib/ldb/tests/ldb_lmdb_test.c (+1/-0)
lib/ldb/tests/ldb_no_lmdb_test.c (+1/-0)
lib/ldb/tests/test_ldb_dn.c (+1/-0)
libgpo/pygpo.c (+1/-1)
librpc/ndr/ndr_string.c (+47/-2)
python/samba/provision/sambadns.py (+10/-0)
python/samba/tests/samba_upgradedns_lmdb.py (+75/-0)
script/release.sh (+9/-28)
source3/include/libsmb_internal.h (+15/-7)
source3/libsmb/libsmb_dir.c (+11/-20)
source3/libsmb/libsmb_file.c (+76/-46)
source3/libsmb/libsmb_server.c (+9/-0)
source3/libsmb/libsmb_stat.c (+79/-53)
source3/libsmb/libsmb_xattr.c (+26/-43)
source3/modules/vfs_ceph_snapshots.c (+11/-3)
source3/modules/vfs_glusterfs.c (+4/-1)
source3/smbd/trans2.c (+1/-1)
source4/auth/gensec/pygensec.c (+1/-1)
source4/selftest/tests.py (+2/-0)
source4/utils/oLschema2ldif/test.c (+1/-0)
Reviewer Review Type Date Requested Status
Rafael David Tinoco (community) Approve
Canonical Server Core Reviewers Pending
Review via email: mp+379900@code.staging.launchpad.net

Description of the change

Going ahead of debian by updating samba to 4.11.6 (release notes: https://www.samba.org/samba/history/samba-4.11.6.html

I proposed a pristine-tar branch to debian for 4.11.6, so we should use the same tarball if debian also updates to 4.11.6: https://salsa.debian.org/samba-team/samba/-/merge_requests/45

That is the tarball I used.

I checked diffing the dfsg tarball and upstream's (whose gpg signature I validated) and the only diff are the exceptions listed in debian/gbp.conf.

This update allows us to drop the py38 fixes I rushed in a few days ago.

Bileto ticket still building/running: https://bileto.ubuntu.com/#/ticket/3945

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

The tests are red because they need to re-run against proposed (or at least, proposed's python). I just retriggered that.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

And the tests are now failing because of the ubuntu phone (yes):

Err:6 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu focal Release
  404 Not Found [IP: 91.189.95.83 80]

Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :

I'm taking this one to review.

Revision history for this message
Rafael David Tinoco (rafaeldtinoco) wrote :
Download full text (10.8 KiB)

# checklist for merges
----------------------------
 [.] changelog entry correct, targeted to correct codename
 [-] update-maintainer has been run
 [-] old content and logical tag match as expected
 ----
 [.] no major upstream changes to consider
 [-] debian changes look safe
 ----
 [.] dropped changes are ok to be dropped
 [.] nothing else to drop
 [.] changes forwarded upstream/debian (if appropriate)
 [.] patches match what was proposed upstream
 ----
 [-] patches correctly included in debian/patches/series?
 [-] patches have correct DEP3 metadata
 ----
 [.] verified dpkg-buildpackage -S and -b
 [.] autopkgtest against PPA or built package passes
----------------------------
[.] = ok
[x] = not ok
[!] = question
[-] = n/a

# relevant stdout:

- dpkg-buildpackage -S:

dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building samba using existing ./samba_4.11.6+dfsg.orig.tar.xz
dpkg-source: info: using patch list from debian/patches/series
dpkg-source: warning: newly created empty file '.mine' will not be represented in diff
dpkg-source: info: building samba in samba_4.11.6+dfsg-0ubuntu1.debian.tar.xz
dpkg-source: info: building samba in samba_4.11.6+dfsg-0ubuntu1.dsc
 dpkg-genbuildinfo --build=source
 dpkg-genchanges --build=source >../samba_4.11.6+dfsg-0ubuntu1_source.changes
dpkg-genchanges: info: including full source code in upload
 dpkg-source --after-build .
dpkg-source: info: unapplying ctdb-config-enable-syslog-by-default.patch
dpkg-source: info: unapplying wscript-split-function-check-to-one-per-line-and-sor.patch
dpkg-source: info: unapplying wscript-remove-all-checks-for-_FUNC-and-__FUNC.patch
dpkg-source: info: unapplying build-Remove-tests-for-getdents-and-getdirentries.patch
dpkg-source: info: unapplying fix-nfs-service-name-to-nfs-kernel-server.patch
dpkg-source: info: unapplying smbd.service-Run-update-apparmor-samba-profile-befor.patch
dpkg-source: info: unapplying heimdal-rfc3454.txt
dpkg-source: info: unapplying add-so-version-to-private-libraries
dpkg-source: info: unapplying VERSION.patch
dpkg-source: info: unapplying usershare.patch
dpkg-source: info: unapplying smbclient-pager.patch
dpkg-source: info: unapplying README_nosmbldap-tools.patch
dpkg-source: info: unapplying bug_221618_precise-64bit-prototype.patch
dpkg-source: info: unapplying 07_private_lib
dpkg-buildpackage: info: full upload (original source is included)
 signfile samba_4.11.6+dfsg-0ubuntu1.dsc
 signfile samba_4.11.6+dfsg-0ubuntu1_source.buildinfo
 signfile samba_4.11.6+dfsg-0ubuntu1_source.changes

- dpkg-buildpackage -b:

dpkg-deb: building package 'samba' in '../samba_4.11.6+dfsg-0ubuntu1_amd64.deb'.
dpkg-deb: building package 'smbclient' in '../smbclient_4.11.6+dfsg-0ubuntu1_amd64.deb'.
dpkg-deb: building package 'registry-tools' in '../registry-tools_4.11.6+dfsg-0ubuntu1_amd64.deb'.
dpkg-deb: building package 'python3-samba' in '../python3-samba_4.11.6+dfsg-0ubuntu1_amd64.deb'.
dpkg-deb: building package 'samba-vfs-modules' in '../samba-vfs-modules_4.11.6+dfsg-0ubuntu1_amd64.deb'.
dpkg-deb: building package 'samba-common' in '../samba-common_4.11.6+dfsg-0ubuntu1_all.deb'.
dpkg-deb: building package 'libwbclient0' in '../libw...

review: Approve
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Thanks, tagging and uploading bb3eff39307a7f5f73dcfbffc1998875b604663b

$ git push pkg upload/2%4.11.6+dfsg-0ubuntu1
Enumerating objects: 374, done.
Counting objects: 100% (374/374), done.
Delta compression using up to 4 threads
Compressing objects: 100% (189/189), done.
Writing objects: 100% (191/191), 23.36 KiB | 1.37 MiB/s, done.
Total 191 (delta 183), reused 3 (delta 1)
remote: Resolving deltas: 100% (183/183), completed with 180 local objects.
remote: Checking connectivity: 191, done.
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/samba
 * [new tag] upload/2%4.11.6+dfsg-0ubuntu1 -> upload/2%4.11.6+dfsg-0ubuntu1

$ dput ubuntu ../samba_4.11.6+dfsg-0ubuntu1_source.changes
Checking signature on .changes
gpg: ../samba_4.11.6+dfsg-0ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../samba_4.11.6+dfsg-0ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading samba_4.11.6+dfsg-0ubuntu1.dsc: done.
  Uploading samba_4.11.6+dfsg.orig.tar.xz: done.
  Uploading samba_4.11.6+dfsg-0ubuntu1.debian.tar.xz: done.
  Uploading samba_4.11.6+dfsg-0ubuntu1_source.buildinfo: done.
  Uploading samba_4.11.6+dfsg-0ubuntu1_source.changes: done.
Successfully uploaded packages.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches