httpd-win32-msi-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r577499 - in /httpd/httpd/win32-msi/trunk: apache_2.0-win32.ism apache_2.2-win32.ism
Date Thu, 20 Sep 2007 01:51:09 GMT
Author: wrowe
Date: Wed Sep 19 18:51:06 2007
New Revision: 577499

URL: http://svn.apache.org/viewvc?rev=577499&view=rev
Log:
Add openssl.cnf for openssl.exe installs to 2.0, remove it's duplication
in the general components of 2.2.

Modified:
    httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
    httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism

Modified: httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism?rev=577499&r1=577498&r2=577499&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.0-win32.ism Wed Sep 19 18:51:06 2007
@@ -356,6 +356,7 @@
 		<row><td>abs</td><td>{581AB144-8BA2-4089-8B92-C61E3806B712}</td><td>APACHEBINDIR</td><td>0</td><td/><td>F200414_abs.exe</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>cgibin</td><td>{57385CC7-3504-4EF9-92B3-DD3B734CF980}</td><td>APACHECGIDIR</td><td>0</td><td/><td>F48458_printenv.pl</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>conf</td><td>{00557AFD-F5B5-4EFF-87D3-8942174F9778}</td><td>APACHECONFDIR</td><td>0</td><td/><td>F45780_mime.types.default</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+		<row><td>conf_openssl</td><td>{03F0033B-5C37-4850-B016-6C158E89088D}</td><td>APACHECONFDIR</td><td>0</td><td/><td>openssl.cnf</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>conf_ssl_temp</td><td>{54026674-F390-4CCB-9E7E-39C12B6CDB0C}</td><td>APACHECONFDIR</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>conf_temp</td><td>{0E1C777D-47A6-4775-93D4-0A5464767D25}</td><td>APACHECONFDIR</td><td>0</td><td/><td/><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 		<row><td>dbmmanage</td><td>{A77BF270-0A5C-4D82-B021-CE850191065B}</td><td>APACHEBINDIR</td><td>0</td><td/><td>F23523_dbmmanage.pl</td><td>1</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
@@ -1634,6 +1635,7 @@
 		<row><td>BuildFiles</td><td>include</td></row>
 		<row><td>BuildFiles</td><td>lib</td></row>
 		<row><td>Iconv</td><td>iconv_bin</td></row>
+		<row><td>OpensslBin</td><td>conf_openssl</td></row>
 		<row><td>OpensslBin</td><td>libeay32</td></row>
 		<row><td>OpensslBin</td><td>openssl</td></row>
 		<row><td>OpensslBin</td><td>openssl_read</td></row>
@@ -1759,6 +1761,7 @@
 		<row><td>index.html.en</td><td>manual_rewrite</td><td>INDEXH~1.EN|index.html.en</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\rewrite\index.html.en</td><td>1</td><td/></row>
 		<row><td>mod_version.so</td><td>mod_version</td><td>MOD_VE~1.SO|mod_version.so</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\modules\mod_version.so</td><td>1</td><td/></row>
 		<row><td>modtrans.xsl</td><td>manual_style_xsl_util</td><td>modtrans.xsl</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\manual\style\xsl\util\modtrans.xsl</td><td>1</td><td/></row>
+		<row><td>openssl.cnf</td><td>conf_openssl</td><td>openssl.cnf</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheBuildFolder&gt;\srclib\openssl\apps\openssl.cnf</td><td>1</td><td/></row>
 		<row><td>notice.txt</td><td>read</td><td>NOTICE.txt</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheTargetFolder&gt;\NOTICE.txt</td><td>1</td><td/></row>
 		<row><td>ssl_std.conf.in</td><td>conf_ssl_temp</td><td>SSL-ST~1.IN|ssl-std.conf.in</td><td>0</td><td/><td/><td/><td>1</td><td>&lt;ApacheBuildFolder&gt;\docs\conf\ssl-std.conf.in</td><td>1</td><td/></row>
 	</table>
@@ -1934,6 +1937,7 @@
 		<row><td>abs</td><td/><td/><td>_5EEDE9CC_EE8F_4661_8601_EA4F10EC984B_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>cgibin</td><td/><td/><td>_2CE877A9_0121_442C_963F_8098743C8481_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>conf</td><td/><td/><td>_83B239A3_E21A_4F2E_9DBC_9E51BF3D6132_FILTER</td><td/><td/><td/><td/></row>
+		<row><td>conf_openssl</td><td/><td/><td>_83B939A3_E21A_4F2E_9DBC_9E51BF3D2132_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>conf_ssl_temp</td><td/><td/><td>_BC8D9547_BB60_4D56_B24D_4B2B1FA6C12D_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>conf_temp</td><td/><td/><td>_4F8E0A9B_A6B1_414B_BEFE_2760A9C78C15_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>dbmmanage</td><td/><td/><td>_8601034B_F48A_4A56_B7C6_AFCB916D29C6_FILTER</td><td/><td/><td/><td/></row>

Modified: httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism
URL: http://svn.apache.org/viewvc/httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism?rev=577499&r1=577498&r2=577499&view=diff
==============================================================================
--- httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism (original)
+++ httpd/httpd/win32-msi/trunk/apache_2.2-win32.ism Wed Sep 19 18:51:06 2007
@@ -1580,7 +1580,6 @@
 		<row><td>ApacheRuntime</td><td>conf_default</td></row>
 		<row><td>ApacheRuntime</td><td>conf_default_temp</td></row>
 		<row><td>ApacheRuntime</td><td>conf_extra</td></row>
-		<row><td>ApacheRuntime</td><td>conf_openssl</td></row>
 		<row><td>ApacheRuntime</td><td>dbmmanage</td></row>
 		<row><td>ApacheRuntime</td><td>error</td></row>
 		<row><td>ApacheRuntime</td><td>error_include</td></row>
@@ -1984,7 +1983,7 @@
 		<row><td>conf_default</td><td/><td/><td>_FE199AB6_4AE8_4D25_A465_A2D4E4EB9FBE_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>conf_default_temp</td><td/><td/><td>_4F41A882_B4D7_47F8_95E5_EF8C38C3CE94_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>conf_extra</td><td/><td/><td>_4F8E0A9B_A6B1_414B_BEFE_2760A9C78C15_FILTER</td><td/><td/><td/><td/></row>
-		<row><td>conf_openssl</td><td/><td/><td>_83B239A3_E21A_4F2E_9DBC_9E51BF3D6132_FILTER</td><td/><td/><td/><td/></row>
+		<row><td>conf_openssl</td><td/><td/><td>_83B739A3_E21A_4F2E_9DBC_9E51BF3D6C32_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>dbmmanage</td><td/><td/><td>_8601034B_F48A_4A56_B7C6_AFCB916D29C6_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>error</td><td/><td/><td>_5843A457_0C11_4276_AB01_58E010E30289_FILTER</td><td/><td/><td/><td/></row>
 		<row><td>error_include</td><td/><td/><td>_597E35F2_09A8_4739_8D01_F1E5F8EA0CBE_FILTER</td><td/><td/><td/><td/></row>



---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org


Mime
View raw message