[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#210931: apache: 001_SSLpatch patches ap_config.h.orig



Package: apache
Version: 1.3.27.1-3
Severity: wishlist

I set the severity to wishlist because I am not sure this is a bug. If not, please just close it.

apache-1.3.27.1/debian/patches/ssl/001_SSLpatch contains the following hunk, which seems to have originated from Bug#100296:
diff -Naurd build-tree-ssl.ORIG/apache_1.3.27/src/include/ap_config.h.orig build-tree-ssl/apache_1.3.27/src/include/ap_config.h.orig
--- build-tree-ssl.ORIG/apache_1.3.27/src/include/ap_config.h.orig	2002-09-10 19:01:14.000000000 +0200
+++ build-tree-ssl/apache_1.3.27/src/include/ap_config.h.orig	2003-05-14 21:36:39.000000000 +0200
@@ -518,6 +518,13 @@
 typedef int rlim_t;
 #endif
 
+#elif defined(HURD)
+#define HAVE_SYSLOG 1
+#define HAVE_MMAP 1
+#define USE_MMAP_FILES 1
+#define USE_MMAP_SCOREBOARD 1
+#include <sys/time.h>
+
 #elif defined(SCO)
 #undef HAVE_GMTOFF
 #undef NO_KILLPG

ap_config.h.orig is not included in the upstream tarballs; it is generated as a backup file when ap_config.h is patched. Thus, I wonder whether the patched ap_config.h.orig will actually be used at all. Should the hunk perhaps be changing ap_config.h instead?

I noticed this because my VERSION_CONTROL=numbered environment variable caused the backup to be saved as ap_config.h.~1~, so that ap_config.h.orig couldn't be patched and the build failed.

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux Astalo 2.4.21-kon.astalo.1 #1 la elokuun 23. 01:05:31 EEST 2003 i686
Locale: LANG=fi_FI.UTF-8@euro, LC_CTYPE=fi_FI.UTF-8@euro

Reply to: