merge of a1ab10cae4a810f7d749da7ef9f90eb700bf2a34

     and ff8482dffaa2fde2376b39d9666e0598a8beae83

7 files changed, 96 insertions, 0 deletions

diff --git a/packages/bogofilter/.mtn2git_empty b/packages/bogofilter/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bogofilter/.mtn2git_empty
diff --git a/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty b/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bogofilter/bogofilter-0.96.0/.mtn2git_empty
diff --git a/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch b/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch
new file mode 100644
index 0000000000..310eaaa16d
--- /dev/null
+++ b/packages/bogofilter/bogofilter-0.96.0/configure.ac.patch
@@ -0,0 +1,34 @@
+--- bogofilter-0.96.0/configure.ac.orig	2005-09-04 20:42:35.000000000 +0200
++++ bogofilter-0.96.0/configure.ac	2005-09-04 20:45:12.000000000 +0200
+@@ -460,6 +460,7 @@
+ 	dnl check if run-time link works
+ 	saveLIBS="$LIBS"
+ 	LIBS="$LIBS $LIBDB"
++	if test x$cross_compiling = xNO ; then
+ 	AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run)
+ 	AC_RUN_IFELSE(
+ 	AC_LANG_PROGRAM([[
+@@ -500,6 +501,7 @@
+ 		   [AC_MSG_RESULT(no)
+ 		   AC_MSG_ERROR(db.h header file and db library version do not match.)],)
+ 	AC_MSG_RESULT(yes)
++	fi
+ 	AC_CHECK_DECLS(db_create,,
+ 	       AC_MSG_ERROR([[Can not locate a suitable Berkeley DB db.h header file.
+ Use --with-libdb-prefix=PATH to specify the path to a v3+ install directory.
+@@ -509,6 +511,7 @@
+ #endif
+ #include <db.h>]]
+ 	)
++	if test x$cross_compiling = xNO ; then
+ 	AC_MSG_CHECKING(if Berkeley DB supports shared environments)
+ 	if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then
+ 	AC_RUN_IFELSE(
+@@ -548,6 +551,7 @@
+     else
+ 	AC_MSG_RESULT(skipped)
+     fi
++	fi
+ 
+ 	AC_DEFINE(ENABLE_DB_DATASTORE,1, [Enable Berkeley DB datastore])
+ 	LIBS="$saveLIBS"
diff --git a/packages/bogofilter/bogofilter_0.96.0.bb b/packages/bogofilter/bogofilter_0.96.0.bb
new file mode 100644
index 0000000000..e552f1b8bd
--- /dev/null
+++ b/packages/bogofilter/bogofilter_0.96.0.bb
@@ -0,0 +1,17 @@
+SECTION = "console/network"
+DEPENDS = "db3"
+DESCRIPTION = "Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) \
+by a statistical analysis of the message's header and content (body). \
+The program is able to learn from the user's classifications and corrections."
+LICENSE = "GPL"
+PR = "r1"
+PRIORITY = "optional"
+
+SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \
+           file://${FILESDIR}/configure.ac.patch;patch=1 \
+	   "
+
+inherit autotools
+
+EXTRA_OECONF = "--with-libdb-prefix=${libdir}"
+
diff --git a/packages/upslug/upslug2-native_3.bb b/packages/upslug/upslug2-native_3.bb
new file mode 100644
index 0000000000..c3744f3cf6
--- /dev/null
+++ b/packages/upslug/upslug2-native_3.bb
@@ -0,0 +1,3 @@
+include upslug2.inc
+
+inherit native
diff --git a/packages/upslug/upslug2.inc b/packages/upslug/upslug2.inc
new file mode 100644
index 0000000000..0be0883cc9
--- /dev/null
+++ b/packages/upslug/upslug2.inc
@@ -0,0 +1,41 @@
+# This package builds the 'upslug2' binary upload/flash tool
+# for the NSLU2.  It is not useful for anything else.
+PR = "r0"
+DESCRIPTION = "NSLU2 binary upload tool (version 2)"
+HOMEPAGE = "http://www.nslu2-linux.org/wiki/Main/UpSlug2"
+MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL-2"
+
+# On Linux libpcap does not work.  Using libpcap is sub-optimal - it
+# is intended for packet capture not management of a new protocol
+# stream - so you may want to try the linux options on other operating
+# systems.
+LIBPCAP_OECONF = "--with-libpcap"
+LIBPCAP_OECONF_linux = ""
+LIBPCAP_OECONF_linux-uclibc = ""
+LIBPCAP_RDEPENDS = "libpcap"
+LIBPCAP_RDEPENDS_linux = ""
+LIBPCAP_RDEPENDS_linux-uclibc = ""
+
+RDEPENDS += "${LIBPCAP_RDEPENDS}"
+
+SRC_TAG = "upslug2_${@'_'.join(bb.data.getVar('PV',d,1).split('.'))}"
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/nslu;method=pserver;module=upslug2;tag=${SRC_TAG}"
+# For testing use this (tags and other changes take a day to
+# propogate on sourceforge).  Change 'jbowler' to your login name!
+#SRC_URI = "cvs://jbowler@cvs.sourceforge.net/cvsroot/nslu;method=ext;rsh=ssh;module=upslug2;tag=${SRC_TAG}"
+
+inherit autotools
+
+S = "${WORKDIR}/upslug2"
+PACKAGES = "${PN}"
+EXTRA_OECONF += "${LIBPCAP_OECONF}"
+
+python () {
+	# Don't build upslug2 unless we're targeting an nslu2
+	mach = bb.data.getVar("MACHINE", d, 1)
+	if mach != 'nslu2':
+		raise bb.parse.SkipPackage("upslug2 only builds for the Linksys NSLU2")
+}
diff --git a/packages/upslug/upslug2_3.bb b/packages/upslug/upslug2_3.bb
new file mode 100644
index 0000000000..de9c427303
--- /dev/null
+++ b/packages/upslug/upslug2_3.bb
@@ -0,0 +1 @@
+include upslug2.inc