diff options
| -rw-r--r-- | main/clamav/APKBUILD | 27 | ||||
| -rw-r--r-- | main/clamav/arm.patch | 15 | ||||
| -rw-r--r-- | main/clamav/clamav-0.95.1-nls.patch | 11 |
3 files changed, 28 insertions, 25 deletions
diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD index 10d11ecd66..bd58ffb7ae 100644 --- a/main/clamav/APKBUILD +++ b/main/clamav/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Carlo Landmeter <clandmeter@gmail.com> pkgname=clamav -pkgver=0.97.8 +pkgver=0.98.6 pkgrel=0 pkgusers="clamav" pkggroups="clamav" @@ -12,15 +12,15 @@ license="GPL" depends="$pkgname-scanner $pkgname-daemon" install="freshclam.pre-install clamav-daemon.pre-install clamav-daemon.pre-upgrade" -makedepends="ncurses-dev zlib-dev bzip2-dev" +makedepends="ncurses-dev zlib-dev bzip2-dev openssl-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-lib $pkgname-libunrar $pkgname-daemon $pkgname-scanner $pkgname-db freshclam" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + arm.patch clamd.initd clamd.confd freshclam.initd freshclam.confd - clamav-0.95.1-nls.patch clamd.logrotate freshclam.logrotate " @@ -29,7 +29,6 @@ _builddir="$srcdir/$pkgname-$pkgver" prepare() { cd "$_builddir" - patch -p0 -i "$srcdir/clamav-0.95.1-nls.patch" || return 1 } build() { @@ -61,7 +60,7 @@ package() { -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \ -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "$pkgdir"/etc/clamav/freshclam.conf + "$pkgdir"/etc/clamav/freshclam.conf.sample # set proper defaults sed -i -e "s:^\(Example\):\# \1:" \ @@ -71,7 +70,7 @@ package() { -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \ -e "s:^\#\(LogTime\).*:\1 yes:" \ -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \ - "$pkgdir"/etc/clamav/clamd.conf + "$pkgdir"/etc/clamav/clamd.conf.sample } lib() { @@ -102,7 +101,7 @@ freshclam() { "$subpkgdir"/etc/clamav mv "$pkgdir"/usr/bin/freshclam "$subpkgdir"/usr/bin || return 1 - mv "$pkgdir"/etc/clamav/freshclam.conf \ + mv "$pkgdir"/etc/clamav/freshclam.conf.sample \ "$subpkgdir"/etc/clamav/ || return 1 install -d -m755 -o clamav -g clamav \ "$subpkgdir"/var/run/clamav \ @@ -164,7 +163,7 @@ daemon() { "$subpkgdir"/usr/bin/ || return 1 mv "$pkgdir"/usr/bin/clamdscan \ "$subpkgdir"/usr/bin/ || return 1 - mv "$pkgdir"/etc/clamav/clamd.conf \ + mv "$pkgdir"/etc/clamav/clamd.conf.sample \ "$subpkgdir"/etc/clamav/ || return 1 install -m755 -D "$srcdir"/clamd.initd \ "$subpkgdir"/etc/init.d/clamd || return 1 @@ -174,27 +173,27 @@ daemon() { "$pkgdir"/etc/logrotate.d/clamd || return 1 } -md5sums="ac52bcbad3ea72eac08fedb9772f648b clamav-0.97.8.tar.gz +md5sums="7f4f7e82a09e42c4ebf153d6d452d9d8 clamav-0.98.6.tar.gz +104d062d384e9fada1812d08dc433ed8 arm.patch b4523253843761d7a7e5fa765b3fb2b9 clamd.initd e8a03fad6ce603631e8fe71a24d387c6 clamd.confd 401fe30d9af2fea3151f938b26ff01c0 freshclam.initd e48466ddfb56f66c623b83e58777b778 freshclam.confd -0d08fd29656bd4b018ecf8ce9706ac55 clamav-0.95.1-nls.patch ae1e48ab56a0fff1acdde023c1f6f350 clamd.logrotate 226824214c021b2366f0be1289561d17 freshclam.logrotate" -sha256sums="d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12 clamav-0.97.8.tar.gz +sha256sums="6591245d55445a2ddcc1700964c33b8bf62fe20c75bd9c7746f4fe0735502951 clamav-0.98.6.tar.gz +989e41505f5287e7b01c8e4657078e147fe7751e9d2bf64f8c2abad63ea45e6c arm.patch 5f8847600cacc35de56ea61c7a8d0761e5a351ccfd507fd3e07160170269e055 clamd.initd 4d978313004f66d871564b873df27c5459d3cc504788b179e41edba0f04b74dc clamd.confd f69a8741f0165a1edd7558ce6c3ea8411fc2bc6e433a1636c25c366a057134d0 freshclam.initd 75551ce7e04bbef4a889bc94a357b160d9da88f06eba32df594ba3cbb2c81ed1 freshclam.confd -4aa3ba46cdea229355f90e2c6533c0f3c91f52ce869f7bc6dcc870a29450e312 clamav-0.95.1-nls.patch ec5e60f7efca02ed151f625e9a44404346991ed6608c6e2088db2436bbd03d49 clamd.logrotate 84006ac3d2e8dc2e13a01f5e313c20e4978cdc93d831c181e0075badcbf4ada0 freshclam.logrotate" -sha512sums="e3a80bbfc90922f7f49521d1ab53ec63fb948a42d448ecaa933023cbb256f35e5b695305bd2d56480ee1f94ac93703d10aa4193566c521a1fa62f2c0e1019fda clamav-0.97.8.tar.gz +sha512sums="420064e784c352c1398c531f7530dbe37ed1092de8015984b354a96f0e5fe0968b285cae6108659fcebfa91ffbe0742335b70cb8d7f49db7690d049ca2d52758 clamav-0.98.6.tar.gz +20374e90aa6dcac08eb7e2fb09531f2044181103a3733ada4d9b79c051507f02cd1bb5f28f1b4b4870b82ef9746949d4e0a266c0bc4249aef9029299b28f5082 arm.patch 5f64211605db7fc91785331d6bb768cf71fe7579e40c82624e3fd71e4738e41d48cd4e7984e2ddbcc932aa27d3d77fb121de40e2ecdb123b81f58f277b184df2 clamd.initd 59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794 clamd.confd e192f89d6591c0601f828da368a8a21eb7ed14c50757630896fbbb3582c2660ad562760b28979904f1a4a21eecc320f2e6f7f0c7b673f89c6d2af83d2d4b280c freshclam.initd ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08 freshclam.confd -8363ba0e69918ce2cbfef3adf3406d3f73d29adacc1f1382f11c1ef3b55baba96ee581beb5f9eaafbfbad1e00ffb0e4af39cd09b597cdba1e3ab2db39a3c5a04 clamav-0.95.1-nls.patch 57e5b0c0dc6dc078e0102829e5d36882cff9ae5dd0637c31c7a23ef274dd0a4d967bc036f74c42b4690af511bc0a43fdb6d19b0c307506432577d82de7beff78 clamd.logrotate f1cd8df6d47824009a6df130bd60bf5e9f9deaef87fbeaceec8fe71e6c8b2772b5dba017390a2190deee851723256f06e9aef2182b0a2881119f22ba68740554 freshclam.logrotate" diff --git a/main/clamav/arm.patch b/main/clamav/arm.patch new file mode 100644 index 0000000000..d503679b7c --- /dev/null +++ b/main/clamav/arm.patch @@ -0,0 +1,15 @@ +https://raw.github.com/archlinuxarm/PKGBUILDs/master/extra/clamav/arm.patch + +diff -urN a/clamd/fan-syscalllib.h b/clamd/fan-syscalllib.h +--- a/clamd/fan-syscalllib.h 2013-09-16 13:28:14.000000000 -0600 ++++ b/clamd/fan-syscalllib.h 2013-09-19 21:29:47.314868930 -0600 +@@ -10,6 +10,9 @@ + #elif defined(__i386__) + # define __NR_fanotify_init 338 + # define __NR_fanotify_mark 339 ++#elif defined(__ARM_EABI__) ++# define __NR_fanotify_init 367 ++# define __NR_fanotify_mark 368 + #else + # error "System call numbers not defined for this architecture" + #endif diff --git a/main/clamav/clamav-0.95.1-nls.patch b/main/clamav/clamav-0.95.1-nls.patch deleted file mode 100644 index 82ae88f576..0000000000 --- a/main/clamav/clamav-0.95.1-nls.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- shared/output.c-orig 2009-04-04 10:17:42 +0000 -+++ shared/output.c 2009-04-04 10:18:30 +0000 -@@ -67,7 +67,7 @@ - pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER; - #endif - --#ifdef C_LINUX -+#if defined(C_LINUX) && defined(HAVE_LIBINTL_H) - #include <libintl.h> - #include <locale.h> - |