diff options
-rw-r--r-- | recipes-security/clamav/clamav-0.99.1/mempool_build_fix.patch | 14 | ||||
-rw-r--r-- | recipes-security/clamav/clamav-0.99.1/remove_rpath_chk.patch | 16 | ||||
-rw-r--r-- | recipes-security/clamav/clamav-0.99.1/rpath_rmove.patch | 44 | ||||
-rw-r--r-- | recipes-security/clamav/clamav_0.99.2.bb (renamed from recipes-security/clamav/clamav_0.99.1.bb) | 9 | ||||
-rw-r--r-- | recipes-security/clamav/files/clamav-freshclam.service (renamed from recipes-security/clamav/clamav-0.99.1/clamav-freshclam.service) | 0 | ||||
-rw-r--r-- | recipes-security/clamav/files/clamav-milter.conf.sample (renamed from recipes-security/clamav/clamav-0.99.1/clamav-milter.conf.sample) | 0 | ||||
-rw-r--r-- | recipes-security/clamav/files/clamav.service (renamed from recipes-security/clamav/clamav-0.99.1/clamav.service) | 0 | ||||
-rw-r--r-- | recipes-security/clamav/files/clamd.conf (renamed from recipes-security/clamav/clamav-0.99.1/clamd.conf) | 0 | ||||
-rw-r--r-- | recipes-security/clamav/files/freshclam.conf (renamed from recipes-security/clamav/clamav-0.99.1/freshclam.conf) | 0 | ||||
-rw-r--r-- | recipes-security/clamav/files/volatiles.03_clamav (renamed from recipes-security/clamav/clamav-0.99.1/volatiles.03_clamav) | 0 |
10 files changed, 4 insertions, 79 deletions
diff --git a/recipes-security/clamav/clamav-0.99.1/mempool_build_fix.patch b/recipes-security/clamav/clamav-0.99.1/mempool_build_fix.patch deleted file mode 100644 index 18ead72..0000000 --- a/recipes-security/clamav/clamav-0.99.1/mempool_build_fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: libclamav/readdb.c -=================================================================== ---- a/libclamav/readdb.c -+++ b/libclamav/readdb.c -@@ -4163,7 +4163,9 @@ static int cli_loadpwdb(FILE *fs, struct - - /* use the tdb to track filetypes and check flevels */ - memset(&tdb, 0, sizeof(tdb)); -+#ifdef USE_MPOOL - tdb.mempool = engine->mempool; -+#endif - ret = init_tdb(&tdb, engine, attribs, passname); - free(attribs); - if(ret != CL_SUCCESS) { diff --git a/recipes-security/clamav/clamav-0.99.1/remove_rpath_chk.patch b/recipes-security/clamav/clamav-0.99.1/remove_rpath_chk.patch deleted file mode 100644 index 4d00931..0000000 --- a/recipes-security/clamav/clamav-0.99.1/remove_rpath_chk.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: clamav-0.99/configure -=================================================================== ---- clamav-0.99.orig/configure -+++ clamav-0.99/configure -@@ -16192,11 +16192,6 @@ $as_echo_n "checking for shared library - if ${acl_cv_rpath+:} false; then : - $as_echo_n "(cached) " >&6 - else -- -- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ -- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh -- . ./conftest.sh -- rm -f ./conftest.sh - acl_cv_rpath=done - - fi diff --git a/recipes-security/clamav/clamav-0.99.1/rpath_rmove.patch b/recipes-security/clamav/clamav-0.99.1/rpath_rmove.patch deleted file mode 100644 index a903c7e..0000000 --- a/recipes-security/clamav/clamav-0.99.1/rpath_rmove.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: clamav-0.99/configure -=================================================================== ---- clamav-0.99.orig/configure -+++ clamav-0.99/configure -@@ -9266,7 +9266,7 @@ $as_echo_n "checking whether the $compil - # are reset later if shared libraries are not supported. Putting them - # here allows them to be overridden if necessary. - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='${wl}-rpath $libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' - # ancient GNU ld didn't support --whole-archive et. al. - if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -@@ -9502,7 +9502,7 @@ _LT_EOF - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='${wl}-rpath $libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else -@@ -10074,7 +10074,7 @@ $as_echo "$lt_cv_irix_exported_symbol" > - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' - fi - archive_cmds_need_lc='no' -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='${wl}-rpath $libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes -Index: clamav-0.99/config/config.rpath -=================================================================== ---- clamav-0.99.orig/config/config.rpath -+++ clamav-0.99/config/config.rpath -@@ -156,7 +156,7 @@ if test "$with_gnu_ld" = yes; then - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec= - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken diff --git a/recipes-security/clamav/clamav_0.99.1.bb b/recipes-security/clamav/clamav_0.99.2.bb index 461015f..184d605 100644 --- a/recipes-security/clamav/clamav_0.99.1.bb +++ b/recipes-security/clamav/clamav_0.99.2.bb @@ -12,11 +12,10 @@ SRC_URI = "http://www.clamav.net/downloads/production/${BPN}-${PV}.tar.gz \ file://clamd.conf \ file://freshclam.conf \ file://volatiles.03_clamav \ - file://mempool_build_fix.patch \ - file://remove_rpath_chk.patch \ -" -SRC_URI[md5sum] = "cf1f3cbe62a08c9165801f79239166ff" -SRC_URI[sha256sum] = "e144689122d3f91293808c82cbb06b7d3ac9eca7ae29564c5d148ffe7b25d58a" + " + +SRC_URI[md5sum] = "61b51a04619aeafd965892a53f86d192" +SRC_URI[sha256sum] = "167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a" LEAD_SONAME = "libclamav.so" SO_VER = "7.1.1" diff --git a/recipes-security/clamav/clamav-0.99.1/clamav-freshclam.service b/recipes-security/clamav/files/clamav-freshclam.service index 0c909fb..0c909fb 100644 --- a/recipes-security/clamav/clamav-0.99.1/clamav-freshclam.service +++ b/recipes-security/clamav/files/clamav-freshclam.service diff --git a/recipes-security/clamav/clamav-0.99.1/clamav-milter.conf.sample b/recipes-security/clamav/files/clamav-milter.conf.sample index ed0d519..ed0d519 100644 --- a/recipes-security/clamav/clamav-0.99.1/clamav-milter.conf.sample +++ b/recipes-security/clamav/files/clamav-milter.conf.sample diff --git a/recipes-security/clamav/clamav-0.99.1/clamav.service b/recipes-security/clamav/files/clamav.service index f13191f..f13191f 100644 --- a/recipes-security/clamav/clamav-0.99.1/clamav.service +++ b/recipes-security/clamav/files/clamav.service diff --git a/recipes-security/clamav/clamav-0.99.1/clamd.conf b/recipes-security/clamav/files/clamd.conf index 0457785..0457785 100644 --- a/recipes-security/clamav/clamav-0.99.1/clamd.conf +++ b/recipes-security/clamav/files/clamd.conf diff --git a/recipes-security/clamav/clamav-0.99.1/freshclam.conf b/recipes-security/clamav/files/freshclam.conf index 100724f..100724f 100644 --- a/recipes-security/clamav/clamav-0.99.1/freshclam.conf +++ b/recipes-security/clamav/files/freshclam.conf diff --git a/recipes-security/clamav/clamav-0.99.1/volatiles.03_clamav b/recipes-security/clamav/files/volatiles.03_clamav index ee2153c..ee2153c 100644 --- a/recipes-security/clamav/clamav-0.99.1/volatiles.03_clamav +++ b/recipes-security/clamav/files/volatiles.03_clamav |