April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit qbittorrent for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package qbittorrent for openSUSE:Factory checked in at 2016-04-01 13:02:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qbittorrent (Old) and /work/SRC/openSUSE:Factory/.qbittorrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qbittorrent" Changes: -------- --- /work/SRC/openSUSE:Factory/qbittorrent/qbittorrent.changes 2016-01-28 17:24:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qbittorrent.new/qbittorrent.changes 2016-04-01 13:02:58.000000000 +0200 @@ -1,0 +2,75 @@ +Wed Mar 30 21:12:43 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.3.4: + * FEATURE: Download more pieces in + "Download first and last pieces first" feature. + * FEATURE: Unlock first column in peerlist too. + * FEATURE: Add "Hide zero values" option. + * FEATURE: Add a "remaining" column to the torrent content model. + * FEATURE: Allow to toggle columns in peerlist. + * FEATURE: Add ability to filter log messages by type. + * FEATURE: Add ability to write the log to file. + * FEATURE: Add 'never show again' checkbox/pref to auto-exit + confirm dialog. + * PERFORMANCE: Perform fastresume data saving in separate thread. + * PERFORMANCE: Optimise session startup. + * BUGFIX: Save resume data using QSaveFile (Qt5 only). This + reduces chances of corrupt files. + * BUGFIX: Check torrent file permissions before opening. + * BUGFIX: Always update native session's announce_ip setting. + * BUGFIX: Fix loading *.magnet files from watched directories. + * BUGFIX: Fix upgrade corrupted fastresume file. + * BUGFIX: Fix total values for "Seeds" & "Peers". + * BUGFIX: Fix potential race condition. + * BUGFIX: Don't merge trackers for private torrents. + * BUGFIX: Fix double buttons in "Add New Torrent" dialog. + * BUGFIX: Fix malformed date header in email. + * BUGFIX: Save "Run external programme" input as is. + * BUGFIX: Enable "filename" column in peers list again. + Crash is fixed now. + * BUGFIX: Don't display warning when directory name stayed the + same after rename. + * BUGFIX: Fix selection of Portuguese translation files. + * BUGFIX: Fix selection of Esperanto locale. + * BUGFIX: Fix "caja" file manager opens the file instead of + opens the directory. + * BUGFIX: Potentially fix a random crash coming from the sidepanel. + * WEBUI: Fix max_ratio precision. + * WEBUI: Fix JavaScript exception on WebUI load. + * WEBUI: Fix translation. + * WEBUI: Submit the label in the new label dialog on pressing + enter key. + * WEBUI: Check WebUI username and password length. + * WEBUI: Minor changes in CSS styles. + * WEBUI: Add "Added on" and "Completion on" fields to + query/torrents query response. + * WEBUI: Do not try to parse request message when content-length + is 0. + * WEBUI: Support SSL certificate bundles. + * WEBUI: Change the order of the values of speed labels. + * WEBUI: Bump WebUI API_VERSION. + * SEARCH: Update PirateBay plugin. + * SEARCH: Added TorLock search engine. + * COSMETIC: Fix splash screen staying on top of all windows. + * COSMETIC: Rearrange advanced settings. + * COSMETIC: Cleanup "about" dialog. + * COSMETIC: Cleanup "Add New Torrent" dialog. + * COSMETIC: Use short date in addnewtorrentdialog. + * COSMETIC: Change "Free disk space" to "Free space on disk". + * COSMETIC: Let OS handle DPI scaling for now. Should let Qt do + the work when it's more mature. + * COSMETIC: Put comment_lbl in QScrollArea. + * COSMETIC: Change the order of the values of speed labels. + * COSMETIC: Cleanup the Log tab. + * COSMETIC: Cleanup the Atom/RSS tab. + * OTHER: Set "Show splash screen on start up" option default to + off. + * OTHER: Support for cross-compilation with MXE. + * OTHER: Add basic (and unofficial) cmake support. + * OTHER: Move some URLs overs to https. + * OTHER: Add appveyor suppor. + * OTHER: Many other internal code restructuring, cleaning and + fixing. +- Check tarball signing. + +------------------------------------------------------------------- Old: ---- qbittorrent-3.3.3.tar.xz New: ---- qbittorrent-3.3.4.tar.xz qbittorrent-3.3.4.tar.xz.asc qbittorrent.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qbittorrent.spec ++++++ --- /var/tmp/diff_new_pack.jVne9q/_old 2016-04-01 13:02:59.000000000 +0200 +++ /var/tmp/diff_new_pack.jVne9q/_new 2016-04-01 13:02:59.000000000 +0200 @@ -19,13 +19,15 @@ %define _name qBittorrent Name: qbittorrent -Version: 3.3.3 +Version: 3.3.4 Release: 0 Summary: A BitTorrent client in Qt License: GPL-2.0+ Group: Productivity/Networking/File-Sharing Url: http://qbittorrent.org/ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.xz +Source1: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.xz.asc +Source2: %{name}.keyring Patch1: bittorrent_missing_ppc64le_in_ax_boost_base.m4.patch BuildRequires: autoconf BuildRequires: automake @@ -84,7 +86,6 @@ %build aclocal -I m4 autoconf - %global _configure ../configure for ui in nox gui; do [[ "$ui" == nox ]] && ui_opt='--disable-gui' || ui_opt= ++++++ qbittorrent-3.3.3.tar.xz -> qbittorrent-3.3.4.tar.xz ++++++ ++++ 277986 lines of diff (skipped) ++++++ qbittorrent.keyring ++++++ pub rsa4096/520EC6F6 2016-03-27 [SC] Key fingerprint = F4A5 FD20 1B11 7B1C 2AB5 90E2 A1AC CAE4 520E C6F6 uid [ unknown] sledgehammer999 (Used for signing qBittorrent source tarballs and binaries.) <sledgehammer999(a)qbittorrent.org> sub rsa4096/82EDA1AD 2016-03-27 [E] -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v2 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 x8m1+aYiYlKfcKWm1nKQG0hF04Axq5AYezjKvA== =Zdwm -----END PGP PUBLIC KEY BLOCK-----

1 0

commit libressl for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package libressl for openSUSE:Factory checked in at 2016-04-01 13:02:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-09 16:50:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libressl.new/libressl.changes 2016-04-01 13:02:56.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 23 20:50:00 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 2.3.3 +* cert.pem has been reorganized and synced with Mozilla's + certificate store + +------------------------------------------------------------------- Old: ---- libressl-2.3.2.tar.gz libressl-2.3.2.tar.gz.asc New: ---- libressl-2.3.3.tar.gz libressl-2.3.3.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libressl.spec ++++++ --- /var/tmp/diff_new_pack.61tsVC/_old 2016-04-01 13:02:57.000000000 +0200 +++ /var/tmp/diff_new_pack.61tsVC/_new 2016-04-01 13:02:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: libressl -Version: 2.3.2 +Version: 2.3.3 Release: 0 Summary: An SSL/TLS protocol implementation License: OpenSSL ++++++ libressl-2.3.2.tar.gz -> libressl-2.3.3.tar.gz ++++++ ++++ 10774 lines of diff (skipped)

1 0

