March 2018 - openSUSE Commits - openSUSE Mailing Lists

commit 000product for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2018-03-31 15:37:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Sat Mar 31 15:37:49 2018 rev:50 rq: version:unknown Sat Mar 31 15:37:44 2018 rev:49 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ _service:product_converter:openSUSE-Addon-NonOss-ftp-ftp-i586_x86_64.kiwi: same change _service:product_converter:openSUSE-Addon-NonOss-release.spec: same change ++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-dvd5-dvd-x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hissJm/_old 2018-03-31 15:38:05.035085730 +0200 +++ /var/tmp/diff_new_pack.hissJm/_new 2018-03-31 15:38:05.035085730 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE-Tumbleweed-Kubic___20180330" schemaversion="4.1"> +<image name="OBS__openSUSE-Tumbleweed-Kubic___20180331" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -35,9 +35,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20180330</productvar> + <productvar name="VERSION">20180331</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180330,openSUSE Tumbleweed Kubic</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180331,openSUSE Tumbleweed Kubic</productinfo> <productinfo name="LINGUAS">en_US </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> ++++++ _service:product_converter:openSUSE-Tumbleweed-Kubic-release.spec ++++++ --- /var/tmp/diff_new_pack.hissJm/_old 2018-03-31 15:38:05.051085150 +0200 +++ /var/tmp/diff_new_pack.hissJm/_new 2018-03-31 15:38:05.051085150 +0200 @@ -17,7 +17,7 @@ Name: openSUSE-Tumbleweed-Kubic-release -Version: 20180330 +Version: 20180331 Release: 0 Summary: openSUSE Tumbleweed Kubic License: GPL-2.0-or-later @@ -38,9 +38,9 @@ ExclusiveArch: %ix86 x86_64 ppc64le s390x aarch64 Provides: %name-%version Provides: product() = openSUSE-Tumbleweed-Kubic -Provides: product(openSUSE-Tumbleweed-Kubic) = 20180330-0 +Provides: product(openSUSE-Tumbleweed-Kubic) = 20180331-0 Provides: product-label() = openSUSE%20Tumbleweed%20Kubic -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180330 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Dtumbleweed%2Dkubic%3A20180331 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(openSUSE-Tumbleweed-Kubic) @@ -61,7 +61,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20180330-0 +Provides: product_flavor(openSUSE-Tumbleweed-Kubic) = 20180331-0 Summary: openSUSE Tumbleweed Kubic %description dvd @@ -123,11 +123,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Tumbleweed-Kubic</name> - <version>20180330</version> + <version>20180331</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180330</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-tumbleweed-kubic:20180331</cpeid> <productline>openSUSE-Tumbleweed-Kubic</productline> <register> <pool> ++++++ _service:product_converter:openSUSE-cd-mini-i586.kiwi ++++++ --- /var/tmp/diff_new_pack.hissJm/_old 2018-03-31 15:38:05.075084280 +0200 +++ /var/tmp/diff_new_pack.hissJm/_new 2018-03-31 15:38:05.075084280 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20180330" schemaversion="4.1"> +<image name="OBS__openSUSE___20180331" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -32,9 +32,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20180330</productvar> + <productvar name="VERSION">20180331</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180330,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180331,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="INI_DIR">/usr/share/kiwi/modules/plugins/suse-tumbleweed</productoption> _service:product_converter:openSUSE-cd-mini-x86_64.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-i586.kiwi: same change _service:product_converter:openSUSE-dvd5-dvd-x86_64.kiwi: same change ++++++ _service:product_converter:openSUSE-ftp-ftp-i586_x86_64.kiwi ++++++ --- /var/tmp/diff_new_pack.hissJm/_old 2018-03-31 15:38:05.159081234 +0200 +++ /var/tmp/diff_new_pack.hissJm/_new 2018-03-31 15:38:05.163081089 +0200 @@ -1,4 +1,4 @@ -<image name="OBS__openSUSE___20180330" schemaversion="4.1"> +<image name="OBS__openSUSE___20180331" schemaversion="4.1"> <description type="system"> <author>The SUSE Team</author> <contact>build(a)opensuse.org</contact> @@ -24,7 +24,7 @@ <productvar name="DISTNAME">openSUSE</productvar> <productvar name="FLAVOR">ftp</productvar> <productvar name="MAKE_LISTINGS">true</productvar> - <productvar name="MEDIUM_NAME">openSUSE-20180330-i586-x86_64</productvar> + <productvar name="MEDIUM_NAME">openSUSE-20180331-i586-x86_64</productvar> <productvar name="MULTIPLE_MEDIA">true</productvar> <productvar name="PRODUCT_DIR">/</productvar> <productvar name="PRODUCT_NAME">$DISTNAME-$FLAVOR</productvar> @@ -36,9 +36,9 @@ <productvar name="SEPARATE_MEDIA">true</productvar> <productvar name="SHA1OPT">-x -2</productvar> <productvar name="VENDOR">openSUSE</productvar> - <productvar name="VERSION">20180330</productvar> + <productvar name="VERSION">20180331</productvar> <productinfo name="CONTENTSTYLE">11</productinfo> - <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180330,openSUSE Tumbleweed</productinfo> + <productinfo name="DISTRO">cpe:/o:opensuse:opensuse:20180331,openSUSE Tumbleweed</productinfo> <productinfo name="LINGUAS">cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW </productinfo> <productinfo name="VENDOR">openSUSE</productinfo> <productoption name="DEBUGMEDIUM">2</productoption> ++++++ _service:product_converter:openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.hissJm/_old 2018-03-31 15:38:05.203079639 +0200 +++ /var/tmp/diff_new_pack.hissJm/_new 2018-03-31 15:38:05.223078914 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20180330 +Version: 20180331 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -51,7 +51,7 @@ Obsoletes: aaa_version Obsoletes: openSUSE-Promo-release <= 11.1 Obsoletes: openSUSE-release-live <= 11.0 -Obsoletes: product_flavor(%{product}) < 20180330 +Obsoletes: product_flavor(%{product}) < 20180331 # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -61,7 +61,7 @@ Provides: weakremover(kernel-xen) < 3.11 Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20180330-0 +Provides: product(openSUSE) = 20180331-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -75,7 +75,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180330 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20180331 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -12857,7 +12857,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description ftp @@ -12872,7 +12872,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description mini @@ -12887,7 +12887,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description dvd @@ -12902,7 +12902,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description livecd-kde @@ -12917,7 +12917,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description livecd-x11 @@ -12932,7 +12932,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description livecd-gnome @@ -12947,7 +12947,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description usb-kde @@ -12962,7 +12962,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description usb-gnome @@ -12977,7 +12977,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20180330-0 +Provides: product_flavor(openSUSE) = 20180331-0 Summary: openSUSE Tumbleweed %description usb-x11 @@ -13050,10 +13050,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20180330</version> + <version>20180331</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20180330</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20180331</cpeid> <productline>openSUSE</productline> <register> <pool> openSUSE-release.spec: same change ++++++ openSUSE-Tumbleweed-Kubic.product ++++++ --- /var/tmp/diff_new_pack.hissJm/_old 2018-03-31 15:38:05.495069052 +0200 +++ /var/tmp/diff_new_pack.hissJm/_new 2018-03-31 15:38:05.495069052 +0200 @@ -6,7 +6,7 @@ <name>openSUSE-Tumbleweed-Kubic</name> <releasepkgname>openSUSE-Tumbleweed-Kubic-release</releasepkgname> <endoflife/> - <version>20180330</version> + <version>20180331</version>  <release>0</release> <productline>openSUSE-Tumbleweed-Kubic</productline> ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.hissJm/_old 2018-03-31 15:38:05.515068326 +0200 +++ /var/tmp/diff_new_pack.hissJm/_new 2018-03-31 15:38:05.519068181 +0200 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20180330</version> + <version>20180331</version> <release>0</release> <productline>openSUSE</productline>

1 0

commit recidivm for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package recidivm for openSUSE:Factory checked in at 2018-03-31 15:37:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/recidivm (Old) and /work/SRC/openSUSE:Factory/.recidivm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "recidivm" Sat Mar 31 15:37:43 2018 rev:2 rq:592740 version:0.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/recidivm/recidivm.changes 2017-09-28 12:34:46.660681323 +0200 +++ /work/SRC/openSUSE:Factory/.recidivm.new/recidivm.changes 2018-03-31 15:38:02.099192183 +0200 @@ -1,0 +2,12 @@ +Mon Mar 12 18:49:05 UTC 2018 - sebix+novell.com(a)sebix.at + +- update to version 0.1.4: + * Don't allow mixing options with positional arguments. + +------------------------------------------------------------------- +Wed Nov 8 20:39:30 UTC 2017 - sebix+novell.com(a)sebix.at + +- update to version 0.1.3: + * build system improvements + +------------------------------------------------------------------- Old: ---- recidivm-0.1.2.tar.gz recidivm-0.1.2.tar.gz.asc New: ---- recidivm-0.1.4.tar.gz recidivm-0.1.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ recidivm.spec ++++++ --- /var/tmp/diff_new_pack.P98aXu/_old 2018-03-31 15:38:02.871164192 +0200 +++ /var/tmp/diff_new_pack.P98aXu/_new 2018-03-31 15:38:02.875164047 +0200 @@ -1,7 +1,7 @@ # # spec file for package recidivm # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: recidivm -Version: 0.1.2 +Version: 0.1.4 Release: 0 Summary: Tool for estimating peak virtual memory use License: MIT @@ -38,8 +38,10 @@ make %{?_smp_mflags} %install -install -Dm 755 %{name} -t %{buildroot}%{_bindir} -install -Dm 644 doc/%{name}.1 -t %{buildroot}%{_mandir}/man1/ +%make_install PREFIX=%{_prefix} + +%check +make %{?_smp_mflags} test %files %doc doc/changelog ++++++ recidivm-0.1.2.tar.gz -> recidivm-0.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/recidivm-0.1.2/Makefile new/recidivm-0.1.4/Makefile --- old/recidivm-0.1.2/Makefile 2017-09-24 11:01:09.000000000 +0200 +++ new/recidivm-0.1.4/Makefile 2018-03-12 17:07:54.000000000 +0100 @@ -1,12 +1,25 @@ CFLAGS ?= -g -O2 CFLAGS += -Wall -Wextra -Wconversion -CFLAGS += $(shell getconf LFS_CFLAGS) -LDFLAGS += $(shell getconf LFS_LDFLAGS) -LDLIBS += $(shell getconf LFS_LIBS) +CFLAGS += -D_FILE_OFFSET_BITS=64 .PHONY: all all: recidivm +.PHONY: install +install: recidivm + install -d $(DESTDIR)$(PREFIX)/bin + install -m755 $(<) $(DESTDIR)$(PREFIX)/bin/$(<) +ifeq "$(wildcard .git doc/recidivm.1)" ".git" + # run "$(MAKE) -C doc" to build the manpage +else + install -d $(DESTDIR)$(PREFIX)/share/man/man1 + install -m644 doc/recidivm.1 $(DESTDIR)$(PREFIX)/share/man/man1/recidivm.1 +endif + +.PHONY: test +test: recidivm + ./recidivm -v -- true + .PHONY: clean clean: rm -f recidivm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/recidivm-0.1.2/doc/changelog new/recidivm-0.1.4/doc/changelog --- old/recidivm-0.1.2/doc/changelog 2017-09-24 11:01:09.000000000 +0200 +++ new/recidivm-0.1.4/doc/changelog 2018-03-12 17:07:54.000000000 +0100 @@ -1,3 +1,19 @@ +recidivm (0.1.4) unstable; urgency=low + + * Fix build failure on OpenBSD. + * Don't allow mixing options with positional arguments. + + -- Jakub Wilk <jwilk(a)jwilk.net> Mon, 12 Mar 2018 17:07:46 +0100 + +recidivm (0.1.3) unstable; urgency=low + + * Improve the build system: + + Add “install” target. + + Add “test” target. + + Don't use getconf(1) to acquire LFS build flags. + + -- Jakub Wilk <jwilk(a)jwilk.net> Wed, 08 Nov 2017 20:43:09 +0100 + recidivm (0.1.2) unstable; urgency=low * In the first step, set virtual memory limit to 32 TiB (slightly above the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/recidivm-0.1.2/doc/recidivm.1 new/recidivm-0.1.4/doc/recidivm.1 --- old/recidivm-0.1.2/doc/recidivm.1 2017-09-24 11:01:16.000000000 +0200 +++ new/recidivm-0.1.4/doc/recidivm.1 2018-03-12 17:08:14.000000000 +0100 @@ -67,7 +67,7 @@ .\" ======================================================================== .\" .IX Title "RECIDIVM 1" -.TH RECIDIVM 1 "2017-09-24" "recidivm 0.1.2" "" +.TH RECIDIVM 1 "2018-03-12" "recidivm 0.1.4" "" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/recidivm-0.1.2/recidivm.c new/recidivm-0.1.4/recidivm.c --- old/recidivm-0.1.2/recidivm.c 2017-09-24 11:01:09.000000000 +0200 +++ new/recidivm-0.1.4/recidivm.c 2018-03-12 17:07:54.000000000 +0100 @@ -32,6 +32,10 @@ #include <sys/wait.h> #include <unistd.h> +#ifndef RLIMIT_AS +#define RLIMIT_AS RLIMIT_DATA +#endif + void usage(bool explicit) { fprintf(stderr, "Usage: recidivm [-cpv] [-u B|K|M] -- <command> [argument...]\n"); @@ -176,7 +180,7 @@ } rlim_t step = (rlim_t) lstep; while (1) { - int opt = getopt(argc, argv, "hcpu:v"); + int opt = getopt(argc, argv, "+hcpu:v"); if (opt == -1) break; switch (opt) {

1 0

commit axel for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package axel for openSUSE:Factory checked in at 2018-03-31 15:37:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/axel (Old) and /work/SRC/openSUSE:Factory/.axel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "axel" Sat Mar 31 15:37:37 2018 rev:4 rq:592739 version:2.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/axel/axel.changes 2017-11-27 22:18:54.177563652 +0100 +++ /work/SRC/openSUSE:Factory/.axel.new/axel.changes 2018-03-31 15:38:00.883236273 +0200 @@ -1,0 +2,6 @@ +Sat Mar 10 08:47:25 UTC 2018 - sebix+novell.com(a)sebix.at + +- update to version 2.16.1: + * no noteable changes + +------------------------------------------------------------------- Old: ---- axel-2.16.tar.xz New: ---- axel-2.16.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ axel.spec ++++++ --- /var/tmp/diff_new_pack.NOi0zO/_old 2018-03-31 15:38:01.819202336 +0200 +++ /var/tmp/diff_new_pack.NOi0zO/_new 2018-03-31 15:38:01.823202190 +0200 @@ -1,7 +1,7 @@ # # spec file for package axel # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ %{!?license: %global license %doc} Name: axel -Version: 2.16 +Version: 2.16.1 Release: 0 Summary: Lightweight Download Accelerator -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Other Url: http://axel.alioth.debian.org/ Source: https://github.com/axel-download-accelerator/axel/releases/download/v%{vers… ++++++ axel-2.16.tar.xz -> axel-2.16.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/CREDITS new/axel-2.16.1/CREDITS --- old/axel-2.16/CREDITS 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/CREDITS 2017-12-05 06:16:05.000000000 +0100 @@ -1,3 +1,11 @@ +2.16.1 version: + +- Changes in source code by: + + * Ismael Luceno <ismael(a)iodev.co.uk> + + Read the ChangeLog to see the changes. + 2.16 version: - Changes in source code by: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/ChangeLog new/axel-2.16.1/ChangeLog --- old/axel-2.16/ChangeLog 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/ChangeLog 2017-12-05 06:16:05.000000000 +0100 @@ -1,3 +1,11 @@ +Version: 2.16.1, 2017-12-05 + + [ Ismael Luceno ] + +* Fixed building against static OpenSSL + + + Version: 2.16, 2017-11-25 [ Ismael Luceno ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/Makefile.in new/axel-2.16.1/Makefile.in --- old/axel-2.16/Makefile.in 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/Makefile.in 2017-12-05 06:16:05.000000000 +0100 @@ -96,6 +96,7 @@ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/VERSION \ \ + \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -198,7 +199,7 @@ am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \ $(srcdir)/config.h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ INSTALL NEWS README compile config.guess config.rpath \ - config.sub install-sh missing + config.sub depcomp install-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -297,9 +298,14 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SSL_CFLAGS = @SSL_CFLAGS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/VERSION new/axel-2.16.1/VERSION --- old/axel-2.16/VERSION 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/VERSION 2017-12-05 06:16:05.000000000 +0100 @@ -1 +1 @@ -2.16 2017-11-25T03:52:38Z +2.16.1 2017-12-05T05:16:05Z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/aclocal.m4 new/axel-2.16.1/aclocal.m4 --- old/axel-2.16/aclocal.m4 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/aclocal.m4 2017-12-05 06:16:05.000000000 +0100 @@ -20,6 +20,282 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) + +dnl Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. +dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists(a)gmail.com> +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $2]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR + # Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/configure new/axel-2.16.1/configure --- old/axel-2.16/configure 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/configure 2017-12-05 06:16:05.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for axel 2.16. +# Generated by GNU Autoconf 2.69 for axel 2.16.1. # # Report bugs to <https://github.com/axel-download-accelerator/axel/issues>. # @@ -581,8 +581,8 @@ # Identity of this package. PACKAGE_NAME='axel' PACKAGE_TARNAME='axel' -PACKAGE_VERSION='2.16' -PACKAGE_STRING='axel 2.16' +PACKAGE_VERSION='2.16.1' +PACKAGE_STRING='axel 2.16.1' PACKAGE_BUGREPORT='https://github.com/axel-download-accelerator/axel/issues' PACKAGE_URL= @@ -653,6 +653,8 @@ MSGFMT GETTEXT_MACRO_VERSION USE_NLS +SSL_LIBS +SSL_CFLAGS EGREP GREP CPP @@ -673,6 +675,9 @@ LDFLAGS CFLAGS CC +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V @@ -754,12 +759,17 @@ ac_precious_vars='build_alias host_alias target_alias +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR CC CFLAGS LDFLAGS LIBS CPPFLAGS -CPP' +CPP +SSL_CFLAGS +SSL_LIBS' # Initialize some variables set by options. @@ -1300,7 +1310,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures axel 2.16 to adapt to many kinds of systems. +\`configure' configures axel 2.16.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1370,7 +1380,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of axel 2.16:";; + short | recursive ) echo "Configuration of axel 2.16.1:";; esac cat <<\_ACEOF @@ -1399,6 +1409,11 @@ --without-libintl-prefix don't search for libintl in includedir and libdir Some influential environment variables: + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path CC C compiler command CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a @@ -1407,6 +1422,8 @@ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if you have headers in a nonstandard directory <include dir> CPP C preprocessor + SSL_CFLAGS C compiler flags for SSL, overriding pkg-config + SSL_LIBS linker flags for SSL, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1474,7 +1491,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -axel configure 2.16 +axel configure 2.16.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1951,7 +1968,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by axel $as_me 2.16, which was +It was created by axel $as_me 2.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2820,7 +2837,7 @@ # Define the identity of the package. PACKAGE='axel' - VERSION='2.16' + VERSION='2.16.1' cat >>confdefs.h <<_ACEOF @@ -2914,6 +2931,126 @@ fi + + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -4171,8 +4308,10 @@ fi -if test "x$ac_cv_prog_cc_c99" = "xno"; then +if test "x$ac_cv_prog_cc_c99" = "xno"; then : + as_fn_error $? "C99 compiler required" "$LINENO" 5 + fi @@ -4828,128 +4967,99 @@ if test "x$with_ssl" != xno; then : -$as_echo "#define HAVE_SSL 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_new" >&5 -$as_echo_n "checking for library containing SSL_new... " >&6; } -if ${ac_cv_search_SSL_new+:} false; then : - $as_echo_n "(cached) " >&6 +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5 +$as_echo_n "checking for openssl... " >&6; } + +if test -n "$SSL_CFLAGS"; then + pkg_cv_SSL_CFLAGS="$SSL_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$SSL_LIBS"; then + pkg_cv_SSL_LIBS="$SSL_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5 + ($PKG_CONFIG --exists --print-errors "openssl") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SSL_new (); -int -main () -{ -return SSL_new (); - ; - return 0; -} -_ACEOF -for ac_lib in '' ssl; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_SSL_new=$ac_res + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_SSL_new+:} false; then : - break + else + pkg_failed=untried fi -done -if ${ac_cv_search_SSL_new+:} false; then : -else - ac_cv_search_SSL_new=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_SSL_new" >&5 -$as_echo "$ac_cv_search_SSL_new" >&6; } -ac_res=$ac_cv_search_SSL_new -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -else - as_fn_error $? "libssl not found" "$LINENO" 5 +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + SSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "openssl" 2>&1` + else + SSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "openssl" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SSL_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ERR_get_error" >&5 -$as_echo_n "checking for library containing ERR_get_error... " >&6; } -if ${ac_cv_search_ERR_get_error+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + as_fn_error $? "Package requirements (openssl) were not met: -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ERR_get_error (); -int -main () -{ -return ERR_get_error (); - ; - return 0; -} -_ACEOF -for ac_lib in '' crypto; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_ERR_get_error=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_ERR_get_error+:} false; then : - break -fi -done -if ${ac_cv_search_ERR_get_error+:} false; then : +$SSL_PKG_ERRORS -else - ac_cv_search_ERR_get_error=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ERR_get_error" >&5 -$as_echo "$ac_cv_search_ERR_get_error" >&6; } -ac_res=$ac_cv_search_ERR_get_error -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -else +Alternatively, you may set the environment variables SSL_CFLAGS +and SSL_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables SSL_CFLAGS +and SSL_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - as_fn_error $? "libcrypto not found" "$LINENO" 5 +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } +else + SSL_CFLAGS=$pkg_cv_SSL_CFLAGS + SSL_LIBS=$pkg_cv_SSL_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi +$as_echo "#define HAVE_SSL 1" >>confdefs.h + else { $as_echo "$as_me:${as_lineno-$LINENO}: SSL support disabled" >&5 @@ -7844,7 +7954,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by axel $as_me 2.16, which was +This file was extended by axel $as_me 2.16.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7910,7 +8020,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -axel config.status 2.16 +axel config.status 2.16.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/configure.ac new/axel-2.16.1/configure.ac --- old/axel-2.16/configure.ac 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/configure.ac 2017-12-05 06:16:05.000000000 +0100 @@ -7,6 +7,7 @@ # This file is under same license of Axel AC_PREREQ([2.69]) +PKG_PREREQ([0.29]) AXEL_PKG([axel], [https://github.com/axel-download-accelerator/axel/issues] AXEL_VER_READ([VERSION]) @@ -16,15 +17,16 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE +PKG_PROG_PKG_CONFIG AM_SILENT_RULES([yes]) # Checks for programs. AC_PROG_CC AC_PROG_CC_C99 -if test "x$ac_cv_prog_cc_c99" = "xno"; then +AS_IF([test "x$ac_cv_prog_cc_c99" = "xno"], [ AC_MSG_ERROR([C99 compiler required]) -fi +]) AC_PROG_INSTALL @@ -82,13 +84,8 @@ AC_HELP_STRING([--without-ssl],[disable TLS support]), [], [with_ssl=yes]) AS_IF([test "x$with_ssl" != xno], [ + PKG_CHECK_MODULES([SSL], [openssl]) AC_DEFINE([HAVE_SSL], [1], [SSL]) - AC_SEARCH_LIBS([SSL_new], [ssl], [], [ - AC_MSG_ERROR([libssl not found]) - ]) - AC_SEARCH_LIBS([ERR_get_error], [crypto], [], [ - AC_MSG_ERROR([libcrypto not found]) - ]) ], AC_MSG_NOTICE([SSL support disabled])) # Add Gettext diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/src/Makefile.am new/axel-2.16.1/src/Makefile.am --- old/axel-2.16/src/Makefile.am 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/src/Makefile.am 2017-12-05 06:16:05.000000000 +0100 @@ -19,5 +19,7 @@ tcp.h \ text.c +axel_LDADD = $(SSL_LIBS) + AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\" AM_CPPFLAGS += -D_BSD_SOURCE -D_DEFAULT_SOURCE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/axel-2.16/src/Makefile.in new/axel-2.16.1/src/Makefile.in --- old/axel-2.16/src/Makefile.in 2017-11-25 04:52:38.000000000 +0100 +++ new/axel-2.16.1/src/Makefile.in 2017-12-05 06:16:05.000000000 +0100 @@ -98,6 +98,7 @@ $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/VERSION \ \ + \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -112,7 +113,8 @@ ftp.$(OBJEXT) http.$(OBJEXT) search.$(OBJEXT) ssl.$(OBJEXT) \ tcp.$(OBJEXT) text.$(OBJEXT) axel_OBJECTS = $(am_axel_OBJECTS) -axel_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +axel_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -222,9 +224,14 @@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +SSL_CFLAGS = @SSL_CFLAGS@ +SSL_LIBS = @SSL_LIBS@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -301,6 +308,7 @@ tcp.h \ text.c +axel_LDADD = $(SSL_LIBS) AM_CPPFLAGS = -DLOCALEDIR=\""$(localedir)"\" -D_BSD_SOURCE \ -D_DEFAULT_SOURCE all: all-am

