From: Lars Bahner <bahner@debian.org>
Subject: Debian conformance patch for the Debian pyca-package
 This patch consists mainly of FHS (2.2) stuff

diff -Naur pyca.orig/bin/ca2ldif.py pyca-20030602/bin/ca2ldif.py
--- pyca.orig/bin/ca2ldif.py	2002-02-20 18:41:22.000000000 +0100
+++ pyca-20030602/bin/ca2ldif.py	2003-06-03 22:19:23.000000000 +0200
@@ -34,11 +34,11 @@
 
   --config=[pathname]
 	Pathname of OpenSSL configuration file.
-	Default: /etc/openssl/openssl.cnf
+	Default: /etc/pyca/openssl.cnf
 
   --pycalib=[directory]
         Specify directory containing the pyCA modules
-	Default: /usr/local/pyca/pylib
+	Default: /usr/share/pyca/pylib
 
   --out=[pathname]
 	Pathname of LDIF file for output
@@ -70,7 +70,7 @@
 if findoption(options,'--config')!=():
   opensslcnfname = findoption(options,'--config')[1]
 else:
-  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/openssl/openssl.cnf')
+  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/pyca/openssl.cnf')
 
 if not os.path.isfile(opensslcnfname):
   PrintUsage('Config file %s not found.' % (opensslcnfname))
@@ -79,7 +79,7 @@
 if findoption(options,'--pycalib')!=():
   pycalib = findoption(options,'--pycalib')[1]
 else:
-  pycalib = os.environ.get('PYCALIB','/usr/local/pyca/pylib')
+  pycalib = os.environ.get('PYCALIB','/usr/share/pyca/pylib')
 
 if not os.path.exists(pycalib) or not os.path.isdir(pycalib):
   PrintUsage('Module directory %s does not exist or is no directory.' % (pycalib))
diff -Naur pyca.orig/conf/cacert_AuthCerts.cnf pyca-20030602/conf/cacert_AuthCerts.cnf
--- pyca.orig/conf/cacert_AuthCerts.cnf	2003-05-15 20:32:19.000000000 +0200
+++ pyca-20030602/conf/cacert_AuthCerts.cnf	2003-06-03 22:16:51.000000000 +0200
@@ -39,16 +39,16 @@
 subjectKeyIdentifier=hash
 authorityKeyIdentifier=keyid:always,issuer:always
 keyUsage = cRLSign, keyCertSign
-subjectAltName = URI:"http://localhost/pyca/get-cert.py/AuthCerts/ca.crt"
+subjectAltName = URI:"http://localhost/cgi-bin/pyca/get-cert.py/AuthCerts/ca.crt"
 issuerAltName = issuer:copy
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/Root/crl.crl"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 #certificatePolicies=ia5org,@polsect
 
 # Netscape cert extensions
 nsComment = "This CA issues SSL client certificates."
 nsCaPolicyUrl = "https://localhost/AuthCerts/policy.html"
 nsCertType = sslCA
-nsCaRevocationUrl = "http://localhost/pyca/get-cert.py/Root/crl.crl"
+nsCaRevocationUrl = "http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 
 [ polsect ]
 #policyIdentifier=1.2.3.4
diff -Naur pyca.orig/conf/cacert_CodeSigning.cnf pyca-20030602/conf/cacert_CodeSigning.cnf
--- pyca.orig/conf/cacert_CodeSigning.cnf	2003-05-15 20:32:19.000000000 +0200
+++ pyca-20030602/conf/cacert_CodeSigning.cnf	2003-06-03 22:16:51.000000000 +0200
@@ -39,16 +39,16 @@
 subjectKeyIdentifier=hash
 authorityKeyIdentifier=keyid:always,issuer:always
 keyUsage = cRLSign, keyCertSign
-subjectAltName = URI:"http://localhost/pyca/get-cert.py/CodeSigning/ca.crt"
+subjectAltName = URI:"http://localhost/cgi-bin/pyca/get-cert.py/CodeSigning/ca.crt"
 issuerAltName = issuer:copy
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/Root/crl.crl"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 #certificatePolicies=ia5org,@polsect
 
 # Netscape cert extensions
 nsComment = "This CA issues code signing certificates."
 nsCaPolicyUrl = "https://localhost/CodeSigning/policy.html"
 nsCertType = objCA
