[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. ad908674c2ee9d57f44d2b846c3885281e7aacc0

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit ad908674c2ee9d57f44d2b846c3885281e7aacc0
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Feb 13 16:55:42 2012 +0100

    max line length is 128k now, no need for this patch anymore

diff --git a/debian/patches/052_logresolve_linelength b/debian/patches/052_logresolve_linelength
deleted file mode 100755
index 74664d3..0000000
--- a/debian/patches/052_logresolve_linelength
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 052_logresolve_linelength.dpatch by Stefan Fritsch <sf at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: remove limit of 1024 bytes per line #331631
-
- at DPATCH@
---- a/support/logresolve.c
-+++ b/support/logresolve.c
-@@ -82,7 +82,7 @@
- #endif
- 
- static void cgethost(struct in_addr ipnum, char *string, int check);
--static int get_line(char *s, int n);
-+static int get_line();
- static void stats(FILE *output);
- 
- #ifdef BEOS
-@@ -90,11 +90,6 @@
- #endif
- 
- 
--/* maximum line length */
--#ifndef MAXLINE
--#define MAXLINE 1024
--#endif
--
- /* maximum length of a domain name */
- #ifndef MAXDNAME
- #define MAXDNAME 256
-@@ -141,6 +136,8 @@
- static int resolves = 0;
- static int withname = 0;
- static int errors[MAX_ERR + 3];
-+static size_t maxline=0;
-+static char *line = NULL;
- 
- /*
-  * cgethost - gets hostname by IP address, caching, and adding unresolvable
-@@ -287,14 +284,15 @@
-  * gets a line from stdin
-  */
- 
--static int get_line (char *s, int n)
-+static int get_line ()
- {
-+    ssize_t len;
-     char *cp;
- 
--    if (!fgets(s, n, stdin))
-+    if ( (len = getline(&line, &maxline, stdin)) == -1 )
-         return (0);
--    cp = strchr(s, '\n');
--    if (cp)
-+    cp = line + len -1;
-+    if (*cp == '\n')
-         *cp = '\0';
-     return (1);
- }
-@@ -302,7 +300,7 @@
- int main (int argc, char *argv[])
- {
-     struct in_addr ipnum;
--    char *bar, hoststring[MAXDNAME + 1], line[MAXLINE], *statfile;
-+    char *bar, hoststring[MAXDNAME + 1], *statfile;
-     int i, check;
- 
- #if defined(WIN32) || (defined(NETWARE) && defined(USE_WINSOCK))
-@@ -337,7 +335,7 @@
-     for (i = 0; i < MAX_ERR + 2; i++)
-         errors[i] = 0;
- 
--    while (get_line(line, MAXLINE)) {
-+    while (get_line()) {
-         if (line[0] == '\0')
-             continue;
-         entries++;
diff --git a/debian/patches/series b/debian/patches/series
index e62c565..e21cd2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@
 #033_dbm_read_hash_or_btree
 #034_apxs2_libtool_fixtastic
 #038_no_LD_LIBRARY_PATH
-#052_logresolve_linelength
 #058_suexec-CVE-2007-1742
 #076_apxs2_a2enmod
 #099_config_guess_sub_update

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)