- argh! db1 patch is out, updated db3 patch is back - httpd starts now

Changed files:
    apache1-mod_ssl.spec -> 1.34
    mod_ssl-db1.patch -> 1.2
    mod_ssl-db3.patch -> 1.3

diff --git a/apache1-mod_ssl.spec b/apache1-mod_ssl.spec
index cbc3115206155dfde5586eea6a2a355ba357e21b..8cc85d1e66a8296dfef3d77229a114679bb8e328 100644 (file)
--- a/apache1-mod_ssl.spec
+++ b/apache1-mod_ssl.spec
@@ -18,13 +18,12 @@ Source3:    %{name}-server.key
 Source4:       %{name}-sxnet.html
 Source5:       %{name}.logrotate
 Patch1:                mod_ssl-cca-openssl-path.patch
-Patch2:                mod_ssl-db1.patch
+Patch2:                mod_ssl-db3.patch
 URL:           http://www.modssl.org/
 BuildRequires: apache(EAPI)-devel = %{APACHEVER}
 BuildRequires: openssl-devel >= 0.9.6a
 BuildRequires: openssl-tools >= 0.9.6a
 BuildRequires: db3-devel
-BuildRequires: db1-devel
 BuildRequires: apache(EAPI)-devel = %{APACHEVER}
 Requires:      apache(EAPI) >= %{APACHEVER}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)

diff --git a/mod_ssl-db1.patch b/mod_ssl-db1.patch
deleted file mode 100644 (file)
index eedc7dc..0000000
--- a/mod_ssl-db1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mod_ssl-2.8.4-1.3.20/configure     Tue Mar  6 15:57:50 2001
-+++ mod_ssl-2.8.4-1.3.20-p/configure   Mon Sep 24 16:53:14 2001
-@@ -355,7 +355,7 @@
-     echo "INCDIR=$APXS_INCLUDEDIR" >>$file
-     echo "OSDIR=\$(INCDIR)" >>$file
-     echo "CC=$APXS_CC" >>$file
--    echo "CFLAGS=-I\$(INCDIR) $APXS_CFLAGS" >>$file
-+    echo "CFLAGS=-I\$(INCDIR) -I/usr/include/db1 $APXS_CFLAGS" >>$file
-     echo "CFLAGS_SHLIB=$APXS_CFLAGS_SHLIB" >>$file
-     echo "LD_SHLIB=$APXS_LD_SHLIB" >>$file
-     echo "LDFLAGS=$APXS_LDFLAGS" >>$file

diff --git a/mod_ssl-db3.patch b/mod_ssl-db3.patch
new file mode 100644 (file)
index 0000000..085064e
--- /dev/null
+++ b/mod_ssl-db3.patch
@@ -0,0 +1,29 @@
+--- mod_ssl-2.8.4-1.3.20/pkg.sslmod/mod_ssl.h~ Wed May  3 18:28:56 2000
++++ mod_ssl-2.8.4-1.3.20/pkg.sslmod/mod_ssl.h  Sun Nov 12 00:04:04 2000
+@@ -338,6 +338,15 @@
+ #define SSL_DBM_FILE_SUFFIX_PAG ".pag"
+ #else /* !SSL_USE_SDBM */
++#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
++    && __GLIBC__ >= 2 && __GLIBC_MINOR__ == 1
++#include <db1/ndbm.h>
++#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
++    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 2
++#define DB_DBM_HSEARCH 1
++#include <db.h>
++#else
+ #include <ndbm.h>
++#endif
+ #define ssl_dbm_open     dbm_open
+ #define ssl_dbm_close    dbm_close
+ #define ssl_dbm_store    dbm_store
+--- mod_ssl-2.6.6-1.3.12/pkg.sslmod/Makefile.tmpl~     Thu Feb 24 20:33:23 2000
++++ mod_ssl-2.6.6-1.3.12/pkg.sslmod/Makefile.tmpl      Sun Nov 12 00:02:32 2000
+@@ -133,7 +133,7 @@
+ 
+ libssl.so: $(OBJS_PIC)
+       rm -f $@
+-      $(LD_SHLIB) $(SSL_LDFLAGS) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC) $(SSL_LIBS) $(LIBS_SHLIB) 
++      $(LD_SHLIB) $(SSL_LDFLAGS) $(LDFLAGS_SHLIB) -o $@ $(OBJS_PIC) $(SSL_LIBS) $(LIBS_SHLIB) -lndbm
+ 
+ .SUFFIXES: .o .lo
+