From 416da30aeabed3da6f7775d9da973d959aad45f2 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Mon, 20 Sep 2010 22:55:32 +0400 Subject: clamav: update 0.96.2 to 0.96.3 * bugfix release, considered as safe upgrade Signed-off-by: Roman I Khimov --- .../clamav/clamav-0.96.2/fix-libclamav.pc.in.patch | 11 ----------- .../clamav-0.96.2/fix-llvm-cross-configure.patch | 13 ------------- .../clamav/clamav-0.96.3/fix-libclamav.pc.in.patch | 11 +++++++++++ .../clamav-0.96.3/fix-llvm-cross-configure.patch | 13 +++++++++++++ recipes/clamav/clamav_0.96.2.bb | 21 --------------------- recipes/clamav/clamav_0.96.3.bb | 21 +++++++++++++++++++++ 6 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 recipes/clamav/clamav-0.96.2/fix-libclamav.pc.in.patch delete mode 100644 recipes/clamav/clamav-0.96.2/fix-llvm-cross-configure.patch create mode 100644 recipes/clamav/clamav-0.96.3/fix-libclamav.pc.in.patch create mode 100644 recipes/clamav/clamav-0.96.3/fix-llvm-cross-configure.patch delete mode 100644 recipes/clamav/clamav_0.96.2.bb create mode 100644 recipes/clamav/clamav_0.96.3.bb diff --git a/recipes/clamav/clamav-0.96.2/fix-libclamav.pc.in.patch b/recipes/clamav/clamav-0.96.2/fix-libclamav.pc.in.patch deleted file mode 100644 index 46e919a27f..0000000000 --- a/recipes/clamav/clamav-0.96.2/fix-libclamav.pc.in.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: clamav-0.96.1/libclamav.pc.in -=================================================================== ---- clamav-0.96.1.orig/libclamav.pc.in 2010-07-14 13:13:59.000000000 -0700 -+++ clamav-0.96.1/libclamav.pc.in 2010-07-14 13:14:05.000000000 -0700 -@@ -7,5 +7,5 @@ - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ - Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -+Cflags: -I${includedir} - diff --git a/recipes/clamav/clamav-0.96.2/fix-llvm-cross-configure.patch b/recipes/clamav/clamav-0.96.2/fix-llvm-cross-configure.patch deleted file mode 100644 index 17cfb2b3e4..0000000000 --- a/recipes/clamav/clamav-0.96.2/fix-llvm-cross-configure.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: clamav-0.96.1/libclamav/c++/llvm/configure -=================================================================== ---- clamav-0.96.1.orig/libclamav/c++/llvm/configure 2010-05-21 15:09:40.000000000 +0400 -+++ clamav-0.96.1/libclamav/c++/llvm/configure 2010-05-21 15:11:09.000000000 +0400 -@@ -4502,7 +4502,7 @@ - fi - fi - test -z "$BUILD_CC" && as_fn_error "no acceptable cc found in \$PATH" "$LINENO" 5 -- ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -+ ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&5' - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_build_exeext= diff --git a/recipes/clamav/clamav-0.96.3/fix-libclamav.pc.in.patch b/recipes/clamav/clamav-0.96.3/fix-libclamav.pc.in.patch new file mode 100644 index 0000000000..46e919a27f --- /dev/null +++ b/recipes/clamav/clamav-0.96.3/fix-libclamav.pc.in.patch @@ -0,0 +1,11 @@ +Index: clamav-0.96.1/libclamav.pc.in +=================================================================== +--- clamav-0.96.1.orig/libclamav.pc.in 2010-07-14 13:13:59.000000000 -0700 ++++ clamav-0.96.1/libclamav.pc.in 2010-07-14 13:14:05.000000000 -0700 +@@ -7,5 +7,5 @@ + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ + Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ ++Cflags: -I${includedir} + diff --git a/recipes/clamav/clamav-0.96.3/fix-llvm-cross-configure.patch b/recipes/clamav/clamav-0.96.3/fix-llvm-cross-configure.patch new file mode 100644 index 0000000000..17cfb2b3e4 --- /dev/null +++ b/recipes/clamav/clamav-0.96.3/fix-llvm-cross-configure.patch @@ -0,0 +1,13 @@ +Index: clamav-0.96.1/libclamav/c++/llvm/configure +=================================================================== +--- clamav-0.96.1.orig/libclamav/c++/llvm/configure 2010-05-21 15:09:40.000000000 +0400 ++++ clamav-0.96.1/libclamav/c++/llvm/configure 2010-05-21 15:11:09.000000000 +0400 +@@ -4502,7 +4502,7 @@ + fi + fi + test -z "$BUILD_CC" && as_fn_error "no acceptable cc found in \$PATH" "$LINENO" 5 +- ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++ ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&5' + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_build_exeext= diff --git a/recipes/clamav/clamav_0.96.2.bb b/recipes/clamav/clamav_0.96.2.bb deleted file mode 100644 index 6aebc15bc4..0000000000 --- a/recipes/clamav/clamav_0.96.2.bb +++ /dev/null @@ -1,21 +0,0 @@ -require clamav.inc - -SRC_URI += "file://fix-llvm-cross-configure.patch \ - file://fix-libclamav.pc.in.patch" - -SRC_URI[clamav-0.96.2.md5sum] = "a2c2555d86868f91a01d0e2c2403bbec" -SRC_URI[clamav-0.96.2.sha256sum] = "6aa0b0d96ed25ffb4b5aca53f6348978c94771503c299f86e480fef475abcefa" - -PR = "${INC_PR}.0" - -EXTRA_OECONF_append_libc-uclibc = " --disable-llvm" - -# Autoreconf breaks on llvm with -# gnu-configize: `configure.ac' or `configure.in' is required -# -# Works good enough without autoreconf -do_configure() { - oe_runconf -} - -FILES_${PN}_append = " ${bindir}/clambc" diff --git a/recipes/clamav/clamav_0.96.3.bb b/recipes/clamav/clamav_0.96.3.bb new file mode 100644 index 0000000000..617d4082b7 --- /dev/null +++ b/recipes/clamav/clamav_0.96.3.bb @@ -0,0 +1,21 @@ +require clamav.inc + +SRC_URI += " file://fix-llvm-cross-configure.patch \ + file://fix-libclamav.pc.in.patch" + +SRC_URI[clamav-0.96.3.md5sum] = "663274565c4da17abb112ff88895e510" +SRC_URI[clamav-0.96.3.sha256sum] = "db324d50a2d4e71a9b647198a607e56b952eb480f75ad6a28231d1f713736c8b" + +PR = "${INC_PR}.0" + +EXTRA_OECONF_append_libc-uclibc = " --disable-llvm" + +# Autoreconf breaks on llvm with +# gnu-configize: `configure.ac' or `configure.in' is required +# +# Works good enough without autoreconf +do_configure() { + oe_runconf +} + +FILES_${PN}_append = " ${bindir}/clambc" -- cgit 1.2.3-korg