commit libzrtpcpp for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package libzrtpcpp for openSUSE:Factory checked in at 2016-04-01 13:02:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzrtpcpp (Old) and /work/SRC/openSUSE:Factory/.libzrtpcpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzrtpcpp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzrtpcpp/libzrtpcpp.changes 2016-02-26 22:19:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzrtpcpp.new/libzrtpcpp.changes 2016-04-01 13:02:52.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 23 21:19:19 UTC 2016 - jengelh(a)inai.de + +- Update to new upstream release 4.6.3 +* A small fix inside the ZRTP main module to ignore malformed + DH1 packets and avoid an NULL pointer access. + +------------------------------------------------------------------- Old: ---- V4.6.2.tar.gz New: ---- V4.6.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzrtpcpp.spec ++++++ --- /var/tmp/diff_new_pack.Q9biSS/_old 2016-04-01 13:02:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Q9biSS/_new 2016-04-01 13:02:54.000000000 +0200 @@ -18,7 +18,7 @@ Name: libzrtpcpp %define lname libzrtpcpp4 -Version: 4.6.2 +Version: 4.6.3 Release: 0 Summary: A ccrtp extension for ZRTP support License: GPL-3.0+ ++++++ V4.6.2.tar.gz -> V4.6.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.2/.idea/dictionaries/werner.xml new/ZRTPCPP-4.6.3/.idea/dictionaries/werner.xml --- old/ZRTPCPP-4.6.2/.idea/dictionaries/werner.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/ZRTPCPP-4.6.3/.idea/dictionaries/werner.xml 2016-03-14 18:50:58.000000000 +0100 @@ -0,0 +1,8 @@ +<component name="ProjectDictionaryState"> + <dictionary name="werner"> + <words> + <w>dittmann</w> + <w>hmac</w> + </words> + </dictionary> +</component> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.2/CMakeLists.txt new/ZRTPCPP-4.6.3/CMakeLists.txt --- old/ZRTPCPP-4.6.2/CMakeLists.txt 2016-02-04 16:32:31.000000000 +0100 +++ new/ZRTPCPP-4.6.3/CMakeLists.txt 2016-03-14 18:50:58.000000000 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Werner Dittman +# Copyright (C) 2009 - 2016 Werner Dittman # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -14,9 +14,9 @@ SET(CPACK_PACKAGE_VERSION_MAJOR 4) SET(CPACK_PACKAGE_VERSION_MINOR 6) -SET(CPACK_PACKAGE_VERSION_PATCH 2) +SET(CPACK_PACKAGE_VERSION_PATCH 3) -set (VERSION 4.6.2) +set (VERSION 4.6.3) set (SOVERSION 4) # Define supported command line parameters. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.2/NEWS.md new/ZRTPCPP-4.6.3/NEWS.md --- old/ZRTPCPP-4.6.2/NEWS.md 2016-02-04 16:32:31.000000000 +0100 +++ new/ZRTPCPP-4.6.3/NEWS.md 2016-03-14 18:50:58.000000000 +0100 @@ -1,3 +1,9 @@ +## GNU ZRTP 4.6.3 ## + +A small fix inside the ZRTP main module to ignore malformed +DH1 packets and avoid an NULL pointer access. + + ## GNU ZRTP 4.6.2 ## A small fix in the ZrtpCWrapper to fix an issue within 4.6.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.2/zrtp/ZRtp.cpp new/ZRTPCPP-4.6.3/zrtp/ZRtp.cpp --- old/ZRTPCPP-4.6.2/zrtp/ZRtp.cpp 2016-02-04 16:32:31.000000000 +0100 +++ new/ZRTPCPP-4.6.3/zrtp/ZRtp.cpp 2016-03-14 18:50:58.000000000 +0100 @@ -690,6 +690,10 @@ // get and check Responder's public value, see chap. 5.4.3 in the spec pvr = dhPart1->getPv(); + if (pvr == NULL) { + *errMsg = IgnorePacket; + return NULL; + } if (!dhContext->checkPubKey(pvr)) { *errMsg = DHErrorWrongPV; return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.2/zrtp/ZrtpPacketDHPart.cpp new/ZRTPCPP-4.6.3/zrtp/ZrtpPacketDHPart.cpp --- old/ZRTPCPP-4.6.2/zrtp/ZrtpPacketDHPart.cpp 2016-02-04 16:32:31.000000000 +0100 +++ new/ZRTPCPP-4.6.3/zrtp/ZrtpPacketDHPart.cpp 2016-03-14 18:50:58.000000000 +0100 @@ -37,8 +37,8 @@ void* allocated = &data; memset(allocated, 0, sizeof(data)); - zrtpHeader = (zrtpPacketHeader_t *)&((DHPartPacket_t *)allocated)->hdr; // the standard header - DHPartHeader = (DHPart_t *)&((DHPartPacket_t *)allocated)->dhPart; + zrtpHeader = &((DHPartPacket_t *)allocated)->hdr; // the standard header + DHPartHeader = &((DHPartPacket_t *)allocated)->dhPart; pv = ((uint8_t*)allocated) + sizeof(DHPartPacket_t); // point to the public key value setZrtpId(); @@ -46,7 +46,7 @@ // The fixed numbers below are taken from ZRTP specification, chap 5.1.5 void ZrtpPacketDHPart::setPubKeyType(const char* pkt) { - // Well - the algo type is only 4 char thus cast to int32 and compare + // Well - the algorithm type is only 4 char thus cast to int32 and compare if (*(int32_t*)pkt == *(int32_t*)dh2k) { dhLength = 256; } @@ -68,15 +68,15 @@ else return; - int length = sizeof(DHPartPacket_t) + dhLength + (2 * ZRTP_WORD_SIZE); // HMAC field is 2*ZRTP_WORD_SIZE - setLength(length / ZRTP_WORD_SIZE); + uint16_t length = static_cast<uint16_t>(sizeof(DHPartPacket_t) + dhLength + (2 * ZRTP_WORD_SIZE)); // HMAC field is 2*ZRTP_WORD_SIZE + setLength(static_cast<uint16_t>(length / ZRTP_WORD_SIZE)); } ZrtpPacketDHPart::ZrtpPacketDHPart(uint8_t *data) { DEBUGOUT((fprintf(stdout, "Creating DHPart packet from data\n"))); - zrtpHeader = (zrtpPacketHeader_t *)&((DHPartPacket_t *)data)->hdr; // the standard header - DHPartHeader = (DHPart_t *)&((DHPartPacket_t *)data)->dhPart; + zrtpHeader = &((DHPartPacket_t *)data)->hdr; // the standard header + DHPartHeader = &((DHPartPacket_t *)data)->dhPart; int16_t len = getLength(); DEBUGOUT((fprintf(stdout, "DHPart length: %d\n", len)));

1 0

