Package: ia32-libs
Version: 2.7
Severity: normal
Hi,
when using a 32bit application, which makes use of the struct passwd and you
have enabled
the sasl stuff the installed libsasl will search its plugins under
/usr/lib/sasl2, rather
then /usr/lib32/sasl2. Unfornatly I dont understand the ia32-lib building I can
not
provide a patch directly. I attached a patch which works directly on
cyrus-sasl2
can maybe used as a base.
Bye Henning
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/changelog cyrus-sasl2-2.1.22.dfsg1/debian/changelog
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/changelog 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/changelog 2009-07-15 12:27:29.000000000 +0200
@@ -1,3 +1,9 @@
+cyrus-sasl2 (2.1.22.dfsg1-23+lenny1+tarent1) stable; urgency=low
+
+ * fix modules/plugin-dir for ia32-libs
+
+ -- Henning Heinold <h.hein...@tarent.de> Wed, 15 Jul 2009 12:23:48 +0200
+
cyrus-sasl2 (2.1.22.dfsg1-23+lenny1) stable-security; urgency=high
* debian/patches/0021_CVE-2009-0688-fix.dpatch, debian/patches/00list:
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-2.dirs cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-2.dirs
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-2.dirs 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-2.dirs 2009-07-15 10:56:50.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib
-usr/lib/sasl2
+usr/lib32
+usr/lib32/sasl2
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-2.install cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-2.install
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-2.install 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-2.install 2009-07-15 10:57:03.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/libsasl2.so.*
-usr/lib/sasl2/libsasldb*
+usr/lib32/libsasl2.so.*
+usr/lib32/sasl2/libsasldb*
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-dev.dirs cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-dev.dirs
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-dev.dirs 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-dev.dirs 2009-07-15 11:24:06.000000000 +0200
@@ -1,3 +1,3 @@
usr/include/sasl
-usr/lib
+usr/lib32
usr/share/man/man3
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-dev.install cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-dev.install
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-dev.install 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-dev.install 2009-07-15 11:24:17.000000000 +0200
@@ -1,4 +1,4 @@
usr/include/sasl
-usr/lib/libsasl2.??
-usr/lib/libsasl2.a
+usr/lib32/libsasl2.??
+usr/lib32/libsasl2.a
usr/share/man/man3
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules.dirs cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules.dirs
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules.dirs 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules.dirs 2009-07-15 10:57:18.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2
+usr/lib32/sasl2
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-gssapi-mit.dirs cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-gssapi-mit.dirs
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-gssapi-mit.dirs 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-gssapi-mit.dirs 2009-07-15 10:58:05.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2
+usr/lib32/sasl2
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-gssapi-mit.install cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-gssapi-mit.install
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-gssapi-mit.install 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-gssapi-mit.install 2009-07-15 10:58:16.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2/libgssapiv2.*
+usr/lib32/sasl2/libgssapiv2.*
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules.install cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules.install
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules.install 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules.install 2009-07-15 10:57:43.000000000 +0200
@@ -1,6 +1,6 @@
-usr/lib/sasl2/libanonymous.*
-usr/lib/sasl2/libcrammd5.*
-usr/lib/sasl2/libdigestmd5.*
-usr/lib/sasl2/liblogin.*
-usr/lib/sasl2/libntlm.*
-usr/lib/sasl2/libplain.*
+usr/lib32/sasl2/libanonymous.*
+usr/lib32/sasl2/libcrammd5.*
+usr/lib32/sasl2/libdigestmd5.*
+usr/lib32/sasl2/liblogin.*
+usr/lib32/sasl2/libntlm.*
+usr/lib32/sasl2/libplain.*
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-ldap.dirs cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-ldap.dirs
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-ldap.dirs 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-ldap.dirs 2009-07-15 10:58:28.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2
+usr/lib32/sasl2
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-ldap.install cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-ldap.install
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-ldap.install 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-ldap.install 2009-07-15 10:58:36.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2/libldapdb.*
+usr/lib32/sasl2/libldapdb.*
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-otp.dirs cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-otp.dirs
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-otp.dirs 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-otp.dirs 2009-07-15 10:58:50.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2
+usr/lib32/sasl2
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-otp.install cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-otp.install
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-otp.install 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-otp.install 2009-07-15 10:58:57.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2/libotp.*
+usr/lib32/sasl2/libotp.*
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-sql.dirs cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-sql.dirs
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-sql.dirs 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-sql.dirs 2009-07-15 10:59:05.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2
+usr/lib32/sasl2
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-sql.install cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-sql.install
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-sql.install 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/libsasl2-modules-sql.install 2009-07-15 10:59:12.000000000 +0200
@@ -1 +1 @@
-usr/lib/sasl2/libsql.*
+usr/lib32/sasl2/libsql.*
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/patches/0022_fix32libs.dpatch cyrus-sasl2-2.1.22.dfsg1/debian/patches/0022_fix32libs.dpatch
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/patches/0022_fix32libs.dpatch 1970-01-01 01:00:00.000000000 +0100
+++ cyrus-sasl2-2.1.22.dfsg1/debian/patches/0022_fix32libs.dpatch 2009-07-27 18:28:43.000000000 +0200
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0022_fix32libs.dpatch by Henning Heinold <h.hein...@tarent.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix for plugins to
+
+...@dpatch@
+Index: cyrus-sasl2-2.1.22.dfsg1/Makefile.am
+===================================================================
+--- cyrus-sasl2-2.1.22.dfsg1.orig/Makefile.am 2009-07-27 18:23:05.000000000 +0200
++++ cyrus-sasl2-2.1.22.dfsg1/Makefile.am 2009-07-27 18:23:47.000000000 +0200
+@@ -79,23 +79,7 @@
+
+ framedir = /Library/Frameworks/SASL2.framework
+ install-exec-local: $(INSTALLOSX)
+- @if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
+- echo "********************************************************"; \
+- echo "* WARNING:"; \
+- echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
+- echo "* but the library will look for them in $(plugindir)."; \
+- echo "* You need to make sure that the plugins will eventually"; \
+- echo "* be in $(plugindir) -- the easiest way is to make a"; \
+- echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
+- echo "* but this may not be appropriate for your site, so this"; \
+- echo "* installation procedure won't do it for you."; \
+- echo "*"; \
+- echo "* If you don't want to do this for some reason, you can"; \
+- echo "* set the location where the library will look for plugins"; \
+- echo "* by setting the environment variable SASL_PATH to the path"; \
+- echo "* the library should use."; \
+- echo "********************************************************"; \
+- fi
++
+ install-exec-local-osx:
+ $(mkinstalldirs) $(framedir)/Versions/A/Headers
+ $(mkinstalldirs) $(framedir)/Versions/A/Resources
+Index: cyrus-sasl2-2.1.22.dfsg1/plugins/Makefile.am
+===================================================================
+--- cyrus-sasl2-2.1.22.dfsg1.orig/plugins/Makefile.am 2009-07-27 18:22:12.000000000 +0200
++++ cyrus-sasl2-2.1.22.dfsg1/plugins/Makefile.am 2009-07-27 18:22:33.000000000 +0200
+@@ -75,7 +75,7 @@
+
+ common_sources = plugin_common.c plugin_common.h
+
+-sasldir = $(prefix)/lib/sasl2
++sasldir = $(libdir)/sasl2
+ sasl_LTLIBRARIES = @SASL_MECHS@
+ EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
+ libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/patches/00list cyrus-sasl2-2.1.22.dfsg1/debian/patches/00list
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/patches/00list 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/patches/00list 2009-07-27 18:27:13.000000000 +0200
@@ -20,3 +20,4 @@
0019_ldap_deprecated
0020_saslauthd_manpage
0021_CVE-2009-0688-fix
+0022_fix32libs
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/README.configure-options cyrus-sasl2-2.1.22.dfsg1/debian/README.configure-options
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/README.configure-options 1970-01-01 01:00:00.000000000 +0100
+++ cyrus-sasl2-2.1.22.dfsg1/debian/README.configure-options 2009-07-27 18:32:31.000000000 +0200
@@ -0,0 +1,2 @@
+To build this package, configure was called as follows:
+configure '--host=i486-linux-gnu' '--build=i486-linux-gnu' '--prefix=/usr' '--mandir=\${prefix}/share/man' '--infodir=\${prefix}/share/info' '--enable-static' '--enable-shared' '--enable-alwaystrue' '--enable-checkapop' '--enable-cram' '--enable-digest' '--enable-otp' '--disable-srp' '--disable-srp-setpass' '--disable-krb4' '--enable-gssapi' '--enable-gss_mutexes' '--enable-auth-sasldb' '--enable-plain' '--enable-anon' '--enable-login' '--enable-ntlm' '--disable-passdss' '--enable-sql' '--enable-ldapdb' '--disable-macos-framework' '--with-pam' '--with-saslauthd=/var/run/saslauthd' '--with-ldap' '--with-pgsql=/usr/include/postgresql' '--with-configdir=/etc/sasl:/usr/lib32/sasl2' '--sysconfdir=/etc' '--with-devrandom=/dev/urandom' '--with-plugindir=/usr/lib32/sasl2' '--libdir=/usr/lib32' 'build_alias=i486-linux-gnu' 'host_alias=i486-linux-gnu' 'CFLAGS=-Wall -g -O2' 'LDFLAGS= -Wl,-z,defs' 'CPPFLAGS=' 'CXXFLAGS=-g -O2' 'FFLAGS=-g -O2'
diff -Naur cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/rules cyrus-sasl2-2.1.22.dfsg1/debian/rules
--- cyrusorig/cyrus-sasl2-2.1.22.dfsg1/debian/rules 2009-07-27 18:40:56.000000000 +0200
+++ cyrus-sasl2-2.1.22.dfsg1/debian/rules 2009-07-15 11:30:14.000000000 +0200
@@ -166,9 +166,11 @@
--with-saslauthd=/var/run/saslauthd \
$(CONFIGURE_LDAP) \
--with-pgsql=/usr/include/postgresql \
- --with-configdir=/etc/sasl:/usr/lib/sasl2 \
+ --with-configdir=/etc/sasl:/usr/lib32/sasl2 \
--sysconfdir=/etc \
- --with-devrandom=/dev/urandom
+ --with-devrandom=/dev/urandom \
+ --with-plugindir=/usr/lib32/sasl2 \
+ --libdir=/usr/lib32
# Prepare to build sample-{client,server}
cp -f $(CURDIR)/debian/sample/config.h $(CURDIR)/sample/config.h
@@ -245,10 +247,10 @@
# Alter the rpath of certain binaries and shared libraries.
chrpath -d $(TMPPKG)/usr/sbin/sasldblistusers2 \
$(TMPPKG)/usr/sbin/saslpasswd2
- chrpath -d $(TMPPKG)/usr/lib/sasl2/libsql.so.2.0.22
+ chrpath -d $(TMPPKG)/usr/lib32/sasl2/libsql.so.2.0.22
# Install the sasl-sample-client and -server man pages.
- dh_installman -psasl2-bin sasl-sample-client.8 sasl-sample-server.8
+# dh_installman -psasl2-bin sasl-sample-client.8 sasl-sample-server.8
# Install saslfinger
install -m 644 -D $(CURDIR)/debian/saslfinger/saslfinger.1 \
@@ -276,7 +278,7 @@
dh_strip -s --dbg-package=cyrus-sasl2-dbg
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -s -X/usr/lib/sasl2
+ dh_makeshlibs -s -X/usr/lib32/sasl2
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
