Apache 1.x is no longer supported.

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6062 33e552b5-05e3-0310-8538-816dae2090ed

4 files changed, 0 insertions, 223 deletions

diff --git a/patches/apache_1.3.36/generic/apache_1.3.36-cross.diff b/patches/apache_1.3.36/generic/apache_1.3.36-cross.diff
deleted file mode 100644
index dd583454d..000000000
--- a/patches/apache_1.3.36/generic/apache_1.3.36-cross.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: src/main/Makefile.tmpl
-===================================================================
---- a/src/main/Makefile.tmpl.orig
-+++ b/src/main/Makefile.tmpl
-@@ -32,14 +32,14 @@ distclean: clean
- uri_delims.h: gen_uri_delims
- 	./gen_uri_delims >uri_delims.h
- 
--gen_uri_delims: gen_uri_delims.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -o gen_uri_delims gen_uri_delims.o $(LIBS)
-+gen_uri_delims: gen_uri_delims.c
-+	$(CC_FOR_BUILD) -I../os/unix -I../include -o gen_uri_delims gen_uri_delims.c $(LIBS)
- 
- test_char.h: gen_test_char
- 	./gen_test_char >test_char.h
- 
--gen_test_char: gen_test_char.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -o gen_test_char gen_test_char.o $(LIBS)
-+gen_test_char: gen_test_char.c
-+	$(CC_FOR_BUILD)  -I../os/unix -I../include -o gen_test_char gen_test_char.c $(LIBS)
- 
- # We really don't expect end users to use this rule.  It works only with
- # gcc, and rebuilds Makefile.tmpl.  You have to re-run Configure after
-Index: src/support/apxs.pl
-===================================================================
---- a/src/support/apxs.pl.orig
-+++ b/src/support/apxs.pl
-@@ -190,13 +190,13 @@ if (not -x "$CFG_SBINDIR/$CFG_TARGET") {
-     print STDERR "apxs:Error: $CFG_SBINDIR/$CFG_TARGET not found or not executable\n";
-     exit(1);
- }
--if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
--    print STDERR "apxs:Error: Sorry, no DSO support for Apache available\n";
--    print STDERR "apxs:Error: under your platform. Make sure the Apache\n";
--    print STDERR "apxs:Error: module mod_so is compiled into your server\n";
--    print STDERR "apxs:Error: binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
--    exit(1);
--}
-+#if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
-+#    print STDERR "apxs:Error: Sorry, no DSO support for Apache available\n";
-+#    print STDERR "apxs:Error: under your platform. Make sure the Apache\n";
-+#    print STDERR "apxs:Error: module mod_so is compiled into your server\n";
-+#    print STDERR "apxs:Error: binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
-+#    exit(1);
-+#}
- }
- 
- ##
diff --git a/rules/apache.in b/rules/apache.in
deleted file mode 100644
index ad2bf406e..000000000
--- a/rules/apache.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# Apache 1 configuration
-
-config APACHE
-	bool
-	prompt "Apache 1 HTTP Server"
-	select EXPAT
-	help
-	  Apache is a versatile, high-performance HTTP server.
-	  The most popular server in the world, Apache features 
-	  a modular design and supports dynamic selection of 
-	  extension modules at runtime.
-	  Some of its strong points are its range of possible 
-	  customization, dynamic adjustment of the number of server 
-	  processes, and a whole range of available modules 
-	  including many authentication mechanisms, server-parsed 
-	  HTML, server-side includes, access control, CERN httpd
-	  metafiles emulation, proxy caching, etc.  
-	  Apache also supports multiple virtual homing.
-
-	  Website: http://www.apache.org
-
-	  There is also a "next generation" Version, called Apache2
diff --git a/rules/apache.make b/rules/apache.make
deleted file mode 100644
index 6402ad08c..000000000
--- a/rules/apache.make
+++ /dev/null
@@ -1,152 +0,0 @@
-# -*-makefile-*-
-# $Id: apache.make,v 1.5 2005/04/29 09:54:22 michl Exp $
-#
-# Copyright (C) 2005 by Jiri Nesladek
-#          
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_APACHE) += apache
-
-#
-# Paths and names
-#
-APACHE_VERSION		= 1.3.36
-APACHE			= apache_$(APACHE_VERSION)
-APACHE_SUFFIX		= tar.gz
-APACHE_URL		= http://mirror.styx.cz/apache/httpd/$(APACHE).$(APACHE_SUFFIX)
-APACHE_PATCH_URL	= file://$(LOCALPATCHDIR)
-APACHE_SOURCE		= $(SRCDIR)/$(APACHE).$(APACHE_SUFFIX)
-APACHE_DIR		= $(BUILDDIR)/$(APACHE)
-
-
-# ----------------------------------------------------------------------------
-# Get
-# ----------------------------------------------------------------------------
-
-apache_get: $(STATEDIR)/apache.get
-
-$(STATEDIR)/apache.get: $(apache_get_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-$(APACHE_SOURCE):
-	@$(call targetinfo, $@)
-	@$(call get, APACHE)
-
-# ----------------------------------------------------------------------------
-# Extract
-# ----------------------------------------------------------------------------
-
-apache_extract: $(STATEDIR)/apache.extract
-
-$(STATEDIR)/apache.extract: $(apache_extract_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(APACHE_DIR))
-	@$(call extract, APACHE)
-	@$(call patchin, APACHE)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-apache_prepare: $(STATEDIR)/apache.prepare
-
-APACHE_PATH = PATH=$(CROSS_PATH)
-APACHE_ENV = \
-	$(CROSS_ENV) \
-	apr_cv_process_shared_works=yes \
-	ac_cv_sizeof_size_t=4 \
-	ac_cv_sizeof_ssize_t=4 
-#
-# autoconf
-#	
-# FIXME: RSC: add more config options 
-#
-APACHE_AUTOCONF = \
-	--disable-module=access \
-	--disable-module=asis \
-	--disable-module=autoindex \
-	--disable-module=userdir \
-	--disable-module=include \
-	--disable-module=log_config \
-	--disable-module=negotiation \
-	--disable-module=setenvif \
-	--disable-module=status \
-	--disable-module=env \
-	--enable-module=so
-
-APACHE_MAKEVARS = \
-	root=$(SYSROOT)
-
-$(STATEDIR)/apache.prepare: $(apache_prepare_deps_default)
-	@$(call targetinfo, $@)
-	@$(call clean, $(APACHE_DIR)/config.cache)
-	cd $(APACHE_DIR) && \
-		$(APACHE_PATH) $(APACHE_ENV) \
-		./configure $(APACHE_AUTOCONF)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-apache_compile: $(STATEDIR)/apache.compile
-
-$(STATEDIR)/apache.compile: $(apache_compile_deps_default)
-	@$(call targetinfo, $@)
-	cd $(APACHE_DIR) && $(APACHE_ENV) $(APACHE_PATH) make $(APACHE_MAKEVARS)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-apache_install: $(STATEDIR)/apache.install
-
-$(STATEDIR)/apache.install: $(apache_install_deps_default)
-	@$(call targetinfo, $@)
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-apache_targetinstall: $(STATEDIR)/apache.targetinstall
-
-$(STATEDIR)/apache.targetinstall: $(apache_targetinstall_deps_default)
-	@$(call targetinfo, $@)
-
-	@$(call install_init, apache)
-	@$(call install_fixup, apache,PACKAGE,apache)
-	@$(call install_fixup, apache,PRIORITY,optional)
-	@$(call install_fixup, apache,VERSION,$(APACHE_VERSION))
-	@$(call install_fixup, apache,SECTION,base)
-	@$(call install_fixup, apache,AUTHOR,"Jiri Nesladek <nesladek\@2n.cz>")
-	@$(call install_fixup, apache,DEPENDS,)
-	@$(call install_fixup, apache,DESCRIPTION,missing)
-
-	@$(call install_copy, apache, 0, 0, 0755, /usr/lib/apache)
-	@$(call install_copy, apache, 0, 0, 0755, $(APACHE_DIR)/src/httpd, /usr/sbin/httpd)
-
-	@$(call install_finish, apache)
-
-	@$(call touch, $@)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-apache_clean:
-	rm -rf $(STATEDIR)/apache.*
-	rm -rf $(IMAGEDIR)/apache_*
-	rm -rf $(APACHE_DIR)
-
-# vim: syntax=make
diff --git a/rules/networking.in b/rules/networking.in
index 9211d020f..329858b1b 100644
--- a/rules/networking.in
+++ b/rules/networking.in
@@ -18,7 +18,6 @@ source "rules/shorewall.in"
 comment "Networking Apps"
 ##############################################################################
 
-source "rules/apache.in"
 source "rules/apache2.in"
 source "rules/betaftpd.in"
 source "rules/bind.in"