[csw-devel] SF.net SVN: gar:[11677] csw/mgar/pkg/apache2/branches/fs-rework

[bdwalton at users.sourceforge.net]

Revision: 11677
          http://gar.svn.sourceforge.net/gar/?rev=11677&view=rev
Author:   bdwalton
Date:     2010-11-21 20:59:15 +0000 (Sun, 21 Nov 2010)

Log Message:
-----------
apache2/fs-rework: merge in changes from trunk

Modified Paths:
--------------
    csw/mgar/pkg/apache2/branches/fs-rework/Makefile
    csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template

Removed Paths:
-------------
    csw/mgar/pkg/apache2/branches/fs-rework/files/server.crt.build_cas

Property Changed:
----------------
    csw/mgar/pkg/apache2/branches/fs-rework/


Property changes on: csw/mgar/pkg/apache2/branches/fs-rework
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/apache2/trunk:11641-11676

Modified: csw/mgar/pkg/apache2/branches/fs-rework/Makefile
===================================================================
--- csw/mgar/pkg/apache2/branches/fs-rework/Makefile	2010-11-21 17:07:28 UTC (rev 11676)
+++ csw/mgar/pkg/apache2/branches/fs-rework/Makefile	2010-11-21 20:59:15 UTC (rev 11677)
@@ -40,7 +40,7 @@
 DISTFILES += CSWapache2.preinstall
 
 # Configuration templates
-DISTFILES += update20to22 server.crt.build_cas
+DISTFILES += update20to22
 DISTFILES += README.CSW.apache2 README.CSW.ap2_prefork
 DISTFILES += README.CSW.apache2rt
 
@@ -198,7 +198,7 @@
 PKGFILES_CSWap2worker = .*share/doc/ap2_worker.* .*sbin/httpd.worker
 PKGFILES_CSWapache2rt = .*share/doc/apache2rt.*
 
-PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; $$$$3 ~ /server.crt.CSW/ { $$$$1 = "e"; $$$$2 = "build"; $$$$4 = "0600" }; {print}'
+PROTOTYPE_FILTER = gawk '$$$$3 ~ /apache2\/etc/ && $$$$1 == "f" && $$$$3 !~ /CSW/ && $$$$3 !~ /original/ {$$$$1 = "e"; $$$$2 = "build"}; {print}'
 
 include gar/category.mk
 
@@ -249,7 +249,4 @@
 			mv $$f $$f.CSW; \
 			$(abspath $(FILEDIR))/build_cas_template $$f > $$f; \
 		done )
-	@echo "  => Creating ssl server.crt build CAS template."
-	@(cp -p $(WORKDIR)/server.crt.build_cas $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW; \
-		chmod 600 $(PKGROOT)/$(prefix)/apache2/etc/server.crt.CSW )
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template
===================================================================
--- csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template	2010-11-21 17:07:28 UTC (rev 11676)
+++ csw/mgar/pkg/apache2/branches/fs-rework/files/build_cas_template	2010-11-21 20:59:15 UTC (rev 11677)
@@ -19,8 +19,7 @@
 	-e "s/^User.*daemon/User nobody/;" \
 	-e "s/^Group.*daemon/Group nobody/;" \
 	-e 's/^(LoadModule.*suexec.*)/#\$1/;' \
-	-e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \
-	-e 's/^#(Include.*httpd-ssl.conf)/\$1/;' \$CONF_FILE
+	-e 's/^#(Include.*httpd-mpm.conf)/\$1/;' \$CONF_FILE
 
       chown root:bin \$CONF_FILE
       chmod 644 \$CONF_FILE

Deleted: csw/mgar/pkg/apache2/branches/fs-rework/files/server.crt.build_cas
===================================================================
--- csw/mgar/pkg/apache2/branches/fs-rework/files/server.crt.build_cas	2010-11-21 17:07:28 UTC (rev 11676)
+++ csw/mgar/pkg/apache2/branches/fs-rework/files/server.crt.build_cas	2010-11-21 20:59:15 UTC (rev 11677)
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# On installation, generate a dummy ssl certificate (if required)
-
-PIR=${PKG_INSTALL_ROOT:-/}
-AP2_PREFIX=/opt/csw/apache2
-AP2_CONFDIR=$AP2_PREFIX/etc
-
-if [ "$1" = install ]; then
-    # this gets captured and placed by the build CAS
-    echo This is a dummy file but still a part of CSWapache2
-    echo Please do not remove.
-
-    if [ ! -f $PIR/$AP2_CONFDIR/server.crt -a ! -f $PIR/$AP2_CONFDIR/server.key ]; then
-	echo Generating dummy ssl key and certificate... >&2
-
-        # this is likely overkill for a dummy cert, but why not
-	cat <<EOF | /usr/sbin/chroot ${PIR} /opt/csw/bin/openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -keyout $AP2_CONFDIR/server.key  -out $AP2_CONFDIR/server.crt >/dev/null 2>&1
-TS
-Westfarthing
-Hobbiton
-
-
-`hostname`
-bilbo at example.net
-
-
-EOF
-	chmod 600 $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt
-	chown root:bin $AP2_CONFDIR/server.key $AP2_CONFDIR/server.crt
-    else
-	echo "Not touching existing SSL files." >&2
-    fi
-fi
-
-# No output on a remove action will see the file purged.
-# As this is server.crt.CSW, that doesn't matter.  The
-# real files will be left behind in place whether they
-# are the pretend or replaced with real files by the admin.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.