-nsCaRevocationUrl = "http://localhost/pyca/get-cert.py/Root/crl.crl"
+nsCaRevocationUrl = "http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 
 [ polsect ]
 #policyIdentifier=1.2.3.4
diff -Naur pyca.orig/conf/cacert_EmailCerts.cnf pyca-20030602/conf/cacert_EmailCerts.cnf
--- pyca.orig/conf/cacert_EmailCerts.cnf	2003-05-15 20:32:19.000000000 +0200
+++ pyca-20030602/conf/cacert_EmailCerts.cnf	2003-06-03 22:16:51.000000000 +0200
@@ -39,16 +39,16 @@
 subjectKeyIdentifier=hash
 authorityKeyIdentifier=keyid:always,issuer:always
 keyUsage = cRLSign, keyCertSign
-subjectAltName = URI:"http://localhost/pyca/get-cert.py/EmailCerts/ca.crt"
+subjectAltName = URI:"http://localhost/cgi-bin/pyca/get-cert.py/EmailCerts/ca.crt"
 issuerAltName = issuer:copy
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/Root/crl.crl"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 #certificatePolicies=ia5org,@polsect
 
 # Netscape cert extensions
 nsComment = "This CA issues e-mail certificates."
 nsCaPolicyUrl = "https://localhost/EmailCerts/policy.html"
 nsCertType = emailCA
-nsCaRevocationUrl = "http://localhost/pyca/get-cert.py/Root/crl.crl"
+nsCaRevocationUrl = "http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 
 [ polsect ]
 #policyIdentifier=1.2.3.4
diff -Naur pyca.orig/conf/cacert_Root.cnf pyca-20030602/conf/cacert_Root.cnf
--- pyca.orig/conf/cacert_Root.cnf	2003-05-15 20:32:19.000000000 +0200
+++ pyca-20030602/conf/cacert_Root.cnf	2003-06-03 22:16:51.000000000 +0200
@@ -37,8 +37,8 @@
 # Netscape cert extensions
 nsCertType = sslCA,emailCA,objCA
 nsComment = "This Root CA issues sub-CA certs of different policies and has no contact with end-entities."
-nsCaPolicyUrl = "https://localhost/Root/policy.html"
-nsCaRevocationUrl = "http://localhost/pyca/get-cert.py/Root/crl.crl"
+nsCaPolicyUrl = "http://localhost/Root/policy.html"
+nsCaRevocationUrl = "http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 
 # PKIX
 basicConstraints=critical,CA:true
@@ -46,8 +46,8 @@
 authorityKeyIdentifier=keyid:always,issuer:always
 keyUsage = cRLSign,keyCertSign
 extendedKeyUsage = nsSGC,msSGC
-subjectAltName = URI:"http://localhost/pyca/get-cert.py/Root/ca.crt"
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/Root/crl.crl"
+subjectAltName = URI:"http://localhost/cgi-bin/pyca/get-cert.py/Root/ca.crt"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 #certificatePolicies=ia5org,@polsect
 
 [ polsect ]
diff -Naur pyca.orig/conf/cacert_ServerCerts.cnf pyca-20030602/conf/cacert_ServerCerts.cnf
--- pyca.orig/conf/cacert_ServerCerts.cnf	2003-05-15 20:32:19.000000000 +0200
+++ pyca-20030602/conf/cacert_ServerCerts.cnf	2003-06-03 22:16:51.000000000 +0200
@@ -40,16 +40,16 @@
 authorityKeyIdentifier=keyid:always,issuer:always
 keyUsage = cRLSign, keyCertSign
 extendedKeyUsage = nsSGC,msSGC
-subjectAltName = URI:"http://localhost/pyca/get-cert.py/ServerCerts/ca.crt"
+subjectAltName = URI:"http://localhost/cgi-bin/pyca/get-cert.py/ServerCerts/ca.crt"
 issuerAltName = issuer:copy
