X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-ua0-f182.google.com (mail-ua0-f182.google.com [209.85.217.182]) by lists.alpinelinux.org (Postfix) with ESMTP id 82DA75C5019 for ; Wed, 30 May 2018 09:28:33 +0000 (GMT) Received: by mail-ua0-f182.google.com with SMTP id 74-v6so1544184uav.1 for ; Wed, 30 May 2018 02:28:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=xLaw64mBuuX+3tWZhZo2qNYJ+VufEKJ4/89vTi3kumE=; b=eJd8ipkj8HIMLLkgzGb8JtjtmRfEjSDL03Ot4DFVGUr4NJJmy4M/5NciaGOSKHPj4T v0jSqud87EitlymT1bmPWySzY3VQkHI5s/NdntC4PcmmVdJ/Wmn6uNrGdIX6bSdBj+74 gss8Xo7bY+RM7d7r/LIEy2axqZtKWd/cyTHI3BYijsHwvtjDoo6aMKZZGafkwUZltWkR SJxYcHVNAQUdvOiT2CKL2QF21BDYURBK12zgqz/EEcWFsGV8MKh/pOoLhd/fHyNP6Rcu 1wH0VAKKHbmP+wRpADyQh0UqBuv1KxRBpJGSt8MVkwt1GrjAEO6txO7QJuRQTQjmg7A2 iExw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=xLaw64mBuuX+3tWZhZo2qNYJ+VufEKJ4/89vTi3kumE=; b=HgHofnHiunN/XQC4qMFvZeHYz4ViCYMEJJR3DaJsCCKQYu8tMB5t5o3SxRhdJKE1ZO DPbuRTqzPxQ20g7PRiTEKl5gf+QSrYhKE1P2NUsw1w9ZJhHqAOAHU0VWn1kiUnyMr2aH to2Idp9VeY8BW38Ba9DDDVUvskNKsHnNEC//CCGW5CcD5OHLLdevMioxSWq36tbvSgt5 4wKH2AudgH+mH8u/YdCRiMz6CvNdIfN0J1ndqV2G2v2xRQ7P9ZRiPg5O/6NMwrTUI4uW Iago5cWeNF1TOSKhKwlpiYnMKC74v+kblzN4QGbOI6spvZ6EFHcuBf4OAjlf4ofQCLrq ca7Q== X-Gm-Message-State: ALKqPweA7lErS1x9AANjRteEDH+K0k/GU2XPWyfVaIxQDyTBjlG7F40o 4q+c3XIY9uzeWpa5rVHJOA7I5QxBiyr2KpQbOsU= X-Google-Smtp-Source: ADUXVKIc7fy/0eAtjX5x5X5eEV5a0KCuecn7v4mfbZCe8VUejV4rsigUZI8mzg9DhhzDl/Bd9+aBfIuSK1uSm768wm4= X-Received: by 2002:ab0:5a72:: with SMTP id m47-v6mr1054616uad.37.1527672512929; Wed, 30 May 2018 02:28:32 -0700 (PDT) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Received: by 2002:ab0:5507:0:0:0:0:0 with HTTP; Wed, 30 May 2018 02:28:32 -0700 (PDT) In-Reply-To: <20180410063031.26674-1-jens@eisfair.org> References: <20180410063031.26674-1-jens@eisfair.org> From: Leonardo Arena Date: Wed, 30 May 2018 11:28:32 +0200 Message-ID: Subject: Re: [alpine-aports] [PATCH] syslog-ng release 3.14.1 with patches from issues list To: Jens Vehlhaber Cc: alpine-aports Content-Type: multipart/alternative; boundary="000000000000776396056d68f962" --000000000000776396056d68f962 Content-Type: text/plain; charset="UTF-8" Hi, sorry for the late review and thank you for your help. Please see comments below: On Tue, Apr 10, 2018 at 8:30 AM, Jens Vehlhaber wrote: > --- > main/syslog-ng/APKBUILD | 53 > ++++++++++++++++++++------------ > main/syslog-ng/issue1901.patch | 10 ++++++ > main/syslog-ng/pagesize.patch | 13 ++++++++ > main/syslog-ng/syslog-ng-destination.std | 12 ++++---- > main/syslog-ng/syslog-ng-options.std | 5 +++ > main/syslog-ng/syslog-ng-plugins.std | 3 +- > main/syslog-ng/syslog-ng-source.std | 2 -- > main/syslog-ng/syslog-ng.initd | 11 +++++-- > main/syslog-ng/syslog-ng.pre-upgrade | 4 +++ > 9 files changed, 81 insertions(+), 32 deletions(-) > create mode 100644 main/syslog-ng/issue1901.patch > create mode 100644 main/syslog-ng/pagesize.patch > create mode 100644 main/syslog-ng/syslog-ng.pre-upgrade > > diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD > index 9f1068840f..f1b9ad3b2d 100644 > --- a/main/syslog-ng/APKBUILD > +++ b/main/syslog-ng/APKBUILD > @@ -2,19 +2,21 @@ > # Contributor: Adrian Guenter > # Maintainer: jv > pkgname=syslog-ng > -pkgver=3.13.2 > -pkgrel=1 > +pkgver=3.14.1 > +pkgrel=0 > pkgdesc="Next generation logging daemon" > url="http://www.balabit.com" > arch="all !aarch64" > license="GPL-2.0" > -depends="" > +depends="tzdata" > depends_dev="glib-dev eventlog-dev pcre-dev libressl-dev python2-dev > hiredis-dev json-c-dev file" > makedepends="$depends_dev" > -install="$pkgname.post-install" > -subpackages="$pkgname-json" > +install="$pkgname.post-install $pkgname.pre-upgrade" > +subpackages="$pkgname-dev $pkgname-json" > > source="https://github.com/balabit/syslog-ng/releases/ > download/syslog-ng-${pkgver}/syslog-ng-${pkgver}.tar.gz > + pagesize.patch > + issue1901.patch > syslog-ng.logrotate > syslog-ng.initd > syslog-ng-destination.std > @@ -27,37 +29,46 @@ source="https://github.com/balabit/syslog-ng/releases/ > download/syslog-ng-${pkgve > > _builddir="$srcdir/${pkgname}-$pkgver" > Can you please rename "_builddir" into "builddir". It's an official abuild variable. > > +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 > +} > + > Here you can use "default_prepare" abuild function which does the same thing. > build() { > cd "$_builddir" > ./configure --prefix=/usr \ > --sysconfdir=/etc/syslog-ng \ > --localstatedir=/run \ > - --enable-extra-warnings \ > + --with-timezone-dir=/usr/share/zoneinfo \ > --with-librabbitmq-client=system \ > --enable-ipv6 \ > --enable-ssl \ > --disable-sql \ > --enable-redis \ > --disable-mongodb \ > - --enable-json > - make > + --enable-json \ > + --disable-python \ > + --disable-systemd \ > + || return 1 > + make || return 1 > } > > We use "set -e" in abuild, so no need to catch the errors. > check() { > cd "$_builddir" > + # 2 of 64 tests fail > make check || return 0 > } > > Is it possible to either fix the failing tests or patch the sources to do not run only the failing test? This essentially is like disabling the tests altogether. Thanks! /leo --000000000000776396056d68f962 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

