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 8A679DC0116 for ; Mon, 25 Jan 2016 12:51:38 +0000 (UTC) Received: from mail-lf0-f43.google.com (mail-lf0-f43.google.com [209.85.215.43]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id EC7F5DC00A4 for ; Mon, 25 Jan 2016 12:51:37 +0000 (UTC) Received: by mail-lf0-f43.google.com with SMTP id m198so83912150lfm.0 for ; Mon, 25 Jan 2016 04:51:37 -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=zlOD7UjCcvD7s0WFjzMH3EJgDvEz/AVzKheUAd1zVVs=; b=OZiFI/k3DvooOLdEwZgsqop1IBFfx9o6GR1Q7UGhlPEqenv7WqcxnPaN8CKMEdtksc ozMcLnrsdsdV5yATeKfMtzm7Y347tsAhscxq9s8urQ4/BIKBKadOdc+SFHTIQgr/9G+V 60Jyo/weMGoKxVVy4qcMvj2C/jiwrTuE1hvRJH37VTDiddgazmFa9ZISeZ5G93kNSk8E kRHhBUeZVSTTgC1Tg6ZrOWyOPSNTH76I+AxNjBLRNEthwHPppS6pMccSq5Q73lPXLuGp Z77ansyb5vR+n1emO7PNwAQGHmsUrwRNAgwQxHTe5GzXUOoflsXa18gJzC4cUGNPXyHo zKsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=zlOD7UjCcvD7s0WFjzMH3EJgDvEz/AVzKheUAd1zVVs=; b=mAyWLlK8MQtRjXqJv3S1GjeQ2QE30SQbSe6C3PnEImGGUptTzHLlMbzDixs44rvmdR hRzRyD7QmoOZFKIBViGjzOg2W8TpaEdDDAKhVsUhbJtJUu3CP1GOxU7dF0j/ydKAhkmE TvPwpX6ViYrU2cd0OTlIPnjb4zz+CiFo3scxwNLhKZ1QDZgzv92euAzkspiFrDKIposM KdON7fuKAmGS3f21uSbrANDjwbMxPeMi5J52VBZJaMkGOGOwvRC4Klapw/7Y0/1o4sny bD6B6dpw6YXKTQIvXNZu+pj+0vr+X67wE8Aum3B5NoRat2KG9ZP+aPyb5h7Z5o34I2H7 p3Gg== X-Gm-Message-State: AG10YOQuHXpq14PFEqFeHhZbi2opIkkhtsi0MNTDntB7Xn0IjHQMdyPukBpMOlhcUfdQTQ0eZahDkh9cHuKv2w== 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.25.16.30 with SMTP id f30mr5102060lfi.21.1453726295348; Mon, 25 Jan 2016 04:51:35 -0800 (PST) Received: by 10.25.39.4 with HTTP; Mon, 25 Jan 2016 04:51:35 -0800 (PST) In-Reply-To: <20160125134440.213d7b0c@ncopa-desktop.alpinelinux.org> References: <1453723230-31958-1-git-send-email-valery.kartel@gmail.com> <20160125134440.213d7b0c@ncopa-desktop.alpinelinux.org> Date: Mon, 25 Jan 2016 14:51:35 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] main/curl: strip to subpackages and cleanups From: Valery Kartel To: Natanael Copa Cc: alpine-aports@lists.alpinelinux.org Content-Type: multipart/alternative; boundary=001a11403d146f5dca052a280770 X-Virus-Scanned: ClamAV using ClamSMTP --001a11403d146f5dca052a280770 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Ok, I'll made v2 commit =D1=81onsidering your comments 2016-01-25 14:44 GMT+02:00 Natanael Copa : > On Mon, 25 Jan 2016 14:00:30 +0200 > Valery Kartel wrote: > > > - remove unused patch > > - move libcurl and zsh completion to subpackages > > --- > > ...-generate-code-for-disable-manual-as-well.patch | 42 > ---------------------- > > main/curl/APKBUILD | 40 > +++++++++++---------- > > 2 files changed, 22 insertions(+), 60 deletions(-) > > delete mode 100644 > main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.patch > > > > diff --git > a/main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.patch > b/main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.patch > > deleted file mode 100644 > > index d23b484..0000000 > > --- > a/main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.patch > > +++ /dev/null > > @@ -1,42 +0,0 @@ > > -From 38d582ff541353d738858299d4a2b78bafac03ed Mon Sep 17 00:00:00 2001 > > -From: Daniel Stenberg > > -Date: Wed, 26 Mar 2014 13:22:10 +0100 > > -Subject: [PATCH] mkhelp: generate code for --disable-manual as well > > - > > -This allows configure --disable-manual to run and build without having > > -to regenerate the src/tool_hugehelp.c file which otherwise is necessar= y > > -since we ship tarballs with that file present. > > - > > -Reported-by: Remi Gacogne > > -Bug: http://curl.haxx.se/bug/view.cgi?id=3D1350 > > ---- > > - src/mkhelp.pl | 6 +++++- > > - 1 file changed, 5 insertions(+), 1 deletion(-) > > - > > -diff --git a/src/mkhelp.pl b/src/mkhelp.pl > > -index 444b669..7ed86f7 100644 > > ---- a/src/mkhelp.pl > > -+++ b/src/mkhelp.pl > > -@@ -6,7 +6,7 @@ > > - # | (__| |_| | _ <| |___ > > - # \___|\___/|_| \_\_____| > > - # > > --# Copyright (C) 1998 - 2011, Daniel Stenberg, , et al= . > > -+# Copyright (C) 1998 - 2014, Daniel Stenberg, , et al= . > > - # > > - # This software is licensed as described in the file COPYING, which > > - # you should have received as part of this distribution. The terms > > -@@ -256,6 +256,10 @@ foot(); > > - > > - sub foot { > > - print < > -+#else /* !USE_MANUAL */ > > -+/* built-in manual is disabled, blank function */ > > -+#include "tool_hugehelp.h" > > -+void hugehelp(void) {} > > - #endif /* USE_MANUAL */ > > - FOOT > > - ; > > --- > > -1.9.1 > > - > > diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD > > index 4962d9e..87f476d 100644 > > --- a/main/curl/APKBUILD > > +++ b/main/curl/APKBUILD > > @@ -1,40 +1,29 @@ > > +# Contributor: Valery Kartel > > # Contributor: =C3=85 ukasz Jendrysik > > # Maintainer: Natanael Copa > > pkgname=3Dcurl > > pkgver=3D7.46.0 > > -pkgrel=3D1 > > +pkgrel=3D2 > > pkgdesc=3D"An URL retrival utility and library" > > url=3D"http://curl.haxx.se" > > arch=3D"all" > > license=3D"MIT" > > depends=3D"ca-certificates" > > depends_dev=3D"zlib-dev openssl-dev libssh2-dev" > > -makedepends=3D"groff $depends_dev perl" > > -source=3D"http://curl.haxx.se/download/curl-$pkgver.tar.bz2" > > -subpackages=3D"$pkgname-doc $pkgname-dev" > > +makedepends=3D"$depends_dev groff perl" > > +source=3D"http://curl.haxx.se/download/$pkgname-$pkgver.tar.bz2" > > +subpackages=3D"$pkgname-doc $pkgname-dev libcurl > $pkgname-zsh-completion:zshcomp" > > > > -_builddir=3D"$srcdir/$pkgname-$pkgver" > > - > > -prepare() { > > - local i > > - cd "$_builddir" > > - for i in $source; do > > - case $i in > > - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; > > - esac > > - done > > -} > > i like to keep the prepare function in case we need to add a patch > later. > > For example see commit: > > http://git.alpinelinux.org/cgit/aports/commit/?id=3D81070afb94cd7454dd87c= adfb0d0faed7e556de8 > > I spent almost a day to debug the issue that commit is supposed to > solve. However, the patch was actually not applied: > > > http://git.alpinelinux.org/cgit/aports/commit/?id=3Dd836f6e8fb1d5165bf708= 39a7c953a56568848d7 > > So, I prefer to keep it unless there is a good reason to remove it. > > > > +_builddir=3D"$srcdir"/$pkgname-$pkgver > > build() { > > cd "$_builddir" > > ./configure \ > > --build=3D$CBUILD \ > > --host=3D$CHOST \ > > --prefix=3D/usr \ > > - --mandir=3D/usr/share/man \ > > - --without-libidn \ > > --enable-ipv6 \ > > --enable-unix-sockets \ > > - --disable-ldap \ > > I don't like removing the --disable-* things. It will prevent to > unintentionally link against ldap and libidn in case it happens to be > installed at developer box. > > otherwise i think its ok. > > > > + --disable-static \ > > || return 1 > > make || return 1 > > } > > @@ -44,6 +33,21 @@ package() { > > make DESTDIR=3D"$pkgdir" install || return 1 > > } > > > > +libcurl() { > > + pkgdesc=3D"The multiprotocol file transfer library" > > + mkdir -p "$subpkgdir"/usr > > + mv "$pkgdir"/usr/lib "$subpkgdir"/usr > > +} > > + > > +zshcomp() { > > + pkgdesc=3D"Zsh completion for $pkgname" > > + arch=3D"noarch" > > + depends=3D"" > > + install_if=3D"$pkgname=3D$pkgver-r$pkgrel zsh" > > + mkdir -p "$subpkgdir"/usr/ > > + mv "$pkgdir"/usr/share "$subpkgdir"/usr > > +} > > + > > md5sums=3D"9979f989a2a9930d10f1b3deeabc2148 curl-7.46.0.tar.bz2" > > > sha256sums=3D"b7d726cdd8ed4b6db0fa1b474a3c59ebbbe4dcd4c61ac5e7ade0e0270d3= 195ad > curl-7.46.0.tar.bz2" > > > sha512sums=3D"ff47216a2b4a2d14a2e98e0e87867897a9bf059c58d2d73aa47a69ccd94= 977367e2de15bea641abfb00e236a8b016ee869675c2cc702f7919da5fe612bd8b5e1 > curl-7.46.0.tar.bz2" > > --001a11403d146f5dca052a280770 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Ok, I'll made v2 commit =D1=81onsidering your comments