1 0

commit platformsh-cli for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2018-03-31 15:37:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old) and /work/SRC/openSUSE:Factory/.platformsh-cli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "platformsh-cli" Sat Mar 31 15:37:34 2018 rev:42 rq:592686 version:3.31.5 Changes: -------- --- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2018-03-29 11:57:57.753280198 +0200 +++ /work/SRC/openSUSE:Factory/.platformsh-cli.new/platformsh-cli.changes 2018-03-31 15:37:58.647317345 +0200 @@ -1,0 +2,10 @@ +Sat Mar 31 00:59:13 UTC 2018 - jimmy(a)boombatower.com + +- Update to version 3.31.5: + * Release v3.31.5 + * [bot] add --party and --parrot options + * Add application.date_format to README + * Add application.date_format config option + * Smarter environment cache + +------------------------------------------------------------------- Old: ---- platformsh-cli-3.31.4.tar.xz New: ---- platformsh-cli-3.31.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ platformsh-cli.spec ++++++ --- /var/tmp/diff_new_pack.P0qTXn/_old 2018-03-31 15:37:59.899271950 +0200 +++ /var/tmp/diff_new_pack.P0qTXn/_new 2018-03-31 15:37:59.899271950 +0200 @@ -17,7 +17,7 @@ Name: platformsh-cli -Version: 3.31.4 +Version: 3.31.5 Release: 0 Summary: Tool for managing Platform.sh services from the command line # See licenses.txt for dependency licenses. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.P0qTXn/_old 2018-03-31 15:37:59.931270790 +0200 +++ /var/tmp/diff_new_pack.P0qTXn/_new 2018-03-31 15:37:59.931270790 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">refs/tags/v3.31.4</param> + <param name="revision">refs/tags/v3.31.5</param> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.P0qTXn/_old 2018-03-31 15:37:59.951270065 +0200 +++ /var/tmp/diff_new_pack.P0qTXn/_new 2018-03-31 15:37:59.955269920 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> - <param name="changesrevision">4ef5eb28776e289a4e8131b7dfb192dded4ed5b3</param> + <param name="changesrevision">6602a8a0720a2208c777e2cf892fe130f274aaf6</param> </service> </servicedata> ++++++ platformsh-cli-3.31.4.tar.xz -> platformsh-cli-3.31.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/README.md new/platformsh-cli-3.31.5/README.md --- old/platformsh-cli-3.31.4/README.md 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/README.md 2018-03-30 17:03:36.000000000 +0200 @@ -222,6 +222,9 @@ # 'browser'). login_method: browser + # The default date format string. For a list of formats, see: http://php.net/manual/en/function.date.php + date_format: c + local: # Set this to true to avoid some Windows symlink issues. copy_on_windows: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/config.yaml new/platformsh-cli-3.31.5/config.yaml --- old/platformsh-cli-3.31.4/config.yaml 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/config.yaml 2018-03-30 17:03:36.000000000 +0200 @@ -1,7 +1,7 @@ # Metadata about the CLI application itself. application: name: 'Platform.sh CLI' - version: '3.31.4' + version: '3.31.5' executable: 'platform' package_name: 'platformsh/cli' installer_url: 'https://platform.sh/cli/installer' @@ -17,6 +17,11 @@ # This can be overridden in the user config file. login_method: browser + # The default date format string. This can be overridden in the user config + # file, or by the --date-fmt option. For a list of formats, see: + # http://php.net/manual/en/function.date.php + date_format: c + # Disabled commands (a list of full command names). disabled_commands: [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/dist/manifest.json new/platformsh-cli-3.31.5/dist/manifest.json --- old/platformsh-cli-3.31.4/dist/manifest.json 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/dist/manifest.json 2018-03-30 17:03:36.000000000 +0200 @@ -1,10 +1,10 @@ [ { "name": "platform.phar", - "sha1": "e65c563a5f4ebca95c3f40d04b2f1cc1d5479f84", - "sha256": "e460d8c574664e236bf58ddba2899d9a46a0205bf68f956a554d0b23880cd44e", - "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.31.4/plat…", - "version": "3.31.4", + "sha1": "7e194e6a78ae62e53e46cf0995b9f04c00e18c1c", + "sha256": "d530dfe7e98b592be2e2b878c62e8ea8341319aabe982d5d318d3f53ceae2008", + "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.31.5/plat…", + "version": "3.31.5", "php": { "min": "5.5.9" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/0.txt new/platformsh-cli-3.31.5/resources/parrot/0.txt --- old/platformsh-cli-3.31.4/resources/parrot/0.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/0.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + .cccc;;cc;';c. + .,:dkdc:;;:c:,:d:. + .loc'.,cc::c:::,..;:. + .cl;....;dkdccc::,...c; + .c:,';:'..ckc',;::;....;c. + .c:'.,dkkoc:ok:;llllc,,c,';:. + .;c,';okkkkkkkk:;lllll,:kd;.;:,. + co..:kkkkkkkkkk:;llllc':kkc..oNc + .cl;.,oxkkkkkkkkkc,:cll;,okkc'.cO; + ;k:..ckkkkkkkkkkkl..,;,.;xkko:',l' + .,...';dkkkkkkkkkkd;.....ckkkl'.cO; + .,,:,.;oo:ckkkkkkkkkkkdoc;;cdkkkc..cd, + .cclo;,ccdkkl;llccdkkkkkkkkkkkkkkkd,.c; + .lol:;;okkkkkxooc::coodkkkkkkkkkkkko'.oc + .c:'..lkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkd,.oc + .lo;,:cdkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkd,.c; +,dx:..;lllllllllllllllllllllllllllllllllc'... +cNO;........................................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/1.txt new/platformsh-cli-3.31.5/resources/parrot/1.txt --- old/platformsh-cli-3.31.4/resources/parrot/1.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/1.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + .ckx;'........':c. + .,:c:::::oxxocoo::::,',. + .odc'..:lkkoolllllo;..;d, + ;c..:o:..;:..',;'.......;. + ,c..:0Xx::o:.,cllc:,'::,.,c. + ;c;lkXKXXXXl.;lllll;lKXOo;':c. + ,dc.oXXXXXXXXl.,lllll;lXXXXx,c0: + ;Oc.oXXXXXXXXo.':ll:;'oXXXXO;,l' + 'l;;kXXXXXXXXd'.'::'..dXXXXO;,l' + 'l;:0XXXXXXXX0x:...,:o0XXXXx,:x, + 'l;;kXXXXXXXXXKkol;oXXXXXXXO;oNc + ,c'..ckk0XXXXXXXXXX00XXXXXXX0:;o:. + .':;..:do::ooookXXXXXXXXXXXXXXXo..c; + .',',:co0XX0kkkxxOXXXXXXXXXXXXXXXOc..;l. + .:;'..oXXXXXXXXXXXXXXXXXXXXXXXXXXXXXko;';:. +.ldc..:oOXKXXXXXXKXXKXXXXXXXXXXXXXXXXXXXo..oc +:0o...:dxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxo,.:, +cNo........................................;' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/2.txt new/platformsh-cli-3.31.5/resources/parrot/2.txt --- old/platformsh-cli-3.31.4/resources/parrot/2.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/2.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + .cc;. ... .;c. + .,,cc:cc:lxxxl:ccc:;,. + .lo;...lKKklllookl..cO; + .cl;.,:'.okl;..''.;,..';:. + .:o;;dkd,.ll..,cc::,..,'.;:,. + co..lKKKkokl.':lloo;''ol..;dl. + .,c;.,xKKKKKKo.':llll;.'oOxl,.cl,. + cNo..lKKKKKKKo'';llll;;okKKKl..oNc + cNo..lKKKKKKKko;':c:,'lKKKKKo'.oNc + cNo..lKKKKKKKKKl.....'dKKKKKxc,l0: + .c:'.lKKKKKKKKKk;....lKKKKKKo'.oNc + ,:.'oxOKKKKKKKOxxxxOKKKKKKxc,;ol:. + ;c..'':oookKKKKKKKKKKKKKKKKKk:.'clc. + ,xl'.,oxo;'';oxOKKKKKKKKKKKKKKKOxxl:::;,. + .dOc..lKKKkoooookKKKKKKKKKKKKKKKKKKKxl,;ol. + cx,';okKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKl..;lc. + co..:dddddddddddddddddddddddddddddddddl::',::. + co........................................... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/3.txt new/platformsh-cli-3.31.5/resources/parrot/3.txt --- old/platformsh-cli-3.31.4/resources/parrot/3.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/3.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + .ccccccc. + .,,,;cooolccoo;;,,. + .dOx;..;lllll;..;xOd. + .cdo;',loOXXXXXkll;';odc. + ,ol:;c,':oko:cccccc,...ckl. + ;c.;kXo..::..;c::'.......oc +,dc..oXX0kk0o.':lll;..cxxc.,ld, +kNo.'oXXXXXXo',:lll;..oXXOo;cOd. +KOc;oOXXXXXXo.':lol;..dXXXXl';xc +Ol,:k0XXXXXX0c.,clc'.:0XXXXx,.oc +KOc;dOXXXXXXXl..';'..lXXXXXo..oc +dNo..oXXXXXXXOx:..'lxOXXXXXk,.:; .. +cNo..lXXXXXXXXXOolkXXXXXXXXXkl,..;:';. +.,;'.,dkkkkk0XXXXXXXXXXXXXXXXXOxxl;,;,;l:. + ;c.;:''''':doOXXXXXXXXXXXXXXXXXXOdo;';clc. + ;c.lOdood:'''oXXXXXXXXXXXXXXXXXXXXXk,..;ol. + ';.:xxxxxocccoxxxxxxxxxxxxxxxxxxxxxxl::'.';;. + ';........................................;l' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/4.txt new/platformsh-cli-3.31.5/resources/parrot/4.txt --- old/platformsh-cli-3.31.4/resources/parrot/4.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/4.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + + .;:;;,.,;;::,. + .;':;........'co:. + .clc;'':cllllc::,.':c. + .lo;;o:coxdllllllc;''::,,. +.c:'.,cl,.'l:',,;;'......cO; +do;';oxoc;:l;;llllc'.';;'.,;. +c..ckkkkkkkd,;llllc'.:kkd;.':c. +'.,okkkkkkkkc;lllll,.:kkkdl,cO; +..;xkkkkkkkkc,ccll:,;okkkkk:,co, +..,dkkkkkkkkc..,;,'ckkkkkkkc;ll. +..'okkkkkkkko,....'okkkkkkkc,:c. +c..ckkkkkkkkkdl;,:okkkkkkkkd,.',';. +d..':lxkkkkkkkkxxkkkkkkkkkkkdoc;,;'..'.,. +o...'';llllldkkkkkkkkkkkkkkkkkkdll;..'cdo. +o..,l;'''''';dkkkkkkkkkkkkkkkkkkkkdlc,..;lc. +o..;lc;;;;;;,,;clllllllllllllllllllllc'..,:c. +o..........................................;' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/5.txt new/platformsh-cli-3.31.5/resources/parrot/5.txt --- old/platformsh-cli-3.31.4/resources/parrot/5.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/5.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + + .,,,,,,,,,. + .ckKxodooxOOdcc. + .cclooc'....';;cool. + .loc;;;;clllllc;;;;;:;,. + .c:'.,okd;;cdo:::::cl,..oc + .:o;';okkx;';;,';::;'....,:,. + co..ckkkkkddkc,cclll;.,c:,:o:. + co..ckkkkkkkk:,cllll;.:kkd,.':c. +.,:;.,okkkkkkkk:,cclll;.ckkkdl;;o:. +cNo..ckkkkkkkkko,.;loc,.ckkkkkc..oc +,dd;.:kkkkkkkkkx;..;:,.'lkkkkko,.:, + ;:.ckkkkkkkkkkc.....;ldkkkkkk:.,' +,dc..'okkkkkkkkkxoc;;cxkkkkkkkkc..,;,. +kNo..':lllllldkkkkkkkkkkkkkkkkkdcc,.;l. +KOc,c;''''''';lldkkkkkkkkkkkkkkkkkc..;lc. +xx:':;;;;,.,,...,;;cllllllllllllllc;'.;od, +cNo.....................................oc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/6.txt new/platformsh-cli-3.31.5/resources/parrot/6.txt --- old/platformsh-cli-3.31.4/resources/parrot/6.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/6.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + + + .ccccccc. + .ccckNKOOOOkdcc. + .;;cc:ccccccc:,:c::,,. + .c;:;.,cccllxOOOxlllc,;ol. + .lkc,coxo:;oOOxooooooo;..:, + .cdc.,dOOOc..cOd,.',,;'....':l. + cNx'.lOOOOxlldOc..;lll;.....cO; + ,do;,:dOOOOOOOOOl'':lll;..:d:''c, + co..lOOOOOOOOOOOl'':lll;.'lOd,.cd. + co.'dOOOOOOOOOOOo,.;llc,.,dOOc..dc + co..lOOOOOOOOOOOOc.';:,..cOOOl..oc + .,:;.'::lxOOOOOOOOOo:'...,:oOOOc.'dc + ;Oc..cl'':lldOOOOOOOOdcclxOOOOx,.cd. + .:;';lxl''''':lldOOOOOOOOOOOOOOc..oc +,dl,.'cooc:::,....,::coooooooooooc'.c: +cNo.................................oc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/7.txt new/platformsh-cli-3.31.5/resources/parrot/7.txt --- old/platformsh-cli-3.31.4/resources/parrot/7.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/7.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + + + + .cccccccc. + .,,,;;cc:cccccc:;;,. + .cdxo;..,::cccc::,..;l. + ,do:,,:c:coxxdllll:;,';:,. + .cl;.,oxxc'.,cc,.';;;'...oNc + ;Oc..cxxxc'.,c;..;lll;...cO; + .;;',:ldxxxdoldxc..;lll:'...'c, + ;c..cxxxxkxxkxxxc'.;lll:'','.cdc. + .c;.;odxxxxxxxxxxxd;.,cll;.,l:.'dNc + .:,''ccoxkxxkxxxxxxx:..,:;'.:xc..oNc + .lc,.'lc':dxxxkxxxxxxxol,...',lx:..dNc + .:,',coxoc;;ccccoxxxxxxxxo:::oxxo,.cdc. + .;':;.'oxxxxxc''''';cccoxxxxxxxxxxxc..oc +,do:'..,:llllll:;;;;;;,..,;:lllllllll;..oc +cNo.....................................oc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/8.txt new/platformsh-cli-3.31.5/resources/parrot/8.txt --- old/platformsh-cli-3.31.4/resources/parrot/8.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/8.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + + + .ccccc. + .cc;'coooxkl;. + .:c:::c:,,,,,;c;;,.'. + .clc,',:,..:xxocc;'..c; + .c:,';:ox:..:c,,,,,,...cd, + .c:'.,oxxxxl::l:.,loll;..;ol. + ;Oc..:xxxxxxxxx:.,llll,....oc + .,;,',:loxxxxxxxxx:.,llll;.,,.'ld, + .lo;..:xxxxxxxxxxxx:.'cllc,.:l:'cO; + .:;...'cxxxxxxxxxxxxoc;,::,..cdl;;l' + .cl;':,'';oxxxxxxdxxxxxx:....,cooc,cO; + .,,,::;,lxoc:,,:lxxxxxxxxxxxo:,,;lxxl;'oNc + .cdxo;':lxxxxxxc'';cccccoxxxxxxxxxxxxo,.;lc. + .loc'.'lxxxxxxxxocc;''''';ccoxxxxxxxxx:..oc +olc,..',:cccccccccccc:;;;;;;;;:ccccccccc,.'c, +Ol;......................................;l' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/resources/parrot/9.txt new/platformsh-cli-3.31.5/resources/parrot/9.txt --- old/platformsh-cli-3.31.4/resources/parrot/9.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/platformsh-cli-3.31.5/resources/parrot/9.txt 2018-03-30 17:03:36.000000000 +0200 @@ -0,0 +1,18 @@ + + ,ddoodd, + .cc' ,ooccoo,'cc. + .ccldo;...',,...;oxdc. + .,,:cc;.,'..;lol;;,'..lkl. + .dOc';:ccl;..;dl,.''.....oc + .,lc',cdddddlccld;.,;c::'..,cc:. + cNo..:ddddddddddd;':clll;,c,';xc + .lo;,clddddddddddd;':clll;:kc..;' + .,c;..:ddddddddddddd:';clll,;ll,.. + ;Oc..';:ldddddddddddl,.,c:;';dd;.. + .''',:c:,'cdddddddddddo:,''..'cdd;.. + .cdc';lddd:';lddddddddddddd;.';lddl,.. + .,;::;,cdddddol;;lllllodddddddlcldddd:.'l; + .dOc..,lddddddddlcc:;'';cclddddddddddd;;ll. + .coc,;::ldddddddddddddlcccc:ldddddddddl:,cO; +,xl::,..,cccccccccccccccccccccccccccccccc:;':xx, +cNd.........................................;lOc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/src/Command/BotCommand.php new/platformsh-cli-3.31.5/src/Command/BotCommand.php --- old/platformsh-cli-3.31.4/src/Command/BotCommand.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/src/Command/BotCommand.php 2018-03-30 17:03:36.000000000 +0200 @@ -2,8 +2,9 @@ namespace Platformsh\Cli\Command; -use Platformsh\Cli\Console\Bot; +use Platformsh\Cli\Console\Animation; use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; class BotCommand extends CommandBase @@ -13,15 +14,45 @@ protected function configure() { - $this->setName('bot')->setDescription('The ' . $this->config()->get('service.name') . ' Bot'); + $this->setName('bot') + ->setDescription('The ' . $this->config()->get('service.name') . ' Bot') + ->addOption('party', null, InputOption::VALUE_NONE) + ->addOption('parrot', null, InputOption::VALUE_NONE); } protected function execute(InputInterface $input, OutputInterface $output) { - $bot = new Bot($output, $this->config()->get('service.name')); + $dir = CLI_ROOT . '/resources/bot'; + $signature = $this->config()->get('service.name'); + $party = $input->getOption('party'); + $interval = $party ? 120000 : 500000; + + // With thanks to https://github.com/jmhobbs/terminal-parrot + if ($input->getOption('parrot')) { + $dir = dirname($dir) . '/parrot'; + $interval = $party ? 70000 : 100000; + $signature = ''; + } + + $frames = []; + foreach (scandir($dir) as $filename) { + if ($filename[0] !== '.') { + $frames[] = file_get_contents($dir . '/' . $filename); + } + } + + if ($signature) { + $frames = $this->addSignature($frames, $signature); + } + + if ($party) { + $frames = $this->addColor($frames); + } + + $animation = new Animation($output, $frames, $interval); if (!$output->isDecorated()) { - $bot->render(); + $animation->render(); return; } @@ -35,7 +66,35 @@ } while (true) { - $bot->render(); + $animation->render(); + } + } + + private function addSignature(array $frames, $signature) + { + $indent = ' '; + if (strlen($signature) > 0) { + $signatureIndent = str_repeat(' ', strlen($indent) + 5 - floor(strlen($signature) / 2)); + $signature = "\n" . $signatureIndent . '<info>' . $signature . '</info>'; } + + return array_map(function ($frame) use ($indent, $signature) { + return preg_replace('/^/m', $indent, $frame) . $signature; + }, $frames); + } + + private function addColor(array $frames) + { + $colors = ['red', 'yellow', 'green', 'blue', 'magenta', 'cyan', 'white']; + $partyFrames = []; + for ($i = 1; $i <= 7; $i++) { + foreach ($frames as $frame) { + shuffle($colors); + $color = reset($colors); + $partyFrames[] = "<fg=$color>$frame</>"; + } + } + + return $partyFrames; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/src/Command/CommandBase.php new/platformsh-cli-3.31.5/src/Command/CommandBase.php --- old/platformsh-cli-3.31.4/src/Command/CommandBase.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/src/Command/CommandBase.php 2018-03-30 17:03:36.000000000 +0200 @@ -327,7 +327,7 @@ { $success = false; if ($this->output && $this->input && $this->input->isInteractive()) { - $method = $this->config()->get('application.login_method'); + $method = $this->config()->getWithDefault('application.login_method', 'browser'); if ($method === 'browser') { /** @var \Platformsh\Cli\Service\QuestionHelper $questionHelper */ $questionHelper = $this->getService('question_helper'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/src/Command/Integration/IntegrationCommandBase.php new/platformsh-cli-3.31.5/src/Command/Integration/IntegrationCommandBase.php --- old/platformsh-cli-3.31.4/src/Command/Integration/IntegrationCommandBase.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/src/Command/Integration/IntegrationCommandBase.php 2018-03-30 17:03:36.000000000 +0200 @@ -201,9 +201,7 @@ 'health.email', ]], 'description' => 'The From address for alert emails', - 'default' => $this->config()->has('service.default_from_address') - ? $this->config()->get('service.default_from_address') - : null, + 'default' => $this->config()->getWithDefault('service.default_from_address', null), ]), 'recipients' => new ArrayField('Recipients', [ 'conditions' => ['type' => [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/src/Command/Self/SelfReleaseCommand.php new/platformsh-cli-3.31.5/src/Command/Self/SelfReleaseCommand.php --- old/platformsh-cli-3.31.4/src/Command/Self/SelfReleaseCommand.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/src/Command/Self/SelfReleaseCommand.php 2018-03-30 17:03:36.000000000 +0200 @@ -14,10 +14,8 @@ protected function configure() { - $defaultRepo = $this->config()->has('application.github_repo') - ? $this->config()->get('application.github_repo') : null; - $defaultReleaseBranch = $this->config()->has('application.release_branch') - ? $this->config()->get('application.release_branch') : 'master'; + $defaultRepo = $this->config()->getWithDefault('application.github_repo', null); + $defaultReleaseBranch = $this->config()->getWithDefault('application.release_branch', 'master'); $this ->setName('self:release') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/src/Command/WelcomeCommand.php new/platformsh-cli-3.31.5/src/Command/WelcomeCommand.php --- old/platformsh-cli-3.31.4/src/Command/WelcomeCommand.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/src/Command/WelcomeCommand.php 2018-03-30 17:03:36.000000000 +0200 @@ -47,7 +47,7 @@ } // Show the environments. - $this->runOtherCommand('environments'); + $this->runOtherCommand('environments', ['--refresh' => 0]); $this->stdErr->writeln("\nYou can list other projects by running <info>$executable projects</info>\n"); } else { // The project is not known. Show all projects. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/src/Service/Api.php new/platformsh-cli-3.31.5/src/Service/Api.php --- old/platformsh-cli-3.31.4/src/Service/Api.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/src/Service/Api.php 2018-03-30 17:03:36.000000000 +0200 @@ -373,18 +373,21 @@ $environments = $this->getEnvironments($project, $refresh); - // Retry if the environment was not found in the cache. - if (!isset($environments[$id]) - && $refresh === null - && !self::$environmentsCacheRefreshed) { - $environments = $this->getEnvironments($project, true); - } - // Look for the environment by ID. if (isset($environments[$id])) { return $environments[$id]; } + // Retry directly if the environment was not found in the cache. + if ($refresh === null) { + if ($environment = $project->getEnvironment($id)) { + // If the environment was found directly, the cache must be out + // of date. + $this->clearEnvironmentsCache($project->id); + return $environment; + } + } + // Look for the environment by machine name. if ($tryMachineName) { foreach ($environments as $environment) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/src/Service/Config.php new/platformsh-cli-3.31.5/src/Service/Config.php --- old/platformsh-cli-3.31.4/src/Service/Config.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/src/Service/Config.php 2018-03-30 17:03:36.000000000 +0200 @@ -81,6 +81,24 @@ } /** + * Get a configuration value, specifying a default if it does not exist. + * + * @param string $name + * @param mixed $default + * + * @return mixed + */ + public function getWithDefault($name, $default) + { + $value = NestedArrayUtil::getNestedArrayValue(self::$config, explode('.', $name), $exists); + if (!$exists) { + return $default; + } + + return $value; + } + + /** * @return string */ public function getUserConfigDir() @@ -205,6 +223,7 @@ 'experimental' => 'experimental', 'updates' => 'updates', 'application.login_method' => 'application.login_method', + 'application.date_format' => 'application.date_format', ]; $userConfig = $this->getUserConfig(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/src/Service/PropertyFormatter.php new/platformsh-cli-3.31.5/src/Service/PropertyFormatter.php --- old/platformsh-cli-3.31.4/src/Service/PropertyFormatter.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/src/Service/PropertyFormatter.php 2018-03-30 17:03:36.000000000 +0200 @@ -11,14 +11,16 @@ class PropertyFormatter implements InputConfiguringInterface { - const DEFAULT_DATE_FORMAT = 'c'; - /** @var InputInterface|null */ protected $input; - public function __construct(InputInterface $input = null) + /** @var \Platformsh\Cli\Service\Config */ + protected $config; + + public function __construct(InputInterface $input = null, Config $config = null) { $this->input = $input; + $this->config = $config ?: new Config(); } /** @@ -70,7 +72,8 @@ null, InputOption::VALUE_REQUIRED, 'The date format (as a PHP date format string)', - self::DEFAULT_DATE_FORMAT + // @todo refactor so this can be non-static and use injected config + (new Config())->getWithDefault('application.date_format', 'c') )); } @@ -85,7 +88,9 @@ if (isset($this->input) && $this->input->hasOption('date-fmt')) { $format = $this->input->getOption('date-fmt'); } - $format = $format ?: self::DEFAULT_DATE_FORMAT; + if ($format === null) { + $format = $this->config->getWithDefault('application.date_format', 'c'); + } // Workaround for the ssl.expires_on date, which is currently a // timestamp in milliseconds. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.31.4/tests/ConfigTest.php new/platformsh-cli-3.31.5/tests/ConfigTest.php --- old/platformsh-cli-3.31.4/tests/ConfigTest.php 2018-03-28 22:44:52.000000000 +0200 +++ new/platformsh-cli-3.31.5/tests/ConfigTest.php 2018-03-30 17:03:36.000000000 +0200 @@ -15,6 +15,7 @@ $this->assertTrue($config->has('application.name')); $this->assertFalse($config->has('nonexistent')); $this->assertEquals($config->get('application.name'), 'Mock CLI'); + $this->assertEquals(123, $config->getWithDefault('nonexistent', 123)); } /** ++++++ platformsh-cli-vendor.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/autoload.php new/vendor/autoload.php --- old/vendor/autoload.php 2018-03-29 04:01:46.828820489 +0200 +++ new/vendor/autoload.php 2018-03-31 02:59:16.463102901 +0200 @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitabedc0cb3383310d6509812bb78d1eb1::getLoader(); +return ComposerAutoloaderInit1d4b01237e44e16ca3a54bed97926edf::getLoader(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_real.php new/vendor/composer/autoload_real.php --- old/vendor/composer/autoload_real.php 2018-03-29 04:01:46.828820489 +0200 +++ new/vendor/composer/autoload_real.php 2018-03-31 02:59:16.463102901 +0200 @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitabedc0cb3383310d6509812bb78d1eb1 +class ComposerAutoloaderInit1d4b01237e44e16ca3a54bed97926edf { private static $loader; @@ -19,15 +19,15 @@ return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitabedc0cb3383310d6509812bb78d1eb1', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit1d4b01237e44e16ca3a54bed97926edf', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitabedc0cb3383310d6509812bb78d1eb1', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit1d4b01237e44e16ca3a54bed97926edf', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitabedc0cb3383310d6509812bb78d1eb1::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit1d4b01237e44e16ca3a54bed97926edf::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitabedc0cb3383310d6509812bb78d1eb1::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit1d4b01237e44e16ca3a54bed97926edf::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequireabedc0cb3383310d6509812bb78d1eb1($fileIdentifier, $file); + composerRequire1d4b01237e44e16ca3a54bed97926edf($fileIdentifier, $file); } return $loader; } } -function composerRequireabedc0cb3383310d6509812bb78d1eb1($fileIdentifier, $file) +function composerRequire1d4b01237e44e16ca3a54bed97926edf($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/composer/autoload_static.php new/vendor/composer/autoload_static.php --- old/vendor/composer/autoload_static.php 2018-03-29 04:01:46.828820489 +0200 +++ new/vendor/composer/autoload_static.php 2018-03-31 02:59:16.463102901 +0200 @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitabedc0cb3383310d6509812bb78d1eb1 +class ComposerStaticInit1d4b01237e44e16ca3a54bed97926edf { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -195,9 +195,9 @@ public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitabedc0cb3383310d6509812bb78d1eb1::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitabedc0cb3383310d6509812bb78d1eb1::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitabedc0cb3383310d6509812bb78d1eb1::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit1d4b01237e44e16ca3a54bed97926edf::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit1d4b01237e44e16ca3a54bed97926edf::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit1d4b01237e44e16ca3a54bed97926edf::$classMap; }, null, ClassLoader::class); }

