Add dsniff, add some static lib builds alongside the shared, generate the rpcsvc headers in glibc, and thereby fix the dsniff build.

BKrev: 3faadb17GD8DyutGwY6Zd8acsexYJQ

8 files changed, 126 insertions, 4 deletions

diff --git a/db/db3_3.2.9.oe b/db/db3_3.2.9.oe
index c4d86ed5ab..25e5063507 100644
--- a/db/db3_3.2.9.oe
+++ b/db/db3_3.2.9.oe
@@ -8,14 +8,15 @@ B = ${WORKDIR}/db-${PV}/build_unix
 inherit autotools libtool
 
 EXTRA_OECONF = '--enable-shared --enable-compat185 --enable-static'
-EXTRA_OEMAKE = "'SHELL=/bin/sh' 'ar=`which ${AR}`' 'chmod=`which chmod`' \
+EXTRA_OEMAKE = "'SHELL=/bin/sh' 'ar=`which ${AR}` cr' 'chmod=`which chmod`' \
 		'cp=`which cp`' 'ln=`which ln`' 'mkdir=`which mkdir`' 'ranlib=`which ${RANLIB}`' \
 		'rm=`which rm`' 'strip=`which ${STRIP}`'"
 
-FILES_${PN}=${bindir} ${libdir}/libdb-3.2.{so,a,la}
-FILES_${PN}-dev=${includedir} ${libdir}/libdb.so ${libdir}/libdb-3.so
+FILES_${PN}=${bindir} ${libdir}/libdb-3.2*
+FILES_${PN}-dev=${includedir} ${libdir}/libdb.so ${libdir}/libdb.a ${libdir}/libdb-3.so
 
 do_configure_prepend () {
+	set -e
 	(
 		cd ${S}
 		. ./RELEASE
@@ -32,17 +33,43 @@ do_configure_prepend () {
 	)
 }
 
+do_configure () {
+	set -e
+	cd ${B}
+	oe_runconf --enable-shared --disable-static
+	mkdir -p ${WORKDIR}/db-${PV}/build_unix_static
+	cd ${WORKDIR}/db-${PV}/build_unix_static
+	oe_runconf --disable-shared --enable-static
+	cd ${S}
+}
+
+do_compile () {
+	set -e
+	cd ${B}
+	oe_runmake
+	cd ${WORKDIR}/db-${PV}/build_unix_static
+	oe_runmake
+	cd ${S}
+}
+
 do_stage () {
+	set -e
+	cd ${B}
 	install -m 0644 db_185.h ../include/db_cxx.h db.h ${STAGING_DIR}/target/include/
 	install -m 0755 .libs/libdb-3.2.so ${STAGING_LIBDIR}/
 	ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb-3.so
 	ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb3.so
 	ln -sf libdb-3.2.so ${STAGING_LIBDIR}/libdb.so
 	install -m 0644 .libs/libdb-3.2.la ${STAGING_LIBDIR}/
+	cd ${WORKDIR}/db-${PV}/build_unix_static
+	install -m 0644 libdb.a ${STAGING_LIBDIR}/
+	cd ${S}
 }
 
 do_install () {
-	oe_runmake \
+	set -e
+	for i in ${B} ${WORKDIR}/db-${PV}/build_unix_static; do
+	oe_runmake -C $i \
 		prefix=${D}/${prefix} \
 		exec_prefix=${D}/${exec_prefix} \
 		bindir=${D}/${bindir} \
@@ -50,4 +77,5 @@ do_install () {
 		libdir=${D}/${libdir} \
 		docdir=${D}/${docdir} \
 		install
+	done
 }
diff --git a/dsniff/dsniff-2.3/configure.patch b/dsniff/dsniff-2.3/configure.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/dsniff/dsniff-2.3/configure.patch
diff --git a/dsniff/dsniff_2.3.oe b/dsniff/dsniff_2.3.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/dsniff/dsniff_2.3.oe
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index da6cad808c..af22f2e48c 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -95,6 +95,20 @@ do_compile_prepend() {
 	touch sysdeps/${TARGET_ARCH}/framestate.c
 }
 
+rpcsvc = bootparam_prot.x nlm_prot.x rstat.x \
+	 yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+	 rusers.x spray.x nfs_prot.x rquota.x key_prot.x
+
+do_compile_append() {
+	(
+		cd ${S}/sunrpc/rpcsvc
+		for r in ${rpcsvc}; do
+			h=`echo $r|sed -e's,\.x$,.h,'`
+			rpcgen -h $r -o $h || oewarn "unable to generate header for $r"
+		done
+	)
+}
+
 do_stage() {
 	oe_runmake 'install_root=${STAGING_DIR}/target' \
 		'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
@@ -106,11 +120,19 @@ do_stage() {
 	cat '${STAGING_LIBDIR}/libpthread-old.so' | sed -e's,/lib/,,g' > '${STAGING_LIBDIR}/libpthread.so'
 	cp -a '${WORKDIR}/linux/include/linux' '${STAGING_DIR}/target/include/'
 	cp -a '${WORKDIR}/linux/include/asm-${TARGET_ARCH}' '${STAGING_DIR}/target/include/'
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${STAGING_DIR}/target/include/rpcsvc/
+	done
 	ln -sf 'asm-${TARGET_ARCH}' '${STAGING_DIR}/target/include/asm'
 }
 
 do_install() {
 	oe_runmake install_root=${D} install
+	for r in ${rpcsvc}; do
+		h=`echo $r|sed -e's,\.x$,.h,'`
+		install -m 0644 ${S}/sunrpc/rpcsvc/$h ${D}/${includedir}/rpcsvc/
+	done
 #	cp -a ${WORKDIR}/linux/include/linux ${D}/${includedir}/
 #	cp -a ${WORKDIR}/linux/include/asm-${TARGET_ARCH}/* ${D}/${includedir}/asm/
 }
diff --git a/libnet/libnet_1.0.2a.oe b/libnet/libnet_1.0.2a.oe
index 055224a73b..6caee56345 100644
--- a/libnet/libnet_1.0.2a.oe
+++ b/libnet/libnet_1.0.2a.oe
@@ -10,6 +10,7 @@ inherit autotools
 CPPFLAGS_prepend = "-I${S}/libnet/include -DHAVE_PF_PACKET "
 
 do_stage () {
+	install -m 0755 libnet-config ${STAGING_BINDIR}/
 	install -m 0644 include/libnet.h ${STAGING_DIR}/target/include/
 	install -d ${STAGING_DIR}/target/include/libnet
 	install -m 0644 include/libnet/libnet-headers.h ${STAGING_DIR}/target/include/libnet/
diff --git a/libnet/libnet_1.1.0.oe b/libnet/libnet_1.1.0.oe
index e69de29bb2..af6bea963e 100644
--- a/libnet/libnet_1.1.0.oe
+++ b/libnet/libnet_1.1.0.oe
@@ -0,0 +1,20 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI := http://www.packetfactory.net/libnet/dist/libnet.tar.gz \
+	   file://${FILESDIR}/configure.patch;patch=1
+S := ${WORKDIR}/Libnet-latest
+
+inherit autotools
+
+CPPFLAGS_prepend = "-I${S}/libnet/include "
+
+do_stage () {
+	install -m 0755 libnet-config ${STAGING_BINDIR}/
+	oe_runmake -C src 'DESTDIR=${STAGING_DIR}/target' \
+			  'libdir=/lib' install-libLIBRARIES
+	oe_runmake -C include 'DESTDIR=${STAGING_DIR}/target' \
+			      'includedir=/include' install-includeHEADERS
+	oe_runmake -C include/libnet 'DESTDIR=${STAGING_DIR}/target' \
+			      'includedir=/include' install-libnetincludeHEADERS
+}
diff --git a/libnids/libnids_1.18.oe b/libnids/libnids_1.18.oe
index e69de29bb2..46f314d6ac 100644
--- a/libnids/libnids_1.18.oe
+++ b/libnids/libnids_1.18.oe
@@ -0,0 +1,14 @@
+DEPENDS = libc libnet libpcap
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/libnids/libnids-${PV}.tar.gz \
+	  file://${FILESDIR}/configure.patch;patch=1
+
+inherit autotools
+EXTRA_OECONF='--with-libpcap=${STAGING_DIR}/target \
+	      --with-libnet=${STAGING_DIR}/target'
+EXTRA_OEMAKE='"install_prefix=${D}"'
+
+do_stage () {
+	install -m 0644 src/nids.h ${STAGING_DIR}/target/include/
+	install -m 0644 src/libnids.a ${STAGING_LIBDIR}/
+}
diff --git a/openssl/openssl_0.9.7c.oe b/openssl/openssl_0.9.7c.oe
index e69de29bb2..ba1495df1c 100644
--- a/openssl/openssl_0.9.7c.oe
+++ b/openssl/openssl_0.9.7c.oe
@@ -0,0 +1,37 @@
+SRC_URI = http://www.openssl.org/source/${P}.tar.gz \
+	  ${DEBIAN_MIRROR}/main/o/${PN}/${PN}_${PV}-5.diff.gz
+S = ${WORKDIR}/${PN}-${PV}
+
+DEPENDS = virtual/libc
+SECTION = libs
+DESCRIPTION = Secure Socket Layer (SSL) binary and related cryptographic tools.
+
+AR_append = " r"
+export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}"
+export DIRS = "crypto ssl"
+export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
+do_compile () {
+	perl util/perlpath.pl /usr/bin
+	perl ./Configure shared --prefix=/usr --openssldir=/usr/lib/ssl ${TARGET_OS}-elf-${TARGET_ARCH}
+	ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
+	oe_runmake -f Makefile.ssl
+	perl ./Configure no-shared --prefix=/usr --openssldir=/usr/lib/ssl ${TARGET_OS}-elf-${TARGET_ARCH}
+	oe_runmake -f Makefile.ssl
+}
+
+do_stage () {
+	cp --dereference -R include/openssl ${STAGING_DIR}/target/include/
+	install -m 0755 libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
+	ln -sf libcrypto.so.0.9.7 ${STAGING_LIBDIR}/libcrypto.so
+	install -m 0755 libssl.so.0.9.7 ${STAGING_LIBDIR}/
+	ln -sf libssl.so.0.9.7 ${STAGING_LIBDIR}/libssl.so
+	install -m 0644 libcrypto.a ${STAGING_LIBDIR}/
+	install -m 0644 libssl.a ${STAGING_LIBDIR}/
+}
+
+do_install () {
+	install -d ${D}/${libdir}/pkgconfig
+	oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install
+	chmod u+rx ${D}/${libdir}/pkgconfig
+	chmod 644 ${D}/${libdir}/pkgconfig/openssl.pc
+}