May 2016 - openSUSE Commits - openSUSE Mailing Lists

commit libressl for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package libressl for openSUSE:Factory checked in at 2016-05-05 12:12:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libressl (Old) and /work/SRC/openSUSE:Factory/.libressl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libressl" Changes: -------- --- /work/SRC/openSUSE:Factory/libressl/libressl.changes 2016-04-01 13:02:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libressl.new/libressl.changes 2016-05-05 12:12:28.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 4 16:08:33 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 2.3.4 [boo#978492, boo#977584] +* Fix multiple vulnerabilities in libcrypto relating to ASN.1 and + encoding. + +------------------------------------------------------------------- Old: ---- libressl-2.3.3.tar.gz libressl-2.3.3.tar.gz.asc New: ---- libressl-2.3.4.tar.gz libressl-2.3.4.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libressl.spec ++++++ --- /var/tmp/diff_new_pack.7iPyuH/_old 2016-05-05 12:12:29.000000000 +0200 +++ /var/tmp/diff_new_pack.7iPyuH/_new 2016-05-05 12:12:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: libressl -Version: 2.3.3 +Version: 2.3.4 Release: 0 Summary: An SSL/TLS protocol implementation License: OpenSSL ++++++ libressl-2.3.3.tar.gz -> libressl-2.3.4.tar.gz ++++++ ++++ 11806 lines of diff (skipped)

1 0