commit booth for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2016-04-01 13:02:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "booth" Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2016-01-22 01:09:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2016-04-01 13:02:49.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Mar 23 16:35:54 UTC 2016 - opensuse-packaging(a)opensuse.org + +- Update to version v1.0_6_g106efdf: + + Feature: extprog: add capability to run a set of programs + + Medium: extprog: external tests timeout after renewal interval + +------------------------------------------------------------------- +Wed Mar 16 15:53:29 UTC 2016 - dmuhamedagic(a)suse.com + +- Update to release v1.0 + + systemd: add booth-arbitrator.service (bsc#967036) + + main: improve address matching procedure + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ booth.spec ++++++ --- /var/tmp/diff_new_pack.Mqf5sy/_old 2016-04-01 13:02:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Mqf5sy/_new 2016-04-01 13:02:50.000000000 +0200 @@ -46,7 +46,7 @@ License: GPL-2.0+ Group: %{pkg_group} Version: 1.0 -Release: 0rc1 +Release: 0 Source: booth.tar.bz2 Source1: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,6 +103,7 @@ # systemd mkdir -p %{buildroot}/%{_unitdir} cp -a conf/booth@.service %{buildroot}/%{_unitdir}/booth@.service +cp -a conf/booth-arbitrator.service %{buildroot}/%{_unitdir}/booth-arbitrator.service ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbooth-arbitrator %else # sysV init @@ -156,6 +157,7 @@ %if %{defined _unitdir} %{_unitdir}/booth@.service +%{_unitdir}/booth-arbitrator.service %exclude %{_initddir}/booth-arbitrator %else %{_initddir}/booth-arbitrator @@ -167,22 +169,6 @@ %doc AUTHORS README COPYING %doc README.upgrade-from-v0.1 -# this should be preun, but... -%pre -# new installation? -test -x %{_sbindir}/booth || exit 0 -# stop the arbitrator if it's the previous paxos version 1.0 -if [ "`booth version | awk '{print $2}'`" = "1.0" ]; then - echo "booth v0.1 found" - if grep -qs 'ticket.*;' /etc/booth/booth.conf; then - echo "Convert the booth configuration in /etc/booth/booth.conf!" - fi - if ps -o pid,cmd -e | grep -qs "[b]oothd arbitrator"; then - rcbooth-arbitrator stop - fi -fi -exit 0 - %package test Summary: Test scripts for Booth Group: %{pkg_group} ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Mqf5sy/_old 2016-04-01 13:02:50.000000000 +0200 +++ /var/tmp/diff_new_pack.Mqf5sy/_new 2016-04-01 13:02:50.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/booth.git</param> - <param name="changesrevision">9c5c19f2c9217db9bf6265e8e753ac15ba631ae0</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">106efdf386c23aa7c740f1d238ecd04fd63f5ebc</param></service></servicedata> \ No newline at end of file ++++++ booth.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/.git_info new/booth/.git_info --- old/booth/.git_info 2016-01-12 15:03:32.000000000 +0100 +++ new/booth/.git_info 2016-03-23 17:32:51.000000000 +0100 @@ -1 +1 @@ -v1.0rc1 +v1.0-6-g106efdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/ChangeLog new/booth/ChangeLog --- old/booth/ChangeLog 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/ChangeLog 2016-03-23 17:31:14.000000000 +0100 @@ -1,3 +1,8 @@ +* Mar Jan 16 2016 Dejan Muhamedagic <dmuhamedagic(a)suse.com> and others +- stable release 1.0 +- systemd: add booth-arbitrator.service (bsc#967036) +- main: improve address matching procedure + * Mon Jan 11 2016 Dejan Muhamedagic <dmuhamedagic(a)suse.com> and others - release candidate 1.0 rc1 - main: prevent segfault on no arguments diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/README new/booth/README --- old/booth/README 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/README 2016-03-23 17:31:14.000000000 +0100 @@ -118,14 +118,18 @@ renewals are configurable and by default set to half ticket expire time. -Before ticket renewal, the leader runs an external program if -such program is set in 'before-acquire-handler'. The external -program should ensure that the cluster managed service which is -protected by this ticket can run at this site. If that program -fails, the leader relinquishes the ticket. It announces its -intention to step down by broadcasting an unsolicited VOTE_FOR -with an empty vote. On receiving such RPC other servers start new -elections to elect a new leader. +Before ticket renewal, the leader runs one or more external +programs if such are set in 'before-acquire-handler'. This can +point either to a file or a directory. In the former case, that +file is the program, but in the latter there could be a number of +programs in the specified directory. All files which have the +executable bit set and whose names don't start with a '.' are +run sequentially. This program or programs should ensure that the +cluster managed service which is protected by this ticket can run +at this site. If any of them fails, the leader relinquishes the +ticket. It announces its intention to step down by broadcasting +an unsolicited VOTE_FOR with an empty vote. On receiving such RPC +other servers start new elections to elect a new leader. Split brain ------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/booth.spec new/booth/booth.spec --- old/booth/booth.spec 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/booth.spec 2016-03-23 17:31:14.000000000 +0100 @@ -29,7 +29,7 @@ License: GPL-2.0+ Group: %{pkg_group} Version: 1.0 -Release: rc1 +Release: 0 Source: booth.tar.bz2 Source1: %name-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -86,6 +86,7 @@ # systemd mkdir -p %{buildroot}/%{_unitdir} cp -a conf/booth@.service %{buildroot}/%{_unitdir}/booth@.service +cp -a conf/booth-arbitrator.service %{buildroot}/%{_unitdir}/booth-arbitrator.service ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcbooth-arbitrator %else # sysV init @@ -148,6 +149,7 @@ %if %{defined _unitdir} %{_unitdir}/booth@.service +%{_unitdir}/booth-arbitrator.service %exclude %{_initddir}/booth-arbitrator %else %{_initddir}/booth-arbitrator @@ -159,23 +161,6 @@ %doc AUTHORS README COPYING %doc README.upgrade-from-v0.1 -# this should be preun, but... -%pre -# new installation? -test -x %{_sbindir}/booth || exit 0 -# stop the arbitrator if it's the previous paxos version 1.0 -if [ "`booth version | awk '{print $2}'`" = "1.0" ]; then - echo "booth v0.1 found" - if grep -qs 'ticket.*;' /etc/booth/booth.conf; then - echo "Convert the booth configuration in /etc/booth/booth.conf!" - fi - if ps -o pid,cmd -e | grep -qs "[b]oothd arbitrator"; then - rcbooth-arbitrator stop - fi -fi -exit 0 - - %package test Summary: Test scripts for Booth Group: %{pkg_group} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/conf/booth-arbitrator.service new/booth/conf/booth-arbitrator.service --- old/booth/conf/booth-arbitrator.service 1970-01-01 01:00:00.000000000 +0100 +++ new/booth/conf/booth-arbitrator.service 2016-03-23 17:31:14.000000000 +0100 @@ -0,0 +1,16 @@ +# This file is part of Booth. + +[Unit] +Description=Booth - Ticket Manager for Pacemaker Clusters +Documentation=man:boothd(8) +After=network-online.target +ConditionFileNotEmpty=/etc/booth/booth.conf +Conflicts=pacemaker.service + +[Install] +WantedBy=multi-user.target + +[Service] +Type=simple +ExecStart=/usr/sbin/boothd daemon -S -c /etc/booth/booth.conf + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/conf/booth@.service new/booth/conf/booth@.service --- old/booth/conf/booth@.service 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/conf/booth@.service 2016-03-23 17:31:14.000000000 +0100 @@ -4,7 +4,8 @@ Description=Booth - Ticket Manager for Pacemaker Clusters Documentation=man:boothd(8) After=network-online.target -ConditionFileExists=/etc/booth/%i.conf +ConditionFileNotEmpty=/etc/booth/%i.conf +Conflicts=pacemaker.service [Install] Alias=boothd @@ -12,6 +13,5 @@ [Service] Type=simple -Conflicts=pacemaker.service ExecStart=/usr/sbin/boothd daemon -S -c %i diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/configure.ac new/booth/configure.ac --- old/booth/configure.ac 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/configure.ac 2016-03-23 17:31:14.000000000 +0100 @@ -4,7 +4,7 @@ # bootstrap / init AC_PREREQ([2.61]) -AC_INIT([booth], [1.0-0-rc1], [users(a)clusterlabs.org]) +AC_INIT([booth], [1.0], [users(a)clusterlabs.org]) AM_INIT_AUTOMAKE([-Wno-portability]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/docs/boothd.8.txt new/booth/docs/boothd.8.txt --- old/booth/docs/boothd.8.txt 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/docs/boothd.8.txt 2016-03-23 17:31:14.000000000 +0100 @@ -282,10 +282,10 @@ If the network reliability is often reduced over prolonged periods, it is advisable to try to renew more often. + -Before every renewal, if defined, the command specified in -'before-acquire-handler' is run. In that case the 'renewal-freq' -parameter is effectively also the local cluster monitoring -interval. +Before every renewal, if defined, the command or commands +specified in 'before-acquire-handler' is run. In that case the +'renewal-freq' parameter is effectively also the local cluster +monitoring interval. *'timeout'*:: After that time 'booth' will re-send packets if there was an @@ -314,9 +314,11 @@ file defines priority for conflicting requests. *'before-acquire-handler'*:: - If set, this command will be called before 'boothd' tries to - acquire or renew a ticket. On exit code other than 0, - 'boothd' relinquishes the ticket. + If set, this parameter specifies either a file containing a + program to be run or a directory where a number of programs + can reside. They are invoked before 'boothd' tries to acquire + or renew a ticket. If any of them exits with a code other + than 0, 'boothd' relinquishes the ticket. + Thus it is possible to ensure whether the services and its dependencies protected by the ticket are in good shape at this @@ -325,6 +327,10 @@ be unable to run. In that case, it is of no use to claim the ticket. + +One or more arguments may follow the program or directory +location. Typically, there is at least the name of one of +the resources which depend on this ticket. ++ See below for details about booth specific environment variables. The distributed 'service-runnable' script is an example which may be used to test whether a pacemaker resource can be started. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/script/lsb/booth-arbitrator new/booth/script/lsb/booth-arbitrator --- old/booth/script/lsb/booth-arbitrator 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/script/lsb/booth-arbitrator 2016-03-23 17:31:14.000000000 +0100 @@ -126,15 +126,9 @@ local rc=0 for cnf in ${BOOTH_CONF_FILE:-$CONF_DIR/*.conf} ; do - if [ $# != 1 ] ; then - echo "== For configuration file $cnf:" - fi cnf_base=`basename $cnf` "$@" rc=$((rc|$?)) - if [ $# != 1 ] ; then - echo "== configuration file $cnf done" - fi done return $rc } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/script/unit-test.py new/booth/script/unit-test.py --- old/booth/script/unit-test.py 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/script/unit-test.py 2016-03-23 17:31:14.000000000 +0100 @@ -220,7 +220,7 @@ ]); logging.info("started booth with PID %d, lockfile %s" % (self.booth.pid, self.lockfile)) - self.booth.expect("BOOTH site daemon is starting", timeout=2) + self.booth.expect("BOOTH site \S+ $build \S+$ daemon is starting", timeout=2) #print self.booth.before; exit self.gdb = self.start_a_process("gdb", @@ -471,14 +471,14 @@ comment = tkt.aux.get("comment", "") logging.info("ticket change %s (%s:%d) %s" % (ktkt, fn, self.current_nr, comment)) self.set_state(tkt) + if gdb: + for (k, v) in gdb.iteritems(): + self.send_cmd(k + " " + v.replace("§", "\n")) if msg: self.current_nr = msg.aux.get("line") comment = msg.aux.get("comment", "") logging.info("sending %s (%s:%d) %s" % (kmsg, fn, self.current_nr, comment)) self.send_message(self.merge_dicts(data["message"], msg)) - if gdb: - for (k, v) in gdb.iteritems(): - self.send_cmd(k + " " + v.replace("§", "\n")) if data.has_key(kgdb) and len(gdb) == 0: self.user_debug("manual override") if out: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/config.c new/booth/src/config.c --- old/booth/src/config.c 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/src/config.c 2016-03-23 17:31:14.000000000 +0100 @@ -330,7 +330,7 @@ } /* make arguments for execv(2) - * tk_test.prog points to the path + * tk_test.path points to the path * tk_test.argv is argument vector (starts with the prog) * (strtok pokes holes in the configuration parameter value, i.e. * we don't need to allocate memory for arguments) @@ -340,21 +340,21 @@ char *p; int i = 0; - if (tk_test.prog) { - free(tk_test.prog); + if (tk_test.path) { + free(tk_test.path); } - if (!(tk_test.prog = strdup(val))) { + if (!(tk_test.path = strdup(val))) { log_error("out of memory"); return -1; } - p = strtok(tk_test.prog, " \t"); + p = strtok(tk_test.path, " \t"); tk_test.argv[i++] = p; do { p = strtok(NULL, " \t"); if (i >= MAX_ARGS) { log_error("too many arguments for the acquire-handler"); - free(tk_test.prog); + free(tk_test.path); return -1; } tk_test.argv[i++] = p; @@ -509,7 +509,7 @@ strcpy(booth_conf->arb_group, "nobody"); parse_weights("", defaults.weight); - defaults.clu_test.prog = NULL; + defaults.clu_test.path = NULL; defaults.clu_test.pid = 0; defaults.clu_test.status = 0; defaults.clu_test.progstate = EXTPROG_IDLE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/config.h new/booth/src/config.h --- old/booth/src/config.h 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/src/config.h 2016-03-23 17:31:14.000000000 +0100 @@ -97,7 +97,8 @@ /* Program to ask whether it makes sense to * acquire the ticket */ struct clu_test { - char *prog; + char *path; + int is_dir; char *argv[MAX_ARGS]; pid_t pid; int status; /* child exit status */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/handler.c new/booth/src/handler.c --- old/booth/src/handler.c 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/src/handler.c 2016-03-23 17:31:14.000000000 +0100 @@ -20,6 +20,8 @@ #include <string.h> #include <errno.h> #include <arpa/inet.h> +#include <signal.h> +#include <sys/wait.h> #include <inttypes.h> #include <stdio.h> #include <assert.h> @@ -61,6 +63,173 @@ } } +static void +run_ext_prog(struct ticket_config *tk, char *prog) +{ + if (set_booth_env(tk)) { + _exit(1); + } + closefiles(); /* don't leak open files */ + tk_log_debug("running handler %s", prog); + execv(prog, tk_test.argv); + tk_log_error("%s: execv failed (%s)", prog, strerror(errno)); + _exit(1); +} + +static int +prog_filter(const struct dirent *dp) +{ + return (*dp->d_name != '.'); +} + +static pid_t curr_pid; +static int ignore_status; + +static int +test_exit_status(struct ticket_config *tk, char *prog, int status, int log_msg) +{ + int rv = -1; + + if (WIFEXITED(status)) { + rv = WEXITSTATUS(status); + } else if (WIFSIGNALED(status)) { + rv = 128 + WTERMSIG(status); + } + if (rv) { + if (log_msg) { + tk_log_warn("handler \"%s\" failed: %s", + prog, interpret_rv(status)); + tk_log_warn("we are not allowed to acquire ticket"); + } + } else { + tk_log_debug("handler \"%s\" exited with success", + prog); + } + return rv; +} + +static void +reset_test_state(struct ticket_config *tk) +{ + tk_test.pid = 0; + tk_test.progstate = EXTPROG_IDLE; +} + +int tk_test_exit_status(struct ticket_config *tk) +{ + int rv; + + rv = test_exit_status(tk, tk_test.path, tk_test.status, !tk_test.is_dir); + reset_test_state(tk); + return rv; +} + +void wait_child(int sig) +{ + int i, status; + struct ticket_config *tk; + + /* use waitpid(2) and not wait(2) in order not to interfear + * with popen(2)/pclose(2) and system(2) used in pacemaker.c + */ + foreach_ticket(i, tk) { + if (tk_test.path && tk_test.pid >= 0 && + (tk_test.progstate == EXTPROG_RUNNING || + tk_test.progstate == EXTPROG_IGNORE) && + waitpid(tk_test.pid, &status, WNOHANG) == tk_test.pid) { + if (tk_test.progstate == EXTPROG_IGNORE) { + /* not interested in the outcome */ + reset_test_state(tk); + } else { + tk_test.status = status; + tk_test.progstate = EXTPROG_EXITED; + } + } + } +} + +/* the parent may want to have us stop processing scripts, say + * when the ticket gets revoked + */ +static void ignore_rest(int sig) +{ + signal(SIGTERM, SIG_IGN); + log_info("external programs handler caught TERM, ignoring status of external test programs"); + ignore_status = 1; + if (curr_pid > 0) { + (void)kill(curr_pid, SIGTERM); + } +} + +void ext_prog_timeout(struct ticket_config *tk) +{ + tk_log_warn("handler timed out"); +} + +int is_ext_prog_running(struct ticket_config *tk) +{ + if (!tk_test.path) + return 0; + return (tk_test.pid > 0 && tk_test.progstate == EXTPROG_RUNNING); +} + +void ignore_ext_test(struct ticket_config *tk) +{ + if (is_ext_prog_running(tk)) { + (void)kill(tk_test.pid, SIGTERM); + tk_test.progstate = EXTPROG_IGNORE; + } +} + +static void +process_ext_dir(struct ticket_config *tk) +{ + char prog[FILENAME_MAX+1]; + int rv, n_progs, i, status; + struct dirent **proglist, *dp; + + signal(SIGTERM, (__sighandler_t)ignore_rest); + signal(SIGCHLD, SIG_DFL); + signal(SIGUSR1, SIG_DFL); + signal(SIGINT, SIG_DFL); + tk_log_debug("running programs in directory %s", tk_test.path); + n_progs = scandir(tk_test.path, &proglist, prog_filter, alphasort); + if (n_progs == -1) { + tk_log_error("%s: scandir failed (%s)", tk_test.path, strerror(errno)); + _exit(1); + } + for (i = 0; i < n_progs; i++) { + if (ignore_status) + break; + dp = proglist[i]; + if (strlen(dp->d_name) + strlen(tk_test.path) + 1 > FILENAME_MAX) { + tk_log_error("%s: name exceeds max length (%s)", + tk_test.path, dp->d_name); + _exit(1); + } + strcpy(prog, tk_test.path); + strcat(prog, "/"); + strcat(prog, dp->d_name); + switch(curr_pid=fork()) { + case -1: + log_error("fork: %s", strerror(errno)); + _exit(1); + case 0: /* child */ + run_ext_prog(tk, prog); + default: /* parent */ + while (waitpid(curr_pid, &status, 0) != curr_pid) + ; + curr_pid = 0; + if (!ignore_status) { + rv = test_exit_status(tk, prog, status, 1); + if (rv) + _exit(rv); + } + } + } + _exit(0); +} + /* run some external program * return codes: * RUNCMD_ERR: executing program failed (or some other failure) @@ -70,22 +239,27 @@ { int rv = 0; pid_t pid; + struct stat stbuf; - if (!tk_test.prog) + if (!tk_test.path) return 0; + if (stat(tk_test.path, &stbuf)) { + tk_log_error("%s: stat failed (%s)", tk_test.path, strerror(errno)); + return RUNCMD_ERR; + } + tk_test.is_dir = (stbuf.st_mode & S_IFDIR); + switch(pid=fork()) { case -1: log_error("fork: %s", strerror(errno)); return RUNCMD_ERR; case 0: /* child */ - if (set_booth_env(tk)) { - exit(1); + if (tk_test.is_dir) { + process_ext_dir(tk); + } else { + run_ext_prog(tk, tk_test.path); } - closefiles(); /* don't leak open files */ - execv(tk_test.prog, tk_test.argv); - tk_log_error("%s: execv failed (%s)", tk_test.prog, strerror(errno)); - exit(1); default: /* parent */ tk_test.pid = pid; tk_test.progstate = EXTPROG_RUNNING; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/handler.h new/booth/src/handler.h --- old/booth/src/handler.h 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/src/handler.h 2016-03-23 17:31:14.000000000 +0100 @@ -25,6 +25,11 @@ }; int run_handler(struct ticket_config *tk); +int tk_test_exit_status(struct ticket_config *tk); +void ignore_ext_test(struct ticket_config *tk); +int is_ext_prog_running(struct ticket_config *tk); +void ext_prog_timeout(struct ticket_config *tk); +void wait_child(int sig); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/main.c new/booth/src/main.c --- old/booth/src/main.c 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/src/main.c 2016-03-23 17:31:14.000000000 +0100 @@ -58,8 +58,9 @@ #include "ticket.h" #include "request.h" #include "attr.h" +#include "handler.h" -#define RELEASE_VERSION "0.2.0" +#define RELEASE_VERSION "1.0" #define RELEASE_STR RELEASE_VERSION " (build " BOOTH_BUILD_VERSION ")" #define CLIENT_NALLOC 32 @@ -1396,31 +1397,6 @@ exit(0); } -static void wait_child(int sig) -{ - int i, status; - struct ticket_config *tk; - - /* use waitpid(2) and not wait(2) in order not to interfear - * with popen(2)/pclose(2) and system(2) used in pacemaker.c - */ - foreach_ticket(i, tk) { - if (tk_test.prog && tk_test.pid >= 0 && - (tk_test.progstate == EXTPROG_RUNNING || - tk_test.progstate == EXTPROG_IGNORE) && - waitpid(tk_test.pid, &status, WNOHANG) == tk_test.pid) { - if (tk_test.progstate == EXTPROG_IGNORE) { - /* not interested in the outcome */ - tk_test.pid = 0; - tk_test.progstate = EXTPROG_IDLE; - } else { - tk_test.status = status; - tk_test.progstate = EXTPROG_EXITED; - } - } - } -} - static int do_server(int type) { int rv = -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/ticket.c new/booth/src/ticket.c --- old/booth/src/ticket.c 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/src/ticket.c 2016-03-23 17:31:14.000000000 +0100 @@ -190,59 +190,6 @@ } } -/* Ask an external program whether getting the ticket - * makes sense. -* Eg. if the services have a failcount of INFINITY, -* we can't serve here anyway. */ -static int run_external_prog(struct ticket_config *tk, - int start_election) -{ - int rv; - - rv = run_handler(tk); - switch (rv) { - case RUNCMD_ERR: - tk_log_warn("couldn't run external test, not allowed to acquire ticket"); - ext_prog_failed(tk, start_election); - break; - case 0: - /* immediately returned with success */ - break; - case RUNCMD_MORE: - tk_log_debug("forked %s", tk_test.prog); - break; - default: - break; - } - - return rv; -} - -static int test_exit_status(struct ticket_config *tk, - int start_election) -{ - int rv = -1, status; - - status = tk_test.status; - if (WIFEXITED(status)) { - rv = WEXITSTATUS(status); - } else if (WIFSIGNALED(status)) { - rv = 128 + WTERMSIG(status); - } - if (rv) { - tk_log_warn("handler \"%s\" failed: %s", - tk_test.prog, interpret_rv(status)); - tk_log_warn("we are not allowed to acquire ticket"); - ext_prog_failed(tk, start_election); - } else { - tk_log_debug("handler \"%s\" exited with success", - tk_test.prog); - } - tk_test.pid = 0; - tk_test.progstate = EXTPROG_IDLE; - return rv; -} - #define attr_found(geo_ap, ap) \ ((geo_ap) && !strcmp((geo_ap)->val, (ap)->attr_val)) @@ -292,19 +239,26 @@ { int rv = 0; - if (!tk_test.prog) + if (!tk_test.path) return 0; switch(tk_test.progstate) { case EXTPROG_IDLE: - rv = run_external_prog(tk, start_election); + rv = run_handler(tk); + if (rv == RUNCMD_ERR) { + tk_log_warn("couldn't run external test, not allowed to acquire ticket"); + ext_prog_failed(tk, start_election); + } break; case EXTPROG_RUNNING: /* should never get here, but just in case */ rv = RUNCMD_MORE; break; case EXTPROG_EXITED: - rv = test_exit_status(tk, start_election); + rv = tk_test_exit_status(tk); + if (rv) { + ext_prog_failed(tk, start_election); + } break; case EXTPROG_IGNORE: /* nothing to do here */ @@ -376,15 +330,6 @@ } } -static void ignore_extprog(struct ticket_config *tk) -{ - if (tk_test.prog && tk_test.pid >= 0 && - tk_test.progstate == EXTPROG_RUNNING) { - tk_test.progstate = EXTPROG_IGNORE; - (void)kill(tk_test.pid, SIGTERM); - } -} - static void start_revoke_ticket(struct ticket_config *tk) { tk_log_info("revoking ticket"); @@ -392,7 +337,6 @@ save_committed_tkt(tk); reset_ticket(tk); set_leader(tk, no_leader); - ignore_extprog(tk); ticket_write(tk); ticket_broadcast(tk, OP_REVOKE, OP_ACK, RLT_SUCCESS, OR_ADMIN); } @@ -497,6 +441,7 @@ void reset_ticket(struct ticket_config *tk) { + ignore_ext_test(tk); disown_ticket(tk); no_resends(tk); set_state(tk, ST_INIT); @@ -943,8 +888,13 @@ if (tk->leader != local) { tk_log_warn("lost at %s", site_string(tk->leader)); } else { - tk_log_warn("lost majority (revoking locally)"); - reason = tk->election_reason ? tk->election_reason : OR_REACQUIRE; + if (is_ext_prog_running(tk)) { + ext_prog_timeout(tk); + reason = OR_LOCAL_FAIL; + } else { + tk_log_warn("lost majority (revoking locally)"); + reason = tk->election_reason ? tk->election_reason : OR_REACQUIRE; + } } tk->lost_leader = tk->leader; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/src/transport.c new/booth/src/transport.c --- old/booth/src/transport.c 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/src/transport.c 2016-03-23 17:31:14.000000000 +0100 @@ -102,12 +102,12 @@ if (matched == node->addrlen) { - /* Full match. */ + /* Exact match. */ +exact_match: *address_bits_matched = matched * 8; -found: *me = node; did_match = EXACT_MATCH; - continue; + break; } if (!fuzzy_allowed) @@ -120,14 +120,14 @@ if (matched * 8 < *address_bits_matched) continue; if (!bits_left) - goto found; + goto exact_match; node_bits = n_a[bytes]; ip_bits = ipaddr[bytes]; if (((node_bits ^ ip_bits) & mask) == 0) { /* _At_least_ prefixlen bits matched. */ - *address_bits_matched = prefixlen; if (did_match < EXACT_MATCH) { + *address_bits_matched = prefixlen; *me = node; did_match = FUZZY_MATCH; } @@ -769,7 +769,7 @@ * packet */ char buffer[MAX_MSG_LEN]; /* Used for unit tests */ - void *msg; + struct boothc_ticket_msg *msg; sa_len = sizeof(sa); @@ -781,7 +781,7 @@ if (rv == -1) return; - deliver_fn(msg, rv); + deliver_fn((void*)msg, rv); } static int booth_udp_init(void *f) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/unit-tests/020_ext-verifier.txt new/booth/unit-tests/020_ext-verifier.txt --- old/booth/unit-tests/020_ext-verifier.txt 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/unit-tests/020_ext-verifier.txt 2016-03-23 17:31:14.000000000 +0100 @@ -13,10 +13,11 @@ term_duration 3000 # but shall start renewal now term_expires time(0) + 1000 - ext_verifier "test `set|grep ^BOOTH|wc -l` -ge 5" - hb_sent_at time(0) - 10 + req_sent_at time(0) - 10 +gdb0: + call parse_extprog("test `set|grep ^BOOTH|wc -l` -ge 5", booth_conf->ticket+0) outgoing0: header.cmd OP_HEARTBEAT @@ -25,7 +26,7 @@ ticket1: ext_verifier 'test "$BOOTH_TICKET" == "tick1"' # cause re-query of the verifier - hb_sent_at time(0) - 10 + req_sent_at time(0) - 10 # #gdb1: @@ -40,7 +41,7 @@ ticket2: ext_verifier 'test "$BOOTH_TICKET" == "tick2FOO"' # cause re-query of the verifier - hb_sent_at time(0) - 10 + req_sent_at time(0) - 10 # We just tell the others we don't have it anymore. outgoing2: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/booth/unit-tests/_defaults.txt new/booth/unit-tests/_defaults.txt --- old/booth/unit-tests/_defaults.txt 2016-01-12 11:50:01.000000000 +0100 +++ new/booth/unit-tests/_defaults.txt 2016-03-23 17:31:14.000000000 +0100 @@ -15,14 +15,15 @@ # defaults for all tests state ST_INIT - next_cron 0 + next_cron.tv_sec 0 + # time(0)+1 # local is site[0] per convention leader booth_conf->site+1 #owner booth_conf->site+1 #expires time(0)+1 - term_expires time(0)+1 + term_expires.tv_sec time(0)+1 #last_ack_ballot 242 leader 0 @@ -51,5 +52,4 @@ ticket.leader -1 ticket.term 0 ticket.term_valid_for 0 - ticket.leader_commit -1

1 0

commit uhd for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package uhd for openSUSE:Factory checked in at 2016-04-01 13:02:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uhd (Old) and /work/SRC/openSUSE:Factory/.uhd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "uhd" Changes: -------- --- /work/SRC/openSUSE:Factory/uhd/uhd.changes 2016-01-22 01:09:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.uhd.new/uhd.changes 2016-04-01 13:02:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 23 23:01:19 UTC 2016 - wk(a)ire.pw.edu.pl + +- Update sources to version 3.9.3 + +------------------------------------------------------------------- Old: ---- uhd-3.9.2.tar.gz uhd-images_003.009.002-release.tar.gz New: ---- uhd-3.9.3.tar.gz uhd-images_003.009.003-release.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uhd.spec ++++++ --- /var/tmp/diff_new_pack.ZaIBn4/_old 2016-04-01 13:02:47.000000000 +0200 +++ /var/tmp/diff_new_pack.ZaIBn4/_new 2016-04-01 13:02:47.000000000 +0200 @@ -18,10 +18,10 @@ Name: uhd %define libname libuhd003 -Version: 3.9.2 +Version: 3.9.3 Release: 0 -%define src_ver 003.009.002 -%define img_ver 003.009.002 +%define src_ver 003.009.003 +%define img_ver 003.009.003 Summary: The driver for USRP SDR boards License: GPL-3.0+ Group: Hardware/Other ++++++ uhd-3.9.2.tar.gz -> uhd-3.9.3.tar.gz ++++++ ++++ 1731 lines of diff (skipped) ++++++ uhd-images_003.009.002-release.tar.gz -> uhd-images_003.009.003-release.tar.gz ++++++ /work/SRC/openSUSE:Factory/uhd/uhd-images_003.009.002-release.tar.gz /work/SRC/openSUSE:Factory/.uhd.new/uhd-images_003.009.003-release.tar.gz differ: char 5, line 1

1 0

commit bundle-lang-common for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at 2016-04-01 13:02:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bundle-lang-common (Old) and /work/SRC/openSUSE:Factory/.bundle-lang-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bundle-lang-common" Changes: -------- --- /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.changes 2016-03-18 21:41:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.changes 2016-04-01 13:02:43.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 30 09:20:46 UTC 2016 - dimstar(a)opensuse.org + +- Update package list. + +------------------------------------------------------------------- bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-gnome.spec ++++++ ++++ 708 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-gnome.spec ++++ and /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-gnome.spec bundle-lang-other.spec: same change ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.PvrQu4/_old 2016-04-01 13:02:45.000000000 +0200 +++ /var/tmp/diff_new_pack.PvrQu4/_new 2016-04-01 13:02:45.000000000 +0200 @@ -34,7 +34,7 @@ bijiben-lang gnome bluedevil5-lang kde blueproximity-lang gnome-extras -brasero-lang gnome +brasero-lang gnome-extras breeze5-style-lang kde byzanz-lang gnome-extras cairo-clock-lang gnome-extras @@ -67,7 +67,6 @@ easytag-lang gnome-extras efax-gtk-lang gnome-extras eiciel-lang gnome-extras -emerillon-lang gnome-extras empathy-lang gnome eog-lang gnome eog-plugins-lang gnome-extras @@ -219,7 +218,7 @@ grilo-plugins-lang gnome grisbi-lang gnome-extras gsettings-desktop-schemas-lang common -gspell-lang gnome-extras +gspell-lang gnome gstreamer-lang common gstreamer-plugins-bad-lang gnome gstreamer-plugins-base-lang common @@ -460,7 +459,6 @@ weather-wallpaper-lang gnome-extras x-tile-lang gnome-extras xchat-gnome-lang gnome-extras -xchat-lang gnome-extras xdg-user-dirs-gtk-lang gnome xdg-user-dirs-lang common xkeyboard-config-lang common

1 0

commit skiboot for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package skiboot for openSUSE:Factory checked in at 2016-04-01 13:02:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skiboot (Old) and /work/SRC/openSUSE:Factory/.skiboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skiboot" Changes: -------- --- /work/SRC/openSUSE:Factory/skiboot/skiboot.changes 2016-03-29 10:39:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.skiboot.new/skiboot.changes 2016-04-01 13:02:41.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 29 12:38:37 UTC 2016 - dvaleev(a)suse.com + +- Reenable parallel build + 0001-Make-links-target-reusable.patch + +------------------------------------------------------------------- New: ---- 0001-Make-links-target-reusable.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skiboot.spec ++++++ --- /var/tmp/diff_new_pack.IsX86l/_old 2016-04-01 13:02:42.000000000 +0200 +++ /var/tmp/diff_new_pack.IsX86l/_new 2016-04-01 13:02:42.000000000 +0200 @@ -24,6 +24,7 @@ Group: System/Management Url: https://github.com/open-power/skiboot Source: https://github.com/open-power/skiboot/archive/%{name}-%{version}.tar.gz +Patch0: 0001-Make-links-target-reusable.patch BuildRequires: linux-glibc-devel BuildRequires: systemd-rpm-macros BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -66,12 +67,13 @@ %prep %setup -q -n %{name}-%{name}-%{version} +%patch0 -p1 %build SKIBOOT_VERSION=%version CROSS= make V=1 %{?_smp_mflags} -OPAL_PRD_VERSION=%version make V=1 -C external/opal-prd -GARD_VERSION=%version make V=1 -C external/gard -PFLASH_VERSION=%version make V=1 -C external/pflash +OPAL_PRD_VERSION=%version make V=1 %{?_smp_mflags} -C external/opal-prd +GARD_VERSION=%version make V=1 %{?_smp_mflags} -C external/gard +PFLASH_VERSION=%version make V=1 %{?_smp_mflags} -C external/pflash make V=1 -C external/xscom-utils %install ++++++ 0001-Make-links-target-reusable.patch ++++++ >From e52008e69c0d4541bd531df5ce10187faeeddecd Mon Sep 17 00:00:00 2001 From: Dinar Valeev <dvaleev(a)suse.com> Date: Thu, 24 Mar 2016 18:33:22 +0100 Subject: [PATCH] Make links target reusable Move symlinking target to external/common/rules.mk, so the rule could be reused by gard and opal-prd. Signed-off-by: Dinar Valeev <dvaleev(a)suse.com> --- external/common/rules.mk | 24 ++++++++++++++++++++++++ external/gard/Makefile | 19 ++----------------- external/opal-prd/Makefile | 25 ++----------------------- external/pflash/Makefile | 24 +----------------------- 4 files changed, 29 insertions(+), 63 deletions(-) diff --git a/external/common/rules.mk b/external/common/rules.mk index ec20593..4a929d6 100644 --- a/external/common/rules.mk +++ b/external/common/rules.mk @@ -17,6 +17,30 @@ endif endif endif +# Use make V=1 for a verbose build. +ifndef V + Q_CC= @echo ' CC ' $@; + Q_LINK= @echo ' LINK ' $@; + Q_LN= @echo ' LN ' $@; + Q_MKDIR=@echo ' MKDIR ' $@; +endif + + +.PHONY: links +links: libflash ccan common + +libflash: + $(Q_LN)ln -sf ../../libflash ./libflash + +ccan: + $(Q_LN)ln -sf ../../ccan ./ccan + +common: + $(Q_LN)ln -sf ../common ./common + +make_version.sh: + $(Q_LN)ln -sf ../../make_version.sh + ARCH_SRC := $(addprefix common/,$(ARCH_FILES)) ARCH_OBJS := $(addprefix common-,$(ARCH_FILES:.c=.o)) diff --git a/external/gard/Makefile b/external/gard/Makefile index be3d1ba..b54923d 100644 --- a/external/gard/Makefile +++ b/external/gard/Makefile @@ -3,22 +3,7 @@ include rules.mk GET_ARCH = ../../external/common/get_arch.sh include ../../external/common/rules.mk -all: $(EXE) - -.PHONY: links -links: libflash ccan common make_version.sh - -libflash: - ln -sf ../../libflash . - -ccan: - ln -sf ../../ccan . - -common: - ln -sf ../common . - -make_version.sh: - ln -sf ../../make_version.sh +all: links arch_links $(EXE) #Rebuild version.o so that the the version always matches #what the test suite will get from ./make_version.sh @@ -26,7 +11,7 @@ check: version.o all @ln -sf ../../test/test.sh test/test.sh @test/test-gard -$(OBJS): | links arch_links +links += make_version.sh .PHONY: VERSION-always .version: VERSION-always diff --git a/external/opal-prd/Makefile b/external/opal-prd/Makefile index 3f34371..e89f73d 100644 --- a/external/opal-prd/Makefile +++ b/external/opal-prd/Makefile @@ -10,19 +10,11 @@ sbindir = $(prefix)/sbin datadir = $(prefix)/share mandir = $(datadir)/man -all: opal-prd +all: links arch_links | opal-prd GET_ARCH = ../../external/common/get_arch.sh include ../../external/common/rules.mk -# Use make V=1 for a verbose build. -ifndef V - Q_CC= @echo ' CC ' $@; - Q_LINK= @echo ' LINK ' $@; - Q_LN= @echo ' LN ' $@; - Q_MKDIR=@echo ' MKDIR ' $@; -endif - LIBFLASH_OBJS = libflash-blocklevel.o libflash-libffs.o \ libflash-libflash.o libflash-ecc.o \ libflash-file.o @@ -30,30 +22,17 @@ LIBFLASH_OBJS = libflash-blocklevel.o libflash-libffs.o \ OBJS = opal-prd.o thunk.o pnor.o i2c.o module.o version.o \ $(LIBFLASH_OBJS) common-arch_flash.o -LINKS = ccan common libflash $(ARCH_LINKS) - OPAL_PRD_VERSION ?= $(shell ../../make_version.sh opal-prd) ifdef KERNEL_DIR -LINKS += asm/opal-prd.h +links += asm/opal-prd.h endif -ccan: - $(Q_LN)ln -sfr ../../ccan ./ccan - -libflash: - $(Q_LN)ln -sfr ../../libflash ./libflash - -common: - $(Q_LN)ln -sfr ../common ./common - asm/opal-prd.h: $(Q_MKDIR)mkdir -p asm $(Q_LN)ln -sfr $(KERNEL_DIR)/arch/powerpc/include/uapi/asm/opal-prd.h \ asm/opal-prd.h -$(OBJS): | $(LINKS) - %.o: %.c $(Q_CC)$(COMPILE.c) $< -o $@ diff --git a/external/pflash/Makefile b/external/pflash/Makefile index 9d7c183..bc371a3 100644 --- a/external/pflash/Makefile +++ b/external/pflash/Makefile @@ -1,30 +1,8 @@ -# Use make V=1 for a verbose build. -ifndef V - Q_CC= @echo ' CC ' $@; - Q_LD= @echo ' LD ' $@; - Q_LN= @echo ' LN ' $@; - Q_MKDIR=@echo ' MKDIR ' $@; -endif - include rules.mk GET_ARCH = ../../external/common/get_arch.sh include ../../external/common/rules.mk -all: $(EXE) - -.PHONY: links -links: libflash ccan common - -libflash: - $(Q_LN)ln -sf ../../libflash . - -ccan: - $(Q_LN)ln -sf ../../ccan . - -common: - $(Q_LN)ln -sf ../common . - -$(OBJS): | links arch_links +all: links arch_links $(EXE) .PHONY: VERSION-always .version: VERSION-always -- 2.1.4

1 0

commit mate-themes for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package mate-themes for openSUSE:Factory checked in at 2016-04-01 13:02:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mate-themes (Old) and /work/SRC/openSUSE:Factory/.mate-themes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mate-themes" Changes: -------- --- /work/SRC/openSUSE:Factory/mate-themes/mate-themes.changes 2016-01-04 09:22:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mate-themes.new/mate-themes.changes 2016-04-01 13:02:38.000000000 +0200 @@ -1,0 +2,52 @@ +Sat Mar 26 19:35:13 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 3.20.4: + * GTK+-3.20 Menta themes: Add styling for mate-mixer GUI. + * GTK+-3.20 Menta themes: Reduce size of menubars and menuitems. + * GTK+-3.20 Menta themes: Reduce size of reduce size of actionbar. + * GTK+-3.20 Menta themes: Fix buttons in rhythmbox. + * GTK+-3.20 Menta themes: Adjust GtkColorScale. + * GTK+-3.20 Menta themes: Simplify combobox and caja settings. + * GTK+-3.20 Menta themes: Reduce height of sidbar treeview. + * GTK+-3.20: Menta themes: Adjust treeviews. + * GTK+-3.20 Menta themes: Fix combobox, spinbutton and switch in + list rows, this make elements in cinnamon-setting visible. + * GTK+-3.20 Menta themes: File-browser pathbar adjustments + + increase size of rows + clean up. + * GTK+-3.20 Menta themes: adjust notebooks settings. + * GTK+-3.20 branch: make GreanLaguna optional (not default). + * GTK+-3.20 high contrast themes: Finished port to Gtk 3.20. + * GTK3-3.20 traditional themes: Button state cleanup + fix size + of Nemo's buttons. + * GTK+-3.20 traditional themes: Adjust GtkScale and GtkColorScale. + * GTK+-3.20 traditional themes: Adjust width of scrollbars. + * GTK+-3.20 traditional themes: Adjust comboboxes. + * GTK+-3.20 traditional themes: Fix treeview header button. + * GTK+-3.20 traditional themes: Fix jumping pathbar buttons. + * GTK+-3.20 Submarine themes: Improve Nemo pathbar settings. + * GTK+-3.20 Submarine themes: Adjustements for Nemo and + cinnamon-settings. + * GTK+-3.20 Submarine themes: Adjust GtkColorScale. + * GTK+-3.20 Submarine themes: Adjust combobox, rows, treeviews, + inline-toolbar and Nautilus pathbar. + * GTK+-3.20 Submarine themes: Adjust Caja and Pluma. + * GTK+-3.20 Submarine themes: Adjust notebooks. + * GTK+-3.20 most themes: Fix text bg of credits in GtkAbout + windows. + * GTK+-3.20 all themes: Update wnckpager to follow latest + mate-panel changes. + +------------------------------------------------------------------- +Tue Mar 22 20:32:54 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to 3.20.3 (changes since 1.12.2): + * Port BlueMenta, BlackMATE, *Submarine, Menta, TraditionalOK, + TraditionalGreen to GTK+ 3.20. + * Gtk3: Fix Scrollbars, Spinbutton and Notebooks in Menta themes, + Submarine themes and Traditional themes. + * Other improvements. + * Language updates. +- Require current Gtk for build: should not be built on targets + with a lesser version, as new themes are not usable there. + +------------------------------------------------------------------- Old: ---- mate-themes-gtk3.18-1.12.2.tar.xz New: ---- mate-themes-3.20.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mate-themes.spec ++++++ --- /var/tmp/diff_new_pack.fXwE4o/_old 2016-04-01 13:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.fXwE4o/_new 2016-04-01 13:02:39.000000000 +0200 @@ -18,26 +18,26 @@ # TODO: Split up packages into individual themes. # mate-themes is released in different editions for different Gtk3 versions. -# Let's use a Gtk 3.18 version for openSUSE Tumbleweed. -%define _gtk_ver 3.18 -%define _version 1.12 +# Let's use the Gtk 3.20 version for openSUSE Tumbleweed. +%define _version 3.20 Name: mate-themes -Version: 1.12.2 +Version: 3.20.4 Release: 0 Summary: Themes for the MATE desktop License: LGPL-2.1+ Group: System/GUI/Other Url: http://mate-desktop.org/ -Source0: http://pub.mate-desktop.org/releases/%{_version}/%{name}-gtk%{_gtk_ver}-%{v… +Source: http://pub.mate-desktop.org/releases/themes/%{_version}/%{name}-%{version}.… BuildRequires: fdupes BuildRequires: icon-naming-utils -BuildRequires: mate-common >= %{_version} +BuildRequires: mate-common BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 Requires: gtk2-engine-clearlooks Requires: gtk2-engine-hcengine Requires: gtk2-engine-murrine -Recommends: %{name}-lang +Obsoletes: %{name}-lang BuildArch: noarch %description @@ -49,17 +49,17 @@ %lang_package %prep -%setup -q -n %{name}-gtk%{_gtk_ver}-%{version} +%setup -q %build -%configure --enable-all-themes +NOCONFIGURE=1 mate-autogen +%configure \ + --enable-all-themes make %{?_smp_mflags} %install %make_install %icon_theme_cache_create_ghost ContrastHigh - -%find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}%{_datadir} %post @@ -77,12 +77,10 @@ %{_datadir}/themes/Blue-Submarine/ %{_datadir}/themes/ContrastHigh/ %{_datadir}/themes/ContrastHighInverse/ -%{_datadir}/themes/GreenLaguna/ %{_datadir}/themes/Green-Submarine/ %{_datadir}/themes/Menta/ %{_datadir}/themes/Shiny/ %{_datadir}/themes/TraditionalOk/ -%{_datadir}/themes/TraditionalOkTest/ %{_datadir}/themes/TraditionalGreen/ # Icon sets. %{_datadir}/icons/ContrastHigh/ @@ -91,7 +89,4 @@ %dir %{_datadir}/icons/mate/ %{_datadir}/icons/mate/cursors/ -%files lang -f %{name}.lang -%defattr(-,root,root) - %changelog ++++++ mate-themes-gtk3.18-1.12.2.tar.xz -> mate-themes-3.20.4.tar.xz ++++++ ++++ 114807 lines of diff (skipped)

1 0

commit servicelog for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package servicelog for openSUSE:Factory checked in at 2016-04-01 13:02:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/servicelog (Old) and /work/SRC/openSUSE:Factory/.servicelog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "servicelog" Changes: -------- --- /work/SRC/openSUSE:Factory/servicelog/servicelog.changes 2014-09-09 19:00:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.servicelog.new/servicelog.changes 2016-04-01 13:02:36.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 22 16:26:13 UTC 2016 - jloeser(a)suse.com + +- version update to 1.1.14 (FATE#319555) + - see servicelog-1.1.14/ChangeLog for changes + +------------------------------------------------------------------- Old: ---- servicelog-1.1.13.tar.bz2 New: ---- servicelog-1.1.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ servicelog.spec ++++++ --- /var/tmp/diff_new_pack.Wwrx0U/_old 2016-04-01 13:02:37.000000000 +0200 +++ /var/tmp/diff_new_pack.Wwrx0U/_new 2016-04-01 13:02:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package servicelog # -# Copyright (c) 2014 SUSE LINUX Products 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: servicelog -Version: 1.1.13 +Version: 1.1.14 Release: 0 Summary: Servicelog Tools License: GPL-2.0 @@ -26,7 +26,7 @@ BuildRequires: libservicelog-devel BuildRequires: sqlite3-devel Url: http://linux-diag.sourceforge.net/servicelog -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 ppc64le

1 0

commit sitar for openSUSE:Factory
by root＠hilbert.suse.de 01 Apr '16

01 Apr '16

Hello community, here is the log from the commit of package sitar for openSUSE:Factory checked in at 2016-04-01 13:02:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sitar (Old) and /work/SRC/openSUSE:Factory/.sitar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sitar" Changes: -------- --- /work/SRC/openSUSE:Factory/sitar/sitar.changes 2014-10-16 18:16:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sitar.new/sitar.changes 2016-04-01 13:02:35.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Mar 20 14:51:02 UTC 2016 - bwiedemann(a)suse.com + +- Add reproducible.patch to fix build-compare + +------------------------------------------------------------------- New: ---- reproducible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sitar.spec ++++++ --- /var/tmp/diff_new_pack.OQD0TE/_old 2016-04-01 13:02:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OQD0TE/_new 2016-04-01 13:02:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sitar # -# Copyright (c) 2012 SUSE LINUX Products 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 @@ -26,6 +26,7 @@ Source0: sitar-%{version}.tar.bz2 # PATCH-FIX-OPENSUSE fix-syntax-errors-with-newer-perl.patch boo#899992 wbauer(a)tmo.at -- fix syntax errors when run with the perl in openSUSE 13.1 and higher Patch: fix-syntax-errors-with-newer-perl.patch +Patch1: reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: groff BuildArch: noarch @@ -58,8 +59,11 @@ %prep %setup -q %patch -p1 +%patch1 -p1 %build +: ${SOURCE_DATE_EPOCH:=1168904229} +export SOURCE_DATE_EPOCH make %install ++++++ reproducible.patch ++++++ Index: sitar-1.0.6/Makefile =================================================================== --- sitar-1.0.6.orig/Makefile +++ sitar-1.0.6/Makefile @@ -26,7 +26,7 @@ PERL = /usr/bin/perl RELEASE = 1.0.6 SVNVERSION := $(shell svnversion -n . | sed "s/:/./" ) -RELDATE := $(shell date +"%Y%m%d") +RELDATE := $(shell date --date=@$$SOURCE_DATE_EPOCH +"%Y%m%d") CFG_PFRAGS = pfrags/cfg2scm.header.pl \ pfrags/cfg2scm.manpage.pl \ pfrags/cfg2scm.globals.pl \

1 0