- updated to fit 3.0.44

Changed files:
    yaz-libwrap-fix.patch -> 1.9

diff --git a/yaz-libwrap-fix.patch b/yaz-libwrap-fix.patch
index 3670eb215df7143d429e618f3b10810591fd76aa..edddeb982213f87345135bd6d8c9543aa3e36055 100644 (file)
--- a/yaz-libwrap-fix.patch
+++ b/yaz-libwrap-fix.patch
@@ -1,41 +1,35 @@
---- yaz-2.1.22/configure.ac.orig       2006-06-15 15:38:05.000000000 +0200
-+++ yaz-2.1.22/configure.ac    2006-07-22 15:39:52.050565250 +0200
-@@ -231,6 +231,7 @@
+diff -burNp yaz-3.0.44/configure.ac yaz-3.0.44-dud/configure.ac
+--- yaz-3.0.44/configure.ac    2009-02-17 14:21:39.000000000 +0100
++++ yaz-3.0.44-dud/configure.ac        2009-02-26 20:46:19.762891769 +0100
+@@ -283,6 +283,7 @@ AC_DEFINE([YAZ_USE_NEW_LOG])
  dnl
  dnl ------ tcpd
- AC_ARG_ENABLE(tcpd,[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
+ AC_ARG_ENABLE([tcpd],[  --enable-tcpd[=PREFIX]  enable TCP wrapper for server if available])
 +WRAPLIBS=""
  if test "$enable_tcpd" -a "$enable_tcpd" != "no"; then
      oldLibs=$LIBS
      oldCPPFLAGS=$CPPFLAGS
-@@ -239,7 +240,7 @@
-       CPPFLAGS="$CPPFLAGS -I$enable_tcpd/include"
-     fi
-     AC_MSG_CHECKING(for working tcpd.h)
--    LIBS="$LIBS -lwrap -lnsl"
-+    LIBS="$LIBS -lwrap"
-     AC_TRY_LINK([#include <syslog.h>
- #include <tcpd.h>
-           int allow_severity = LOG_INFO;
-@@ -255,8 +256,11 @@
+@@ -307,8 +308,11 @@ if test "$enable_tcpd" -a "$enable_tcpd"
      else
-       AC_MSG_RESULT(yes)
-       AC_DEFINE(HAVE_TCPD_H)
+       AC_MSG_RESULT([yes])
+       AC_DEFINE([HAVE_TCPD_H])
 +      WRAPLIBS="-lwrap"
      fi
 +    LIBS=$oldLibs
  fi
 +AC_SUBST(WRAPLIBS)
  dnl
- AC_SUBST(THREAD_CFLAGS)
- HAVETHREADS=0
---- 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)
+ AC_SUBST([YAZ_CONFIG_CFLAGS])
+ dnl
+diff -burNp yaz-3.0.44/src/Makefile.am yaz-3.0.44-dud/src/Makefile.am
+--- yaz-3.0.44/src/Makefile.am 2009-01-09 14:33:37.000000000 +0100
++++ yaz-3.0.44-dud/src/Makefile.am     2009-02-26 20:57:00.142937281 +0100
+@@ -26,7 +26,7 @@ YAZCOMP_Z = $(YAZCOMP) -d $(srcdir)/z.tc
+ YAZCOMP_I = $(YAZCOMP) -d $(srcdir)/ill.tcl -i yaz -I$(top_srcdir)/include
  
- libyazthread_la_SOURCES=
- libyazthread_la_LIBADD=thr-nmem.lo thr-statserv.lo thr-eventl.lo
+ AM_CPPFLAGS=-I$(top_srcdir)/include $(XML2_CFLAGS) $(SSL_CFLAGS) 
+-libyaz_la_LIBADD = $(SSL_LIBS)
++libyaz_la_LIBADD = $(SSL_LIBS) $(WRAPLIBS)
+ libyaz_server_la_CFLAGS = $(PTHREAD_CFLAGS)
+ libyaz_server_la_LIBADD = libyaz.la
+ libyaz_icu_la_CPPFLAGS = $(AM_CPPFLAGS) $(ICU_CPPFLAGS)