From 0c7bcbae70e40cf1460aa516e94f58ea57a8a643 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Jun 2014 19:40:38 +0200 Subject: update to latest stable upstream --- package/bogofilter/Makefile | 12 ++-- package/bogofilter/patches/patch-configure | 96 ------------------------------ 2 files changed, 5 insertions(+), 103 deletions(-) delete mode 100644 package/bogofilter/patches/patch-configure (limited to 'package/bogofilter') diff --git a/package/bogofilter/Makefile b/package/bogofilter/Makefile index db2fae668..f2e553b01 100644 --- a/package/bogofilter/Makefile +++ b/package/bogofilter/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= bogofilter -PKG_VERSION:= 1.2.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 39d27c13eae8a5064d68e20d585e60de +PKG_VERSION:= 1.2.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 94aee3ced558c2a354547083735f2ba7 PKG_DESCR:= mail filter software PKG_SECTION:= net/mail PKG_BUILDDEP:= libiconv-tiny db @@ -24,15 +24,13 @@ CONFIGURE_ENV+= LIBS="-liconv" \ ac_cv_func_memcmp_working=yes CONFIGURE_ARGS+= --without-libsqlite3-prefix \ --without-libqdbm-prefix \ + --without-libiconv-prefix \ --with-included-gsl \ --disable-static \ --with-libdb-prefix=${STAGING_TARGET_DIR}/usr \ --disable-transactions -pre-build: - touch $(WRKBUILD)/src/lexer_v3.l $(WRKBUILD)/src/Makefile.in $(WRKBUILD)/src/lexer_v3.c - -post-install: +bogofilter-install: ${INSTALL_DIR} ${IDIR_BOGOFILTER}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/bogofilter \ ${IDIR_BOGOFILTER}/usr/bin/ diff --git a/package/bogofilter/patches/patch-configure b/package/bogofilter/patches/patch-configure deleted file mode 100644 index 21db7d973..000000000 --- a/package/bogofilter/patches/patch-configure +++ /dev/null @@ -1,96 +0,0 @@ ---- bogofilter-1.2.2.orig/configure 2010-07-08 05:30:26.000000000 +0200 -+++ bogofilter-1.2.2/configure 2010-11-09 23:29:25.894996376 +0100 -@@ -10284,93 +10284,7 @@ $as_echo "$LIBDB" >&6; } - - saveLIBS="$LIBS" - LIBS="$LIBS $LIBDB" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if a program can be linked against Berkeley DB and run" >&5 --$as_echo_n "checking if a program can be linked against Berkeley DB and run... " >&6; } -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#ifdef HAVE_INTTYPES_H --#include --#endif --#include -- --int --main () --{ -- --return 0; -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- as_fn_error "Cannot run a program linked against libdb. --Did you adjust your library search path to include your libdb?" "$LINENO" 5 --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Berkeley DB header and library versions match" >&5 --$as_echo_n "checking if Berkeley DB header and library versions match... " >&6; } -- rm -r -f bfadtestdir -- mkdir bfadtestdir -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- #include -- #include --#ifdef HAVE_INTTYPES_H --#include --#endif -- #include - --int --main () --{ -- -- int maj, min; -- (void)db_version(&maj, &min, 0); -- (void)fprintf(stderr, "headers: %d.%d, library: %d.%d\n", -- DB_VERSION_MAJOR, DB_VERSION_MINOR, maj, min); -- if (maj != DB_VERSION_MAJOR) exit(1); -- if (min != DB_VERSION_MINOR) exit(1); -- exit(0); -- -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- as_fn_error "db.h header file and db library version do not match." "$LINENO" 5 --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- cgit v1.2.3