1 0

commit gnu_parallel for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package gnu_parallel for openSUSE:Factory checked in at 2018-03-31 15:37:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnu_parallel (Old) and /work/SRC/openSUSE:Factory/.gnu_parallel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnu_parallel" Sat Mar 31 15:37:31 2018 rev:43 rq:592684 version:20180322 Changes: -------- --- /work/SRC/openSUSE:Factory/gnu_parallel/gnu_parallel.changes 2018-03-09 10:44:20.875536500 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/gnu_parallel.changes 2018-03-31 15:37:50.187624086 +0200 @@ -1,0 +2,9 @@ +Fri Mar 30 15:47:51 UTC 2018 - astieger(a)suse.com + +- update to 20180322: + * niceload -p can now take multiple pids separated by comma + * --timeout gives a warning when killing processes + * --embed now uses the same code for all supported shells + * --delay can now take arguments like 1h12m07s + +------------------------------------------------------------------- Old: ---- parallel-20180222.tar.bz2 parallel-20180222.tar.bz2.sig New: ---- parallel-20180322.tar.bz2 parallel-20180322.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu_parallel.spec ++++++ --- /var/tmp/diff_new_pack.tYajfk/_old 2018-03-31 15:37:55.831419447 +0200 +++ /var/tmp/diff_new_pack.tYajfk/_new 2018-03-31 15:37:55.835419302 +0200 @@ -17,7 +17,7 @@ Name: gnu_parallel -Version: 20180222 +Version: 20180322 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0-or-later ++++++ parallel-20180222.tar.bz2 -> parallel-20180322.tar.bz2 ++++++ ++++ 3693 lines of diff (skipped) ++++++ parallel-20180222.tar.bz2.sig -> parallel-20180322.tar.bz2.sig ++++++ --- /work/SRC/openSUSE:Factory/gnu_parallel/parallel-20180222.tar.bz2.sig 2018-03-09 10:44:21.063529729 +0100 +++ /work/SRC/openSUSE:Factory/.gnu_parallel.new/parallel-20180322.tar.bz2.sig 2018-03-31 15:37:55.099445988 +0200 @@ -2,7 +2,7 @@ # To check the signature run: # echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20180222.tar.bz2.sig +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20180322.tar.bz2.sig echo | gpg 2>/dev/null gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 @@ -11,32 +11,32 @@ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 -iQTwBAABCgAGBQJajx42AAoJENGrRRaIiIiIsU4moKpV2dhJEUVTpj9bPX9AI/AX -drqv5dvX9XuZVW8ca3crF5tpAkGRWQfsdqiUe7CHbiqhrJirWpJ1Yz3HUEAedIFo -F2zM/Zw+beZACr4OSWscM9ZnoFRrQcolkdMrFf6YK9lsWhcYS2YCp0IdCVud/Ru+ -6t5hAa0SdRGlgVIIk4pGOZdCoyHuLOqolGbZfayaqfrrEDYqxClpDXW0asc+hDv/ -XE30cy1jV55PKfIT0TPINs9HDiWZT0/veKXgX8QOG6EpUbavzj0JHLliaiUFwD3H -bKV7QUKbKqO6E5ld6Dl6xVFYkfImq5fv7gbkZInPLZcDLu7JOETmZY7M+FXV2DiU -sj+EqrvaJHN5c6/+Zn2XzKDA3BGbsJVvr7+Ui0yp3MMsgZQM28O87+Y1L09+nj7b -rMzUqHcJNVuWDlr/x1BbqtV/pdSeo99t7I0uLbbsp0i3GjLp4uU2Tjg3rgMKlDUp -36f5CfeGlJa8TZJOjEQO8BfZYbBPLV2jniT61uul3iQqwqS7rh+kJFMUXCBFjTP9 -rC6MYn3DOSzSvpgqdtW4O7PXuPd0/AqR6GCdIcPFilzsVQJeMV1e/RQgG8o9rjvM -ytTvW4ClzqVBdOhSuQS1P0JGB/GZ1jBkGszT/3rTKKRP4qCAme8mANL4TedHLtJ2 -75E0urPPaJUsUZPkcOgnH3ft0BqFLRA0tGoJ/RLbnCQ2MxYLY73pmZCAku/C3TvO -7Q0rjmXm1y3SlaLUDm5eX1pvux+n1UXqv+gCeUZZVquo1SmF6WlaP0uHgqJjfkBs -YzVohgbMN6Xd7KwOOxqLHTW+o7nVq/Q2YwzYSvIlsE6/qrR8xRPfU/4sZAC4Uckj -uxQySzvIinpR5AK/61Y53TqFcfCpDxNAWCbx8JQWCMn9ioO0EEeIuBvyub7rx5fK -qDBkpE6GvYm6RjYPR05FrqHKuwmX1aTKZY52JkYhh/19LHPaSrMB+4/YsWpLnxyz -M6XAlBL18yQouxRP8PWGoIwnDx/+vZJhD3I/z6Kebl4C2s005sCp3vJuR7tO3kyG -dnGhC2kkC1RIjcWt5JFeawEu31x6MTTtOrD50Q4UIOIFL2f+IFpfLS39Y0WnycdQ -nJji05AFQYgUYBMjMxzm4G7w0Jd+7PcooTvBd1IYt7dwidRL40GfjYuclNZe4d+r -vxyzLG03qYDm+Jb2+tRdUomIQcvaoraxEGyoCkCDwlFW0+DxOohHB57yVhS4OzrH -L+sY7Y7xEJI/AVSB6TkuzD1vU688oGW5q7eO+QH2HeLiwUYkR+1BM+ct4DDhl7DI -rFROi2I2TdDgSBBJol/DUlCTETaY9FiboR8b7QHlko8citrl9+Ic3TA55Pp2nqjv -H3Qk3Qc30E/m9IO8fEw8vWjdyv8I0xjqHxy+iYeBwpIWEbxMvQSKl9K0pHAQgzB7 -AQrcKG1OYsl+PgqJH0MwwaZZx6jlXZHOA7BZjk28hrFhu9nkPSpZgxVPvsCpkiOu -44dGY1JoRQilVilbsJOg/tLm1EgVIo3mZgHQDoJLNhIQNYuxPo8Up1pF5y9KOrQ7 -hsv3VzBRO4W/MB282eiDL53rturYSKkKKqMvqFK6CHQhF2IZOwOxIgCnBuaZEIPS -EV4tO2rGPKKSofjnt5KyK3Fd9A== -=oZQV +iQTwBAABCgAGBQJas1//AAoJENGrRRaIiIiIjG8mnRQsfhjNeQjw2i36nHX/VIxY +uKEMffeZ6qnPj2TTFDuRtVmIt8fl1Xj9O5sObvi4VdetEooVim8RhHdhjwi7DP6q +fRw/xn26xybpcBCz7H4lyiwIHTwW03VoENJYC5UOFCb2D7jBBFp9rVirki7mD89E +81YdpFnSEgoon6b5nZ3Rt12cOVplgpjF9MrxWXprT6K/AtAqN8vU7DRYYwfq7uxL +3zh1BBSmBUk0D4eLEwcMPzL1IXCk8gpuF8PX5hGfJhQKzHsmJ38qM2BLJcwWWPSd +pvB/L5XdcOgqW6Y8PcuikLGs6I+2aoCY02pRkFWuSoD8dAI9WS4/vZvbXCCHTfZB +G+fgs2OWyysfMUlJmROXqxz3ve2iki3OLSPn7EWz8jAq8+bf2L4d87kGzsm0LUQU +MsuE0CqFzwnbRAr7yiG4mgHpI3iUHq7TNPs9RxILfowYE3M1o8mmlx6JQDn1qf96 +aPd7U2jZkWaR/Hxb0GLIyiZotv/HdACn1BeYNj8r3p2VvF1ww8Rit6x5GFjnfExE +3P/n0T/3bIo/UnsGCoGDQ/jAoFDdbpl05vjK693G0UTDI7CHXPQvfd5/mQagng3Y +pf3BCmYsOJBpVMqlxra0lbaCNqaZAS/V5Cb8IoClhjTHsFnEJEilLm7Prz5Mrbyd +PHdnzrW167NUSdcq2wnWNXrJ0La0Khu8P9tX+sNalrPXJ9Bh03bPm+7jYDDSVrJE +On8WbUZra0GqBS5/eRyUyCEeaiXDUCepFmmNibgUozboS3bijrN8eguIOcrAyht1 +xUUn9yFAN/IREHFLpWhjSQTU/3QoRUw6eBev2UdNU4DRGJS/ezZ396sJTR7AFKwZ +HyotXPfyHXkkSLC0jK1VW2iNfc3xpKSOm+gt4XVqVvwS8YG9umvdp7uGmr84rFvB +x1zNvDUF76EzduRkldzngbNKHy4d5dffhPFMixXYKGkmYQeRIQKu9SK7vK8E+tO+ ++TPWyYL5kdS/RG05hz/zHUZ2qcGCk/Ht08qkZT4yuLGa3qyxmUyOyXtI/rp1jPtN +UMV9zdlVPepXE31JnsgnDmgX7OBZDChWmPtHHbDzjXCmJSwvIy7vFKSKmEGeroON +efmUtnTtRhKRo9WJhbPhrwFWViHc6M394GL0TR2URDypqTSLviLULNizYFzVm4LK +YcPRKrSmNdKLxcpJ8Ium6qIxB/Qd4zGG2rmvPXLqfxZEV4lXgK1GrdzCfVDGaNeh +yI56RUe68NEgiF4/FDyU8nfb237dkd0hDNAmQuscQ8PJi8FAyFXOIZiatb3RD6Tk +mOzeqb28i5/obVWW+E3uGKfmyo/8VeYd4dFFhbi25p0bbv2KpavS0uasw/DqRDXX +l0hQaYqXWBCLNIrwmcZ+1ITtXVg6j8jZCZfVJXAkm5kkPfQ9AMC/WOImq8d2nzkF +b+MlLYf0GZxGQd5WUYDAb6qBQuUMi1C2ohF3Ji+qQqOkieau2DxdIrsRU47ZTbJ8 +RBn+Vwn7dkWjUUUEHC+WMKdiN0G7Or0m55pDLHW4oA9cSQS73vpiJuN7kYjwa3gu +hjxPP0peG4NcCTllDIhc59wd4YS1DeRERJxRzKRQW3ohdJqt1ntPJMgnF+K3F//O +I+V0B7U1PlG03bU06NDncmzXag== +=dLT/ -----END PGP SIGNATURE-----