-crlDistributionPoints = URI:"http://localhost/pyca/get-cert.py/Root/crl.crl"
+crlDistributionPoints = URI:"http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 #certificatePolicies=ia5org,@polsect
 
 # Netscape cert extensions
 nsComment = "This CA issues SSL server certificates."
 nsCaPolicyUrl = "https://localhost/ServerCerts/policy.html"
 nsCertType = sslCA
-nsCaRevocationUrl = "http://localhost/pyca/get-cert.py/Root/crl.crl"
+nsCaRevocationUrl = "http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 
 [ polsect ]
 #policyIdentifier=1.2.3.4
diff -Naur pyca.orig/conf/openssl.cnf pyca-20030602/conf/openssl.cnf
--- pyca.orig/conf/openssl.cnf	2003-05-15 20:32:19.000000000 +0200
+++ pyca-20030602/conf/openssl.cnf	2003-06-03 22:29:03.000000000 +0200
@@ -12,7 +12,7 @@
 #      +-CodeSigning    (solely for code signing, Authenticode etc.)
 
 RANDFILE		= "$ENV::HOME/.rnd"
-oid_file		= /etc/openssl/.oid
+oid_file		= /etc/pyca/.oid
 oid_section             = new_oids
 
 [ new_oids ]
@@ -41,7 +41,7 @@
 ####################################################################
 
 [ CA_Root ]
-dir		= /usr/local/myCA/Root# Where everything is kept
+dir		= /var/lib/pyca/Root# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
@@ -58,12 +58,12 @@
 default_md	= sha1			# which md to use.
 preserve	= no			# keep passed DN ordering
 policy		= policy_CA
-ca_x509_extfile	= /etc/openssl/cacert_Root.cnf
+ca_x509_extfile	= /etc/pyca/cacert_Root.cnf
 x509_extensions	= x509v3_ext_CA		# This section is only used for
                                         # displaying the params in ca-index.py
 
 [ CA_EmailCerts ]
-dir		= /usr/local/myCA/EmailCerts	# Where everything is kept
+dir		= /var/lib/pyca/EmailCerts	# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
@@ -82,12 +82,12 @@
 policy		= policy_EmailCerts
 x509_extensions	= x509v3_ext_EmailCerts
 signedby	= Root
-ca_x509_extfile	= /etc/openssl/cacert_EmailCerts.cnf
+ca_x509_extfile	= /etc/pyca/cacert_EmailCerts.cnf
 req		= req_EmailCerts
 min_key_size    = 768
 
 [ CA_AuthCerts ]
-dir		= /usr/local/myCA/AuthCerts	# Where everything is kept
+dir		= /var/lib/pyca/AuthCerts	# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
@@ -106,11 +106,11 @@
 policy		= policy_AuthCerts
 x509_extensions	= x509v3_ext_AuthCerts
 signedby	= Root
-ca_x509_extfile	= /etc/openssl/cacert_AuthCerts.cnf
+ca_x509_extfile	= /etc/pyca/cacert_AuthCerts.cnf
 req		= req_AuthCerts
 
 [ CA_CodeSigning ]
-dir		= /usr/local/myCA/CodeSigning	# Where everything is kept
+dir		= /var/lib/pyca/CodeSigning	# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
@@ -129,11 +129,11 @@
 policy		= policy_CodeSigning
 x509_extensions	= x509v3_ext_CodeSigning
 signedby	= Root
-ca_x509_extfile	= /etc/openssl/cacert_CodeSigning.cnf
+ca_x509_extfile	= /etc/pyca/cacert_CodeSigning.cnf
 req		= req_EmailCerts
 
 [ CA_ServerCerts ]
-dir		= /usr/local/myCA/ServerCerts	# Where everything is kept
+dir		= /var/lib/pyca/ServerCerts	# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
@@ -152,7 +152,7 @@
 policy		= policy_ServerCerts
 x509_extensions	= x509v3_ext_ServerCerts
 signedby	= Root
-ca_x509_extfile	= /etc/openssl/cacert_ServerCerts.cnf
+ca_x509_extfile	= /etc/pyca/cacert_ServerCerts.cnf
 
 ########################### Policies ###############################
 
