propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)

            to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)

5 files changed, 191 insertions, 179 deletions

diff --git a/packages/ettercap/ettercap-0.6.b/configure.patch b/packages/ettercap/ettercap-0.6.b/configure.patch
deleted file mode 100644
index 89132125b8..0000000000
--- a/packages/ettercap/ettercap-0.6.b/configure.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- tmp/base/ettercap-0.6.b-r0/ettercap-0.6.b/acinclude.m4	Thu Jul 10 03:25:31 2003
-+++ ettercap-0.6.b/acinclude.m4	Thu Nov  6 18:25:39 2003
-@@ -182,9 +182,11 @@
- dnl     HAVE_SOCKLEN_T
- dnl
- 
--AC_DEFUN(EC_SOCKLEN_CHECK,
--   [AC_MSG_CHECKING(for socklen_t in sys/socket.h)
-+samba_cv_socklen_t
- 
-+AC_DEFUN(EC_SOCKLEN_CHECK,
-+   [AC_CACHE_CHECK([for socklen_t in sys/socket.h],
-+		   [ettercap_cv_type_socklen_t],
-    AC_TRY_RUN([
-       #include <sys/types.h>
-       #include <sys/socket.h>
-@@ -197,14 +199,12 @@
-          return 0;
-       }
-    ],
--   [  AC_MSG_RESULT(yes)
--      AC_DEFINE(HAVE_SOCKLEN_T)
--      ],
--      AC_MSG_RESULT(no);
--      ,
--      AC_MSG_RESULT(unkown when cross-compiling)
--   )
-+   [ettercap_cv_type_socklen_t=yes],
-+   [ettercap_cv_type_socklen_t=no]))
- 
-+   if test X$ettercap_cv_type_socklen_t = Xyes; then
-+     AC_DEFINE(HAVE_SOCKLEN_T)
-+   fi
- ])
- 
- 
-@@ -377,24 +377,78 @@
- 
- AC_DEFUN(EC_NS_GET,[
- 
--   AC_MSG_CHECKING(for NS_GET32)
--   AC_TRY_RUN([
--      #include <arpa/nameser.h>
-+AC_CACHE_CHECK([for NS_GET32],
-+		ec_cv_func_ns_get32,
-+		[AC_TRY_LINK([
-+		 #include <arpa/nameser.h>
-+		 ],
-+		 [
-+                  int i;
-+                  char *p = "\x01\x02\x03\x04";
-+                  NS_GET32(i, p);
-+		 ],
-+		 ec_cv_func_ns_get32=yes,
-+		 ec_cv_func_ns_get32=no)
-+   if test X$ec_cv_func_ns_get32 = Xyes; then
-+     AC_DEFINE(HAVE_NS_GET,1)
-+   fi])
-+])
- 
--      int main()
--      {
--         int i;
--         char *p = "\x01\x02\x03\x04";
--         NS_GET32(i, p);
-+dnl vim:ts=3:expandtab
- 
--         return 0;
--      }
--   ],
--   [  AC_MSG_RESULT(yes)
--      AC_DEFINE(HAVE_NS_GET,1) ],
--   [  AC_MSG_RESULT(no); ]
--   )
-+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-+dnl also defines GSTUFF_PKG_ERRORS on error
-+AC_DEFUN(PKG_CHECK_MODULES, [
-+  succeeded=no
-+
-+  if test -z "$PKG_CONFIG"; then
-+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+  fi
-+
-+  if test "$PKG_CONFIG" = "no" ; then
-+     echo "*** The pkg-config script could not be found. Make sure it is"
-+     echo "*** in your path, or set the PKG_CONFIG environment variable"
-+     echo "*** to the full path to pkg-config."
-+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-+  else
-+     PKG_CONFIG_MIN_VERSION=0.9.0
-+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-+        AC_MSG_CHECKING(for $2)
-+
-+        if $PKG_CONFIG --exists "$2" ; then
-+            AC_MSG_RESULT(yes)
-+            succeeded=yes
-+
-+            AC_MSG_CHECKING($1_CFLAGS)
-+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-+            AC_MSG_RESULT($$1_CFLAGS)
-+
-+            AC_MSG_CHECKING($1_LIBS)
-+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-+            AC_MSG_RESULT($$1_LIBS)
-+        else
-+            $1_CFLAGS=""
-+            $1_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but 
-+            ## do set a variable so people can do so.
-+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
-+        fi
-+
-+        AC_SUBST($1_CFLAGS)
-+        AC_SUBST($1_LIBS)
-+     else
-+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-+     fi
-+  fi
- 
-+  if test $succeeded = yes; then
-+     ifelse([$3], , :, [$3])
-+  else
-+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-+  fi
- ])
- 
--dnl vim:ts=3:expandtab
-+
---- tmp/base/ettercap-0.6.b-r0/ettercap-0.6.b/configure.in	Thu Jul 10 03:25:31 2003
-+++ ettercap-0.6.b/configure.in	Thu Nov  6 18:13:44 2003
-@@ -20,9 +20,10 @@
- dnl    $Id: configure.in,v 1.69 2003/06/30 19:57:41 alor Exp $
- dnl
- 
--AC_PREREQ([2.50])
-+AC_PREREQ(2.57)
- 
--AC_INIT(src/ec_main.c)
-+AC_INIT
-+AC_CONFIG_SRCDIR([src/ec_main.c])
- AC_CONFIG_HEADER(config.h)
- 
- echo "char configure_line[[]] = \"$0 $*\";" > ./src/include/ec_debug_info.h
-@@ -77,7 +78,7 @@
- dnl   Check the OS
- dnl ================
- 
--AC_CANONICAL_SYSTEM
-+AC_CANONICAL_TARGET([])
- case "$target_os" in
- *linux*)
-    EC_LINUX_KERNEL()
-@@ -868,7 +869,8 @@
- 
- AC_SUBST(MAKEPLUG)
- 
--AC_OUTPUT(ettercap.spec ettercap.8 Makefile $makeplug win32/ettercap.nsi)
-+AC_CONFIG_FILES([ettercap.spec ettercap.8 Makefile $makeplug win32/ettercap.nsi])
-+AC_OUTPUT
- 
- dnl ============================
- dnl   FOR DEBUGING INFORMATIONS
diff --git a/packages/ettercap/ettercap-ng_0.7.3.bb b/packages/ettercap/ettercap-ng_0.7.3.bb
new file mode 100644
index 0000000000..c9e73d9ea0
--- /dev/null
+++ b/packages/ettercap/ettercap-ng_0.7.3.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "network sniffer/interceptor/logger for ethernet LANs. It \
+supports active and passive dissection of many protocols (even ciphered ones, \
+like SSH and HTTPS)."
+SECTION = "console/network"
+DEPENDS = "virtual/libiconv libnet libpcap openssl libpcre ncurses zlib libtool"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-NG-${PV}.tar.gz \
+           file://autotools.patch;patch=1"
+
+S = "${WORKDIR}/ettercap-NG-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF += "--disable-gtk"
+
+FILES_${PN} += "${datadir} ${libdir}/ettercap/*.so"
+FILES_${PN}-dbg += "${libdir}/ettercap/.debug"
diff --git a/packages/ettercap/ettercap_0.6.b.bb b/packages/ettercap/ettercap_0.6.b.bb
deleted file mode 100644
index d5983d4481..0000000000
--- a/packages/ettercap/ettercap_0.6.b.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "console/network"
-DEPENDS = "ncurses openssl"
-LICENSE = "GPL"
-DESCRIPTION = "Ettercap is a network sniffer/interceptor/logger \
-for ethernet LANs. It supports active and passive dissection of \
-many protocols (even ciphered ones, like SSH and HTTPS)."
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
-
-inherit autotools
-
-EXTRA_OECONF = "--disable-gtk \
-	        --with-openssl=${STAGING_LIBDIR}/.."
diff --git a/packages/ettercap/ettercap-0.6.b/.mtn2git_empty b/packages/ettercap/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/ettercap/ettercap-0.6.b/.mtn2git_empty
+++ b/packages/ettercap/files/.mtn2git_empty
diff --git a/packages/ettercap/files/autotools.patch b/packages/ettercap/files/autotools.patch
new file mode 100644
index 0000000000..b6024c48c7
--- /dev/null
+++ b/packages/ettercap/files/autotools.patch
@@ -0,0 +1,173 @@
+diff -ur ettercap-NG-0.7.3/configure.in ettercap-NG-0.7.3-changed/configure.in
+--- ettercap-NG-0.7.3/configure.in	2005-01-13 10:24:28.000000000 +0100
++++ ettercap-NG-0.7.3-changed/configure.in	2007-11-07 11:42:25.000000000 +0100
+@@ -178,6 +178,7 @@
+ 
+ AC_PROG_CC
+ AM_PROG_CC_STDC
++AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_PROG_GCC_TRADITIONAL
+@@ -236,7 +237,7 @@
+ AC_CHECK_HEADERS(sys/poll.h poll.h sys/select.h)
+ AC_CHECK_HEADERS(sys/cdefs.h)
+ dnl nameser NS_GET32 and so on...
+-EC_NS_GET()
++dnl EC_NS_GET()
+ 
+ dnl ==================================================================
+ dnl   Checks for typedefs, structures, and compiler characteristics.
+@@ -379,129 +380,6 @@
+ dnl ==================
+ 
+ 
+-dnl ---------
+-dnl  libpcap
+-dnl ---------
+-ac_ec_libpcap=default
+-
+-AC_MSG_CHECKING(for libpcap)
+-AC_ARG_WITH(libpcap, AC_HELP_STRING(--with-libpcap=DIR,use libpcap in DIR),
+-[ case "$withval" in
+-  no)
+-     AC_MSG_RESULT(no)
+-     AC_MSG_ERROR(["*** ettercap cannot operate without libpcap. ***"])
+-     ;;
+-  *)
+-     if test -f $withval/pcap.h; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        PCAPINC="-I$withval"
+-        if test "$OS" = "WINDOWS"; then
+-           PCAPLIB="-L$withval -lwpcap -lpacket"
+-        else
+-           PCAPLIB="-L$withval -lpcap"
+-        fi
+-        ac_ec_libpcap=$withval
+-        AC_MSG_RESULT($withval)
+-     elif test -f $withval/include/pcap.h; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        PCAPINC="-I$withval/include"
+-        if test "$OS" = "WINDOWS"; then
+-           PCAPLIB="-L$withval/lib -lwpcap -lpacket"
+-        else
+-           PCAPLIB="-L$withval/lib -lpcap"
+-        fi
+-        ac_ec_libpcap=$withval
+-        AC_MSG_RESULT($withval)
+-     else
+-        AC_MSG_RESULT(no)
+-        AC_MSG_ERROR([pcap.h not found in $withval])
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f /usr/include/pcap/pcap.h; then
+-     PCAPINC="-I/usr/include/pcap"
+-     if test "$OS" = "WINDOWS"; then
+-        PCAPLIB="-lwpcap -lpacket"
+-     else
+-        PCAPLIB="-lpcap"
+-     fi
+-  elif test -f /usr/include/pcap.h; then
+-     if test "$OS" = "WINDOWS"; then
+-        PCAPLIB="-lwpcap -lpacket"
+-     else
+-        PCAPLIB="-lpcap"
+-     fi
+-  elif test -f /usr/local/include/pcap.h; then
+-     PCAPINC="-I/usr/local/include"
+-     if test "$OS" = "WINDOWS"; then
+-        PCAPLIB="-lwpcap -lpacket"
+-     else
+-        PCAPLIB="-lpcap"
+-     fi
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_MSG_ERROR([libpcap not found])
+-  fi
+-  AC_MSG_RESULT(yes) ]
+-)
+-
+-if test "$OS" = "WINDOWS"; then
+-   EC_CHECK_FUNC(wpcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-   EC_CHECK_FUNC(packet, PacketInitPacket, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-   AC_CHECK_LIB(ws2_32, ntohs,, AC_MSG_ERROR([Incorrect ws2_32 version.]))
+-   AC_CHECK_LIB(iphlpapi, main)
+-else
+-   EC_CHECK_FUNC(pcap, pcap_datalink_val_to_description, $PCAPLIB, $LIBS,, AC_MSG_ERROR([Incorrect libpcap version. libpcap >= 0.8.1 required]))
+-fi
+-
+-dnl ---------
+-dnl  libnet
+-dnl ---------
+-ac_ec_libnet=default
+-
+-AC_MSG_CHECKING(for libnet)
+-AC_ARG_WITH(libnet, AC_HELP_STRING(--with-libnet=DIR,use libnet in DIR),
+-[ case "$withval" in
+-  no)
+-     AC_MSG_RESULT(no)
+-     AC_MSG_ERROR(["*** ettercap cannot operate without libnet. ***"])
+-     ;;
+-  *)
+-     if test -f $withval/lnet.h; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        LNETINC="-I$withval"
+-        LNETLIB="-L$withval -lnet"
+-        ac_ec_libnet=$withval
+-        AC_MSG_RESULT($withval)
+-     elif test -f $withval/include/libnet.h; then
+-        owd=`pwd`
+-        if cd $withval; then withval=`pwd`; cd $owd; fi
+-        LNETINC="-I$withval/include"
+-        LNETLIB="-L$withval/lib -L$withval/src -lnet"
+-        ac_ec_libnet=$withval
+-        AC_MSG_RESULT($withval)
+-     else
+-        AC_MSG_RESULT(no)
+-        AC_MSG_ERROR([libnet.h not found in $withval])
+-     fi
+-     ;;
+-  esac ],
+-[ if test -f /usr/include/libnet.h; then
+-     AC_MSG_RESULT(yes)
+-     LNETINC=""
+-     LNETLIB="-lnet"
+-  else
+-     AC_MSG_RESULT(no)
+-     AC_MSG_ERROR([libnet >= 1.1.2.1 not found])
+-  fi
+-]
+-)
+-
+-EC_CHECK_FUNC(net, libnet_adv_free_packet, $LNETLIB, $LIBS,, AC_MSG_ERROR([Incorrect libnet version. libnet >= 1.1.2.1 required]))
+-
+ dnl ------------------
+ dnl Checks for openssl
+ dnl ------------------
+@@ -794,7 +672,8 @@
+ dnl  set up the final vars
+ dnl -----------------------
+ EC_CFLAGS="$DEBUG_FLAGS $PCAPINC $LNETINC $SSLINC $PCREINC $ICONVINC"
+-EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
++dnl EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB"
++EC_LIBS="$LIBS $PCAPLIB $LNETLIB $SSLLIB $PCRELIB $NCURSLIB $GTK_LIBS $ICONVLIB -lpcap -lnet"
+ 
+ AC_SUBST(EC_CFLAGS)
+ AC_SUBST(EC_LIBS)
+diff -ur ettercap-NG-0.7.3/src/Makefile.am ettercap-NG-0.7.3-changed/src/Makefile.am
+--- ettercap-NG-0.7.3/src/Makefile.am	2005-01-13 10:18:48.000000000 +0100
++++ ettercap-NG-0.7.3-changed/src/Makefile.am	2007-11-06 20:15:12.000000000 +0100
+@@ -127,8 +127,7 @@
+ 
+ ettercap_CFLAGS = @EC_CFLAGS@
+ 
+-ettercap_LDADD = @LIBOBJS@ \
+-                 os/libec_os.a \
++ettercap_LDADD = missing/strlcpy.o os/libec_os.a \
+                  interfaces/daemon/libec_daemon.a \
+                  interfaces/text/libec_text.a 
+