From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/bogofilter/patches/patch-config_in | 14 -- package/bogofilter/patches/patch-configure | 281 -------------------------- package/bogofilter/patches/patch-configure_ac | 53 +++++ 3 files changed, 53 insertions(+), 295 deletions(-) delete mode 100644 package/bogofilter/patches/patch-config_in delete mode 100644 package/bogofilter/patches/patch-configure create mode 100644 package/bogofilter/patches/patch-configure_ac (limited to 'package/bogofilter/patches') diff --git a/package/bogofilter/patches/patch-config_in b/package/bogofilter/patches/patch-config_in deleted file mode 100644 index 11648db39..000000000 --- a/package/bogofilter/patches/patch-config_in +++ /dev/null @@ -1,14 +0,0 @@ -$Id$ ---- bogofilter-1.1.3.orig/config.in 2006-12-03 05:17:24.000000000 +0100 -+++ bogofilter-1.1.3/config.in 2007-03-29 19:28:01.000000000 +0200 -@@ -51,10 +51,6 @@ - /* Have suitable db.h header */ - #undef HAVE_DB_H - --/* Define to 1 if you have the declaration of `db_create', and to 0 if you -- don't. */ --#undef HAVE_DECL_DB_CREATE -- - /* Define to 1 if you have the declaration of `getopt', and to 0 if you don't. - */ - #undef HAVE_DECL_GETOPT diff --git a/package/bogofilter/patches/patch-configure b/package/bogofilter/patches/patch-configure deleted file mode 100644 index 165de8409..000000000 --- a/package/bogofilter/patches/patch-configure +++ /dev/null @@ -1,281 +0,0 @@ -$Id$ ---- bogofilter-1.1.3.orig/configure 2006-12-03 05:17:15.000000000 +0100 -+++ bogofilter-1.1.3/configure 2007-03-29 19:27:35.000000000 +0200 -@@ -13464,238 +13464,55 @@ echo "${ECHO_T}$LIBDB" >&6; } - - saveLIBS="$LIBS" - LIBS="$LIBS $LIBDB" -- { echo "$as_me:$LINENO: checking if a program can be linked against Berkeley DB and run" >&5 --echo $ECHO_N "checking if a program can be linked against Berkeley DB and run... $ECHO_C" >&6; } -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- -+# AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) -+# AC_RUN_IFELSE( -+# AC_LANG_PROGRAM([[ - #ifdef HAVE_INTTYPES_H - #include - #endif - #include -+# ]], [[ -+#return 0; -+# ]]),, -+# [AC_MSG_RESULT(no) -+# AC_MSG_ERROR([Cannot run a program linked against libdb. -+#Did you adjust your library search path to include your libdb?])],) -+# AC_MSG_RESULT(yes) - --int --main () --{ -- --return 0; -- -- ; -- return 0; --} --_ACEOF --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --{ echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- { { echo "$as_me:$LINENO: error: Cannot run a program linked against libdb. --Did you adjust your library search path to include your libdb?" >&5 --echo "$as_me: error: Cannot run a program linked against libdb. --Did you adjust your library search path to include your libdb?" >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- -- { echo "$as_me:$LINENO: checking if Berkeley DB header and library versions match" >&5 --echo $ECHO_N "checking if Berkeley DB header and library versions match... $ECHO_C" >&6; } -- rm -r -f bfadtestdir -- mkdir bfadtestdir -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- -- #include -- #include -+# dnl check if header and library of DB library match -+# dnl ignore if cross compiling -+# AC_MSG_CHECKING(if Berkeley DB header and library versions match) -+# rm -r -f bfadtestdir -+# mkdir bfadtestdir -+# AC_RUN_IFELSE( -+# AC_LANG_PROGRAM([[ -+# #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 --rm -f conftest$ac_exeext --if { (ac_try="$ac_link" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_link") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_try") 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --( exit $ac_status ) --{ echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6; } -- { { echo "$as_me:$LINENO: error: db.h header file and db library version do not match." >&5 --echo "$as_me: error: db.h header file and db library version do not match." >&2;} -- { (exit 1); exit 1; }; } --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- -- -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } -- { echo "$as_me:$LINENO: checking whether db_create is declared" >&5 --echo $ECHO_N "checking whether db_create is declared... $ECHO_C" >&6; } --if test "${ac_cv_have_decl_db_create+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#ifdef HAVE_INTTYPES_H -+# #include -+# ]], [[ -+# 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); -+# ]]),, -+# [AC_MSG_RESULT(no) -+# AC_MSG_ERROR(db.h header file and db library version do not match.)],) -+# AC_MSG_RESULT(yes) -+# 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. -+#You can download Berkeley DB 4.3.x from http://www.sleepycat.com/]]), -+# [[#ifdef HAVE_INTTYPES_H - #include - #endif --#include -- -- --int --main () --{ --#ifndef db_create -- (void) db_create; --#endif -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- ac_cv_have_decl_db_create=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_cv_have_decl_db_create=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi --{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_db_create" >&5 --echo "${ECHO_T}$ac_cv_have_decl_db_create" >&6; } --if test $ac_cv_have_decl_db_create = yes; then -- --cat >>confdefs.h <<_ACEOF --#define HAVE_DECL_DB_CREATE 1 --_ACEOF -- -- --else -- cat >>confdefs.h <<_ACEOF --#define HAVE_DECL_DB_CREATE 0 --_ACEOF -- --{ { echo "$as_me:$LINENO: 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. --You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&5 --echo "$as_me: 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. --You can download Berkeley DB 4.3.x from http://www.sleepycat.com/" >&2;} -- { (exit 1); exit 1; }; } --fi -- -- -+#include ]] -+# ) - { echo "$as_me:$LINENO: checking if Berkeley DB supports shared environments" >&5 - echo $ECHO_N "checking if Berkeley DB supports shared environments... $ECHO_C" >&6; } - if test "x$enable_dbshared_test" != xno && test "x$USE_TRANSACTIONS" != xNO ; then diff --git a/package/bogofilter/patches/patch-configure_ac b/package/bogofilter/patches/patch-configure_ac new file mode 100644 index 000000000..8d79ed50f --- /dev/null +++ b/package/bogofilter/patches/patch-configure_ac @@ -0,0 +1,53 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- bogofilter-1.2.0.orig/configure.ac 2009-02-21 21:41:43.000000000 +0100 ++++ bogofilter-1.2.0/configure.ac 2009-05-28 19:47:00.466710794 +0200 +@@ -550,49 +550,6 @@ Cannot link against libdb? Try these ste + AH_TEMPLATE([HAVE_DB_H], [Have suitable db.h header]) + AC_SUBST(LIBDB) + +- dnl check if run-time link works +- saveLIBS="$LIBS" +- LIBS="$LIBS $LIBDB" +- AC_MSG_CHECKING(if a program can be linked against Berkeley DB and run) +- AC_RUN_IFELSE( +- AC_LANG_PROGRAM([[ +-#ifdef HAVE_INTTYPES_H +-#include +-#endif +-#include +- ]], [[ +-return 0; +- ]]),, +- [AC_MSG_RESULT(no) +- AC_MSG_ERROR([Cannot run a program linked against libdb. +-Did you adjust your library search path to include your libdb?])],) +- AC_MSG_RESULT(yes) +- +- dnl check if header and library of DB library match +- dnl ignore if cross compiling +- AC_MSG_CHECKING(if Berkeley DB header and library versions match) +- rm -r -f bfadtestdir +- mkdir bfadtestdir +- AC_RUN_IFELSE( +- AC_LANG_PROGRAM([[ +- #include +- #include +-#ifdef HAVE_INTTYPES_H +-#include +-#endif +- #include +- ]], [[ +- 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); +- ]]),, +- [AC_MSG_RESULT(no) +- AC_MSG_ERROR(db.h header file and db library version do not match.)],) +- AC_MSG_RESULT(yes) + 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. -- cgit v1.2.3