[oe-commits] org.oe.dev merge of '0366fffbef665b0cabc497886e24038bbc2a9a33'
oe commit
openembedded-commits at lists.openembedded.org
Thu Nov 15 19:48:47 UTC 2007
merge of '0366fffbef665b0cabc497886e24038bbc2a9a33'
and '479d13695983e03ab97dd5dc4227bdf7453ca63b'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 14f416531e83c71b6e31d078aee007b712bd8096
ViewMTN: http://monotone.openembedded.org/revision/info/14f416531e83c71b6e31d078aee007b712bd8096
Files:
1
packages/gpephone/quickdial_svn.bb
packages/ettercap/ettercap-0.6.b
packages/ettercap/ettercap-0.6.b/configure.patch
packages/ettercap/ettercap_0.6.b.bb
packages/tasks/task-gpe-sectest.bb
packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch
packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch
packages/ettercap/files
packages/sqlite/sqlite3
packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030
packages/wlan-ng/wlan-ng-utils-0.2.8
packages/desktop-file-utils/desktop-file-utils-native_0.14.bb
packages/ettercap/ettercap-ng_0.7.3.bb
packages/ettercap/files/autotools.patch
packages/glibc/glibc-intermediate_2.7.bb
packages/navit/navit_0.0.2.bb
packages/navit/navit_cvs.bb
packages/openmoko2/openmoko-messages2_svn.bb
packages/sqlite/sqlite3/cross-compile.patch
packages/sqlite/sqlite3/ldflags.patch
packages/sqlite/sqlite3/libtool.patch
packages/sqlite/sqlite3_3.5.2.bb
packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch
packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in
packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch
packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb
packages/wlan-ng/wlan-ng-utils-0.2.8/config.in
packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch
packages/wlan-ng/wlan-ng-utils_0.2.8.bb
classes/insane.bbclass
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/machine/tosa.conf
contrib/feed-browser/includes/config.inc
packages/base-files/base-files/akita/fstab
packages/base-files/base-files/c7x0/fstab
packages/base-files/base-files/collie/fstab
packages/base-files/base-files/poodle/fstab
packages/base-files/base-files/spitz/fstab
packages/base-files/base-files/tosa/fstab
packages/base-files/base-files_3.0.14.bb
packages/gpsdrive/gpsdrive_2.10pre2.bb
packages/libogg/libtheora_0.9+1.0alpha7.bb
packages/librcf/librcf_0.4.bb
packages/linux/linux-rp_2.6.23.bb
packages/lm_sensors/lmsensors-apps_2.10.1.bb
packages/matchbox-common/matchbox-common_0.9.1.bb
packages/matchbox-wm/matchbox-wm_0.8.3.bb
packages/matchbox-wm/matchbox-wm_0.8.4.bb
packages/matchbox-wm/matchbox-wm_0.9.2.bb
packages/matchbox-wm/matchbox-wm_0.9.3.bb
packages/matchbox-wm/matchbox-wm_0.9.4.bb
packages/matchbox-wm/matchbox-wm_0.9.5.bb
packages/matchbox-wm/matchbox-wm_0.9.bb
packages/matchbox-wm/matchbox-wm_1.0.bb
packages/matchbox-wm/matchbox-wm_1.1.bb
packages/matchbox-wm/matchbox-wm_1.2.bb
packages/matchbox-wm/matchbox-wm_svn.bb
packages/navit/navit_0.0.1.bb
packages/openmoko2/openmoko-dialer2_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-today2-folders_svn.bb
packages/python/python-pygtk_2.10.4.bb
packages/tasks/task-openmoko.bb
packages/wifi-radar/wifi-radar_1.9.6.bb
packages/wlan-ng/wlan-ng-modules_0.2.7.bb
packages/xorg-data/xbitmaps_1.0.1.bb
Diffs:
#
# mt diff -r0366fffbef665b0cabc497886e24038bbc2a9a33 -r14f416531e83c71b6e31d078aee007b712bd8096
#
#
#
# add_file "packages/gpephone/quickdial_svn.bb"
# content [5a7854af3e370761f2adf68476bdf0c2eea3e7d1]
#
============================================================
--- packages/gpephone/quickdial_svn.bb 5a7854af3e370761f2adf68476bdf0c2eea3e7d1
+++ packages/gpephone/quickdial_svn.bb 5a7854af3e370761f2adf68476bdf0c2eea3e7d1
@@ -0,0 +1,21 @@
+LICENSE = "LiPS"
+DESCRIPTION = "Quickdial application and backend"
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+PV = "0.0+svnr-${SRCREV}"
+
+SRCREV_pn-${PN} ?= "1393"
+
+DEFAULT_PREFERENCE = "-1"
+
+DEPENDS = "gtk+ librecord2 libgpephone hiker"
+
+inherit gpephone autotools pkgconfig
+
+SRC_URI = "${GPEPHONE_SVN}"
+
+S = "${WORKDIR}/${PN}"
+
+
+FILES_${PN} += "${datadir}/qdial/database"
#
# mt diff -r479d13695983e03ab97dd5dc4227bdf7453ca63b -r14f416531e83c71b6e31d078aee007b712bd8096
#
#
#
# delete "packages/ettercap/ettercap-0.6.b"
#
# delete "packages/ettercap/ettercap-0.6.b/configure.patch"
#
# delete "packages/ettercap/ettercap_0.6.b.bb"
#
# delete "packages/tasks/task-gpe-sectest.bb"
#
# rename "packages/linux/linux-rp-2.6.23/tmio-ohci-r8.patch"
# to "packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch"
#
# add_dir "packages/ettercap/files"
#
# add_dir "packages/sqlite/sqlite3"
#
# add_dir "packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030"
#
# add_dir "packages/wlan-ng/wlan-ng-utils-0.2.8"
#
# add_file "packages/desktop-file-utils/desktop-file-utils-native_0.14.bb"
# content [a2e82b4ea68a494f12d15c7dd824579781660311]
#
# add_file "packages/ettercap/ettercap-ng_0.7.3.bb"
# content [885933dadc1db669a1e36edfed1a6651b48a0aae]
#
# add_file "packages/ettercap/files/autotools.patch"
# content [a46938ba70c1204f0430b669e940422dcf404f4e]
#
# add_file "packages/glibc/glibc-intermediate_2.7.bb"
# content [27e617506e71e32db940d64c4849ce48bcfeb8b4]
#
# add_file "packages/navit/navit_0.0.2.bb"
# content [8189c9268a53e80bff74928adc510bd38c8de9b2]
#
# add_file "packages/navit/navit_cvs.bb"
# content [bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9]
#
# add_file "packages/openmoko2/openmoko-messages2_svn.bb"
# content [ea174dab3e9bcc6065b2012e9fce4ee4eeff15d6]
#
# add_file "packages/sqlite/sqlite3/cross-compile.patch"
# content [042a61e637b0dbcec6e33369da0d1d863518934c]
#
# add_file "packages/sqlite/sqlite3/ldflags.patch"
# content [f72a79539a6af7dc9d3729e7bfa96b305faf8169]
#
# add_file "packages/sqlite/sqlite3/libtool.patch"
# content [9301b88cfee311e677873cae9b461f3fc90eb8a8]
#
# add_file "packages/sqlite/sqlite3_3.5.2.bb"
# content [0edb125c6ed5c435fe50102b3d355f2b8061b1ef]
#
# add_file "packages/wlan-ng/wlan-ng-modules-0.2.7/2.6.22-fixes.patch"
# content [be6a4b2aa961a49ffec3f9081246234b2804629e]
#
# add_file "packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/config.in"
# content [17183bc6462566738db8f06c6e1ddc4240d07ebf]
#
# add_file "packages/wlan-ng/wlan-ng-modules-0.2.8+svn20071030/only-the-modules.patch"
# content [c6f7565289a40fd28eda76c11ae8e338956d78a4]
#
# add_file "packages/wlan-ng/wlan-ng-modules_0.2.8+svn20071030.bb"
# content [36b440c955d9fb612091be4d06ae444af04b35be]
#
# add_file "packages/wlan-ng/wlan-ng-utils-0.2.8/config.in"
# content [0523c8ca1a1797319198caf094645a286dc0aafb]
#
# add_file "packages/wlan-ng/wlan-ng-utils-0.2.8/only-the-utils.patch"
# content [e56c3bf90ae7d569fbfbbea1b3c299382b228fc6]
#
# add_file "packages/wlan-ng/wlan-ng-utils_0.2.8.bb"
# content [c5fd6799aeb817b3ba2dd8a42f0e9c6179a0e71b]
#
# patch "classes/insane.bbclass"
# from [2b43994e2dd8ae85f612788e116ce44c9b31619d]
# to [969f0ea4a41bb686333bda84032d4f9250a61c3b]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [edc976173fe3b3eaefcad6ce35aff6594210bf8c]
# to [8af2f634c8a91d9c27579c3537ca1e7d3132f5c6]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [a5c8530186b1620c562bb7e94df157e23c4b8928]
# to [6d0c484efba81861d983282087a7cb547e23b01a]
#
# patch "conf/distro/openmoko.conf"
# from [fb09004f81fdf9ff14811c7e83335282b3f46b4b]
# to [bedbe8dd945eb5ace788da554ab20d12a1ab3e6d]
#
# patch "conf/machine/tosa.conf"
# from [c4618a42bc1f0559d10723f0315b08046bfc97f4]
# to [bdda7deb7ee9f2d950ee255097efcdfa1cf7a39a]
#
# patch "contrib/feed-browser/includes/config.inc"
# from [9bcb9f854ff6728529de402c08d7094a7ca86dd5]
# to [c83ad830b6705b298699f4bad3d61b6ea860b1d2]
#
# patch "packages/base-files/base-files/akita/fstab"
# from [051fdab814430f401dc16286d1b777bc35162b34]
# to [855484ea65b3d49701e574e221d3465069d37a0e]
#
# patch "packages/base-files/base-files/c7x0/fstab"
# from [eed9bc8456143ce5a434151621475fb86deb06ac]
# to [04cc26eb17a1dc0d9f40acf54504ae3438ad60c5]
#
# patch "packages/base-files/base-files/collie/fstab"
# from [05311cfbc2a0c4d6c46a9fd4069350acd0e738af]
# to [d021297a86dede194f58f281f05215ada358a38b]
#
# patch "packages/base-files/base-files/poodle/fstab"
# from [073a091164137a993354145d11ab8fec7d5d705e]
# to [68f3d377a9ee2c1310021b9097f1937f7e5ac18b]
#
# patch "packages/base-files/base-files/spitz/fstab"
# from [35ab9eb73d1459c8df77b39504039919fed923f8]
# to [e2d7a6cfe5868408dac45ab759d61f4463307ac0]
#
# patch "packages/base-files/base-files/tosa/fstab"
# from [6437623746ef3ac7b1c5885e9b3b1d769225f2e1]
# to [631ad0716796432fa213c13cdbc22b739968800b]
#
# patch "packages/base-files/base-files_3.0.14.bb"
# from [5ad0ff2fa42f3bbdf7ceaf70ccf5f97af9120efa]
# to [56808741a8321e9f358d766697b017963b7292b4]
#
# patch "packages/gpsdrive/gpsdrive_2.10pre2.bb"
# from [4f0bb75fb726f90146f36b31de850d6f95659d62]
# to [93bb980156ef9b9d196e0009f4a6380e9eaa5133]
#
# patch "packages/libogg/libtheora_0.9+1.0alpha7.bb"
# from [53e7f61fc4fc80636acdcfd1b1a2706c3dead2ac]
# to [b983c982c8e684492b52fe831fc1760f3fc9f521]
#
# patch "packages/librcf/librcf_0.4.bb"
# from [af5f3be0da5beebc1039db8f2dccb6cdb1c98cba]
# to [e10e690f864ec45a86f3965e44d01081544edfc1]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [3160d6c5ebf760c1528741fc195566d294bb8879]
# to [ec394e80b40202881b329768580de4f21d156493]
#
# patch "packages/lm_sensors/lmsensors-apps_2.10.1.bb"
# from [098458d7451b302e662d248e4b54f392a787c643]
# to [8bb22b9d820630e5803ef13f1376c3dc051c6e9f]
#
# patch "packages/matchbox-common/matchbox-common_0.9.1.bb"
# from [bddf9d7d1a113a7b887c375bef97a8a3174105be]
# to [68df8bc491f589a6f3e7b69e5b10ec838e6b621f]
#
# patch "packages/matchbox-wm/matchbox-wm_0.8.3.bb"
# from [11f0e82bf7277f00ee0b1d83b5e68e3f0c9a9998]
# to [ac32ff6ed6dc301adbd233b2350be8b417c8e8bc]
#
# patch "packages/matchbox-wm/matchbox-wm_0.8.4.bb"
# from [11f0e82bf7277f00ee0b1d83b5e68e3f0c9a9998]
# to [ac32ff6ed6dc301adbd233b2350be8b417c8e8bc]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.2.bb"
# from [d34175fd9e7dc98d24532e81f6b73f9249bcd833]
# to [b61868d3efcb200c6ffe77b9ac981c477a2d1949]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.3.bb"
# from [239ef84130d55e5d0a21d48b1f3ccda8a7c3cfa2]
# to [2f6e68ee104c265ea1b80cd420646ecc135becf6]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.4.bb"
# from [62a357c7147f2bbc597d68ef36eba0957ba3cb70]
# to [07c9759d161ba9bd0d2cc7cc6040d278ce8f2f99]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.5.bb"
# from [6f73f13cd644cb48fa51fef99afb1946bcbd4a6a]
# to [19253c686c438e95da7707f11261101315a019de]
#
# patch "packages/matchbox-wm/matchbox-wm_0.9.bb"
# from [d47c653a293a9012fa9a983fb0bfc387b52f4537]
# to [59d56967ceddf69a4719582ab3c456710c85ba77]
#
# patch "packages/matchbox-wm/matchbox-wm_1.0.bb"
# from [4950e7030b1cbd117a9d000f47194aa320a992df]
# to [33cf62145c1efd3eaeb1414b7575633906beb0a1]
#
# patch "packages/matchbox-wm/matchbox-wm_1.1.bb"
# from [739e15a3c621658a1679e10df4d1e8d7321a66bc]
# to [831232f53fb4bd1b6c17527e9d92fb8c72355ae1]
#
# patch "packages/matchbox-wm/matchbox-wm_1.2.bb"
# from [f76c8f85daaf9e0782a8d564dcc1b6e906534b7a]
# to [98095f550f8c77883c44c40c96ff2b2161a07c87]
#
# patch "packages/matchbox-wm/matchbox-wm_svn.bb"
# from [5bafe560fead96654e15db643aa0ea49f27d227c]
# to [ce0ac84cb055e0cb08930225f22832e6aca6df3c]
#
# patch "packages/navit/navit_0.0.1.bb"
# from [87c4e6ce2cdf4c2270e9f3aa51f1441b78a4db82]
# to [f26539d3ae16efb9541db714be3d65c0312fc4a8]
#
# patch "packages/openmoko2/openmoko-dialer2_svn.bb"
# from [31e4e965b0782f418f64556c10bf5a9e45fbff7c]
# to [c4ffce03fc13089743a05ef4992588caaf7a1326]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [f186993a5ae9b6417b6d498b2e29dc8164dad287]
# to [a4e57156caaece7b3fd09e98c9f541594ba4879b]
#
# patch "packages/openmoko2/openmoko-today2-folders_svn.bb"
# from [90e242a90fac296a369c67150653c19f6e9356d5]
# to [956d96368858c8c2d572532cab005e6a6c738c93]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [cc6cb8b2119ee8dacad8781ada129bfea85d69e5]
# to [1fe07d72af509c3c4379bfd590276993274cdb1f]
#
# patch "packages/tasks/task-openmoko.bb"
# from [5dc5506edaaf3e889cc37fc49dda94c482b1d8c3]
# to [f0b4bb1fe9d73d5cd26853e1a02d2f654a4a71f3]
#
# patch "packages/wifi-radar/wifi-radar_1.9.6.bb"
# from [221e6edf4928be2b1bce088bd74dd7985772ea37]
# to [1744245b1a014042504064af18845a64c864a03a]
#
# patch "packages/wlan-ng/wlan-ng-modules_0.2.7.bb"
# from [62d8318e1c3641cef346f24229fb5ab86c21bd75]
# to [4f3ab359bbe31bfb1b631b303c97ad63c2f981e3]
#
# patch "packages/xorg-data/xbitmaps_1.0.1.bb"
# from [613ab066e8981893ec5634d14519baa5129ae981]
# to [47f276f3b54cf30ab254a4d478388c6d462ac6a3]
#
============================================================
--- packages/desktop-file-utils/desktop-file-utils-native_0.14.bb a2e82b4ea68a494f12d15c7dd824579781660311
+++ packages/desktop-file-utils/desktop-file-utils-native_0.14.bb a2e82b4ea68a494f12d15c7dd824579781660311
@@ -0,0 +1,12 @@
+SECTION = "console/utils"
+HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"
+DESCRIPTION = "command line utilities to work with *.desktop files"
+LICENSE = "GPL"
+
+DEPENDS = "glib-2.0-native"
+
+SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz"
+
+inherit autotools native
+
+S = "${WORKDIR}/desktop-file-utils-${PV}"
============================================================
--- packages/ettercap/ettercap-ng_0.7.3.bb 885933dadc1db669a1e36edfed1a6651b48a0aae
+++ packages/ettercap/ettercap-ng_0.7.3.bb 885933dadc1db669a1e36edfed1a6651b48a0aae
@@ -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"
============================================================
--- packages/ettercap/files/autotools.patch a46938ba70c1204f0430b669e940422dcf404f4e
+++ packages/ettercap/files/autotools.patch a46938ba70c1204f0430b669e940422dcf404f4e
@@ -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
+
============================================================
--- packages/glibc/glibc-intermediate_2.7.bb 27e617506e71e32db940d64c4849ce48bcfeb8b4
+++ packages/glibc/glibc-intermediate_2.7.bb 27e617506e71e32db940d64c4849ce48bcfeb8b4
@@ -0,0 +1,8 @@
+require%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list