Package: c-icap-modules
Version: 1:0.3.1-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu trusty ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following:
* 0002-Implicit-declaration.patch: Replace strcasestr() with ci_strcasestr()
* debian/{control,rules}: Builddep on and use dh-autoreconf for new ports.
Due to a thinko in virus_scan_vir.c, it ends up implicitly declaring
strcasestr(), when it should have used the wrapped ci_strcasestr(). The
attached path fixes this.
While you're at it, you may as well take the other part of the patch,
which adds dh-autoreconf, and future-proofs your package for new ports,
such as ppc64el.
... Adam
-- System Information:
Debian Release: wheezy/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty'), (500, 'saucy-updates')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.13.0-0-generic (SMP w/4 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru c-icap-modules-0.3.1/debian/changelog c-icap-modules-0.3.1/debian/changelog
diff -Nru c-icap-modules-0.3.1/debian/control c-icap-modules-0.3.1/debian/control
--- c-icap-modules-0.3.1/debian/control 2013-12-21 02:37:38.000000000 -0700
+++ c-icap-modules-0.3.1/debian/control 2013-12-21 14:11:28.000000000 -0700
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Tim Weippert <we...@weiti.org>
Uploaders: Jochen Friedrich <joc...@debian.org>, Mathieu Parent <sath...@debian.org>
-Build-Depends: debhelper (>= 9~), autotools-dev, libicapapi-dev (>=1:0.3.1~), libclamav-dev, libltdl-dev | libltdl3-dev, libdb-dev
+Build-Depends: debhelper (>= 9~), autotools-dev, libicapapi-dev (>=1:0.3.1~), libclamav-dev, libltdl-dev | libltdl3-dev, libdb-dev, dh-autoreconf
Standards-Version: 3.9.4
Homepage: http://c-icap.sourceforge.net/
diff -Nru c-icap-modules-0.3.1/debian/patches/0002-Implicit-declaration.patch c-icap-modules-0.3.1/debian/patches/0002-Implicit-declaration.patch
--- c-icap-modules-0.3.1/debian/patches/0002-Implicit-declaration.patch 1969-12-31 17:00:00.000000000 -0700
+++ c-icap-modules-0.3.1/debian/patches/0002-Implicit-declaration.patch 2013-12-21 13:51:56.000000000 -0700
@@ -0,0 +1,14 @@
+Description: Use ci_strcasestr() instead of strcasestr()
+Author: Adam Conrad <adcon...@ubuntu.com>
+
+--- c-icap-modules-0.3.1.orig/services/virus_scan/virus_scan_vir.c
++++ c-icap-modules-0.3.1/services/virus_scan/virus_scan_vir.c
+@@ -197,7 +197,7 @@
+ int namelen;
+
+ content_disposition = ci_http_response_get_header(req, "Content-Disposition");
+- if (content_disposition && (filename = strcasestr(content_disposition, "filename="))) {
++ if (content_disposition && (filename = ci_strcasestr(content_disposition, "filename="))) {
+ filename = filename + 9;
+ if ((str = strrchr(filename, '/'))) {
+ filename = str + 1;
diff -Nru c-icap-modules-0.3.1/debian/patches/series c-icap-modules-0.3.1/debian/patches/series
--- c-icap-modules-0.3.1/debian/patches/series 2013-12-21 02:37:38.000000000 -0700
+++ c-icap-modules-0.3.1/debian/patches/series 2013-12-21 12:30:36.000000000 -0700
@@ -1 +1,2 @@
0001-Fix-manpage.patch
+0002-Implicit-declaration.patch
diff -Nru c-icap-modules-0.3.1/debian/rules c-icap-modules-0.3.1/debian/rules
--- c-icap-modules-0.3.1/debian/rules 2013-12-21 02:37:38.000000000 -0700
+++ c-icap-modules-0.3.1/debian/rules 2013-12-21 12:41:32.000000000 -0700
@@ -10,7 +10,7 @@
export DEB_BUILD_MAINT_OPTIONS := hardening=+bindnow
%:
- dh $@
+ dh $@ --with autoreconf
override_dh_auto_configure:
dh_auto_configure -- \
