apache2: remove after on year in staging

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 4 insertions, 374 deletions

diff --git a/rules/apache2-bbinit.in b/rules/apache2-bbinit.in
deleted file mode 100644
index 74e1dcfab..000000000
--- a/rules/apache2-bbinit.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=initmethod_bbinit
-
-config APACHE2_BBINIT_LINK
-	string
-	depends on APACHE2_STARTSCRIPT
-	prompt "apache2"
-	default "S91apache2"
-
diff --git a/rules/apache2.in b/rules/apache2.in
deleted file mode 100644
index f8cd3855f..000000000
--- a/rules/apache2.in
+++ /dev/null
@@ -1,160 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=networking
-
-menuconfig APACHE2
-	tristate
-	prompt "apache 2 http server          "
-	select APR
-	select APR_UTIL
-	select HOST_APACHE2
-	select LIBC_M
-	select LIBC_RT
-	select LIBC_DL
-	select LIBC_NSL
-	select LIBC_CRYPT
-	select GCCLIBS_GCC_S
-	help
-	  Apache v2 is the next generation of the Apache web server.
-	  This version - a total rewrite - introduces many new
-	  improvements, such as threading, a new API, IPv6 support,
-	  request/response filtering, and more.
-
-	  STAGING: remove in ptxdist-2019.03.0
-	  Really old version that needs updating.
-
-if APACHE2
-
-comment "build options   ---"
-
-choice
-	prompt "Multi Process Model"
-
-	config APACHE2_MPM_PREFORK
-		bool "prefork"
-		help
-		  Multi Process Model with preforking (Apache 1.3)
-
-	config APACHE2_MPM_PERCHILD
-		bool "perchild"
-		help
-		  Multi Process Model with threading.
-		  Constant number of processes, variable number of threads,
-		  each child process can have a different uid/gid.
-
-	config APACHE2_MPM_WORKER
-		bool "worker"
-		help
-		  Multi Process model with threads.
-		  One acceptor thread, multiple worker threads.
-endchoice
-
-comment "runtime options   ---"
-
-config APACHE2_SERVERROOT
-	string
-	prompt "ServerRoot directory"
-	default "/usr/share/apache2"
-	help
-	  This directory defines apache's serverroot where the icons are
-	  located.
-
-config APACHE2_INSTALL_CONFIG
-	bool
-	default y
-	prompt "Install httpd.conf"
-	help
-	  Install a $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf from a selectable
-	  source.
-
-config APACHE2_LISTEN
-	depends on APACHE2_INSTALL_CONFIG
-	string
-	default "0.0.0.0:80"
-	prompt "LISTEN"
-	help
-	  LISTEN entry in httpd.conf; this entry must contain a server
-	  name or IP and a port, for example "0.0.0.0:80" to listen
-	  on all interfaces.
-
-config APACHE2_SERVERNAME
-	depends on APACHE2_INSTALL_CONFIG
-	string
-	default "localhost"
-	prompt "SERVERNAME"
-	help
-	  SERVERNAME entry in httpd.conf
-
-config APACHE2_SERVERADMIN
-	depends on APACHE2_INSTALL_CONFIG
-	string
-	default "foo\@bar"
-	prompt "SERVERADMIN"
-	help
-	  SERVERADMIN entry in httpd.conf
-
-comment "Directories   ---"
-
-config APACHE2_CONFIGDIR
-	string
-	default "/etc/apache2"
-	prompt "Config directory"
-	help
-	  Apache's configuration directory (httpd.conf, mime.types etc. are
-	  searched here).
-
-config APACHE2_LOGDIR
-	string
-	default "/var/log/apache2"
-	prompt "Logfile directory"
-	help
-	  Apache's logfile directory.
-
-config APACHE2_DOCUMENTROOT
-	string
-	default "/var/www"
-	prompt "DocumentRoot directory"
-	help
-	  Apache's docroot is very empty if you don't add some
-	  files. Later you can connect to your target, but you
-	  will see nothing special (only an very small html page
-	  is provided).
-
-config APACHE2_DEFAULT_INDEX
-	depends on APACHE2_DOCUMENTROOT != ""
-	bool
-	default y
-	prompt "Default index.html"
-	help
-	  Install a demo HTML file, from project/projectroot/var/www/index.html.
-
-comment "Misc   ---"
-
-config APACHE2_PUBLICDOMAINICONS
-	bool "Public Domain Icons"
-	depends on APACHE2_SERVERROOT != ""
-	default y
-	help
-          These icons were originally made for Mosaic for X and have been
-          included in the NCSA httpd and Apache server distributions in the
-          past. They are in the public domain and may be freely included in
-	  any application. The originals were done by Kevin Hughes
-          (kevinh@kevcom.com).
-
-config APACHE2_CUSTOMERRORS
-	bool "Multi Language Custom Error Documents"
-	depends on APACHE2_SERVERROOT != ""
-	default y
-	help
-	  Install HTTP error messages in multiple languages. If the preferred
-	  language of a client is available it is selected automatically via
-	  the MultiViews feature. This feature is enabled by default via the
-	  Options, Language and ErrorDocument directives.
-
-config APACHE2_STARTSCRIPT
-	bool
-	default y
-	prompt "install /etc/init.d/apache2"
-
-endif
-
diff --git a/rules/apache2.make b/rules/apache2.make
deleted file mode 100644
index 91df30033..000000000
--- a/rules/apache2.make
+++ /dev/null
@@ -1,203 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2005 by Robert Schwebel
-#               2009, 2012 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# 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_APACHE2) += apache2
-
-#
-# Paths and names
-#
-APACHE2_VERSION	:= 2.0.64
-APACHE2_MD5	:= 762e250a3b981ce666bc10e6748a1ac1
-APACHE2		:= httpd-$(APACHE2_VERSION)
-APACHE2_SUFFIX	:= tar.bz2
-APACHE2_URL	:= http://archive.apache.org/dist/httpd/$(APACHE2).$(APACHE2_SUFFIX)
-APACHE2_SOURCE	:= $(SRCDIR)/$(APACHE2).$(APACHE2_SUFFIX)
-APACHE2_DIR	:= $(BUILDDIR)/$(APACHE2)
-APACHE2_LICENSE	:= Apache-2.0
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-#
-# autoconf
-#
-APACHE2_CONF_TOOL := autoconf
-APACHE2_CONF_OPT := \
-	$(CROSS_AUTOCONF_USR) \
-	--includedir=/usr/include/apache2 \
-	--enable-so \
-	--with-apr=$(PTXDIST_SYSROOT_CROSS)/bin/apr-config \
-	--with-apr-util=$(PTXDIST_SYSROOT_CROSS)/bin/apu-config
-
-ifdef PTXCONF_APACHE2_MPM_PREFORK
-APACHE2_CONF_OPT += --with-mpm=prefork
-endif
-
-ifdef PTXCONF_APACHE2_MPM_PERCHILD
-APACHE2_CONF_OPT += --with-mpm=perchild
-endif
-
-ifdef PTXCONF_APACHE2_MPM_WORKER
-APACHE2_CONF_OPT += --with-mpm=worker
-endif
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/apache2.install.post:
-	@$(call targetinfo)
-	@$(call world/install.post, APACHE2)
-	sed -i -e "s~\([ =\"]\)\(/usr\)~\1$(PTXDIST_SYSROOT_TARGET)\2~g" \
-		$(PTXDIST_SYSROOT_TARGET)/usr/build/config.nice \
-		$(PTXDIST_SYSROOT_TARGET)/usr/bin/apxs
-	sed -i \
-		-e "/AP._BINDIR/s~\([ =\"]\)\(/usr\)~\1$(PTXDIST_SYSROOT_TARGET)\2~g" \
-		-e "/^includedir/s~= \(.*\)~= $(PTXDIST_SYSROOT_TARGET)\1~g" \
-		$(PTXDIST_SYSROOT_TARGET)/usr/build/config_vars.mk
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/apache2.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, apache2)
-	@$(call install_fixup, apache2,PRIORITY,optional)
-	@$(call install_fixup, apache2,SECTION,base)
-	@$(call install_fixup, apache2,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, apache2,DESCRIPTION,missing)
-
-	@$(call install_copy, apache2, 0, 0, 0755, \
-		$(APACHE2_PKGDIR)/usr/bin/httpd, /usr/sbin/apache2)
-
-ifneq ($(PTXCONF_APACHE2_SERVERROOT),"")
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_SERVERROOT))
-
-ifdef PTXCONF_APACHE2_PUBLICDOMAINICONS
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_SERVERROOT)/icons)
-	@cd $(APACHE2_PKGDIR)/usr/icons; \
-	for i in *.gif *.png; do \
-		$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/icons/$$i, \
-			$(PTXCONF_APACHE2_SERVERROOT)/icons/$$i); \
-	done
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_SERVERROOT)/icons/small)
-	@cd $(APACHE2_PKGDIR)/usr/icons/small; \
-	for i in *.gif *.png; do \
-		$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/icons/small/$$i, \
-			$(PTXCONF_APACHE2_SERVERROOT)/icons/small/$$i); \
-	done
-endif
-
-ifdef PTXCONF_APACHE2_CUSTOMERRORS
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_SERVERROOT)/error)
-	@cd $(APACHE2_PKGDIR)/usr/error; \
-	for i in *.html.var; do \
-		$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/error/$$i, \
-			$(PTXCONF_APACHE2_SERVERROOT)/error/$$i); \
-	done
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_SERVERROOT)/error/include)
-	@cd $(APACHE2_PKGDIR)/usr/error/include; \
-	for i in *.html; do \
-		$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/usr/error/include/$$i, \
-			$(PTXCONF_APACHE2_SERVERROOT)/error/include/$$i); \
-	done
-endif
-
-#
-# install some generic definitions into the directory where
-# the server's root is
-# -> mime.types: Definition of mime-type, their names and extensions
-# -> magic: Definitions to detect the mime-type without extensions
-#
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_SERVERROOT)/conf)
-	@$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/etc/magic, \
-		$(PTXCONF_APACHE2_SERVERROOT)/conf/magic)
-	@$(call install_copy, apache2, www, www, 0644, $(APACHE2_PKGDIR)/etc/mime.types, \
-		$(PTXCONF_APACHE2_SERVERROOT)/conf/mime.types)
-
-endif
-
-ifdef PTXCONF_APACHE2_DEFAULT_INDEX
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_DOCUMENTROOT))
-	@$(call install_copy, apache2, www, www, 0644, \
-		$(PTXDIST_TOPDIR)/projectroot/var/www/index.html, \
-		$(PTXCONF_APACHE2_DOCUMENTROOT)/index.html)
-endif
-
-ifneq ($(PTXCONF_APACHE2_CONFIGDIR), "")
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_CONFIGDIR))
-
-ifdef PTXCONF_APACHE2_INSTALL_CONFIG
-	@$(call install_alternative, apache2, www, www, 0644, \
-		/etc/apache2/httpd.conf,, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf)
-	@$(call install_replace, apache2, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
-		@SERVERROOT@, $(PTXCONF_APACHE2_SERVERROOT))
-	@$(call install_replace, apache2, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
-		@DOCUMENTROOT@, $(PTXCONF_APACHE2_DOCUMENTROOT))
-	@$(call install_replace, apache2, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
-		@CONFIGDIR@, $(PTXCONF_APACHE2_CONFIGDIR))
-	@$(call install_replace, apache2, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
-		@LOGPATH@, $(PTXCONF_APACHE2_LOGDIR))
-	@$(call install_replace, apache2, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
-		@PIDFILE@, /var/run/apache2.pid)
-	@$(call install_replace, apache2, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
-		@LISTEN@, $(PTXCONF_APACHE2_LISTEN))
-	@$(call install_replace, apache2, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
-		@SERVERADMIN@, $(PTXCONF_APACHE2_SERVERADMIN))
-	@$(call install_replace, apache2, $(PTXCONF_APACHE2_CONFIGDIR)/httpd.conf, \
-		@SERVERNAME@, $(PTXCONF_APACHE2_SERVERNAME))
-endif
-endif
-
-#	#
-#	# create the log dir if enabled
-#	#
-ifneq ($(PTXCONF_APACHE2_LOGDIR), "")
-	@$(call install_copy, apache2, www, www, 0755, $(PTXCONF_APACHE2_LOGDIR))
-endif
-
-#	#
-#	# busybox init: startscript
-#	#
-ifdef PTXCONF_INITMETHOD_BBINIT
-ifdef PTXCONF_APACHE2_STARTSCRIPT
-	@$(call install_alternative, apache2, 0, 0, 0755, /etc/init.d/apache2)
-
-	@$(call install_replace, apache2, /etc/init.d/apache2, \
-		@APACHECONFIG@, $(PTXCONF_APACHE2_CONFIGDIR))
-	@$(call install_replace, apache2, /etc/init.d/apache2, \
-		@LOGPATH@, $(PTXCONF_APACHE2_LOGDIR))
-
-ifneq ($(call remove_quotes, $(PTXCONF_APACHE2_BBINIT_LINK)),)
-	@$(call install_link, apache2, \
-		../init.d/apache2, \
-		/etc/rc.d/$(PTXCONF_APACHE2_BBINIT_LINK))
-endif
-endif
-endif
-
-ifdef PTXCONF_PRELINK
-	@$(call install_alternative, apache2, 0, 0, 0644, \
-		/etc/prelink.conf.d/apache2)
-endif
-
-	@$(call install_finish, apache2)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/rules/php5.in b/rules/php5.in
index cd191b96f..07dfa159e 100644
--- a/rules/php5.in
+++ b/rules/php5.in
@@ -4,7 +4,6 @@
 menuconfig PHP5
 	tristate
 	prompt "php5                          "
-	select APACHE2		if PHP5_SAPI_APXS2 || PHP5_SAPI_APXS2FILTER
 	select LIBCURL		if PHP5_EXT_CURL
 	select LIBXML2		if PHP5_XML_LIBXML2
 	select LIBXML2_C14N	if PHP5_XML_LIBXML2
@@ -49,7 +48,8 @@ config PHP5_SAPI_AOLSERVER
 
 config PHP5_SAPI_APXS2FILTER
 	bool
-	depends on STAGING
+	# needs apache
+	depends on BROKEN
 	prompt "apxs2filter"
 	help
 	  EXPERIMENTAL: Build shared Apache 2.0 Filter module. FILE is the optional
@@ -57,7 +57,8 @@ config PHP5_SAPI_APXS2FILTER
 
 config PHP5_SAPI_APXS2
 	bool
-	depends on STAGING
+	# needs apache
+	depends on BROKEN
 	prompt "apache mod_php (apxs2)"
 	help
 	  Build shared Apache 2.0 Handler module.