[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: samba (2:3.6.1-3) squeeze-backports request



Schaefer-Hutter <schaefer.hutter@gmail.com> (25/02/2012):
> In CTDB:
> --------
> 
> diff -u debian/rules debian.new/rules
> --- debian/rules	2012-01-15 21:58:12.000000000 +0100
> +++ debian.new/rules	2012-02-25 10:45:00.000000000 +0100
> @@ -10,7 +10,8 @@
> 
>  conf_args = \
>  		--localstatedir=/var/lib \
> -		--with-logdir=/var/log/ctdb
> +		--with-logdir=/var/log/ctdb \
> +		--libdir=/usr/lib

What I suggested, so no surprise here.

> In SAMBA:
> ---------
> 
> diff -u debian/libpam-smbpass.install debian.new/libpam-smbpass.install
> --- debian/libpam-smbpass.install	2012-02-09 20:31:09.000000000 +0100
> +++ debian.new/libpam-smbpass.install	2012-02-25 12:34:30.000000000 +0100
> @@ -1,2 +1,2 @@
> -lib/security/pam_smbpass.so
> +lib/*/security/pam_smbpass.so
>  usr/share/pam-configs/smbpasswd-migrate
[ same for libpam-winbind.install ]

Is that '*' needed because of the architecture triplet? If so, I think
it's incorrect, as squeeze (basically) has no multiarch support; and I
think a better change would be disabling multiarch entirely.

Anyway, I find it strange you needed that, see what's in 2:3.6.3-1~bpo60+1:
| DEB_HOST_MULTIARCH      ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
|                  --with-pammodulesdir=/lib/$(DEB_HOST_MULTIARCH)/security […]
|         install -m 0644 nsswitch/libnss_winbind.so $(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libnss_winbind.so.2
|         install -m 0644 nsswitch/libnss_wins.so $(DESTDIR)/lib/$(DEB_HOST_MULTIARCH)/libnss_wins.so.2

AFAICT (at least on this squeeze system), I get:
| cbrulebois@Kashyyyk:~/bpo/samba-3.6.3$ dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null
| cbrulebois@Kashyyyk:~/bpo/samba-3.6.3$ dpkg-architecture -qDEB_HOST_MULTIARCH
| DEB_HOST_MULTIARCH is not a supported variable name at /usr/bin/dpkg-architecture line 214.

so you should have an empty DEB_HOST_MULTIARCH string, and no triplet
should appear. Maybe you installed some dpkg-dev from bpo (I didn't
check whether it brings multiarch support)?

Anyway, to make sure no multiarch bits land in the backported packages,
I'd suggest setting DEB_HOST_MULTIARCH to an empty string instead of
calling “dpkg-architecture -qDEB_HOST_MULTIARCH”, so that the rest
of the rules file can be left unchanged.

Disclaimer: I didn't do any actual build check.

Mraw,
KiBi.

Attachment: signature.asc
Description: Digital signature


Reply to: