Package: libsasl2-modules
Severity: normal

tags 516833 +patch
thank you

Attached is a patch which removes .la files from everywhere and .a
files from plugins (I don't think that .a files are usefull for
dynamic plugin loading :).

The second patch removes the symlink hell in /usr/lib/sasl2/ ;-) which
is not used anyway since the plugins are loaded just as plain .so
files.  (Correct me if I am wrong.)  As an added value I am removing
RPATH from all plugins ;), but really this needs to be fixed with
upstream (at least by adding --disable-rpath configure option).

O.
diff --git a/debian/libsasl2-dev.install b/debian/libsasl2-dev.install
index f4da345..77cc994 100644
--- a/debian/libsasl2-dev.install
+++ b/debian/libsasl2-dev.install
@@ -1,4 +1,4 @@
 usr/include/sasl
-usr/lib/libsasl2.??
+usr/lib/libsasl2.so
 usr/lib/libsasl2.a
 usr/share/man/man3
diff --git a/debian/libsasl2-modules-gssapi-heimdal.install b/debian/libsasl2-modules-gssapi-heimdal.install
index e3ed632..92b8b67 100644
--- a/debian/libsasl2-modules-gssapi-heimdal.install
+++ b/debian/libsasl2-modules-gssapi-heimdal.install
@@ -1 +1 @@
-usr/lib/sasl2/libgssapiv2.*
+usr/lib/sasl2/libgssapiv2.so*
diff --git a/debian/libsasl2-modules-gssapi-mit.install b/debian/libsasl2-modules-gssapi-mit.install
index e3ed632..92b8b67 100644
--- a/debian/libsasl2-modules-gssapi-mit.install
+++ b/debian/libsasl2-modules-gssapi-mit.install
@@ -1 +1 @@
-usr/lib/sasl2/libgssapiv2.*
+usr/lib/sasl2/libgssapiv2.so*
diff --git a/debian/libsasl2-modules-ldap.install b/debian/libsasl2-modules-ldap.install
index 429f8bf..47a9799 100644
--- a/debian/libsasl2-modules-ldap.install
+++ b/debian/libsasl2-modules-ldap.install
@@ -1 +1 @@
-usr/lib/sasl2/libldapdb.*
+usr/lib/sasl2/libldapdb.so*
diff --git a/debian/libsasl2-modules-sql.install b/debian/libsasl2-modules-sql.install
index 4f2ae65..a202000 100644
--- a/debian/libsasl2-modules-sql.install
+++ b/debian/libsasl2-modules-sql.install
@@ -1 +1 @@
-usr/lib/sasl2/libsql.*
+usr/lib/sasl2/libsql.so*
diff --git a/debian/libsasl2-modules.install b/debian/libsasl2-modules.install
index 86e64a2..30490ec 100644
--- a/debian/libsasl2-modules.install
+++ b/debian/libsasl2-modules.install
@@ -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/lib/sasl2/libanonymous.so*
+usr/lib/sasl2/libcrammd5.so*
+usr/lib/sasl2/libdigestmd5.so*
+usr/lib/sasl2/liblogin.so*
+usr/lib/sasl2/libntlm.so*
+usr/lib/sasl2/libplain.so*
diff --git a/debian/rules b/debian/rules
index 4acd042..9b7f0d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -267,7 +267,12 @@ install: build-arch build-indep test
 	# Alter the rpath of certain binaries and shared libraries.
 	chrpath -d $(TMPPKG_MIT)/usr/sbin/sasldblistusers2 \
 		$(TMPPKG_MIT)/usr/sbin/saslpasswd2
-	chrpath -d $(TMPPKG_MIT)/usr/lib/sasl2/libsql.so.2.0.23
+
+	for l in $(TMPPKG_MIT)/usr/lib/sasl2/lib*.so $(TMPPKG_HEIMDAL)/usr/lib/sasl2/lib*.so; do \
+	  rm $$l $$l.2; \
+	  mv $$l.2.0.23 $$l; \
+	  chrpath -d $$l; \
+	done
 
 	# Install the sasl-sample-client and -server man pages.
 	dh_installman -psasl2-bin sasl-sample-client.8 sasl-sample-server.8
@@ -309,7 +314,7 @@ binary-arch: build-arch install
 	dh_link -s
 	dh_strip -s -psasl2-bin -plibsasl2-2 -plibsasl2-modules -plibsasl2-modules-ldap -plibsasl2-modules-sql -plibsasl2-modules-gssapi-mit -plibsasl2-dev -Nlibsasl2-modules-gssapi-heimdal --dbg-package=cyrus-sasl2-dbg
 	dh_strip -s -plibsasl2-modules-gssapi-heimdal -Nsasl2-bin -Nlibsasl2-2 -Nlibsasl2-modules -Nlibsasl2-modules-ldap -Nlibsasl2-modules-sql -Nlibsasl2-modules-gssapi-mit -Nlibsasl2-dev --dbg-package=cyrus-sasl2-heimdal-dbg
-	mv debian/cyrus-sasl2-dbg/usr/lib/debug/usr/lib/sasl2/libgssapiv2.so.2.0.23 debian/cyrus-sasl2-mit-dbg/usr/lib/debug/usr/lib/sasl2/
+	mv debian/cyrus-sasl2-dbg/usr/lib/debug/usr/lib/sasl2/libgssapiv2.so debian/cyrus-sasl2-mit-dbg/usr/lib/debug/usr/lib/sasl2/
 	dh_compress -s
 	dh_fixperms -s
 	dh_makeshlibs -s -X/usr/lib/sasl2

Reply via email to