- updated for 2.0.21

Changed files:
    yaz-libwrap-fix.patch -> 1.5
    yaz-link.patch -> 1.4

diff --git a/yaz-libwrap-fix.patch b/yaz-libwrap-fix.patch
index 17012de40f20b508026bed2e05a00530e0c7c210..7906af41908059f5131f19946a295d3ef44c74f4 100644 (file)
--- a/yaz-libwrap-fix.patch
+++ b/yaz-libwrap-fix.patch
@@ -1,14 +1,14 @@
---- yaz-2.0/configure.in.orig  Sun Feb 23 21:18:04 2003
-+++ yaz-2.0/configure.in       Tue Mar 11 11:51:10 2003
-@@ -232,6 +232,7 @@
+--- yaz-2.0.21/configure.in.orig       2004-05-14 10:19:16.000000000 +0200
++++ yaz-2.0.21/configure.in    2004-05-16 00:10:45.787417432 +0200
+@@ -209,6 +209,7 @@
  dnl
  dnl ------ tcpd
  AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
 +WRAPLIBS=""
- if test "$enable_tcpd" != ""; then
+ if test "$enable_tcpd" != "" && test "$enable_tcpd" != "no"; then
        oldLibs=$LIBS
        oldCPPFLAGS=$CPPFLAGS
-@@ -240,7 +241,7 @@
+@@ -217,7 +218,7 @@
                CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
        fi
        AC_MSG_CHECKING(for working tcpd.h)
@@ -17,7 +17,7 @@
        AC_TRY_LINK([#include <syslog.h>
  #include <tcpd.h>
        int allow_severity = LOG_INFO;
-@@ -250,13 +251,15 @@
+@@ -227,13 +228,15 @@
        tcpd_ok=1, tcpd_ok=0)
        if test "$tcpd_ok" = "0"; then
                AC_MSG_RESULT(no)

diff --git a/yaz-link.patch b/yaz-link.patch
index b71199bd1819e471d820fbea11febe0b7ef79dad..d40ce6729ab4a876ffce0cd8d82d631987d252bb 100644 (file)
--- a/yaz-link.patch
+++ b/yaz-link.patch
@@ -1,16 +1,11 @@
---- yaz-2.0.6/src/Makefile.am.orig     2003-12-07 11:14:58.000000000 +0100
-+++ yaz-2.0.6/src/Makefile.am  2003-12-07 11:15:47.250030720 +0100
-@@ -67,11 +67,11 @@
+--- yaz-2.0.21/src/Makefile.am.orig    2004-05-16 00:11:25.138435168 +0200
++++ yaz-2.0.21/src/Makefile.am 2004-05-16 00:13:10.354439904 +0200
+@@ -63,7 +63,7 @@
  libyaz_la_LIBADD=$(WRAPLIBS)
  
  libyazthread_la_SOURCES=
 -libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo
-+libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo libyaz.la -lpthread
++libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo libyaz.la
  libyazthread_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
  
- libyazssl_la_SOURCES=
--libyazssl_la_LIBADD=ssl-comstack.lo ssl-tcpip.lo
-+libyazssl_la_LIBADD=ssl-comstack.lo ssl-tcpip.lo libyaz.la $(SSL_LIBS)
- libyazssl_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
- 
  # Rules for Z39.50 V3