@@ -310,13 +310,13 @@
 [ x509v3_ext_CA ]
 basicConstraints        = CA:true
 keyUsage = cRLSign,keyCertSign
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/Root/crl.crl"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/Root/crl.crl"
 nsComment		= "This certificate is used for issueing sub-CA certs."
-nsBaseUrl		= "https://localhost/"
-nsCaRevocationUrl	= pyca/get-cert.py/Root/crl.crl
-nsRevocationUrl		= pyca/ns-check-rev.py/Root?
-nsRenewalUrl		= pyca/ns-renewal.py/Root?
-nsCaPolicyUrl		= TestCA/policy/CA-policy.html
+nsBaseUrl		= "http://localhost/"
+nsCaRevocationUrl	= cgi-bin/pyca/get-cert.py/Root/crl.crl
+nsRevocationUrl		= cgi-binpyca/ns-check-rev.py/Root?
+nsRenewalUrl		= cgi-bin/pyca/ns-renewal.py/Root?
+nsCaPolicyUrl		= CA/policy.html
 
 [ x509v3_ext_EmailCerts ]
 # PKIX extensions
@@ -324,16 +324,16 @@
 authorityKeyIdentifier  = keyid:always,issuer:always
 keyUsage                = nonRepudiation,digitalSignature,keyEncipherment
 extendedKeyUsage        = emailProtection
-issuerAltName = URI:"https://localhost/pyca/get-cert.py/EmailCerts/ca.crt"
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/EmailCerts/crl.crl"
+issuerAltName 		= URI:"http://localhost/cgi-bin/pyca/get-cert.py/EmailCerts/ca.crt"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/EmailCerts/crl.crl"
 subjectAltName = email:copy
 # Netscape-specific extensions
 nsComment		= "This certificate is used for e-mail."
-nsBaseUrl		= "https://localhost/"
-nsCaRevocationUrl	= pyca/get-cert.py/EmailCerts/crl.crl
-nsRevocationUrl		= pyca/ns-check-rev.py/EmailCerts?
-nsRenewalUrl		= pyca/ns-renewal.py/EmailCerts?
-nsCaPolicyUrl		= TestCA/policy/EmailCerts-policy.html
+nsBaseUrl		= "http://localhost/"
+nsCaRevocationUrl	= cgi-bin/pyca/get-cert.py/EmailCerts/crl.crl
+nsRevocationUrl		= cgi-bin/pyca/ns-check-rev.py/EmailCerts?
+nsRenewalUrl		= cgi-bin/pyca/ns-renewal.py/EmailCerts?
+nsCaPolicyUrl		= EmailCerts/policy.html
 nsCertType		= email
 
 [ x509v3_ext_AuthCerts ]
@@ -342,15 +342,15 @@
 authorityKeyIdentifier  = keyid:always,issuer:always
 keyUsage                = digitalSignature
 extendedKeyUsage        = clientAuth
-issuerAltName = URI:"https://localhost/pyca/get-cert.py/AuthCerts/ca.crt"
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/AuthCerts/crl.crl"
+issuerAltName = URI:"http://localhost/cgi-bin/pyca/get-cert.py/AuthCerts/ca.crt"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/AuthCerts/crl.crl"
 # Netscape-specific extensions
 nsComment		= "This certificate is used for strong authentication."
-nsBaseUrl		= "https://localhost/"
-nsCaRevocationUrl	= pyca/get-cert.py/AuthCerts/crl.crl
-nsRevocationUrl		= pyca/ns-check-rev.py/AuthCerts?
-nsRenewalUrl		= pyca/ns-renewal.py/AuthCerts?
-nsCaPolicyUrl		= TestCA/policy/AuthCerts-policy.html
+nsBaseUrl		= "http://localhost/"
+nsCaRevocationUrl	= cgi-bin/pyca/get-cert.py/AuthCerts/crl.crl
+nsRevocationUrl		= cgi-bin/pyca/ns-check-rev.py/AuthCerts?
+nsRenewalUrl		= cgi-bin/pyca/ns-renewal.py/AuthCerts?
+nsCaPolicyUrl		= AuthCerts/policy.html
 nsCertType		= client
 
 [ x509v3_ext_CodeSigning ]
