X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id A9DA3DC7F56 for ; Mon, 7 Dec 2015 15:33:25 +0000 (UTC) Received: from newmail.tetrasec.net (unknown [74.117.189.116]) by mail.alpinelinux.org (Postfix) with ESMTP id 89EBCDC75E9 for ; Mon, 7 Dec 2015 15:33:25 +0000 (UTC) Received: from ncopa-desktop.alpinelinux.org (unknown [79.160.13.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by newmail.tetrasec.net (Postfix) with ESMTPSA id 522BF5A1370; Mon, 7 Dec 2015 15:22:42 +0000 (GMT) Date: Mon, 7 Dec 2015 16:33:21 +0100 From: Natanael Copa To: Valery Kartel Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] main/clamav: upgrade to 0.99. Minor fixes in APKBUILD, init and logrotate scripts Message-ID: <20151207163321.26e2b600@ncopa-desktop.alpinelinux.org> In-Reply-To: <1449491806-13874-1-git-send-email-valery.kartel@gmail.com> References: <1449491806-13874-1-git-send-email-valery.kartel@gmail.com> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Virus-Scanned: ClamAV using ClamSMTP On Mon, 7 Dec 2015 14:36:46 +0200 Valery Kartel wrote: > --- > main/clamav/APKBUILD | 106 ++++++++++++++++++++-------------------- > main/clamav/clamd.initd | 3 +- > main/clamav/clamd.logrotate | 11 ++--- > main/clamav/freshclam.initd | 13 ++++- > main/clamav/freshclam.logrotate | 10 ++-- > 5 files changed, 75 insertions(+), 68 deletions(-) ... > lib() { > pkgdesc="ClamAV library" > depends="" > - replaces="clamav" > + replaces="$pkgname" > mkdir -p "$subpkgdir"/usr/lib > mv "$pkgdir"/usr/lib/libclamav.so.* \ > "$subpkgdir"/usr/lib/ > @@ -98,7 +99,7 @@ lib() { > libunrar() { > pkgdesc="ClamAV unrar libraries" > depends="" > - replaces="clamav" > + replaces="$pkgname" > mkdir -p "$subpkgdir"/usr/lib > mv "$pkgdir"/usr/lib/libclamunrar* \ > "$subpkgdir"/usr/lib/ > @@ -107,19 +108,18 @@ libunrar() { > freshclam() { > pkgdesc="Auto-updater for the Clam Antivirus scanner data-files" > depends="logrotate" > - replaces="clamav clamav-db" > + replaces="$pkgname $pkgname-db" > mkdir -p "$subpkgdir"/usr/bin \ > "$subpkgdir"/etc/init.d \ > "$subpkgdir"/etc/conf.d \ I don't like the replaces change to use $pkgname. If the pkgname changes (to for example clamav1 or similar) then will we automatically get a replaces="clamav1-db", which is completely useless as there have never been any clamav1-db package. The replaces="clamav1" in clamav-lib will also be meaningless. We could probably remove the replaces since they were added to deal with new organization of subpackages. Since then apk handles this kind of things better. The replaces were there to solve issue when upgrade for older version, but i dont think we support uppgrading from affected versions at this point. -nc --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---