[oe-commits] org.oe.dev merge of '2c5d0d8be360397528c4d116b6cbfb655cba6778'

[mickeyl commit]

merge of '2c5d0d8be360397528c4d116b6cbfb655cba6778'
     and '7c12c95bf9c72db33fe18c1e84311fba909db68b'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5e35db6c3b96d8b3e06e67674b625afa6fb788ad
ViewMTN: http://monotone.openembedded.org/revision/info/5e35db6c3b96d8b3e06e67674b625afa6fb788ad
Files:
1
packages/gstreamer/gst-plugins-base_0.10.17.bb
packages/dsniff/dsniff_2.3.bb
packages/libnids/libnids_1.18.bb
Diffs:

#
# mt diff -r2c5d0d8be360397528c4d116b6cbfb655cba6778 -r5e35db6c3b96d8b3e06e67674b625afa6fb788ad
#
#
#
# patch "packages/gstreamer/gst-plugins-base_0.10.17.bb"
#  from [42b568147310d58a2ca061df2db79c873973b472]
#    to [e208972d500349c227dd389cb57a1fa1e39092f4]
#
============================================================
--- packages/gstreamer/gst-plugins-base_0.10.17.bb	42b568147310d58a2ca061df2db79c873973b472
+++ packages/gstreamer/gst-plugins-base_0.10.17.bb	e208972d500349c227dd389cb57a1fa1e39092f4
@@ -6,7 +6,7 @@ PROVIDES += "gst-plugins"
 # if alsa has been built and is present.  You will
 # not get an error if this is not present, just 
 # a missing alsa plugin
-DEPENDS += "alsa-lib"
+DEPENDS += "alsa-lib libsm"
 
-PR = "r2"
+PR = "r3"
 


#
# mt diff -r7c12c95bf9c72db33fe18c1e84311fba909db68b -r5e35db6c3b96d8b3e06e67674b625afa6fb788ad
#
#
#
# patch "packages/dsniff/dsniff_2.3.bb"
#  from [bf75cae573f37bcc7496dea22f35d15c7854c46a]
#    to [6a689cf3545adb354773f64a33731a981e6f6dfa]
# 
# patch "packages/libnids/libnids_1.18.bb"
#  from [444da5983b34add606a5fff618ea311d958f6274]
#    to [28a53c70d2e265f9bb1318e589a1db4fe06b0bb2]
#
============================================================
--- packages/dsniff/dsniff_2.3.bb	bf75cae573f37bcc7496dea22f35d15c7854c46a
+++ packages/dsniff/dsniff_2.3.bb	6a689cf3545adb354773f64a33731a981e6f6dfa
@@ -1,22 +1,30 @@
+DESCRIPTION = "dsniff is a collection of tools for network auditing and penetration testing."
 SECTION = "console/network"
-DESCRIPTION = "dsniff is a collection of tools for network auditing and penetration testing."
+HOMEPAGE = "http://www.monkey.org/~dugsong/dsniff/"
+AUTHOR = "Dug Song <dugsong at monkey.org>"
 LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
 
 # There is a significant API change beween 1.0.2a of libnet and
 # 1.1.x, dsniff will only work with the older and there is no
 # updated version of dnsniff.
 DEPENDS = "virtual/db libpcap libnet-1.0 libnids openssl"
 
-SRC_URI = "http://www.monkey.org/~dugsong/dsniff/dsniff-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+SRC_URI = "\
+  http://www.monkey.org/~dugsong/dsniff/dsniff-${PV}.tar.gz \
+  file://configure.patch;patch=1 \
+"
 
 inherit autotools
 
-EXTRA_OECONF = "--without-x --with-db=${STAGING_LIBDIR}/.. \
-	       --with-libpcap=${STAGING_LIBDIR}/.. \
-	       --with-libnet=${STAGING_LIBDIR}/.. \
-	       --with-libnids=${STAGING_LIBDIR}/.. \
-	       --with-openssl=${STAGING_LIBDIR}/.."
+EXTRA_OECONF = "\
+  --without-x --with-db=${STAGING_LIBDIR}/.. \
+  --with-libpcap=${STAGING_LIBDIR}/.. \
+  --with-libnet=${STAGING_LIBDIR}/.. \
+  --with-libnids=${STAGING_LIBDIR}/.. \
+  --with-openssl=${STAGING_LIBDIR}/.. \
+"
 EXTRA_OEMAKE = "'install_prefix=${D}'"
+
+CFLAGS =+ "-I${S}/missing"
+LDFLAGS += "-lresolv"
-CFLAGS_prepend = " -I${S}/missing "
============================================================
--- packages/libnids/libnids_1.18.bb	444da5983b34add606a5fff618ea311d958f6274
+++ packages/libnids/libnids_1.18.bb	28a53c70d2e265f9bb1318e589a1db4fe06b0bb2
@@ -1,17 +1,21 @@
-LICENSE = "GPL"
-SECTION = "libs"
-DEPENDS = "libnet libpcap"
 DESCRIPTION = "Libnids performs assembly of TCP segments \
 into TCP streams, IP defragmentation, and TCP port \
 scan detection."
+LICENSE = "GPL"
+SECTION = "libs"
+DEPENDS = "libnet-1.0 libpcap"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz \
-	   file://configure.patch;patch=1"
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz \
+  file://configure.patch;patch=1"
 
 inherit autotools
 
-EXTRA_OECONF = "--with-libpcap=${STAGING_LIBDIR}/.. \
-		--with-libnet=${STAGING_LIBDIR}/.."
+EXTRA_OECONF = "\
+  --with-libpcap=${STAGING_LIBDIR}/.. \
+  --with-libnet=${STAGING_LIBDIR}/.. \
+"
 EXTRA_OEMAKE = "'install_prefix=${D}'"
 
 do_stage () {