Package: apache Version: 1.3.31-6 Tags: patch Made some changes to allow build on Hurd, patch follows. WARNING: This patch is not sufficient to build correctly because dpkg-gencontrol is buggy (see #274677). When dpkg-dev is patched (provided with bugreport), apache is building perfectly. Working packages can be found here : http://debian.duckcorp.org/
diff -Nur apache-1.3.31_old/debian/changelog apache-1.3.31/debian/changelog --- apache-1.3.31_old/debian/changelog 2004-10-03 19:52:12.000000000 +0200 +++ apache-1.3.31/debian/changelog 2004-10-03 19:54:49.000000000 +0200 @@ -1,3 +1,13 @@ +apache (1.3.31-6.1) unstable; urgency=low + + * Rebuild on GNU/Hurd. + * Disabled experimental modules on GNU/Hurd. + * Added explicit link with libpthread. + * Modified '012_hurd_compile_fix_for_upstream' to select fcntl + serialized accept method on Hurd. + + -- Marc Dequènes (Duck) <Duck@DuckCorp.org> Sun, 3 Oct 2004 00:40:53 +0200 + apache (1.3.31-6) unstable; urgency=medium * (Fabio M. Di Nitto) diff -Nur apache-1.3.31_old/debian/patches/012_hurd_compile_fix_for_upstream apache-1.3.31/debian/patches/012_hurd_compile_fix_for_upstream --- apache-1.3.31_old/debian/patches/012_hurd_compile_fix_for_upstream 2004-10-03 19:52:05.000000000 +0200 +++ apache-1.3.31/debian/patches/012_hurd_compile_fix_for_upstream 2004-10-03 00:37:56.000000000 +0200 @@ -1,9 +1,8 @@ -diff -ruN -x Makefile.in -x configure -x *~ -x apache_1.3.20.orig apache_1.3.20.orig/src/include/ap_config.h apache_1.3.20/src/include/ap_config.h ---- build-tree/apache_1.3.31/src/include/ap_config.h Thu Apr 5 20:13:11 2001 -+++ build-tree/apache_1.3.31/src/include/ap_config.h Tue Jun 12 12:53:24 2001 -@@ -503,6 +503,13 @@ - typedef int rlim_t; +--- build-tree-apache/apache_1.3.31/src/include/ap_config.h.orig 2004-03-29 19:33:52.000000000 +0200 ++++ build-tree-apache/apache_1.3.31/src/include/ap_config.h 2004-10-02 19:19:25.000000000 +0200 +@@ -488,6 +488,14 @@ #endif + #define AP_ENABLE_EXCEPTION_HOOK +#elif defined(HURD) +#define HAVE_SYSLOG 1 @@ -11,6 +10,7 @@ +#define USE_MMAP_FILES 1 +#define USE_MMAP_SCOREBOARD 1 +#include <sys/time.h> ++#define HAVE_FCNTL_SERIALIZED_ACCEPT + #elif defined(SCO) #undef HAVE_GMTOFF diff -Nur apache-1.3.31_old/debian/rules apache-1.3.31/debian/rules --- apache-1.3.31_old/debian/rules 2004-10-03 19:52:16.000000000 +0200 +++ apache-1.3.31/debian/rules 2004-09-29 02:21:30.000000000 +0200 @@ -45,6 +45,8 @@ PERL := /usr/bin/perl LIBPERL := -lperl +DEB_ARCH = $(shell dpkg --print-architecture) + # Build *FLAGS EXTRA_CONFARGS = @@ -129,7 +131,7 @@ $(STAMP_DIR)/configure-stamp-apache: $(STAMP_DIR)/source.make @echo -e "\n\n*** Configuring apache ***\n\n" - cd $(V) && LDFLAGS="$(LDFLAGS)" CFLAGS="$(CONFLAGS)" ./configure $(APACHEARGS) + cd $(V) && LDFLAGS="$(LDFLAGS) -lpthread" CFLAGS="$(CONFLAGS)" ./configure $(APACHEARGS) @echo -e "\n\n*** Creating apaci (apache) *** \n\n" @@ -169,7 +171,7 @@ $(STAMP_DIR)/configure-stamp-ssl: $(STAMP_DIR)/source.make @echo -e "\n\n*** Configuring apache-ssl ***\n\n" - cd $(S) && LDFLAGS="$(LDFLAGS)" CFLAGS="$(CONFLAGS)" ./configure $(SSLARGS) + cd $(S) && LDFLAGS="$(LDFLAGS) -lpthread" CFLAGS="$(CONFLAGS)" ./configure $(SSLARGS) @echo -e "\n\n*** Creating apaci (apache-ssl) *** \n\n" @@ -218,7 +220,7 @@ PERL_TRACE=0 PERL_LOG_API=1 PERL_URI_API=1 PERL_UTIL_API=1 \ PERL_TABLE_API=1 PERL_FILE_API=1 - cd $(P) && LDFLAGS="$(LDFLAGS)" CFLAGS="$(CONFLAGS)" ./configure $(PERLARGS) + cd $(P) && LDFLAGS="$(LDFLAGS) -lpthread" CFLAGS="$(CONFLAGS)" ./configure $(PERLARGS) @echo -e "\n\n*** Creating apaci (apache-perl) *** \n\n" @@ -280,11 +282,14 @@ @echo -e "\n\n*** Compiling apache daemon and modules ***\n\n" cd $(V) && $(MAKE) - @echo -e "\n\n*** Compiling experimental modules ***\n\n" - export APXS=$(CURDIR)/debian/local-apxs && \ - cd $(V)/src/modules/experimental/ && \ - $$APXS -c mod_backtrace.c && \ - $$APXS -c -I$(CURDIR)/$(V)/src/main/ mod_whatkilledus.c + if [[ "$(DEB_ARCH)" != "hurd-i386" ]]; \ + then \ + @echo -e "\n\n*** Compiling experimental modules ***\n\n" \ + export APXS=$(CURDIR)/debian/local-apxs && \ + cd $(V)/src/modules/experimental/ && \ + $$APXS -c mod_backtrace.c && \ + $$APXS -c -I$(CURDIR)/$(V)/src/main/ mod_whatkilledus.c; \ + fi @echo -e "\n\n*** Compiling contrib modules ***\n\n" cd $(C) && $(MAKE) APXS=$(CURDIR)/debian/local-apxs
-- Marc Dequènes (Duck)
Attachment:
pgp3qsRSdaX_D.pgp
Description: PGP signature