1 0

commit openSUSE-release-tools for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2018-03-31 15:37:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Sat Mar 31 15:37:25 2018 rev:76 rq:592677 version:20180329.1ab84c3 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2018-03-30 12:08:16.815873723 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new/openSUSE-release-tools.changes 2018-03-31 15:37:43.847853960 +0200 @@ -1,0 +2,8 @@ +Thu Mar 29 15:44:18 UTC 2018 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20180329.1ab84c3: + * Change remaining usage of _product to 000product + * leaper: set maintainer review early + * leaper: also look into :Live subproject of Factory + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20180329.9ad18cf.obscpio New: ---- openSUSE-release-tools-20180329.1ab84c3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.ZJdfnU/_old 2018-03-31 15:37:44.615826114 +0200 +++ /var/tmp/diff_new_pack.ZJdfnU/_new 2018-03-31 15:37:44.623825824 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20180329.9ad18cf +Version: 20180329.1ab84c3 Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ZJdfnU/_old 2018-03-31 15:37:44.671824084 +0200 +++ /var/tmp/diff_new_pack.ZJdfnU/_new 2018-03-31 15:37:44.671824084 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">64bd11baf498f4832256420a5b4c8a570494fc60</param> + <param name="changesrevision">1ab84c3cd672bd77e34a279869bc66634fb31e8c</param> </service> </servicedata> ++++++ openSUSE-release-tools-20180329.9ad18cf.obscpio -> openSUSE-release-tools-20180329.1ab84c3.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180329.9ad18cf/ToolBase.py new/openSUSE-release-tools-20180329.1ab84c3/ToolBase.py --- old/openSUSE-release-tools-20180329.9ad18cf/ToolBase.py 2018-03-29 13:05:23.000000000 +0200 +++ new/openSUSE-release-tools-20180329.1ab84c3/ToolBase.py 2018-03-29 17:39:14.000000000 +0200 @@ -106,7 +106,7 @@ def meta_get_packagelist(self, prj, deleted=None, expand=False): root = ET.fromstring(self._meta_get_packagelist(prj, deleted, expand)) - return [ node.get('name') for node in root.findall('entry') if not node.get('name') == '_product' and not node.get('name').startswith('_product:') and not node.get('name').startswith('patchinfo.') ] + return [ node.get('name') for node in root.findall('entry') if not node.get('name') == '000product' and not node.get('name').startswith('patchinfo.') ] # FIXME: duplicated from manager_42 def latest_packages(self, project): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180329.9ad18cf/biarchtool.py new/openSUSE-release-tools-20180329.1ab84c3/biarchtool.py --- old/openSUSE-release-tools-20180329.9ad18cf/biarchtool.py 2018-03-29 13:05:23.000000000 +0200 +++ new/openSUSE-release-tools-20180329.1ab84c3/biarchtool.py 2018-03-29 17:39:14.000000000 +0200 @@ -169,11 +169,11 @@ else: self.packages = packages - # check when _product was last changed, eg by packagelist + # check when 000product was last changed, eg by packagelist # generator. Yield only packges that got checked in after that # point in time. def _filter_packages_by_time(self, packages): - x = ET.fromstring(self.cached_GET(self.makeurl(['source', self.project, '_product', '_history'], {'limit': '1'}))) + x = ET.fromstring(self.cached_GET(self.makeurl(['source', self.project, '000product', '_history'], {'limit': '1'}))) producttime = int(x.find('./revision/time').text) for pkg in packages: try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180329.9ad18cf/leaper.py new/openSUSE-release-tools-20180329.1ab84c3/leaper.py --- old/openSUSE-release-tools-20180329.9ad18cf/leaper.py 2018-03-29 13:05:23.000000000 +0200 +++ new/openSUSE-release-tools-20180329.1ab84c3/leaper.py 2018-03-29 17:39:14.000000000 +0200 @@ -151,8 +151,6 @@ if self.ibs and target_project.startswith('SUSE:SLE'): - self.do_check_maintainer_review = False - if package in self.lookup_sle15: origin = self.lookup_sle15[package] @@ -413,22 +411,17 @@ return False def _check_factory(self, target_package, src_srcinfo, target_project='openSUSE:Factory'): - good = self.factory._check_project(target_project, target_package, src_srcinfo.verifymd5) + for subprj in ('', ':NonFree', ':Live'): + prj = ''.join((target_project, subprj)) + good = self.factory._check_project(prj, target_package, src_srcinfo.verifymd5) if good: return good - good = self.factory._check_requests(target_project, target_package, src_srcinfo.verifymd5) + good = self.factory._check_requests(prj, target_package, src_srcinfo.verifymd5) if good or good == None: - self.logger.debug("found request to Factory") - return good - target_project_nonfree = '{}:NonFree'.format(target_project) - good = self.factory._check_project(target_project_nonfree, target_package, src_srcinfo.verifymd5) - if good: + self.logger.debug("found request to %s", prj) return good - good = self.factory._check_requests(target_project_nonfree, target_package, src_srcinfo.verifymd5) - if good or good == None: - self.logger.debug('found request to {}'.format(target_project_nonfree)) - return good - return False + + return False def _check_project_and_request(self, project, target_package, src_srcinfo): good = self.factory._check_project(project, target_package, src_srcinfo.verifymd5) @@ -447,7 +440,7 @@ self.needs_release_manager = False self.pending_factory_submission = False self.source_in_factory = None - self.do_check_maintainer_review = True + self.do_check_maintainer_review = not self.ibs self.packages = {} request_ok = ReviewBot.ReviewBot.check_one_request(self, req) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20180329.9ad18cf/update_crawler.py new/openSUSE-release-tools-20180329.1ab84c3/update_crawler.py --- old/openSUSE-release-tools-20180329.9ad18cf/update_crawler.py 2018-03-29 13:05:23.000000000 +0200 +++ new/openSUSE-release-tools-20180329.1ab84c3/update_crawler.py 2018-03-29 17:39:14.000000000 +0200 @@ -128,7 +128,7 @@ def meta_get_packagelist(self, prj, deleted=None, expand=False): root = ET.fromstring(self._meta_get_packagelist(prj, deleted, expand)) - return [ node.get('name') for node in root.findall('entry') if not node.get('name') == '_product' and not node.get('name').startswith('_product:') and not node.get('name').startswith('patchinfo.') ] + return [ node.get('name') for node in root.findall('entry') if not node.get('name') == '000product' and not node.get('name').startswith('patchinfo.') ] def _get_source_infos(self, project, packages): query = [ 'view=info' ] ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.ZJdfnU/_old 2018-03-31 15:37:45.395797834 +0200 +++ /var/tmp/diff_new_pack.ZJdfnU/_new 2018-03-31 15:37:45.399797688 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20180329.9ad18cf -mtime: 1522321523 -commit: 9ad18cf55f51716afde390433628cf1bd602a5e9 +version: 20180329.1ab84c3 +mtime: 1522337954 +commit: 1ab84c3cd672bd77e34a279869bc66634fb31e8c

