diff options
author | Chuck Short <zul@gentoo.org> | 2004-03-26 18:50:03 +0000 |
---|---|---|
committer | Chuck Short <zul@gentoo.org> | 2004-03-26 18:50:03 +0000 |
commit | 646bf2dc4ca3a4500ba677ef020cf3a6b346c63d (patch) | |
tree | f67a9e31b3c17c816d5c873069e265f7276cb633 | |
parent | Marked stable on sparc wrt bug #45584. (diff) | |
download | historical-646bf2dc4ca3a4500ba677ef020cf3a6b346c63d.tar.gz historical-646bf2dc4ca3a4500ba677ef020cf3a6b346c63d.tar.bz2 historical-646bf2dc4ca3a4500ba677ef020cf3a6b346c63d.zip |
Copied missing file, closes #45786.
-rw-r--r-- | net-www/apache/ChangeLog | 5 | ||||
-rw-r--r-- | net-www/apache/Manifest | 73 | ||||
-rw-r--r-- | net-www/apache/files/2.0.49/gentestcrt.sh | 243 |
3 files changed, 284 insertions, 37 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index 59a3af7547e1..6f2645f12492 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-www/apache # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.106 2004/03/26 08:45:48 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.107 2004/03/26 18:50:01 zul Exp $ + + 26 Mar 2004; <zul@gentoo.org> files/2.0.49/gentestcrt.sh: + Copied missing gentestcrt.sh from ${FILESDIR}/2.0.40. Closes #45786. 26 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> files/2.0.49/apache2.initd: diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index a26435200254..7edb67436cea 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -1,24 +1,24 @@ -MD5 d172e61a4129d10e6f679543bc7595b1 apache-2.0.48.ebuild 11203 -MD5 da1c08c8716b9cc1449c4d2329963898 apache-2.0.48-r2.ebuild 12008 -MD5 9ccb266dd9f8ba601a66c8d8cf7bed96 apache-1.3.27-r3.ebuild 7652 -MD5 28ea989c204ac961883b795d16566964 apache-2.0.48-r4.ebuild 12278 -MD5 d0008ca37363cd4cafd360564aad605b apache-2.0.47.ebuild 11472 -MD5 597f3e7208178ee209f0e246e5a7fbc3 apache-1.3.29.ebuild 7283 -MD5 8b0802da8985bebebe0839a0424a1aeb apache-1.3.29-r1.ebuild 7314 -MD5 b7737e1559b3508b5ba3dc679ae33537 apache-2.0.48-r1.ebuild 11662 -MD5 7310b6787d782d8b03439d2f5e52b444 apache-2.0.49.ebuild 12447 -MD5 450d24552a1de4f3c3cafe8f990585a3 apache-2.0.48-r3.ebuild 12060 -MD5 2f88fe2b3c11a9cf3adf6bee88c5aee1 ChangeLog 20651 -MD5 28e0f7ec35e9ffd32ca9b85eba551071 apache-1.3.28-r1.ebuild 7670 +MD5 0bb207522b010218deb7ea94a718a131 apache-2.0.48.ebuild 11204 +MD5 a26d7272e8bb71a11b039b26bc453e14 apache-2.0.48-r2.ebuild 12009 +MD5 550ad9c89cc83883b979d5064f7a04f0 apache-1.3.27-r3.ebuild 7653 +MD5 01e35056f8fda7af5ff0b93e572e861e apache-2.0.48-r4.ebuild 12279 +MD5 19e2b87577db3ad3bfa74c554f3a27a9 apache-2.0.47.ebuild 11473 +MD5 c32d8e3cbf6401230bdb6572e3a79109 apache-1.3.29.ebuild 7284 +MD5 649a3da796a19e931fd37b75422cb98a apache-1.3.29-r1.ebuild 7315 +MD5 dcd66758c6c1536d6b0ad001be8d98de apache-2.0.48-r1.ebuild 11663 +MD5 5218e9fb7199f710c8adc77a54fef7a0 apache-2.0.49.ebuild 12448 +MD5 0c605a3397eed2626b9170fa2d3c0662 apache-2.0.48-r3.ebuild 12061 +MD5 9ad632f3ffc685ac0fd5f6d9d36e9676 ChangeLog 20780 +MD5 ec841d27e5613d0aae57ddf2083a7597 apache-1.3.28-r1.ebuild 7671 MD5 bd80c41f0d8d92374c3712c4cac4d2ff metadata.xml 503 -MD5 3604262d4ff6e52fbbb35796df8cd865 apache-2.0.47-r1.ebuild 10758 -MD5 67747d74a9762563074e67f1d6b54db1 apache-1.3.27-r4.ebuild 8678 -MD5 9ad659015ff71d249e4a9b80579cb47a apache-2.0.46.ebuild 11059 -MD5 f16958750d664f94b6e756727a1a88a1 apache-1.3.28.ebuild 8903 +MD5 b4580094775cde0d53605e4c036ec191 apache-2.0.47-r1.ebuild 10759 +MD5 fcc5fef301f573c52854462740975b0b apache-1.3.27-r4.ebuild 8679 +MD5 f73405c24e4fe9e86c870dca88cc7284 apache-2.0.46.ebuild 11060 +MD5 52063286236598300600f9324e40fb56 apache-1.3.28.ebuild 8904 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149 MD5 399e3c15e2afa45a732faed0df6b1a30 files/apache-1.3.28-zombie-cgi.patch 940 MD5 86dc760b13645d25565a874a6d3b890e files/apache-2.0.47-gentoo.diff 3609 -MD5 7be16a0103be642b354ddcba5fb4bd91 files/apache-builtin-mods 2464 +MD5 97c7a2efed7a3fd05614167426c495d9 files/apache-builtin-mods 2465 MD5 10be9409287dd5848fd675c1d96d0f7c files/digest-apache-1.3.27-r3 211 MD5 21c6ed7e53ea9fc80f4634cbf37b2bc6 files/digest-apache-1.3.27-r4 303 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28-r1 211 @@ -33,46 +33,46 @@ MD5 5dbbb01b1f4e39ff052a49389caa76ed files/apache-1.3.27_db4_gentoo.patch 956 MD5 2c7dedfa1c3b2b815d733e90acfa06fc files/apache-2.0.48-export.diff 706 MD5 43283cd264b5b1a6b3e5a4adba5ee2c1 files/apache-2.0.48-gentoo.diff 5905 MD5 f2c60b199c12729b25716ed451a24e38 files/apache-2.0.44-gentoo.diff 4895 -MD5 c7a1e8ba0818b1e5a32b5ac5309fb06a files/apache.rc6 1056 +MD5 eb130dcb9d5f084be37ba0e7e2089e51 files/apache.rc6 1057 MD5 998b4b7df08eb15641e0b9132443b365 files/apache-1.3.27-apachectl.patch 1328 -MD5 a0252c6abb04b4211f28e828eaabe5d3 files/apachelogserverstatus 4762 -MD5 bf269395d653f995f21b543a4ceb42a9 files/robots.txt 339 -MD5 d0e867a1725d08e241f43cbab60ac3bb files/apacheaddmod 5976 +MD5 8d790bf68c47c08951c761815cd66a1c files/apachelogserverstatus 4763 +MD5 df54361aa8754197cf3bafe99d32c7ec files/robots.txt 340 +MD5 02db12f0d91e1f89e0b173fea6c5151d files/apacheaddmod 5977 MD5 b7c4fabdcb3845c4218b770acb792f73 files/apache-2.0.49-gentoo.diff 6316 -MD5 2ab9f43e3c8529e441e139bdd64074f4 files/apachedelmod 3184 +MD5 bae4b9d941cd38a32943533e958aa1b3 files/apachedelmod 3185 MD5 9dc40e1918a2d30a578ebf1653f7182c files/apache-2.0.45-gentoo.diff 5448 MD5 f11a5046372c128afa033b7fbc787dd9 files/digest-apache-1.3.28 211 MD5 589e8773eb94f785be510f74b2e39ad0 files/digest-apache-1.3.29 211 -MD5 961de7bbaaeee7a96240f50cf6966bea files/apachesplitlogfile 4958 +MD5 a90bef6fb0fb6d05f74c36eaf26285d6 files/apachesplitlogfile 4959 MD5 b1b73cd67ed116ce0f9c973eeff9fbdf files/digest-apache-2.0.46 65 MD5 78ec0e944bbdb4246ed75478e6d8e52a files/digest-apache-2.0.47 65 MD5 4cc91d25cf4117b8db0fec344bebec4d files/digest-apache-2.0.48 65 MD5 3a7818b24f0952694c7b878ba3d8e79a files/digest-apache-2.0.49 65 MD5 c8c70224d0f41de7f02387f13911e539 files/apache-2.0.46-gentoo.diff 3963 -MD5 8ecc5ddcd2c3804c8d6f35cb31e1933c files/apache.confd 999 +MD5 158ae679067a535097854981105c6c06 files/apache.confd 1000 MD5 df3796825b36f68131a9ab673297f692 files/conf/apache.conf 7238 MD5 7f443a9cfecdb060ed53ddd8cb572316 files/conf/commonapache.conf 22169 -MD5 49f74daf31509c98150f0b77c31a1195 files/conf/VirtualHomePages.conf 906 -MD5 24b8240f9bebfbf4c51c2bc626d1a6cb files/conf/Vhosts.conf 1908 -MD5 7c47e2641f7719c7c76607bc720b7b82 files/conf/DynamicVhosts.conf 962 +MD5 c774e0c7ddc6d55bddc164a9b5af0cb6 files/conf/VirtualHomePages.conf 907 +MD5 f820076adb31912c060052154d08eecb files/conf/Vhosts.conf 1909 +MD5 fd9b211c5078739d4aadbe6b3e53aead files/conf/DynamicVhosts.conf 963 MD5 6c5fea3288b0ca4769495060d345055d files/2.0.48-r1/commonapache2.conf 31776 -MD5 8ae5a1ea62ef8fbd5acc44b859c94320 files/2.0.48-r1/apache2.confd 1954 -MD5 36537a22909398ef15862e7aca7a3647 files/2.0.48-r1/apache2.initd 2417 +MD5 63b10f728d11f10fb24241f8322542df files/2.0.48-r1/apache2.confd 1955 +MD5 ee8c33081bbca97e9d9930c0a4dea57a files/2.0.48-r1/apache2.initd 2418 MD5 429d2311b221deba1bc181e17e046543 files/2.0.48-r1/apache2.conf 7652 MD5 869ec17a0417518aa1d9d9566a958fb5 files/2.0.40/40_mod_ssl.conf 3185 MD5 819ee444395cf42ccc8009529a94af37 files/2.0.40/45_mod_dav.conf 583 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.40/46_mod_ldap.conf 902 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.40/apache2logserverstatus 4652 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.40/apache2splitlogfile 4844 -MD5 75f0dfc2d25c9047d1451a368e8eadb4 files/2.0.40/apache2-builtin-mods 2212 -MD5 44e6cb453fc9166b2f1cdea29814c8c4 files/2.0.40/gentestcrt.sh 8804 +MD5 3dfd53805dfe77a12507c3af371dbeae files/2.0.40/apache2-builtin-mods 2213 +MD5 b335411e582a8fd58aacf2f35e75291f files/2.0.40/gentestcrt.sh 8805 MD5 9375735d739344987fe4b2a3990de273 files/2.0.40/highperformance.conf 1959 MD5 5c47dec8c730edf1cb755b581327bd49 files/2.0.40/httpd.conf 35481 MD5 0055923f696c9ba3be7eeb5518603d40 files/2.0.40/ssl.conf 11082 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.40/41_mod_ssl.default-vhost.conf 8053 MD5 9a54f9faa53622b7db4b7e119016c549 files/2.0.40/commonapache2.conf 31777 -MD5 6a2a6bd30168a28993fe4d6344810784 files/2.0.40/apache2.confd 783 -MD5 0b63668f84f8d38539382bb3fe35aa26 files/2.0.40/apache2.initd 1157 +MD5 7648aa0e65d9bfd6ee5dc7109bc94fbc files/2.0.40/apache2.confd 784 +MD5 4df3a9c91545a3db51ebfa176484214a files/2.0.40/apache2.initd 1158 MD5 66bf65c4f0a2072d612b781599515807 files/2.0.40/apache2.conf 7649 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.40/vhosts.conf 1695 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.40/virtual-homepages.conf 780 @@ -82,11 +82,12 @@ MD5 819ee444395cf42ccc8009529a94af37 files/2.0.49/45_mod_dav.conf 583 MD5 50b76a8df795c79378c02f1edea750a4 files/2.0.49/46_mod_ldap.conf 902 MD5 b610d37fd521de1f8fc782069e165969 files/2.0.49/apache2logserverstatus 4652 MD5 a14d8565fd5ca2b5753799477a85b1af files/2.0.49/apache2splitlogfile 4844 -MD5 b3a6d1c01772a3623f7d467e9d8ad51c files/2.0.49/apache2-builtin-mods 2210 +MD5 0fac1724d97d449d1cfb746275f7b32b files/2.0.49/apache2-builtin-mods 2211 +MD5 0e8867687279c44ddbf51375c537cd02 files/2.0.49/gentestcrt.sh 8800 MD5 1d10cc98714a34ddc38525743c2989f9 files/2.0.49/41_mod_ssl.default-vhost.conf 8053 MD5 dc5c8ebe712dc08bdb83fa8563924c96 files/2.0.49/commonapache2.conf 31775 -MD5 4a7d5e937948ff12e82e520baa675745 files/2.0.49/apache2.confd 1950 -MD5 732dc50b2afa76c98ca0223188643195 files/2.0.49/apache2.initd 2427 +MD5 bf4f5fef094c57eeef892940ea689da9 files/2.0.49/apache2.confd 1951 +MD5 c4f8af47d18e2f30f0c748567b8cd214 files/2.0.49/apache2.initd 2428 MD5 77785d5ff6e5a7a21425dc69a6162779 files/2.0.49/apache2.conf 7652 MD5 d9e0ecfbc1591486a698494a388b091c files/2.0.49/vhosts.conf 1695 MD5 b69bf7c3126e471a2abff013e716367f files/2.0.49/virtual-homepages.conf 780 diff --git a/net-www/apache/files/2.0.49/gentestcrt.sh b/net-www/apache/files/2.0.49/gentestcrt.sh new file mode 100644 index 000000000000..81e39fe6e3d4 --- /dev/null +++ b/net-www/apache/files/2.0.49/gentestcrt.sh @@ -0,0 +1,243 @@ +#!/bin/sh +## $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/2.0.49/gentestcrt.sh,v 1.1 2004/03/26 18:50:03 zul Exp $ +## +## gentestcrt -- Create self-signed test certificate +## (C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft +## Based on cca.sh script by Ralf S. Engelschall +## + +# external tools +openssl="/usr/bin/openssl" + +# some optional terminal sequences +case $TERM in + xterm|xterm*|vt220|vt220*) + T_MD=`echo dummy | awk '{ printf("%c%c%c%c", 27, 91, 49, 109); }'` + T_ME=`echo dummy | awk '{ printf("%c%c%c", 27, 91, 109); }'` + ;; + vt100|vt100*) + T_MD=`echo dummy | awk '{ printf("%c%c%c%c%c%c", 27, 91, 49, 109, 0, 0); }'` + T_ME=`echo dummy | awk '{ printf("%c%c%c%c%c", 27, 91, 109, 0, 0); }'` + ;; + default) + T_MD='' + T_ME='' + ;; +esac + +# find some random files +# (do not use /dev/random here, because this device +# doesn't work as expected on all platforms) +randfiles='' +for file in /var/log/messages /var/adm/messages \ + /kernel /vmunix /vmlinuz \ + /etc/hosts /etc/resolv.conf; do + if [ -f $file ]; then + if [ ".$randfiles" = . ]; then + randfiles="$file" + else + randfiles="${randfiles}:$file" + fi + fi +done + + +echo "${T_MD}maketestcrt -- Create self-signed test certificate${T_ME}" +echo "(C) 2001 Jean-Michel Dault <jmdault@mandrakesoft.com> and Mandrakesoft" +echo "Based on cca.sh script by Ralf S. Engelschall" +echo "" + +grep -q -s DUMMY server.crt && mv server.crt server.crt.dummy +grep -q -s DUMMY server.key && mv server.key server.key.dummy + +echo "" +echo "" + +if [ ! -e ./server.crt -a ! -e ./server.key ];then + echo "Will create server.key and server.crt in `pwd`" +else + echo "server.key and server.crt already exist, dying" + exit +fi + +echo "" + + +mkdir -p /tmp/tmpssl-$$ +pushd /tmp/tmpssl-$$ > /dev/null + + + echo "${T_MD}INITIALIZATION${T_ME}" + + echo "" + echo "${T_MD}Generating custom Certificate Authority (CA)${T_ME}" + echo "______________________________________________________________________" + echo "" + echo "${T_MD}STEP 1: Generating RSA private key for CA (1024 bit)${T_ME}" + cp /dev/null ca.rnd + echo '01' >ca.ser + if [ ".$randfiles" != . ]; then + $openssl genrsa -rand $randfiles -out ca.key 1024 + else + $openssl genrsa -out ca.key 1024 + fi + if [ $? -ne 0 ]; then + echo "cca:Error: Failed to generate RSA private key" 1>&2 + exit 1 + fi + echo "______________________________________________________________________" + echo "" + echo "${T_MD}STEP 2: Generating X.509 certificate signing request for CA${T_ME}" + cat >.cfg <<EOT +[ req ] +default_bits = 1024 +distinguished_name = req_DN +RANDFILE = ca.rnd +[ req_DN ] +countryName = "1. Country Name (2 letter code)" +#countryName_default = CA +#countryName_min = 2 +countryName_max = 2 +stateOrProvinceName = "2. State or Province Name (full name) " +#stateOrProvinceName_default = "Quebec" +localityName = "3. Locality Name (eg, city) " +#localityName_default = "Montreal" +0.organizationName = "4. Organization Name (eg, company) " +0.organizationName_default = "Apache HTTP Server" +organizationalUnitName = "5. Organizational Unit Name (eg, section) " +organizationalUnitName_default = "For testing purposes only" +commonName = "6. Common Name (eg, CA name) " +commonName_max = 64 +commonName_default = "localhost" +emailAddress = "7. Email Address (eg, name@FQDN)" +emailAddress_max = 40 +#emailAddress_default = "root@localhost" +EOT + $openssl req -config .cfg -new -key ca.key -out ca.csr + if [ $? -ne 0 ]; then + echo "cca:Error: Failed to generate certificate signing request" 1>&2 + exit 1 + fi + echo "______________________________________________________________________" + echo "" + echo "${T_MD}STEP 3: Generating X.509 certificate for CA signed by itself${T_ME}" + cat >.cfg <<EOT +#extensions = x509v3 +#[ x509v3 ] +#subjectAltName = email:copy +#basicConstraints = CA:true,pathlen:0 +#nsComment = "CCA generated custom CA certificate" +#nsCertType = sslCA +EOT + $openssl x509 -extfile .cfg -req -days 365 -signkey ca.key -in ca.csr -out ca.crt + if [ $? -ne 0 ]; then + echo "cca:Error: Failed to generate self-signed CA certificate" 1>&2 + exit 1 + fi + echo "______________________________________________________________________" + echo "" + echo "${T_MD}RESULT:${T_ME}" + $openssl verify ca.crt + if [ $? -ne 0 ]; then + echo "cca:Error: Failed to verify resulting X.509 certificate" 1>&2 + exit 1 + fi + $openssl x509 -text -in ca.crt + $openssl rsa -text -in ca.key + + echo "${T_MD}CERTIFICATE GENERATION${T_ME}" + user="server" + + echo "" + echo "${T_MD}Generating custom USER${T_ME} [$user]" + echo "______________________________________________________________________" + echo "" + echo "${T_MD}STEP 5: Generating RSA private key for USER (1024 bit)${T_ME}" + if [ ".$randfiles" != . ]; then + $openssl genrsa -rand $randfiles -out $user.key 1024 + else + $openssl genrsa -out $user.key 1024 + fi + if [ $? -ne 0 ]; then + echo "cca:Error: Failed to generate RSA private key" 1>&2 + exit 1 + fi + echo "______________________________________________________________________" + echo "" + echo "${T_MD}STEP 6: Generating X.509 certificate signing request for USER${T_ME}" + cat >.cfg <<EOT +[ req ] +default_bits = 1024 +distinguished_name = req_DN +RANDFILE = ca.rnd +[ req_DN ] +countryName = "1. Country Name (2 letter code)" +#countryName_default = XY +#countryName_min = 2 +countryName_max = 2 +stateOrProvinceName = "2. State or Province Name (full name) " +#stateOrProvinceName_default = "Unknown" +localityName = "3. Locality Name (eg, city) " +#localityName_default = "Server Room" +0.organizationName = "4. Organization Name (eg, company) " +0.organizationName_default = "Apache HTTP Server" +organizationalUnitName = "5. Organizational Unit Name (eg, section) " +organizationalUnitName_default = "Test Certificate" +commonName = "6. Common Name (eg, DOMAIN NAME) " +commonName_max = 64 +commonName_default = "localhost" +emailAddress = "7. Email Address (eg, name@fqdn)" +emailAddress_max = 40 +#emailAddress_default = "root@localhost" +EOT + $openssl req -config .cfg -new -key $user.key -out $user.csr + if [ $? -ne 0 ]; then + echo "cca:Error: Failed to generate certificate signing request" 1>&2 + exit 1 + fi + rm -f .cfg + echo "______________________________________________________________________" + echo "" + echo "${T_MD}STEP 7: Generating X.509 certificate signed by own CA${T_ME}" + cat >.cfg <<EOT +#extensions = x509v3 +#[ x509v3 ] +#subjectAltName = email:copy +#basicConstraints = CA:false,pathlen:0 +#nsComment = "CCA generated client certificate" +#nsCertType = client +EOT + $openssl x509 -extfile .cfg -days 365 -CAserial ca.ser -CA ca.crt -CAkey ca.key -in $user.csr -req -out $user.crt + if [ $? -ne 0 ]; then + echo "cca:Error: Failed to generate X.509 certificate" 1>&2 + exit 1 + fi + caname="`$openssl x509 -noout -text -in ca.crt |\ + grep Subject: | sed -e 's;.*CN=;;' -e 's;/Em.*;;'`" + username="`$openssl x509 -noout -text -in $user.crt |\ + grep Subject: | sed -e 's;.*CN=;;' -e 's;/Em.*;;'`" +# echo "Assembling PKCS#12 package" +# $openssl pkcs12 -export -in $user.crt -inkey $user.key -certfile ca.crt -name "$username" -caname "$caname" -out $user.p12 + echo "______________________________________________________________________" + echo "" + echo "${T_MD}RESULT:${T_ME}" + $openssl verify -CAfile ca.crt $user.crt + if [ $? -ne 0 ]; then + echo "cca:Error: Failed to verify resulting X.509 certificate" 1>&2 + exit 1 + fi + $openssl x509 -text -in $user.crt + $openssl rsa -text -in $user.key + + +popd >/dev/null + + +rm -f /tmp/tmpssl-$$/*.csr +rm -f /tmp/tmpssl-$$/ca.* +chmod 400 /tmp/tmpssl-$$/* + +echo "Certificate creation done!" +cp /tmp/tmpssl-$$/server.* . + +rm -rf /tmp/tmpssl-$$ |