2016-01-25 14:44 GMT+02:00 Natanael Copa <ncopa@alpin= elinux.org>:
On Mon, 25 Jan 2016 14:00:30 +0200
Valery Kartel <valery.kartel@= gmail.com> wrote:

> - remove unused patch
> - move libcurl and zsh completion to subpackages
> ---
>=C2=A0 ...-generate-code-for-disable-manual-as-well.patch | 42 --------= --------------
>=C2=A0 main/curl/APKBUILD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| = 40 +++++++++++----------
>=C2=A0 2 files changed, 22 insertions(+), 60 deletions(-)
>=C2=A0 delete mode 100644 main/curl/0001-mkhelp-generate-code-for-disab= le-manual-as-well.patch
>
> diff --git a/main/curl/0001-mkhelp-generate-code-for-disable-manual-as= -well.patch b/main/curl/0001-mkhelp-generate-code-for-disable-manual-as-wel= l.patch
> deleted file mode 100644
> index d23b484..0000000
> --- a/main/curl/0001-mkhelp-generate-code-for-disable-manual-as-well.p= atch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -From 38d582ff541353d738858299d4a2b78bafac03ed Mon Sep 17 00:00:00 200= 1
> -From: Daniel Stenberg <daniel@ha= xx.se>
> -Date: Wed, 26 Mar 2014 13:22:10 +0100
> -Subject: [PATCH] mkhelp: generate code for --disable-manual as well > -
> -This allows configure --disable-manual to run and build without havin= g
> -to regenerate the src/tool_hugehelp.c file which otherwise is necessa= ry
> -since we ship tarballs with that file present.
> -
> -Reported-by: Remi Gacogne
> -Bug: http://curl.haxx.se/bug/view.cgi?id=3D1350<= br> > ----
> - src/mkhelp.pl | 6 +++++-
> - 1 file changed, 5 insertions(+), 1 deletion(-)
> -
> -diff --git a/src/mkhelp.pl b/src/mkhelp.pl
> -index 444b669..7ed86f7 100644
> ---- a/src/mkhelp.pl
> -+++ b/src/mkhelp.pl
> -@@ -6,7 +6,7 @@
> - #=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | (__| |_| |=C2=A0 _ <| |___
> - #=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0\___|\___/|_| \_\_____|
> - #
> --# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
> -+# Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
> - #
> - # This software is licensed as described in the file COPYING, which<= br> > - # you should have received as part of this distribution. The terms > -@@ -256,6 +256,10 @@ foot();
> -
> - sub foot {
> -=C2=A0 =C2=A0print <<FOOT
> -+#else /* !USE_MANUAL */
> -+/* built-in manual is disabled, blank function */
> -+#include "tool_hugehelp.h"
> -+void hugehelp(void) {}
> - #endif /* USE_MANUAL */
> - FOOT
> -=C2=A0 =C2=A0;
> ---
> -1.9.1
> -
> diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
> index 4962d9e..87f476d 100644
> --- a/main/curl/APKBUILD
> +++ b/main/curl/APKBUILD
> @@ -1,40 +1,29 @@
> +# Contributor: Valery Kartel <valery.kartel@gmail.com>
>=C2=A0 # Contributor: =C3=85 ukasz Jendrysik <scadu@yandex.com>
>=C2=A0 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
>=C2=A0 pkgname=3Dcurl
>=C2=A0 pkgver=3D7.46.0
> -pkgrel=3D1
> +pkgrel=3D2
>=C2=A0 pkgdesc=3D"An URL retrival utility and library"
>=C2=A0 url=3D"http://curl.haxx.se"
>=C2=A0 arch=3D"all"
>=C2=A0 license=3D"MIT"
>=C2=A0 depends=3D"ca-certificates"
>=C2=A0 depends_dev=3D"zlib-dev openssl-dev libssh2-dev"
> -makedepends=3D"groff $depends_dev perl"
> -source=3D"http://curl.haxx.se/download/c= url-$pkgver.tar.bz2"
> -subpackages=3D"$pkgname-doc $pkgname-dev"
> +makedepends=3D"$depends_dev groff perl"
> +source=3D"http://curl.haxx.se/downlo= ad/$pkgname-$pkgver.tar.bz2"
> +subpackages=3D"$pkgname-doc $pkgname-dev libcurl $pkgname-zsh-co= mpletion:zshcomp"
>
> -_builddir=3D"$srcdir/$pkgname-$pkgver"
> -
> -prepare() {
> -=C2=A0 =C2=A0 =C2=A0local i
> -=C2=A0 =C2=A0 =C2=A0cd "$_builddir"
> -=C2=A0 =C2=A0 =C2=A0for i in $source; do
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case $i in
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*.patch) msg $i; patc= h -p1 -i "$srcdir"/$i || return 1;;
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0esac
> -=C2=A0 =C2=A0 =C2=A0done
> -}

