SOURCES: etherape-Makefile.patch (NEW), etherape-resolv.patch - up...

[maciek2w]

Author: maciek2w                     Date: Wed Feb  1 12:16:44 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 0.9.4; some patchs fixed
- STBR

---- Files affected:
SOURCES:
   etherape-Makefile.patch (NONE -> 1.1)  (NEW), etherape-resolv.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/etherape-Makefile.patch
diff -u /dev/null SOURCES/etherape-Makefile.patch:1.1
--- /dev/null	Wed Feb  1 13:16:44 2006
+++ SOURCES/etherape-Makefile.patch	Wed Feb  1 13:16:39 2006
@@ -0,0 +1,11 @@
+--- etherape-0.9.4/po/Makefile.in.in.orig	2006-02-01 12:43:52.000000000 +0100
++++ etherape-0.9.4/po/Makefile.in.in	2006-02-01 12:44:45.000000000 +0100
+@@ -27,7 +27,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(MKINSTALLDIRS)" ;; esac`
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@

================================================================
Index: SOURCES/etherape-resolv.patch
diff -u SOURCES/etherape-resolv.patch:1.3 SOURCES/etherape-resolv.patch:1.4
--- SOURCES/etherape-resolv.patch:1.3	Wed Jul 14 21:25:22 2004
+++ SOURCES/etherape-resolv.patch	Wed Feb  1 13:16:39 2006
@@ -1,36 +1,36 @@
---- etherape-0.9.0/configure.in.orig	2003-03-01 23:05:30.000000000 +0100
-+++ etherape-0.9.0/configure.in	2004-07-14 21:21:22.064405638 +0200
-@@ -45,14 +45,25 @@
+--- etherape-0.9.4/configure.in.orig	2006-01-11 07:47:42.000000000 +0100
++++ etherape-0.9.4/configure.in	2006-02-01 12:23:25.000000000 +0100
+@@ -90,14 +90,25 @@
+ # After some kind of change in libc, it seems it is
  # required to #include <resolv.h> for the test to succeed.
  # To go around it I included the test for __res_init
- 
 -AC_CHECK_FUNC(res_init, , 
 -  AC_CHECK_LIB(bind, res_init, , 
 -   AC_CHECK_LIB(resolv, res_init, ,
--    AC_CHECK_LIB(c, __res_init, , AC_MSG_ERROR(No resolver library found)))))
+-    AC_CHECK_LIB(c, __res_init, , [AC_MSG_ERROR([No resolver library found])] ))))
 -
 -AC_CHECK_FUNC(res_mkquery, , 
 -  AC_CHECK_LIB(bind, res_mkquery, , 
--   AC_CHECK_LIB(resolv, res_mkquery, , AC_MSG_ERROR(No resolver library found))))
+-   AC_CHECK_LIB(resolv, res_mkquery, , [AC_MSG_ERROR([No resolver library found])] )))
 +AC_CHECK_FUNC(res_init, , [
 +  AC_CHECK_FUNC(__res_init, , [
 +    AC_CHECK_LIB(resolv, res_init, , [
 +      AC_CHECK_LIB(resolv, __res_init, , [
-+	AC_CHECK_LIB(bind, res_init, , [AC_MSG_ERROR([No resolver library found])])
++       AC_CHECK_LIB(bind, res_init, , [AC_MSG_ERROR([No resolver library found])])
 +      ])
 +    ])
 +  ])
 +])
-+			   
++
 +AC_CHECK_FUNC(res_mkquery, , [
 +  AC_CHECK_FUNC(__res_mkquery, , [
 +    AC_CHECK_LIB(resolv, res_mkquery, , [
 +      AC_CHECK_LIB(resolv, __res_mkquery, , [
-+	AC_CHECK_LIB(bind, res_mkquery, , [AC_MSG_ERROR([No resolver library found])])
++       AC_CHECK_LIB(bind, res_mkquery, , [AC_MSG_ERROR([No resolver library found])])
 +      ])
 +    ])
 +  ])
 +])
- 
- # Check for the pcap library.
- AC_ARG_ENABLE(static-pcap,
+ else
+ AC_CHECK_FUNC(gethostbyaddr_r, , 
+   AC_CHECK_LIB(bind, gethostbyaddr_r, , 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/etherape-resolv.patch?r1=1.3&r2=1.4&f=u