From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- app-antivirus/clamav/Manifest | 4 +- app-antivirus/clamav/clamav-0.101.2-r1.ebuild | 175 +++++++++++++++++++++ app-antivirus/clamav/clamav-0.101.2.ebuild | 175 --------------------- .../files/clamav-0.101.2-libxml2_pkgconfig.patch | 78 +++++++++ .../clamav/files/clamav-0.101.2-tinfo.patch | 31 ++++ 5 files changed, 287 insertions(+), 176 deletions(-) create mode 100644 app-antivirus/clamav/clamav-0.101.2-r1.ebuild delete mode 100644 app-antivirus/clamav/clamav-0.101.2.ebuild create mode 100644 app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch create mode 100644 app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch (limited to 'app-antivirus/clamav') diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest index 4618f00db010..5a743267752d 100644 --- a/app-antivirus/clamav/Manifest +++ b/app-antivirus/clamav/Manifest @@ -1,4 +1,6 @@ AUX clamav-0.100.0_autotools.patch 369 BLAKE2B ee30a0fe90e4553b64a67d1e0646a9d6c5ee33858e657905e0d71da9c4b14176469f1b2960dd04b25d46823fd239b252490c172a51d64eae589894423b8aafb0 SHA512 d872a162040ba10476f463b9e0e77edea81f022a4c0d53d7a6d09ca5753036a5236cf7182f518515f659888a203b07366873b757cf5af15c3dee74bbad6b2d02 +AUX clamav-0.101.2-libxml2_pkgconfig.patch 2298 BLAKE2B 55c3cf4d4dda55816cb8830df0ba3d865559ffd7068c819c46788a8dbb9940c18a47d23333e5660c57d0b8e488c5359a7bf3d0d1d5024999fe230b080857787d SHA512 4ae92f85a1623fcc6a40f53af0d08bd6e3bf9f3283036f36924cf2b2559531174b7a19c667b496b391a1bfa901e0451a52546d5be7168983c82c2790af3ca738 +AUX clamav-0.101.2-tinfo.patch 854 BLAKE2B 46479552a2dffcf56c7b142062896e8ae34e3721bb604011c7f4d439a0475f7b20fc04b8027958e72eba6c97de4adee0de9f737cc4899bac194ad6fba8f0c475 SHA512 e78e1c13ba9398a59449376ba60f2728ce36feaa94342f675d2f7fe8245703f4c632028ca2bf161e6fe5c3238c540e49849c191b1b080b5486913803384882d9 AUX clamav-milter.README.gentoo 2284 BLAKE2B 7afc18f3dad57c2d7595257b356943efb3d1af28d55ac8f09f0506430fd0dedf0820906ced666a7237e3af44a9bc1b43fff017c03faad844f96b132ca4c5dde6 SHA512 38eadf2d919a0c48345600ea5a39c90e766b62e8b1ffc7bb01969a8fd93c4545f2030058a470ac7efb75a1d6c74f9930438f58aeff5035e19e38241ed381f7b3 AUX clamav-milter.service 284 BLAKE2B 7fbdce10ffa1d85aa671616f17ad45683177916269b434283582ecb53000f7a9a8978119e6a8170ddad8f7c0f14f09398fd7b893aad5d718083b002f6371ff21 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee AUX clamav-milter.service-r1 303 BLAKE2B 55253d9a660699411e352bc80837add840dc6740afed4fe64a86def84610cad836ea3ea620664f540f242b917aab560201cca9c33b9fbc9b1cef2c8b29bfce36 SHA512 5dc30e3c57d9bff6595155e8299336c579c713aed429ab770f10d7678dd74691a135aa2070a825ddb726fdabcb001c19caeb993c1cd9a6fcf95d1d47f7160540 @@ -11,5 +13,5 @@ AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376 AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020dd326a437d6abf4bc515392d0b263eeb0773de128b9c0eff1c1f0b7b604dd14b9dffd50aba31909963e1 SHA512 28da28d633f487806448e17aec36648b6ba12f549549485704607e403e64643caea6ee9420e8101f11b3edebe62b651e6d6c338ab232f33b97b315d64b3789ac AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2 DIST clamav-0.101.2.tar.gz 21722932 BLAKE2B 5c2960e678510a6f829fc9333e05a45a57a704e13eb407e0f890dd5553a1f9644eb3b1122c677755237b8c682127319d447a508087bc9130d14cd2cfec92896a SHA512 f9ea4589a8081acf7b6d454d1a068da05ae6574a9070a08f9438935795cb6dc084ffb9222b11fb1623f31962f859e6536a2f5bd1de29ef6b9b314efa5edc8c7e -EBUILD clamav-0.101.2.ebuild 5503 BLAKE2B 60bfb53bfd4f8c5f77b5bc6c4d5decd0ab8507d1f0f8565cd9f4b8f8663deadd20f4bceb827ab3bf39853ea75716e2718ad7cc50828e5c47e41bcfb2deaa5d5a SHA512 2bc8a016e3899b261eb9bdfadf383041ea4f00afd2740acfb7a713fe34a7422847fabf78e20c1002ef5a0d8c6c3b97ce40a8dbf69ff3d28dcc64af1c256b67a1 +EBUILD clamav-0.101.2-r1.ebuild 5558 BLAKE2B 0ecb496bb10d11bd95c22b63923f00be6e8f2837a03384e6c9cbf20b88f49104ce8a848dec98dfe0624684833778a4aa00aa61f5ec0dd5e40267be97ac1323d4 SHA512 2f75d1127400bf5c2794691d32582bbd9ddb96af226be40d1cf9b14ed14dbe63553303970a7fc1404b38928a6ba17441458cba887aaf9fabc3a97e009a415e89 MISC metadata.xml 677 BLAKE2B 0f1325062a27dc76bb5313cf665635af98eac88aeb331247511e24b84006bf5a01a999b7601edaa03a30674838a8c8b784e5f1bcb54117fd254333aca0f9ac10 SHA512 f63fab0eb32bf5f98155e58cbeb987a5a8623adbe44b0dc8b903e5cf8485aec6cca5c7651ca0b3af0dbe387480f9add1e5a158542fe0b5eb73f9d2fcd4cac96b diff --git a/app-antivirus/clamav/clamav-0.101.2-r1.ebuild b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild new file mode 100644 index 000000000000..372a1c6336b2 --- /dev/null +++ b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild @@ -0,0 +1,175 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils flag-o-matic user systemd + +DESCRIPTION="Clam Anti-Virus Scanner" +HOMEPAGE="https://www.clamav.net/" +SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml" + +CDEPEND="bzip2? ( app-arch/bzip2 ) + clamdtop? ( sys-libs/ncurses:0 ) + iconv? ( virtual/libiconv ) + metadata-analysis-api? ( dev-libs/json-c:= ) + milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) + >=sys-libs/zlib-1.2.2:= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + sys-devel/libtool + || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) + dev-libs/libmspack + xml? ( dev-libs/libxml2 ) + elibc_musl? ( sys-libs/fts-standalone ) + !!> "${ED}"/etc/conf.d/clamd <<-EOF + MILTER_NICELEVEL=19 + START_MILTER=no + EOF + + systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service + fi + + if use doc; then + einstalldocs + doman docs/man/*.[1-8] + fi + + for i in clamd freshclam clamav-milter + do + [[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,} + done + + prune_libtool_files --all +} + +src_test() { + emake quick-check +} + +pkg_postinst() { + if use milter ; then + elog "For simple instructions how to setup the clamav-milter read the" + elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" + fi + if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then + ewarn "You must run freshclam manually to populate the virus database files" + ewarn "before starting clamav for the first time.\n" + fi +} diff --git a/app-antivirus/clamav/clamav-0.101.2.ebuild b/app-antivirus/clamav/clamav-0.101.2.ebuild deleted file mode 100644 index 165eaec43722..000000000000 --- a/app-antivirus/clamav/clamav-0.101.2.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic user systemd - -DESCRIPTION="Clam Anti-Virus Scanner" -HOMEPAGE="https://www.clamav.net/" -SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="bzip2 doc clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs test uclibc xml" - -CDEPEND="bzip2? ( app-arch/bzip2 ) - clamdtop? ( sys-libs/ncurses:0 ) - iconv? ( virtual/libiconv ) - metadata-analysis-api? ( dev-libs/json-c:= ) - milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) - >=sys-libs/zlib-1.2.2:= - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - sys-devel/libtool - || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) - dev-libs/libmspack - xml? ( dev-libs/libxml2 ) - elibc_musl? ( sys-libs/fts-standalone ) - !!> "${ED}"/etc/conf.d/clamd <<-EOF - MILTER_NICELEVEL=19 - START_MILTER=no - EOF - - systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service - fi - - if use doc; then - einstalldocs - doman docs/man/*.[1-8] - fi - - for i in clamd freshclam clamav-milter - do - [[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,} - done - - prune_libtool_files --all -} - -src_test() { - emake quick-check -} - -pkg_postinst() { - if use milter ; then - elog "For simple instructions how to setup the clamav-milter read the" - elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}" - fi - if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then - ewarn "You must run freshclam manually to populate the virus database files" - ewarn "before starting clamav for the first time.\n" - fi -} diff --git a/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch b/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch new file mode 100644 index 000000000000..e1f5bb9b338a --- /dev/null +++ b/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch @@ -0,0 +1,78 @@ +https://bugs.gentoo.org/661328 + +--- clamav-0.101.2/m4/reorganization/libs/xml.m4 ++++ clamav-0.101.2/m4/reorganization/libs/xml.m4 +@@ -4,55 +4,19 @@ + [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])], + want_xml=$enableval, want_xml="auto") + +-XML_HOME="" +-if test "X$want_xml" != "Xno"; then +- AC_MSG_CHECKING([for libxml2 installation]) +- AC_ARG_WITH([xml], +- AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library +- @<:@default=/usr/local or /usr if not found in /usr/local@:>@]), +- [with_xml_val=$withval] +- ) +-fi +- +-AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""], +- [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"], +- [XML_HOME="$with_xml_val"]) +- +-AS_IF([test "x$XML_HOME" != "x"], [ +- AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""]) +- ]) +- +-AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [ +- AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"]) +- ]) +- +-if test "x$XML_HOME" != "x"; then +- AC_MSG_RESULT([$XML_HOME]) +-else +- AC_MSG_RESULT([not found]) +-fi +- +-found_xml="no" +-XMLCONF_VERSION="" +-XML_CPPFLAGS="" +-XML_LIBS="" +-if test "x$XML_HOME" != "x"; then +- AC_MSG_CHECKING([xml2-config version]) +- XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`" +- if test "x%XMLCONF_VERSION" != "x"; then +- AC_MSG_RESULT([$XMLCONF_VERSION]) +- found_xml="yes" +- XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`" +- XML_LIBS="`$XML_HOME/bin/xml2-config --libs`" +- AS_ECHO("$XML_CPPFLAGS") +- AS_ECHO("$XML_LIBS") +- else +- AC_MSG_ERROR([xml2-config failed]) +- fi +-fi ++PKG_CHECK_MODULES([XML], [libxml-2.0], ++ [found_xml=yes], ++ [ ++ found_xml=no ++ AS_IF([test "x$want_xml" = xyes], ++ [AC_MSG_ERROR([--enable-xml set but cannot find libxml2])] ++ ) ++ ] ++) + + working_xml="no" + if test "X$found_xml" != "Xno"; then ++ XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0) + AC_MSG_CHECKING([for xmlreader.h in $XML_HOME]) + + if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then +@@ -61,6 +25,7 @@ + AC_MSG_RESULT([found]) + save_LIBS="$LIBS" + save_CPPFLAGS="$CPPFLAGS" ++ XML_CPPFLAGS="$XML_CFLAGS" + CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $XML_LIBS" diff --git a/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch b/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch new file mode 100644 index 000000000000..66130be41882 --- /dev/null +++ b/app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/670729 + +--- a/m4/reorganization/clamdtop.m4 ++++ b/m4/reorganization/clamdtop.m4 +@@ -4,12 +4,26 @@ + + if test "$enable_clamdtop" != "no"; then + ++PKG_CHECK_MODULES([CURSES], [ncursesw], ++ [CURSES_INCLUDE=""; ++ HAVE_LIBNCURSES=yes], ++ HAVE_LIBNCURSES=no]) ++ ++if test "X$HAVE_LIBNCURSES" != "Xyes"; then ++PKG_CHECK_MODULES([CURSES], [ncurses], ++ [CURSES_INCLUDE=""; ++ HAVE_LIBNCURSES=yes], ++ HAVE_LIBNCURSES=no]) ++fi ++ ++if test "X$HAVE_LIBNCURSES" != "Xyes"; then + AC_LIB_FIND([ncurses], [ncurses/ncurses.h], + AC_LANG_PROGRAM([#include ], + [initscr(); KEY_RESIZE;]), + [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; + CURSES_INCLUDE=""], + []) ++fi + + if test "X$HAVE_LIBNCURSES" != "Xyes"; then + HAVE_LIBNCURSES= -- cgit v1.2.3