@@ -359,31 +359,31 @@
 authorityKeyIdentifier  = keyid:always,issuer:always
 keyUsage                = digitalSignature
 extendedKeyUsage        = codeSigning
-issuerAltName = URI:"https://localhost/pyca/get-cert.py/CodeSigning/ca.crt"
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/CodeSigning/crl.crl"
+issuerAltName = URI:"http://localhost/cgi-bin/pyca/get-cert.py/CodeSigning/ca.crt"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/CodeSigning/crl.crl"
 # Netscape-specific extensions
 nsComment		= "This certificate is used for CodeSigning signing."
-nsBaseUrl		= "https://localhost/"
-nsCaRevocationUrl	= pyca/get-cert.py/CodeSigning/crl.crl
-nsRevocationUrl		= pyca/ns-check-rev.py/CodeSigning?
-nsRenewalUrl		= pyca/ns-renewal.py/CodeSigning?
-nsCaPolicyUrl		= TestCA/policy/CodeSigning-policy.html
+nsBaseUrl		= "http://localhost/"
+nsCaRevocationUrl	= cgi-bin/pyca/get-cert.py/CodeSigning/crl.crl
+nsRevocationUrl		= cgi-bin/pyca/ns-check-rev.py/CodeSigning?
+nsRenewalUrl		= cgi-bin/pyca/ns-renewal.py/CodeSigning?
+nsCaPolicyUrl		= CodeSigning/policy.html
 nsCertType		= objsign
 
 [ x509v3_ext_ServerCerts ]
 # PKIX extensions
 subjectKeyIdentifier    = hash
 authorityKeyIdentifier  = keyid:always,issuer:always
-crlDistributionPoints	= URI:"http://localhost/pyca/get-cert.py/ServerCerts/crl.crl"
+crlDistributionPoints	= URI:"http://localhost/cgi-bin/pyca/get-cert.py/ServerCerts/crl.crl"
 keyUsage                = keyEncipherment
 extendedKeyUsage        = serverAuth,nsSGC,msSGC
 # Netscape-specific extensions
 nsComment		= "This certificate is used for SSL ServerCerts."
-nsBaseUrl		= "https://localhost/"
-nsCaRevocationUrl	= pyca/get-cert.py/ServerCerts/crl.crl
-nsRevocationUrl		= pyca/ns-check-rev.py/ServerCerts?
-nsRenewalUrl		= pyca/ns-renewal.py/ServerCerts?
-nsCaPolicyUrl		= TestCA/policy/ServerCerts-policy.html
+nsBaseUrl		= "http://localhost/"
+nsCaRevocationUrl	= cgi-bin/pyca/get-cert.py/ServerCerts/crl.crl
+nsRevocationUrl		= cgi-bin/pyca/ns-check-rev.py/ServerCerts?
+nsRenewalUrl		= cgi-bin/pyca/ns-renewal.py/ServerCerts?
+nsCaPolicyUrl		= ServerCerts/policy.html
 nsCertType		= server
 
 # [ pyca ] is a proprietary, non-OpenSSL section for the pyca-package
@@ -396,37 +396,37 @@
 # Base-URL for the other URL addresses
 # This is meant as fallback option if the CA-specific
 # attribute nsBaseUrl is not set
-nsBaseUrl = "https://localhost/"
+nsBaseUrl = "http://localhost/"
 
 # Relative URL address of ca-index.py
-nsCAIndexUrl = pyca/ca-index.py
+nsCAIndexUrl = cgi-bin/pyca/ca-index.py
 
 # Relative URL address of client-enroll.py
-nsEnrollUrl = pyca/client-enroll.py
+nsEnrollUrl = cgi-bin/pyca/client-enroll.py
 
 # Relative URL address of get-cert.py
-nsGetCertUrl = pyca/get-cert.py
+nsGetCertUrl = cgi-bin/pyca/get-cert.py
 
 # Relative URL address of view-cert.py
-nsViewCertUrl = pyca/view-cert.py
+nsViewCertUrl = cgi-bin/pyca/view-cert.py
 
 # Pathname of the openssl executable
 OpenSSLExec = /usr/bin/openssl
 
 # Username of caadmin
-userCAAdmin = caadmin
+userCAAdmin = pyca
 
 # Username of WWW Server