sorry for the late review and thank = you for your help. Please see comments below:

On Tue, Apr 10, 2018 at 8:30 AM, Jens Vehlh= aber <jens@eisfair.org> wrote:
---
=C2=A0main/syslog-ng/APKBUILD=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 53 ++++++++++++++++++++------------
=C2=A0main/syslog-ng/issue1901.patch=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 10 ++++++
=C2=A0main/syslog-ng/pagesize.patch=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 13 ++++++++
=C2=A0main/syslog-ng/syslog-ng-destination.std | 12 ++++----
=C2=A0main/syslog-ng/syslog-ng-options.std=C2=A0 =C2=A0 =C2=A0|=C2=A0 = 5 +++
=C2=A0main/syslog-ng/syslog-ng-plugins.std=C2=A0 =C2=A0 =C2=A0|=C2=A0 = 3 +-
=C2=A0main/syslog-ng/syslog-ng-source.std=C2=A0 =C2=A0 =C2=A0 |=C2=A0 = 2 --
=C2=A0main/syslog-ng/syslog-ng.initd=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 11 +++++--
=C2=A0main/syslog-ng/syslog-ng.pre-upgrade=C2=A0 =C2=A0 =C2=A0|=C2=A0 = 4 +++
=C2=A09 files changed, 81 insertions(+), 32 deletions(-)
=C2=A0create mode 100644 main/syslog-ng/issue1901.patch
=C2=A0create mode 100644 main/syslog-ng/pagesize.patch
=C2=A0create mode 100644 main/syslog-ng/syslog-ng.pre-upgrade