1 0

commit fio for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package fio for openSUSE:Factory checked in at 2018-03-31 15:37:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fio (Old) and /work/SRC/openSUSE:Factory/.fio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fio" Sat Mar 31 15:37:23 2018 rev:45 rq:592671 version:3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/fio/fio.changes 2018-03-09 10:46:00.771938417 +0100 +++ /work/SRC/openSUSE:Factory/.fio.new/fio.changes 2018-03-31 15:37:43.011884272 +0200 @@ -1,0 +2,12 @@ +Thu Mar 29 14:48:36 UTC 2018 - jeffm(a)suse.com + +- Update license tag to read "GPL-2.0" + +------------------------------------------------------------------- +Thu Mar 29 14:46:43 UTC 2018 - jeffm(a)suse.com + +- Allow to build on SLE11 again: + - %licence -> %doc on old rpm + - No dependencies on libnuma (i386), librbd, and libpmem. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fio.spec ++++++ --- /var/tmp/diff_new_pack.nT7rDF/_old 2018-03-31 15:37:43.595863098 +0200 +++ /var/tmp/diff_new_pack.nT7rDF/_new 2018-03-31 15:37:43.599862952 +0200 @@ -17,14 +17,29 @@ # +%if 0%{?sles_version} == 11 +%bcond_with librbd +%bcond_with libpmem +%ifarch %{ix86} +%bcond_with libnuma +%else +%bcond_without libnuma +%endif +%else +%bcond_without librbd +%bcond_without libpmem +%bcond_without libnuma +%endif + Name: fio Version: 3.4 Release: 0 Summary: Flexible I/O tester -License: GPL-2.0-only +License: GPL-2.0 Group: System/Benchmark -URL: http://git.kernel.dk/?p=fio.git;a=summary +Url: http://git.kernel.dk/?p=fio.git;a=summary Source: http://brick.kernel.dk/snaps/fio-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gtk2-devel BuildRequires: libaio-devel BuildRequires: librdmacm-devel @@ -32,19 +47,25 @@ BuildRequires: zlib-devel Suggests: gfio Suggests: gnuplot +%if %{with libnuma} %ifnarch s390x s390 %{arm} BuildRequires: libnuma-devel %endif +%endif +%if %{with librbd} %ifnarch s390x s390 ppc64le ppc64 ppc %{ix86} %{arm} BuildRequires: librbd-devel %endif +%endif %if 0%{?is_opensuse} BuildRequires: glusterfs-devel %endif +%if %{with libpmem} %ifarch x86_64 BuildRequires: libpmem-devel BuildRequires: libpmemblk-devel %endif +%endif %description fio is an I/O tool meant to be used both for benchmark and stress/hardware @@ -88,7 +109,12 @@ make %{?_smp_mflags} test %files +%defattr(-, root, root) +%if 0%{?sles_version} == 11 +%doc COPYING MORAL-LICENSE +%else %license COPYING MORAL-LICENSE +%endif %doc README examples %doc HOWTO REPORTING-BUGS %doc GFIO-TODO SERVER-TODO STEADYSTATE-TODO @@ -110,6 +136,7 @@ %{_mandir}/man1/fiologparser_hist.py.1%{ext_man} %files -n gfio +%defattr(-, root, root) %{_bindir}/gfio %changelog

