| 1 |
commit: 23f936685079e75931b026d5dcdb2e18015daf71 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 31 12:02:32 2019 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 31 12:07:20 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23f93668 |
| 7 |
|
| 8 |
app-antivirus/clamav: Revbump to remove automagic dep on dev-libs/icu |
| 9 |
|
| 10 |
Fixed without excplicit permission due to maintainer timeout. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/661328 |
| 13 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 15 |
|
| 16 |
...mav-0.101.2.ebuild => clamav-0.101.2-r1.ebuild} | 15 ++--- |
| 17 |
.../files/clamav-0.101.2-libxml2_pkgconfig.patch | 78 ++++++++++++++++++++++ |
| 18 |
2 files changed, 85 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-antivirus/clamav/clamav-0.101.2.ebuild b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild |
| 21 |
similarity index 97% |
| 22 |
rename from app-antivirus/clamav/clamav-0.101.2.ebuild |
| 23 |
rename to app-antivirus/clamav/clamav-0.101.2-r1.ebuild |
| 24 |
index 165eaec4372..986cc1711ae 100644 |
| 25 |
--- a/app-antivirus/clamav/clamav-0.101.2.ebuild |
| 26 |
+++ b/app-antivirus/clamav/clamav-0.101.2-r1.ebuild |
| 27 |
@@ -40,20 +40,19 @@ RDEPEND="${CDEPEND} |
| 28 |
DOCS=( docs/UserManual.md docs/UserManual ) |
| 29 |
HTML_DOCS=( docs/html ) |
| 30 |
|
| 31 |
-#PATCHES=( |
| 32 |
-# "${FILESDIR}/clamav-0.100.0_autotools.patch" |
| 33 |
-#) |
| 34 |
+PATCHES=( |
| 35 |
+ "${FILESDIR}/clamav-0.101.2-libxml2_pkgconfig.patch" #661328 |
| 36 |
+) |
| 37 |
|
| 38 |
pkg_setup() { |
| 39 |
enewgroup clamav |
| 40 |
enewuser clamav -1 -1 /dev/null clamav |
| 41 |
} |
| 42 |
|
| 43 |
-#src_prepare() { |
| 44 |
-# default |
| 45 |
-# |
| 46 |
-# eautoconf |
| 47 |
-#} |
| 48 |
+src_prepare() { |
| 49 |
+ default |
| 50 |
+ eautoconf |
| 51 |
+} |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
use elibc_musl && append-ldflags -lfts |
| 55 |
|
| 56 |
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 |
| 57 |
new file mode 100644 |
| 58 |
index 00000000000..e1f5bb9b338 |
| 59 |
--- /dev/null |
| 60 |
+++ b/app-antivirus/clamav/files/clamav-0.101.2-libxml2_pkgconfig.patch |
| 61 |
@@ -0,0 +1,78 @@ |
| 62 |
+https://bugs.gentoo.org/661328 |
| 63 |
+ |
| 64 |
+--- clamav-0.101.2/m4/reorganization/libs/xml.m4 |
| 65 |
++++ clamav-0.101.2/m4/reorganization/libs/xml.m4 |
| 66 |
+@@ -4,55 +4,19 @@ |
| 67 |
+ [AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])], |
| 68 |
+ want_xml=$enableval, want_xml="auto") |
| 69 |
+ |
| 70 |
+-XML_HOME="" |
| 71 |
+-if test "X$want_xml" != "Xno"; then |
| 72 |
+- AC_MSG_CHECKING([for libxml2 installation]) |
| 73 |
+- AC_ARG_WITH([xml], |
| 74 |
+- AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library |
| 75 |
+- @<:@default=/usr/local or /usr if not found in /usr/local@:>@]), |
| 76 |
+- [with_xml_val=$withval] |
| 77 |
+- ) |
| 78 |
+-fi |
| 79 |
+- |
| 80 |
+-AS_IF([test "x$with_xml_val" = "xno"], [XML_HOME=""], |
| 81 |
+- [test "x$with_xml_val" = "xyes"], [XML_HOME="/usr/local"], |
| 82 |
+- [XML_HOME="$with_xml_val"]) |
| 83 |
+- |
| 84 |
+-AS_IF([test "x$XML_HOME" != "x"], [ |
| 85 |
+- AS_IF([test ! -x "$XML_HOME/bin/xml2-config"], [XML_HOME=""]) |
| 86 |
+- ]) |
| 87 |
+- |
| 88 |
+-AS_IF([test "x$XML_HOME" = "x" -a "x$with_xml_val" = "xyes"], [ |
| 89 |
+- AS_IF([test -x "/usr/bin/xml2-config"], [XML_HOME="/usr"]) |
| 90 |
+- ]) |
| 91 |
+- |
| 92 |
+-if test "x$XML_HOME" != "x"; then |
| 93 |
+- AC_MSG_RESULT([$XML_HOME]) |
| 94 |
+-else |
| 95 |
+- AC_MSG_RESULT([not found]) |
| 96 |
+-fi |
| 97 |
+- |
| 98 |
+-found_xml="no" |
| 99 |
+-XMLCONF_VERSION="" |
| 100 |
+-XML_CPPFLAGS="" |
| 101 |
+-XML_LIBS="" |
| 102 |
+-if test "x$XML_HOME" != "x"; then |
| 103 |
+- AC_MSG_CHECKING([xml2-config version]) |
| 104 |
+- XMLCONF_VERSION="`$XML_HOME/bin/xml2-config --version`" |
| 105 |
+- if test "x%XMLCONF_VERSION" != "x"; then |
| 106 |
+- AC_MSG_RESULT([$XMLCONF_VERSION]) |
| 107 |
+- found_xml="yes" |
| 108 |
+- XML_CPPFLAGS="`$XML_HOME/bin/xml2-config --cflags`" |
| 109 |
+- XML_LIBS="`$XML_HOME/bin/xml2-config --libs`" |
| 110 |
+- AS_ECHO("$XML_CPPFLAGS") |
| 111 |
+- AS_ECHO("$XML_LIBS") |
| 112 |
+- else |
| 113 |
+- AC_MSG_ERROR([xml2-config failed]) |
| 114 |
+- fi |
| 115 |
+-fi |
| 116 |
++PKG_CHECK_MODULES([XML], [libxml-2.0], |
| 117 |
++ [found_xml=yes], |
| 118 |
++ [ |
| 119 |
++ found_xml=no |
| 120 |
++ AS_IF([test "x$want_xml" = xyes], |
| 121 |
++ [AC_MSG_ERROR([--enable-xml set but cannot find libxml2])] |
| 122 |
++ ) |
| 123 |
++ ] |
| 124 |
++) |
| 125 |
+ |
| 126 |
+ working_xml="no" |
| 127 |
+ if test "X$found_xml" != "Xno"; then |
| 128 |
++ XML_HOME=$(${PKG_CONFIG} --variable prefix libxml-2.0) |
| 129 |
+ AC_MSG_CHECKING([for xmlreader.h in $XML_HOME]) |
| 130 |
+ |
| 131 |
+ if test ! -f "$XML_HOME/include/libxml2/libxml/xmlreader.h"; then |
| 132 |
+@@ -61,6 +25,7 @@ |
| 133 |
+ AC_MSG_RESULT([found]) |
| 134 |
+ save_LIBS="$LIBS" |
| 135 |
+ save_CPPFLAGS="$CPPFLAGS" |
| 136 |
++ XML_CPPFLAGS="$XML_CFLAGS" |
| 137 |
+ CPPFLAGS="$CPPFLAGS $XML_CPPFLAGS" |
| 138 |
+ save_LDFLAGS="$LDFLAGS" |
| 139 |
+ LDFLAGS="$LDFLAGS $XML_LIBS" |
Archives