[Pkg-samba-maint] r1001 - in trunk: . patches

[Peter Eisentraut]

Author: petere
Date: 2006-01-26 19:31:24 +0000 (Thu, 26 Jan 2006)
New Revision: 1001

Added:
   trunk/patches/libnss-soname.patch
Modified:
   trunk/changelog
   trunk/patches/series
   trunk/rules
   trunk/winbind.files
Log:
Remove sonames from libnss_win{bind,s}.so.


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-01-25 22:23:47 UTC (rev 1000)
+++ trunk/changelog	2006-01-26 19:31:24 UTC (rev 1001)
@@ -6,8 +6,9 @@
   * Fix lintian overrides and install them into the right packages.
   * Remove swat inetd registration in remove, not purge. Closes: #313214
   * Add findsmb script. Closes: #231806
+  * Remove sonames from libnss_win{bind,s}.so. Closes: #333290
 
- -- Peter Eisentraut <petere at debian.org>  Wed, 25 Jan 2006 01:11:56 +0100
+ -- Peter Eisentraut <petere at debian.org>  Wed, 25 Jan 2006 18:05:42 +0100
 
 samba (3.0.21a-4) unstable; urgency=low
 

Added: trunk/patches/libnss-soname.patch
===================================================================
--- trunk/patches/libnss-soname.patch	2006-01-25 22:23:47 UTC (rev 1000)
+++ trunk/patches/libnss-soname.patch	2006-01-26 19:31:24 UTC (rev 1001)
@@ -0,0 +1,20 @@
+Index: samba-3.0.21a/source/Makefile.in
+===================================================================
+--- samba-3.0.21a.orig/source/Makefile.in	2006-01-23 01:08:53.000000000 +0100
++++ samba-3.0.21a/source/Makefile.in	2006-01-23 01:50:26.000000000 +0100
+@@ -1180,13 +1180,12 @@
+ @WINBIND_NSS@: $(WINBIND_NSS_PICOBJS)
+ 	@echo "Linking $@"
+ 	@$(SHLD) $(WINBIND_NSS_LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
+-		@WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
++		@WINBIND_NSS_EXTRA_LIBS@
+ 
+ @WINBIND_WINS_NSS@: $(WINBIND_WINS_NSS_PICOBJS)
+ 	@echo "Linking $@"
+ 	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_PICOBJS) \
+-		$(LDAP_LIBS) $(KRB5LIBS) -lc \
+-		@SONAMEFLAG@`basename $@`
++		$(LDAP_LIBS) $(KRB5LIBS) -lc
+ 
+ nsswitch/pam_winbind. at SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy
+ 	@echo "Linking $@"

Modified: trunk/patches/series
===================================================================
--- trunk/patches/series	2006-01-25 22:23:47 UTC (rev 1000)
+++ trunk/patches/series	2006-01-26 19:31:24 UTC (rev 1001)
@@ -18,3 +18,4 @@
 VERSION.patch
 adapt_machine_creation_script.patch
 autoconf.patch
+libnss-soname.patch

Modified: trunk/rules
===================================================================
--- trunk/rules	2006-01-25 22:23:47 UTC (rev 1000)
+++ trunk/rules	2006-01-26 19:31:24 UTC (rev 1001)
@@ -160,13 +160,13 @@
 
 	# Install winbind stuff not installed by 'make install'
 	install -m 0644 source/nsswitch/libnss_winbind.so \
-		$(DESTDIR)/lib/libnss_winbind.so.2
+		$(DESTDIR)/lib/libnss_winbind.so
 	install -m 0644 source/nsswitch/pam_winbind.so \
 		$(DESTDIR)/lib/security/
 
 	# Install libnss_wins.so, which is not installed by 'make install' either.
 	install -m 0644 source/nsswitch/libnss_wins.so \
-		$(DESTDIR)/lib/libnss_wins.so.2
+		$(DESTDIR)/lib/libnss_wins.so
 
 	# pam_smbpass.so isn't being installed by 'make install'.
 	#	We'll move it here to $(DESTDIR)/lib/security/ and then

Modified: trunk/winbind.files
===================================================================
--- trunk/winbind.files	2006-01-25 22:23:47 UTC (rev 1000)
+++ trunk/winbind.files	2006-01-26 19:31:24 UTC (rev 1001)
@@ -6,5 +6,5 @@
 usr/share/man/man7/pam_winbind.7
 usr/share/man/man8/winbindd.8
 lib/security/pam_winbind.so
-lib/libnss_winbind.so.2
-lib/libnss_wins.so.2
+lib/libnss_winbind.so
+lib/libnss_wins.so