[arch-commits] Commit in clamav/repos (38 files)
Evangelos Foutras
foutrelis at archlinux.org
Sat May 27 02:36:41 UTC 2017
Date: Saturday, May 27, 2017 @ 02:36:40
Author: foutrelis
Revision: 296666
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
clamav/repos/extra-i686/PKGBUILD
(from rev 296665, clamav/trunk/PKGBUILD)
clamav/repos/extra-i686/clamd.conf
(from rev 296665, clamav/trunk/clamd.conf)
clamav/repos/extra-i686/clamd.service
(from rev 296665, clamav/trunk/clamd.service)
clamav/repos/extra-i686/freshclam.conf
(from rev 296665, clamav/trunk/freshclam.conf)
clamav/repos/extra-i686/freshclamd.service
(from rev 296665, clamav/trunk/freshclamd.service)
clamav/repos/extra-i686/install
(from rev 296665, clamav/trunk/install)
clamav/repos/extra-i686/logrotate
(from rev 296665, clamav/trunk/logrotate)
clamav/repos/extra-i686/make_it_compile_against_openssl_1_1_0.patch
(from rev 296665, clamav/trunk/make_it_compile_against_openssl_1_1_0.patch)
clamav/repos/extra-i686/tmpfiles.d
(from rev 296665, clamav/trunk/tmpfiles.d)
clamav/repos/extra-x86_64/PKGBUILD
(from rev 296665, clamav/trunk/PKGBUILD)
clamav/repos/extra-x86_64/clamd.conf
(from rev 296665, clamav/trunk/clamd.conf)
clamav/repos/extra-x86_64/clamd.service
(from rev 296665, clamav/trunk/clamd.service)
clamav/repos/extra-x86_64/freshclam.conf
(from rev 296665, clamav/trunk/freshclam.conf)
clamav/repos/extra-x86_64/freshclamd.service
(from rev 296665, clamav/trunk/freshclamd.service)
clamav/repos/extra-x86_64/install
(from rev 296665, clamav/trunk/install)
clamav/repos/extra-x86_64/logrotate
(from rev 296665, clamav/trunk/logrotate)
clamav/repos/extra-x86_64/make_it_compile_against_openssl_1_1_0.patch
(from rev 296665, clamav/trunk/make_it_compile_against_openssl_1_1_0.patch)
clamav/repos/extra-x86_64/tmpfiles.d
(from rev 296665, clamav/trunk/tmpfiles.d)
Deleted:
clamav/repos/extra-i686/PKGBUILD
clamav/repos/extra-i686/clamav-0.99.2-gcc-6.patch
clamav/repos/extra-i686/clamd.conf
clamav/repos/extra-i686/clamd.service
clamav/repos/extra-i686/freshclam.conf
clamav/repos/extra-i686/freshclamd.service
clamav/repos/extra-i686/install
clamav/repos/extra-i686/logrotate
clamav/repos/extra-i686/make_it_compile_against_openssl_1_1_0.patch
clamav/repos/extra-i686/tmpfiles.d
clamav/repos/extra-x86_64/PKGBUILD
clamav/repos/extra-x86_64/clamav-0.99.2-gcc-6.patch
clamav/repos/extra-x86_64/clamd.conf
clamav/repos/extra-x86_64/clamd.service
clamav/repos/extra-x86_64/freshclam.conf
clamav/repos/extra-x86_64/freshclamd.service
clamav/repos/extra-x86_64/install
clamav/repos/extra-x86_64/logrotate
clamav/repos/extra-x86_64/make_it_compile_against_openssl_1_1_0.patch
clamav/repos/extra-x86_64/tmpfiles.d
----------------------------------------------------------+
/PKGBUILD | 156 ++++++++++
/clamd.conf | 12
/clamd.service | 22 +
/freshclam.conf | 6
/freshclamd.service | 20 +
/install | 18 +
/logrotate | 20 +
/make_it_compile_against_openssl_1_1_0.patch | 196 +++++++++++++
/tmpfiles.d | 2
extra-i686/PKGBUILD | 80 -----
extra-i686/clamav-0.99.2-gcc-6.patch | 84 -----
extra-i686/clamd.conf | 6
extra-i686/clamd.service | 11
extra-i686/freshclam.conf | 3
extra-i686/freshclamd.service | 10
extra-i686/install | 9
extra-i686/logrotate | 10
extra-i686/make_it_compile_against_openssl_1_1_0.patch | 98 ------
extra-i686/tmpfiles.d | 1
extra-x86_64/PKGBUILD | 80 -----
extra-x86_64/clamav-0.99.2-gcc-6.patch | 84 -----
extra-x86_64/clamd.conf | 6
extra-x86_64/clamd.service | 11
extra-x86_64/freshclam.conf | 3
extra-x86_64/freshclamd.service | 10
extra-x86_64/install | 9
extra-x86_64/logrotate | 10
extra-x86_64/make_it_compile_against_openssl_1_1_0.patch | 98 ------
extra-x86_64/tmpfiles.d | 1
29 files changed, 452 insertions(+), 624 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/PKGBUILD 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,80 +0,0 @@
-# $Id$
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=clamav
-pkgver=0.99.2
-pkgrel=6
-pkgdesc='Anti-virus toolkit for Unix'
-url='http://www.clamav.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('libmilter')
-depends=('bzip2' 'libltdl' 'libxml2' 'curl' 'pcre')
-validpgpkeys=('B964E6D7BC7D7C82CCB8D45840B8EA2364221D53'
- 'F79FB2D08751574C5D3FDFFBB3D5342C260429A0')
-source=("http://www.clamav.net/downloads/production/${pkgname}-${pkgver}.tar.gz"{,.sig}
- 'logrotate'
- 'tmpfiles.d'
- 'clamd.conf'
- 'freshclam.conf'
- 'clamd.service'
- 'freshclamd.service'
- 'clamav-0.99.2-gcc-6.patch'
- 'make_it_compile_against_openssl_1_1_0.patch')
-sha256sums=('167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a'
- 'SKIP'
- 'ce4b9b8c300614641af600c9a73b52a00ee8e47ccc9f91b2428a113b0ecff21b'
- '0a61abee3b9bba94126afe3344e7d8e82da5120ca6dbd2b413b10f75da5b0b0d'
- 'afdb95f93f7e11e163d368caccd5f6814206c6f0d74816b4f712c0267b50572a'
- '127b39e13525ffb4242198cfb76f99d4d517e5f2fd9fa8dcad3f31fc9f82f952'
- 'e376ab0cefeefa5ac5f1cd611718452ea8646198e854aca3cc0026f5ffe58fb4'
- 'dd5ff6c79ee360da5f2221c4d9110a2a8886d86293f6c93c16bf74fdb126593c'
- 'b2960553243392a4298f37d5ef537296e989e95f7cc084800b8e3ab6a251be6d'
- '0a8e02a91bc3f2c99bd52dc475592637376baa991fe3f899b7745b840fc586c5')
-
-backup=('etc/clamav/clamd.conf'
- 'etc/clamav/freshclam.conf'
- 'etc/logrotate.d/clamav')
-
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../clamav-0.99.2-gcc-6.patch
- patch -Np1 -i ../make_it_compile_against_openssl_1_1_0.patch
- autoreconf -fi
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # --disable-zlib-vcheck because the configure script thinks that
- # zlib 1.2.11 is older than 1.2.2
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc/clamav \
- --with-dbdir=/var/lib/clamav \
- --disable-clamav \
- --disable-zlib-vcheck \
- --enable-milter
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
- install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
- install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
- install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
- install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
- install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
-
- install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav
- install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav
-}
Copied: clamav/repos/extra-i686/PKGBUILD (from rev 296665, clamav/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,78 @@
+# $Id$
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=clamav
+pkgver=0.99.2
+pkgrel=7
+pkgdesc='Anti-virus toolkit for Unix'
+url='http://www.clamav.net/'
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('libmilter')
+depends=('bzip2' 'libltdl' 'libxml2' 'curl' 'pcre')
+validpgpkeys=('B964E6D7BC7D7C82CCB8D45840B8EA2364221D53'
+ 'F79FB2D08751574C5D3FDFFBB3D5342C260429A0')
+source=("http://www.clamav.net/downloads/production/${pkgname}-${pkgver}.tar.gz"{,.sig}
+ 'logrotate'
+ 'tmpfiles.d'
+ 'clamd.conf'
+ 'freshclam.conf'
+ 'clamd.service'
+ 'freshclamd.service'
+ 'make_it_compile_against_openssl_1_1_0.patch')
+sha256sums=('167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a'
+ 'SKIP'
+ 'ce4b9b8c300614641af600c9a73b52a00ee8e47ccc9f91b2428a113b0ecff21b'
+ '0a61abee3b9bba94126afe3344e7d8e82da5120ca6dbd2b413b10f75da5b0b0d'
+ 'afdb95f93f7e11e163d368caccd5f6814206c6f0d74816b4f712c0267b50572a'
+ '127b39e13525ffb4242198cfb76f99d4d517e5f2fd9fa8dcad3f31fc9f82f952'
+ 'e376ab0cefeefa5ac5f1cd611718452ea8646198e854aca3cc0026f5ffe58fb4'
+ 'dd5ff6c79ee360da5f2221c4d9110a2a8886d86293f6c93c16bf74fdb126593c'
+ '0a8e02a91bc3f2c99bd52dc475592637376baa991fe3f899b7745b840fc586c5')
+
+backup=('etc/clamav/clamd.conf'
+ 'etc/clamav/freshclam.conf'
+ 'etc/logrotate.d/clamav')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../make_it_compile_against_openssl_1_1_0.patch
+ autoreconf -fi
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # --disable-zlib-vcheck because the configure script thinks that
+ # zlib 1.2.11 is older than 1.2.2
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc/clamav \
+ --with-dbdir=/var/lib/clamav \
+ --disable-clamav \
+ --disable-llvm \
+ --disable-zlib-vcheck \
+ --enable-milter
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
+ install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
+ install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
+ install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
+ install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
+ install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
+
+ install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav
+ install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav
+}
Deleted: extra-i686/clamav-0.99.2-gcc-6.patch
===================================================================
--- extra-i686/clamav-0.99.2-gcc-6.patch 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/clamav-0.99.2-gcc-6.patch 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,84 +0,0 @@
-diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
-index 59ff6aa..1325394 100644
---- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
-+++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
-@@ -169,3 +169,3 @@ public:
- KeyLength+1;
-- unsigned Alignment = alignof<StringMapEntry>();
-+ unsigned Alignment = alignOf<StringMapEntry>();
-
-diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
-index 88044c7..86b0f40 100644
---- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
-+++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
-@@ -417,3 +417,3 @@ namespace llvm {
- ileAllocator.Allocate(sizeof(IndexListEntry),
-- alignof<IndexListEntry>()));
-+ alignOf<IndexListEntry>()));
-
-diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
-index 6a7a1a6..979e597 100644
---- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
-+++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
-@@ -51,8 +51,8 @@ struct AlignOf {
-
--/// alignof - A templated function that returns the mininum alignment of
-+/// alignOf - A templated function that returns the mininum alignment of
- /// of a type. This provides no extra functionality beyond the AlignOf
- /// class besides some cosmetic cleanliness. Example usage:
--/// alignof<int>() returns the alignment of an int.
-+/// alignOf<int>() returns the alignment of an int.
- template <typename T>
--static inline unsigned alignof() { return AlignOf<T>::Alignment; }
-+static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
-
-diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
-index 4a7251f..17caf5e 100644
---- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h
-+++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
-@@ -203,3 +203,3 @@ public:
- for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
-- Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
-+ Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
- if (Ptr + sizeof(T) <= End)
-diff --git a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
-index b892d85..dc72346 100644
---- a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
-+++ b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
-@@ -495,3 +495,3 @@ void SCEVUnknown::print(raw_ostream &OS) const {
- if (isAlignOf(AllocTy)) {
-- OS << "alignof(" << *AllocTy << ")";
-+ OS << "alignOf(" << *AllocTy << ")";
- return;
-diff --git a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
-index 824021c..757ca50 100644
---- a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
-+++ b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
-@@ -569,3 +569,3 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI,
- // Calculate what the SS field value should be...
-- static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
-+ static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
- unsigned SS = SSTable[Scale.getImm()];
-diff --git a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
-index 9564fe0..b2b7986 100644
---- a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
-+++ b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
-@@ -332,3 +332,3 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op,
- // Calculate what the SS field value should be...
-- static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
-+ static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
- unsigned SS = SSTable[Scale.getImm()];
-diff --git a/libclamav/mpool.c b/libclamav/mpool.c
-index cd38e15..b5e537d 100644
---- a/libclamav/mpool.c
-+++ b/libclamav/mpool.c
-@@ -417,3 +417,3 @@ static size_t from_bits(unsigned int bits) {
-
--static inline unsigned int alignof(size_t size)
-+static inline unsigned int alignOf(size_t size)
- {
-@@ -609,3 +609,3 @@ static void* allocate_aligned(struct MPMAP *mpm, size_t size, unsigned align, co
- void *mpool_malloc(struct MP *mp, size_t size) {
-- size_t align = alignof(size);
-+ size_t align = alignOf(size);
- size_t i, needed = align_increase(size+FRAG_OVERHEAD, align);
Deleted: extra-i686/clamd.conf
===================================================================
--- extra-i686/clamd.conf 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/clamd.conf 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,6 +0,0 @@
-LogFile /var/log/clamav/clamd.log
-LogTime yes
-PidFile /run/clamav/clamd.pid
-TemporaryDirectory /tmp
-LocalSocket /var/lib/clamav/clamd.sock
-User clamav
Copied: clamav/repos/extra-i686/clamd.conf (from rev 296665, clamav/trunk/clamd.conf)
===================================================================
--- extra-i686/clamd.conf (rev 0)
+++ extra-i686/clamd.conf 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,6 @@
+LogFile /var/log/clamav/clamd.log
+LogTime yes
+PidFile /run/clamav/clamd.pid
+TemporaryDirectory /tmp
+LocalSocket /var/lib/clamav/clamd.sock
+User clamav
Deleted: extra-i686/clamd.service
===================================================================
--- extra-i686/clamd.service 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/clamd.service 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,11 +0,0 @@
-[Unit]
-Description=clamav daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/clamd.pid
-ExecStart=/usr/bin/clamd
-
-[Install]
-WantedBy=multi-user.target
Copied: clamav/repos/extra-i686/clamd.service (from rev 296665, clamav/trunk/clamd.service)
===================================================================
--- extra-i686/clamd.service (rev 0)
+++ extra-i686/clamd.service 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,11 @@
+[Unit]
+Description=clamav daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/clamav/clamd.pid
+ExecStart=/usr/bin/clamd
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-i686/freshclam.conf
===================================================================
--- extra-i686/freshclam.conf 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/freshclam.conf 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,3 +0,0 @@
-UpdateLogFile /var/log/clamav/freshclam.log
-DatabaseMirror database.clamav.net
-NotifyClamd /etc/clamav/clamd.conf
Copied: clamav/repos/extra-i686/freshclam.conf (from rev 296665, clamav/trunk/freshclam.conf)
===================================================================
--- extra-i686/freshclam.conf (rev 0)
+++ extra-i686/freshclam.conf 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,3 @@
+UpdateLogFile /var/log/clamav/freshclam.log
+DatabaseMirror database.clamav.net
+NotifyClamd /etc/clamav/clamd.conf
Deleted: extra-i686/freshclamd.service
===================================================================
--- extra-i686/freshclamd.service 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/freshclamd.service 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav updater
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/freshclam.pid
-ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
-
-[Install]
-WantedBy=multi-user.target
Copied: clamav/repos/extra-i686/freshclamd.service (from rev 296665, clamav/trunk/freshclamd.service)
===================================================================
--- extra-i686/freshclamd.service (rev 0)
+++ extra-i686/freshclamd.service 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,10 @@
+[Unit]
+Description=clamav updater
+
+[Service]
+Type=forking
+PIDFile=/run/clamav/freshclam.pid
+ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-i686/install
===================================================================
--- extra-i686/install 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/install 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,9 +0,0 @@
-post_upgrade() {
- systemd-tmpfiles --create clamav.conf
-}
-
-post_install() {
- getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
- getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
- post_upgrade
-}
Copied: clamav/repos/extra-i686/install (from rev 296665, clamav/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ systemd-tmpfiles --create clamav.conf
+}
+
+post_install() {
+ getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
+ getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
+ post_upgrade
+}
Deleted: extra-i686/logrotate
===================================================================
--- extra-i686/logrotate 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/logrotate 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,10 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
- create 644 clamav clamav
- sharedscripts
- missingok
- notifempty
- postrotate
- /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
- /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
Copied: clamav/repos/extra-i686/logrotate (from rev 296665, clamav/trunk/logrotate)
===================================================================
--- extra-i686/logrotate (rev 0)
+++ extra-i686/logrotate 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,10 @@
+/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
+ create 644 clamav clamav
+ sharedscripts
+ missingok
+ notifempty
+ postrotate
+ /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
+ /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
+ endscript
+}
Deleted: extra-i686/make_it_compile_against_openssl_1_1_0.patch
===================================================================
--- extra-i686/make_it_compile_against_openssl_1_1_0.patch 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/make_it_compile_against_openssl_1_1_0.patch 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,98 +0,0 @@
-From 088af365ce4f715b9f1d41754651e01db6ebf39a Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
-Date: Sat, 2 Jul 2016 00:12:01 +0200
-Subject: make it compile against openssl 1.1.0
-
-- SSL_library_init() is no longer a function but a define invoking
- another function with parameters. Thus a link check against this
- function will fail. As a fix AC_LINK_IFELSE is used so the header file
- can be included.
-
-- X509_CRL is opaque and needs an accessor. X509_CRL_get_nextUpdate() is
- around since OpenSSL 0.9.1c. X509_cmp_current_time() seems to be
- around since SSLeay 0.8.1b.
-
-BTS: https://bugs.debian.org/828083
-clamav: https://bugzilla.clamav.net/show_bug.cgi?id=11594
-Patch-Name: make_it_compile_against_openssl_1_1_0.patch
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
----
- libclamav/crypto.c | 21 ++++++---------------
- m4/reorganization/libs/openssl.m4 | 12 +++++++++---
- 2 files changed, 15 insertions(+), 18 deletions(-)
-
-diff --git a/libclamav/crypto.c b/libclamav/crypto.c
-index c62c65a..4be900f 100644
---- a/libclamav/crypto.c
-+++ b/libclamav/crypto.c
-@@ -1096,7 +1096,6 @@ X509_CRL *cl_load_crl(const char *file)
- {
- X509_CRL *x=NULL;
- FILE *fp;
-- struct tm *tm;
-
- if (!(file))
- return NULL;
-@@ -1110,21 +1109,13 @@ X509_CRL *cl_load_crl(const char *file)
- fclose(fp);
-
- if ((x)) {
-- tm = cl_ASN1_GetTimeT(x->crl->nextUpdate);
-- if (!(tm)) {
-- X509_CRL_free(x);
-- return NULL;
-- }
-+ ASN1_TIME *tme;
-
--#if !defined(_WIN32)
-- if (timegm(tm) < time(NULL)) {
-- X509_CRL_free(x);
-- free(tm);
-- return NULL;
-- }
--#endif
--
-- free(tm);
-+ tme = X509_CRL_get_nextUpdate(x);
-+ if (!tme || X509_cmp_current_time(tme) < 0) {
-+ X509_CRL_free(x);
-+ return NULL;
-+ }
- }
-
- return x;
-diff --git a/m4/reorganization/libs/openssl.m4 b/m4/reorganization/libs/openssl.m4
-index 78e2c23..45ee02d 100644
---- a/m4/reorganization/libs/openssl.m4
-+++ b/m4/reorganization/libs/openssl.m4
-@@ -26,12 +26,13 @@ save_LDFLAGS="$LDFLAGS"
- save_CFLAGS="$CFLAGS"
- save_LIBS="$LIBS"
-
--SSL_LIBS="-lssl -lcrypto -lz"
-+SSL_LIBS="$LIBS -lssl -lcrypto -lz"
-+LIBS="$LIBS $SSL_LIBS"
-
- if test "$LIBSSL_HOME" != "/usr"; then
- SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
- SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
-- LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
-+ LDFLAGS="-L$LIBSSL_HOME/lib"
- CFLAGS="$SSL_CPPFLAGS"
- else
- SSL_LDFLAGS=""
-@@ -41,7 +42,12 @@ fi
- have_ssl="no"
- have_crypto="no"
-
--AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
-+AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
-+ [[SSL_library_init();]])],
-+ [have_ssl="yes";],
-+ [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])])
-+
-
- AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
-
Copied: clamav/repos/extra-i686/make_it_compile_against_openssl_1_1_0.patch (from rev 296665, clamav/trunk/make_it_compile_against_openssl_1_1_0.patch)
===================================================================
--- extra-i686/make_it_compile_against_openssl_1_1_0.patch (rev 0)
+++ extra-i686/make_it_compile_against_openssl_1_1_0.patch 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,98 @@
+From 088af365ce4f715b9f1d41754651e01db6ebf39a Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
+Date: Sat, 2 Jul 2016 00:12:01 +0200
+Subject: make it compile against openssl 1.1.0
+
+- SSL_library_init() is no longer a function but a define invoking
+ another function with parameters. Thus a link check against this
+ function will fail. As a fix AC_LINK_IFELSE is used so the header file
+ can be included.
+
+- X509_CRL is opaque and needs an accessor. X509_CRL_get_nextUpdate() is
+ around since OpenSSL 0.9.1c. X509_cmp_current_time() seems to be
+ around since SSLeay 0.8.1b.
+
+BTS: https://bugs.debian.org/828083
+clamav: https://bugzilla.clamav.net/show_bug.cgi?id=11594
+Patch-Name: make_it_compile_against_openssl_1_1_0.patch
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
+---
+ libclamav/crypto.c | 21 ++++++---------------
+ m4/reorganization/libs/openssl.m4 | 12 +++++++++---
+ 2 files changed, 15 insertions(+), 18 deletions(-)
+
+diff --git a/libclamav/crypto.c b/libclamav/crypto.c
+index c62c65a..4be900f 100644
+--- a/libclamav/crypto.c
++++ b/libclamav/crypto.c
+@@ -1096,7 +1096,6 @@ X509_CRL *cl_load_crl(const char *file)
+ {
+ X509_CRL *x=NULL;
+ FILE *fp;
+- struct tm *tm;
+
+ if (!(file))
+ return NULL;
+@@ -1110,21 +1109,13 @@ X509_CRL *cl_load_crl(const char *file)
+ fclose(fp);
+
+ if ((x)) {
+- tm = cl_ASN1_GetTimeT(x->crl->nextUpdate);
+- if (!(tm)) {
+- X509_CRL_free(x);
+- return NULL;
+- }
++ ASN1_TIME *tme;
+
+-#if !defined(_WIN32)
+- if (timegm(tm) < time(NULL)) {
+- X509_CRL_free(x);
+- free(tm);
+- return NULL;
+- }
+-#endif
+-
+- free(tm);
++ tme = X509_CRL_get_nextUpdate(x);
++ if (!tme || X509_cmp_current_time(tme) < 0) {
++ X509_CRL_free(x);
++ return NULL;
++ }
+ }
+
+ return x;
+diff --git a/m4/reorganization/libs/openssl.m4 b/m4/reorganization/libs/openssl.m4
+index 78e2c23..45ee02d 100644
+--- a/m4/reorganization/libs/openssl.m4
++++ b/m4/reorganization/libs/openssl.m4
+@@ -26,12 +26,13 @@ save_LDFLAGS="$LDFLAGS"
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+
+-SSL_LIBS="-lssl -lcrypto -lz"
++SSL_LIBS="$LIBS -lssl -lcrypto -lz"
++LIBS="$LIBS $SSL_LIBS"
+
+ if test "$LIBSSL_HOME" != "/usr"; then
+ SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
+ SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
+- LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
++ LDFLAGS="-L$LIBSSL_HOME/lib"
+ CFLAGS="$SSL_CPPFLAGS"
+ else
+ SSL_LDFLAGS=""
+@@ -41,7 +42,12 @@ fi
+ have_ssl="no"
+ have_crypto="no"
+
+-AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
++AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++ [[SSL_library_init();]])],
++ [have_ssl="yes";],
++ [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])])
++
+
+ AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
+
Deleted: extra-i686/tmpfiles.d
===================================================================
--- extra-i686/tmpfiles.d 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-i686/tmpfiles.d 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1 +0,0 @@
-d /run/clamav 0755 clamav clamav
Copied: clamav/repos/extra-i686/tmpfiles.d (from rev 296665, clamav/trunk/tmpfiles.d)
===================================================================
--- extra-i686/tmpfiles.d (rev 0)
+++ extra-i686/tmpfiles.d 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1 @@
+d /run/clamav 0755 clamav clamav
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/PKGBUILD 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,80 +0,0 @@
-# $Id$
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=clamav
-pkgver=0.99.2
-pkgrel=6
-pkgdesc='Anti-virus toolkit for Unix'
-url='http://www.clamav.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('libmilter')
-depends=('bzip2' 'libltdl' 'libxml2' 'curl' 'pcre')
-validpgpkeys=('B964E6D7BC7D7C82CCB8D45840B8EA2364221D53'
- 'F79FB2D08751574C5D3FDFFBB3D5342C260429A0')
-source=("http://www.clamav.net/downloads/production/${pkgname}-${pkgver}.tar.gz"{,.sig}
- 'logrotate'
- 'tmpfiles.d'
- 'clamd.conf'
- 'freshclam.conf'
- 'clamd.service'
- 'freshclamd.service'
- 'clamav-0.99.2-gcc-6.patch'
- 'make_it_compile_against_openssl_1_1_0.patch')
-sha256sums=('167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a'
- 'SKIP'
- 'ce4b9b8c300614641af600c9a73b52a00ee8e47ccc9f91b2428a113b0ecff21b'
- '0a61abee3b9bba94126afe3344e7d8e82da5120ca6dbd2b413b10f75da5b0b0d'
- 'afdb95f93f7e11e163d368caccd5f6814206c6f0d74816b4f712c0267b50572a'
- '127b39e13525ffb4242198cfb76f99d4d517e5f2fd9fa8dcad3f31fc9f82f952'
- 'e376ab0cefeefa5ac5f1cd611718452ea8646198e854aca3cc0026f5ffe58fb4'
- 'dd5ff6c79ee360da5f2221c4d9110a2a8886d86293f6c93c16bf74fdb126593c'
- 'b2960553243392a4298f37d5ef537296e989e95f7cc084800b8e3ab6a251be6d'
- '0a8e02a91bc3f2c99bd52dc475592637376baa991fe3f899b7745b840fc586c5')
-
-backup=('etc/clamav/clamd.conf'
- 'etc/clamav/freshclam.conf'
- 'etc/logrotate.d/clamav')
-
-install=install
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../clamav-0.99.2-gcc-6.patch
- patch -Np1 -i ../make_it_compile_against_openssl_1_1_0.patch
- autoreconf -fi
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- # --disable-zlib-vcheck because the configure script thinks that
- # zlib 1.2.11 is older than 1.2.2
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc/clamav \
- --with-dbdir=/var/lib/clamav \
- --disable-clamav \
- --disable-zlib-vcheck \
- --enable-milter
-
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
- install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
- install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
- install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
- install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
- install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
-
- install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav
- install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav
-}
Copied: clamav/repos/extra-x86_64/PKGBUILD (from rev 296665, clamav/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,78 @@
+# $Id$
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=clamav
+pkgver=0.99.2
+pkgrel=7
+pkgdesc='Anti-virus toolkit for Unix'
+url='http://www.clamav.net/'
+license=('GPL')
+arch=('i686' 'x86_64')
+makedepends=('libmilter')
+depends=('bzip2' 'libltdl' 'libxml2' 'curl' 'pcre')
+validpgpkeys=('B964E6D7BC7D7C82CCB8D45840B8EA2364221D53'
+ 'F79FB2D08751574C5D3FDFFBB3D5342C260429A0')
+source=("http://www.clamav.net/downloads/production/${pkgname}-${pkgver}.tar.gz"{,.sig}
+ 'logrotate'
+ 'tmpfiles.d'
+ 'clamd.conf'
+ 'freshclam.conf'
+ 'clamd.service'
+ 'freshclamd.service'
+ 'make_it_compile_against_openssl_1_1_0.patch')
+sha256sums=('167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a'
+ 'SKIP'
+ 'ce4b9b8c300614641af600c9a73b52a00ee8e47ccc9f91b2428a113b0ecff21b'
+ '0a61abee3b9bba94126afe3344e7d8e82da5120ca6dbd2b413b10f75da5b0b0d'
+ 'afdb95f93f7e11e163d368caccd5f6814206c6f0d74816b4f712c0267b50572a'
+ '127b39e13525ffb4242198cfb76f99d4d517e5f2fd9fa8dcad3f31fc9f82f952'
+ 'e376ab0cefeefa5ac5f1cd611718452ea8646198e854aca3cc0026f5ffe58fb4'
+ 'dd5ff6c79ee360da5f2221c4d9110a2a8886d86293f6c93c16bf74fdb126593c'
+ '0a8e02a91bc3f2c99bd52dc475592637376baa991fe3f899b7745b840fc586c5')
+
+backup=('etc/clamav/clamd.conf'
+ 'etc/clamav/freshclam.conf'
+ 'etc/logrotate.d/clamav')
+
+install=install
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../make_it_compile_against_openssl_1_1_0.patch
+ autoreconf -fi
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # --disable-zlib-vcheck because the configure script thinks that
+ # zlib 1.2.11 is older than 1.2.2
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc/clamav \
+ --with-dbdir=/var/lib/clamav \
+ --disable-clamav \
+ --disable-llvm \
+ --disable-zlib-vcheck \
+ --enable-milter
+
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
+ install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
+ install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
+ install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
+ install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
+ install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
+
+ install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav
+ install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav
+}
Deleted: extra-x86_64/clamav-0.99.2-gcc-6.patch
===================================================================
--- extra-x86_64/clamav-0.99.2-gcc-6.patch 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/clamav-0.99.2-gcc-6.patch 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,84 +0,0 @@
-diff --git a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
-index 59ff6aa..1325394 100644
---- a/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
-+++ b/libclamav/c++/llvm/include/llvm/ADT/StringMap.h
-@@ -169,3 +169,3 @@ public:
- KeyLength+1;
-- unsigned Alignment = alignof<StringMapEntry>();
-+ unsigned Alignment = alignOf<StringMapEntry>();
-
-diff --git a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
-index 88044c7..86b0f40 100644
---- a/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
-+++ b/libclamav/c++/llvm/include/llvm/CodeGen/SlotIndexes.h
-@@ -417,3 +417,3 @@ namespace llvm {
- ileAllocator.Allocate(sizeof(IndexListEntry),
-- alignof<IndexListEntry>()));
-+ alignOf<IndexListEntry>()));
-
-diff --git a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
-index 6a7a1a6..979e597 100644
---- a/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
-+++ b/libclamav/c++/llvm/include/llvm/Support/AlignOf.h
-@@ -51,8 +51,8 @@ struct AlignOf {
-
--/// alignof - A templated function that returns the mininum alignment of
-+/// alignOf - A templated function that returns the mininum alignment of
- /// of a type. This provides no extra functionality beyond the AlignOf
- /// class besides some cosmetic cleanliness. Example usage:
--/// alignof<int>() returns the alignment of an int.
-+/// alignOf<int>() returns the alignment of an int.
- template <typename T>
--static inline unsigned alignof() { return AlignOf<T>::Alignment; }
-+static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
-
-diff --git a/libclamav/c++/llvm/include/llvm/Support/Allocator.h b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
-index 4a7251f..17caf5e 100644
---- a/libclamav/c++/llvm/include/llvm/Support/Allocator.h
-+++ b/libclamav/c++/llvm/include/llvm/Support/Allocator.h
-@@ -203,3 +203,3 @@ public:
- for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
-- Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
-+ Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
- if (Ptr + sizeof(T) <= End)
-diff --git a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
-index b892d85..dc72346 100644
---- a/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
-+++ b/libclamav/c++/llvm/lib/Analysis/ScalarEvolution.cpp
-@@ -495,3 +495,3 @@ void SCEVUnknown::print(raw_ostream &OS) const {
- if (isAlignOf(AllocTy)) {
-- OS << "alignof(" << *AllocTy << ")";
-+ OS << "alignOf(" << *AllocTy << ")";
- return;
-diff --git a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
-index 824021c..757ca50 100644
---- a/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
-+++ b/libclamav/c++/llvm/lib/Target/X86/X86CodeEmitter.cpp
-@@ -569,3 +569,3 @@ void Emitter<CodeEmitter>::emitMemModRMByte(const MachineInstr &MI,
- // Calculate what the SS field value should be...
-- static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
-+ static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
- unsigned SS = SSTable[Scale.getImm()];
-diff --git a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
-index 9564fe0..b2b7986 100644
---- a/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
-+++ b/libclamav/c++/llvm/lib/Target/X86/X86MCCodeEmitter.cpp
-@@ -332,3 +332,3 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op,
- // Calculate what the SS field value should be...
-- static const unsigned SSTable[] = { ~0, 0, 1, ~0, 2, ~0, ~0, ~0, 3 };
-+ static const unsigned SSTable[] = { ~0u, 0u, 1u, ~0u, 2u, ~0u, ~0u, ~0u, 3u };
- unsigned SS = SSTable[Scale.getImm()];
-diff --git a/libclamav/mpool.c b/libclamav/mpool.c
-index cd38e15..b5e537d 100644
---- a/libclamav/mpool.c
-+++ b/libclamav/mpool.c
-@@ -417,3 +417,3 @@ static size_t from_bits(unsigned int bits) {
-
--static inline unsigned int alignof(size_t size)
-+static inline unsigned int alignOf(size_t size)
- {
-@@ -609,3 +609,3 @@ static void* allocate_aligned(struct MPMAP *mpm, size_t size, unsigned align, co
- void *mpool_malloc(struct MP *mp, size_t size) {
-- size_t align = alignof(size);
-+ size_t align = alignOf(size);
- size_t i, needed = align_increase(size+FRAG_OVERHEAD, align);
Deleted: extra-x86_64/clamd.conf
===================================================================
--- extra-x86_64/clamd.conf 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/clamd.conf 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,6 +0,0 @@
-LogFile /var/log/clamav/clamd.log
-LogTime yes
-PidFile /run/clamav/clamd.pid
-TemporaryDirectory /tmp
-LocalSocket /var/lib/clamav/clamd.sock
-User clamav
Copied: clamav/repos/extra-x86_64/clamd.conf (from rev 296665, clamav/trunk/clamd.conf)
===================================================================
--- extra-x86_64/clamd.conf (rev 0)
+++ extra-x86_64/clamd.conf 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,6 @@
+LogFile /var/log/clamav/clamd.log
+LogTime yes
+PidFile /run/clamav/clamd.pid
+TemporaryDirectory /tmp
+LocalSocket /var/lib/clamav/clamd.sock
+User clamav
Deleted: extra-x86_64/clamd.service
===================================================================
--- extra-x86_64/clamd.service 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/clamd.service 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,11 +0,0 @@
-[Unit]
-Description=clamav daemon
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/clamd.pid
-ExecStart=/usr/bin/clamd
-
-[Install]
-WantedBy=multi-user.target
Copied: clamav/repos/extra-x86_64/clamd.service (from rev 296665, clamav/trunk/clamd.service)
===================================================================
--- extra-x86_64/clamd.service (rev 0)
+++ extra-x86_64/clamd.service 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,11 @@
+[Unit]
+Description=clamav daemon
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/clamav/clamd.pid
+ExecStart=/usr/bin/clamd
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/freshclam.conf
===================================================================
--- extra-x86_64/freshclam.conf 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/freshclam.conf 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,3 +0,0 @@
-UpdateLogFile /var/log/clamav/freshclam.log
-DatabaseMirror database.clamav.net
-NotifyClamd /etc/clamav/clamd.conf
Copied: clamav/repos/extra-x86_64/freshclam.conf (from rev 296665, clamav/trunk/freshclam.conf)
===================================================================
--- extra-x86_64/freshclam.conf (rev 0)
+++ extra-x86_64/freshclam.conf 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,3 @@
+UpdateLogFile /var/log/clamav/freshclam.log
+DatabaseMirror database.clamav.net
+NotifyClamd /etc/clamav/clamd.conf
Deleted: extra-x86_64/freshclamd.service
===================================================================
--- extra-x86_64/freshclamd.service 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/freshclamd.service 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav updater
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/freshclam.pid
-ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
-
-[Install]
-WantedBy=multi-user.target
Copied: clamav/repos/extra-x86_64/freshclamd.service (from rev 296665, clamav/trunk/freshclamd.service)
===================================================================
--- extra-x86_64/freshclamd.service (rev 0)
+++ extra-x86_64/freshclamd.service 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,10 @@
+[Unit]
+Description=clamav updater
+
+[Service]
+Type=forking
+PIDFile=/run/clamav/freshclam.pid
+ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
+
+[Install]
+WantedBy=multi-user.target
Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/install 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,9 +0,0 @@
-post_upgrade() {
- systemd-tmpfiles --create clamav.conf
-}
-
-post_install() {
- getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
- getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
- post_upgrade
-}
Copied: clamav/repos/extra-x86_64/install (from rev 296665, clamav/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,9 @@
+post_upgrade() {
+ systemd-tmpfiles --create clamav.conf
+}
+
+post_install() {
+ getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
+ getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
+ post_upgrade
+}
Deleted: extra-x86_64/logrotate
===================================================================
--- extra-x86_64/logrotate 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/logrotate 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,10 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
- create 644 clamav clamav
- sharedscripts
- missingok
- notifempty
- postrotate
- /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
- /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
Copied: clamav/repos/extra-x86_64/logrotate (from rev 296665, clamav/trunk/logrotate)
===================================================================
--- extra-x86_64/logrotate (rev 0)
+++ extra-x86_64/logrotate 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,10 @@
+/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
+ create 644 clamav clamav
+ sharedscripts
+ missingok
+ notifempty
+ postrotate
+ /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
+ /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
+ endscript
+}
Deleted: extra-x86_64/make_it_compile_against_openssl_1_1_0.patch
===================================================================
--- extra-x86_64/make_it_compile_against_openssl_1_1_0.patch 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/make_it_compile_against_openssl_1_1_0.patch 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1,98 +0,0 @@
-From 088af365ce4f715b9f1d41754651e01db6ebf39a Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
-Date: Sat, 2 Jul 2016 00:12:01 +0200
-Subject: make it compile against openssl 1.1.0
-
-- SSL_library_init() is no longer a function but a define invoking
- another function with parameters. Thus a link check against this
- function will fail. As a fix AC_LINK_IFELSE is used so the header file
- can be included.
-
-- X509_CRL is opaque and needs an accessor. X509_CRL_get_nextUpdate() is
- around since OpenSSL 0.9.1c. X509_cmp_current_time() seems to be
- around since SSLeay 0.8.1b.
-
-BTS: https://bugs.debian.org/828083
-clamav: https://bugzilla.clamav.net/show_bug.cgi?id=11594
-Patch-Name: make_it_compile_against_openssl_1_1_0.patch
-
-Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
----
- libclamav/crypto.c | 21 ++++++---------------
- m4/reorganization/libs/openssl.m4 | 12 +++++++++---
- 2 files changed, 15 insertions(+), 18 deletions(-)
-
-diff --git a/libclamav/crypto.c b/libclamav/crypto.c
-index c62c65a..4be900f 100644
---- a/libclamav/crypto.c
-+++ b/libclamav/crypto.c
-@@ -1096,7 +1096,6 @@ X509_CRL *cl_load_crl(const char *file)
- {
- X509_CRL *x=NULL;
- FILE *fp;
-- struct tm *tm;
-
- if (!(file))
- return NULL;
-@@ -1110,21 +1109,13 @@ X509_CRL *cl_load_crl(const char *file)
- fclose(fp);
-
- if ((x)) {
-- tm = cl_ASN1_GetTimeT(x->crl->nextUpdate);
-- if (!(tm)) {
-- X509_CRL_free(x);
-- return NULL;
-- }
-+ ASN1_TIME *tme;
-
--#if !defined(_WIN32)
-- if (timegm(tm) < time(NULL)) {
-- X509_CRL_free(x);
-- free(tm);
-- return NULL;
-- }
--#endif
--
-- free(tm);
-+ tme = X509_CRL_get_nextUpdate(x);
-+ if (!tme || X509_cmp_current_time(tme) < 0) {
-+ X509_CRL_free(x);
-+ return NULL;
-+ }
- }
-
- return x;
-diff --git a/m4/reorganization/libs/openssl.m4 b/m4/reorganization/libs/openssl.m4
-index 78e2c23..45ee02d 100644
---- a/m4/reorganization/libs/openssl.m4
-+++ b/m4/reorganization/libs/openssl.m4
-@@ -26,12 +26,13 @@ save_LDFLAGS="$LDFLAGS"
- save_CFLAGS="$CFLAGS"
- save_LIBS="$LIBS"
-
--SSL_LIBS="-lssl -lcrypto -lz"
-+SSL_LIBS="$LIBS -lssl -lcrypto -lz"
-+LIBS="$LIBS $SSL_LIBS"
-
- if test "$LIBSSL_HOME" != "/usr"; then
- SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
- SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
-- LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
-+ LDFLAGS="-L$LIBSSL_HOME/lib"
- CFLAGS="$SSL_CPPFLAGS"
- else
- SSL_LDFLAGS=""
-@@ -41,7 +42,12 @@ fi
- have_ssl="no"
- have_crypto="no"
-
--AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
-+AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
-+ [[SSL_library_init();]])],
-+ [have_ssl="yes";],
-+ [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])])
-+
-
- AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
-
Copied: clamav/repos/extra-x86_64/make_it_compile_against_openssl_1_1_0.patch (from rev 296665, clamav/trunk/make_it_compile_against_openssl_1_1_0.patch)
===================================================================
--- extra-x86_64/make_it_compile_against_openssl_1_1_0.patch (rev 0)
+++ extra-x86_64/make_it_compile_against_openssl_1_1_0.patch 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1,98 @@
+From 088af365ce4f715b9f1d41754651e01db6ebf39a Mon Sep 17 00:00:00 2001
+From: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
+Date: Sat, 2 Jul 2016 00:12:01 +0200
+Subject: make it compile against openssl 1.1.0
+
+- SSL_library_init() is no longer a function but a define invoking
+ another function with parameters. Thus a link check against this
+ function will fail. As a fix AC_LINK_IFELSE is used so the header file
+ can be included.
+
+- X509_CRL is opaque and needs an accessor. X509_CRL_get_nextUpdate() is
+ around since OpenSSL 0.9.1c. X509_cmp_current_time() seems to be
+ around since SSLeay 0.8.1b.
+
+BTS: https://bugs.debian.org/828083
+clamav: https://bugzilla.clamav.net/show_bug.cgi?id=11594
+Patch-Name: make_it_compile_against_openssl_1_1_0.patch
+
+Signed-off-by: Sebastian Andrzej Siewior <sebastian at breakpoint.cc>
+---
+ libclamav/crypto.c | 21 ++++++---------------
+ m4/reorganization/libs/openssl.m4 | 12 +++++++++---
+ 2 files changed, 15 insertions(+), 18 deletions(-)
+
+diff --git a/libclamav/crypto.c b/libclamav/crypto.c
+index c62c65a..4be900f 100644
+--- a/libclamav/crypto.c
++++ b/libclamav/crypto.c
+@@ -1096,7 +1096,6 @@ X509_CRL *cl_load_crl(const char *file)
+ {
+ X509_CRL *x=NULL;
+ FILE *fp;
+- struct tm *tm;
+
+ if (!(file))
+ return NULL;
+@@ -1110,21 +1109,13 @@ X509_CRL *cl_load_crl(const char *file)
+ fclose(fp);
+
+ if ((x)) {
+- tm = cl_ASN1_GetTimeT(x->crl->nextUpdate);
+- if (!(tm)) {
+- X509_CRL_free(x);
+- return NULL;
+- }
++ ASN1_TIME *tme;
+
+-#if !defined(_WIN32)
+- if (timegm(tm) < time(NULL)) {
+- X509_CRL_free(x);
+- free(tm);
+- return NULL;
+- }
+-#endif
+-
+- free(tm);
++ tme = X509_CRL_get_nextUpdate(x);
++ if (!tme || X509_cmp_current_time(tme) < 0) {
++ X509_CRL_free(x);
++ return NULL;
++ }
+ }
+
+ return x;
+diff --git a/m4/reorganization/libs/openssl.m4 b/m4/reorganization/libs/openssl.m4
+index 78e2c23..45ee02d 100644
+--- a/m4/reorganization/libs/openssl.m4
++++ b/m4/reorganization/libs/openssl.m4
+@@ -26,12 +26,13 @@ save_LDFLAGS="$LDFLAGS"
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+
+-SSL_LIBS="-lssl -lcrypto -lz"
++SSL_LIBS="$LIBS -lssl -lcrypto -lz"
++LIBS="$LIBS $SSL_LIBS"
+
+ if test "$LIBSSL_HOME" != "/usr"; then
+ SSL_LDFLAGS="-L$LIBSSL_HOME/lib"
+ SSL_CPPFLAGS="-I$LIBSSL_HOME/include"
+- LDFLAGS="-L$LIBSSL_HOME/lib $SSL_LIBS"
++ LDFLAGS="-L$LIBSSL_HOME/lib"
+ CFLAGS="$SSL_CPPFLAGS"
+ else
+ SSL_LDFLAGS=""
+@@ -41,7 +42,12 @@ fi
+ have_ssl="no"
+ have_crypto="no"
+
+-AC_CHECK_LIB([ssl], [SSL_library_init], [have_ssl="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
++AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]],
++ [[SSL_library_init();]])],
++ [have_ssl="yes";],
++ [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])])
++
+
+ AC_CHECK_LIB([crypto], [EVP_EncryptInit], [have_crypto="yes"], [AC_MSG_ERROR([Your OpenSSL installation is misconfigured or missing])], [-lcrypto -lz])
+
Deleted: extra-x86_64/tmpfiles.d
===================================================================
--- extra-x86_64/tmpfiles.d 2017-05-27 02:36:04 UTC (rev 296665)
+++ extra-x86_64/tmpfiles.d 2017-05-27 02:36:40 UTC (rev 296666)
@@ -1 +0,0 @@
-d /run/clamav 0755 clamav clamav
Copied: clamav/repos/extra-x86_64/tmpfiles.d (from rev 296665, clamav/trunk/tmpfiles.d)
===================================================================
--- extra-x86_64/tmpfiles.d (rev 0)
+++ extra-x86_64/tmpfiles.d 2017-05-27 02:36:40 UTC (rev 296666)
@@ -0,0 +1 @@
+d /run/clamav 0755 clamav clamav
More information about the arch-commits
mailing list