diff --git a/main/syslog-ng/APKBUILD b/main/syslog-ng/APKBUILD
index 9f1068840f..f1b9ad3b2d 100644
--- a/main/syslog-ng/APKBUILD
+++ b/main/syslog-ng/APKBUILD
@@ -2,19 +2,21 @@
=C2=A0# Contributor: Adrian Guenter <a= drian@gntr.me>
=C2=A0# Maintainer: jv <jens@eisfair= .org>
=C2=A0pkgname=3Dsyslog-ng
-pkgver=3D3.13.2
-pkgrel=3D1
+pkgver=3D3.14.1
+pkgrel=3D0
=C2=A0pkgdesc=3D"Next generation logging daemon"
=C2=A0url=3D"http://www.balabit.com"
=C2=A0arch=3D"all !aarch64"
=C2=A0license=3D"GPL-2.0"
-depends=3D""
+depends=3D"tzdata"
=C2=A0depends_dev=3D"glib-dev eventlog-dev pcre-dev libressl-dev pytho= n2-dev hiredis-dev json-c-dev file"
=C2=A0makedepends=3D"$depends_dev"
-install=3D"$pkgname.post-install"
-subpackages=3D"$pkgname-json"
+install=3D"$pkgname.post-install $pkgname.pre-upgrade"
+subpackages=3D"$pkgname-dev $pkgname-json"

=C2=A0source=3D"https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${pkgver}/syslog-ng-${pkgver}.tar.gz
+=C2=A0 =C2=A0 pagesize.patch
+=C2=A0 =C2=A0 issue1901.patch
=C2=A0 =C2=A0 =C2=A0syslog-ng.logrotate
=C2=A0 =C2=A0 =C2=A0syslog-ng.initd
=C2=A0 =C2=A0 =C2=A0syslog-ng-destination.std
@@ -27,37 +29,46 @@ source=3D"https://github.com/balabit/syslog-ng/releases/download/sys= log-ng-${pkgve

=C2=A0_builddir=3D"$srcdir/${pkgname}-$pkgver"


Can you please rename "_builddir" into= "builddir". It's an official abuild variable.
=
=C2=A0

+prepare() {
+=C2=A0 =C2=A0 local i
+=C2=A0 =C2=A0 cd "$_builddir"
+=C2=A0 =C2=A0 for i in ${source}; do
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 case ${i} in
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0*.patch) msg ${i}; patch -p1 -i &= quot;$srcdir"/${i} || return 1;;
+=C2=A0 =C2=A0 =C2=A0 =C2=A0esac
+=C2=A0 =C2=A0 done
+}
+


Here you can use "default_pr= epare" abuild function which does the same thing.

= =C2=A0
=C2=A0build() {
=C2=A0 =C2=A0 =C2=A0cd "$_builddir"
=C2=A0 =C2=A0 =C2=A0./configure --prefix=3D/usr \
=C2=A0 =C2=A0 =C2=A0--sysconfdir=3D/etc/syslog-ng \
=C2=A0 =C2=A0 =C2=A0--localstatedir=3D/run \
-=C2=A0 =C2=A0 --enable-extra-warnings \
+=C2=A0 =C2=A0 --with-timezone-dir=3D/usr/share/zoneinfo \
=C2=A0 =C2=A0 =C2=A0--with-librabbitmq-client=3Dsystem \
=C2=A0 =C2=A0 =C2=A0--enable-ipv6 \
=C2=A0 =C2=A0 =C2=A0--enable-ssl \
=C2=A0 =C2=A0 =C2=A0--disable-sql \
=C2=A0 =C2=A0 =C2=A0--enable-redis \
=C2=A0 =C2=A0 =C2=A0--disable-mongodb \
-=C2=A0 =C2=A0 --enable-json
-=C2=A0 =C2=A0 make
+=C2=A0 =C2=A0 --enable-json \
+=C2=A0 =C2=A0 --disable-python \
+=C2=A0 =C2=A0 --disable-systemd \
+=C2=A0 =C2=A0 || return 1
+=C2=A0 =C2=A0 make || return 1
=C2=A0}



We use "set -e" in abuil= d, so no need to catch the errors.

=C2=A0
=C2=A0check() {
=C2=A0 =C2=A0 =C2=A0cd "$_builddir"
+=C2=A0 =C2=A0 # 2 of 64 tests fail
=C2=A0 =C2=A0 =C2=A0make check || return 0
=C2=A0}


Is it possible to either fix the faili= ng tests or patch the sources to do not run only the failing test?
This essentially is like disabling the tests altogether.
=C2=A0
Thanks!

/le= o
--000000000000776396056d68f962-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---