Browse Source

get rid of DSOs; remove patches from CVS

Ralf S. Engelschall 23 years ago
parent
commit
2be8335d17
3 changed files with 1 additions and 43 deletions
  1. 0 31
      sasl/sasl-db4.patch
  2. 0 12
      sasl/sasl.patch
  3. 1 0
      sasl/sasl.spec

+ 0 - 31
sasl/sasl-db4.patch

@@ -1,31 +0,0 @@
-diff -Naur cyrus-sasl-2.1.7.orig/sasldb/db_berkeley.c cyrus-sasl-2.1.7/sasldb/db_berkeley.c
---- cyrus-sasl-2.1.7.orig/sasldb/db_berkeley.c	Fri Jul  5 17:45:13 2002
-+++ cyrus-sasl-2.1.7/sasldb/db_berkeley.c	Mon Oct 14 22:00:50 2002
-@@ -85,7 +85,11 @@
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--	    ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+        ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
-+#else
-+        ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
-+#endif
- 	    if (ret != 0)
- 	    {
- 		    (void) (*mbdb)->close(*mbdb, 0);
-diff -Naur cyrus-sasl-2.1.7.orig/utils/dbconverter-2.c cyrus-sasl-2.1.7/utils/dbconverter-2.c
---- cyrus-sasl-2.1.7.orig/utils/dbconverter-2.c	Fri Jul  5 17:44:43 2002
-+++ cyrus-sasl-2.1.7/utils/dbconverter-2.c	Mon Oct 14 22:04:56 2002
-@@ -214,7 +214,11 @@
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
-+#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+	    ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
-+#else
- 	    ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
-+#endif
- 	    if (ret != 0)
- 	    {
- 		    (void) (*mbdb)->close(*mbdb, 0);

+ 0 - 12
sasl/sasl.patch

@@ -1,12 +0,0 @@
-diff -Naur cyrus-sasl-2.1.9.orig/lib/Makefile.in cyrus-sasl-2.1.9/lib/Makefile.in
---- cyrus-sasl-2.1.9.orig/lib/Makefile.in	Mon Oct 28 13:55:03 2002
-+++ cyrus-sasl-2.1.9/lib/Makefile.in	Mon Oct 28 13:58:14 2002
-@@ -437,7 +437,7 @@
- 
- 
- plugin_common.lo: plugin_common.o
--	ln -s $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
-+	ln -fs $(top_builddir)/plugins/plugin_common.lo plugin_common.lo
- 
- plugin_common.o:
- 	ln -s $(top_builddir)/plugins/plugin_common.o plugin_common.o

+ 1 - 0
sasl/sasl.spec

@@ -146,6 +146,7 @@ AutoReqProv:  no
     mv $RPM_BUILD_ROOT%{l_prefix}/lib/sasl2 \
         $RPM_BUILD_ROOT%{l_prefix}/lib/sasl
     strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libsasl*.so* >/dev/null 2>&1 || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
 %if "%{with_fsl}" == "yes"
         '%config %{l_prefix}/etc/fsl/fsl.sasl' \