From 3391bc4c4d7ebc2de9e10c289e674fb616fe1541 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Mar 2010 14:13:17 +0800 Subject: bogofilter: Upgrade to 0.96.6 * 0.96.6 is the latest release of the ancient 0.96 release * It is addressing CVE-2005-4592 --- .../bogofilter-0.96.0/configure.ac.patch | 34 ------------------ .../bogofilter-0.96.6/configure.ac.patch | 34 ++++++++++++++++++ recipes/bogofilter/bogofilter_0.96.0.bb | 38 -------------------- recipes/bogofilter/bogofilter_0.96.6.bb | 40 ++++++++++++++++++++++ 4 files changed, 74 insertions(+), 72 deletions(-) delete mode 100644 recipes/bogofilter/bogofilter-0.96.0/configure.ac.patch create mode 100644 recipes/bogofilter/bogofilter-0.96.6/configure.ac.patch delete mode 100644 recipes/bogofilter/bogofilter_0.96.0.bb create mode 100644 recipes/bogofilter/bogofilter_0.96.6.bb (limited to 'recipes/bogofilter') diff --git a/recipes/bogofilter/bogofilter-0.96.0/configure.ac.patch b/recipes/bogofilter/bogofilter-0.96.0/configure.ac.patch deleted file mode 100644 index 310eaaa16d..0000000000 --- a/recipes/bogofilter/bogofilter-0.96.0/configure.ac.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 ]] - ) -+ 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/recipes/bogofilter/bogofilter-0.96.6/configure.ac.patch b/recipes/bogofilter/bogofilter-0.96.6/configure.ac.patch new file mode 100644 index 0000000000..310eaaa16d --- /dev/null +++ b/recipes/bogofilter/bogofilter-0.96.6/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 ]] + ) ++ 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/recipes/bogofilter/bogofilter_0.96.0.bb b/recipes/bogofilter/bogofilter_0.96.0.bb deleted file mode 100644 index 48caf83af5..0000000000 --- a/recipes/bogofilter/bogofilter_0.96.0.bb +++ /dev/null @@ -1,38 +0,0 @@ -SECTION = "console/network" -DEPENDS = "virtual/db" -RDEPENDS = "glibc-gconv glibc-gconv-iso8859-1" -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 = "r8" -PRIORITY = "optional" - -SRC_URI = "http://download.sourceforge.net/bogofilter/bogofilter-${PV}.tar.bz2 \ - file://configure.ac.patch;patch=1 \ - file://volatiles \ - file://postfix-filter.sh \ - file://bogohelper.sh \ - " - -inherit autotools - -EXTRA_OECONF = "--with-libdb-prefix=${libdir}" - -do_install_append () { - mkdir -p ${D}${sysconfdir}/default/volatiles - install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_bogofilter - install -m 755 ${WORKDIR}/postfix-filter.sh ${D}${bindir}/postfix-filter.sh - install -m 755 ${WORKDIR}/bogohelper.sh ${D}${bindir}/bogohelper.sh -} - -pkg_postinst () { - grep filter /etc/group || addgroup filter - grep spam /etc/passwd || adduser --disabled-password --home=/var/spool/filter --ingroup filter -g "Bogofilter" spam - grep bogo /etc/passwd || adduser --disabled-password --home=/home/bogo --ingroup filter -g "Bogofilter" bogo - [ -f "/etc/postfix/master.cf" ] && grep "/usr/bin/postfix-filter.sh" /etc/postfix/master.cf || { - echo "bogofilter unix - n n - - pipe" >> /etc/postfix/master.cf - echo " flags=R user=bogo argv=/usr/bin/postfix-filter.sh -f ${sender} -- ${recipient}" >> /etc/postfix/master.cf - } - /etc/init.d/populate-volatile.sh update -} diff --git a/recipes/bogofilter/bogofilter_0.96.6.bb b/recipes/bogofilter/bogofilter_0.96.6.bb new file mode 100644 index 0000000000..35bb1112b5 --- /dev/null +++ b/recipes/bogofilter/bogofilter_0.96.6.bb @@ -0,0 +1,40 @@ +SECTION = "console/network" +DEPENDS = "virtual/db" +RDEPENDS = "glibc-gconv glibc-gconv-iso8859-1" +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 = "r8" +PRIORITY = "optional" + +SRC_URI = "http://launchpad.net/bogofilter/main/0.96.6/+download/bogofilter-0.96.6.tar.gz;name=src \ + file://configure.ac.patch;patch=1 \ + file://volatiles \ + file://postfix-filter.sh \ + file://bogohelper.sh " +SRC_URI[src.md5sum] = "7e8e9593662f6394a56f99f12f525d6e" +SRC_URI[src.sha256sum] = "0b12fdd5b0bc50b582327764ee5cd415809db6d7adc233f1801bc0d0bf435a6d" + + +inherit autotools + +EXTRA_OECONF = "--with-libdb-prefix=${libdir}" + +do_install_append () { + mkdir -p ${D}${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/01_bogofilter + install -m 755 ${WORKDIR}/postfix-filter.sh ${D}${bindir}/postfix-filter.sh + install -m 755 ${WORKDIR}/bogohelper.sh ${D}${bindir}/bogohelper.sh +} + +pkg_postinst () { + grep filter /etc/group || addgroup filter + grep spam /etc/passwd || adduser --disabled-password --home=/var/spool/filter --ingroup filter -g "Bogofilter" spam + grep bogo /etc/passwd || adduser --disabled-password --home=/home/bogo --ingroup filter -g "Bogofilter" bogo + [ -f "/etc/postfix/master.cf" ] && grep "/usr/bin/postfix-filter.sh" /etc/postfix/master.cf || { + echo "bogofilter unix - n n - - pipe" >> /etc/postfix/master.cf + echo " flags=R user=bogo argv=/usr/bin/postfix-filter.sh -f ${sender} -- ${recipient}" >> /etc/postfix/master.cf + } + /etc/init.d/populate-volatile.sh update +} -- cgit 1.2.3-korg