--<cut>--
diff -Naur openssl-0.9.5.orig/Makefile.org openssl-0.9.5/Makefile.org
--- openssl-0.9.5.orig/Makefile.org   Sun Aug  8 12:29:52 1999
+++ openssl-0.9.5/Makefile.org   Tue Aug 17 02:27:51 1999
@@ -12,6 +12,7 @@
 # Normally it is left empty.
 INSTALL_PREFIX=
 INSTALLTOP=/usr/local/ssl
+CONFDIR=/etc
 
 # Do not edit this manually. Use Configure --openssldir=DIR do change this!
 OPENSSLDIR=/usr/local/ssl
@@ -156,7 +157,7 @@
 MAKEFILE= Makefile.ssl
 MAKE=     make -f Makefile.ssl
 
-MANDIR=$(OPENSSLDIR)/man
+MANDIR=/usr/man
 MAN1=1
 MAN3=3
 SHELL=/bin/sh
@@ -339,7 +340,7 @@
       $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
       $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
       $(INSTALL_PREFIX)$(OPENSSLDIR)/private \
-      $(INSTALL_PREFIX)$(OPENSSLDIR)/lib
+      $(INSTALL_PREFIX)$(CONFDIR)
    @for i in $(EXHEADER) ;\
    do \
    (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
diff -Naur openssl-0.9.5.orig/apps/ca.c openssl-0.9.5/apps/ca.c
--- openssl-0.9.5.orig/apps/ca.c   Fri Aug  6 23:47:09 1999
+++ openssl-0.9.5/apps/ca.c   Tue Aug 17 02:26:44 1999
@@ -98,7 +98,7 @@
 #define PROG ca_main
 
 #define BASE_SECTION   "ca"
-#define CONFIG_FILE "openssl.cnf"
+#define CONFIG_FILE "/etc/openssl.cnf"
 
 #define ENV_DEFAULT_CA      "default_ca"
 
diff -Naur openssl-0.9.5.orig/e_os.h openssl-0.9.5/e_os.h
--- openssl-0.9.5.orig/e_os.h   Thu Jun 10 10:12:20 1999
+++ openssl-0.9.5/e_os.h   Tue Aug 17 02:26:44 1999
@@ -209,7 +209,7 @@
 #    else
 #      include <unixlib.h>
 #    endif
-#    define OPENSSL_CONF   "openssl.cnf"
+#    define OPENSSL_CONF   "/etc/openssl.cnf"
 #    define SSLEAY_CONF      OPENSSL_CONF
 #    define RFILE      ".rnd"
 #    define LIST_SEPARATOR_CHAR ','
@@ -231,7 +231,7 @@
      /* !defined VMS */
 #    include OPENSSL_UNISTD
 
-#    define OPENSSL_CONF   "openssl.cnf"
+#    define OPENSSL_CONF   "/etc/openssl.cnf"
 #    define SSLEAY_CONF      OPENSSL_CONF
 #    define RFILE      ".rnd"
 #    define LIST_SEPARATOR_CHAR ':'
--- openssl-0.9.5/apps/req.c.old   Mon Oct 18 22:20:41 1999
+++ openssl-0.9.5/apps/req.c   Mon Oct 18 22:21:07 1999
@@ -360,7 +360,8 @@
       p=getenv("SSLEAY_CONF");
    if (p == NULL)
       {
-      strcpy(config_name,X509_get_default_cert_area());
+   /*   strcpy(config_name,X509_get_default_cert_area()); */
+      *config_name=0;
 #ifndef VMS
       strcat(config_name,"/");
 #endif
--- openssl-0.9.5/apps/openssl.c.old   Mon Oct 18 22:17:52 1999
+++ openssl-0.9.5/apps/openssl.c   Mon Oct 18 22:20:35 1999
@@ -146,7 +146,8 @@
       p=getenv("SSLEAY_CONF");
    if (p == NULL)
       {
-      strcpy(config_name,X509_get_default_cert_area());
+   /*   strcpy(config_name,X509_get_default_cert_area()); */
+      *config_name=0;
 #ifndef VMS
       strcat(config_name,"/");
 #endif
--- openssl-0.9.5a/apps/Makefile.ssl   Mon Mar 20 15:27:29 2000
+++ openssl-0.9.5a/apps/Makefile.ssl   Mon May 22 18:12:30 2000
@@ -101,8 +101,8 @@
     cp $$i $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i; \
     chmod 755 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc/$$i ); \
     done
-   @cp openssl.cnf $(INSTALL_PREFIX)$(OPENSSLDIR); \
-   chmod 644 $(INSTALL_PREFIX)$(OPENSSLDIR)/openssl.cnf
+   @cp openssl.cnf $(INSTALL_PREFIX)/etc; \
+   chmod 644 $(INSTALL_PREFIX)/etc/openssl.cnf
 
 tags:
    ctags $(SRC)
--<cut>--

-- JcLawrence - 06 Sep 2000

Topic revision: r1 - 01 Feb 2002 - MattWalsh
 
This site is powered by the TWiki collaboration platformCopyright © 2008-2012 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback