Merge lp:~l3on/ubuntu/precise/lusca/fix-ftbfs into lp:ubuntu/precise/lusca

[Leo Iannacone]

* Imported a patch from upstream to fix security warning and ftbfs.

 * Switched to 3.0 (quilt) format to simplify patch system

 * Fixed again ftbfs moving mime.conf from /usr/share to /etc (as default
   declared in the application configure script)

[Andreas Moog (ampelbein)]

Thanks for your work, however there are a few issues:

1. The debian package used dpatch to manage patches, there is no need to diverge in Ubuntu.
2. In the dep3-headers you list yourself as the "Author", however this should list the person who created the patch in the first place.

Cheers,
  Andreas

review: Needs Fixing

Unmerged revisions

3. By Leo Iannacone on 2012-03-02

* Fix format not a string literal and no format argument causing
  FTBFS (LP: #935290, closes: #643437).
* Switch to debian format 3.0 (quilt).
* Install mime.conf for lusca-common in /etc/ instead in /usr/share.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-05 14:15:23 +0000
+++ debian/changelog	2012-03-02 15:44:19 +0000
@@ -1,3 +1,12 @@
+lusca (0.1~svn14809-1ubuntu1) precise; urgency=low
+
+  * Fix format not a string literal and no format argument causing
+    FTBFS (LP: #935290, closes: #643437).
+  * Switch to debian format 3.0 (quilt).
+  * Install mime.conf for lusca-common in /etc/ instead in /usr/share.
+
+ -- Leo Iannacone <[e-mail]>  Fri, 02 Mar 2012 16:08:22 +0100
+
 lusca (0.1~svn14809-1) unstable; urgency=low
 
   * First attempt to package (Closes: #486224, #517734)

=== modified file 'debian/control'
--- debian/control	2011-03-05 14:15:23 +0000
+++ debian/control	2012-03-02 15:44:19 +0000
@@ -1,7 +1,8 @@
 Source: lusca
 Section: web
 Priority: optional
-Maintainer: Luigi Gangitano <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Luigi Gangitano <[e-mail]>
 Homepage: http://www.lusca.org/
 Standards-Version: 3.9.1
 Build-Depends: sharutils, dpatch (>= 2.0.9), po-debconf, cdbs, debhelper (>=5), comerr-dev, libsasl2-dev, libdb-dev, libkrb5-dev, libldap2-dev, libpam0g-dev

=== modified file 'debian/lusca-common.install'
--- debian/lusca-common.install	2011-03-05 14:15:23 +0000
+++ debian/lusca-common.install	2012-03-02 15:44:19 +0000
@@ -1,5 +1,5 @@
 usr/share/lusca/icons
 usr/share/lusca/errors
 usr/share/lusca/mib.txt
-usr/share/lusca/mime.conf
+etc/lusca/mime.conf
 etc/lusca/squid.conf.default /usr/share/doc/lusca-common/squid.conf.documented

=== added file 'debian/patches/missing-format-string.patch'
--- debian/patches/missing-format-string.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/missing-format-string.patch	2012-03-02 15:44:19 +0000
@@ -0,0 +1,18 @@
+Description: Fixing FTBFS with -Werror=format-security
+ Patch stolen from upstream: 
+ http://code.google.com/p/lusca-cache/source/detail?r=14941
+Author: Leo Iannacone <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/935290
+Bug-Debian: http://bugs.debian.org/643437
+
+--- a/src/client_side_ranges.c
++++ b/src/client_side_ranges.c
+@@ -39,7 +39,7 @@
+     httpHeaderClean(&hdr);
+ 
+     /* append <crlf> (we packed a header, not a reply) */
+-    memBufPrintf(mb, crlf);
++    memBufPrintf(mb, "%s", crlf);
+ }
+ 
+ /*

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2012-03-02 15:44:19 +0000
@@ -0,0 +1,1 @@
+missing-format-string.patch

=== modified file 'debian/rules'
--- debian/rules	2011-03-05 14:15:23 +0000
+++ debian/rules	2012-03-02 15:44:19 +0000
@@ -4,7 +4,6 @@
 #
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
 
 INSTALLDIR := $(CURDIR)/debian/tmp
 datadir=/usr/share/lusca

=== modified file 'debian/source/format'
--- debian/source/format	2011-03-05 14:15:23 +0000
+++ debian/source/format	2012-03-02 15:44:19 +0000
@@ -1,1 +1,1 @@
-1.0
+3.0 (quilt)