[csw-devel] SF.net SVN: gar:[19351] csw/mgar/pkg/apache2/branches/apache24
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Tue Oct 2 12:02:45 CEST 2012
Revision: 19351
http://gar.svn.sourceforge.net/gar/?rev=19351&view=rev
Author: bdwalton
Date: 2012-10-02 10:02:45 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
apache2/branches/apache24: trim out apache 2.2 stuff for now; add a config.layout patch
Modified Paths:
--------------
csw/mgar/pkg/apache2/branches/apache24/Makefile
Added Paths:
-----------
csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch
Removed Paths:
-------------
csw/mgar/pkg/apache2/branches/apache24/files/config.layout
Modified: csw/mgar/pkg/apache2/branches/apache24/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 09:35:24 UTC (rev 19350)
+++ csw/mgar/pkg/apache2/branches/apache24/Makefile 2012-10-02 10:02:45 UTC (rev 19351)
@@ -18,17 +18,17 @@
LICENSE = LICENSE
# Build multiple mpm's and merge them all into one install
-EXTRA_MODULATORS = MPM
+#EXTRA_MODULATORS = MPM
# !!!NOTE, NOTE, NOTE!!! prefork must be last as it's the one where
# all modules are built. This affects the default httpd.conf that
# gets generated. The other modulations will generate httpd.conf
# files that lack the important LoadModule lines. This is primarily
# useful at version bump time when files/httpd.conf.CSW may need an
# update to reflect new modules, etc.
-MODULATIONS_MPM = worker prefork
+#MODULATIONS_MPM = worker prefork
-MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
-MERGE_SCRIPTS_isa-default-mpm-worker = copy-all
+# MERGE_SCRIPTS_isa-default-mpm-prefork = copy-all
+# MERGE_SCRIPTS_isa-default-mpm-worker = copy-all
# Visitor information
SPKG_SOURCEURL = http://httpd.apache.org/
@@ -38,115 +38,16 @@
# Standard package bits
DISTFILES += cswapache2
-# The PACKAGES variable tell GAR which packages to build
-PACKAGES = CSWapache2 CSWapache2-dev CSWapache2-manual CSWap2suexec
-PACKAGES += CSWap2worker CSWapache2-utils
-# These packages are dummy versions to make dependencies nicer
-# as various things depend on them currently
-PACKAGES += CSWap2prefork CSWapache2rt CSWapache2c
+PATCHFILES += 0001-Add-an-OpenCSW-option-to-config.layout.patch
BUILD_DEP_PKGS += CSWlibaprutil-dev
-OBSOLETED_BY_CSWapache2-dev = CSWapache2-devel
-
-ARCHALL_CSWapache2-manual = 1
-ARCHALL_CSWap2prefork = 1
-ARCHALL_CSWapache2rt = 1
-ARCHALL_CSWapache2c = 1
-
-CATALOGNAME_CSWapache2 = apache2
-CATALOGNAME_CSWapache2-dev = apache2_dev
-CATALOGNAME_CSWapache2-manual = apache2_manual
-CATALOGNAME_CSWapache2-utils = apache2_utils
-CATALOGNAME_CSWap2suexec = ap2_suexec
-CATALOGNAME_CSWap2prefork = ap2_prefork
-CATALOGNAME_CSWap2worker = ap2_worker
-CATALOGNAME_CSWapache2rt = apache2rt
-
-SPKG_DESC_CSWapache2 = A high performance Unix-based HTTP server.
-SPKG_DESC_CSWapache2-dev = The development files for Apache2.
-SPKG_DESC_CSWapache2-manual = The Apache2 manual files.
-SPKG_DESC_CSWapache2-utils = Utility programs for Apache2.
-SPKG_DESC_CSWap2suexec = The standard suEXEC binary for Apache2.
-SPKG_DESC_CSWap2worker = The apache worker mpm.
-SPKG_DESC_CSWap2prefork = A stub for the old prefork mpm package.
-SPKG_DESC_CSWapache2rt = A stub for the old apache2rt package.
-SPKG_DESC_CSWapache2c = A stub for the old apache2c package.
-
-RUNTIME_DEP_PKGS_CSWapache2 += CSWlibiconv2 CSWosslutils
-RUNTIME_DEP_PKGS_CSWapache2 += CSWliblber2-4-2 CSWlibldap2-4-2
-# the loadable ldap module dynamically opens files in this apr sub-package
-RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-ldap
-RUNTIME_DEP_PKGS_CSWapache2 += CSWlibssl1-0-0 CSWlibz1
-RUNTIME_DEP_PKGS_CSWapache2 += CSWbdb48 CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-0 CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWapache2 += CSWapache2c CSWperl CSWapache2-utils
-# Note: This is required because apxs uses ap{r,u}-1-config
-RUNTIME_DEP_PKGS_CSWapache2 += CSWlibapr-dev CSWlibaprutil-dev
-# Note: This is included as something in mod_dav uses dlopen to leverage it
-RUNTIME_DEP_PKGS_CSWapache2 += CSWlibaprutil1-dbm-db
-RUNTIME_DEP_PKGS_CSWapache2-manual = CSWapache2
-RUNTIME_DEP_PKGS_CSWapache2-dev = CSWapache2
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWbdb48
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWlibssl1-0-0
-RUNTIME_DEP_PKGS_CSWapache2-utils += CSWperl
-RUNTIME_DEP_PKGS_CSWap2suexec = CSWapache2
-RUNTIME_DEP_PKGS_CSWap2prefork = CSWapache2 CSWapache2c
-RUNTIME_DEP_PKGS_CSWap2worker = CSWapache2 CSWap2prefork
-RUNTIME_DEP_PKGS_CSWap2worker += CSWlibapr1-0 CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWap2worker += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWap2worker += CSWbdb48 CSWlibiconv2 CSWapache2c
-RUNTIME_DEP_PKGS_CSWapache2rt = CSWapache2
-
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWosslutils
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2c
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWapache2-utils
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibapr-dev
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil-dev
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-dbm-db
-CHECKPKG_OVERRIDES_CSWapache2 += surplus-dependency|CSWlibaprutil1-ldap
-CHECKPKG_OVERRIDES_CSWapache2-utils += surplus-dependency|CSWperl
-CHECKPKG_OVERRIDES_CSWapache2-utils += missing-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2
-CHECKPKG_OVERRIDES_CSWap2prefork += surplus-dependency|CSWapache2c
-CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWap2prefork
-CHECKPKG_OVERRIDES_CSWap2worker += surplus-dependency|CSWapache2c
-CHECKPKG_OVERRIDES_CSWapache2rt += surplus-dependency|CSWapache2
-
-CHECKPKG_OVERRIDES_CSWapache2-dev += file-with-bad-content|/usr/local|root/opt/csw/apache2/include/httpd.h
-
-# these will eventually go away...
-CHECKPKG_OVERRIDES_CSWap2suexec += catalogname-does-not-match-pkgname|pkgname=CSWap2suexec|catalogname=ap2_suexec|expected-catalogname=ap2suexec
-CHECKPKG_OVERRIDES_CSWap2worker += catalogname-does-not-match-pkgname|pkgname=CSWap2worker|catalogname=ap2_worker|expected-catalogname=ap2worker
-CHECKPKG_OVERRIDES_CSWap2prefork += catalogname-does-not-match-pkgname|pkgname=CSWap2prefork|catalogname=ap2_prefork|expected-catalogname=ap2prefork
-
-# User requested...
-BUILD64 = 1
-
-# We need this to get bdb48/lib into the runpath
-EXTRA_LIB = $(prefix)/bdb48/lib
-
# The SMF support: you don't need to specify cswinitsmf any more. You need to
# make sure the the /etc/opt/csw/init.d/cswapache file gets installed during
# the post-install stage, and add "INITSMF = /etc/opt/csw/init.d/cswapache" to
# the Makefile.
INITSMF = /etc/opt/csw/init.d/cswapache2
-POSTMSG = /opt/csw/share/doc/apache2/README.CSW
-
-AP2_MODS = 1
-AP2_MODFILES = *suexec*\.so
-
-ALTERNATIVES_CSWapache2 = prefork
-ALTERNATIVES_CSWap2worker = worker
-ALTERNATIVE_prefork = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.prefork 50
-ALTERNATIVE_worker = /opt/csw/apache2/sbin/httpd httpd /opt/csw/apache2/sbin/httpd.worker 100
-
# Build Configuration
CONFIGURE_ARGS += --with-apr=$(prefix)/bin/apr-1-config
CONFIGURE_ARGS += --with-apr-util=$(prefix)/bin/apu-1-config
@@ -158,94 +59,11 @@
CONFIGURE_ARGS += --with-z=$(prefix)
CONFIGURE_ARGS += --with-ssl=$(prefix)
-ifneq ($(MPM),prefork)
-CONFIGURE_ARGS += --enable-modules=none
-CONFIGURE_ARGS += --disable-actions
-CONFIGURE_ARGS += --disable-alias
-CONFIGURE_ARGS += --disable-authn-file
-CONFIGURE_ARGS += --disable-authn-default
-CONFIGURE_ARGS += --disable-authz-host
-CONFIGURE_ARGS += --disable-authz-user
-CONFIGURE_ARGS += --disable-authz-groupfile
-CONFIGURE_ARGS += --disable-authz-default
-CONFIGURE_ARGS += --disable-auth-basic
-CONFIGURE_ARGS += --disable-asis
-CONFIGURE_ARGS += --disable-auth
-CONFIGURE_ARGS += --disable-autoindex
-CONFIGURE_ARGS += --disable-cgi
-CONFIGURE_ARGS += --disable-cgid
-CONFIGURE_ARGS += --disable-charset-lite
-CONFIGURE_ARGS += --disable-dir
-CONFIGURE_ARGS += --disable-env
-CONFIGURE_ARGS += --disable-filter
-CONFIGURE_ARGS += --disable-imap
-CONFIGURE_ARGS += --disable-include
-CONFIGURE_ARGS += --disable-log-config
-CONFIGURE_ARGS += --disable-mime
-CONFIGURE_ARGS += --disable-negotiation
-CONFIGURE_ARGS += --disable-setenvif
-CONFIGURE_ARGS += --disable-ssl
-CONFIGURE_ARGS += --disable-status
-CONFIGURE_ARGS += --disable-userdir
-CONFIGURE_ARGS += --disable-version
-else
-CONFIGURE_ARGS += --enable-suexec
-CONFIGURE_ARGS += --with-suexec-caller=nobody
-CONFIGURE_ARGS += --with-suexec-docroot=$(prefix)/apache2/share/htdocs
-CONFIGURE_ARGS += --with-suexec-userdir=public_html
-CONFIGURE_ARGS += --with-suexec-uidmin=100
-CONFIGURE_ARGS += --with-suexec-gidmin=100
-CONFIGURE_ARGS += --with-suexec-logfile=$(prefix)/apache2/var/log/suexec_log
-CONFIGURE_ARGS += --with-suexec-bin=$(prefix)/apache2/sbin/suexec
-CONFIGURE_ARGS += --with-suexec-safepath=/opt/csw/bin:/usr/bin:/bin
-CONFIGURE_ARGS += --enable-authn-alias
-CONFIGURE_ARGS += --enable-authnz-ldap
-CONFIGURE_ARGS += --enable-file-cache
-CONFIGURE_ARGS += --enable-cache
-CONFIGURE_ARGS += --enable-disk-cache
-CONFIGURE_ARGS += --enable-mem-cache
-CONFIGURE_ARGS += --enable-bucketeer
-CONFIGURE_ARGS += --enable-charset-lite
-CONFIGURE_ARGS += --enable-ldap
-CONFIGURE_ARGS += --enable-log-forensic
-CONFIGURE_ARGS += --enable-usertrack
-CONFIGURE_ARGS += --enable-unique-id
-CONFIGURE_ARGS += --enable-version
-CONFIGURE_ARGS += --enable-proxy
-CONFIGURE_ARGS += --enable-proxy-connect
-CONFIGURE_ARGS += --enable-proxy-ftp
-CONFIGURE_ARGS += --enable-proxy-http
-CONFIGURE_ARGS += --enable-proxy-ajp
-CONFIGURE_ARGS += --enable-proxy-balancer
-CONFIGURE_ARGS += --enable-cgid
-CONFIGURE_ARGS += --enable-dav-lock
-CONFIGURE_ARGS += --enable-mods-shared=all
-endif
-
# Fixup target variables
-APACHE_ROOT = $(DESTDIR)$(prefix)/apache2
+APACHE_ROOT = $(DESTDIR)$(prefix)
LIBTOOL_LADIR = $(APACHE_ROOT)/lib
STRIP_DIRS = $(APACHE_ROOT)/sbin $(APACHE_ROOT)/libexec
-PKGFILES_CSWapache2-utils = .*sbin/ab .*sbin/dbmmanage .*sbin/htdbm
-PKGFILES_CSWapache2-utils += .*sbin/htdigest .*sbin/htpasswd .*sbin/logresolve
-PKGFILES_CSWapache2-utils += .*sbin/htcacheclean .*sbin/rotatelogs
-PKGFILES_CSWapache2-utils += .*sbin/checkgid
-PKGFILES_CSWapache2-utils += .*man8/ab.8 .*man1/dbmmanage.1 .*man1/htdbm.1
-PKGFILES_CSWapache2-utils += .*man1/htdigest.1 .*man1/htpasswd.1
-PKGFILES_CSWapache2-utils += .*man8/logresolve.8
-PKGFILES_CSWapache2-utils += .*man8/htcacheclean .*man8/rotatelogs
-PKGFILES_CSWap2suexec = .*sbin/suexec .*libexec/.*suexec.* .*/man/.*suexec.*
-PKGFILES_CSWap2suexec += .*ap2mod/suexec
-PKGFILES_CSWapache2-dev = .*include/.* .*\.(a|la)
-PKGFILES_CSWapache2-manual = .*share/.*manual.* .*etc/extra/httpd-manual.conf
-PKGFILES_CSWap2prefork = .*share/doc/ap2_prefork.*
-PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker
-PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
-PKGFILES_CSWapache2c = .*share/doc/apache2c.*
-
-#PROTOTYPE_FILTER = awk '$$$$3 == "/opt/csw/apache2/sbin/suexec" { $$$$4 = "4755" }; $$$$3 ~ /cswap2mod/ { $$$$4 = "0555" }; { print }'
-
TEST_TARGET = test
include gar/category.mk
@@ -260,85 +78,3 @@
@gsed -e s,INSTALL_PREFIX,$(prefix)/apache2,g \
$(WORKDIR)/config.layout > $(WORKDIR)/$(NAME)-$(VERSION)/config.layout
@$(MAKECOOKIE)
-
-
-post-install-modulated: rename-httpd copy-local-files create-templates copy-readmes
-
-copy-readmes:
- @(cd $(WORKDIR); for f in README.CSW*; do \
- p=`echo $$f | sed 's/README.CSW.//'`; \
- ginstall -d -m0755 $(DESTDIR)/$(prefix)/share/doc/$$p; \
- ginstall -m 0644 $$f $(DESTDIR)/$(prefix)/share/doc/$$p/README.CSW; \
- done)
- @$(MAKECOOKIE)
-
-rename-httpd:
- @if test -f $(APACHE_ROOT)/sbin/httpd ; then \
- ( cd $(APACHE_ROOT)/sbin ; mv httpd httpd.$(MPM) ) ; \
- fi
-
-
-# Copy in specialized templates
-copy-local-files:
- @ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- @ginstall $(WORKDIR)/cswapache2 $(DESTDIR)/etc/opt/csw/init.d
- @ginstall $(WORKDIR)/update20to22 $(APACHE_ROOT)/sbin
- @$(MAKECOOKIE)
-
-# Create stock templates
-template_list = share/htdocs/index.html
-template_list += etc/extra/httpd-autoindex.conf
-template_list += etc/extra/httpd-dav.conf
-template_list += etc/extra/httpd-default.conf
-template_list += etc/extra/httpd-info.conf
-template_list += etc/extra/httpd-languages.conf
-template_list += etc/extra/httpd-multilang-errordoc.conf
-template_list += etc/extra/httpd-userdir.conf
-template_list += etc/extra/httpd-vhosts.conf
-template_list += etc/extra/httpd-mpm.conf
-template_list += etc/magic
-template_list += etc/mime.types
-template_list += etc/envvars etc/envvars-std
-
-create-templates:
- @echo " => Creating template files"
- @( cd $(DESTDIR)$(prefix)/apache2 ; \
- for file in $(template_list) ; do \
- gmv -v $$file $$file.CSW ; \
- done )
- @$(MAKECOOKIE)
-
-
-post-merge:
- @(cd $(PKGROOT)/$(prefix)/apache2/etc/; \
- for f in httpd.conf extra/httpd-ssl.conf; do \
- perl -pi -e 's/User.*daemon.*/User \@USER\@/; \
- s/Group.*daemon.*/Group \@GROUP\@/; \
- s/#*ServerName www.example.com/ServerName \@HOSTNAME\@/; \
- s/ServerAdmin you\@example.com/ServerAdmin \@ADMIN\@/; \
- s/^(LoadModule.*suexec.*)/#$$1/; \
- s/^#(Include.*httpd-mpm.conf)/$$1/; \
- s/^#(Include.*httpd-ssl.conf)/$$1/' $$f; \
- mv $$f $$f.CSW; \
- done )
- @echo Fixing usr/local references in the online manaual...
- @(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \
- /opt/csw/bin/gfind . -type f -print0 | \
- /opt/csw/bin/gxargs -0 \
- perl -pi \
- -e 's@/usr/local/apache2*@/opt/csw/apache2 at g;' \
- -e 's@/usr/local@/opt/csw/apache2 at g')
- @echo Fixing export/home references in the online manaual...
- @(cd $(PKGROOT)/$(prefix)/apache2/share/manual; \
- /opt/csw/bin/gfind . -type f -print0 | \
- /opt/csw/bin/gxargs -0 \
- perl -pi \
- -e 's@/export/home@/home at g;')
- @echo Fixing usr/local reference in the cgi-bin scripts
- @(cd $(PKGROOT)/$(prefix)/apache2/share/cgi-bin; \
- perl -pi -e 's@/usr/local/bin@/opt/csw/bin at g' *)
- @echo Adding link from original envvars location
- @(cd $(PKGROOT)/$(prefix)/apache2/sbin; \
- ln -s ../etc/envvars envvars )
- @$(MAKECOOKIE)
-
Added: csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch (rev 0)
+++ csw/mgar/pkg/apache2/branches/apache24/files/0001-Add-an-OpenCSW-option-to-config.layout.patch 2012-10-02 10:02:45 UTC (rev 19351)
@@ -0,0 +1,45 @@
+From 6625eb4c5833cbee96ccb143f6d4e3d4f367b4b3 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Tue, 2 Oct 2012 11:08:04 +0200
+Subject: [PATCH] Add an OpenCSW option to config.layout
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ config.layout | 24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+diff --git a/config.layout b/config.layout
+index 35a325a..b21a3d4 100644
+--- a/config.layout
++++ b/config.layout
+@@ -370,3 +370,27 @@
+ logfiledir: ${localstatedir}/log/httpd
+ proxycachedir: ${localstatedir}/cache/httpd
+ </Layout>
++
++# CSW Layout
++<Layout OpenCSW>
++ prefix: /opt/csw
++ exec_prefix: ${prefix}
++ bindir: ${prefix}/bin
++ sbindir: ${prefix}/sbin
++ libdir: ${prefix}/lib/apache24
++ libexecdir: ${libdir}/modules
++ installbuilddir: ${libdir}/build
++ sysconfdir: /etc/${prefix}/apache24
++ mandir: ${prefix}/share/man
++ datadir: /var/${prefix}/apache24
++ errordir: ${datadir}/error
++ iconsdir: ${datadir}/icons
++ htdocsdir: ${datadir}/htdocs
++ manualdir: ${datadir}/manual
++ cgidir: ${datadir}/cgi-bin
++ includedir: ${prefix}/include/apache24
++ localstatedir: /var/${prefix}
++ runtimedir: /var/run
++ logfiledir: ${localstatedir}/log/apache24
++ proxycachedir: ${localstatedir}/apache24/proxy
++</Layout>
+--
+1.7.12
+
Deleted: csw/mgar/pkg/apache2/branches/apache24/files/config.layout
===================================================================
--- csw/mgar/pkg/apache2/branches/apache24/files/config.layout 2012-10-02 09:35:24 UTC (rev 19350)
+++ csw/mgar/pkg/apache2/branches/apache24/files/config.layout 2012-10-02 10:02:45 UTC (rev 19351)
@@ -1,23 +0,0 @@
-# CSW Layout
-<Layout csw>
- prefix: INSTALL_PREFIX
- exec_prefix: ${prefix}
- bindir: ${exec_prefix}/bin
- sbindir: ${exec_prefix}/sbin
- libdir: ${exec_prefix}/lib
- libexecdir: ${exec_prefix}/libexec
- datadir: ${prefix}/share
- mandir: ${datadir}/man
- sysconfdir: /etc/${prefix}/apache24
- installbuilddir: ${datadir}/build
- errordir: ${datadir}/error
- iconsdir: ${datadir}/icons
- htdocsdir: ${datadir}/htdocs
- manualdir: ${datadir}/manual
- cgidir: ${datadir}/cgi-bin
- includedir: ${exec_prefix}/include
- localstatedir: /var/${prefix}
- runtimedir: /var/run
- logfiledir: ${localstatedir}/log
- proxycachedir: ${localstatedir}/proxy
-</Layout>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list