Hello community, here is the log from the commit of package bonnie++ for openSUSE:Factory checked in at 2016-11-14 20:16:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bonnie++ (Old) and /work/SRC/openSUSE:Factory/.bonnie++.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bonnie++" Changes: -------- --- /work/SRC/openSUSE:Factory/bonnie++/bonnie++.changes 2016-06-19 12:53:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bonnie++.new/bonnie++.changes 2016-11-14 20:16:04.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 13 18:49:19 UTC 2016 - [email protected] + +- Update to version 1.97.2 + * make it build with GCC-6 + * fix some Debian bugs. +- Drop needed patch bonnie++-1.96-minmax.patch + +------------------------------------------------------------------- Old: ---- bonnie++-1.96-minmax.patch bonnie++-1.97.tgz New: ---- bonnie++-1.97.2.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bonnie++.spec ++++++ --- /var/tmp/diff_new_pack.hstAMF/_old 2016-11-14 20:16:05.000000000 +0100 +++ /var/tmp/diff_new_pack.hstAMF/_new 2016-11-14 20:16:05.000000000 +0100 @@ -17,18 +17,16 @@ Name: bonnie++ -Version: 1.97 +Version: 1.97.2 Release: 0 Summary: A Bonnie-Like File System Benchmark License: MIT Group: System/Benchmark Url: http://www.coker.com.au/bonnie++/ Source: http://www.coker.com.au/bonnie++/experimental/%{name}-%{version}.tgz +BuildRequires: gcc-c++ # PATCH-FIX-UPSTREAM bonnie++-1.96-makefile.patch -- fixes make install Patch0: bonnie++-1.96-makefile.patch -# PATCH-FIX-UPSTREAM bonnie++-1.96-minmax.patch -- fixes building with gcc6 (boo#985139) -Patch1: bonnie++-1.96-minmax.patch -BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -36,16 +34,14 @@ hard drive and file system performance tests. %prep -# match the upstream tarball, there's no diff against 1.97 -%setup -q -n bonnie++-1.97.1 +%setup -q %patch0 -%patch1 %build %configure \ --disable-stripping make clean %{?_smp_mflags} -make MORECFLAGS="%{optflags}" LINK="g++ -Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" %{?_smp_mflags} +make MORECFLAGS="%{optflags}" %{?_smp_mflags} %install %make_install ++++++ bonnie++-1.97.tgz -> bonnie++-1.97.2.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/bonnie++.cpp new/bonnie++-1.97.2/bonnie++.cpp --- old/bonnie++-1.97.1/bonnie++.cpp 2009-07-03 04:38:14.000000000 +0200 +++ new/bonnie++-1.97.2/bonnie++.cpp 2016-06-30 11:41:41.000000000 +0200 @@ -73,7 +73,7 @@ void set_io_chunk_size(int size) { delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; } void set_file_chunk_size(int size) - { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; } + { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; } // Return the page-aligned version of the local buffer char *buf() { return m_buf_pa; } @@ -138,7 +138,7 @@ , m_buf(NULL) , m_buf_pa(NULL) { - pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); + pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa); SetName("."); } @@ -393,8 +393,8 @@ usage(); } #endif - globals.byte_io_size = __min(file_size, globals.byte_io_size); - globals.byte_io_size = __max(0, globals.byte_io_size); + globals.byte_io_size = min(file_size, globals.byte_io_size); + globals.byte_io_size = max(0, globals.byte_io_size); if(machine == NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/debian/changelog new/bonnie++-1.97.2/debian/changelog --- old/bonnie++-1.97.1/debian/changelog 2012-11-23 10:14:22.000000000 +0100 +++ new/bonnie++-1.97.2/debian/changelog 2016-06-30 11:42:23.000000000 +0200 @@ -1,3 +1,13 @@ +bonnie++ (1.97.2) unstable; urgency=medium + + * Added compat level and build-depends on debhelper >= 9 + Closes: #817380 Closes: #817313 + * Fix description Closes: #699576 + * Added smoketest Closes: #719739 + * Make it build with GCC-6 + + -- Russell Coker <[email protected]> Thu, 30 Jun 2016 19:22:23 +1000 + bonnie++ (1.97.1) unstable; urgency=medium * Fixed the changelog and aim it at unstable not wheezy. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/debian/compat new/bonnie++-1.97.2/debian/compat --- old/bonnie++-1.97.1/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ new/bonnie++-1.97.2/debian/compat 2016-06-30 11:21:46.000000000 +0200 @@ -0,0 +1 @@ +9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/debian/control new/bonnie++-1.97.2/debian/control --- old/bonnie++-1.97.1/debian/control 2012-11-23 08:52:15.000000000 +0100 +++ new/bonnie++-1.97.2/debian/control 2016-06-30 11:28:22.000000000 +0200 @@ -3,7 +3,8 @@ Priority: optional Maintainer: Russell Coker <[email protected]> Standards-Version: 3.5.6 -Build-Depends: debhelper +Build-Depends: debhelper (>= 9) +XS-Testsuite: autopkgtest Package: bonnie++ Architecture: any @@ -12,10 +13,10 @@ Replaces: zcav, bonnie Provides: zcav, bonnie Description: Hard drive benchmark suite - Based on the old Bonnie benchmark, Bonnie++ is a toolkit for testing - hard drive and file system performance. - . - As well as bonnie++ itself and some output filters, the suite provides - some other benchmarking tools including zcav, which can compare the - raw-read performance of different zones on a drive, and gives output - suitable for gnuplot. + Based on the old Bonnie benchmark, Bonnie++ is a toolkit for testing + hard drive and file system performance. + . + As well as bonnie++ itself and some output filters, the suite provides + some other benchmarking tools including zcav, which can compare the + raw-read performance of different zones on a drive, and gives output + suitable for gnuplot. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/debian/rules new/bonnie++-1.97.2/debian/rules --- old/bonnie++-1.97.1/debian/rules 2008-07-23 02:58:51.000000000 +0200 +++ new/bonnie++-1.97.2/debian/rules 2016-06-30 11:29:32.000000000 +0200 @@ -5,9 +5,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=4 - build: build-stamp build-stamp: dh_testdir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/debian/tests/control new/bonnie++-1.97.2/debian/tests/control --- old/bonnie++-1.97.1/debian/tests/control 1970-01-01 01:00:00.000000000 +0100 +++ new/bonnie++-1.97.2/debian/tests/control 2016-06-30 11:28:04.000000000 +0200 @@ -0,0 +1 @@ +Tests: smoke diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/debian/tests/smoke new/bonnie++-1.97.2/debian/tests/smoke --- old/bonnie++-1.97.1/debian/tests/smoke 1970-01-01 01:00:00.000000000 +0100 +++ new/bonnie++-1.97.2/debian/tests/smoke 2016-06-30 11:28:04.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +tmpdir="$(mktemp -d)" +trap "rm -rf $tmpdir" 0 INT QUIT ABRT PIPE TERM + +# A minimalist bonnie++ run +/usr/sbin/bonnie++ -q -u $(id -u) -d "$tmpdir" -s 0 -n 1 > /dev/null; then +exit $? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/duration.cpp new/bonnie++-1.97.2/duration.cpp --- old/bonnie++-1.97.1/duration.cpp 2008-12-23 23:26:42.000000000 +0100 +++ new/bonnie++-1.97.2/duration.cpp 2016-06-30 11:41:58.000000000 +0200 @@ -38,7 +38,7 @@ getTime(&tv); double ret; ret = tv - m_start; - m_max = __max(m_max, ret); + m_max = max(m_max, ret); return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/port.h new/bonnie++-1.97.2/port.h --- old/bonnie++-1.97.1/port.h 2011-01-18 22:36:31.000000000 +0100 +++ new/bonnie++-1.97.2/port.h 2016-06-30 11:41:09.000000000 +0200 @@ -3,19 +3,6 @@ #include "conf.h" -#ifndef HAVE_MIN_MAX -#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO) -#ifdef HAVE_ALGO -#include <algo> -#else -#include <algo.h> -#endif -#else -#define min(XX,YY) ((XX) < (YY) ? (XX) : (YY)) -#define max(XX,YY) ((XX) > (YY) ? (XX) : (YY)) -#endif -#endif - @@ -49,8 +36,6 @@ #endif typedef int FILE_TYPE; -#define __min min -#define __max max typedef unsigned int UINT; typedef unsigned long ULONG; typedef const char * PCCHAR; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/port.h.in new/bonnie++-1.97.2/port.h.in --- old/bonnie++-1.97.1/port.h.in 2008-12-24 01:16:16.000000000 +0100 +++ new/bonnie++-1.97.2/port.h.in 2016-06-30 11:40:52.000000000 +0200 @@ -3,19 +3,6 @@ #include "conf.h" -#ifndef HAVE_MIN_MAX -#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO) -#ifdef HAVE_ALGO -#include <algo> -#else -#include <algo.h> -#endif -#else -#define min(XX,YY) ((XX) < (YY) ? (XX) : (YY)) -#define max(XX,YY) ((XX) > (YY) ? (XX) : (YY)) -#endif -#endif - @semun@ @bool@ @snprintf@ @@ -49,8 +36,6 @@ #endif typedef int FILE_TYPE; -#define __min min -#define __max max typedef unsigned int UINT; typedef unsigned long ULONG; typedef const char * PCCHAR; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bonnie++-1.97.1/rand.h new/bonnie++-1.97.2/rand.h --- old/bonnie++-1.97.1/rand.h 2003-01-08 20:52:53.000000000 +0100 +++ new/bonnie++-1.97.2/rand.h 2016-06-30 11:38:55.000000000 +0200 @@ -3,9 +3,9 @@ using namespace std; #include "port.h" +#include <string> #include <stdio.h> #include <stdlib.h> -#include <string> class Rand {