commit yast2-dns-server for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package yast2-dns-server for openSUSE:Factory checked in at 2016-05-05 12:12:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-dns-server (Old) and /work/SRC/openSUSE:Factory/.yast2-dns-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-dns-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-dns-server/yast2-dns-server.changes 2015-12-03 13:30:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-dns-server.new/yast2-dns-server.changes 2016-05-05 12:12:27.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 4 08:45:09 UTC 2016 - cwh(a)suse.com + +- Fix handling of trailing spaces in named.conf (bsc#976643) +- 3.1.20 + +------------------------------------------------------------------- Old: ---- yast2-dns-server-3.1.19.tar.bz2 New: ---- yast2-dns-server-3.1.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.F8ghIy/_old 2016-05-05 12:12:28.000000000 +0200 +++ /var/tmp/diff_new_pack.F8ghIy/_new 2016-05-05 12:12:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-dns-server # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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: yast2-dns-server -Version: 3.1.19 +Version: 3.1.20 Release: 0 Url: https://github.com/yast/yast-dns-server ++++++ yast2-dns-server-3.1.19.tar.bz2 -> yast2-dns-server-3.1.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.19/package/yast2-dns-server.changes new/yast2-dns-server-3.1.20/package/yast2-dns-server.changes --- old/yast2-dns-server-3.1.19/package/yast2-dns-server.changes 2015-11-27 14:47:01.000000000 +0100 +++ new/yast2-dns-server-3.1.20/package/yast2-dns-server.changes 2016-05-04 16:21:53.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 4 08:45:09 UTC 2016 - cwh(a)suse.com + +- Fix handling of trailing spaces in named.conf (bsc#976643) +- 3.1.20 + +------------------------------------------------------------------- Fri Nov 27 09:35:39 UTC 2015 - ancor(a)suse.com - Adapted to latest changes in UI::ServiceStatus API (fate#318771) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.19/package/yast2-dns-server.spec new/yast2-dns-server-3.1.20/package/yast2-dns-server.spec --- old/yast2-dns-server-3.1.19/package/yast2-dns-server.spec 2015-11-27 14:47:01.000000000 +0100 +++ new/yast2-dns-server-3.1.20/package/yast2-dns-server.spec 2016-05-04 16:21:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-dns-server -Version: 3.1.19 +Version: 3.1.20 Release: 0 Url: https://github.com/yast/yast-dns-server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-dns-server-3.1.19/src/scrconf/dns_named.scr new/yast2-dns-server-3.1.20/src/scrconf/dns_named.scr --- old/yast2-dns-server-3.1.19/src/scrconf/dns_named.scr 2015-11-27 14:47:01.000000000 +0100 +++ new/yast2-dns-server-3.1.20/src/scrconf/dns_named.scr 2016-05-04 16:21:53.000000000 +0200 @@ -22,7 +22,7 @@ "comments" : [ "^[ \t]*#.*$", "^[ \t]*$" ], "params" : [ $[ - "match" : [ "([^ \t]+)[ \t]([^ \t]+(.*[^ \t]+)+)[ \t]*;$", "%s %s;" ], + "match" : [ "([^ \t]+)[ \t]([^ \t]+(.*[^ \t]+)+)[ \t]*;", "%s %s;" ], // This enables multiline parameters "multiline" : [ "([^ \t]+)[ \t]+([^}]*)", "([^}]*\\}[ \t]*;)[ \t]*" ], ],

1 0

commit quagga for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package quagga for openSUSE:Factory checked in at 2016-05-05 12:12:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quagga (Old) and /work/SRC/openSUSE:Factory/.quagga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "quagga" Changes: -------- --- /work/SRC/openSUSE:Factory/quagga/quagga.changes 2016-04-08 09:39:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.quagga.new/quagga.changes 2016-05-05 12:12:26.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 4 13:32:20 UTC 2016 - pwieczorkiewicz(a)suse.com + +- Add quagga-CVE-2016-4049-fix-buf-ovflow-bgp-dump-routes.patch + Fix for a buffer overflow error in bgp_dump_routes_func. + (CVE-2016-4049, bsc#977012) + +------------------------------------------------------------------- New: ---- quagga-CVE-2016-4049-fix-buf-ovflow-bgp-dump-routes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quagga.spec ++++++ --- /var/tmp/diff_new_pack.cXOoVT/_old 2016-05-05 12:12:27.000000000 +0200 +++ /var/tmp/diff_new_pack.cXOoVT/_new 2016-05-05 12:12:27.000000000 +0200 @@ -49,6 +49,7 @@ Patch2: %{name}-add-table_test-return-value.patch Patch3: 0001-systemd-change-the-WantedBy-target.patch Patch4: %{name}-autoconf-detect-AM_SILENT_RULES.patch +Patch5: %{name}-CVE-2016-4049-fix-buf-ovflow-bgp-dump-routes.patch BuildRequires: autoconf >= 2.6 BuildRequires: automake >= 1.6 BuildRequires: libtool @@ -110,6 +111,7 @@ %patch2 -p 1 %patch3 -p 1 %patch4 -p 1 +%patch5 -p 1 %build if ! ls /proc/net/{dev,route,snmp} >/dev/null; then ++++++ quagga-CVE-2016-4049-fix-buf-ovflow-bgp-dump-routes.patch ++++++ Index: quagga-1.0.20160315/bgpd/bgp_dump.c =================================================================== --- quagga-1.0.20160315.orig/bgpd/bgp_dump.c +++ quagga-1.0.20160315/bgpd/bgp_dump.c @@ -297,11 +297,96 @@ bgp_dump_routes_index_table(struct bgp * } +static struct bgp_info * +bgp_dump_route_node_record (int afi, struct bgp_node *rn, struct bgp_info *info, unsigned int seq) +{ + struct stream *obuf; + size_t sizep; + size_t endp; + + obuf = bgp_dump_obuf; + stream_reset(obuf); + + /* MRT header */ + if (afi == AFI_IP) + bgp_dump_header (obuf, MSG_TABLE_DUMP_V2, TABLE_DUMP_V2_RIB_IPV4_UNICAST, + BGP_DUMP_ROUTES); + else if (afi == AFI_IP6) + bgp_dump_header (obuf, MSG_TABLE_DUMP_V2, TABLE_DUMP_V2_RIB_IPV6_UNICAST, + BGP_DUMP_ROUTES); + + /* Sequence number */ + stream_putl(obuf, seq); + + /* Prefix length */ + stream_putc (obuf, rn->p.prefixlen); + + /* Prefix */ + if (afi == AFI_IP) + { + /* We'll dump only the useful bits (those not 0), but have to align on 8 bits */ + stream_write(obuf, (u_char *)&rn->p.u.prefix4, (rn->p.prefixlen+7)/8); + } + else if (afi == AFI_IP6) + { + /* We'll dump only the useful bits (those not 0), but have to align on 8 bits */ + stream_write (obuf, (u_char *)&rn->p.u.prefix6, (rn->p.prefixlen+7)/8); + } + + /* Save where we are now, so we can overwride the entry count later */ + sizep = stream_get_endp(obuf); + + /* Entry count */ + uint16_t entry_count = 0; + + /* Entry count, note that this is overwritten later */ + stream_putw(obuf, 0); + + endp = stream_get_endp(obuf); + for (; info; info = info->next) + { + size_t cur_endp; + + /* Peer index */ + stream_putw(obuf, info->peer->table_dump_index); + + /* Originated */ +#ifdef HAVE_CLOCK_MONOTONIC + stream_putl (obuf, time(NULL) - (bgp_clock() - info->uptime)); +#else + stream_putl (obuf, info->uptime); +#endif /* HAVE_CLOCK_MONOTONIC */ + + /* Dump attribute. */ + /* Skip prefix & AFI/SAFI for MP_NLRI */ + bgp_dump_routes_attr (obuf, info->attr, &rn->p); + + cur_endp = stream_get_endp(obuf); + if (cur_endp > BGP_MAX_PACKET_SIZE + BGP_DUMP_MSG_HEADER + + BGP_DUMP_HEADER_SIZE) + { + stream_set_endp(obuf, endp); + break; + } + + entry_count++; + endp = cur_endp; + } + + /* Overwrite the entry count, now that we know the right number */ + stream_putw_at (obuf, sizep, entry_count); + + bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2); + fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp); + + return info; +} + + /* Runs under child process. */ static unsigned int bgp_dump_routes_func (int afi, int first_run, unsigned int seq) { - struct stream *obuf; struct bgp_info *info; struct bgp_node *rn; struct bgp *bgp; @@ -320,81 +405,17 @@ bgp_dump_routes_func (int afi, int first if(first_run) bgp_dump_routes_index_table(bgp); - obuf = bgp_dump_obuf; - stream_reset(obuf); - /* Walk down each BGP route. */ table = bgp->rib[afi][SAFI_UNICAST]; for (rn = bgp_table_top (table); rn; rn = bgp_route_next (rn)) { - if(!rn->info) - continue; - - stream_reset(obuf); - - /* MRT header */ - if (afi == AFI_IP) - bgp_dump_header (obuf, MSG_TABLE_DUMP_V2, TABLE_DUMP_V2_RIB_IPV4_UNICAST, - BGP_DUMP_ROUTES); - else if (afi == AFI_IP6) - bgp_dump_header (obuf, MSG_TABLE_DUMP_V2, TABLE_DUMP_V2_RIB_IPV6_UNICAST, - BGP_DUMP_ROUTES); - - /* Sequence number */ - stream_putl(obuf, seq); - - /* Prefix length */ - stream_putc (obuf, rn->p.prefixlen); - - /* Prefix */ - if (afi == AFI_IP) - { - /* We'll dump only the useful bits (those not 0), but have to align on 8 bits */ - stream_write(obuf, (u_char *)&rn->p.u.prefix4, (rn->p.prefixlen+7)/8); - } - else if (afi == AFI_IP6) - { - /* We'll dump only the useful bits (those not 0), but have to align on 8 bits */ - stream_write (obuf, (u_char *)&rn->p.u.prefix6, (rn->p.prefixlen+7)/8); - } - - /* Save where we are now, so we can overwride the entry count later */ - int sizep = stream_get_endp(obuf); - - /* Entry count */ - uint16_t entry_count = 0; - - /* Entry count, note that this is overwritten later */ - stream_putw(obuf, 0); - - for (info = rn->info; info; info = info->next) - { - entry_count++; - - /* Peer index */ - stream_putw(obuf, info->peer->table_dump_index); - - /* Originated */ -#ifdef HAVE_CLOCK_MONOTONIC - stream_putl (obuf, time(NULL) - (bgp_clock() - info->uptime)); -#else - stream_putl (obuf, info->uptime); -#endif /* HAVE_CLOCK_MONOTONIC */ - - /* Dump attribute. */ - /* Skip prefix & AFI/SAFI for MP_NLRI */ - bgp_dump_routes_attr (obuf, info->attr, &rn->p); - } - - /* Overwrite the entry count, now that we know the right number */ - stream_putw_at (obuf, sizep, entry_count); - - seq++; - - bgp_dump_set_size(obuf, MSG_TABLE_DUMP_V2); - fwrite (STREAM_DATA (obuf), stream_get_endp (obuf), 1, bgp_dump_routes.fp); - + info = rn->info; + while (info) + { + info = bgp_dump_route_node_record(afi, rn, info, seq); + seq++; + } } fflush (bgp_dump_routes.fp); @@ -841,8 +862,8 @@ bgp_dump_init (void) memset (&bgp_dump_updates, 0, sizeof (struct bgp_dump)); memset (&bgp_dump_routes, 0, sizeof (struct bgp_dump)); - bgp_dump_obuf = stream_new (BGP_MAX_PACKET_SIZE + BGP_DUMP_MSG_HEADER - + BGP_DUMP_HEADER_SIZE); + bgp_dump_obuf = stream_new ((BGP_MAX_PACKET_SIZE << 1) + + BGP_DUMP_MSG_HEADER + BGP_DUMP_HEADER_SIZE); install_node (&bgp_dump_node, config_write_bgp_dump);

1 0

commit zypper-docker for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package zypper-docker for openSUSE:Factory checked in at 2016-05-05 12:12:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper-docker (Old) and /work/SRC/openSUSE:Factory/.zypper-docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper-docker" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper-docker/zypper-docker.changes 2016-04-30 23:31:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zypper-docker.new/zypper-docker.changes 2016-05-05 12:12:23.000000000 +0200 @@ -1,0 +2,5 @@ +Wed May 4 14:07:31 UTC 2016 - jmassaguerpla(a)suse.com + +- Release version 1.2.0 (bsc#978467). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper-docker.spec ++++++ --- /var/tmp/diff_new_pack.dMEFZM/_old 2016-05-05 12:12:24.000000000 +0200 +++ /var/tmp/diff_new_pack.dMEFZM/_new 2016-05-05 12:12:24.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package zypper-docker # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define go_arches %ix86 x86_64 %ifarch %go_arches @@ -30,10 +31,10 @@ Name: zypper-docker Version: 1.2.0 Release: 0 -License: Apache-2.0 Summary: Easy patch and update solution for Docker images -Url: https://github.com/SUSE/zypper-docker +License: Apache-2.0 Group: Development/Languages/Other +Url: https://github.com/SUSE/zypper-docker Source0: %{name}-%{version}.tar.xz Source42: zypper-docker-rpmlintrc %ifarch %go_arches @@ -89,3 +90,5 @@ %{_bindir}/zypper-docker %{_mandir}/man1/zypper-docker-*.1.gz %{_mandir}/man1/zypper-docker.1.gz + +%changelog

1 0

commit crmsh for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2016-05-05 12:12:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2016-04-28 16:59:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2016-05-05 12:12:22.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 03 14:19:08 UTC 2016 - kgronlund(a)suse.com + +- Update to version 2.2.0+git.1462285059.d79cd0d: + + high: ui_root: Add crm verify command + + medium: hb_report: Fix broken -S option (#137) + + low: hb_report: Fix spurious error on missing events.txt + + low: scripts: Note SBD recommendation in vmware script (fate#318320) + + low: scripts: Note SBD recommendation in libvirt script (fate#318320) + +------------------------------------------------------------------- @@ -69 +79 @@ - + high: history: Faster log parsing (bsc#920278) + + high: history: Faster log parsing (bsc#970278) Old: ---- crmsh-2.2.0+git.1461246131.bf3c265.tar.bz2 New: ---- crmsh-2.2.0+git.1462285059.d79cd0d.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.TmGExt/_old 2016-05-05 12:12:23.000000000 +0200 +++ /var/tmp/diff_new_pack.TmGExt/_new 2016-05-05 12:12:23.000000000 +0200 @@ -32,13 +32,13 @@ %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%define version_unconverted 2.2.0+git.1461246131.bf3c265 +%define version_unconverted 2.2.0+git.1462285059.d79cd0d Name: crmsh Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.2.0+git.1461246131.bf3c265 +Version: 2.2.0+git.1462285059.d79cd0d Release: 0 Url: http://crmsh.github.io Source0: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.TmGExt/_old 2016-05-05 12:12:23.000000000 +0200 +++ /var/tmp/diff_new_pack.TmGExt/_new 2016-05-05 12:12:23.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/crmsh.git</param> - <param name="changesrevision">bf3c265508ce63bf1eb9c873534c29cfa488420d</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">d79cd0db97b99ccb6d4dbbe9797917c18a4982aa</param></service></servicedata> \ No newline at end of file ++++++ crmsh-2.2.0+git.1461246131.bf3c265.tar.bz2 -> crmsh-2.2.0+git.1462285059.d79cd0d.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/.gitignore new/crmsh-2.2.0+git.1462285059.d79cd0d/.gitignore --- old/crmsh-2.2.0+git.1461246131.bf3c265/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/.gitignore 2016-05-03 16:17:39.000000000 +0200 @@ -0,0 +1,19 @@ +*.pyc +*~ +#*.*# +.#* +doc/website-v1/gen +Makefile.in +autom4te.cache +patches/* + +# Tool specific files +.README.md.html +.*.*~ +.project +.settings +.pydevproject + +contrib/build/ +contrib/dist/ +contrib/pygments_crmsh_lexers.egg-info/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/.hgignore new/crmsh-2.2.0+git.1462285059.d79cd0d/.hgignore --- old/crmsh-2.2.0+git.1461246131.bf3c265/.hgignore 1970-01-01 01:00:00.000000000 +0100 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/.hgignore 2016-05-03 16:17:39.000000000 +0200 @@ -0,0 +1,7 @@ +syntax: glob + +*.pyc +*~ +#*.*# +doc/gen + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/README.md new/crmsh-2.2.0+git.1462285059.d79cd0d/README.md --- old/crmsh-2.2.0+git.1461246131.bf3c265/README.md 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/README.md 2016-05-03 16:17:39.000000000 +0200 @@ -1,6 +1,7 @@ # crmsh [![Build Status](https://travis-ci.org/ClusterLabs/crmsh.svg?branch=master)](https:/… +[![Code Health](https://landscape.io/github/ClusterLabs/crmsh/master/landscape.svg?style=flat)](https://landscape.io/github/ClusterLabs/crmsh/master) ## Introduction @@ -21,7 +22,13 @@ ## Installation -Autoconf is used to take care of platform dependent locations. It is mainly inherited from the Pacemaker source. +The GNU Autotools suite is used to configure the OCF root directory, +the Asciidoc tool which is used to generate documentation and the +default daemon user (usually hacluster). + +It then calls the python setuptools setup.py to actually process the +Python module sources and install into the Python system site-packages +directory. ```shell ./autogen.sh @@ -52,6 +59,14 @@ git clone https://github.com/ClusterLabs/crmsh ``` +There is a git `pre-commit` hook used to update the data-manifest +which lists all the data files to be installed. To install this, run + +```shell +cp contrib/git-hook-pre-commit .git/hooks/pre-commit +chmod +x .git/hooks/pre-commit +``` + ## Community * Bugs and issues can be reported at the [crmsh issues @ Github.com](https://github.com/clusterlabs/crmsh/issues) page. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/configure.ac new/crmsh-2.2.0+git.1462285059.d79cd0d/configure.ac --- old/crmsh-2.2.0+git.1461246131.bf3c265/configure.ac 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/configure.ac 2016-05-03 16:17:39.000000000 +0200 @@ -8,7 +8,7 @@ AC_PREREQ([2.53]) -AC_INIT([crmsh],[2.2.0],[users(a)clusterlabs.org]) +AC_INIT([crmsh],[2.3.0],[users(a)clusterlabs.org]) AC_ARG_WITH(version, [ --with-version=version Override package version (if you're a packager needing to pretend) ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/crm new/crmsh-2.2.0+git.1462285059.d79cd0d/crm --- old/crmsh-2.2.0+git.1461246131.bf3c265/crm 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/crm 2016-05-03 16:17:39.000000000 +0200 @@ -1,8 +1,22 @@ #!/usr/bin/python # +# crmsh, command line interface for Linux HA clusters # Copyright (C) 2008-2015 Dejan Muhamedagic <dmuhamedagic(a)suse.de> # Copyright (C) 2013-2015 Kristoffer Gronlund <kgronlund(a)suse.com> -# See COPYING for license information. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/crmsh/cmd_status.py new/crmsh-2.2.0+git.1462285059.d79cd0d/crmsh/cmd_status.py --- old/crmsh-2.2.0+git.1461246131.bf3c265/crmsh/cmd_status.py 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/crmsh/cmd_status.py 2016-05-03 16:17:39.000000000 +0200 @@ -118,3 +118,24 @@ utils.page_string(CrmMonFilter()(s)) return True + + +def cmd_verify(args): + ''' + Calls crm_verify -LV; ptest -L -VVVV + ''' + from . import config + from . import clidisplay + if "ptest" in config.core.ptest: + cmd1 = "crm_verify -LV; %s -L -VVVV" % (config.core.ptest) + else: + cmd1 = "crm_verify -LV; %s -LjV" % (config.core.ptest) + + if "scores" in args: + cmd1 += " -s" + + cmd1 = utils.add_sudo(cmd1) + rc, s, e = utils.get_stdout_stderr(cmd1) + e = '\n'.join(clidisplay.error(l) for l in e.split('\n')).strip() + utils.page_string("\n".join((s, e))) + return rc == 0 and not e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/crmsh/ui_root.py new/crmsh-2.2.0+git.1462285059.d79cd0d/crmsh/ui_root.py --- old/crmsh-2.2.0+git.1461246131.bf3c265/crmsh/ui_root.py 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/crmsh/ui_root.py 2016-05-03 16:17:39.000000000 +0200 @@ -181,6 +181,19 @@ def do_status(self, context, *args): return cmd_status.cmd_status(args) + @command.help('''Verify cluster state +Performs basic checks for the cluster configuration and +current status, reporting potential issues. + +Usage: +................. +verify [scores] +................. +''') + def do_verify(self, context, *args): + return cmd_status.cmd_verify(args) + + # this will initialize _children for all levels under the root Root.init_ui() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/doc/crm.8.adoc new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/crm.8.adoc --- old/crmsh-2.2.0+git.1461246131.bf3c265/doc/crm.8.adoc 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/crm.8.adoc 2016-05-03 16:17:39.000000000 +0200 @@ -1,5 +1,5 @@ :man source: crm -:man version: 2.2.0 +:man version: 2.3.0 :man manual: crmsh documentation crm(8) @@ -892,6 +892,26 @@ | brief ............... +[[cmdhelp_root_verify,Verify cluster status]] +=== `verify` + +Performs basic checks for the cluster configuration and +current status, reporting potential issues. + +See `crm_verify(8)` and `crm_simulate(8)` for more details. + +Example: +............... +verify +verify scores +............... + +Usage: +............... +verify [scores] +............... + + [[cmdhelp_cluster,Cluster setup and management]] === `cluster` - Cluster setup and management diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/doc/website-v1/index.adoc new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/website-v1/index.adoc --- old/crmsh-2.2.0+git.1461246131.bf3c265/doc/website-v1/index.adoc 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/website-v1/index.adoc 2016-05-03 16:17:39.000000000 +0200 @@ -18,6 +18,6 @@ insight into the state of your cluster. * https://github.com/ClusterLabs/crmsh/[Source Code] -* http://crmsh.github.io/man-2.0/[Reference Manual (v2.2.0)] +* http://crmsh.github.io/man-2.0/[Reference Manual (v2.2.1)] * https://build.opensuse.org/package/show/network:ha-clustering:Stable/crmsh[… * http://clusterlabs.org[Cluster Labs] \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/doc/website-v1/man-2.0.adoc new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/website-v1/man-2.0.adoc --- old/crmsh-2.2.0+git.1461246131.bf3c265/doc/website-v1/man-2.0.adoc 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/website-v1/man-2.0.adoc 2016-05-03 16:17:39.000000000 +0200 @@ -1,5 +1,5 @@ :man source: crm -:man version: 2.2.0 +:man version: 2.2.1 :man manual: crmsh documentation crm(8) @@ -97,6 +97,11 @@ Extra directory where crm looks for cluster scripts, or a list of directories separated by semi-colons (e.g. +/dir1;/dir2;etc.+). +*-o, --opt*='OPTION=VALUE':: + Set crmsh option temporarily. If the options are saved using + +options save+ then the value passed here will also be saved. + Multiple options can be set by using +-o+ multiple times. + [[topics_Introduction,Introduction]] == Introduction @@ -1211,7 +1216,7 @@ Usage: ......... -add-node <addr> +add-node <addr> [name] ......... [[cmdhelp_corosync_del-node,Remove a corosync node]] @@ -2085,6 +2090,21 @@ ready [<node>] ............... +[[cmdhelp_node_server,show node hostname or server address]] +==== `server` + +Remote nodes may have a configured server address which should +be used when contacting the node. This command prints the +server address if configured, else the node name. + +If no parameter is given, the adresses or names for all nodes +are printed. + +Usage: +............... +server [<node> ...] +............... + [[cmdhelp_node_show,show node]] ==== `show` @@ -2936,8 +2956,11 @@ Load a part of configuration (or all of it) from a local file or a network URL. The +replace+ method replaces the current -configuration with the one from the source. The +update+ tries to -import the contents into the current configuration. +configuration with the one from the source. The +update+ method +tries to import the contents into the current configuration. The ++push+ method imports the contents into the current configuration +and removes any lines that are not present in the given +configuration. The file may be a CLI file or an XML file. If the URL is `-`, the configuration is read from standard input. @@ -2946,12 +2969,13 @@ ............... load [xml] <method> URL -method :: replace | update +method :: replace | update | push ............... Example: ............... load xml update myfirstcib.xml load xml replace http://storage.big.com/cibs/bigcib.xml +load xml push smallcib.xml ............... [[cmdhelp_configure_location,a location preference]] @@ -3653,6 +3677,11 @@ example, to show both the tag itself and the objects tagged by it the following combination can be used: +show tag:my-tag my-tag+. +To refine a selection of objects using multiple modifiers, the keywords ++and+ and +or+ can be used. For example, to select all primitives tagged ++foo+, the following combination can be used: ++show type:primitive and tag:foo+. + Usage: ............... show [xml] [<id> @@ -3679,8 +3708,8 @@ show related:webapp ............... -[[cmdhelp_configure_show_property,Show property value]] -==== `show-property` +[[cmdhelp_configure_get_property,Get property value]] +==== `get-property` Show the value of the given property. If the value is not set, the command will print the default value for the property, if known. @@ -3692,19 +3721,19 @@ property sets with different rule expressions, the output of this command is undefined. -Pass the argument +-t+ or +--true+ to `show-property` to translate +Pass the argument +-t+ or +--true+ to `get-property` to translate the argument value into +true+ or +false+. If the value is not set, the command will print +false+. Usage: ............... -show-property [-t|--true] [<name>] +get-property [-t|--true] [<name>] ............... Example: ............... -show-property stonith-enabled -show-property -t maintenance-mode +get-property stonith-enabled +get-property -t maintenance-mode ............... [[cmdhelp_configure_tag,Define resource tags]] @@ -4765,6 +4794,22 @@ transition save 0 enigma-22 ............... +[[cmdhelp_history_transitions,List transitions]] +==== `transitions` + +A transition represents a change in cluster configuration or +state. This command lists the transitions in the current timeframe. + +Usage: +............... +transitions +............... +Example: +............... +transitions +............... + + [[cmdhelp_history_wdiff,cluster states/transitions difference]] ==== `wdiff` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/doc/website-v1/news/2016-04-28-release-2_2_1.adoc new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/website-v1/news/2016-04-28-release-2_2_1.adoc --- old/crmsh-2.2.0+git.1461246131.bf3c265/doc/website-v1/news/2016-04-28-release-2_2_1.adoc 1970-01-01 01:00:00.000000000 +0100 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/website-v1/news/2016-04-28-release-2_2_1.adoc 2016-05-03 16:17:39.000000000 +0200 @@ -0,0 +1,73 @@ +crmsh 2.2.1 and 2.1.6 are released +================================== +:Author: Kristoffer Gronlund +:Email: kgronlund(a)suse.com +:Date: 2016-04-28 01:00 + +Today I'm announcing two new releases of crmsh: 2.2.1 and 2.1.6. + +Both are stable releases, and I would recommend all users to +upgrade to crmsh 2.2.1 if they can. + +== crmsh 2.2.1 + +Here is a brief list of the most significant changes in this release: + +* Rewritten history explorer internally to improve performance significantly +* Allow configuring reload operation +* Fix fencing for remote nodes +* Recycle corosync node IDs when possible +* Several bug fixes in crm report +* Warn if generated report is empty +* Improved SBD cluster script +* Add push method for configure load +* Fixed cluster init + +The source code can be downloaded from Github: + +* https://github.com/ClusterLabs/crmsh/releases/tag/2.2.1 + +Packages for several popular Linux distributions can be downloaded +from the Stable repository at the OBS: + +* http://download.opensuse.org/repositories/network:/ha-clustering:/Stable/ + +Archives of the tagged release: + +* https://github.com/ClusterLabs/crmsh/archive/2.2.1.tar.gz +* https://github.com/ClusterLabs/crmsh/archive/2.2.1.zip + +For the full list of changes since version 2.2.0, see the ChangeLog, +available at: + +* https://github.com/ClusterLabs/crmsh/blob/2.2.1/ChangeLog + +== crmsh 2.1.6 + +This is a bug fix release. +Most fixes are minor or related to time handling in reports. + +For a complete list of changes since the previous version, please +refer to the changelog: + +* https://github.com/ClusterLabs/crmsh/blob/2.1.6/ChangeLog + +Currently I'm not building binary releases for 2.1.6 as the stable +series (at OBS) is at 2.2. This release is intended for users of +the 2.1 series who have yet to migrate to 2.2. + +Archives of the tagged release: + +https://github.com/ClusterLabs/crmsh/archive/2.1.6.tar.gz +https://github.com/ClusterLabs/crmsh/archive/2.1.6.zip + +For the full list of changes since version 2.1.5, see the ChangeLog, +available at: + +* https://github.com/ClusterLabs/crmsh/blob/2.1.5/ChangeLog + + +As usual, a huge thank you to all contributors and users of crmsh! + +Cheers, +Kristoffer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/doc/website-v1/news.adoc new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/website-v1/news.adoc --- old/crmsh-2.2.0+git.1461246131.bf3c265/doc/website-v1/news.adoc 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/doc/website-v1/news.adoc 2016-05-03 16:17:39.000000000 +0200 @@ -1,14 +1,15 @@ = News -link:/news/2016-01-15-release-2_2_0[2016-01-15 15:00] +link:/news/2016-04-28-release-2_2_1[2016-04-28 01:00] :leveloffset: 1 -include::news/2016-01-15-release-2_2_0.adoc[] +include::news/2016-04-28-release-2_2_1.adoc[] :leveloffset: 0 '''' +* link:/news/2016-01-15-release-2_2_0[2016-01-15 15:00 crmsh 2.2.0 is released] * link:/news/2016-01-12-release-2_1_5[2016-01-12 10:00 Announcing crmsh stable release 2.1.5] * link:/news/2015-05-25-getting-started-jp[2015-05-25 13:30 Getting Started translated to Japanese] * link:/news/2015-05-13-release-2_1_4[2015-05-13 15:30 Announcing crmsh stable release 2.1.4] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/hb_report/hb_report.in new/crmsh-2.2.0+git.1462285059.d79cd0d/hb_report/hb_report.in --- old/crmsh-2.2.0+git.1461246131.bf3c265/hb_report/hb_report.in 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/hb_report/hb_report.in 2016-05-03 16:17:39.000000000 +0200 @@ -562,9 +562,8 @@ debug "running: $LOCAL_SUDO hb_report __slave" $LOCAL_SUDO ${HA_NOARCHBIN}/hb_report __slave else - debug "running: ssh $SSH_OPTS $node \"$SUDO hb_report __slave" - ssh $SSH_OPTS $node \ - "$SUDO ${HA_NOARCHBIN}/hb_report __slave" + debug "running: ssh $SSH_OPTS $node \"$SUDO ${HA_NOARCHBIN}/hb_report __slave\"" + ssh $SSH_OPTS $node "$SUDO ${HA_NOARCHBIN}/hb_report __slave" fi | (cd $WORKDIR && tar xf -) } @@ -972,7 +971,9 @@ if [ -f $destdir/$HALOG_F ]; then events_all $destdir/$HALOG_F > $destdir/events.txt for n in $NODES; do - awk "\$4==\"$n\"" $destdir/events.txt > $destdir/$n/events.txt + if [ -d "$destdir/$n" ]; then + awk "\$4==\"$n\"" $destdir/events.txt > $destdir/$n/events.txt + fi done else for n in $NODES; do @@ -1424,9 +1425,8 @@ # # Start slave collectors # - -if ! is_collector; then - for node in $NODES; do +collect_for_nodes() { + for node in "$@"; do if node_needs_pwd $node; then info "Please provide password for `say_ssh_user` at $node" info "Note that collecting data will take a while." @@ -1436,6 +1436,14 @@ SLAVEPIDS="$SLAVEPIDS $!" fi done +} + +if ! is_collector; then + if [ -z "$NO_SSH" ]; then + collect_for_nodes $NODES + elif is_node; then + collect_for_nodes "$WE" + fi fi # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/scripts/libvirt/main.yml new/crmsh-2.2.0+git.1462285059.d79cd0d/scripts/libvirt/main.yml --- old/crmsh-2.2.0+git.1461246131.bf3c265/scripts/libvirt/main.yml 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/scripts/libvirt/main.yml 2016-05-03 16:17:39.000000000 +0200 @@ -6,6 +6,9 @@ longdesc: > Uses libvirt as a STONITH device to fence a guest node. Create a separate resource for each guest node in the cluster. + + Note that the recommended fencing mechanism is SBD whenever + a shared storage device (like a SAN) is available. category: Stonith parameters: - name: id diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/scripts/vmware/main.yml new/crmsh-2.2.0+git.1462285059.d79cd0d/scripts/vmware/main.yml --- old/crmsh-2.2.0+git.1461246131.bf3c265/scripts/vmware/main.yml 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/scripts/vmware/main.yml 2016-05-03 16:17:39.000000000 +0200 @@ -3,12 +3,16 @@ # License: GNU General Public License (GPL) version: 2.2 category: Stonith -shortdesc: VMWare vCenter / ESX Server Fencing +shortdesc: Fencing using vCenter / ESX Server longdesc: | + Note that SBD is the recommended fencing mechanism for VMware + hosts! Please refer to the documentation for more details on + recommended fencing configurations. + Fencing for VMware virtualized hosts using ESX Server or vCenter. This wizard configures a fencing resource for a single node. - You will need to run the wizard for each node to fence. + It is necessary to run the wizard for each node to fence. Prerequisites diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/test/testcases/bugs new/crmsh-2.2.0+git.1462285059.d79cd0d/test/testcases/bugs --- old/crmsh-2.2.0+git.1461246131.bf3c265/test/testcases/bugs 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/test/testcases/bugs 2016-05-03 16:17:39.000000000 +0200 @@ -40,3 +40,25 @@ _test verify . +session Unknown properties +configure +erase +primitive st stonith:null \ + params hostlist='node1' \ + meta description="some description here" \ + op start requires=nothing \ + op monitor interval=60m +property SAPHanaSR: \ + hana_ha1_site_lss_WDF1=4 +show +commit +_test +verify +property SAPHanaSR_2: \ + hana_ha1_site_iss_WDF1=cde \ + hana_ha1_site_bss_WDF1=abc +show xml +commit +_test +verify +. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/test/testcases/bugs.exp new/crmsh-2.2.0+git.1462285059.d79cd0d/test/testcases/bugs.exp --- old/crmsh-2.2.0+git.1461246131.bf3c265/test/testcases/bugs.exp 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/test/testcases/bugs.exp 2016-05-03 16:17:39.000000000 +0200 @@ -96,3 +96,64 @@ .EXT cib metadata .INP: _test .INP: verify +.TRY Unknown properties +.INP: configure +.INP: erase +INFO: 2: modified location:loc1 from g1 to gr2 +INFO: 2: constraint colocation:c2 updated +INFO: 2: constraint colocation:c2 updated +.INP: primitive st stonith:null params hostlist='node1' meta description="some description here" op start requires=nothing op monitor interval=60m +.INP: property SAPHanaSR: hana_ha1_site_lss_WDF1=4 +.INP: show +node node1 +primitive st stonith:null \ + params hostlist=node1 \ + meta description="some description here" \ + op start requires=nothing interval=0 \ + op monitor interval=60m +property SAPHanaSR: \ + hana_ha1_site_lss_WDF1=4 +.INP: commit +.EXT crm_resource --show-metadata stonith:null +.EXT stonithd metadata +.EXT pengine metadata +.INP: _test +.INP: verify +.INP: property SAPHanaSR_2: hana_ha1_site_iss_WDF1=cde hana_ha1_site_bss_WDF1=abc +.INP: show xml +<?xml version="1.0" ?> +<cib> + <configuration> + <crm_config> + <cluster_property_set id="SAPHanaSR_2"> + <nvpair name="hana_ha1_site_iss_WDF1" value="cde" id="SAPHanaSR_2-hana_ha1_site_iss_WDF1"/> + <nvpair name="hana_ha1_site_bss_WDF1" value="abc" id="SAPHanaSR_2-hana_ha1_site_bss_WDF1"/> + </cluster_property_set> + <cluster_property_set id="SAPHanaSR"> + <nvpair name="hana_ha1_site_lss_WDF1" value="4" id="SAPHanaSR-hana_ha1_site_lss_WDF1"/> + </cluster_property_set> + </crm_config> + <nodes> + <node uname="node1" id="node1"/> + </nodes> + <resources> + <primitive id="st" class="stonith" type="null"> + <instance_attributes id="st-instance_attributes"> + <nvpair name="hostlist" value="node1" id="st-instance_attributes-hostlist"/> + </instance_attributes> + <meta_attributes id="st-meta_attributes"> + <nvpair name="description" value="some description here" id="st-meta_attributes-description"/> + </meta_attributes> + <operations> + <op name="start" requires="nothing" interval="0" id="st-start-0"/> + <op name="monitor" interval="60m" id="st-monitor-60m"/> + </operations> + </primitive> + </resources> + <constraints/> + </configuration> +</cib> + +.INP: commit +.INP: _test +.INP: verify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/test/testcases/scripts.exp new/crmsh-2.2.0+git.1462285059.d79cd0d/test/testcases/scripts.exp --- old/crmsh-2.2.0+git.1461246131.bf3c265/test/testcases/scripts.exp 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/test/testcases/scripts.exp 2016-05-03 16:17:39.000000000 +0200 @@ -57,6 +57,7 @@ libvirt STONITH for libvirt (kvm / Xen) sbd SBD, Shared storage based fencing +vmware Fencing using vCenter / ESX Server .INP: list all .EXT crm_resource --show-metadata systemd:haproxy @@ -120,6 +121,7 @@ libvirt STONITH for libvirt (kvm / Xen) sbd SBD, Shared storage based fencing +vmware Fencing using vCenter / ESX Server .INP: list names add @@ -160,6 +162,7 @@ sbd sbd-device virtual-ip +vmware .INP: list names all add apache @@ -198,6 +201,7 @@ sbd sbd-device virtual-ip +vmware .INP: list all names add apache @@ -236,6 +240,7 @@ sbd sbd-device virtual-ip +vmware .INP: list bogus ERROR: 7: script.list: Unexpected argument 'bogus': expected [all|names] .INP: show mailto diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh-2.2.0+git.1461246131.bf3c265/test/unittests/test_bugs.py new/crmsh-2.2.0+git.1462285059.d79cd0d/test/unittests/test_bugs.py --- old/crmsh-2.2.0+git.1461246131.bf3c265/test/unittests/test_bugs.py 2016-04-21 15:46:53.000000000 +0200 +++ new/crmsh-2.2.0+git.1462285059.d79cd0d/test/unittests/test_bugs.py 2016-05-03 16:17:39.000000000 +0200 @@ -924,3 +924,14 @@ assert ok ok = factory.create_object(*"primitive dup1 Dummy".split()) assert not ok + + +@with_setup(setup_func, teardown_func) +def test_dup_create(): + """ + Creating property sets with unknown properties + """ + ok = factory.create_object(*"property hana_test1: hana_attribute_1=5 hana_attribute_2=mohican".split()) + assert ok + ok = factory.create_object(*"property hana_test2: hana_attribute_1=5s a-b-c-d=e-f-g".split()) + assert ok

1 0

commit python-gobject for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package python-gobject for openSUSE:Factory checked in at 2016-05-05 12:12:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-gobject (Old) and /work/SRC/openSUSE:Factory/.python-gobject.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-gobject" Changes: -------- --- /work/SRC/openSUSE:Factory/python-gobject/python-gobject.changes 2016-04-28 16:49:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-gobject.new/python-gobject.changes 2016-05-05 12:12:16.000000000 +0200 @@ -1,0 +2,13 @@ +Tue May 3 21:29:34 UTC 2016 - dimstar(a)opensuse.org + +- Move gi/overrides/keysyms.* also to the -Gdk subpackage: Keysyms + is mapped to Gdk symbols and is only usable in GUI apps. + +------------------------------------------------------------------- +Mon Apr 25 08:20:10 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 3.20.1: + + test_gerror_novalue: Don't assign the error to a variable + (bgo#764165). + +------------------------------------------------------------------- python3-gobject.changes: same change Old: ---- pygobject-3.20.0.tar.xz New: ---- pygobject-3.20.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-gobject.spec ++++++ --- /var/tmp/diff_new_pack.6Zxetn/_old 2016-05-05 12:12:17.000000000 +0200 +++ /var/tmp/diff_new_pack.6Zxetn/_new 2016-05-05 12:12:17.000000000 +0200 @@ -39,7 +39,7 @@ Summary: Python bindings for GObject License: LGPL-2.1+ Group: Development/Libraries/Python -Version: 3.20.0 +Version: 3.20.1 Release: 0 Url: https://wiki.gnome.org/Projects/PyGObject/ Source: http://download.gnome.org/sources/pygobject/3.20/%{_name}-%{version}.tar.xz @@ -152,11 +152,13 @@ %exclude %{local_py_sitedir}/gi/_gi_cairo*.so %exclude %{local_py_sitedir}/gi/overrides/Gdk.* %exclude %{local_py_sitedir}/gi/overrides/Gtk.* +%exclude %{local_py_sitedir}/gi/overrides/keysyms.* %files Gdk %defattr(-,root,root) %{local_py_sitedir}/gi/overrides/Gdk.* %{local_py_sitedir}/gi/overrides/Gtk.* +%{local_py_sitedir}/gi/overrides/keysyms.* %files cairo %defattr(-,root,root) python3-gobject.spec: same change ++++++ pygobject-3.20.0.tar.xz -> pygobject-3.20.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/ChangeLog new/pygobject-3.20.1/ChangeLog --- old/pygobject-3.20.0/ChangeLog 2016-03-22 04:35:12.000000000 +0100 +++ new/pygobject-3.20.1/ChangeLog 2016-04-25 05:56:58.000000000 +0200 @@ -1,3 +1,29 @@ +commit 1e1d5e071683287f3dcb99cc4407eed566dcb0e3 +Author: Iain Lane <iain(a)orangesquash.org.uk> +Date: Thu Mar 24 18:04:40 2016 +0000 + + test_gerror_novalue: Don't assign the error to a variable + + Otherwise the build fails with: + + CHECK Pyflakes examples gi tests pygtkcompat + tests/test_gobject.py:689: local variable 'error' is assigned to + but never used + + https://bugzilla.gnome.org/show_bug.cgi?id=764165 + + tests/test_gobject.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3a4a867477c4adbe5343d1ccb8bbc00dcc1c1345 +Author: Simon Feltman <sfeltman(a)src.gnome.org> +Date: Mon Mar 21 20:45:54 2016 -0700 + + configure.ac: post-release version bump to 3.20.1 + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + commit ce3034544f126f196cad57485f126f1246cd1acf Author: Simon Feltman <sfeltman(a)src.gnome.org> Date: Mon Mar 21 20:34:50 2016 -0700 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/Makefile.in new/pygobject-3.20.1/Makefile.in --- old/pygobject-3.20.0/Makefile.in 2016-03-22 04:17:52.000000000 +0100 +++ new/pygobject-3.20.1/Makefile.in 2016-04-25 05:54:52.000000000 +0200 @@ -283,6 +283,7 @@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/NEWS new/pygobject-3.20.1/NEWS --- old/pygobject-3.20.0/NEWS 2016-03-22 04:32:05.000000000 +0100 +++ new/pygobject-3.20.1/NEWS 2016-04-25 05:56:20.000000000 +0200 @@ -1,3 +1,7 @@ +3.20.1 24-Apr-2016 + - test_gerror_novalue: Don't assign the error to a variable + (Iain Lane) (#764165) + 3.20.0 21-Mar-2016 3.19.92 15-Mar-2016 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/PKG-INFO new/pygobject-3.20.1/PKG-INFO --- old/pygobject-3.20.0/PKG-INFO 2016-03-22 04:17:55.000000000 +0100 +++ new/pygobject-3.20.1/PKG-INFO 2016-04-25 05:55:50.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyGObject -Version: 3.20.0 +Version: 3.20.1 Summary: Python bindings for GObject Home-page: http://www.pygtk.org/ Author: James Henstridge @@ -8,7 +8,7 @@ Maintainer: Simon Feltman Maintainer-email: sfeltman(a)src.gnome.org License: GNU LGPL -Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.20/pygobject-3.20.0.tar.gz +Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.20/pygobject-3.20.1.tar.gz Description: Python bindings for GLib and GObject Platform: POSIX, Windows Classifier: Development Status :: 5 - Production/Stable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/aclocal.m4 new/pygobject-3.20.1/aclocal.m4 --- old/pygobject-3.20.0/aclocal.m4 2016-03-22 04:17:50.000000000 +0100 +++ new/pygobject-3.20.1/aclocal.m4 2016-04-25 05:54:51.000000000 +0200 @@ -20,221 +20,10 @@ 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 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -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 -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# 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]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -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 -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -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 -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_code_coverage.html +# =========================================================================== # -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# 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 $1]) - -_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 -])# PKG_CHECK_MODULES - - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# 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 - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --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 - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# 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 -])# PKG_CHECK_VAR - # SYNOPSIS # # AX_CODE_COVERAGE() @@ -250,47 +39,87 @@ # corresponds to the value of the --enable-code-coverage option, which # defaults to being disabled. # +# Test also for gcov program and create GCOV variable that could be +# substituted. +# # Note that all optimisation flags in CFLAGS must be disabled when code # coverage is enabled. # # Usage example: +# # configure.ac: -# AX_CODE_COVERAGE +# +# AX_CODE_COVERAGE # # Makefile.am: -# @CODE_COVERAGE_RULES@ -# my_program_LIBS = … $(CODE_COVERAGE_LDFLAGS) … -# my_program_CFLAGS = … $(CODE_COVERAGE_CFLAGS) … -# -# This results in a “check-code-coverage” rule being added to any Makefile.am -# which includes “@CODE_COVERAGE_RULES@” (assuming the module has been -# configured with --enable-code-coverage). Running `make check-code-coverage` -# in that directory will run the module’s test suite (`make check`) and build -# a code coverage report detailing the code which was touched, then print the -# URI for the report. +# +# @CODE_COVERAGE_RULES@ +# my_program_LIBS = ... $(CODE_COVERAGE_LDFLAGS) ... +# my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ... +# +# This results in a "check-code-coverage" rule being added to any +# Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module +# has been configured with --enable-code-coverage). Running `make +# check-code-coverage` in that directory will run the module's test suite +# (`make check`) and build a code coverage report detailing the code which +# was touched, then print the URI for the report. +# +# This code was derived from Makefile.decl in GLib, originally licenced +# under LGPLv2.1+. # # LICENSE # -# Copyright © 2012, 2014 Philip Withnall -# Copyright © 2012 Xan Lopez -# Copyright © 2012 Christian Persch -# Copyright © 2012 Paolo Borelli -# Copyright © 2012 Dan Winship +# Copyright (c) 2012 Philip Withnall +# Copyright (c) 2012 Xan Lopez +# Copyright (c) 2012 Christian Persch +# Copyright (c) 2012 Paolo Borelli +# Copyright (c) 2012 Dan Winship +# Copyright (c) 2015 Bastien ROUCARIES +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or (at +# your option) any later version. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. # -# Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+. -# This file is licenced under LGPLv2.1+. +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. -#serial 1 +#serial 5 AC_DEFUN([AX_CODE_COVERAGE],[ dnl Check for --enable-code-coverage + AC_REQUIRE([AC_PROG_SED]) + + # allow to override gcov location + AC_ARG_WITH([gcov], + [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov]) + AC_MSG_CHECKING([whether to build with code coverage support]) - AC_ARG_ENABLE([code-coverage], AS_HELP_STRING([--enable-code-coverage], [Whether to enable code coverage support]),, enable_code_coverage=no) + AC_ARG_ENABLE([code-coverage], + AS_HELP_STRING([--enable-code-coverage], + [Whether to enable code coverage support]),, + enable_code_coverage=no) + AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes]) AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage]) AC_MSG_RESULT($enable_code_coverage) AS_IF([ test "$enable_code_coverage" = "yes" ], [ + # check for gcov + AC_CHECK_TOOL([GCOV], + [$_AX_CODE_COVERAGE_GCOV_PROG_WITH], + [:]) + AS_IF([test "X$GCOV" = "X:"], + [AC_MSG_ERROR([gcov is needed to do coverage])]) + AC_SUBST([GCOV]) + dnl Check if gcc is being used AS_IF([ test "$GCC" = "no" ], [ AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage]) @@ -349,8 +178,11 @@ # - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage # reports to be created. (Default: # $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance. +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) # - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. -# (Default: empty) +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) # - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml # instance. (Default: empty) # - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore @@ -363,7 +195,9 @@ CODE_COVERAGE_DIRECTORY ?= $(top_builddir) CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage -CODE_COVERAGE_LCOV_OPTIONS ?= +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) CODE_COVERAGE_GENHTML_OPTIONS ?= CODE_COVERAGE_IGNORE_PATTERN ?= @@ -855,6 +689,221 @@ eliminate use of --enable-iso-cxx. See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_comp…]] +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +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 +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# 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]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +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 +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +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 +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# 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 $1]) + +_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 +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# 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 + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --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 + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# 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 +])# PKG_CHECK_VAR + # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/configure new/pygobject-3.20.1/configure --- old/pygobject-3.20.0/configure 2016-03-22 04:17:51.000000000 +0100 +++ new/pygobject-3.20.1/configure 2016-04-25 05:54:51.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pygobject 3.20.0. +# Generated by GNU Autoconf 2.69 for pygobject 3.20.1. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='pygobject' PACKAGE_TARNAME='pygobject' -PACKAGE_VERSION='3.20.0' -PACKAGE_STRING='pygobject 3.20.0' +PACKAGE_VERSION='3.20.1' +PACKAGE_STRING='pygobject 3.20.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject' PACKAGE_URL='https://wiki.gnome.org/Projects/PyGObject/' @@ -643,6 +643,7 @@ CODE_COVERAGE_CFLAGS GENHTML LCOV +GCOV CODE_COVERAGE_ENABLED CODE_COVERAGE_ENABLED_FALSE CODE_COVERAGE_ENABLED_TRUE @@ -832,6 +833,7 @@ with_common enable_compile_warnings enable_iso_c +with_gcov enable_code_coverage ' ac_precious_vars='build_alias @@ -1398,7 +1400,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 pygobject 3.20.0 to adapt to many kinds of systems. +\`configure' configures pygobject 3.20.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1468,7 +1470,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pygobject 3.20.0:";; + short | recursive ) echo "Configuration of pygobject 3.20.1:";; esac cat <<\_ACEOF @@ -1512,6 +1514,7 @@ few standard names such as "python3" or "python2" --without-common For package maintainers: do not install Python version independent files + --with-gcov=GCOV use given GCOV for coverage (GCOV=gcov). Some influential environment variables: CC C compiler command @@ -1611,7 +1614,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pygobject configure 3.20.0 +pygobject configure 3.20.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1889,7 +1892,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pygobject $as_me 3.20.0, which was +It was created by pygobject $as_me 3.20.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2253,9 +2256,9 @@ PYGOBJECT_MINOR_VERSION=20 -$as_echo "#define PYGOBJECT_MICRO_VERSION 0" >>confdefs.h +$as_echo "#define PYGOBJECT_MICRO_VERSION 1" >>confdefs.h -PYGOBJECT_MICRO_VERSION=0 +PYGOBJECT_MICRO_VERSION=1 ac_config_headers="$ac_config_headers config.h" @@ -2777,7 +2780,7 @@ # Define the identity of the package. PACKAGE='pygobject' - VERSION='3.20.0' + VERSION='3.20.1' cat >>confdefs.h <<_ACEOF @@ -14930,7 +14933,19 @@ $as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 + + + # allow to override gcov location + +# Check whether --with-gcov was given. +if test "${with_gcov+set}" = set; then : + withval=$with_gcov; _AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov +else + _AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 $as_echo_n "checking whether to build with code coverage support... " >&6; } # Check whether --enable-code-coverage was given. if test "${enable_code_coverage+set}" = set; then : @@ -14939,6 +14954,7 @@ enable_code_coverage=no fi + if test x$enable_code_coverage = xyes; then CODE_COVERAGE_ENABLED_TRUE= CODE_COVERAGE_ENABLED_FALSE='#' @@ -14954,6 +14970,104 @@ if test "$enable_code_coverage" = "yes" ; then : + # check for gcov + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH", so it can be a program name with args. +set dummy ${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH; 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_prog_GCOV+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GCOV"; then + ac_cv_prog_GCOV="$GCOV" # Let the user override the test. +else +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_prog_GCOV="${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH" + $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 + +fi +fi +GCOV=$ac_cv_prog_GCOV +if test -n "$GCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5 +$as_echo "$GCOV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_GCOV"; then + ac_ct_GCOV=$GCOV + # Extract the first word of "$_AX_CODE_COVERAGE_GCOV_PROG_WITH", so it can be a program name with args. +set dummy $_AX_CODE_COVERAGE_GCOV_PROG_WITH; 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_prog_ac_ct_GCOV+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_GCOV"; then + ac_cv_prog_ac_ct_GCOV="$ac_ct_GCOV" # Let the user override the test. +else +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_prog_ac_ct_GCOV="$_AX_CODE_COVERAGE_GCOV_PROG_WITH" + $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 + +fi +fi +ac_ct_GCOV=$ac_cv_prog_ac_ct_GCOV +if test -n "$ac_ct_GCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GCOV" >&5 +$as_echo "$ac_ct_GCOV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_GCOV" = x; then + GCOV=":" + 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 + GCOV=$ac_ct_GCOV + fi +else + GCOV="$ac_cv_prog_GCOV" +fi + + if test "X$GCOV" = "X:"; then : + as_fn_error $? "gcov is needed to do coverage" "$LINENO" 5 +fi + + if test "$GCC" = "no" ; then : as_fn_error $? "not compiling with gcc, which is required for gcov code coverage" "$LINENO" 5 @@ -15099,8 +15213,11 @@ # - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage # reports to be created. (Default: # $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance. +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) # - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. -# (Default: empty) +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) # - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml # instance. (Default: empty) # - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore @@ -15113,7 +15230,9 @@ CODE_COVERAGE_DIRECTORY ?= $(top_builddir) CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage -CODE_COVERAGE_LCOV_OPTIONS ?= +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) CODE_COVERAGE_GENHTML_OPTIONS ?= CODE_COVERAGE_IGNORE_PATTERN ?= @@ -15861,7 +15980,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pygobject $as_me 3.20.0, which was +This file was extended by pygobject $as_me 3.20.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15928,7 +16047,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pygobject config.status 3.20.0 +pygobject config.status 3.20.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/pygobject-3.20.0/configure.ac new/pygobject-3.20.1/configure.ac --- old/pygobject-3.20.0/configure.ac 2016-03-22 04:11:05.000000000 +0100 +++ new/pygobject-3.20.1/configure.ac 2016-04-25 05:52:12.000000000 +0200 @@ -18,7 +18,7 @@ dnl the pygobject version number m4_define(pygobject_major_version, 3) m4_define(pygobject_minor_version, 20) -m4_define(pygobject_micro_version, 0) +m4_define(pygobject_micro_version, 1) m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version) dnl versions of packages we require ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/examples/Makefile.in new/pygobject-3.20.1/examples/Makefile.in --- old/pygobject-3.20.0/examples/Makefile.in 2016-03-22 04:17:52.000000000 +0100 +++ new/pygobject-3.20.1/examples/Makefile.in 2016-04-25 05:54:52.000000000 +0200 @@ -158,6 +158,7 @@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/gi/Makefile.in new/pygobject-3.20.1/gi/Makefile.in --- old/pygobject-3.20.0/gi/Makefile.in 2016-03-22 04:17:52.000000000 +0100 +++ new/pygobject-3.20.1/gi/Makefile.in 2016-04-25 05:54:52.000000000 +0200 @@ -318,6 +318,7 @@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/gi/_gobject/Makefile.in new/pygobject-3.20.1/gi/_gobject/Makefile.in --- old/pygobject-3.20.0/gi/_gobject/Makefile.in 2016-03-22 04:17:52.000000000 +0100 +++ new/pygobject-3.20.1/gi/_gobject/Makefile.in 2016-04-25 05:54:53.000000000 +0200 @@ -191,6 +191,7 @@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/gi/overrides/Makefile.in new/pygobject-3.20.1/gi/overrides/Makefile.in --- old/pygobject-3.20.0/gi/overrides/Makefile.in 2016-03-22 04:17:52.000000000 +0100 +++ new/pygobject-3.20.1/gi/overrides/Makefile.in 2016-04-25 05:54:53.000000000 +0200 @@ -191,6 +191,7 @@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/gi/repository/Makefile.in new/pygobject-3.20.1/gi/repository/Makefile.in --- old/pygobject-3.20.0/gi/repository/Makefile.in 2016-03-22 04:17:52.000000000 +0100 +++ new/pygobject-3.20.1/gi/repository/Makefile.in 2016-04-25 05:54:53.000000000 +0200 @@ -191,6 +191,7 @@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/pygtkcompat/Makefile.in new/pygobject-3.20.1/pygtkcompat/Makefile.in --- old/pygobject-3.20.0/pygtkcompat/Makefile.in 2016-03-22 04:17:52.000000000 +0100 +++ new/pygobject-3.20.1/pygtkcompat/Makefile.in 2016-04-25 05:54:53.000000000 +0200 @@ -191,6 +191,7 @@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/tests/Makefile.in new/pygobject-3.20.1/tests/Makefile.in --- old/pygobject-3.20.0/tests/Makefile.in 2016-03-22 04:17:52.000000000 +0100 +++ new/pygobject-3.20.1/tests/Makefile.in 2016-04-25 05:54:53.000000000 +0200 @@ -238,6 +238,7 @@ FFI_CFLAGS = @FFI_CFLAGS@ FFI_LIBS = @FFI_LIBS@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pygobject-3.20.0/tests/test_gobject.py new/pygobject-3.20.1/tests/test_gobject.py --- old/pygobject-3.20.0/tests/test_gobject.py 2016-03-02 06:37:02.000000000 +0100 +++ new/pygobject-3.20.1/tests/test_gobject.py 2016-04-25 05:52:53.000000000 +0200 @@ -686,7 +686,7 @@ self.assertEqual(unboxed.code, error.code) def test_gerror_novalue(self): - error = GLib.Error('test message', domain='mydomain', code=42) + GLib.Error('test message', domain='mydomain', code=42) value = GObject.Value(GLib.Error) self.assertEqual(value.g_type, GObject.type_from_name('GError')) self.assertEqual(value.get_value(), None)

1 0

commit gvfs for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package gvfs for openSUSE:Factory checked in at 2016-05-05 12:12:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gvfs (Old) and /work/SRC/openSUSE:Factory/.gvfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gvfs" Changes: -------- --- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes 2016-04-15 19:01:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gvfs.new/gvfs.changes 2016-05-05 12:12:09.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 22 15:19:38 UTC 2016 - zaitor(a)opensuse.org + +- Enable pkgconfig(libnfs) BuildRequires, we now have it in + openSUSE, also package the new nfs support. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.cCSOft/_old 2016-05-05 12:12:10.000000000 +0200 +++ /var/tmp/diff_new_pack.cCSOft/_new 2016-05-05 12:12:10.000000000 +0200 @@ -64,8 +64,7 @@ BuildRequires: pkgconfig(libbluray) BuildRequires: pkgconfig(libgdata) >= 0.17.3 BuildRequires: pkgconfig(libmtp) >= 1.1.5 -# FIXME - Add disabled as we do not have this in openSUSE yet. -# BuildRequires: pkgconfig(libnfs) +BuildRequires: pkgconfig(libnfs) BuildRequires: pkgconfig(libsecret-unstable) BuildRequires: pkgconfig(libsystemd-login) >= 44 BuildRequires: pkgconfig(smbclient) @@ -293,6 +292,8 @@ %{_datadir}/%{name}/mounts/nds.mount %{_libexecdir}/%{name}/gvfsd-network %{_datadir}/%{name}/mounts/network.mount +%{_libexecdir}/%{name}/gvfsd-nfs +%{_datadir}/%{name}/mounts/nfs.mount %{_libexecdir}/%{name}/gvfsd-nvvfs %{_datadir}/%{name}/mounts/nvvfs.mount %{_libexecdir}/%{name}/gvfsd-recent

1 0

commit tracker for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package tracker for openSUSE:Factory checked in at 2016-05-05 12:12:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tracker (Old) and /work/SRC/openSUSE:Factory/.tracker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tracker" Changes: -------- --- /work/SRC/openSUSE:Factory/tracker/tracker-extras.changes 2016-03-29 14:39:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tracker.new/tracker-extras.changes 2016-05-05 12:12:04.000000000 +0200 @@ -1,0 +2,6 @@ +Sun May 1 10:49:54 UTC 2016 - zaitor(a)opensuse.org + +- Add tracker-fix-memory-leak.patch: Fix a memory leak, patch from + upstream git (bgo#765172). + +------------------------------------------------------------------- tracker.changes: same change New: ---- tracker-fix-memory-leak.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tracker-extras.spec ++++++ --- /var/tmp/diff_new_pack.2QTFY0/_old 2016-05-05 12:12:05.000000000 +0200 +++ /var/tmp/diff_new_pack.2QTFY0/_new 2016-05-05 12:12:05.000000000 +0200 @@ -54,6 +54,8 @@ Source2: README.SUSE.rss # PATCH-FIX-UPSTREAM tracker-extract-private.patch bgo#725689 dimstar(a)opensuse.org -- Do not maintain LT versioning for private libs Patch0: tracker-extract-private.patch +# PATCH-FIX-UPSTREAM tracker-fix-memory-leak.patch bgo#765172 zaitor(a)opensuse.org -- Fix a memory leak, patch from upstream git. +Patch1: tracker-fix-memory-leak.patch BuildRequires: NetworkManager-devel >= 0.8 BuildRequires: enca-devel BuildRequires: fdupes @@ -469,6 +471,7 @@ %prep %setup -q -n %{_name}-%{version} %patch0 -p1 +%patch1 -p1 translation-update-upstream cp %{S:2} src/miners/rss/README.SUSE ++++++ tracker.spec ++++++ --- /var/tmp/diff_new_pack.2QTFY0/_old 2016-05-05 12:12:05.000000000 +0200 +++ /var/tmp/diff_new_pack.2QTFY0/_new 2016-05-05 12:12:05.000000000 +0200 @@ -53,6 +53,8 @@ Source2: README.SUSE.rss # PATCH-FIX-UPSTREAM tracker-extract-private.patch bgo#725689 dimstar(a)opensuse.org -- Do not maintain LT versioning for private libs Patch0: tracker-extract-private.patch +# PATCH-FIX-UPSTREAM tracker-fix-memory-leak.patch bgo#765172 zaitor(a)opensuse.org -- Fix a memory leak, patch from upstream git. +Patch1: tracker-fix-memory-leak.patch BuildRequires: NetworkManager-devel >= 0.8 BuildRequires: enca-devel BuildRequires: fdupes @@ -468,6 +470,7 @@ %prep %setup -q -n %{_name}-%{version} %patch0 -p1 +%patch1 -p1 translation-update-upstream cp %{S:2} src/miners/rss/README.SUSE ++++++ tracker-fix-memory-leak.patch ++++++ >From 6c0b7831e1574123e9d9f01035d0dc7ea1e1583b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= <mail(a)baedert.org> Date: Sun, 17 Apr 2016 12:19:39 +0200 Subject: miner-manager: Plug memory leak https://bugzilla.gnome.org/show_bug.cgi?id=765172 --- src/libtracker-control/tracker-miner-manager.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libtracker-control/tracker-miner-manager.c b/src/libtracker-control/tracker-miner-manager.c index aba5b38..af837b0 100644 --- a/src/libtracker-control/tracker-miner-manager.c +++ b/src/libtracker-control/tracker-miner-manager.c @@ -526,7 +526,9 @@ miner_data_free (MinerData *data) } g_free (data->dbus_path); + g_free (data->dbus_name); g_free (data->display_name); + g_free (data->description); g_slice_free (MinerData, data); } -- cgit v0.12

1 0

commit PackageKit for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at 2016-05-05 12:11:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/PackageKit (Old) and /work/SRC/openSUSE:Factory/.PackageKit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "PackageKit" Changes: -------- --- /work/SRC/openSUSE:Factory/PackageKit/PackageKit.changes 2016-03-29 14:27:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.PackageKit.new/PackageKit.changes 2016-05-05 12:11:58.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Apr 29 13:40:11 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 1.1.1: + + Backends: + - alpm: port to g_autoptr(). + - hif: Set ALLOW_DOWNGRADE flag for all transactions. + - zypp: Enforce formatting input as string. + + New Features: + - Add UpdateTriggered / UpgradeTriggered DBus properties. + - Add TriggerUpgrade DBus method handling. + + Bugfixes: + - Emit UpdatesChanges when installing packages. + - Fix GIR annotations for progress callbacks. + - Increase the number of packages that can be resolved. + - Point offline update/upgrade trigger to the prepared update. + - Unlink any existing offline update triggers before creating. + +------------------------------------------------------------------- Old: ---- PackageKit-1.1.0.tar.xz PackageKit-1.1.0.tar.xz.asc New: ---- PackageKit-1.1.1.tar.xz PackageKit-1.1.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.6DmdQx/_old 2016-05-05 12:11:59.000000000 +0200 +++ /var/tmp/diff_new_pack.6DmdQx/_new 2016-05-05 12:11:59.000000000 +0200 @@ -20,7 +20,7 @@ %define BUILD_CNF 0 %define with_offline_updates 1 Name: PackageKit -Version: 1.1.0 +Version: 1.1.1 Release: 0 Summary: Simple software installation management software License: GPL-2.0+ ++++++ PackageKit-1.1.0.tar.xz -> PackageKit-1.1.1.tar.xz ++++++ ++++ 22121 lines of diff (skipped)

1 0

commit webkit2gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 05 May '16

05 May '16

Hello community, here is the log from the commit of package webkit2gtk3 for openSUSE:Factory checked in at 2016-05-05 12:11:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkit2gtk3 (Old) and /work/SRC/openSUSE:Factory/.webkit2gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "webkit2gtk3" Changes: -------- --- /work/SRC/openSUSE:Factory/webkit2gtk3/webkit2gtk3.changes 2016-04-28 16:49:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.webkit2gtk3.new/webkit2gtk3.changes 2016-05-05 12:11:49.000000000 +0200 @@ -1,0 +2,32 @@ +Mon May 2 14:05:38 CEST 2016 - fcrozat(a)suse.com + +- Refresh webkitgtk-disable-gcc-version-checks.patch for latest + version. + +------------------------------------------------------------------- +Thu Apr 28 08:30:17 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 2.12.2: + + Fix rendering of scrollbars with GTK themes using stepper + buttons. + + Fix compatibility issue with 2.12.1 regarding local storage + access from file URLs. + + Make menu list buttons use the text color from the theme. + + Do not show resize grip in non-resizable text fields. + + Fix accessibility events causing Orca to echo key presses + instead of speaking the inserted characters in password fields. + + Fix an off by one error in hyphenation. + + Fix several crashes and rendering issues. + + Fix the build with libjpeg v9. + + Updated translations. + +------------------------------------------------------------------- +Mon Apr 25 14:28:33 UTC 2016 - zaitor(a)opensuse.org + +- Drop pkgconfig(gtk+-2.0) BuildRequires and pass + -DENABLE_PLUGIN_PROCESS_GTK2=OFF to configure. We do no longer + ship the flash-plugin in openSUSE, and it were the last consumer + of this functionality. This also have the added bonus of freeing + zenity and dependant packages of gtk2 dependencies. + +------------------------------------------------------------------- Old: ---- webkitgtk-2.12.1.tar.xz New: ---- webkitgtk-2.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkit2gtk3.spec ++++++ --- /var/tmp/diff_new_pack.AAfGQM/_old 2016-05-05 12:11:50.000000000 +0200 +++ /var/tmp/diff_new_pack.AAfGQM/_new 2016-05-05 12:11:50.000000000 +0200 @@ -26,7 +26,7 @@ %define _pkgconfig_suffix gtk-3.0 %define _name webkitgtk Name: webkit2gtk3 -Version: 2.12.1 +Version: 2.12.2 Release: 0 Summary: Library for rendering web content, GTK+ Port License: LGPL-2.0+ and BSD-3-Clause @@ -68,8 +68,6 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(gstreamer-1.0) >= 1.0.3 BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) -# We require gtk2 for the Gtk2 plugin wrapper -BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10 BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(harfbuzz) >= 0.9.2 @@ -245,6 +243,7 @@ -DCMAKE_BUILD_TYPE=Release \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \ -DPORT=GTK \ + -DENABLE_PLUGIN_PROCESS_GTK2=OFF \ %ifarch ppc ppc64 ppc64le s390x -DENABLE_JIT=OFF \ -DUSE_SYSTEM_MALLOC=ON \ ++++++ webkitgtk-2.12.1.tar.xz -> webkitgtk-2.12.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/webkit2gtk3/webkitgtk-2.12.1.tar.xz /work/SRC/openSUSE:Factory/.webkit2gtk3.new/webkitgtk-2.12.2.tar.xz differ: char 26, line 1 ++++++ webkitgtk-disable-gcc-version-checks.patch ++++++ --- /var/tmp/diff_new_pack.AAfGQM/_old 2016-05-05 12:11:50.000000000 +0200 +++ /var/tmp/diff_new_pack.AAfGQM/_new 2016-05-05 12:11:50.000000000 +0200 @@ -11,10 +11,10 @@ Source/cmake/OptionsGTK.cmake | 7 ------- 1 file changed, 7 deletions(-) -Index: webkitgtk-2.12.0/Source/cmake/OptionsGTK.cmake +Index: webkitgtk-2.12.2/Source/cmake/OptionsGTK.cmake =================================================================== ---- webkitgtk-2.12.0.orig/Source/cmake/OptionsGTK.cmake 2016-03-22 09:40:16.000000000 +0100 -+++ webkitgtk-2.12.0/Source/cmake/OptionsGTK.cmake 2016-03-23 09:15:11.358417558 +0100 +--- webkitgtk-2.12.2.orig/Source/cmake/OptionsGTK.cmake 2016-04-28 08:49:27.000000000 +0200 ++++ webkitgtk-2.12.2/Source/cmake/OptionsGTK.cmake 2016-05-02 14:06:42.166231056 +0200 @@ -6,13 +6,6 @@ set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO}) set(WEBKITGTK_API_VERSION 4.0) @@ -28,11 +28,11 @@ - # Libtool library version, not to be confused with API version. # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html - CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 6 13) -Index: webkitgtk-2.12.0/Source/WTF/wtf/Compiler.h + CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 50 8 13) +Index: webkitgtk-2.12.2/Source/WTF/wtf/Compiler.h =================================================================== ---- webkitgtk-2.12.0.orig/Source/WTF/wtf/Compiler.h 2016-03-17 08:51:05.000000000 +0100 -+++ webkitgtk-2.12.0/Source/WTF/wtf/Compiler.h 2016-03-23 09:15:11.358417558 +0100 +--- webkitgtk-2.12.2.orig/Source/WTF/wtf/Compiler.h 2016-04-11 08:18:43.000000000 +0200 ++++ webkitgtk-2.12.2/Source/WTF/wtf/Compiler.h 2016-05-02 14:06:42.166231056 +0200 @@ -70,8 +70,8 @@ #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))

1 0