SF.net SVN: gar:[25544] csw/mgar/pkg/apache24/trunk

[dmichelsen at users.sourceforge.net]

Revision: 25544
          http://sourceforge.net/p/gar/code/25544
Author:   dmichelsen
Date:     2016-02-05 10:58:17 +0000 (Fri, 05 Feb 2016)
Log Message:
-----------
apache24/trunk: Switch to explicit manifest, enable nghttp

Modified Paths:
--------------
    csw/mgar/pkg/apache24/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/apache24/trunk/files/cswapache24.xml

Removed Paths:
-------------
    csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall

Modified: csw/mgar/pkg/apache24/trunk/Makefile
===================================================================
--- csw/mgar/pkg/apache24/trunk/Makefile	2016-02-05 10:05:59 UTC (rev 25543)
+++ csw/mgar/pkg/apache24/trunk/Makefile	2016-02-05 10:58:17 UTC (rev 25544)
@@ -15,9 +15,10 @@
 MASTER_SITES  = http://www.eu.apache.org/dist/httpd/
 DISTFILES += $(DISTNAME).tar.gz
 DISTFILES += cswapache24
-DISTFILES += CSWapache24.postinstall
 EXPANDVARS += cswapache24
 
+DISTFILES += cswapache24.xml
+
 PATCHFILES += 0002-Switch-usr-local-for-opt-csw-in-default-cgi-path.patch
 PATCHFILES += 0003-fix-43561-apxs.patch
 PATCHFILES-64 += 0004-64bit-apachectl.in.patch 
@@ -35,6 +36,9 @@
 
 GARCOMPILER = SOS12U4
 
+# More build deps missing
+BUILD_DEP_PKGS += CSWlibnghttp2-dev
+
 PACKAGES = CSWapache24
 SPKG_DESC_CSWapache24 = $(DESCRIPTION)
 RUNTIME_DEP_PKGS_CSWapache24 += CSWliblber2-4-2
@@ -46,12 +50,17 @@
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWapache24 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWapache24 += CSWlibnghttp2-14  
 
 EXTRA_MERGE_SCRIPTS_isa-default64 += copy-apache-modules
 
-# This is because /opt/csw/sbin/sparcv9 is missing, most certainly an checkpkg issue
-# CHECKPKG_OVERRIDES_CSWapache24 += missing-dependency|CSWbonnie++|or|CSWcollectd|or|CSWleafnode|or|CSWlighttpd|or|CSWlogrotate|or|CSWopenldap|or|CSWproftpd|or|CSWsysstat|or|CSWzabbix-agent|or|CSWzabbix-server
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswapache24.xml
+PROTOTYPE_CLASS_smf = manifest
 
+# This is the DTD location
+CHECKPKG_OVERRIDES_CSWapache24 += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswapache24.xml  
+
 PACKAGES += CSWapache24-manual
 ARCHALL_CSWapache24-manual = 1
 SPKG_DESC_CSWapache24-manual = The Apache 2.4 Manual
@@ -132,8 +141,10 @@
 CONFIGURE_ARGS += --with-ssl
 # As requested in https://www.opencsw.org/mantis/view.php?id=5152
 CONFIGURE_ARGS += --enable-proxy-html
+CONFIGURE_ARGS += --enable-http2
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(MEMORYMODEL))
 
+
 EXTRA_CFLAGS += -DSSL_EXPERIMENTAL -DSSL_ENGINE
 
 # Fixup target variables
@@ -170,6 +181,7 @@
 	ginstall -D -m 0755 $(WORKDIR)/cswapache24 $(DESTDIR)/etc/opt/csw/init.d/cswapache24
 	gsed -e '/APACHECTL=/s/sbin/sbin\$${MM}/' -i $(DESTDIR)/etc/opt/csw/init.d/cswapache24
 	echo "# create server.(crt|csr)/server.key" > $(DESTDIR)$(sysconfdir)/apache2/server
+	ginstall -D -m 0644 $(WORKDIR)/cswapache24.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswapache24.xml
 	@$(MAKECOOKIE)
 
 merge-copy-apache-modules:

Deleted: csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall
===================================================================
--- csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall	2016-02-05 10:05:59 UTC (rev 25543)
+++ csw/mgar/pkg/apache24/trunk/files/CSWapache24.postinstall	2016-02-05 10:58:17 UTC (rev 25544)
@@ -1,3 +0,0 @@
-[ -x /usr/sbin/svccfg ] && \
- /usr/sbin/svccfg -s cswapache24 'setprop general/enable_64bit = boolean: false' && \
- /usr/sbin/svcadm refresh cswapache24

Added: csw/mgar/pkg/apache24/trunk/files/cswapache24.xml
===================================================================
--- csw/mgar/pkg/apache24/trunk/files/cswapache24.xml	                        (rev 0)
+++ csw/mgar/pkg/apache24/trunk/files/cswapache24.xml	2016-02-05 10:58:17 UTC (rev 25544)
@@ -0,0 +1,30 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='export'>
+  <service name='network/cswapache24' type='service' version='0'>
+    <single_instance/>
+    <dependency name='fs' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local'/>
+    </dependency>
+    <dependency name='net' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/network/loopback'/>
+    </dependency>
+    <exec_method name='start' type='method' exec='/var/opt/csw/svc/method/svc-cswapache24 start' timeout_seconds='120'>
+      <method_context/>
+    </exec_method>
+    <exec_method name='stop' type='method' exec='/var/opt/csw/svc/method/svc-cswapache24 stop' timeout_seconds='60'>
+      <method_context/>
+    </exec_method>
+    <exec_method name='restart' type='method' exec='/var/opt/csw/svc/method/svc-cswapache24 restart' timeout_seconds='180'>
+      <method_context/>
+    </exec_method>
+    <property_group name='general' type='framework'>
+      <propval name='enable_64bit' type='boolean' value='true'/>
+    </property_group>
+    <instance name='default' enabled='true'>
+      <property_group name='general' type='framework'>
+        <propval name='package' type='astring' value='CSWapache24'/>
+      </property_group>
+    </instance>
+  </service>
+</service_bundle>


Property changes on: csw/mgar/pkg/apache24/trunk/files/cswapache24.xml
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.