1 0

commit tvheadend for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package tvheadend for openSUSE:Factory checked in at 2018-03-31 15:37:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tvheadend (Old) and /work/SRC/openSUSE:Factory/.tvheadend.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tvheadend" Sat Mar 31 15:37:18 2018 rev:6 rq:592670 version:4.2.6 Changes: -------- --- /work/SRC/openSUSE:Factory/tvheadend/tvheadend.changes 2018-03-20 22:00:11.278053757 +0100 +++ /work/SRC/openSUSE:Factory/.tvheadend.new/tvheadend.changes 2018-03-31 15:37:38.772038005 +0200 @@ -1,0 +2,7 @@ +Fri Mar 30 15:32:09 UTC 2018 - opensuse(a)sukimashita.com + +- Update to version 4.2.6. For a changelog see + https://github.com/tvheadend/tvheadend/compare/v4.2.5...v4.2.6 +- Fixes a noticable memory leak + +------------------------------------------------------------------- Old: ---- tvheadend-4.2.5.tar.gz New: ---- tvheadend-4.2.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tvheadend.spec ++++++ --- /var/tmp/diff_new_pack.2d0W4Z/_old 2018-03-31 15:37:41.699931842 +0200 +++ /var/tmp/diff_new_pack.2d0W4Z/_new 2018-03-31 15:37:41.699931842 +0200 @@ -26,7 +26,7 @@ %define htsuser hts %define homedir %{_localstatedir}/lib/tvheadend Name: tvheadend -Version: 4.2.5 +Version: 4.2.6 Release: 0 Summary: A TV Streaming Server # parsers are from FFMpeg project under LGPL-2.1 ++++++ tvheadend-4.2.5.tar.gz -> tvheadend-4.2.6.tar.gz ++++++ /work/SRC/openSUSE:Factory/tvheadend/tvheadend-4.2.5.tar.gz /work/SRC/openSUSE:Factory/.tvheadend.new/tvheadend-4.2.6.tar.gz differ: char 31, line 1

