- updated for 2.0.6

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

diff --git a/yaz-libwrap-fix.patch b/yaz-libwrap-fix.patch
index d3ad7c4265f28d9e4c054fec35d5af6cccb35335..17012de40f20b508026bed2e05a00530e0c7c210 100644 (file)
--- a/yaz-libwrap-fix.patch
+++ b/yaz-libwrap-fix.patch
@@ -34,14 +34,13 @@
  dnl
  dnl ------ Headers
  AC_CHECK_HEADERS(fnmatch.h wchar.h locale.h langinfo.h)
---- yaz-2.0/server/Makefile.am.orig    Tue Feb 18 09:08:02 2003
-+++ yaz-2.0/server/Makefile.am Tue Mar 11 11:51:43 2003
-@@ -5,6 +5,8 @@
- libserver_la_SOURCES = eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
-  eventl.h service.h session.h
+--- yaz-2.0.6/src/Makefile.am.orig     2003-10-27 13:21:30.000000000 +0100
++++ yaz-2.0.6/src/Makefile.am  2003-12-07 11:14:22.779872136 +0100
+@@ -64,6 +64,7 @@
+   eventl.c seshigh.c statserv.c requestq.c tcpdchk.c \
+   eventl.h service.c service.h session.h
+ libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
++libyaz_la_LIBADD=$(WRAPLIBS)
  
-+LIBS = $(WRAPLIBS)
-+
- EXTRA_DIST=service.c
- 
- AM_CPPFLAGS=-I$(top_srcdir)/include  $(XML2_CFLAGS) -DDOCDIR=\"$(datadir)/doc/$(PACKAGE)\"
+ libyazthread_la_SOURCES=
+ libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo

diff --git a/yaz-link.patch b/yaz-link.patch
index 8a7a422f382203585d43b818695631aac27d75bb..b71199bd1819e471d820fbea11febe0b7ef79dad 100644 (file)
--- a/yaz-link.patch
+++ b/yaz-link.patch
@@ -1,20 +1,16 @@
---- yaz-2.0.2/lib/Makefile.am.orig     2003-04-18 01:24:00.000000000 +0200
-+++ yaz-2.0.2/lib/Makefile.am  2003-05-12 23:59:08.000000000 +0200
-@@ -22,7 +22,7 @@
- libyaz_la_SOURCES=
- libyaz_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
+--- 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 @@
+ libyaz_la_LIBADD=$(WRAPLIBS)
  
--libyazthread_la_LIBADD=nmem.lo statserv.lo eventl.lo
-+libyazthread_la_LIBADD=nmem.lo statserv.lo eventl.lo -lpthread
  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_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
  
-@@ -30,7 +30,7 @@
- libyazmalloc_la_SOURCES=
- libyazmalloc_la_LDFLAGS=-version-info $(YAZ_VERSION_INFO)
- 
--libyazssl_la_LIBADD=tcpip.lo comstack.lo
-+libyazssl_la_LIBADD=tcpip.lo comstack.lo $(SSL_LIBS)
  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