From patchwork Sun Apr 22 02:44:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 1722 Return-Path: Received: from mail01.ipfire.org (mail01.ipfire.org [IPv6:2001:470:7183:25::1]) by web02.i.ipfire.org (Postfix) with ESMTP id 0B8B760A2A for ; Sat, 21 Apr 2018 18:45:00 +0200 (CEST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id B23851008070; Sat, 21 Apr 2018 17:44:58 +0100 (BST) Authentication-Results: dkim=pass header.d=link38.eu; dmarc=pass (policy=none) header.from=link38.eu; spf=pass smtp.mailfrom=peter.mueller@link38.eu Received: from mx-nbg.link38.eu (mx-nbg.link38.eu [37.120.167.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx-nbg.link38.eu", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 83AB01008070 for ; Sat, 21 Apr 2018 17:44:55 +0100 (BST) ARC-Authentication-Results: i=1; mx-nbg.link38.eu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1524329087; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=6y2+4xkOEnxC2nC6TO1ziD7y9OUCbQOvGqGaoIwovzA=; b=24IG12h00lT4GBNjIQ70+GnkO+wEUDrH5fObqZp8K2nSrgDzCehKa+Felln0euU4FH0tpM jayDhUfjTgtORRh5At0fYqBStQ5dJgwANe1jy4+yX/uNp+6/IPartjp4x4q1cI7qvg1CHV GFaNyTjrUb4aJeK0jbT+lrnbpke64a9CW1VSv1QaFV4ZoJoB93leBGJcG08EUSSVzDUJ+/ 6BaQd5dxD3g4ZKkFtL58HzntsHJixaGEDfuOW6Qd4BpbvYpGoZdx/l9ZbRHtvZH+4wPzXn +KymnMBFsM+wHVt69oyL+RL7h+JKPQK+PRyG2sVniYAab/9A7J/IIoNQEttCRA== ARC-Seal: i=1; s=201803; d=link38.eu; t=1524329087; a=rsa-sha256; cv=none; b=vD9OLoRgJm2MUnRZV0FiRktnqlIwLJIB6SRRQfa53IrtwK6iYmai4TXX498fNTi/DKlEs1aQgqaGCaAMbmGwsWuqESldF6KIwrJh+iN9nPL1TLVyz/HQmVC5pup+dt/YCuSowi/6PNiihU3yJkEWbOnA8/XFP4DwbdyHWTb6HJRDKuCYRiDJv/t36pe/vPkiZypG8vtl5Lt5CIsFZ4q6T6Yf5QmN7YZlaV2tr8WGDRyuiPY+dFHQZmYbzXimb8r3I1MhxXXbLMUnFagYHDkM7PrB463ZKtB1m0cT64AfUnoEe41i5tBgENqQ8OFbkL0yXmTTDjiD1BK742p09z/zDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=link38.eu; s=201803; t=1524329087; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=6y2+4xkOEnxC2nC6TO1ziD7y9OUCbQOvGqGaoIwovzA=; b=tRMQADtdS2fo1HXFIjs5mwc0ynrVcICJkSP1gC61jYmHTvuTstybPn8qgSkZatUHvKJ0W8 I0cV73C0IXA2dZ+ZwKT45GIOAxPeBooba9dZuhCG5/h3qY/QU6YINcN1kd5eTMkB8zw9SR RZY7MnedC7zeTovVRihg624CuQ2cn0MnGej9mlZI91mhd8rniaILNmvGp37Y3VHVUKS4TA L/7dJa8QDtCXm73tcj6Nm2qvNgFfRAE98EIYZnkmsLtWxfpeNxrzEPeHLLH18SlhLYxxt0 CD59pQpssdxttZ6KwLcj8NKRxkzBhEC0nBj9P5CCRCqo/4B1iTHZmNioS+3FCg== To: "IPFire: Development-List" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] update ClamAV to 0.100.0 Message-ID: <8a2a2da2-bb60-2944-fdd8-c00b517a3559@link38.eu> Date: Sat, 21 Apr 2018 18:44:45 +0200 MIME-Version: 1.0 Content-Language: en-US X-Spamd-Result: default: False [-10.52 / 11.00]; IP_SCORE(-3.76)[ip: (-9.87), ipnet: 37.120.160.0/19(-4.94), asn: 197540(-3.92), country: DE(-0.09)]; ARC_ALLOW(-1.00)[i=1]; RCVD_IN_DNSWL_MED(-2.00)[53.167.120.37.list.dnswl.org : 127.0.6.2]; RCVD_COUNT_ZERO(0.00)[0]; FROM_HAS_DN(0.00)[]; MX_GOOD(-0.01)[cached: mx-nbg.link38.eu]; BAYES_HAM(-3.00)[100.00%]; DKIM_TRACE(0.00)[link38.eu:+]; TO_DN_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:37.120.167.53]; RCPT_COUNT_ONE(0.00)[1]; DMARC_POLICY_ALLOW(-0.25)[link38.eu,none]; FROM_EQ_ENVFROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; R_DKIM_ALLOW(-0.20)[link38.eu]; ASN(0.00)[asn:197540, ipnet:37.120.160.0/19, country:DE]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Status: No, score=-10.52 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Update ClamAV to 0.100.0, which brings some new features and bugfixes (release notes are available here: https://blog.clamav.net/2018/04/clamav-01000-has-been-released.html). Since the internal LLVM code is now deprecated and disabled by default, patching clamav/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp does not seem to be necessary anymore. Further, the --disable-zlib-vcheck option has been removed since it produces warnings during compilation. Signed-off-by: Peter Müller --- lfs/clamav | 8 +++----- src/patches/clamav/llvm-glibc.patch | 12 ------------ 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 src/patches/clamav/llvm-glibc.patch diff --git a/lfs/clamav b/lfs/clamav index 748c2c371..7623801fb 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.99.4 +VER = 0.100.0 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 37 +PAK_VER = 38 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b9359b90086948b3c4eb97c84cf4b400 +$(DL_FILE)_MD5 = 93e8efb489c2afdfca73703b76c24e01 install : $(TARGET) @@ -81,10 +81,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/clamav/llvm-glibc.patch cd $(DIR_APP) && ./configure \ --prefix=/usr \ - --disable-zlib-vcheck \ --sysconfdir=/var/ipfire/clamav \ $(CONFIGURE_FLAGS) cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/clamav/llvm-glibc.patch b/src/patches/clamav/llvm-glibc.patch deleted file mode 100644 index 78845fcfc..000000000 --- a/src/patches/clamav/llvm-glibc.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -=================================================================== ---- clamav-0.97.3.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -+++ clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp -@@ -55,6 +55,7 @@ static void runAtExitHandlers() { - #include - #endif - #include -+#include - /* stat functions are redirecting to __xstat with a version number. On x86-64 - * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' - * available as an exported symbol, so we have to add it explicitly.