Mail archive
alpine-aports

Re: [alpine-aports] [PATCH] syslog-ng release 3.14.1 with patches from issues list

From: Leonardo Arena <rnalrd_at_gmail.com>
Date: Wed, 30 May 2018 11:28:32 +0200

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 <jens_at_eisfair.org> 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
> _at__at_ -2,19 +2,21 @@
> # Contributor: Adrian Guenter <adrian_at_gntr.me>
> # Maintainer: jv <jens_at_eisfair.org>
> 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
> _at__at_ -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



---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Wed May 30 2018 - 11:28:32 GMT