[SCM] Debian packaging for apache2 branch, master, updated. debian/2.4.4-2-121-gdf90ce1

[Arno Töll]

The following commit has been merged in the master branch:
commit df90ce17d222d486e5fb284fc3e85882221f785a
Author: Arno Töll <arno at debian.org>
Date:   Fri Jun 7 18:28:46 2013 +0200

    Allow strtoul in httpd.h

diff --git a/debian/changelog b/debian/changelog
index d2485bf..85a35c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,8 +34,10 @@ apache2 (2.4.4-6) UNRELEASED; urgency=low
     accident added by debhelper since we are linking docs. We do to
     apache2-bin instead (Closes: #711127)
   * Refresh "upstream-fixes" patch
+  * Fix "Disabling strtoul violates C89 and C99 and is unnecessary" by
+    removing the symbol override in httpd.h(Closes: #711534)
 
- -- Arno Töll <arno at debian.org>  Fri, 07 Jun 2013 18:22:10 +0200
+ -- Arno Töll <arno at debian.org>  Fri, 07 Jun 2013 18:28:00 +0200
 
 apache2 (2.4.4-5) unstable; urgency=low
 
diff --git a/debian/patches/allow-strtoul.patch b/debian/patches/allow-strtoul.patch
new file mode 100644
index 0000000..eadfea6
--- /dev/null
+++ b/debian/patches/allow-strtoul.patch
@@ -0,0 +1,24 @@
+From: Arno Töll <arno at debian.org>
+Subject: Allow use of strtoul
+
+* include/httpd.h: allow usage of strtoul
+
+We are not sunos4, so we do have strtoul on all ports, especially since it's
+defined in C99.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711534
+--- a/include/httpd.h
++++ b/include/httpd.h
+@@ -2093,12 +2093,6 @@
+  */
+ AP_DECLARE(const char *) ap_psignature(const char *prefix, request_rec *r);
+ 
+-/** strtoul does not exist on sunos4. */
+-#ifdef strtoul
+-#undef strtoul
+-#endif
+-#define strtoul strtoul_is_not_a_portable_function_use_strtol_instead
+-
+   /* The C library has functions that allow const to be silently dropped ...
+      these macros detect the drop in maintainer mode, but use the native
+      methods for normal builds
diff --git a/debian/patches/series b/debian/patches/series
index d1a90bb..7ac3cd6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ itk-hook-just-after-merging-perdir-config.patch
 itk-fix-htaccess-reads-for-persistent-connections.patch
 itk-rerun-configure.patch
 upstream-fixes
+allow-strtoul.patch

-- 
Debian packaging for apache2