summaryrefslogtreecommitdiff
path: root/app-antivirus
diff options
context:
space:
mode:
Diffstat (limited to 'app-antivirus')
-rw-r--r--app-antivirus/Manifest.gzbin895 -> 891 bytes
-rw-r--r--app-antivirus/clamav/Manifest4
-rw-r--r--app-antivirus/clamav/clamav-0.101.2-r1.ebuild (renamed from app-antivirus/clamav/clamav-0.101.2.ebuild)16
-rw-r--r--app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch78
-rw-r--r--app-antivirus/clamav/files/clamav-0.101.2-tinfo.patch31
-rw-r--r--app-antivirus/clamtk/Manifest4
-rw-r--r--app-antivirus/clamtk/clamtk-6.00-r1.ebuild (renamed from app-antivirus/clamtk/clamtk-6.00.ebuild)5
-rw-r--r--app-antivirus/clamtk/clamtk-6.01-r1.ebuild (renamed from app-antivirus/clamtk/clamtk-6.01.ebuild)5
8 files changed, 130 insertions, 13 deletions
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 1b8c614b9ed8..c46baef0591a 100644
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
Binary files differ
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.ebuild b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild
index 165eaec43722..372a1c6336b2 100644
--- a/app-antivirus/clamav/clamav-0.101.2.ebuild
+++ b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild
@@ -40,20 +40,20 @@ RDEPEND="${CDEPEND}
DOCS=( docs/UserManual.md docs/UserManual )
HTML_DOCS=( docs/html )
-#PATCHES=(
-# "${FILESDIR}/clamav-0.100.0_autotools.patch"
-#)
+PATCHES=(
+ "${FILESDIR}/${PN}-0.101.2-libxml2_pkgconfig.patch" #661328
+ "${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
+)
pkg_setup() {
enewgroup clamav
enewuser clamav -1 -1 /dev/null clamav
}
-#src_prepare() {
-# default
-#
-# eautoconf
-#}
+src_prepare() {
+ default
+ eautoconf
+}
src_configure() {
use elibc_musl && append-ldflags -lfts
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="<ncurses.h>";
++ HAVE_LIBNCURSES=yes],
++ HAVE_LIBNCURSES=no])
++
++if test "X$HAVE_LIBNCURSES" != "Xyes"; then
++PKG_CHECK_MODULES([CURSES], [ncurses],
++ [CURSES_INCLUDE="<ncurses.h>";
++ 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 <ncurses/ncurses.h>],
+ [initscr(); KEY_RESIZE;]),
+ [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
+ CURSES_INCLUDE="<ncurses/ncurses.h>"],
+ [])
++fi
+
+ if test "X$HAVE_LIBNCURSES" != "Xyes"; then
+ HAVE_LIBNCURSES=
diff --git a/app-antivirus/clamtk/Manifest b/app-antivirus/clamtk/Manifest
index d5c4670e874f..1c1410e9543b 100644
--- a/app-antivirus/clamtk/Manifest
+++ b/app-antivirus/clamtk/Manifest
@@ -6,6 +6,6 @@ DIST clamtk-gnome-0.03.tar.xz 15088 BLAKE2B cc1440de117eea036cf14a9ed36650916703
DIST clamtk-kde-0.18.tar.xz 17732 BLAKE2B ca82934417f2d869fd8c8e36a31ef4a52cf4ee73581c5d1d400c1b28908c5ea2524a8f5d1110b1e949038378613fb4d5607d5123eebe91df695a53d0dd489302 SHA512 145ddd349010e0bb6fe3295e50d6e15a2dd96e604babbd5de4cb49ba75169d2050777cac38e40ac6a64cb89ddf94025d610aca73136c75f81115d0a2d863d24e
DIST nemo-sendto-clamtk-0.04.tar.xz 4228 BLAKE2B ce656d4f021bc30cd12fb2ee5f98a78c1f1fdb2460ed2cbba0b572408617f91b39b2ca2fe542b9cec7be79b4b9fdfd685f5553e1a671454ca1e6723241dcb805 SHA512 2b5d3abbc4ae5dbc71b1b7bc836df88ad51e6afa00d5e954b5c1355a70c0420b6fef895e1cb5cccb86a662aee2039cef6c01821c1347fa155b5da3529b25562c
DIST thunar-sendto-clamtk-0.06.tar.xz 4416 BLAKE2B 6b9f8857fead9f175af0a5fd3585790c49865b07016ddbc0dfc21f761ecbac32d97a65731fdca0335fd4852af9efc93c06ecb994f769a5efeade35cb734e9924 SHA512 f3b6f296213ad5974f8134d682cce4e426d9730d1898e8f7ea474e27314ee47957b033bbd7f16196cabf054eccec844c05ff8c8f9a98ad013a7f89b899cee591
-EBUILD clamtk-6.00.ebuild 3927 BLAKE2B dd219c5b87c4f900265162e4eaf9eba464227fe05832fc6a7f526ea9a72ff29008cde7a872b8430447063d49e80dc9f7e96036bf7621c60b319e419e9971e40d SHA512 ed537ae5c524810cc5aa71a6b6c6f87e0cdc841cee6812a10b2e273e070f4390e0d554331d352e570b53e5afba574b7761c8024a6450f7ec5ed288bdd92dbb6f
-EBUILD clamtk-6.01.ebuild 3935 BLAKE2B fa56bab3c3b836627a6bfc68b9a67edb3e886d35e0baf0638d49c4073928fb5c63515ce06e090fde7e21d27e226998216f0939c0fcb05e2a38cf1f65d9b18257 SHA512 05539af541c603ff186b6a21e1867ec7c6c195f8e8111bc7ca1c132b8b75a165908e0c3b085e3c8739dfb6d0807e9c66c061a6908b37d1f89087a641b792ea93
+EBUILD clamtk-6.00-r1.ebuild 3947 BLAKE2B 079aa6970bdfefaca452f84b05c0d2cd70d67a7bdec75010a89812b8a154e0c07bdcea6a9d9e2ffb5952cb071ff19a26514c650be4563b63f8fec32213fd83af SHA512 ae91508f617ac2464da51a290e23d5dfafc99bbd973b29a6d34eb1182372c4d2b964912001bc99693bf9f4e4ad8b34efb49a73688ef4cd13125fbfcf4d00a426
+EBUILD clamtk-6.01-r1.ebuild 3955 BLAKE2B 849bb184e00f3cb17373a5ede5b7c56ee009dd5572854c24b10d39d62761d42fa97cb9d61d160765c45d6a3342f58248ada80ef06334388f333857354d2c1d21 SHA512 c61bcc5791acade7e278f0e658e191709280a1ff3c50044794232293570063626794d02189ea7641ae9f15954e05b4158f1289bbf7b4fd5237732be5a59cdea5
MISC metadata.xml 942 BLAKE2B 537f7480903f2c4d4d315e0a7becf14be2f4f7cd2280f1918877f738cac8e71b58d65fa702f4a9979f44f2cb81e61dd44e7f9ba8197472095d6c7071a1bc0be6 SHA512 9bd9e7e9560a7358ed5935949a913628f50b885509f065419060d2cb6dbe605723d98930027908c1faf64f368289cac3c86e9d75a91838912036912ed60022a4
diff --git a/app-antivirus/clamtk/clamtk-6.00.ebuild b/app-antivirus/clamtk/clamtk-6.00-r1.ebuild
index 22d4505ea881..e3ddf10b9e0f 100644
--- a/app-antivirus/clamtk/clamtk-6.00.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.00-r1.ebuild
@@ -45,7 +45,10 @@ RDEPEND="
virtual/perl-MIME-Base64
virtual/perl-Time-Piece
x11-themes/faenza-icon-theme
- nautilus? ( dev-python/nautilus-python[${PYTHON_USEDEP}] )
+ nautilus? (
+ ${PYTHON_DEPS}
+ dev-python/nautilus-python[${PYTHON_USEDEP}]
+ )
"
BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-antivirus/clamtk/clamtk-6.01.ebuild b/app-antivirus/clamtk/clamtk-6.01-r1.ebuild
index a40424a65dc9..e4aac44b03d3 100644
--- a/app-antivirus/clamtk/clamtk-6.01.ebuild
+++ b/app-antivirus/clamtk/clamtk-6.01-r1.ebuild
@@ -45,7 +45,10 @@ RDEPEND="
virtual/perl-MIME-Base64
virtual/perl-Time-Piece
x11-themes/faenza-icon-theme
- nautilus? ( dev-python/nautilus-python[${PYTHON_USEDEP}] )
+ nautilus? (
+ ${PYTHON_DEPS}
+ dev-python/nautilus-python[${PYTHON_USEDEP}]
+ )
"
BDEPEND="nls? ( sys-devel/gettext )"