[pkg-lighttpd] r545 - in lighttpd/trunk/debian: . patches

Arno Töll atoell-guest at alioth.debian.org
Mon Jul 4 00:03:25 UTC 2011


Author: atoell-guest
Date: 2011-07-04 00:03:25 +0000 (Mon, 04 Jul 2011)
New Revision: 545

Removed:
   lighttpd/trunk/debian/patches/silence-errors.diff
   lighttpd/trunk/debian/patches/ssl-fix.patch
Modified:
   lighttpd/trunk/debian/changelog
   lighttpd/trunk/debian/patches/series
Log:
Remove patches merged upstream

Modified: lighttpd/trunk/debian/changelog
===================================================================
--- lighttpd/trunk/debian/changelog	2011-07-03 23:55:35 UTC (rev 544)
+++ lighttpd/trunk/debian/changelog	2011-07-04 00:03:25 UTC (rev 545)
@@ -3,8 +3,11 @@
   * New upstream release
   * Fix "lighty-enable-mod should return non-zero on fail" Update script to
     leave with appropriate exit status (Closes: #629638)
+  * Remove the following patches:
+    + silence-errors.diff - applied upstream
+    + patches/ssl-fix.patch - applied upstream
 
- -- Arno Töll <debian at toell.net>  Sun, 12 Jun 2011 23:04:36 +0200
+ -- Arno Töll <debian at toell.net>  Mon, 04 Jul 2011 02:00:13 +0200
 
 lighttpd (1.4.28-5) unstable; urgency=low
 

Modified: lighttpd/trunk/debian/patches/series
===================================================================
--- lighttpd/trunk/debian/patches/series	2011-07-03 23:55:35 UTC (rev 544)
+++ lighttpd/trunk/debian/patches/series	2011-07-04 00:03:25 UTC (rev 545)
@@ -1,2 +1 @@
-silence-errors.diff
 ssl-fix.patch

Deleted: lighttpd/trunk/debian/patches/silence-errors.diff
===================================================================
--- lighttpd/trunk/debian/patches/silence-errors.diff	2011-07-03 23:55:35 UTC (rev 544)
+++ lighttpd/trunk/debian/patches/silence-errors.diff	2011-07-04 00:03:25 UTC (rev 545)
@@ -1,18 +0,0 @@
-From http://redmine.lighttpd.net/projects/lighttpd/repository/revisions/2771
-Subject: Silence annoying "connection closed: poll() -> ERR" error.log message (fixes #2257)
-Upstream bug report: http://redmine.lighttpd.net/issues/2257
-
-Index: trunk/src/connections.c
-===================================================================
---- trunk.orig/src/connections.c	2010-11-08 18:06:48.000000000 +0100
-+++ trunk/src/connections.c	2010-11-08 18:07:59.000000000 +0100
-@@ -1224,7 +1224,8 @@
- 
- 			}
- 		} else if (revents & FDEVENT_ERR) {
--#ifndef USE_LINUX_SIGIO
-+			/* error, connection reset, whatever... we don't want to spam the logfile */
-+#if 0
- 			log_error_write(srv, __FILE__, __LINE__, "sd",
- 					"connection closed: poll() -> ERR", con->fd);
- #endif

Deleted: lighttpd/trunk/debian/patches/ssl-fix.patch
===================================================================
--- lighttpd/trunk/debian/patches/ssl-fix.patch	2011-07-03 23:55:35 UTC (rev 544)
+++ lighttpd/trunk/debian/patches/ssl-fix.patch	2011-07-04 00:03:25 UTC (rev 545)
@@ -1,203 +0,0 @@
-From: Arno Töll <debian at toell.net>
-Subject: Fix #622733 by avoiding name clashes between OpenSSL 
-  and Lighty's MD5 implementation.
-
-* src/md5.{h,c}: prefix MD5 related functions with li_*
-* other files: adapt to API changes
-
-This patch is backported from upstream commits 2788 and 2791 but left some
-minor parts untouched, as changes do not apply to our version of Lighttpd
-i.e. commit 2789, and modifications of the NEWS file. 
-
-Moreover this patch may be removed for 1.4.29 as soon as that version is released. 
-
-Origin: upstream, http://redmine.lighttpd.net/projects/lighttpd/repository/revisions/2788, http://redmine.lighttpd.net/projects/lighttpd/repository/revisions/2791
-Bug: http://redmine.lighttpd.net/issues/2269
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622733
-
---- a/src/http_auth.c
-+++ b/src/http_auth.c
-@@ -32,6 +32,12 @@
- # include <openssl/md5.h>
- #else
- # include "md5.h"
-+
-+typedef li_MD5_CTX MD5_CTX;
-+#define MD5_Init li_MD5_Init
-+#define MD5_Update li_MD5_Update
-+#define MD5_Final li_MD5_Final
-+
- #endif
- 
- /**
---- a/src/http_auth_digest.c
-+++ b/src/http_auth_digest.c
-@@ -6,6 +6,12 @@
- 
- #ifndef USE_OPENSSL
- # include "md5.h"
-+
-+typedef li_MD5_CTX MD5_CTX;
-+#define MD5_Init li_MD5_Init
-+#define MD5_Update li_MD5_Update
-+#define MD5_Final li_MD5_Final
-+
- #endif
- 
- void CvtHex(IN HASH Bin, OUT HASHHEX Hex) {
---- a/src/md5.c
-+++ b/src/md5.c
-@@ -52,7 +52,7 @@
- #define S43 15
- #define S44 21
- 
--static void MD5Transform (UINT4 [4], const unsigned char [64]);
-+static void li_MD5Transform (UINT4 [4], const unsigned char [64]);
- static void Encode (unsigned char *, UINT4 *, unsigned int);
- static void Decode (UINT4 *, const unsigned char *, unsigned int);
- 
-@@ -110,8 +110,8 @@
- 
- /* MD5 initialization. Begins an MD5 operation, writing a new context.
-  */
--void MD5_Init (context)
--MD5_CTX *context;                                        /* context */
-+void li_MD5_Init (context)
-+li_MD5_CTX *context;                                        /* context */
- {
-   context->count[0] = context->count[1] = 0;
-   /* Load magic initialization constants.
-@@ -126,8 +126,8 @@
-   operation, processing another message block, and updating the
-   context.
-  */
--void MD5_Update (context, _input, inputLen)
--MD5_CTX *context;                                        /* context */
-+void li_MD5_Update (context, _input, inputLen)
-+li_MD5_CTX *context;                                        /* context */
- const void *_input;                                /* input block */
- unsigned int inputLen;                     /* length of input block */
- {
-@@ -151,10 +151,10 @@
-   if (inputLen >= partLen) {
-  MD5_memcpy
-    ((POINTER)&context->buffer[ndx], (POINTER)input, partLen);
-- MD5Transform (context->state, context->buffer);
-+ li_MD5Transform (context->state, context->buffer);
- 
-  for (i = partLen; i + 63 < inputLen; i += 64)
--   MD5Transform (context->state, &input[i]);
-+   li_MD5Transform (context->state, &input[i]);
- 
-  ndx = 0;
-   }
-@@ -170,9 +170,9 @@
- /* MD5 finalization. Ends an MD5 message-digest operation, writing the
-   the message digest and zeroizing the context.
-  */
--void MD5_Final (digest, context)
-+void li_MD5_Final (digest, context)
- unsigned char digest[16];                         /* message digest */
--MD5_CTX *context;                                       /* context */
-+li_MD5_CTX *context;                                       /* context */
- {
-   unsigned char bits[8];
-   unsigned int ndx, padLen;
-@@ -184,10 +184,10 @@
- */
-   ndx = (unsigned int)((context->count[0] >> 3) & 0x3f);
-   padLen = (ndx < 56) ? (56 - ndx) : (120 - ndx);
--  MD5_Update (context, PADDING, padLen);
-+  li_MD5_Update (context, PADDING, padLen);
- 
-   /* Append length (before padding) */
--  MD5_Update (context, bits, 8);
-+  li_MD5_Update (context, bits, 8);
- 
-   /* Store state in digest */
-   Encode (digest, context->state, 16);
-@@ -199,7 +199,7 @@
- 
- /* MD5 basic transformation. Transforms state based on block.
-  */
--static void MD5Transform (state, block)
-+static void li_MD5Transform (state, block)
- UINT4 state[4];
- const unsigned char block[64];
- {
---- a/src/md5.h
-+++ b/src/md5.h
-@@ -39,9 +39,9 @@
-   UINT4 state[4];                                   /* state (ABCD) */
-   UINT4 count[2];        /* number of bits, modulo 2^64 (lsb first) */
-   unsigned char buffer[64];                         /* input buffer */
--} MD5_CTX;
-+} li_MD5_CTX;
- 
--void MD5_Init (MD5_CTX *);
--void MD5_Update (MD5_CTX *, const void *, unsigned int);
--void MD5_Final (unsigned char [16], MD5_CTX *);
-+void li_MD5_Init (li_MD5_CTX *);
-+void li_MD5_Update (li_MD5_CTX *, const void *, unsigned int);
-+void li_MD5_Final (unsigned char [16], li_MD5_CTX *);
- 
---- a/src/mod_cml_funcs.c
-+++ b/src/mod_cml_funcs.c
-@@ -21,6 +21,12 @@
- # include <openssl/md5.h>
- #else
- # include "md5.h"
-+
-+typedef li_MD5_CTX MD5_CTX;
-+#define MD5_Init li_MD5_Init
-+#define MD5_Update li_MD5_Update
-+#define MD5_Final li_MD5_Final
-+
- #endif
- 
- #define HASHLEN 16
---- a/src/mod_cml_lua.c
-+++ b/src/mod_cml_lua.c
-@@ -15,6 +15,12 @@
- # include <openssl/md5.h>
- #else
- # include "md5.h"
-+
-+typedef li_MD5_CTX MD5_CTX;
-+#define MD5_Init li_MD5_Init
-+#define MD5_Update li_MD5_Update
-+#define MD5_Final li_MD5_Final
-+
- #endif
- 
- #define HASHLEN 16
---- a/src/mod_secure_download.c
-+++ b/src/mod_secure_download.c
-@@ -12,6 +12,12 @@
- # include <openssl/md5.h>
- #else
- # include "md5.h"
-+
-+typedef li_MD5_CTX MD5_CTX;
-+#define MD5_Init li_MD5_Init
-+#define MD5_Update li_MD5_Update
-+#define MD5_Final li_MD5_Final
-+
- #endif
- 
- #define HASHLEN 16
---- a/src/mod_usertrack.c
-+++ b/src/mod_usertrack.c
-@@ -12,6 +12,12 @@
- # include <openssl/md5.h>
- #else
- # include "md5.h"
-+
-+typedef li_MD5_CTX MD5_CTX;
-+#define MD5_Init li_MD5_Init
-+#define MD5_Update li_MD5_Update
-+#define MD5_Final li_MD5_Final
-+
- #endif
- 
- /* plugin config for all request/connections */




More information about the pkg-lighttpd-maintainers mailing list