-userWWWRun = wwwrun
+userWWWRun = www-data
 
 # Username of mail delivery demon
-userMailDaemon = daemon
+userMailDaemon = nobody
 
 # Preferred HTTP method for submitting form parameters
 ScriptMethod = POST
 
 # Relative URL address of help texts (e.g. client-enroll-help.html)
-HelpUrl = inkasite/python/pyca/help/
+HelpUrl = /pyca/help/
 
 # The default SMTP mail relay
 MailRelay = localhost
@@ -441,16 +441,16 @@
 
 # Pathname for the error log file.
 # stderr is used as default, if empty or not defined.
-#ErrorLog = /var/log/pyca/httpd_error_log
+ErrorLog = /var/log/pyca/httpd_error_log
 
 # E-mail address of the mail dialogue script for certificate requests
 # if empty, no mail dialogue is initiated.
-caCertReqMailAdr = confirm-cert-req@ms.inka.de
+caCertReqMailAdr = ca-certreq-mail@localhost
 
 # Central e-mail address of the CA's administrator.
 # This is used as From: address if the subject name of a CA cert does
 # not contain an Email attribute.
-caAdminMailAdr = caadmin@ms.inka.de
+caAdminMailAdr = pyca@localhost
 
 # Amount of time [h] how long a pending certificate request is stored
 # in caPendCertReqDir without being confirmed by e-mail.
@@ -467,7 +467,7 @@
 caInternalIPAdr = 127.0.0.0/255.0.0.0,10.0.0.0/255.0.0.0
 
 # List of email address domains which are handled as internal
-caInternalDomains = pyca.de
+caInternalDomains = localhost
 
 # List of CA names for which handling of intermediate CA certs should
 # be provided.
diff -Naur pyca.orig/sbin/ca-certreq-mail.py pyca-20030602/sbin/ca-certreq-mail.py
--- pyca.orig/sbin/ca-certreq-mail.py	2002-05-31 22:54:48.000000000 +0200
+++ pyca-20030602/sbin/ca-certreq-mail.py	2003-06-03 22:16:51.000000000 +0200
@@ -60,7 +60,7 @@
 if findoption(options,'--pycalib')!=():
   pycalib = findoption(options,'--pycalib')[1]
 else:
-  pycalib = os.environ.get('PYCALIB','/usr/local/pyca/pylib')
+  pycalib = os.environ.get('PYCALIB','/usr/share/pyca/pylib')
 if not os.path.exists(pycalib) or not os.path.isdir(pycalib):
   LogWrite(logfile,'Error',None,'Module directory %s not exists or not a directory.' % (pycalib))
 sys.path.append(pycalib)
@@ -68,7 +68,7 @@
 if findoption(options,'--config')!=():
   opensslcnfname = findoption(options,'--config')[1]
 else:
-  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/openssl/openssl.cnf')
+  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/pyca/openssl.cnf')
 
 if not os.path.isfile(opensslcnfname):
   LogWrite(logfile,'Error',None,'Config file %s not found.' % (opensslcnfname))
diff -Naur pyca.orig/sbin/ca-cycle-priv.py pyca-20030602/sbin/ca-cycle-priv.py
--- pyca.orig/sbin/ca-cycle-priv.py	2001-06-09 20:52:53.000000000 +0200
+++ pyca-20030602/sbin/ca-cycle-priv.py	2003-06-03 22:16:51.000000000 +0200
@@ -44,11 +44,11 @@
   --config=[pathname]
 	Pathname of OpenSSL configuration file.
         You may also use env variable OPENSSL_CONF.
-	Default: /etc/openssl/openssl.cnf
+	Default: /etc/pyca/openssl.cnf
 
   --pycalib=[directory]
         Specify directory containing the pyCA modules
-	Default: /usr/local/pyca/pylib
+	Default: /usr/share/pyca/pylib
 
   --issuecrls
         Force issuing of new CRLs
@@ -76,7 +76,7 @@
 if findoption(options,'--config')!=():
   opensslcnfname = findoption(options,'--config')[1]
 else:
-  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/openssl/openssl.cnf')
+  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/pyca/openssl.cnf')
 
 if not os.path.isfile(opensslcnfname):
   PrintUsage('Config file %s not found.' % (opensslcnfname))
