Merge lp:~racb/ubuntu/oneiric/uw-imap/831228 into lp:ubuntu/oneiric/uw-imap

[Robie Basak]

[Dave Walker (davewalker)]

Looks good.

Ideally, we'd like to introduce a new patch incase the edited patch isn't accepted by debian, it makes merging easier next cycle.

You probably don't need to quote http://wiki.debian.org/ToolChain/DSOLinking, as it's understood --as-needed is enough.

I need to build test this first, but generally happy. If you are confident this is a good fix, do you want to use the "submittodebian" tool?

Thanks

[lp:~racb/ubuntu/oneiric/uw-imap/831228]

16. By Robie Basak on 2011-09-16

Fix libc-client.so.2007e.0 dependencies to build correctly with
-Wl,--as-needed. (LP: #831228)

[Robie Basak (racb)]

Upstream doesn't appear to support the creation of shared objects in its build system.

The build system does allow a platform specific "ar" call to create static objects by setting a variable. This assumes that the output filename is goes after the contents of the variable.

The Debian package hacks the build system by using a call to gcc as the "ar" call for a new shared object platform type. This ends in "-o" to fulfil the requirement that the output filename will go after it.

This makes it necessary to modify this hack further to move the "-o output_filename" further back to fix the --as-needed bug, so it makes sense to modify the existing Debian patch rather than create a new one. Given that the existing patch is a hack already, I can't see a cleaner way of fixing this except to change more of the upstream build system which would be too invasive. Hopefully Debian will find this acceptable.

[Colin Watson (cjwatson)]

FWIW it doesn't matter where '-o output_filename' goes; what matters is
the relative positioning of input objects and the libraries they depend
on.

Unmerged revisions

16. By Robie Basak on 2011-09-16

Fix libc-client.so.2007e.0 dependencies to build correctly with
-Wl,--as-needed. (LP: #831228)

15. By Robie Basak on 2011-09-08

Fix libc-client.so.2007e.0 dependencies as caused by Ubuntu's
-Wl,--as-needed default.
See: http://wiki.debian.org/ToolChain/DSOLinking (LP: #831228)

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-13 22:53:14 +0000
+++ debian/changelog	2011-09-16 12:21:25 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 uw-imap (8:2007e~dfsg-3.1ubuntu4) oneiric; urgency=low
 
   * Resolve unresolved symbols in shared libraries. Closes: #558968.
@@ -5,6 +6,15 @@
 
  -- Matthias Klose <[e-mail]>  Tue, 13 Sep 2011 22:53:14 +0000
 
+=======
+uw-imap (8:2007e~dfsg-3.1ubuntu4) oneiric; urgency=low
+
+  * Fix libc-client.so.2007e.0 dependencies to build correctly with
+    -Wl,--as-needed. (LP: #831228)
+
+ -- Robie Basak <[e-mail]>  Tue, 13 Sep 2011 13:38:07 +0100
+
+>>>>>>> MERGE-SOURCE
 uw-imap (8:2007e~dfsg-3.1ubuntu3) oneiric; urgency=low
 
   * Apply patch from Vladimir Kolesnikov to properly zero out len

=== modified file 'debian/patches/1001_shlibs.patch'
--- debian/patches/1001_shlibs.patch	2008-08-22 09:57:49 +0000
+++ debian/patches/1001_shlibs.patch	2011-09-16 12:21:25 +0000
@@ -1,6 +1,5 @@
-diff -ruN uw-imap-2006k~dfsg.orig/Makefile uw-imap-2006k~dfsg/Makefile
---- uw-imap-2006k~dfsg.orig/Makefile	2007-11-08 00:16:50.000000000 +0100
-+++ uw-imap-2006k~dfsg/Makefile	2007-12-10 15:58:39.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -78,11 +78,13 @@
  # hxd	HP-UX 10.x with DCE security (see shp)
  # isc	Interactive Systems
@@ -35,9 +34,8 @@
  lmd:	an
  	$(BUILD) BUILDTYPE=lnp IP=$(IP6) \
  	SPECIALS="SSLINCLUDE=/usr/include/openssl SSLLIB=/usr/lib SSLCERTS=/usr/lib/ssl/certs SSLKEYS=/usr/lib/ssl/private GSSINCLUDE=/usr/include GSSLIB=/usr/lib"
-diff -ruN uw-imap-2006k~dfsg.orig/src/dmail/Makefile uw-imap-2006k~dfsg/src/dmail/Makefile
---- uw-imap-2006k~dfsg.orig/src/dmail/Makefile	2007-09-11 01:56:35.000000000 +0200
-+++ uw-imap-2006k~dfsg/src/dmail/Makefile	2007-12-10 16:00:26.000000000 +0100
+--- a/src/dmail/Makefile
++++ b/src/dmail/Makefile
 @@ -26,7 +26,7 @@
  
  
@@ -65,9 +63,8 @@
  clean:
  	rm -f *.o dmail
  
-diff -ruN uw-imap-2006d.dfsg.orig/src/imapd/Makefile uw-imap-2006d.dfsg/src/imapd/Makefile
---- uw-imap-2006d.dfsg.orig/src/imapd/Makefile	2006-08-31 02:10:44.000000000 +0200
-+++ uw-imap-2006d.dfsg/src/imapd/Makefile	2006-12-19 22:11:49.000000000 +0100
+--- a/src/imapd/Makefile
++++ b/src/imapd/Makefile
 @@ -43,12 +43,12 @@
  # Get local definitions from c-client directory
  
@@ -83,9 +80,8 @@
  
  all:	imapd
  
-diff -ruN uw-imap-2006d.dfsg.orig/src/ipopd/Makefile uw-imap-2006d.dfsg/src/ipopd/Makefile
---- uw-imap-2006d.dfsg.orig/src/ipopd/Makefile	2006-08-31 02:17:30.000000000 +0200
-+++ uw-imap-2006d.dfsg/src/ipopd/Makefile	2006-12-19 22:11:49.000000000 +0100
+--- a/src/ipopd/Makefile
++++ b/src/ipopd/Makefile
 @@ -26,14 +26,14 @@
  
  
@@ -103,9 +99,8 @@
  
  ipopd: ipop2d ipop3d
  
-diff -ruN uw-imap-2006d.dfsg.orig/src/mailutil/Makefile uw-imap-2006d.dfsg/src/mailutil/Makefile
---- uw-imap-2006d.dfsg.orig/src/mailutil/Makefile	2006-08-31 02:21:20.000000000 +0200
-+++ uw-imap-2006d.dfsg/src/mailutil/Makefile	2006-12-19 22:11:49.000000000 +0100
+--- a/src/mailutil/Makefile
++++ b/src/mailutil/Makefile
 @@ -26,7 +26,7 @@
  
  
@@ -131,9 +126,8 @@
  clean:
  	rm -f *.o mailutil
  
-diff -ruN uw-imap-2006d.dfsg.orig/src/mtest/Makefile uw-imap-2006d.dfsg/src/mtest/Makefile
---- uw-imap-2006d.dfsg.orig/src/mtest/Makefile	2006-08-31 02:25:07.000000000 +0200
-+++ uw-imap-2006d.dfsg/src/mtest/Makefile	2006-12-19 22:11:49.000000000 +0100
+--- a/src/mtest/Makefile
++++ b/src/mtest/Makefile
 @@ -26,7 +26,7 @@
  
  
@@ -159,10 +153,17 @@
  clean:
  	rm -f *.o mtest || true
  
-diff -ruN uw-imap-2006d.dfsg.orig/src/osdep/unix/Makefile uw-imap-2006d.dfsg/src/osdep/unix/Makefile
---- uw-imap-2006d.dfsg.orig/src/osdep/unix/Makefile	2006-12-08 02:24:54.000000000 +0100
-+++ uw-imap-2006d.dfsg/src/osdep/unix/Makefile	2006-12-19 22:13:10.000000000 +0100
-@@ -490,7 +490,19 @@
+--- a/src/osdep/unix/Makefile
++++ b/src/osdep/unix/Makefile
+@@ -130,6 +130,7 @@
+ # Commands possibly overriden by the individual port
+ 
+ ARRC=ar rc
++ARRC_POST_FLAGS=
+ CC=cc
+ LN=ln -s
+ RANLIB=ranlib
+@@ -490,7 +491,20 @@
  	 ACTIVEFILE=/var/lib/news/active \
  	 RSHPATH=/usr/bin/rsh \
  	 BASECFLAGS="$(GCCCFLAGS)" \
@@ -178,12 +179,13 @@
 +	 BASECFLAGS="-fPIC $(GCCCFLAGS)" \
 +	 ARCHIVE="libc-client.so" \
 +	 BASELDFLAGS="-L../c-client -lc-client $(PAMLDFLAGS) -lc" \
-+	 ARRC="gcc --shared -Wl,-soname,libc-client.so.$(VERSION) $(PAMLDFLAGS) -lc $(EXTRALDFLAGS) $(SSLLDFLAGS) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -o" \
++	 ARRC="gcc --shared -Wl,-soname,libc-client.so.$(VERSION) -o" \
++	 ARRC_POST_FLAGS="$(PAMLDFLAGS) -lc $(EXTRALDFLAGS) $(SSLLDFLAGS) -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \
 +	 RANLIB=true
  
  lnx:	# Linux non-shadow passwords
  	@echo You are building for traditional Linux *without* shadow
-@@ -861,7 +873,7 @@
+@@ -861,7 +875,7 @@
  # Cleanup
  
  clean:
@@ -192,17 +194,18 @@
  
  
  # Dependencies
-@@ -969,6 +981,7 @@
+@@ -968,7 +982,8 @@
+ 	 -DLOCKPGM1=\"$(LOCKPGM1)\" -DLOCKPGM2=\"$(LOCKPGM2)\" \
  	 -DLOCKPGM3=\"$(LOCKPGM3)\" > OSCFLAGS
  	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
- 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+-	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++	echo "$(ARRC) $(ARCHIVE) $(BINARIES) $(ARRC_POST_FLAGS);$(RANLIB) $(ARCHIVE)" > ARCHIVE
 +	echo $(ARCHIVE) > ARCHIVENAME
  	echo $(OS) > OSTYPE
  	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
  	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
-diff -ruN uw-imap-2006k~dfsg.orig/src/tmail/Makefile uw-imap-2006k~dfsg/src/tmail/Makefile
---- uw-imap-2006k~dfsg.orig/src/tmail/Makefile	2007-12-10 16:26:58.000000000 +0100
-+++ uw-imap-2006k~dfsg/src/tmail/Makefile	2007-12-10 16:28:07.000000000 +0100
+--- a/src/tmail/Makefile
++++ b/src/tmail/Makefile
 @@ -26,7 +26,7 @@