Merge ~rafaeldtinoco/ubuntu/+source/samba:lp1861316-focal into ubuntu/+source/samba:ubuntu/focal-devel

Proposed by Rafael David Tinoco
Status: Merged
Merge reported by: Rafael David Tinoco
Merged at revision: 09cf4f3aaa5441bd75fece65c2b0c9907528edc2
Proposed branch: ~rafaeldtinoco/ubuntu/+source/samba:lp1861316-focal
Merge into: ubuntu/+source/samba:ubuntu/focal-devel
Diff against target: 39 lines (+13/-5)
2 files modified
debian/changelog (+12/-0)
debian/rules (+1/-5)
Reviewer Review Type Date Requested Status
Steve Langasek (community) Approve
Canonical Server Core Reviewers Pending
Canonical Server Team Pending
Review via email: mp+378664@code.launchpad.net

Commit message

BUG: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/1861316

Re-enabling 2 binary packages for i386.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

LGTM. Have you tested that re-enabling these two binaries is sufficient to let libnss-winbind:i386 be installable?

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

Errr,

$ sudo dpkg -i ./libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ./samba-common_4.11.1+dfsg-3ubuntu4_all.deb ./samba-common-bin_4.11.1+dfsg-3ubuntu4_i386.deb ./libwbclient0_4.11.1+dfsg-3ubuntu4_i386.deb ./samba-libs_4.11.1+dfsg-3ubuntu4_i386.deb
(Reading database ... 76234 files and directories currently installed.)
Preparing to unpack .../libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking libnss-winbind:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../samba-common_4.11.1+dfsg-3ubuntu4_all.deb ...
Unpacking samba-common (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../samba-common-bin_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking samba-common-bin (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../libwbclient0_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking libwbclient0:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../samba-libs_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking samba-libs:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
dpkg: dependency problems prevent configuration of libnss-winbind:i386:
 libnss-winbind:i386 depends on winbind:any (= 2:4.11.1+dfsg-3ubuntu4).

dpkg: error processing package libnss-winbind:i386 (--install):
 dependency problems - leaving unconfigured
Setting up samba-common (2:4.11.1+dfsg-3ubuntu4) ...
dpkg: dependency problems prevent configuration of samba-common-bin:
 samba-common-bin depends on python3-samba; however:
  Package python3-samba is not installed.

dpkg: error processing package samba-common-bin (--install):
 dependency problems - leaving unconfigured
Setting up libwbclient0:i386 (2:4.11.1+dfsg-3ubuntu4) ...
Setting up samba-libs:i386 (2:4.11.1+dfsg-3ubuntu4) ...
Processing triggers for libc-bin (2.30-0ubuntu3) ...
Processing triggers for man-db (2.9.0-2) ...
Errors were encountered while processing:
 libnss-winbind:i386
 samba-common-bin

Looks like we would also need python3-samba... by re-adding it as well we would be basically not building only winbind and ctdb =o). Let me know if thats what you prefer and I can re-push things.

Revision history for this message
Steve Langasek (vorlon) wrote :

Yes, please follow through on trying to re-enable the dependencies needed in order to make this package installable. Only if doing this reaches some other package which we consider unmaintainable on i386 should we stop.

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

Alright, I had to rebuild python-crypto for the correct dependencies to bet set (3.7 -> 3.8 move). After that I made it work again. Re-pushing it and will upload the re-build before uploading this change.

Could you +1 it ? Thanks Steve!

(c)rafaeldtinoco@sambai386:~/.../ubuntu$ sudo dpkg -i python-crypto_2.6.1-11ubuntu3_i386.deb python3-crypto_2.6.1-11ubuntu3_i386.deb
Selecting previously unselected package python-crypto.
(Reading database ... 78761 files and directories currently installed.)
Preparing to unpack python-crypto_2.6.1-11ubuntu3_i386.deb ...
Unpacking python-crypto (2.6.1-11ubuntu3) ...
Selecting previously unselected package python3-crypto.
Preparing to unpack python3-crypto_2.6.1-11ubuntu3_i386.deb ...
Unpacking python3-crypto (2.6.1-11ubuntu3) ...
Setting up python-crypto (2.6.1-11ubuntu3) ...
Setting up python3-crypto (2.6.1-11ubuntu3) ...

(c)rafaeldtinoco@sambai386:~/.../ubuntu$ sudo dpkg -i ./libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ./samba-common_4.11.1+dfsg-3ubuntu4_all.deb ./samba-common-bin_4.11.1+dfsg-3ubuntu4_i386.deb ./libwbclient0_4.11.1+dfsg-3ubuntu4_i386.deb ./samba-libs_4.11.1+dfsg-3ubuntu4_i386.deb ./python3-samba_4.11.1+dfsg-3ubuntu4_i386.deb ./libnss-wtu4_i386.deb ./samba-libs_4.11.1+dfsg-3ubuntu4_i386.deb ./python3-samba_4.11.1+dfsg-3ubuntu4_i386.deb ./libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ./winbind_4.11.1+dfsg-3ubuntu4_i386.deb
inbind_4.11.1+dfsg-3ubuntu4_i386.deb ./winbind_4.11.1+dfsg-3ubuntu4_i386.deb
Selecting previously unselected package libnss-winbind:i386.
(Reading database ... 79108 files and directories currently installed.)
Preparing to unpack .../libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking libnss-winbind:i386 (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../samba-common_4.11.1+dfsg-3ubuntu4_all.deb ...
Unpacking samba-common (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Selecting previously unselected package samba-common-bin.
Preparing to unpack .../samba-common-bin_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking samba-common-bin (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../libwbclient0_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking libwbclient0:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../samba-libs_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking samba-libs:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Selecting previously unselected package python3-samba.
Preparing to unpack .../python3-samba_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking python3-samba (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking libnss-winbind:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Selecting previously unselected package winbind.
Preparing to unpack .../winbind_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking winbind (2:4.11.1+dfsg-3ubuntu4) ...
More than one copy of package libnss-winbind:i386 has been unpacked
 in this run ! Only configuring it once.
Setting up samba-common (2:4.11.1+dfsg-3ubuntu4) ...
Setting up libwbclient0:i386 (2:4.11.1+dfsg-3ubuntu4) ...
Setting up samba-libs:i386 (2:4.11.1+dfsg-3ubuntu4) ...
Setting up python3-sa...

Read more...

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

python3-crypto/i386 is back now, so this is unblocked.

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

(c)rafaeldtinoco@sambai386:~$ apt-cache policy python3-crypto
python3-crypto:
  Installed: (none)
  Candidate: 2.6.1-11ubuntu2
  Version table:
     2.6.1-11ubuntu2 500
        500 http://us.archive.ubuntu.com/ubuntu focal/main i386 Packages

It is! Thank you!

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

(c)rafaeldtinoco@sambai386:~/.../ubuntu$ apt-get install python3-crypto

Reading package lists... Done
Building dependency tree
Reading state information... Done
The following NEW packages will be installed:
  python3-crypto
0 upgraded, 1 newly installed, 0 to remove and 2 not upgraded.
4 not fully installed or removed.
Need to get 252 kB of archives.
After this operation, 1,971 kB of additional disk space will be used.
Get:1 http://us.archive.ubuntu.com/ubuntu focal/main i386 python3-crypto i386 2.6.1-11ubuntu2 [252 kB]
Fetched 252 kB in 1s (269 kB/s)
Selecting previously unselected package python3-crypto.
(Reading database ... 49128 files and directories currently installed.)
Preparing to unpack .../python3-crypto_2.6.1-11ubuntu2_i386.deb ...
Unpacking python3-crypto (2.6.1-11ubuntu2) ...
Setting up python3-crypto (2.6.1-11ubuntu2) ...
Setting up samba-common-bin (2:4.11.1+dfsg-3ubuntu4) ...
Checking smb.conf with testparm
Load smb config files from /etc/samba/smb.conf
Loaded services file OK.
Server role: ROLE_STANDALONE
Done
Setting up winbind (2:4.11.1+dfsg-3ubuntu4) ...
mkdir: created directory '/var/lib/samba/winbindd_privileged'
changed group of '/var/lib/samba/winbindd_privileged' from root to winbindd_priv
mode of '/var/lib/samba/winbindd_privileged' changed from 0755 (rwxr-xr-x) to 0750 (rwxr-x---)
Created symlink /etc/systemd/system/multi-user.target.wants/winbind.service → /lib/systemd/system/winbind.service.
Setting up libnss-winbind:i386 (2:4.11.1+dfsg-3ubuntu4) ...
Processing triggers for libc-bin (2.30-0ubuntu3) ...
Processing triggers for systemd (244.2-1ubuntu1) ...

and then

(c)rafaeldtinoco@sambai386:~/.../ubuntu$ sudo dpkg -i ./libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ./samba-common_4.11.1+dfsg-3ubuntu4_all.deb ./samba-common-bin_4.11.1+dfsg-3ubuntu4_i386.deb ./libwbclient0_4.11.1+dfsg-3ubuntu4_i386.deb ./samba-libs_4.11.1+dfsg-3ubuntu4_i386.deb ./python3-samba_4.11.1+dfsg-3ubuntu4_i386.deb ./libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ./winbind_4.11.1+dfsg-3ubuntu4_i386.deb

(Reading database ... 49309 files and directories currently installed.)
Preparing to unpack .../libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking libnss-winbind:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../samba-common_4.11.1+dfsg-3ubuntu4_all.deb ...
Unpacking samba-common (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../samba-common-bin_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking samba-common-bin (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../libwbclient0_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking libwbclient0:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../samba-libs_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking samba-libs:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../python3-samba_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking python3-samba (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfsg-3ubuntu4) ...
Preparing to unpack .../libnss-winbind_4.11.1+dfsg-3ubuntu4_i386.deb ...
Unpacking libnss-winbind:i386 (2:4.11.1+dfsg-3ubuntu4) over (2:4.11.1+dfs...

Read more...

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

Steve this is good to go on my side, I'll push (git-ubuntu) and upload as soon as I get your +1.

Thanks!

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

Ah I just saw you +1ed already. So, with all set, I'll upload it.

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

$ git push pkg upload/2%4.11.1+dfsg-3ubuntu4
Enumerating objects: 13, done.
Counting objects: 100% (13/13), done.
Delta compression using up to 8 threads
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.09 KiB | 50.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/samba
 * [new tag] upload/2%4.11.1+dfsg-3ubuntu4 -> upload/2%4.11.1+dfsg-3ubuntu4

$ dput ubuntu samba_4.11.1+dfsg-3ubuntu4_source.changes
Checking signature on .changes
gpg: /home/rafaeldtinoco/work/sources/ubuntu/samba_4.11.1+dfsg-3ubuntu4_source.changes: Valid signature from A93E0E0AD83C0D0F
Checking signature on .dsc
gpg: /home/rafaeldtinoco/work/sources/ubuntu/samba_4.11.1+dfsg-3ubuntu4.dsc: Valid signature from A93E0E0AD83C0D0F
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading samba_4.11.1+dfsg-3ubuntu4.dsc: done.
  Uploading samba_4.11.1+dfsg-3ubuntu4.debian.tar.xz: done.
  Uploading samba_4.11.1+dfsg-3ubuntu4_source.buildinfo: done.
  Uploading samba_4.11.1+dfsg-3ubuntu4_source.changes: done.
Successfully uploaded packages.

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

Fix released.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 4bde551..5c36d6a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,15 @@
6+samba (2:4.11.1+dfsg-3ubuntu4) focal; urgency=medium
7+
8+ * Ubuntu i386 binary compatibility effort: (LP: #1861316)
9+ - debian/rules:
10+ + re-enable the following binary packages generation:
11+ - libnss-winbind
12+ - samba-common-bin
13+ - python3-samba
14+ - winbind
15+
16+ -- Rafael David Tinoco <rafaeldtinoco@ubuntu.com> Thu, 06 Feb 2020 14:42:38 +0000
17+
18 samba (2:4.11.1+dfsg-3ubuntu3) focal; urgency=medium
19
20 * No-change rebuild to build with python3.8.
21diff --git a/debian/rules b/debian/rules
22index 2068872..0341151 100755
23--- a/debian/rules
24+++ b/debian/rules
25@@ -113,13 +113,9 @@ endif
26 ifeq ($(UBUNTU_I386), 1)
27 BUILD_PACKAGES += \
28 -Nctdb \
29- -Nlibnss-winbind \
30 -Nlibpam-winbind \
31- -Npython3-samba \
32 -Nsamba \
33- -Nsamba-common-bin \
34- -Nsamba-testsuite \
35- -Nwinbind
36+ -Nsamba-testsuite
37 endif
38
39 %:

Subscribers

People subscribed via source and target branches