Bug#766811: spurious library links

Commit Message

Michael Biebl March 16, 2017, 4:28 p.m. UTC

Hi Nathan

On Tue, 9 Feb 2016 22:20:23 -0500 (EST) Nathan Scott
<[e-mail]> wrote:

> > Should I NMU?
> 
> Please go right ahead Marco - many thanks!

So this NMU happened, but unfortunately your followup maintainer upload,
i.e. 4.5.0 did not include the changes from the NMU.

Nathan, could you make another upload including the fix from Marco?

I've attached the debdiff which still seems to apply against 4.9.0

Seeing that this issue already caused two duplicates being filed, I'd
say it's worth fixing for stretch.

Regards,
Michael

Comments

Michael Biebl March 17, 2017, 2:32 p.m. UTC | #1

Hi Nathan,

thanks for your quick reply

Am 17.03.2017 um 13:22 schrieb Nathan Scott:
>> So this NMU happened, but unfortunately your followup maintainer upload,
>> i.e. 4.5.0 did not include the changes from the NMU.
> 
> (d'oh, these changes needs to be sent upstream to the kernel.org
> <http://kernel.org> XFS list)

I'm not sure about Marco, but I don't know the procedures getting a
patch into xfsprogs. So I would very much prefer if you forward the
patch to the right people.

>> Nathan, could you make another upload including the fix from Marco?
> 
> I'm currently traveling and will be unable to attend to this for some time.

Should Marco or myself do another NMU then? I would send you an updated
debdiff in this case.

Regards,
Michael

Patch

diff -Nru xfsprogs-4.3.0/debian/changelog xfsprogs-4.3.0+nmu1/debian/changelog
--- xfsprogs-4.3.0/debian/changelog	2015-11-27 00:38:33.000000000 +0100
+++ xfsprogs-4.3.0+nmu1/debian/changelog	2016-02-10 04:39:50.000000000 +0100
@@ -1,3 +1,11 @@ 
+xfsprogs (4.3.0+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Disabled the code in include/buildmacros which creates bogus symlinks
+    for libraries. (Closes: #766811)
+
+ -- Marco d'Itri <[e-mail]>  Wed, 10 Feb 2016 04:24:23 +0100
+
 xfsprogs (4.3.0) unstable; urgency=low
 
   * New upstream release
diff -Nru xfsprogs-4.3.0/include/buildmacros xfsprogs-4.3.0+nmu1/include/buildmacros
--- xfsprogs-4.3.0/include/buildmacros	2015-09-11 03:51:36.000000000 +0200
+++ xfsprogs-4.3.0+nmu1/include/buildmacros	2016-02-10 04:39:50.000000000 +0100
@@ -76,7 +76,7 @@ 
 	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
 	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
 	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
+	if false && [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
 	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
 		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
 		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \