Patches for aports can be sent to this list

3 2

[alpine-aports] [PATCH] main/clamav: add pcre support for new signatures uses PCREs

Jens Vehlhaber
Details
Message ID
<1453113489-22577-1-git-send-email-jens@eisfair.org>
Sender timestamp
1453113489
DKIM signature
missing
Download raw message
Patch: +11 -10
Signed-off-by: Jens Vehlhaber <jens@eisfair.org>
---
 main/clamav/APKBUILD    | 13 +++++++------
 main/clamav/clamd.initd |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index 2a71af5..92658be 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -4,10 +4,10 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=clamav
 pkgver=0.99
-pkgrel=2
+pkgrel=3
 pkgusers="clamav"
 pkggroups="clamav"
-pkgdesc="An anti-virus toolkit for UNIX"
+pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
 url="http://www.clamav.net/"
 arch="all"
 license="GPL2"
@@ -15,7 +15,7 @@ depends="$pkgname-scanner $pkgname-daemon"
 depends_dev="openssl-dev"
 install="freshclam.pre-install
 	clamav-daemon.pre-install clamav-daemon.pre-upgrade"
-makedepends="ncurses-dev zlib-dev bzip2-dev linux-headers $depends_dev fts-dev"
+makedepends="ncurses-dev zlib-dev bzip2-dev pcre-dev linux-headers $depends_dev fts-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
@@ -58,6 +58,7 @@ build() {
 		--with-dbdir=/var/lib/clamav \
 		--enable-clamdtop \
 		--enable-bigstack \
+		--with-pcre \
 		|| return 1
 	make || return 1
 }
@@ -185,21 +186,21 @@ daemon() {
 }
 
 md5sums="ae79c3982761ba1815dbce17f846bab6  clamav-0.99.tar.gz
-191b7b6b29eaef0af9f745e331058618  clamd.initd
+26fbe47be94c56e47b224059ad06bce3  clamd.initd
 e8a03fad6ce603631e8fe71a24d387c6  clamd.confd
 6c79b77c35ce35ba3846b5a4f363a1d4  freshclam.initd
 e48466ddfb56f66c623b83e58777b778  freshclam.confd
 2fb0399fbad82ab17c1c04f2d331214a  clamd.logrotate
 56e88ff24d3490af599e34e6f3346d5b  freshclam.logrotate"
 sha256sums="d2792c8cfadd685fffc40b2199679628815df031fd3149ccf961649fc8787ea9  clamav-0.99.tar.gz
-0ac8e153aea4422c82956e083358a83b9c77a6400e5bafbfcec2ddb97eb3e733  clamd.initd
+d95865d671c3757a224cfbd395a42410a626563d2fca97dbe5a89317b608963d  clamd.initd
 4d978313004f66d871564b873df27c5459d3cc504788b179e41edba0f04b74dc  clamd.confd
 4ba12be50d010269bcd170c1d14a91e6ddcfe85df3f5cbf68803e6e75a420bb5  freshclam.initd
 75551ce7e04bbef4a889bc94a357b160d9da88f06eba32df594ba3cbb2c81ed1  freshclam.confd
 2fee72877bc1fdc788b298319479de9495db85bdae4433143ce83a450a09dae3  clamd.logrotate
 5127ebd370d8c62f3558c9605b4f33f7fb54bac3acf7831dc5f8c4dda1509dfa  freshclam.logrotate"
 sha512sums="328e66fa412ba61f5e44c839b254c7a84d2ce7821fda6cf29e4ee9532c06e45bdec62f202ca561223e984fff170bfd8280e5cc8e306c09a3017b17e7db3bbf56  clamav-0.99.tar.gz
-c3e1c9efe8744ec96627ea7fe8d54e1c07a45da40907e774ee664d9880bb8e77a98902fb831171acb2b5df2bf797ce712b3b68a17c35657ad86826add7177e35  clamd.initd
+ed81be79bf9a25eec071312252121cc76c96838407377b75077bf94922055f1de99f327982ac4dccd5be85003baa95385e5d002fabab32bb851bb30178475edd  clamd.initd
 59c561b3dcb0b616b647cd8e4ebc46a2cc5e7144c8c7ea0054cc1c3021d1da8f67e4dad5c083c3fe712ed887aaabfca91b538f4759537e7c4c9ab71ba4fd5794  clamd.confd
 00daed8afb67a6e4a29893340246c8840cce970dd9103d26557ecdd26ef60b12551d2291c214fc657faaaa339484052079347411b0cad65e3a33ece56d57cf16  freshclam.initd
 ba181fe1abaac7b898ccb40b0713455aa3c9d5e25ad21d687b6cac09b0105b9e376526e7c776a44636234d8db819709d8d6a6cc76119bc3e98b637b1a3f26c08  freshclam.confd
diff --git a/main/clamav/clamd.initd b/main/clamav/clamd.initd
index 35e6aaf..5511a56 100755
--- a/main/clamav/clamd.initd
+++ b/main/clamav/clamd.initd
@@ -22,10 +22,10 @@ start_pre() {
 	local socket=`awk '$1 == "LocalSocket" { print $2 }' $CONF`
 	local socketdir=${socket%/*}
 	local clamav_user=`awk '$1 == "User" { print $2 }' $CONF`
-	checkpath --directory --owner -m 750 ${clamav_user:-clamav} \
-		${pidfile%/*}
-	checkpath --directory --owner -m 750 ${clamav_user:-clamav} \
-		${socketdir:-/run/clamav}
+	checkpath --directory --owner ${clamav_user:-clamav} \
+		--mode 750 ${pidfile%/*}
+	checkpath --directory --owner ${clamav_user:-clamav} \
+		--mode 755 ${socketdir:-/run/clamav}
 }
 
 start() {
-- 
2.6.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Timo Teras
Details
Message ID
<20160119113224.44ac4160@vostro>
In-Reply-To
<1453113489-22577-1-git-send-email-jens@eisfair.org> (view parent)
Sender timestamp
1453195944
DKIM signature
missing
Download raw message
On Mon, 18 Jan 2016 11:38:09 +0100
Jens Vehlhaber <jens@eisfair.org> wrote:

> Signed-off-by: Jens Vehlhaber <jens@eisfair.org>

> diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
> index 2a71af5..92658be 100644
> --- a/main/clamav/APKBUILD
> +++ b/main/clamav/APKBUILD
> @@ -4,10 +4,10 @@
>  # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
>  pkgname=clamav
>  pkgver=0.99
> -pkgrel=2
> +pkgrel=3
>  pkgusers="clamav"
>  pkggroups="clamav"
> -pkgdesc="An anti-virus toolkit for UNIX"
> +pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"

Looks good otherwise, but I wonder why the pkgdesc change?

>  url="http://www.clamav.net/"
>  arch="all"
>  license="GPL2"



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Jens Vehlhaber
Details
Message ID
<569E1232.7050700@eisfair.org>
In-Reply-To
<20160119113224.44ac4160@vostro> (view parent)
Sender timestamp
1453199922
DKIM signature
missing
Download raw message

Am 19.01.2016 um 10:32 schrieb Timo Teras:
> On Mon, 18 Jan 2016 11:38:09 +0100
> Jens Vehlhaber <jens@eisfair.org> wrote:
>
>> -pkgdesc="An anti-virus toolkit for UNIX"
>> +pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"
> Looks good otherwise, but I wonder why the pkgdesc change?

Sorry, this should not really get in there.



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Timo Teras
Details
Message ID
<20160119125300.2bb468c4@vostro>
In-Reply-To
<569E1232.7050700@eisfair.org> (view parent)
Sender timestamp
1453200780
DKIM signature
missing
Download raw message
On Tue, 19 Jan 2016 11:38:42 +0100
Jens Vehlhaber <jens@eisfair.org> wrote:

> Am 19.01.2016 um 10:32 schrieb Timo Teras:
> > On Mon, 18 Jan 2016 11:38:09 +0100
> > Jens Vehlhaber <jens@eisfair.org> wrote:
> >  
> >> -pkgdesc="An anti-virus toolkit for UNIX"
> >> +pkgdesc="An anti-virus toolkit for UNIX eis-ng backport"  
> > Looks good otherwise, but I wonder why the pkgdesc change?  
> 
> Sorry, this should not really get in there.

Bah. I accidentally pushed this is already. I'll revert this part.

Thanks!


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---