@@ -84,7 +84,7 @@
 if findoption(options,'--pycalib')!=():
   pycalib = findoption(options,'--pycalib')[1]
 else:
-  pycalib = os.environ.get('PYCALIB','/usr/local/pyca/pylib')
+  pycalib = os.environ.get('PYCALIB','/usr/share/pyca/pylib')
 
 issuecrls = findoption(options,'--issuecrls')!=()
 
diff -Naur pyca.orig/sbin/ca-cycle-pub.py pyca-20030602/sbin/ca-cycle-pub.py
--- pyca.orig/sbin/ca-cycle-pub.py	2001-06-09 16:50:09.000000000 +0200
+++ pyca-20030602/sbin/ca-cycle-pub.py	2003-06-03 22:16:51.000000000 +0200
@@ -41,11 +41,11 @@
   --config=[pathname]
 	Pathname of OpenSSL configuration file.
         You may also use env variable OPENSSL_CONF.
-	Default: /etc/openssl/openssl.cnf
+	Default: /etc/pyca/openssl.cnf
 
   --pycalib=[directory]
         Specify directory containing the pyCA modules
-	Default: /usr/local/pyca/pylib
+	Default: /usr/share/pyca/pylib
 
 """ % (script_name,script_name))
   if ErrorMsg:
@@ -69,7 +69,7 @@
 if findoption(options,'--config')!=():
   opensslcnfname = findoption(options,'--config')[1]
 else:
-  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/openssl/openssl.cnf')
+  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/pyca/openssl.cnf')
 
 if not os.path.isfile(opensslcnfname):
   PrintUsage('Config file %s not found.' % (opensslcnfname))
@@ -77,7 +77,7 @@
 if findoption(options,'--pycalib')!=():
   pycalib = findoption(options,'--pycalib')[1]
 else:
-  pycalib = os.environ.get('PYCALIB','/usr/local/pyca/pylib')
+  pycalib = os.environ.get('PYCALIB','/usr/share/pyca/pylib')
 
 if not os.path.exists(pycalib) or not os.path.isdir(pycalib):
   PrintUsage('Module directory %s not exists or not a directory.' % (pycalib))
diff -Naur pyca.orig/sbin/ca-make.py pyca-20030602/sbin/ca-make.py
--- pyca.orig/sbin/ca-make.py	2002-05-31 22:44:56.000000000 +0200
+++ pyca-20030602/sbin/ca-make.py	2003-06-03 22:16:51.000000000 +0200
@@ -83,11 +83,11 @@
   --config=[pathname]
 	Pathname of OpenSSL configuration file.
         You may also use env variable OPENSSL_CONF.
-	Default: /etc/openssl/openssl.cnf
+	Default: /etc/pyca/openssl.cnf
 
   --pycalib=[directory]
         Specify directory containing the pyCA modules
-	Default: /usr/local/pyca/pylib
+	Default: /usr/share/pyca/pylib
 
 """ % (script_name,script_name))
   if ErrorMsg:
@@ -111,7 +111,7 @@
 if findoption(options,'--config')!=():
   opensslcnfname = findoption(options,'--config')[1]
 else:
-  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/openssl/openssl.cnf')
+  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/pyca/openssl.cnf')
 
 if not os.path.isfile(opensslcnfname):
   PrintUsage('Config file %s not found.' % (opensslcnfname))
@@ -119,7 +119,7 @@
 if findoption(options,'--pycalib')!=():
   pycalib = findoption(options,'--pycalib')[1]
 else:
-  pycalib = os.environ.get('PYCALIB','/usr/local/pyca/pylib')
+  pycalib = os.environ.get('PYCALIB','/usr/share/pyca/pylib')
 
 if not os.path.exists(pycalib) or not os.path.isdir(pycalib):
   PrintUsage('Module directory %s not exists or not a directory.' % (pycalib))