1 0

commit pgadmin3 for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package pgadmin3 for openSUSE:Factory checked in at 2018-03-31 15:37:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pgadmin3 (Old) and /work/SRC/openSUSE:Factory/.pgadmin3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pgadmin3" Sat Mar 31 15:37:14 2018 rev:3 rq:592632 version:1.22.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pgadmin3/pgadmin3.changes 2017-11-27 22:17:37.328352922 +0100 +++ /work/SRC/openSUSE:Factory/.pgadmin3.new/pgadmin3.changes 2018-03-31 15:37:34.328199134 +0200 @@ -1,0 +2,6 @@ +Fri Mar 30 11:55:48 UTC 2018 - ralf.habacker(a)freenet.de + +- Added 0003-postgresql-8.3-support.patch to fix invalid + sql statement on accessing postgresql 8.3 database + +------------------------------------------------------------------- New: ---- 0003-postgresql-8.3-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pgadmin3.spec ++++++ --- /var/tmp/diff_new_pack.D6zQWt/_old 2018-03-31 15:37:35.420159541 +0200 +++ /var/tmp/diff_new_pack.D6zQWt/_new 2018-03-31 15:37:35.424159395 +0200 @@ -35,6 +35,7 @@ # https://bitbucket.org/openscg/pgadmin3-lts/commits/ea8a31af779b101248fc1324… # https://bitbucket.org/openscg/pgadmin3-lts/commits/1d65e012f7bb88d3b6c5a089… Patch2: 0002-basic-support-postgresql10.patch +Patch3: 0003-postgresql-8.3-support.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -95,6 +96,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 autoreconf -fiv sed -i 's/\r$//' LICENSE TODO CHANGELOG # remove wrong EOL ++++++ 0003-postgresql-8.3-support.patch ++++++ --- a/pgadmin/schema/pgColumn.cpp 2018-02-27 12:59:42.871950867 +0100 +++ b/pgadmin/schema/pgColumn.cpp 2018-02-27 13:00:15.491784358 +0100 @@ -568,7 +568,7 @@ // grab inherited tables with attibute names pgSet *inhtables = database->ExecuteSet( wxT("SELECT\n") - wxT(" array_to_string(array_agg(inhrelname), ', ') inhrelname,\n") + wxT(" array_to_string(array_agg(inhrelname), ', ') AS inhrelname,\n") wxT(" attrname\n") wxT("FROM\n") wxT(" (SELECT\n") --- a/pgadmin/schema/pgFunction.cpp 2018-02-27 13:10:04.000000000 +0100 +++ b/pgadmin/schema/pgFunction.cpp 2018-02-27 13:10:39.733120796 +0100 @@ -660,7 +660,7 @@ } pgSet *functions; - if (obj->GetConnection()->GetIsGreenplum()) + if (obj->GetConnection()->GetIsGreenplum() || !obj->GetConnection()->BackendMinimumVersion(9, 0)) { // the Open Source version of Greenplum already has the pg_get_function_result() function, // however the 4.3 stable release does not have this function

1 0

commit stress-ng for openSUSE:Factory
by root＠hilbert.suse.de 31 Mar '18

31 Mar '18

Hello community, here is the log from the commit of package stress-ng for openSUSE:Factory checked in at 2018-03-31 15:37:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stress-ng (Old) and /work/SRC/openSUSE:Factory/.stress-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stress-ng" Sat Mar 31 15:37:12 2018 rev:39 rq:592541 version:0.09.23 Changes: -------- --- /work/SRC/openSUSE:Factory/stress-ng/stress-ng.changes 2018-03-28 10:30:56.501994444 +0200 +++ /work/SRC/openSUSE:Factory/.stress-ng.new/stress-ng.changes 2018-03-31 15:37:32.732257001 +0200 @@ -1,0 +2,9 @@ +Wed Mar 28 18:06:28 UTC 2018 - mardnh(a)gmx.de + +- Update to version 0.09.23 + * Makefile: bump version + * cache: revert using shim_str* funcs (LP: #1759515) + Using the shim_* str functions breaks the cache globbing paths, + so for now, revert these. + +------------------------------------------------------------------- Old: ---- stress-ng-0.09.22.tar.xz New: ---- stress-ng-0.09.23.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stress-ng.spec ++++++ --- /var/tmp/diff_new_pack.EciNfF/_old 2018-03-31 15:37:33.732220744 +0200 +++ /var/tmp/diff_new_pack.EciNfF/_new 2018-03-31 15:37:33.732220744 +0200 @@ -18,7 +18,7 @@ Name: stress-ng -Version: 0.09.22 +Version: 0.09.23 Release: 0 Summary: Tool to load and stress a computer License: GPL-2.0-only ++++++ stress-ng-0.09.22.tar.xz -> stress-ng-0.09.23.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.09.22/Makefile new/stress-ng-0.09.23/Makefile --- old/stress-ng-0.09.22/Makefile 2018-03-23 17:44:44.000000000 +0100 +++ new/stress-ng-0.09.23/Makefile 2018-03-28 11:41:12.000000000 +0200 @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -VERSION=0.09.22 +VERSION=0.09.23 # # Codename "portable pressure producer" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.09.22/cache.c new/stress-ng-0.09.23/cache.c --- old/stress-ng-0.09.22/cache.c 2018-03-23 17:44:44.000000000 +0100 +++ new/stress-ng-0.09.23/cache.c 2018-03-28 11:41:12.000000000 +0200 @@ -40,7 +40,7 @@ */ #define MK_PATH(path, len, element) \ (void)memset((path) + len, '\0', sizeof(path) - len); \ - (void)shim_strlcpy((path) + len, element, strlen(element)) + (void)strncpy((path) + len, element, strlen(element)) static const generic_map_t cache_type_map[] = { {"data" , CACHE_TYPE_DATA}, @@ -279,7 +279,7 @@ } len = strlen(index_path); - (void)shim_strlcpy(path, index_path, len); + (void)strncpy(path, index_path, len); MK_PATH(path, len, "/type"); contents = get_string_from_file(path); @@ -452,10 +452,10 @@ } len = strlen(cpu_path); - (void)shim_strlcat(glob_path, cpu_path, len); + (void)strncat(glob_path, cpu_path, len); len2 = strlen(SYS_CPU_CACHE_DIR); - (void)shim_strlcat(glob_path, SYS_CPU_CACHE_DIR, len2); + (void)strncat(glob_path, SYS_CPU_CACHE_DIR, len2); len += len2; ret2 = file_exists(glob_path); @@ -476,7 +476,7 @@ return ret; } - (void)shim_strlcat(glob_path, GLOB_PATTERN_INDEX_PREFIX, + (void)strncat(glob_path, GLOB_PATTERN_INDEX_PREFIX, sizeof(glob_path) - len - 1); ret2 = glob(glob_path, GLOB_ONLYDIR, NULL, &globbuf); @@ -593,7 +593,7 @@ cpu->online = 1; } else { len = strlen(results[i]); - (void)shim_strlcpy(path, results[i], len); + (void)strncpy(path, results[i], len); MK_PATH(path, len, "/online"); contents = get_string_from_file(path);

1 0