July 2014 - openSUSE Commits - openSUSE Mailing Lists

commit monit for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package monit for openSUSE:Factory checked in at 2014-07-31 21:50:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/monit (Old) and /work/SRC/openSUSE:Factory/.monit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "monit" Changes: -------- --- /work/SRC/openSUSE:Factory/monit/monit.changes 2013-09-27 17:46:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.monit.new/monit.changes 2014-07-31 21:50:50.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 30 00:26:49 UTC 2014 - sfalken(a)opensuse.org + +- update to 5.8.1: + * Changed all /var/run to /run to fix rpmlint check failure in Factory + * Added: monit-5.8.1.tar.gz + * Deleted: monit-5.6.tar.gz + monit-page_shift.patch as new version deprecates it + * Updated: monit-better_default_monitrc.patch + +------------------------------------------------------------------- Old: ---- monit-5.6.tar.gz monit-page_shift.patch New: ---- monit-5.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ monit.spec ++++++ --- /var/tmp/diff_new_pack.9hF4mV/_old 2014-07-31 21:50:52.000000000 +0200 +++ /var/tmp/diff_new_pack.9hF4mV/_new 2014-07-31 21:50:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package monit # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Pascal Bleser <pascal.bleser(a)opensuse.org> # # All modifications and additions to the file contributed by third parties @@ -18,16 +18,15 @@ Name: monit -Version: 5.6 +Version: 5.8.1 Release: 0 Summary: Service Manager and Monitor System License: AGPL-3.0 Group: System/Monitoring Source: http://mmonit.com/monit/dist/monit-%{version}.tar.gz Source1: monit-vendor-files.tar.gz -Patch1: monit-page_shift.patch -Patch2: monit-better_default_monitrc.patch -Patch3: monit-dirs.patch +Patch1: monit-better_default_monitrc.patch +Patch2: monit-dirs.patch Source99: monit-rpmlintrc Url: http://mmonit.com/monit/download/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,14 +82,13 @@ %prep %setup -q -a1 -%patch1 +%patch1 -p1 %patch2 -%patch3 %__perl -n -e 'print $1,"\n" if /^\+{3}\s+(\S+)/' <"%PATCH3" \ | while read f; do %__perl -i -p -e ' -s,\Q@@PIDDIR@@\E,%{_var}/run/monit,g; -s,\Q@@EVENTDIR@@\E,%{_var}/run/monit/events,g; +s,\Q@@PIDDIR@@\E,/run/monit,g; +s,\Q@@EVENTDIR@@\E,/run/monit/events,g; ' "$f" done @@ -112,19 +110,19 @@ "%{buildroot}%{_sbindir}" \ "%{buildroot}%{_datadir}/monit" \ "%{buildroot}%{_var}/adm/fillup-templates" \ - "%{buildroot}%{_var}/run/monit" \ - "%{buildroot}%{_var}/run/monit/events" \ + "%{buildroot}/run/monit" \ + "%{buildroot}/run/monit/events" \ "%{buildroot}%{_var}/lib/monit" -touch "%{buildroot}%{_var}/run/monit/.monit.id" +touch "%{buildroot}/run/monit/.monit.id" . vendor-files/sysconfig/monit.tmpl MONIT_BIN="%{_bindir}/monit" MONIT_MODIFY_INITTAB="%{_datadir}/monit/monit-modifyinittab" -MONIT_PID_FILE="%{_var}/run/monit/monit.pid" +MONIT_PID_FILE="/run/monit/monit.pid" MONIT_SYSCONFIG_FILE="/etc/sysconfig/monit" MONIT_INITTAB_STATE_FILE="%{_var}/lib/monit/monit-inittab.state" -MONIT_ARGS="-p ${MONIT_PID_FILE} -s %{_var}/run/monit/monit.state" +MONIT_ARGS="-p ${MONIT_PID_FILE} -s /run/monit/monit.state" MONIT_EVENTQUE_DIR="%{_var}/lib/monit" %__sed -e "s|%{_var}/monit|${MONIT_EVENTQUE_DIR}|g" \ < monitrc > "%{buildroot}%{_sysconfdir}/monitrc" @@ -151,7 +149,7 @@ %__install -m0754 vendor-files/tools/monit-modifyinittab "%{buildroot}%{_datadir}/monit" %__install -m0644 vendor-files/sysconfig/monit "%{buildroot}%{_var}/adm/fillup-templates/sysconfig.monit" touch "%{buildroot}%{_var}/lib/monit/monit-inittab.state" -touch "%{buildroot}%{_var}/run/monit"/monit.{pid,state} +touch "%{buildroot}/run/monit"/monit.{pid,state} %__install -m0644 vendor-files/docu/README README.SUSE %__install -d "%{buildroot}%{_docdir}/%{name}" @@ -161,15 +159,15 @@ echo "%doc %{_docdir}/%{name}/$f" >>doc.main.lst done >doc.doc.lst -for f in CHANGES README* doc; do +for f in README* doc; do %__cp -a "$f" "%{buildroot}%{_docdir}/%{name}/" echo "%doc %{_docdir}/%{name}/$(basename $f)" >>doc.doc.lst done %post %{fillup_and_insserv} -%__install -d -m0700 -o root -g root %{_var}/run/monit -%__install -d -m0700 -o root -g root %{_var}/run/monit/events +%__install -d -m0700 -o root -g root /run/monit +%__install -d -m0700 -o root -g root /run/monit/events %preun %{stop_on_removal monit} @@ -194,11 +192,11 @@ %{_var}/adm/fillup-templates/sysconfig.monit %dir %{_var}/lib/monit %ghost %{_var}/lib/monit/monit-inittab.state -%ghost %dir %{_var}/run/monit -%ghost %{_var}/run/monit/monit.pid -%ghost %{_var}/run/monit/monit.state -%ghost %{_var}/run/monit/.monit.id -%ghost %dir %{_var}/run/monit/events +%ghost %dir /run/monit +%ghost /run/monit/monit.pid +%ghost /run/monit/monit.state +%ghost /run/monit/.monit.id +%ghost %dir /run/monit/events %doc %{_mandir}/man1/monit.1%{ext_man} %files doc -f doc.doc.lst ++++++ monit-5.6.tar.gz -> monit-5.8.1.tar.gz ++++++ ++++ 52285 lines of diff (skipped) ++++++ monit-better_default_monitrc.patch ++++++ --- /var/tmp/diff_new_pack.9hF4mV/_old 2014-07-31 21:50:52.000000000 +0200 +++ /var/tmp/diff_new_pack.9hF4mV/_new 2014-07-31 21:50:52.000000000 +0200 @@ -1,8 +1,7 @@ -Index: monitrc -=================================================================== ---- monitrc.orig -+++ monitrc -@@ -24,24 +24,24 @@ set daemon 60 # check serv +diff -rupN monit-5.8.1.old/monitrc monit-5.8.1/monitrc +--- monit-5.8.1.old/monitrc 2014-05-12 08:51:19.000000000 -0700 ++++ monit-5.8.1/monitrc 2014-07-29 17:17:04.747629705 -0700 +@@ -24,9 +24,9 @@ set daemon 60 # check serv ## Set syslog logging with the 'daemon' facility. If the FACILITY option is ## omitted, Monit will use 'user' facility by default. If you want to log to ## a standalone log file instead, specify the full path to the log file @@ -13,6 +12,9 @@ +set logfile syslog facility log_daemon + # + ## Set the location of the Monit lock file which stores the process id of the + ## running Monit instance. By default this file is stored in $HOME/.monit.pid +@@ -36,17 +36,17 @@ set daemon 60 # check serv ## Set the location of the Monit id file which stores the unique id for the ## Monit instance. The id is generated and stored on first Monit start. By ## default the file is placed in $HOME/.monit.id. @@ -20,7 +22,7 @@ -# set idfile /var/.monit.id -# + -+set idfile /var/run/monit/.monit.id ++set idfile /run/monit/.monit.id + ## Set the location of the Monit state file which saves monitoring states ## on each cycle. By default the file is placed in $HOME/.monit.state. If @@ -31,12 +33,12 @@ -# set statefile /var/.monit.state -# + -+set statefile /var/run/monit/monit.state ++set statefile /run/monit/monit.state + ## Set the list of mail servers for alert delivery. Multiple servers may be ## specified using a comma separator. If the first mail server fails, Monit # will use the second mail server in the list and so on. By default Monit uses -@@ -50,7 +50,9 @@ set daemon 60 # check serv +@@ -55,7 +55,9 @@ set daemon 60 # check serv # set mailserver mail.bar.baz, # primary mailserver # backup.bar.baz port 10025, # backup mailserver on port 10025 # localhost # fallback relay @@ -47,23 +49,25 @@ # ## By default Monit will drop alert events if no mail servers are available. ## If you want to keep the alerts for later delivery retry, you can use the -@@ -62,7 +64,11 @@ set daemon 60 # check serv +@@ -67,7 +69,11 @@ set daemon 60 # check serv # set eventqueue # basedir /var/monit # set the base directory where events will be stored # slots 100 # optionally limit the queue size -# + +set eventqueue -+ basedir /var/run/monit/events ++ basedir /run/monit/events + slots 100 + # ## Send status and events to M/Monit (for more informations about M/Monit ## see http://mmonit.com/). By default Monit registers credentials with -@@ -98,7 +104,9 @@ set daemon 60 # check serv +@@ -101,16 +107,16 @@ set daemon 60 # check serv + ## You can override this message format or parts of it, such as subject + ## or sender using the MAIL-FORMAT statement. Macros such as $DATE, etc. ## are expanded at runtime. For example, to override the sender, use: - # - # set mail-format { from: monit(a)foo.bar } +-# +-# set mail-format { from: monit(a)foo.bar } -# + +set mail-format { from: monit@localhost } @@ -71,13 +75,13 @@ # ## You can set alert recipients whom will receive alerts if/when a ## service defined in this file has errors. Alerts may be restricted on -@@ -108,6 +116,9 @@ set daemon 60 # check serv - ## Do not alert when Monit start,stop or perform a user initiated action - # set alert manager(a)foo.bar not on { instance, action } - # + ## events by using a filter as in the second example below. +-# +-# set alert sysadm(a)foo.bar # receive all alerts +-# + -+set alert root@localhost ++set alert root@localhost # receive all alerts + + ## Do not alert when Monit starts, stops or performs a user initiated action. + ## This filter is recommended to avoid getting alerts for trivial cases. # - ## Monit has an embedded web server which can be used to view status of - ## services monitored and manage services from a web interface. See the -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aespipe for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package aespipe for openSUSE:Factory checked in at 2014-07-31 21:50:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aespipe (Old) and /work/SRC/openSUSE:Factory/.aespipe.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aespipe" Changes: -------- --- /work/SRC/openSUSE:Factory/aespipe/aespipe.changes 2012-04-03 09:19:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.aespipe.new/aespipe.changes 2014-07-31 21:50:47.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 29 11:21:56 UTC 2014 - dvaleev(a)suse.com + +- Fix PowerPC little endian build + +- added patches: + * aespipe-ppc64le.patch +------------------------------------------------------------------- New: ---- aespipe-ppc64le.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aespipe.spec ++++++ --- /var/tmp/diff_new_pack.qjp127/_old 2014-07-31 21:50:48.000000000 +0200 +++ /var/tmp/diff_new_pack.qjp127/_new 2014-07-31 21:50:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package aespipe # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Group: Productivity/Security Url: http://loop-aes.sourceforge.net/ Source: http://loop-aes.sourceforge.net/aespipe/aespipe-v%{version}.tar.bz2 +Patch1: aespipe-ppc64le.patch BuildRequires: autoconf BuildRequires: automake @@ -37,6 +38,7 @@ %prep %setup -q -n "aespipe-v%{version}" %__patch -p0 < aes-GPL.diff +%patch1 -p1 %build autoreconf -fiv ++++++ aespipe-ppc64le.patch ++++++ >From e72eb6bcc737bc5b76645c95002d4cfdd0d92615 Mon Sep 17 00:00:00 2001 From: Dinar Valeev <dvaleev(a)suse.com> Date: Tue, 29 Jul 2014 13:10:05 +0200 Subject: [PATCH] le --- aes.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aes.c b/aes.c index 9af72b8..29da9d7 100644 --- a/aes.c +++ b/aes.c @@ -104,7 +104,11 @@ # undef DATA_ALWAYS_ALIGNED # define DATA_ALWAYS_ALIGNED 1 /* unaligned access is always ok */ #elif defined(__ppc__)||defined(__ppc)||defined(__PPC__)||defined(__PPC)||defined(__powerpc__)||defined(__powerpc)||defined(__POWERPC__)||defined(__POWERPC)||defined(__PowerPC__)||defined(__PowerPC)||defined(__ppc64__)||defined(__ppc64)||defined(__PPC64__)||defined(__PPC64)||defined(__powerpc64__)||defined(__powerpc64)||defined(__s390__)||defined(__s390) +#if defined(__LITTLE_ENDIAN__) +# define INTERNAL_BYTE_ORDER 1 +#else # define INTERNAL_BYTE_ORDER 2 +#endif # undef DATA_ALWAYS_ALIGNED # define DATA_ALWAYS_ALIGNED 1 /* unaligned access is always ok */ #elif defined(__alpha__)||defined(__alpha)||defined(__ia64__)||defined(__ia64) -- 1.8.5.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bonnie++ for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package bonnie++ for openSUSE:Factory checked in at 2014-07-31 21:50:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-10-16 12:43:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bonnie++.new/bonnie++.changes 2014-07-31 21:50:42.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 30 13:47:07 CEST 2014 - dsterba(a)suse.cz + +- upgraded source to version 1.97 + * fixed a bunch of bugs including bad CSV output. + +------------------------------------------------------------------- Old: ---- bonnie++-1.96.tgz New: ---- bonnie++-1.97.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bonnie++.spec ++++++ --- /var/tmp/diff_new_pack.HAstEd/_old 2014-07-31 21:50:44.000000000 +0200 +++ /var/tmp/diff_new_pack.HAstEd/_new 2014-07-31 21:50:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package bonnie++ # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,16 @@ # - Name: bonnie++ -BuildRequires: gcc-c++ +Version: 1.97 +Release: 0 +Summary: A Bonnie-Like File System Benchmark License: MIT Group: System/Benchmark -Provides: bonnie++-1.96 -Summary: A Bonnie-Like File System Benchmark -Version: 1.96 -Release: 1 -Source: http://www.coker.com.au/bonnie++/bonnie++-1.96.tgz +Url: http://www.coker.com.au/bonnie++/ +Source: %{name}-%{version}.tgz +BuildRequires: gcc-c++ +Provides: bonnie++-%{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -33,27 +33,27 @@ hard drive and file system performance tests. %prep -%setup +%setup -q %build - make clean %{?_smp_mflags} - make MORECFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make clean %{?_smp_mflags} +make MORECFLAGS="%{optflags}" %{?_smp_mflags} %install - mkdir -p $RPM_BUILD_ROOT/usr/bin - /usr/bin/install -c bonnie++ zcav $RPM_BUILD_ROOT/usr/bin - /usr/bin/install -c bon_csv2html bon_csv2txt $RPM_BUILD_ROOT/usr/bin - mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,8} - /usr/bin/install -c -m 644 bon_csv2html.1 bon_csv2txt.1 $RPM_BUILD_ROOT%{_mandir}/man1 - /usr/bin/install -c -m 644 bonnie++.8 zcav.8 $RPM_BUILD_ROOT%{_mandir}/man8 +mkdir -p %{buildroot}%{_prefix}/bin +%{_bindir}/install -c bonnie++ zcav %{buildroot}%{_prefix}/bin +%{_bindir}/install -c bon_csv2html bon_csv2txt %{buildroot}%{_prefix}/bin +mkdir -p %{buildroot}%{_mandir}/man{1,8} +%{_bindir}/install -c -m 644 bon_csv2html.1 bon_csv2txt.1 %{buildroot}%{_mandir}/man1 +%{_bindir}/install -c -m 644 bonnie++.8 zcav.8 %{buildroot}%{_mandir}/man8 %files %defattr(-,root,root) %doc readme.html -/usr/bin/bonnie++ -/usr/bin/zcav -/usr/bin/bon_csv2html -/usr/bin/bon_csv2txt +%{_bindir}/bonnie++ +%{_bindir}/zcav +%{_bindir}/bon_csv2html +%{_bindir}/bon_csv2txt %{_mandir}/man8/bonnie++.8.gz %{_mandir}/man8/zcav.8.gz %{_mandir}/man1/bon_csv2html.1.gz ++++++ bonnie++-1.96.tgz -> bonnie++-1.97.tgz ++++++ ++++ 7100 lines of diff (skipped) ++++ retrying with extended exclude list Files old/bonnie++-1.96/.bon_csv2html.cpp.swp and new/bonnie++-1.97/.bon_csv2html.cpp.swp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_csv2html.1 new/bonnie++-1.97/bon_csv2html.1 --- old/bonnie++-1.96/bon_csv2html.1 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bon_csv2html.1 2011-01-18 22:36:31.000000000 +0100 @@ -21,10 +21,10 @@ Before each field I list the field number as well as the name given in the heading .TP .B 0 format_version -Version of the output format in use (1.96) +Version of the output format in use (1.97) .TP .B 1 bonnie_version -(1.96) +(1.97) .TP .B 2 name Machine Name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_csv2html.cpp new/bonnie++-1.97/bon_csv2html.cpp --- old/bonnie++-1.96/bon_csv2html.cpp 2009-07-03 08:21:11.000000000 +0200 +++ new/bonnie++-1.97/bon_csv2html.cpp 2012-11-23 09:22:33.000000000 +0100 @@ -43,14 +43,14 @@ bool col_used[MAX_ITEMS]; #define COL_NAME 2 #define COL_CONCURRENCY 3 -#define COL_FILE_SIZE 5 -#define COL_DATA_CHUNK_SIZE 6 +#define COL_FILE_size 5 +#define COL_DATA_CHUNK_size 6 #define COL_PUTC 7 #define COL_NUM_FILES 19 -#define COL_MAX_SIZE 20 -#define COL_MIN_SIZE 21 +#define COL_MAX_size 20 +#define COL_MIN_size 21 #define COL_NUM_DIRS 22 -#define COL_FILE_CHUNK_SIZE 23 +#define COL_FILE_CHUNK_size 23 #define COL_RAN_DEL_CPU 35 #define COL_PUTC_LATENCY 36 #define COL_SEEKS_LATENCY 41 @@ -90,11 +90,11 @@ props[i] = new PCCHAR[MAX_ITEMS]; props[i][0] = NULL; props[i][1] = NULL; - props[i][COL_NAME] = "bgcolor=\"#FFFFFF\" class=\"rowheader\">= COL_NUM_FILES && j <= COL_FILE_CHUNK_SIZE) || j <= COL_DATA_CHUNK_SIZE ) + if( (j >= COL_NUM_FILES && j <= COL_FILE_CHUNK_size) || j <= COL_DATA_CHUNK_size ) { props[i][j] = "class=\"size\" bgcolor=\"#FFFFFF\""; } @@ -109,32 +109,32 @@ for(i = 0; i < data.size(); i++) { // First print the average speed line - printf("<TR>"); - print_item(i, COL_NAME, "rowspan=2"); + printf("<tr>"); + print_item(i, COL_NAME, "rowspan=\"2\""); if(col_used[COL_CONCURRENCY] == true) print_item(i, COL_CONCURRENCY); - print_item(i, COL_FILE_SIZE); // file_size - if(col_used[COL_DATA_CHUNK_SIZE] == true) - print_item(i, COL_DATA_CHUNK_SIZE); + print_item(i, COL_FILE_size); // file_size + if(col_used[COL_DATA_CHUNK_size] == true) + print_item(i, COL_DATA_CHUNK_size); print_a_line(i, COL_PUTC, COL_NUM_FILES); - if(col_used[COL_MAX_SIZE]) - print_item(i, COL_MAX_SIZE); - if(col_used[COL_MIN_SIZE]) - print_item(i, COL_MIN_SIZE); + if(col_used[COL_MAX_size]) + print_item(i, COL_MAX_size); + if(col_used[COL_MIN_size]) + print_item(i, COL_MIN_size); if(col_used[COL_NUM_DIRS]) print_item(i, COL_NUM_DIRS); - if(col_used[COL_FILE_CHUNK_SIZE]) - print_item(i, COL_FILE_CHUNK_SIZE); - print_a_line(i, COL_FILE_CHUNK_SIZE + 1, COL_RAN_DEL_CPU); - printf("</TR>\n"); + if(col_used[COL_FILE_CHUNK_size]) + print_item(i, COL_FILE_CHUNK_size); + print_a_line(i, COL_FILE_CHUNK_size + 1, COL_RAN_DEL_CPU); + printf("</tr>\n"); // Now print the latency line - printf("<TR>"); + printf("<tr>"); int lat_width = 1; - if(col_used[COL_DATA_CHUNK_SIZE] == true) + if(col_used[COL_DATA_CHUNK_size] == true) lat_width++; if(col_used[COL_CONCURRENCY] == true) lat_width++; - printf("<TD class=\"size\" bgcolor=\"#FFFFFF\" COLSPAN=%d>Latency</TD>" + printf("<td class=\"size\" bgcolor=\"#FFFFFF\" colspan=\"%d\">Latency</td>" , lat_width); print_a_line(i, COL_PUTC_LATENCY, COL_SEEKS_LATENCY); int bef_lat_width; @@ -143,10 +143,10 @@ lat_width = 2; bef_lat_width = mid_width - lat_width; if(bef_lat_width) - printf("<TD COLSPAN=%d></TD>", bef_lat_width); - printf("<TD class=\"size\" bgcolor=\"#FFFFFF\" COLSPAN=%d>Latency</TD>", lat_width); + printf("<td colspan=\"%d\"></td>", bef_lat_width); + printf("<td class=\"size\" bgcolor=\"#FFFFFF\" colspan=\"%d\">Latency</td>", lat_width); print_a_line(i, COL_SEQ_CREATE_LATENCY, COL_RAN_DEL_LATENCY); - printf("</TR>\n"); + printf("</tr>\n"); } footer(); return 0; @@ -251,7 +251,7 @@ { if(vals[column_ind] == eLatency) { - props[sort_ind][column_ind] = "COLSPAN=2"; + props[sort_ind][column_ind] = "colspan=\"2\""; } } } @@ -316,14 +316,14 @@ if(vals[column_ind] != eSpeed) { reverse = true; - extra = " COLSPAN=2"; + extra = " colspan=\"2\""; } props[arr[sort_ind].pos][column_ind] = get_col(range_col, arr[sort_ind].val - min_col, reverse, extra); } else if(vals[column_ind] != eSpeed) { - props[arr[sort_ind].pos][column_ind] = "COLSPAN=2"; + props[arr[sort_ind].pos][column_ind] = "colspan=\"2\""; } } } @@ -333,7 +333,7 @@ { if(vals[column_ind] == eLatency) { - props[sort_ind][column_ind] = "COLSPAN=2"; + props[sort_ind][column_ind] = "colspan=\"2\""; } } } @@ -366,90 +366,90 @@ int header() { int vers_width = 2; - if(col_used[COL_DATA_CHUNK_SIZE] == true) + if(col_used[COL_DATA_CHUNK_size] == true) vers_width++; if(col_used[COL_CONCURRENCY] == true) vers_width++; int mid_width = 1; - if(col_used[COL_MAX_SIZE]) + if(col_used[COL_MAX_size]) mid_width++; - if(col_used[COL_MIN_SIZE]) + if(col_used[COL_MIN_size]) mid_width++; if(col_used[COL_NUM_DIRS]) mid_width++; - if(col_used[COL_FILE_CHUNK_SIZE]) + if(col_used[COL_FILE_CHUNK_size]) mid_width++; - printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">" -"<HTML>" -"<HEAD><TITLE>Bonnie++ Benchmark results</TITLE>" -"<STYLE type=\"text/css\">" -"TD.header {text-align: center; backgroundcolor: \"#CCFFFF\" }" -"TD.rowheader {text-align: center; backgroundcolor: \"#CCCFFF\" }" -"TD.size {text-align: center; backgroundcolor: \"#CCCFFF\" }" -"TD.ksec {text-align: center; fontstyle: italic }" -"</STYLE>" -"<BODY>" -"<TABLE ALIGN=center BORDER=3 CELLPADDING=2 CELLSPACING=1>" -"<TR><TD COLSPAN=%d class=\"header\">" + printf("<!DOCTYPE html PUBLIC \"-//W3C//Dtd XHTML 1.0 Strict//EN\" \"http://www.w3.org/tr/xhtml1/Dtd/xhtml1-strict.dtd\">" +"<html xmlns=\"http://www.w3.org/1999/xhtml\">" +"<head><meta http-equiv=\"Content-Type\" content=\"text/html;charset=utf-8\" /><title>Bonnie++ Benchmark results</title>" +"<style type=\"text/css\">" +"td.header {text-align: center; backgroundcolor: \"#CCFFFF\" }" +"td.rowheader {text-align: center; backgroundcolor: \"#CCCFFF\" }" +"td.size {text-align: center; backgroundcolor: \"#CCCFFF\" }" +"td.ksec {text-align: center; fontstyle: italic }" +"</style></head>" +"<body>" +"<table border=\"3\" cellpadding=\"2\" cellspacing=\"1\">" +"<tr><td colspan=\"%d\" class=\"header\">" "Version " BON_VERSION -"</TD>" -"<TD COLSPAN=6 class=\"header\">Sequential Output</TD>" -"<TD COLSPAN=4 class=\"header\">Sequential Input</TD>" -"<TD COLSPAN=2 ROWSPAN=2 class=\"header\">Random Seeks</TD>" -"<TD COLSPAN=%d class=\"header\"></TD>" -"<TD COLSPAN=6 class=\"header\">Sequential Create</TD>" -"<TD COLSPAN=6 class=\"header\">Random Create</TD>" -"</TR>\n" -"<TR>", vers_width, mid_width); +"</td>" +"<td colspan=\"6\" class=\"header\">Sequential Output</td>" +"<td colspan=\"4\" class=\"header\">Sequential Input</td>" +"<td colspan=\"2\" rowspan=\"2\" class=\"header\">Random Seeks</td>" +"<td colspan=\"%d\" class=\"header\"></td>" +"<td colspan=\"6\" class=\"header\">Sequential Create</td>" +"<td colspan=\"6\" class=\"header\">Random Create</td>" +"</tr>\n" +"<tr>", vers_width, mid_width); if(col_used[COL_CONCURRENCY] == true) - printf("<TD COLSPAN=2>Concurrency</TD>"); + printf("<td colspan=\"2\">Concurrency</td>"); else - printf("<TD></TD>"); - printf("<TD>Size</TD>"); - if(col_used[COL_DATA_CHUNK_SIZE] == true) - printf("<TD>Chunk Size</TD>"); + printf("<td></td>"); + printf("<td>Size</td>"); + if(col_used[COL_DATA_CHUNK_size] == true) + printf("<td>Chunk Size</td>"); heading("Per Char"); heading("Block"); heading("Rewrite"); heading("Per Char"); heading("Block"); - printf("<TD>Num Files</TD>"); - if(col_used[COL_MAX_SIZE]) - printf("<TD>Max Size</TD>"); - if(col_used[COL_MIN_SIZE]) - printf("<TD>Min Size</TD>"); + printf("<td>Num Files</td>"); + if(col_used[COL_MAX_size]) + printf("<td>Max Size</td>"); + if(col_used[COL_MIN_size]) + printf("<td>Min Size</td>"); if(col_used[COL_NUM_DIRS]) - printf("<TD>Num Dirs</TD>"); - if(col_used[COL_FILE_CHUNK_SIZE]) - printf("<TD>Chunk Size</TD>"); + printf("<td>Num Dirs</td>"); + if(col_used[COL_FILE_CHUNK_size]) + printf("<td>Chunk Size</td>"); heading("Create"); heading("Read"); heading("Delete"); heading("Create"); heading("Read"); heading("Delete"); - printf("</TR>"); + printf("</tr>"); - printf("<TR><TD COLSPAN=%d></TD>", vers_width); + printf("<tr><td colspan=\"%d\"></td>", vers_width); int i; - CPCCHAR ksec_form = "<TD class=\"ksec\">%s/sec</TD>" - "<TD class=\"ksec\">%% CPU</TD>"; + CPCCHAR ksec_form = "<td class=\"ksec\">%s/sec</td>" + "<td class=\"ksec\">%% CPU</td>"; for(i = 0; i < 5; i++) { printf(ksec_form, "K"); } printf(ksec_form, ""); - printf("<TD COLSPAN=%d></TD>", mid_width); + printf("<td colspan=\"%d\"></td>", mid_width); for(i = 0; i < 6; i++) { printf(ksec_form, ""); } - printf("</TR>\n"); + printf("</tr>\n"); return mid_width; } void heading(const char * const head) { - printf("<TD COLSPAN=2>%s</TD>", head); + printf("<td colspan=\"2\">%s</td>", head); } void footer() { - printf("</TABLE>\n</BODY></HTML>\n"); + printf("</table>\n</body></html>\n"); } STR_VEC split(CPCCHAR delim, CPCCHAR buf) @@ -473,7 +473,8 @@ STR_VEC arr = split(",", buf); if(strcmp(arr[0], CSV_VERSION) ) { - fprintf(stderr, "Can't process: %s\n", buf); + if(strncmp(arr[0], "format_version", 14)) + fprintf(stderr, "Can't process: %s\n", buf); free((void *)arr[0]); return; } @@ -487,12 +488,12 @@ line_data = data[num][item]; else line_data = ""; - printf("<TD"); + printf("<td"); if(extra) printf(" %s", extra); if(props[num][item]) printf(" %s", props[num][item]); - printf(">%s</TD>", line_data); + printf(">%s</td>", line_data); } void print_a_line(int num, int start, int end) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_csv2txt new/bonnie++-1.97/bon_csv2txt --- old/bonnie++-1.96/bon_csv2txt 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bon_csv2txt 2011-01-18 22:36:31.000000000 +0100 @@ -19,7 +19,7 @@ sub IOHeader { - my $version = '1.96'; + my $version = '1.97'; printf(STDOUT "Version %9s ------Sequential Output------ --Sequential Input- --Random-\n", $version); print " -Per Chr- --Block-- -Rewrite- -Per Chr- --Block-- --Seeks--\n"; print "Machine Size K/sec %CP K/sec %CP K/sec %CP K/sec %CP K/sec %CP /sec %CP\n"; @@ -39,7 +39,7 @@ chomp($line); $line =~ s/\r//; my @arr = split(',', $line); - my $csv_version = '1.96'; + my $csv_version = '1.97'; if($arr[0] ne $csv_version) { printf(STDERR "Can't process: %s\n", $line); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bon_time.cpp new/bonnie++-1.97/bon_time.cpp --- old/bonnie++-1.96/bon_time.cpp 2008-12-23 22:03:20.000000000 +0100 +++ new/bonnie++-1.97/bon_time.cpp 2012-11-23 08:22:33.000000000 +0100 @@ -175,7 +175,7 @@ void BonTimer::PrintHeader(FILE *fp) { - fprintf(fp, "format_version,bonnie_version,name,file_size,io_chunk_size,putc,putc_cpu,put_block,put_block_cpu,rewrite,rewrite_cpu,getc,getc_cpu,get_block,get_block_cpu,seeks,seeks_cpu"); + fprintf(fp, "format_version,bonnie_version,name,concurrency,seed,file_size,io_chunk_size,putc,putc_cpu,put_block,put_block_cpu,rewrite,rewrite_cpu,getc,getc_cpu,get_block,get_block_cpu,seeks,seeks_cpu"); fprintf(fp, ",num_files,max_size,min_size,num_dirs,file_chunk_size,seq_create,seq_create_cpu,seq_stat,seq_stat_cpu,seq_del,seq_del_cpu,ran_create,ran_create_cpu,ran_stat,ran_stat_cpu,ran_del,ran_del_cpu"); fprintf(fp, ",putc_latency,put_block_latency,rewrite_latency,getc_latency,get_block_latency,seeks_latency,seq_create_latency,seq_stat_latency,seq_del_latency,ran_create_latency,ran_stat_latency,ran_del_latency"); fprintf(fp, "\n"); @@ -293,7 +293,7 @@ } else if(m_type == csv) { - fprintf(m_fp, CSV_VERSION "," BON_VERSION ",%s,%d,%s,,,,,,,,,,,,,", m_name + fprintf(m_fp, CSV_VERSION "," BON_VERSION ",%s,%d,%s,,,,,,,,,,,,,,", m_name , m_concurrency, random_source.getSeed().c_str()); } return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bonnie++.8 new/bonnie++-1.97/bonnie++.8 --- old/bonnie++-1.96/bonnie++.8 2008-12-10 00:13:45.000000000 +0100 +++ new/bonnie++-1.97/bonnie++.8 2012-11-23 08:43:18.000000000 +0100 @@ -199,6 +199,10 @@ the output will be displayed as "++++". This is because such a test result can't be calculated accurately due to rounding errors and I would rather display no result than a wrong result. +.P +Data volumes for the 80 column text display use "K" for KiB (1024 bytes), "M" +for MiB (1048576 bytes), and "G" for GiB (1073741824 bytes). So K/sec means +a multiple of 1024 bytes per second. .SH "AUTHOR" This program, its manual page, and the Debian package were written by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bonnie++.spec new/bonnie++-1.97/bonnie++.spec --- old/bonnie++-1.96/bonnie++.spec 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bonnie++.spec 2011-01-18 22:36:31.000000000 +0100 @@ -1,6 +1,6 @@ Summary: A program for benchmarking hard drives and filesystems Name: bonnie++ -Version: 1.96 +Version: 1.97 Release: 1 Copyright: GPL Group: Utilities/Benchmarking diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/bonnie.h new/bonnie++-1.97/bonnie.h --- old/bonnie++-1.96/bonnie.h 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/bonnie.h 2011-01-18 22:36:31.000000000 +0100 @@ -3,8 +3,8 @@ using namespace std; -#define BON_VERSION "1.96" -#define CSV_VERSION "1.96" +#define BON_VERSION "1.97" +#define CSV_VERSION "1.97" #include "port.h" #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/configure.in new/bonnie++-1.97/configure.in --- old/bonnie++-1.96/configure.in 2009-07-04 03:23:53.000000000 +0200 +++ new/bonnie++-1.97/configure.in 2011-01-18 22:35:28.000000000 +0100 @@ -2,9 +2,9 @@ AC_INIT(bonnie++.cpp) AC_CONFIG_HEADER(conf.h) AC_SUBST(version) -version="1.96" +version="1.97" AC_SUBST(csv_version) -csv_version="1.96" +csv_version="1.97" AC_ARG_ENABLE(stripping, [ --disable-stripping disables stripping of installed binaries], @@ -96,7 +96,7 @@ int main () { int fd; off64_t i = off64_t(1) << 32 + 1; - char *name = "test.2g"; + const char * const name = "test.2g"; fd = open64(name, O_CREAT|O_RDWR|O_EXCL|O_LARGEFILE, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/debian/changelog new/bonnie++-1.97/debian/changelog --- old/bonnie++-1.96/debian/changelog 2009-07-04 03:24:26.000000000 +0200 +++ new/bonnie++-1.97/debian/changelog 2012-11-23 10:14:22.000000000 +0100 @@ -1,3 +1,29 @@ +bonnie++ (1.97.1) unstable; urgency=medium + + * Fixed the changelog and aim it at unstable not wheezy. + + -- Russell Coker <russell(a)coker.com.au> Fri, 23 Nov 2012 20:12:46 +1100 + +bonnie++ (1.97) unstable; urgency=medium + + * Fix a CSV column alignment bug in the case where -s0 is used. Bump the + data format version to 1.97. Thanks to Brian Keefer for reporting this. + Also added the concurrency and seed fields to the header. + Closes: #660564, #669124 + * Use a const pointer for the large file test. + * zcav.8 documents the maximum value of -s + * Made the zcav deefault block size 512M to cope with new disks that can + sustain >200MB/s. Also documented this. + * Made zcav not SEGV when the -c option is used. + Closes: #687668 + * Describe the units for the plain text output in bonnie++.8. + Closes: #643821 + * Removed the outdated section in the description which referred to Lenny. + Closes: #693483 + * Fixed most of the HTML validation errors in the output of bon_csv2html. + + -- Russell Coker <russell(a)coker.com.au> Fri, 23 Nov 2012 19:32:00 +1100 + bonnie++ (1.96) unstable; urgency=low * Fix a minor bug in setting the GID. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/debian/control new/bonnie++-1.97/debian/control --- old/bonnie++-1.96/debian/control 2008-08-19 10:36:47.000000000 +0200 +++ new/bonnie++-1.97/debian/control 2012-11-23 08:52:15.000000000 +0100 @@ -11,17 +11,11 @@ Conflicts: zcav, bonnie, bonnie++ Replaces: zcav, bonnie Provides: zcav, bonnie -Description: Hard drive benchmark suite. - It is called Bonnie++ because it was based on the Bonnie program. This - program also tests performance with creating large numbers of files. - Now includes zcav raw-read test program. A modern hard drive will have more - sectors in the outer tracks because they are longer. The hard drive will - have a number (often more than 8) of zones where each zone has the same - number of sectors (due to the need for an integral number of sectors per - track). This program allows you to determine the levels of performance - provided by different zones and store them in a convenient format for gnuplot. - . - This is the experimental version. It's not ready to replace the 1.x series - in time for Lenny but will be for Lenny+1. The extra features (large file - support, better bon_csv2html, and support for zcav tests on multiple devices) - will make it worth using for some people. +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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/sun/pkginfo new/bonnie++-1.97/sun/pkginfo --- old/bonnie++-1.96/sun/pkginfo 2009-07-04 03:24:05.000000000 +0200 +++ new/bonnie++-1.97/sun/pkginfo 2011-01-18 22:36:31.000000000 +0100 @@ -1,6 +1,6 @@ PKG=bonnie++ ARCH=sparc -VERSION=1.96 +VERSION=1.97 CATEGORY=application NAME=Bonnie++ DESC=Hard drive benchmark suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/zcav.8 new/bonnie++-1.97/zcav.8 --- old/bonnie++-1.96/zcav.8 2009-07-03 06:35:13.000000000 +0200 +++ new/bonnie++-1.97/zcav.8 2012-11-23 08:27:16.000000000 +0100 @@ -40,7 +40,7 @@ .TP .B \-b -the size (in Meg) of the blocks to read/write (default 100M), optionally +the size (in Meg) of the blocks to read/write (default 512M), optionally followed by a ':' and the chunk size for read/write operations (default 1M). Note that the chunk size must be less than or equal to the block size and must also be significantly less than the size of the RAM in the machine. @@ -62,7 +62,7 @@ .TP .B \-s skip rate. The option \-s 10 will cause it to read every 10th block and skip -the rest. +the rest. Accepts values from 2 to 20. .TP .B \-f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/zcav.cpp new/bonnie++-1.97/zcav.cpp --- old/bonnie++-1.96/zcav.cpp 2009-07-03 06:33:09.000000000 +0200 +++ new/bonnie++-1.97/zcav.cpp 2012-11-23 08:26:19.000000000 +0100 @@ -104,7 +104,7 @@ MultiZcav::MultiZcav() { - m_block_size = 256; + m_block_size = DEFAULT_BLOCK_SIZE; m_max_loops = 1; m_max_size = 0; m_start_offset = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/zcav_io.cpp new/bonnie++-1.97/zcav_io.cpp --- old/bonnie++-1.96/zcav_io.cpp 2009-07-03 06:28:48.000000000 +0200 +++ new/bonnie++-1.97/zcav_io.cpp 2012-11-23 08:34:43.000000000 +0100 @@ -108,7 +108,7 @@ double total_read_time = 0.0; bool nextLoop = false; for( ; !nextLoop && (!max_size || i < max_size) - && (loops == 0 || m_times[i][0] != -1.0) + && (loops == 0 || (m_times[i] && m_times[i][0] != -1.0)) && (!max_size || i < max_size); i++) { double read_time = access_data(i ? skip_rate - 1 : 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/bonnie++-1.96/zcav_io.h new/bonnie++-1.97/zcav_io.h --- old/bonnie++-1.96/zcav_io.h 2009-07-03 06:23:02.000000000 +0200 +++ new/bonnie++-1.97/zcav_io.h 2012-11-23 08:26:11.000000000 +0100 @@ -20,6 +20,7 @@ double average(double *array, int count); const int MEG = 1024*1024; +const int DEFAULT_BLOCK_SIZE = 512; const int DEFAULT_CHUNK_SIZE = 1; class ZcavRead -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-pytest for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package python3-pytest for openSUSE:Factory checked in at 2014-07-31 21:50:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-pytest (Old) and /work/SRC/openSUSE:Factory/.python3-pytest.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-pytest" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-pytest/python3-pytest.changes 2014-07-25 09:09:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-pytest.new/python3-pytest.changes 2014-07-31 21:50:38.000000000 +0200 @@ -1,0 +2,74 @@ +Wed Jul 30 07:38:02 UTC 2014 - toddrme2178(a)gmail.com + +- Update to 2.6.0 + - Cache exceptions from fixtures according to their scope (issue 467). + - fix issue537: Avoid importing old assertion reinterpretation code by default. + - fix issue364: shorten and enhance tracebacks representation by default. + The new "--tb=auto" option (default) will only display long tracebacks + for the first and last entry. You can get the old behaviour of printing + all entries as long entries with "--tb=long". Also short entries by + default are now printed very similarly to "--tb=native" ones. + - fix issue514: teach assertion reinterpretation about private class attributes + - change -v output to include full node IDs of tests. Users can copy + a node ID from a test run, including line number, and use it as a + positional argument in order to run only a single test. + - fix issue 475: fail early and comprehensible if calling + pytest.raises with wrong exception type. + - fix issue516: tell in getting-started about current dependencies. + - cleanup setup.py a bit and specify supported versions. Thanks Jurko + Gospodnetic for the PR. + - change XPASS colour to yellow rather then red when tests are run + with -v. + - fix issue473: work around mock putting an unbound method into a class + dict when double-patching. + - fix issue498: if a fixture finalizer fails, make sure that + the fixture is still invalidated. + - fix issue453: the result of the pytest_assertrepr_compare hook now gets + it's newlines escaped so that format_exception does not blow up. + - internal new warning system: pytest will now produce warnings when + it detects oddities in your test collection or execution. + Warnings are ultimately sent to a new pytest_logwarning hook which is + currently only implemented by the terminal plugin which displays + warnings in the summary line and shows more details when -rw (report on + warnings) is specified. + - change skips into warnings for test classes with an __init__ and + callables in test modules which look like a test but are not functions. + - fix issue436: improved finding of initial conftest files from command + line arguments by using the result of parse_known_args rather than + the previous flaky heuristics. Thanks Marc Abramowitz for tests + and initial fixing approaches in this area. + - fix issue #479: properly handle nose/unittest(2) SkipTest exceptions + during collection/loading of test modules. Thanks to Marc Schlaich + for the complete PR. + - fix issue490: include pytest_load_initial_conftests in documentation + and improve docstring. + - fix issue472: clarify that ``pytest.config.getvalue()`` cannot work + if it's triggered ahead of command line parsing. + - merge PR123: improved integration with mock.patch decorator on tests. + - fix issue412: messing with stdout/stderr FD-level streams is now + captured without crashes. + - fix issue483: trial/py33 works now properly. Thanks Daniel Grana for PR. + - improve example for pytest integration with "python setup.py test" + which now has a generic "-a" or "--pytest-args" option where you + can pass additional options as a quoted string. Thanks Trevor Bekolay. + - simplified internal capturing mechanism and made it more robust + against tests or setups changing FD1/FD2, also better integrated + now with pytest.pdb() in single tests. + - improvements to pytest's own test-suite leakage detection, courtesy of PRs + from Marc Abramowitz + - fix issue492: avoid leak in test_writeorg. Thanks Marc Abramowitz. + - fix issue493: don't run tests in doc directory with ``python setup.py test`` + (use tox -e doctesting for that) + - fix issue486: better reporting and handling of early conftest loading failures + - some cleanup and simplification of internal conftest handling. + - work a bit harder to break reference cycles when catching exceptions. + Thanks Jurko Gospodnetic. + - fix issue443: fix skip examples to use proper comparison. Thanks Alex + Groenholm. + - support nose-style ``__test__`` attribute on modules, classes and + functions, including unittest-style Classes. If set to False, the + test will not be collected. + - fix issue512: show "<notset>" for arguments which might not be set + in monkeypatch plugin. Improves output in documentation. + +------------------------------------------------------------------- Old: ---- pytest-2.5.2.tar.gz New: ---- pytest-2.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-pytest.spec ++++++ --- /var/tmp/diff_new_pack.IomTIS/_old 2014-07-31 21:50:40.000000000 +0200 +++ /var/tmp/diff_new_pack.IomTIS/_new 2014-07-31 21:50:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-pytest -Version: 2.5.2 +Version: 2.6.0 Release: 0 Summary: Simple powerful testing with Python License: MIT @@ -35,8 +35,8 @@ BuildRequires: python3-mock %endif BuildRequires: python3-PyYAML -BuildRequires: python3-py >= 1.4.20 -Requires: python3-py >= 1.4.20 +BuildRequires: python3-py >= 1.4.22 +Requires: python3-py >= 1.4.22 Requires: python3-setuptools Requires(post): update-alternatives Requires(postun): update-alternatives @@ -60,20 +60,20 @@ %prep %setup -q -n pytest-%{version} #TODO(saschpe): Fix failing tests: -rm testing/test_junitxml.py +# rm testing/test_junitxml.py %build python3 setup.py build python3 setup.py build_sphinx +rm doc/build/html/.buildinfo %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} rm %{buildroot}%{_bindir}/py.test ln -s %{_bindir}/py.test-%{py3_ver} %{buildroot}%{_bindir}/py.test -#%%check -#TODO(saschpe): Not much missing anymore: -#PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{buildroot}%{python3_sitelib}/ py.test-%{py3_ver} +%check +python3 setup.py test %pre # Since /usr/bin/py.test became ghosted to be used ++++++ pytest-2.5.2.tar.gz -> pytest-2.6.0.tar.gz ++++++ ++++ 7620 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cimple for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package cimple for openSUSE:Factory checked in at 2014-07-31 21:50:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cimple (Old) and /work/SRC/openSUSE:Factory/.cimple.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cimple" Changes: -------- --- /work/SRC/openSUSE:Factory/cimple/cimple.changes 2012-11-30 12:20:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cimple.new/cimple.changes 2014-07-31 21:50:36.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Jul 29 13:56:28 UTC 2014 - dvaleev(a)suse.com + +- Fix build on PowerPC little endian + +- added patches: + * ppc64le-support.patch + +------------------------------------------------------------------- +Tue Apr 16 09:18:16 UTC 2013 - schwab(a)suse.de + +- aarch64-support: Add support for aarch64 + * aarch64-support.patch + +------------------------------------------------------------------- New: ---- aarch64-support.patch ppc64le-support.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cimple.spec ++++++ --- /var/tmp/diff_new_pack.Xi377G/_old 2014-07-31 21:50:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Xi377G/_new 2014-07-31 21:50:38.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package cimple (Version 2.0.16) +# spec file for package cimple # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,13 +20,15 @@ Version: 2.0.24 Release: 0 -License: MIT Summary: CIMPLE is an embeddable CIM provider engine -Url: http://cimple.org +License: MIT Group: System/Management +Url: http://cimple.org Source0: %{name}-%{version}.tar.bz2 Patch1: %{name}-%{version}-ow-adapter.dif Patch2: %{name}-%{version}-gcc.patch +Patch3: aarch64-support.patch +Patch4: ppc64le-support.patch BuildRequires: gcc-c++ BuildRequires: konkretcmpi BuildRequires: sblim-cmpi-devel @@ -98,6 +107,8 @@ %setup -q %patch1 -p0 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build export CIMPLE_DEBUG=1 @@ -168,4 +179,4 @@ #%{_libdir}/libcimplepegadap_s.a %endif -%changelog -n cimple +%changelog ++++++ aarch64-support.patch ++++++ Index: cimple-2.0.24/config.guess =================================================================== --- cimple-2.0.24.orig/config.guess +++ cimple-2.0.24/config.guess @@ -38,6 +38,10 @@ if [ -z "$host" ]; then host=ppc-unknown-linux-gnu ;; + aarch64:Linux:*:*) + host=aarch64-unknown-linux-gnu + ;; + sun4*:SunOS:*:*) host=sparc-sun-solaris-gnu ;; Index: cimple-2.0.24/configure =================================================================== --- cimple-2.0.24.orig/configure +++ cimple-2.0.24/configure @@ -282,6 +282,11 @@ case "$host" in libbase=lib64 ;; + aarch64-unknown-linux-gnu) + platform=LINUX_AARCH64_GNU + libbase=lib64 + ;; + arm-wrs-vxworks-gnu) platform=VXWORKS_XSCALE_GNU libbase=lib Index: cimple-2.0.24/mak/platform_LINUX_AARCH64_GNU.mak =================================================================== --- /dev/null +++ cimple-2.0.24/mak/platform_LINUX_AARCH64_GNU.mak @@ -0,0 +1 @@ +include $(TOP)/mak/platform_LINUX.mak Index: cimple-2.0.24/src/cimple/Atomic.h =================================================================== --- cimple-2.0.24.orig/src/cimple/Atomic.h +++ cimple-2.0.24/src/cimple/Atomic.h @@ -41,6 +41,8 @@ #elif defined(CIMPLE_PLATFORM_LINUX_S390_GNU) || \ defined(CIMPLE_PLATFORM_LINUX_S390X_GNU) # include "Atomic_LINUX_S390_GNU.h" +#elif defined(CIMPLE_PLATFORM_LINUX_AARCH64_GNU) +# include "Atomic_LINUX_AARCH64_GNU.h" #elif defined(CIMPLE_PLATFORM_DARWIN_PPC_GNU) # include "Atomic_DARWIN_PPC_GNU.h" #elif defined(CIMPLE_PLATFORM_DARWIN_IX86_GNU) Index: cimple-2.0.24/src/cimple/Atomic_LINUX_AARCH64_GNU.h =================================================================== --- /dev/null +++ cimple-2.0.24/src/cimple/Atomic_LINUX_AARCH64_GNU.h @@ -0,0 +1,53 @@ +#ifndef _cimple_Atomic_LINUX_AARCH64_GNU_h +#define _cimple_Atomic_LINUX_AARCH64_GNU_h + +#include "config.h" + +#define CIMPLE_ATOMIC_INITIALIZER { 0 } + +CIMPLE_NAMESPACE_BEGIN + +struct Atomic +{ + int n; +}; + +inline void Atomic_create(Atomic* atomic, int x) +{ + atomic->n = x; +} + +inline void Atomic_destroy(Atomic* atomic) +{ +} + +inline int Atomic_get(const Atomic* atomic) +{ + int value; + __atomic_load (&atomic->n, &value, __ATOMIC_SEQ_CST); + return value; +} + +inline void Atomic_set(Atomic* atomic, int x) +{ + __atomic_store (&atomic->n, &x, __ATOMIC_SEQ_CST); +} + +static __inline__ void Atomic_inc(Atomic* atomic) +{ + __atomic_add_fetch(&atomic->n, 1, __ATOMIC_SEQ_CST); +} + +static __inline__ int Atomic_dec_and_test(Atomic* atomic) +{ + return __atomic_add_fetch(&atomic->n, -1, __ATOMIC_SEQ_CST) == 0; +} + +static __inline__ void Atomic_dec(Atomic* atomic) +{ + __atomic_add_fetch(&atomic->n, -1, __ATOMIC_SEQ_CST); +} + +CIMPLE_NAMESPACE_END + +#endif /* _cimple_Atomic_LINUX_IX86_GNU_h */ Index: cimple-2.0.24/src/cimple/config.h =================================================================== --- cimple-2.0.24.orig/src/cimple/config.h +++ cimple-2.0.24/src/cimple/config.h @@ -55,6 +55,8 @@ #elif defined(CIMPLE_PLATFORM_LINUX_S390_GNU) || \ defined(CIMPLE_PLATFORM_LINUX_S390X_GNU) # include "platform_LINUX_S390_GNU.h" +#elif defined(CIMPLE_PLATFORM_LINUX_AARCH64_GNU) +# include "platform_LINUX_AARCH64_GNU.h" #elif defined(CIMPLE_PLATFORM_WIN32_IX86_MSVC) # include "platform_WIN32_IX86_MSVC.h" #elif defined(CIMPLE_PLATFORM_WIN64_X86_64_MSVC) Index: cimple-2.0.24/src/cimple/platform_LINUX_AARCH64_GNU.h =================================================================== --- /dev/null +++ cimple-2.0.24/src/cimple/platform_LINUX_AARCH64_GNU.h @@ -0,0 +1,10 @@ +#ifndef _cimple_platform_LINUX_AARCH64_GNU_h +#define _cimple_platform_LINUX_AARCH64_GNU_h + +#include "platform_LINUX.h" + +#define CIMPLE_LITTLE_ENDIAN + +#define CIMPLE_PLATFORM_ID "LINUX_AARCH64_GNU" + +#endif /* _cimple_platform_LINUX_AARCH64_GNU_h */ ++++++ ppc64le-support.patch ++++++ Index: cimple-2.0.24/config.guess =================================================================== --- cimple-2.0.24.orig/config.guess +++ cimple-2.0.24/config.guess @@ -30,6 +30,10 @@ if [ -z "$host" ]; then host=s390x-unknown-linux-gnu ;; + ppc64le:Linux:*:*) + host=ppc64le-unknown-linux-gnu + ;; + ppc64:Linux:*:*) host=ppc64-unknown-linux-gnu ;; Index: cimple-2.0.24/configure =================================================================== --- cimple-2.0.24.orig/configure +++ cimple-2.0.24/configure @@ -193,7 +193,7 @@ if [ "$with_pegasus_env" = "1" ]; then ;; LINUX_PPC64_GNU) - host=ppc64-unknown-linux-gnu + host=ppc64*-unknown-linux-gnu ;; SOLARIS_SPARC_GNU) @@ -287,6 +287,11 @@ case "$host" in libbase=lib64 ;; + ppc64le-unknown-linux-gnu) + platform=LINUX_PPC64_GNU + libbase=lib64 + ;; + arm-wrs-vxworks-gnu) platform=VXWORKS_XSCALE_GNU libbase=lib Index: cimple-2.0.24/src/cimple/platform_LINUX_PPC_GNU.h =================================================================== --- cimple-2.0.24.orig/src/cimple/platform_LINUX_PPC_GNU.h +++ cimple-2.0.24/src/cimple/platform_LINUX_PPC_GNU.h @@ -29,7 +29,11 @@ #include "platform_LINUX.h" +#if defined(__LITTLE_ENDIAN__) +#define CIMPLE_LITTLE_ENDIAN +#else #define CIMPLE_BIG_ENDIAN +#endif #define CIMPLE_PLATFORM_ID "LINUX_PPC_GNU" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kst for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package kst for openSUSE:Factory checked in at 2014-07-31 21:50:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kst (Old) and /work/SRC/openSUSE:Factory/.kst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kst" Changes: -------- --- /work/SRC/openSUSE:Factory/kst/kst.changes 2013-07-21 08:09:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kst.new/kst.changes 2014-07-31 21:50:29.000000000 +0200 @@ -1,0 +2,53 @@ +Tue Jul 29 10:18:04 UTC 2014 - dmitry_r(a)opensuse.org + +- Build with MAT files support + +------------------------------------------------------------------- +Mon Jul 21 17:57:48 UTC 2014 - ctrippe(a)opensuse.org + +- Update to 2.0.8 + 1) Data sources + * A new datasource: sourcelist, which is a successive list of otherwise identical datasources + * Another new datasource: FITS tables, contributed by a new contributor: Nicholas Chapman. Welcome! + * ASCII improved once again to support huge files (>8 GB!) + * Add option how empty ASCII columns should be handled (NaN, copy previous, interpolate) + * Improve ASCII config dialog layout + * Handle data sources which are temporarily typed into the data source selector, + but which are not actually used and when a data source is deleted, delete its slave primitives as well + + 2) Main new features + * Thanks to the awesome job done by the KDE internationalization team, Kst 2.0.8 is now available in the following languages: ca ca@valencia de en_GB fr nl pl pt pt_BR sv uk. Kst will default to using the system language, if available. To override this, launch with e.g. "LANG=en ./kst2" + * A progress bar appears when parsing large ASCII files, very nice when it takes long with huge files! + * Reworked view vector values allowing easy comparison of vectors and changing the number of digits shown - a first step towards a more table-centric view as in other plotting tools + * Add filtering to the data manager to allow finding items easily in complex sessions + * Add an "unwind" filter: for data fields that have wrapped. For example, an angle (0-360 degrees) which has rotated several times + * New plugin to compute the "activity level" of a signal as the product of standard deviation and number of reversals over a sliding window. + + 3) Misc. improvements + * Scripting: major rework underway - still ongoing. Hopefully Python scripting will be supported under Windows as well in the next version + * Add a -T command line option which creates a new tab + * Equations: add 'degree' versions of the trig functions: sind, cosd, etc as well as atan2(x,y) + * Avoid having to type * before/after the text in the editmultiple widget + * HOWTO explaining how to add a plugin + * Improvements to use the whole available space in the scalar/vector/matrix/string selectors + * To reduce the impact of latent/glitchy file system situations, delay reloading a file which looks like it has shrunk + * Use "Spectrogram" instead of "CSD" + * Option to use the "native" Qt graphics system if "use raster" is not selected (native works far better for remote X) + + 4) Bug fixes + * Scalar selector improvements + * Many improvements in the update system and propagation of data source configuration changes + * Solve wrong vector selection in shift and differentiation plugins (kde#325393) + * Fix annoying bug breaking the recent data file and session lists (kde#325086) + * Only reset starting frame to skip boundry if in count from end mode -> allow selecting the right subsamples when using skip in other cases + * Various fixes to ASCII configuration to ensure that we don't parse the whole file when we only want to change the settings + * Make sure custom color applies to all lines of a multi line text label + * Don't crash when there is an exception while searching for rows + * Some improvements to defaults in filter plugins + * Fix enabling/disabling widgets in FFT options (kde#328371) + * In datawizard, don't create plots if no curves (kde#307723) + * Update curve names in plot dialog when changed (kde#318139) +- Remove the python subpackage as this is still under development + and should not be build according to upstream. + +------------------------------------------------------------------- Old: ---- Kst-2.0.7.tar.gz New: ---- Kst-2.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kst.spec ++++++ --- /var/tmp/diff_new_pack.H7z4ej/_old 2014-07-31 21:50:31.000000000 +0200 +++ /var/tmp/diff_new_pack.H7z4ej/_new 2014-07-31 21:50:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package kst # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Christian Trippe ctrippe(a)opensuse.org # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: kst -Version: 2.0.7 +Version: 2.0.8 Release: 0 Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality License: GPL-2.0+ @@ -29,22 +29,16 @@ BuildRequires: Mesa-devel BuildRequires: cmake BuildRequires: fdupes +BuildRequires: getdata-devel BuildRequires: gsl-devel -BuildRequires: kde4-filesystem BuildRequires: libcfitsio-devel -%if 0%{?suse_version} >= 1220 +BuildRequires: libmatio-devel BuildRequires: libnetcdf_c++-devel -BuildRequires: netcdf-devel -BuildRequires: python-numpy-devel -#Python-scipy is only available from 12.2 onwards, so the whole python scripting part ist only build for 12.2 onwards -BuildRequires: python-scipy-devel -%else -BuildRequires: libnetcdf-devel -%endif -BuildRequires: getdata-devel BuildRequires: libqt4-devel +BuildRequires: netcdf-devel BuildRequires: readline-devel BuildRequires: update-desktop-files +Obsoletes: python-kst < %{version} %description Kst is a data plotting and viewing program. Some of the features include: @@ -70,49 +64,24 @@ Development libraries and headers needed to build software making use of %{name} -%if 0%{?suse_version} >= 1220 - -%package -n python-kst -Summary: Python scripting support for %{name} -Group: Development/Libraries/Python -Requires: %{name} = %{version} -Requires: python-base = %py_ver -Requires: python-numpy -Requires: python-scipy - -%description -n python-kst -Provides scripting support for %{name} with Python - -%endif - %prep -%setup -q +%setup -q -n=Kst-2.0.8 %build -%if 0%{?suse_version} >= 1220 -EXTRA_FLAGS="-Dkst_install_prefix=%{_kde_prefix} \ +EXTRA_FLAGS="-Dkst_install_prefix=/usr \ -Dkst_rpath=0 \ -Dkst_install_libdir=%{_lib} \ - -Dkst_install_plugin_desktop_file_path=%{_kde4_servicesdir}/%{name} -Dkst_release=1 \ - -Dkst_python=1" -%else -EXTRA_FLAGS="-Dkst_install_prefix=%{_kde_prefix} \ - -Dkst_rpath=0 \ - -Dkst_install_libdir=%{_lib} \ - -Dkst_install_plugin_desktop_file_path=%{_kde4_servicesdir}/%{name} - -Dkst_release=1" -%endif -%cmake_kde4 -d build -- $EXTRA_FLAGS $RPM_BUILD_DIR/%buildsubdir/cmake + -Dkst_dbgsym=1 \ + -Dkst_python=0" + +cmake $EXTRA_FLAGS make %{?_smp_mflags} %install -cd build %make_install -cd .. %suse_update_desktop_file -r %{name}2 Qt KDE Science Math %fdupes %{buildroot} -%kde_post_install %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -122,28 +91,24 @@ %files %defattr(-,root,root) -%{_kde4_datadir}/applications/%{name}2.desktop -%{_kde4_bindir}/%{name}2 -%{_kde4_datadir}/applnk/ -%{_kde4_datadir}/mimelink/ -%{_kde4_iconsdir}/hicolor/*/apps/*%{name}.* -%{_kde4_libdir}/lib%{name}*.so.* -%{_kde4_libdir}/%{name}2/ -%{_kde4_mandir}/man1/%{name}2.1.gz +%{_datadir}/applications/%{name}2.desktop +%{_bindir}/%{name}2 +%{_datadir}/applnk/ +%{_datadir}/mimelink/ +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/* +%dir %{_datadir}/icons/hicolor/*/apps +%{_datadir}/icons/hicolor/*/apps/*%{name}.* +%{_libdir}/lib%{name}*.so.* +%{_libdir}/%{name}2/ +%{_mandir}/man1/%{name}2.1.gz +%dir %{_datadir}/kst +%dir %{_datadir}/kst/locale +%{_datadir}/kst/locale/kst_common_*.qm %files devel %defattr(-,root,root) -%{_kde4_libdir}/*.so -%{_kde4_libdir}/lib%{name}2app.a - -%if 0%{?suse_version} >= 1220 - -%files -n python-kst -%defattr(-,root,root) -%{python_sitearch}/pykst.py -%{python_sitearch}/pykstpp.py -%{python_sitearch}/pykstpp_h.py - -%endif +%{_libdir}/*.so +%{_libdir}/lib%{name}2app.a %changelog ++++++ Kst-2.0.7.tar.gz -> Kst-2.0.8.tar.gz ++++++ /work/SRC/openSUSE:Factory/kst/Kst-2.0.7.tar.gz /work/SRC/openSUSE:Factory/.kst.new/Kst-2.0.8.tar.gz differ: char 4, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postgresql-init for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package postgresql-init for openSUSE:Factory checked in at 2014-07-31 21:50:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgresql-init (Old) and /work/SRC/openSUSE:Factory/.postgresql-init.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postgresql-init" Changes: -------- --- /work/SRC/openSUSE:Factory/postgresql-init/postgresql-init.changes 2013-09-14 19:09:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postgresql-init.new/postgresql-init.changes 2014-07-31 21:50:26.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Jul 31 09:31:10 UTC 2014 - meissner(a)suse.com + +- no need to directly require SuSEfirewall2 for the service, + just also own the directory. (avoid massive rebuilds for SUSEfirewall2 + changes). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgresql-init.spec ++++++ --- /var/tmp/diff_new_pack.KkkNMj/_old 2014-07-31 21:50:27.000000000 +0200 +++ /var/tmp/diff_new_pack.KkkNMj/_new 2014-07-31 21:50:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package postgresql-init # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,6 @@ Source0: postgresql-init Source1: postgresql-sysconfig Source2: postgresql-firewall -BuildRequires: SuSEfirewall2 Requires(post): %fillup_prereq Requires(postun): %insserv_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,6 +87,7 @@ %files %defattr(-,root,root,-) %config /etc/init.d/postgresql +%dir %fwdir %config %fwdir/%fwname /var/adm/fillup-templates/sysconfig.postgresql /usr/sbin/rcpostgresql -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit postgresql93 for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package postgresql93 for openSUSE:Factory checked in at 2014-07-31 21:50:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/postgresql93 (Old) and /work/SRC/openSUSE:Factory/.postgresql93.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "postgresql93" Changes: -------- --- /work/SRC/openSUSE:Factory/postgresql93/postgresql93-libs.changes 2014-05-02 09:51:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.postgresql93.new/postgresql93-libs.changes 2014-07-31 21:50:24.000000000 +0200 @@ -1,0 +2,49 @@ +Thu Jul 31 11:09:52 UTC 2014 - coolo(a)suse.com + +- postgresql93-libs doesn't require systemd - avoid cycles + +------------------------------------------------------------------- +Tue Jul 29 13:52:03 UTC 2014 - darin(a)darins.net + +- fix systemd unresolvable for SLE_11 + http://en.opensuse.org/openSUSE:Systemd_packaging_guidelines + +------------------------------------------------------------------- +Fri Jul 25 12:34:07 UTC 2014 - max(a)suse.com + +- bnc#888564: Move the server socket from /tmp to /var/run to avoid + problems with clients that use PrivateTmp. + postgresql-var-run-socket.patch +- Rediff patches. + +------------------------------------------------------------------- +Thu Jul 24 11:56:13 UTC 2014 - max(a)suse.com + +- Update to 9.3.5. The most important changes are: + * In pg_upgrade, remove pg_multixact files left behind by + initdb. If you used a pre-9.3.5 version of pg_upgrade to + upgrade a database cluster to 9.3, it might have left behind a + file $PGDATA/pg_multixact/offsets/0000 that should not be + there and will eventually cause problems in VACUUM. However, + in common cases this file is actually valid and must not be + removed. + * Correctly initialize padding bytes in contrib/btree_gist + indexes on bit columns. This error could result in incorrect + query results due to values that should compare equal not + being seen as equal. Users with GiST indexes on bit or bit + varying columns should REINDEX those indexes after installing + this update. + * Protect against torn pages when deleting GIN list pages. + This fix prevents possible index corruption if a system crash + occurs while the page update is being written to disk. + * Don't clear the right-link of a GiST index page while + replaying updates from WAL. This error could lead to + transiently wrong answers from GiST index scans performed in + Hot Standby. + * See release notes for a full list of changes: + http://www.postgresql.org/docs/9.3/static/release-9-3-5.html + /usr/share/doc/packages/postgresql93/HISTORY + +- Remove obsolete postgresql-plperl.patch + +------------------------------------------------------------------- postgresql93.changes: same change Old: ---- postgresql-9.3.4.tar.bz2 postgresql-plperl.patch New: ---- postgresql-9.3.5.tar.bz2 postgresql-tmpfiles.conf postgresql-var-run-socket.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ postgresql93-libs.spec ++++++ --- /var/tmp/diff_new_pack.HXJn0k/_old 2014-07-31 21:50:25.000000000 +0200 +++ /var/tmp/diff_new_pack.HXJn0k/_new 2014-07-31 21:50:25.000000000 +0200 @@ -16,6 +16,8 @@ # +%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} + %define majorversion 9.3 %define packageversion 93 %define pgname postgresql%packageversion @@ -49,6 +51,11 @@ BuildRequires: timezone BuildRequires: uuid-devel BuildRequires: zlib-devel +# +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif +%{?systemd_requires} %endif %if 0%{?suse_version} >= 1110 @@ -70,21 +77,22 @@ Summary: Basic Clients and Utilities for PostgreSQL License: PostgreSQL Group: Productivity/Databases/Tools -Version: 9.3.4 +Version: 9.3.5 Release: 0 %define pg_minor_version %(echo %version | sed -r 's/^([0-9]+\\.[0-9]+).*/\\1/') Source0: postgresql-%version.tar.bz2 Source1: baselibs.conf Source3: postgresql-README.SUSE +Source4: postgresql-tmpfiles.conf Source15: postgresql-bashprofile Source17: postgresql-rpmlintrc Patch1: postgresql-conf.patch Patch2: postgresql-regress.patch Patch3: postgresql-sle10-timestamptz.patch -Patch4: postgresql-plperl.patch Patch6: postgresql-testsuite-int8.sql.patch Patch7: postgresql-testsuite-seclabel-location.patch Patch8: postgresql-testsuite-keep-results-file.patch +Patch9: postgresql-var-run-socket.patch Url: http://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: postgresql = %version @@ -190,6 +198,9 @@ Requires(postun): postgresql-init >= %majorversion Requires(post): update-alternatives Requires(postun): update-alternatives +%if 0%{?suse_version} >= 1210 +Requires(post): systemd +%endif %description server PostgreSQL is an advanced object-relational database management system @@ -325,9 +336,10 @@ %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 touch -r tmp configure rm tmp -find src/test/ -name '*.orig' -print0 | xargs -0 rm -r +find src/test/ -name '*.orig' -print0 | xargs -r0 rm -r %build PACKAGE_TARNAME=%name %configure \ @@ -469,6 +481,8 @@ cp doc/KNOWN_BUGS doc/MISSING_FEATURES COPYRIGHT \ README HISTORY doc/bug.template %buildroot%pgdocdir cp -a %SOURCE3 %buildroot%pgdocdir/README.SUSE +install -d -m755 %buildroot/%_tmpfilesdir +install -m644 %SOURCE4 %buildroot%_tmpfilesdir/%pgname.conf %endif # Use versioned names for the man pages: for f in %buildroot%pgmandir/man*/*; do @@ -558,6 +572,9 @@ -c "PostgreSQL Server" -u 26 postgres 2>/dev/null || : %post server -f alternatives +%if 0%{?suse_version} >= 1210 +systemd-tmpfiles --create %pgname.conf +%endif %preun server # Stop only when we are uninstalling the currently running version @@ -661,12 +678,15 @@ %pgextensiondir/plpgsql* %attr(750,postgres,postgres) %dir /var/lib/pgsql %attr(640,postgres,postgres) %config(noreplace) /var/lib/pgsql/.bash_profile +%_tmpfilesdir + %files pltcl -f pltcl.lang %defattr(-,root,root) %pgextensiondir/pltcl* %pglibdir/pltcl.so %pgdatadir/*.pltcl %pgbindir/pltcl* + %files plperl -f plperl.lang %defattr(-,root,root) %pgextensiondir/plperl* postgresql93.spec: same change ++++++ postgresql-9.3.4.tar.bz2 -> postgresql-9.3.5.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/postgresql93/postgresql-9.3.4.tar.bz2 /work/SRC/openSUSE:Factory/.postgresql93.new/postgresql-9.3.5.tar.bz2 differ: char 11, line 1 ++++++ postgresql-conf.patch ++++++ --- /var/tmp/diff_new_pack.HXJn0k/_old 2014-07-31 21:50:26.000000000 +0200 +++ /var/tmp/diff_new_pack.HXJn0k/_new 2014-07-31 21:50:26.000000000 +0200 @@ -1,8 +1,8 @@ Index: src/backend/utils/misc/postgresql.conf.sample =================================================================== ---- src/backend/utils/misc/postgresql.conf.sample.orig -+++ src/backend/utils/misc/postgresql.conf.sample -@@ -273,13 +273,13 @@ +--- src/backend/utils/misc/postgresql.conf.sample.orig 2014-07-21 21:10:42.000000000 +0200 ++++ src/backend/utils/misc/postgresql.conf.sample 2014-07-25 12:48:28.623693877 +0200 +@@ -295,13 +295,13 @@ # - Where to Log - @@ -18,7 +18,7 @@ # into log files. Required to be on for # csvlogs. # (change requires restart) -@@ -374,7 +374,8 @@ +@@ -393,7 +393,8 @@ #log_duration = off #log_error_verbosity = default # terse, default, or verbose messages #log_hostname = off ++++++ postgresql-regress.patch ++++++ --- /var/tmp/diff_new_pack.HXJn0k/_old 2014-07-31 21:50:26.000000000 +0200 +++ /var/tmp/diff_new_pack.HXJn0k/_new 2014-07-31 21:50:26.000000000 +0200 @@ -1,8 +1,8 @@ Index: src/test/regress/expected/horology.out =================================================================== ---- src/test/regress/expected/horology.out.orig -+++ src/test/regress/expected/horology.out -@@ -616,26 +616,26 @@ SELECT (timestamp with time zone 'tomorr +--- src/test/regress/expected/horology.out.orig 2014-07-21 21:10:42.000000000 +0200 ++++ src/test/regress/expected/horology.out 2014-07-25 12:48:36.948801528 +0200 +@@ -652,26 +652,26 @@ (1 row) -- timestamp with time zone, interval arithmetic around DST change @@ -36,9 +36,9 @@ Sat Apr 02 11:00:00 2005 CST Index: src/test/regress/pg_regress.c =================================================================== ---- src/test/regress/pg_regress.c.orig -+++ src/test/regress/pg_regress.c -@@ -72,7 +72,7 @@ static char *shellprog = SHELLPROG; +--- src/test/regress/pg_regress.c.orig 2014-07-21 21:10:42.000000000 +0200 ++++ src/test/regress/pg_regress.c 2014-07-25 12:48:36.949801541 +0200 +@@ -73,7 +73,7 @@ */ #ifndef WIN32 const char *basic_diff_opts = ""; @@ -49,9 +49,9 @@ const char *pretty_diff_opts = "-w -C3"; Index: src/test/regress/sql/horology.sql =================================================================== ---- src/test/regress/sql/horology.sql.orig -+++ src/test/regress/sql/horology.sql -@@ -116,11 +116,11 @@ SELECT (timestamp with time zone 'tomorr +--- src/test/regress/sql/horology.sql.orig 2014-07-21 21:10:42.000000000 +0200 ++++ src/test/regress/sql/horology.sql 2014-07-25 12:48:36.949801541 +0200 +@@ -122,11 +122,11 @@ SELECT (timestamp with time zone 'tomorrow' > 'now') as "True"; -- timestamp with time zone, interval arithmetic around DST change ++++++ postgresql-testsuite-keep-results-file.patch ++++++ --- /var/tmp/diff_new_pack.HXJn0k/_old 2014-07-31 21:50:26.000000000 +0200 +++ /var/tmp/diff_new_pack.HXJn0k/_new 2014-07-31 21:50:26.000000000 +0200 @@ -4,11 +4,11 @@ don't unlink the result file -diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c -index c8b45c9..9e9a7c7 100644 ---- a/src/test/regress/pg_regress.c -+++ b/src/test/regress/pg_regress.c -@@ -2411,7 +2411,6 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc +Index: postgresql-9.3.5/src/test/regress/pg_regress.c +=================================================================== +--- postgresql-9.3.5.orig/src/test/regress/pg_regress.c 2014-07-25 12:48:36.949801541 +0200 ++++ postgresql-9.3.5/src/test/regress/pg_regress.c 2014-07-25 12:48:53.895020651 +0200 +@@ -2515,7 +2515,6 @@ else { unlink(difffilename); @@ -16,4 +16,3 @@ } if (fail_count != 0) - ++++++ postgresql-testsuite-seclabel-location.patch ++++++ --- /var/tmp/diff_new_pack.HXJn0k/_old 2014-07-31 21:50:26.000000000 +0200 +++ /var/tmp/diff_new_pack.HXJn0k/_new 2014-07-31 21:50:26.000000000 +0200 @@ -4,11 +4,11 @@ fix directory macro -diff --git a/src/test/regress/input/security_label.source b/src/test/regress/input/security_label.source -index 9b430b0..bb0af60 100644 ---- a/src/test/regress/input/security_label.source -+++ b/src/test/regress/input/security_label.source -@@ -39,7 +39,7 @@ SECURITY LABEL ON ROLE seclabel_user1 IS '...invalid label...'; -- fail +Index: postgresql-9.3.5/src/test/regress/input/security_label.source +=================================================================== +--- postgresql-9.3.5.orig/src/test/regress/input/security_label.source 2014-07-21 21:10:42.000000000 +0200 ++++ postgresql-9.3.5/src/test/regress/input/security_label.source 2014-07-25 12:48:43.520886510 +0200 +@@ -40,7 +40,7 @@ SECURITY LABEL ON ROLE seclabel_user3 IS 'unclassified'; -- fail -- Load dummy external security provider @@ -17,4 +17,3 @@ -- -- Test of SECURITY LABEL statement with a plugin - ++++++ postgresql-tmpfiles.conf ++++++ # For the PostgreSQL server's unix domain socket d /var/run/postgresql 0755 postgres postgres - ++++++ postgresql-var-run-socket.patch ++++++ Change the built-in default socket directory to be /var/run/postgresql. For backwards compatibility with (probably non-libpq-based) clients that might still expect to find the socket in /tmp, also create a socket in /tmp. This is to resolve communication problems with clients operating under systemd's PrivateTmp environment, which won't be using the same global /tmp directory as the server; see bug #825448. Note that we apply the socket directory change at the level of the hard-wired defaults in the C code, not by just twiddling the setting in postgresql.conf.sample; this is so that the change will take effect on server package update, without requiring any existing postgresql.conf to be updated. (Of course, a user who dislikes this behavior can still override it via postgresql.conf.) Index: postgresql-9.3.5/contrib/pg_upgrade/test.sh =================================================================== --- postgresql-9.3.5.orig/contrib/pg_upgrade/test.sh 2014-07-25 12:48:53.890020586 +0200 +++ postgresql-9.3.5/contrib/pg_upgrade/test.sh 2014-07-25 12:54:10.221108886 +0200 @@ -138,6 +138,12 @@ EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT" export EXTRA_REGRESS_OPTS +# we want the Unix sockets in $temp_root +PGHOST=$temp_root +export PGHOST + +POSTMASTER_OPTS="$POSTMASTER_OPTS -c unix_socket_directories='$PGHOST'" + # enable echo so the user can see what is being executed set -x Index: postgresql-9.3.5/src/backend/utils/misc/guc.c =================================================================== --- postgresql-9.3.5.orig/src/backend/utils/misc/guc.c 2014-07-25 12:48:53.893020625 +0200 +++ postgresql-9.3.5/src/backend/utils/misc/guc.c 2014-07-25 12:54:10.223108912 +0200 @@ -2971,7 +2971,7 @@ }, &Unix_socket_directories, #ifdef HAVE_UNIX_SOCKETS - DEFAULT_PGSOCKET_DIR, + DEFAULT_PGSOCKET_DIR ", /tmp", #else "", #endif Index: postgresql-9.3.5/src/bin/initdb/initdb.c =================================================================== --- postgresql-9.3.5.orig/src/bin/initdb/initdb.c 2014-07-25 12:48:53.894020638 +0200 +++ postgresql-9.3.5/src/bin/initdb/initdb.c 2014-07-25 12:54:10.223108912 +0200 @@ -1204,7 +1204,7 @@ #ifdef HAVE_UNIX_SOCKETS snprintf(repltok, sizeof(repltok), "#unix_socket_directories = '%s'", - DEFAULT_PGSOCKET_DIR); + DEFAULT_PGSOCKET_DIR ", /tmp"); #else snprintf(repltok, sizeof(repltok), "#unix_socket_directories = ''"); #endif Index: postgresql-9.3.5/src/include/pg_config_manual.h =================================================================== --- postgresql-9.3.5.orig/src/include/pg_config_manual.h 2014-07-25 12:48:53.894020638 +0200 +++ postgresql-9.3.5/src/include/pg_config_manual.h 2014-07-25 12:54:10.224108925 +0200 @@ -144,7 +144,7 @@ * here's where to twiddle it. You can also override this at runtime * with the postmaster's -k switch. */ -#define DEFAULT_PGSOCKET_DIR "/tmp" +#define DEFAULT_PGSOCKET_DIR "/var/run/postgresql" /* * The random() function is expected to yield values between 0 and -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit at for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package at for openSUSE:Factory checked in at 2014-07-31 21:50:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at (Old) and /work/SRC/openSUSE:Factory/.at.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "at" Changes: -------- --- /work/SRC/openSUSE:Factory/at/at.changes 2014-07-29 16:47:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.at.new/at.changes 2014-07-31 21:50:21.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 31 09:26:21 UTC 2014 - alarrosa(a)suse.com + +- Remove a relative path that is not needed in the service symlink + +------------------------------------------------------------------- @@ -6 +11,7 @@ - previous change. + sysvinit change. + +------------------------------------------------------------------- +Fri Jul 25 09:20:31 UTC 2014 - pgajdos(a)suse.com + +- introduced -o <timeformat> switch for atq [bnc#879402] + * added at-atq-timeformat.patch New: ---- at-atq-timeformat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.uq2ceE/_old 2014-07-31 21:50:23.000000000 +0200 +++ /var/tmp/diff_new_pack.uq2ceE/_new 2014-07-31 21:50:23.000000000 +0200 @@ -58,6 +58,8 @@ Patch23: at-secure_getenv.patch #PATCH-FIX-OPENSUSE backport privs from 3.1.8 (bnc#849720) Patch24: at-backport-old-privs.patch +#PATCH-FEATURE-UPSTREAM introduce -o <timeformat> argument for atq (bnc#879402) +Patch25: at-atq-timeformat.patch BuildRequires: autoconf >= 2.69 BuildRequires: automake @@ -102,6 +104,7 @@ %patch22 %patch23 -p1 %patch24 -p1 +%patch25 %build rm -fv y.tab.c y.tab.h lex.yy.c lex.yy.o y.tab.o @@ -133,7 +136,7 @@ %{__install} -D -m 0644 %{S:5} %{buildroot}%{_unitdir}/atd.service %{__install} -D -m 0755 %{S:4} %{buildroot}%{_prefix}/lib/systemd/system-sleep/atd.sh -%{__ln_s} -f ../../%{_sbindir}/service %{buildroot}%{_sbindir}/rcatd +%{__ln_s} -f %{_sbindir}/service %{buildroot}%{_sbindir}/rcatd %{__install} -m644 %SOURCE2 %{buildroot}%{_sysconfdir}/pam.d/atd %{__install} -m644 %SOURCE3 %{buildroot}%{_localstatedir}/adm/fillup-templates ++++++ at-atq-timeformat.patch ++++++ Index: at.c =================================================================== --- at.c.orig 2014-07-25 10:59:06.264608764 +0200 +++ at.c 2014-07-25 11:00:04.036607665 +0200 @@ -132,9 +132,10 @@ char *namep; char atfile[] = ATJOB_DIR "/12345678901234"; -char *atinput = (char *) 0; /* where to get input from */ -char atqueue = 0; /* which queue to examine for jobs (atq) */ -char atverify = 0; /* verify time instead of queuing job */ +char *atinput = (char *) 0; /* where to get input from */ +char atqueue = 0; /* which queue to examine for jobs (atq) */ +char atverify = 0; /* verify time instead of queuing job */ +char *timeformat = TIMEFORMAT_POSIX; /* time format (atq) */ /* Function declarations */ @@ -494,7 +495,7 @@ runtime = localtime(&runtimer); - strftime(timestr, TIMESIZE, TIMEFORMAT_POSIX, runtime); + strftime(timestr, TIMESIZE, timeformat, runtime); fprintf(stderr, "job %ld at %s\n", jobno, timestr); /* Signal atd, if present. Usual precautions taken... */ @@ -608,7 +609,7 @@ runtimer = 60 * (time_t) ctm; runtime = localtime(&runtimer); - strftime(timestr, TIMESIZE, TIMEFORMAT_POSIX, runtime); + strftime(timestr, TIMESIZE, timeformat, runtime); if ((pwd = getpwuid(buf.st_uid))) printf("%ld\t%s %c %s\n", jobno, timestr, queue, pwd->pw_name); @@ -805,7 +806,7 @@ */ if (strcmp(pgm, "atq") == 0) { program = ATQ; - options = "hq:V"; + options = "hq:Vo:"; } else if (strcmp(pgm, "atrm") == 0) { program = ATRM; options = "hV"; @@ -889,6 +890,10 @@ timer -= timer % 60; break; + case 'o': + timeformat = optarg; + break; + default: usage(); break; Index: at.1.in =================================================================== --- at.1.in.orig 2014-07-25 10:59:06.204608765 +0200 +++ at.1.in 2014-07-25 11:17:27.828587820 +0200 @@ -29,6 +29,8 @@ .RB [ -V ] .RB [ -q .IR queue ] +.RB [ -o +.IR timeformat ] .br .B at .RB [ -rd ] @@ -254,6 +256,9 @@ .B \-c cats the jobs listed on the command line to standard output. +.TP 8 +.BI \-o " fmt" +strftime-like time format used for the job list .SH FILES .I @ATJBD@ .br Index: panic.c =================================================================== --- panic.c.orig 2014-07-25 10:59:06.168608765 +0200 +++ panic.c 2014-07-25 11:06:20.232600513 +0200 @@ -96,7 +96,7 @@ " at [-V] [-q x] [-f file] [-mMlbv] -t time\n" " at -c job ...\n" " at [-V] -l [job ...]\n" - " atq [-V] [-q x]\n" + " atq [-V] [-q x] [-o timeformat]\n" " at [ -rd ] job ...\n" " atrm [-V] job ...\n" " batch\n"); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gconf2 for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package gconf2 for openSUSE:Factory checked in at 2014-07-31 21:50:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gconf2 (Old) and /work/SRC/openSUSE:Factory/.gconf2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gconf2" Changes: -------- --- /work/SRC/openSUSE:Factory/gconf2/gconf2.changes 2014-06-18 07:52:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gconf2.new/gconf2.changes 2014-07-31 21:50:19.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 30 15:58:10 UTC 2014 - fcrozat(a)suse.com + +- Update macros.gconf2: ensure schemas file path is absolute + (bnc#886600). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ macros.gconf2 ++++++ --- /var/tmp/diff_new_pack.cOqiE5/_old 2014-07-31 21:50:21.000000000 +0200 +++ /var/tmp/diff_new_pack.cOqiE5/_new 2014-07-31 21:50:21.000000000 +0200 @@ -83,8 +83,8 @@ %_add_gconf_schemas() \ echo $SCHEMAS >>$GCONF_SCHEMAS_NAME.schemas_list\ -echo "if test -f ${SCHEMAS#/} ; then\ - cp -f ${SCHEMAS#/} /usr/share/GConf/schemas/outdated/\ +echo "if test -f ${SCHEMAS} ; then\ + cp -f ${SCHEMAS} /usr/share/GConf/schemas/outdated/\ elif test -f /usr/share/gconf/schemas/${SCHEMAS#/usr/share/GConf/schemas/} ; then\ # Migration from /usr/share/gconf/schemas to /usr/share/GConf/schemas. Can be removed for openSUSE 11.4+3\ cp -f /usr/share/gconf/schemas/${SCHEMAS#/usr/share/GConf/schemas/} /usr/share/GConf/schemas/outdated/\ @@ -93,21 +93,21 @@ cp -f /etc/gconf/schemas/${SCHEMAS#/usr/share/GConf/schemas/} /usr/share/GConf/schemas/outdated/\ fi" >>$GCONF_SCHEMAS_NAME.schemas_pre\ echo "if test -f /usr/share/GConf/schemas/outdated/${SCHEMAS#/usr/share/GConf/schemas/}; then\ - cmp --quiet /usr/share/GConf/schemas/outdated/${SCHEMAS#/usr/share/GConf/schemas/} ${SCHEMAS#/}\ + cmp --quiet /usr/share/GConf/schemas/outdated/${SCHEMAS#/usr/share/GConf/schemas/} ${SCHEMAS}\ if test \\\$? != 0; then\ UNINSTALL_SCHEMA_FILES=\\\"\\\$UNINSTALL_SCHEMA_FILES /usr/share/GConf/schemas/outdated/${SCHEMAS#/usr/share/GConf/schemas/}\\\"\ - INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS#/}\\\"\ + INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS}\\\"\ else\ rm -f /usr/share/GConf/schemas/outdated/${SCHEMAS#/usr/share/GConf/schemas/}\ fi\ else\ - INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS#/}\\\"\ + INSTALL_SCHEMA_FILES=\\\"\\\$INSTALL_SCHEMA_FILES ${SCHEMAS}\\\"\ fi" >>$GCONF_SCHEMAS_NAME.schemas_posttrans\ echo " if test -x /usr/bin/gconftool-2 ; then\ if test -f /usr/share/GConf/schemas/outdated/${SCHEMAS#/usr/share/GConf/schemas/} ; then\ /usr/bin/gconftool-2 --makefile-uninstall-rule /usr/share/GConf/schemas/outdated/${SCHEMAS#/usr/share/GConf/schemas/} >/dev/null\ - elif test -f ${SCHEMAS#/} ; then\ - /usr/bin/gconftool-2 --makefile-uninstall-rule ${SCHEMAS#/} >/dev/null\ + elif test -f ${SCHEMAS} ; then\ + /usr/bin/gconftool-2 --makefile-uninstall-rule ${SCHEMAS} >/dev/null\ fi\ fi\ rm -f /usr/share/GConf/schemas/outdated/${SCHEMAS#/usr/share/GConf/schemas/}" >>$GCONF_SCHEMAS_NAME.schemas_preun\ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0