i like to keep the prepare function in case we need to add a pa= tch
later.

For example see commit:
http://g= it.alpinelinux.org/cgit/aports/commit/?id=3D81070afb94cd7454dd87cadfb0d0fae= d7e556de8

I spent almost a day to debug the issue that commit is supposed to
solve. However, the patch was actually not applied:

http://g= it.alpinelinux.org/cgit/aports/commit/?id=3Dd836f6e8fb1d5165bf70839a7c953a5= 6568848d7

So, I prefer to keep it unless there is a good reason to remove it.


> +_builddir=3D"$srcdir"/$pkgname-$pkgver
>=C2=A0 build() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0cd "$_builddir"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0./configure \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--build=3D$CBUIL= D \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--host=3D$CHOST = \
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--prefix=3D/usr = \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--mandir=3D/usr/share= /man \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--without-libidn \ >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-ipv6 \<= br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--enable-unix-so= ckets \
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--disable-ldap \

I don't like removing the --disable-* things. It will prevent to=
unintentionally link against ldap and libidn in case it happens to be
installed at developer box.

otherwise i think its ok.


> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0--disable-static \ >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|| return 1
>=C2=A0 =C2=A0 =C2=A0 =C2=A0make || return 1
>=C2=A0 }
> @@ -44,6 +33,21 @@ package() {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0make DESTDIR=3D"$pkgdir" install |= | return 1
>=C2=A0 }
>
> +libcurl() {
> +=C2=A0 =C2=A0 =C2=A0pkgdesc=3D"The multiprotocol file transfer l= ibrary"
> +=C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr
> +=C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/lib "$subpkgdir&q= uot;/usr
> +}
> +
> +zshcomp() {
> +=C2=A0 =C2=A0 =C2=A0pkgdesc=3D"Zsh completion for $pkgname"=
> +=C2=A0 =C2=A0 =C2=A0arch=3D"noarch"
> +=C2=A0 =C2=A0 =C2=A0depends=3D""
> +=C2=A0 =C2=A0 =C2=A0install_if=3D"$pkgname=3D$pkgver-r$pkgrel zs= h"
> +=C2=A0 =C2=A0 =C2=A0mkdir -p "$subpkgdir"/usr/
> +=C2=A0 =C2=A0 =C2=A0mv "$pkgdir"/usr/share "$subpkgdir= "/usr
> +}
> +
>=C2=A0 md5sums=3D"9979f989a2a9930d10f1b3deeabc2148=C2=A0 curl-7.46= .0.tar.bz2"
>=C2=A0 sha256sums=3D"b7d726cdd8ed4b6db0fa1b474a3c59ebbbe4dcd4c61ac= 5e7ade0e0270d3195ad=C2=A0 curl-7.46.0.tar.bz2"
>=C2=A0 sha512sums=3D"ff47216a2b4a2d14a2e98e0e87867897a9bf059c58d2d= 73aa47a69ccd94977367e2de15bea641abfb00e236a8b016ee869675c2cc702f7919da5fe61= 2bd8b5e1=C2=A0 curl-7.46.0.tar.bz2"


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