diff -Naur pyca.orig/sbin/ca-revoke.py pyca-20030602/sbin/ca-revoke.py
--- pyca.orig/sbin/ca-revoke.py	2001-05-18 12:17:21.000000000 +0200
+++ pyca-20030602/sbin/ca-revoke.py	2003-06-03 22:16:51.000000000 +0200
@@ -36,12 +36,12 @@
   --config=[pathname]
 	Pathname of OpenSSL configuration file.
         You may also use env variable OPENSSL_CONF.
-	Default: /etc/openssl/openssl.cnf
+	Default: /etc/pyca/openssl.cnf
 
   --pycalib=[directory]
         Specify directory containing the pyCA modules
         You may also use env variable PYCALIB.
-	Default: /usr/local/pyca/pylib
+	Default: /usr/share/pyca/pylib
 
   --name=[CA name]
         Name of CA in section [ca] of OpenSSL config.
@@ -71,7 +71,7 @@
 if findoption(options,'--config')!=():
   opensslcnfname = findoption(options,'--config')[1]
 else:
-  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/openssl/openssl.cnf')
+  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/pyca/openssl.cnf')
 
 if not os.path.isfile(opensslcnfname):
   PrintUsage('Config file %s not found.' % (opensslcnfname))
@@ -79,7 +79,7 @@
 if findoption(options,'--pycalib')!=():
   pycalib = findoption(options,'--pycalib')[1]
 else:
-  pycalib = os.environ.get('PYCALIB','/usr/local/pyca/pylib')
+  pycalib = os.environ.get('PYCALIB','/usr/share/pyca/pylib')
 
 if not os.path.exists(pycalib) or not os.path.isdir(pycalib):
   PrintUsage('Module directory %s not exists or not a directory.' % (pycalib))
diff -Naur pyca.orig/sbin/pickle-cnf.py pyca-20030602/sbin/pickle-cnf.py
--- pyca.orig/sbin/pickle-cnf.py	2001-05-18 12:17:21.000000000 +0200
+++ pyca-20030602/sbin/pickle-cnf.py	2003-06-03 22:16:51.000000000 +0200
@@ -34,12 +34,12 @@
   --config=[pathname]
 	Pathname of OpenSSL configuration file.
         You may also use env variable OPENSSL_CONF.
-	Default: /etc/openssl/openssl.cnf
+	Default: /etc/pyca/openssl.cnf
 
   --pycalib=[directory]
         Specify directory containing the pyCA modules
         You may also use env variable PYCALIB.
-	Default: /usr/local/pyca/pylib
+	Default: /usr/share/pyca/pylib
 
 """ % (script_name,script_name))
   if ErrorMsg:
@@ -63,7 +63,7 @@
 if findoption(options,'--config')!=():
   opensslcnfname = findoption(options,'--config')[1]
 else:
-  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/openssl/openssl.cnf')
+  opensslcnfname = os.environ.get('OPENSSL_CONF','/etc/pyca/openssl.cnf')
 
 if not os.path.isfile(opensslcnfname):
   PrintUsage('Config file %s not found.' % (opensslcnfname))
@@ -71,7 +71,7 @@
 if findoption(options,'--pycalib')!=():
   pycalib = findoption(options,'--pycalib')[1]
 else:
-  pycalib = os.environ.get('PYCALIB','/usr/local/pyca/pylib')
+  pycalib = os.environ.get('PYCALIB','/usr/share/pyca/pylib')
 
 if not os.path.exists(pycalib) or not os.path.isdir(pycalib):
   PrintUsage('Module directory %s not exists or not a directory.' % (pycalib))
--- pyca.orig/cgi-bin/pycacnf.py	2003-05-15 20:32:19.000000000 +0200
+++ pyca-20030602/cgi-bin/pycacnf.py	2003-06-12 06:15:35.000000000 +0200
@@ -13,12 +13,11 @@
 
 # Full pathname of OpenSSL configuration file,
 # most times named openssl.cnf
-cnf_filename = '/etc/openssl/openssl.cnf'
+cnf_filename = '/etc/pyca/openssl.cnf'
 
 # List of additional module directories
 pylib = [
-  os.environ.get('PYCALIB','/usr/local/pyca/pylib'),
-  '/home/michael/Proj/python/pyca/pylib'
+  os.environ.get('PYCALIB','/usr/share/pyca/pylib')
 ]
 
 ########################################################################
