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 838F2DCEFA0 for ; Mon, 7 Dec 2015 16:25:52 +0000 (UTC) Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 15B24DCEC30 for ; Mon, 7 Dec 2015 16:25:51 +0000 (UTC) Received: by wmvv187 with SMTP id v187so174654124wmv.1 for ; Mon, 07 Dec 2015 08:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=8/XAhd0rUl35bm4Y8SqqQ4P6aiHM9VFKUxLEg7EVbpM=; b=wMWwV8WUSSkvIHvO4SgIFloE5ctZg2mrD23yBqFDM8J7z5gbb70XwCe/py49aqDzxK uY2njekbLskimjXmaiCDO+v9iChbOI8R11gFiv+niUrxsBYWj3Oj9Psq/rzce1mmmUfN VCrmQJJG2OQS/St+xjzgQdiqnRloOaCB7BzuW3V8nrHIDac59ITVDD/7Mk+bAdnFNhm5 BoVgGpfmajJUPxSnjVlCfO1OG6kprGEgvoffVT+SrShbVa3SmVjvWGv77YY3rf6no4Ei Nlp+2HTNUGlps86DZ0CEB4A0Fc32wawhu4slgBbN3VZEeZZ32V63eL98G8pxLT5dRMsQ 0U4w== X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 X-Received: by 10.194.24.226 with SMTP id x2mr33684231wjf.43.1449505550352; Mon, 07 Dec 2015 08:25:50 -0800 (PST) Received: by 10.28.90.132 with HTTP; Mon, 7 Dec 2015 08:25:50 -0800 (PST) In-Reply-To: <20151207163321.26e2b600@ncopa-desktop.alpinelinux.org> References: <1449491806-13874-1-git-send-email-valery.kartel@gmail.com> <20151207163321.26e2b600@ncopa-desktop.alpinelinux.org> Date: Mon, 7 Dec 2015 18:25:50 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] main/clamav: upgrade to 0.99. Minor fixes in APKBUILD, init and logrotate scripts From: Valery Kartel To: Natanael Copa Cc: alpine-aports@lists.alpinelinux.org Content-Type: multipart/alternative; boundary=047d7b45066e6dc76e0526514f19 X-Virus-Scanned: ClamAV using ClamSMTP --047d7b45066e6dc76e0526514f19 Content-Type: text/plain; charset=UTF-8 I made a new commit without use of $pkgname as relative path. Think to use some other variable (like $_relpath) for it in the future. 2015-12-07 17:33 GMT+02:00 Natanael Copa : > 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 > --047d7b45066e6dc76e0526514f19 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
I made a new commit without use of $pkgname as relative pa= th. Think to use some other variable (like $_relpath) for it in the future.=

2015-12= -07 17:33 GMT+02:00 Natanael Copa <ncopa@alpinelinux.org>:
On Mon,=C2=A0 7 Dec 2= 015 14:36:46 +0200
Valery Kartel <valery.kartel@= gmail.com> wrote:

> ---
>=C2=A0 main/clamav/APKBUILD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | = 106 ++++++++++++++++++++--------------------
>=C2=A0 main/clamav/clamd.initd=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0= =C2=A03 +-
>=C2=A0 main/clamav/clamd.logrotate=C2=A0 =C2=A0 =C2=A0|=C2=A0 11 ++---<= br> >=C2=A0 main/clamav/freshclam.initd=C2=A0 =C2=A0 =C2=A0|=C2=A0 13 ++++-<= br> >=C2=A0 main/clamav/freshclam.logrotate |=C2=A0 10 ++--
>=C2=A0 5 files changed, 75 insertions(+), 68 deletions(-)

...

>=C2=A0 lib() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"ClamAV library"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D""
> -=C2=A0 =C2=A0 =C2=A0replaces=3D"clamav"
> +=C2=A0 =C2=A0 =C2=A0replaces=3D"$pkgname"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/lib
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/lib/libclamav.so.= * \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$subpkgdir= "/usr/lib/
> @@ -98,7 +99,7 @@ lib() {
>=C2=A0 libunrar() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"ClamAV unrar libraries"=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D""
> -=C2=A0 =C2=A0 =C2=A0replaces=3D"clamav"
> +=C2=A0 =C2=A0 =C2=A0replaces=3D"$pkgname"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/lib
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/lib/libclamunrar*= \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$subpkgdir= "/usr/lib/
> @@ -107,19 +108,18 @@ libunrar() {
>=C2=A0 freshclam() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0pkgdesc=3D"Auto-updater for the Clam An= tivirus scanner data-files"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0depends=3D"logrotate"
> -=C2=A0 =C2=A0 =C2=A0replaces=3D"clamav clamav-db"
> +=C2=A0 =C2=A0 =C2=A0replaces=3D"$pkgname $pkgname-db"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/bin \ >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$subpkgdir= "/etc/init.d \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"$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=3D"clamav1-db", which is completely = useless
as there have never been any clamav1-db package.

The replaces=3D"clamav1" in clamav-lib will also be meaningless.<= br>
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

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