Accepting request 241403 from home:tabraham1:branches:Base:System
update to 11.0.0 OBS-URL: https://build.opensuse.org/request/show/241403 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysstat?expand=0&rev=55
This commit is contained in:
Stephan Kulow
Git OBS Bridge
parent
1649f25513
commit
10dfd76d39
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9e1872298a294f62233120e36b17bd7dcc0aef3b70d87f4deb4090a386a25848
|
||||
size 279948
|
||||
3
sysstat-11.0.0.tar.xz
Normal file
3
sysstat-11.0.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a747b88072bec9cc5e50ab024925b1fd612f927e3f03f3faccbbf3634efe9953
|
||||
size 290408
|
||||
@ -1,15 +1,13 @@
|
||||
Index: common.h
|
||||
===================================================================
|
||||
--- common.h.orig 2013-09-13 09:01:47.000000000 +0200
|
||||
+++ common.h 2013-11-04 13:02:30.115239489 +0100
|
||||
@@ -140,8 +140,8 @@ extern unsigned int kb_shift;
|
||||
--- sysstat-11.0.0/common.h 2014-06-12 15:31:57.000000000 -0400
|
||||
+++ common.h 2014-07-17 22:07:52.571757781 -0400
|
||||
@@ -140,8 +140,8 @@
|
||||
* kB <-> number of pages.
|
||||
* Page size depends on machine architecture (4 kB, 8 kB, 16 kB, 64 kB...)
|
||||
*/
|
||||
-#define KB_TO_PG(k) ((k) >> kb_shift)
|
||||
-#define PG_TO_KB(k) ((k) << kb_shift)
|
||||
+#define KB_TO_PG(k) ((k) / (getpagesize()/1024) )
|
||||
+#define PG_TO_KB(k) ((k) * (getpagesize()/1024) )
|
||||
+#define KB_TO_PG(k) ((k) / (getpagesize()/1024))
|
||||
+#define PG_TO_KB(k) ((k) * (getpagesize()/1024))
|
||||
|
||||
/* Type of persistent device names used in sar and iostat */
|
||||
extern char persistent_name_type[MAX_FILE_LEN];
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
Index: FAQ
|
||||
===================================================================
|
||||
--- FAQ.orig 2013-11-04 13:00:33.520958755 +0100
|
||||
+++ FAQ 2013-11-04 13:00:34.808972906 +0100
|
||||
@@ -422,9 +422,9 @@ to verify that for yourself.
|
||||
--- sysstat-11.0.0/FAQ 2014-06-08 10:28:50.000000000 -0400
|
||||
+++ FAQ 2014-07-17 22:13:10.841736018 -0400
|
||||
@@ -430,9 +430,9 @@
|
||||
Nor do you have to be concerned about using up all your disk space.
|
||||
sar will use a few hundred kilobytes for a whole day's worth of data, and it
|
||||
normally only stores one week worth (this can be configured via the HISTORY
|
||||
@ -14,23 +12,21 @@ Index: FAQ
|
||||
configuration file.
|
||||
|
||||
~~~
|
||||
@@ -464,7 +464,7 @@ another file or create a new one. See al
|
||||
@@ -472,7 +472,7 @@
|
||||
By default sar saves its data in the standard system activity data file,
|
||||
the /var/log/sa/sa<DD> file, where <DD> is the current day in the month.
|
||||
the /var/log/sa/saDD file, where DD is the current day in the month.
|
||||
To prevent sar from overwriting any existing files, just set the variable
|
||||
-HISTORY in /etc/sysconfig/sysstat to the number of days during which data
|
||||
+HISTORY in /etc/sysstat/sysstat to the number of days during which data
|
||||
must be kept. When this variable has a value greater than 28, sa1 script
|
||||
uses a month-by-month directory structure; datafiles are named YYYYMM/saDD
|
||||
and the script maintains links to these datafiles to mimic the standard
|
||||
Index: README
|
||||
===================================================================
|
||||
--- README.orig 2013-11-04 13:00:34.808972906 +0100
|
||||
+++ README 2013-11-04 13:01:12.750389712 +0100
|
||||
@@ -82,8 +82,8 @@ ${PREFIX}/share/doc/sysstat-x.y.z/*
|
||||
/var/log/sa
|
||||
${INIT_DIR}/sysstat
|
||||
/lib/systemd/system/sysstat.service if OS uses systemd
|
||||
--- sysstat-11.0.0/README 2014-03-02 09:05:23.000000000 -0500
|
||||
+++ README 2014-07-17 22:14:50.977729171 -0400
|
||||
@@ -86,8 +86,8 @@
|
||||
/lib/systemd/system/sysstat-collect.timer if OS uses systemd
|
||||
/lib/systemd/system/sysstat-summary.service if OS uses systemd
|
||||
/lib/systemd/system/sysstat-summary.timer if OS uses systemd
|
||||
-/etc/sysconfig/sysstat
|
||||
-/etc/sysconfig/sysstat.ioconf
|
||||
+/etc/sysstat/sysstat
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
Index: sa1.in
|
||||
===================================================================
|
||||
--- sa1.in.orig 2013-11-04 12:58:07.434353548 +0100
|
||||
+++ sa1.in 2013-11-04 13:00:20.173812120 +0100
|
||||
@@ -40,16 +40,22 @@ else
|
||||
[ -f ${CURRENTFILE} ] && [ "`date +%Y%m -r ${CURRENTFILE}`" -lt "${CURRENTDIR}" ] && rm -f ${CURRENTFILE}
|
||||
--- sysstat-11.0.0/sa1.in 2014-06-08 10:56:25.000000000 -0400
|
||||
+++ sa1.in 2014-07-17 21:54:29.822812673 -0400
|
||||
@@ -22,15 +22,21 @@
|
||||
SADC_OPTIONS="${SADC_OPTIONS} -D"
|
||||
fi
|
||||
|
||||
+set -e
|
||||
@ -20,19 +18,16 @@ Index: sa1.in
|
||||
# Note: Stats are written at the end of previous file *and* at the
|
||||
# beginning of the new one (when there is a file rotation) only if
|
||||
# outfile has been specified as '-' on the command line...
|
||||
- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 -
|
||||
+ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 -
|
||||
- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 ${SA_DIR}
|
||||
+ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} 1 1 ${SA_DIR}
|
||||
else
|
||||
- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* -
|
||||
+ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* -
|
||||
- exec ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* ${SA_DIR}
|
||||
+ ${ENDIR}/sadc -F -L ${SADC_OPTIONS} $* ${SA_DIR}
|
||||
fi
|
||||
--- sysstat-11.0.0/sa2.in 2014-06-09 15:12:32.000000000 -0400
|
||||
+++ sa2.in 2014-07-17 21:58:56.852794414 -0400
|
||||
@@ -33,6 +33,17 @@
|
||||
|
||||
Index: sa2.in
|
||||
===================================================================
|
||||
--- sa2.in.orig 2013-11-04 12:58:06.615344546 +0100
|
||||
+++ sa2.in 2013-11-04 12:58:07.435353559 +0100
|
||||
@@ -48,6 +48,17 @@ ENDIR=@bindir@
|
||||
DFILE=${CURRENTDIR}/${CURRENTFILE}
|
||||
[ -f "$DFILE" ] || exit 0
|
||||
cd ${ENDIR}
|
||||
+
|
||||
@ -46,6 +41,6 @@ Index: sa2.in
|
||||
+fi
|
||||
+trap "/bin/rm -f $LOCKFILE" EXIT
|
||||
+
|
||||
[ -L ${RPT} ] && rm -f ${RPT}
|
||||
${ENDIR}/sar $* -f ${DFILE} > ${RPT}
|
||||
find ${DDIR} \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' -o -name 'sar??.bz2' -o -name 'sa??.bz2' \) \
|
||||
|
||||
find ${SA_DIR} \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.xz' -o -name 'sa??.xz' -o -name 'sar??.gz' -o -name 'sa??.gz' -o -name 'sar??.bz2' -o -name 'sa??.bz2' \) \
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
Index: sadf.c
|
||||
===================================================================
|
||||
--- sadf.c.orig
|
||||
+++ sadf.c
|
||||
@@ -43,7 +43,7 @@
|
||||
--- sysstat-11.0.0/sadf.c 2014-06-12 15:31:57.000000000 -0400
|
||||
+++ sadf.c 2014-07-17 22:18:54.094712546 -0400
|
||||
@@ -41,7 +41,7 @@
|
||||
# define _(string) (string)
|
||||
#endif
|
||||
|
||||
@ -11,10 +9,8 @@ Index: sadf.c
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
long interval = -1, count = 0;
|
||||
Index: sadc.c
|
||||
===================================================================
|
||||
--- sadc.c.orig
|
||||
+++ sadc.c
|
||||
--- sysstat-11.0.0/sadc.c 2014-06-12 15:31:57.000000000 -0400
|
||||
+++ sadc.c 2014-07-17 22:19:40.650709363 -0400
|
||||
@@ -52,7 +52,7 @@
|
||||
#include "sensors/error.h"
|
||||
#endif
|
||||
@ -24,11 +20,9 @@ Index: sadc.c
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
long interval = 0;
|
||||
Index: pidstat.c
|
||||
===================================================================
|
||||
--- pidstat.c.orig
|
||||
+++ pidstat.c
|
||||
@@ -43,7 +43,7 @@
|
||||
--- sysstat-11.0.0/pidstat.c 2014-06-12 15:31:57.000000000 -0400
|
||||
+++ pidstat.c 2014-07-17 22:20:46.127704885 -0400
|
||||
@@ -46,7 +46,7 @@
|
||||
#define _(string) (string)
|
||||
#endif
|
||||
|
||||
@ -37,11 +31,9 @@ Index: pidstat.c
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
unsigned long long uptime[3] = {0, 0, 0};
|
||||
Index: mpstat.c
|
||||
===================================================================
|
||||
--- mpstat.c.orig
|
||||
+++ mpstat.c
|
||||
@@ -41,7 +41,7 @@
|
||||
--- sysstat-11.0.0/mpstat.c 2014-06-12 15:31:57.000000000 -0400
|
||||
+++ mpstat.c 2014-07-17 22:21:14.951702914 -0400
|
||||
@@ -42,7 +42,7 @@
|
||||
#define _(string) (string)
|
||||
#endif
|
||||
|
||||
@ -50,11 +42,9 @@ Index: mpstat.c
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
unsigned long long uptime[3] = {0, 0, 0};
|
||||
Index: sar.c
|
||||
===================================================================
|
||||
--- sar.c.orig
|
||||
+++ sar.c
|
||||
@@ -40,7 +40,7 @@
|
||||
--- sysstat-11.0.0/sar.c 2014-06-12 15:31:57.000000000 -0400
|
||||
+++ sar.c 2014-07-17 22:21:39.049701267 -0400
|
||||
@@ -41,7 +41,7 @@
|
||||
#define _(string) (string)
|
||||
#endif
|
||||
|
||||
@ -63,11 +53,9 @@ Index: sar.c
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
/* Interval and count parameters */
|
||||
Index: iostat.c
|
||||
===================================================================
|
||||
--- iostat.c.orig
|
||||
+++ iostat.c
|
||||
@@ -47,7 +47,7 @@
|
||||
--- sysstat-11.0.0/iostat.c 2014-06-12 15:31:57.000000000 -0400
|
||||
+++ iostat.c 2014-07-17 22:22:27.383697962 -0400
|
||||
@@ -48,7 +48,7 @@
|
||||
#define _(string) (string)
|
||||
#endif
|
||||
|
||||
@ -76,10 +64,19 @@ Index: iostat.c
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
struct stats_cpu *st_cpu[2];
|
||||
Index: cifsiostat.c
|
||||
===================================================================
|
||||
--- cifsiostat.c.orig
|
||||
+++ cifsiostat.c
|
||||
--- sysstat-11.0.0/cifsiostat.c 2014-06-12 15:31:58.000000000 -0400
|
||||
+++ cifsiostat.c 2014-07-17 22:22:55.902696011 -0400
|
||||
@@ -41,7 +41,7 @@
|
||||
#define _(string) (string)
|
||||
#endif
|
||||
|
||||
-#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
|
||||
+#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
unsigned long long uptime[2] = {0, 0};
|
||||
--- sysstat-11.0.0/nfsiostat-sysstat.c 2014-06-12 15:31:58.000000000 -0400
|
||||
+++ nfsiostat-sysstat.c 2014-07-17 22:23:30.970693613 -0400
|
||||
@@ -40,7 +40,7 @@
|
||||
#define _(string) (string)
|
||||
#endif
|
||||
@ -89,16 +86,3 @@ Index: cifsiostat.c
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
unsigned long long uptime[2] = {0, 0};
|
||||
Index: nfsiostat.c
|
||||
===================================================================
|
||||
--- nfsiostat.c.orig
|
||||
+++ nfsiostat.c
|
||||
@@ -39,7 +39,7 @@
|
||||
#define _(string) (string)
|
||||
#endif
|
||||
|
||||
-#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__ " compiled " __DATE__ " " __TIME__
|
||||
+#define SCCSID "@(#)sysstat-" VERSION ": " __FILE__
|
||||
char *sccsid(void) { return (SCCSID); }
|
||||
|
||||
unsigned long long uptime[2] = {0, 0};
|
||||
|
||||
@ -1,153 +0,0 @@
|
||||
commit 0b97789cd6b10bca691a9bf43b7cf95cc4fdf384
|
||||
Author: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
Date: Sun Jan 26 09:17:03 2014 +0100
|
||||
|
||||
Rename nfsiostat command to nfsiostat-sysstat
|
||||
|
||||
nfsiostat was added to the sysstat package in 2010, but such a command
|
||||
has already existed in the nfs-utils package since 2008.
|
||||
So to avoid confusion, rename nfsiostat to nfsiostat-sysstat and
|
||||
indicate it is now obsolete.
|
||||
The nfsiostat command from the sysstat package will be removed in a
|
||||
future version since we don't need two similar commands.
|
||||
|
||||
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
||||
|
||||
Index: sysstat-10.2.1/Makefile.in
|
||||
===================================================================
|
||||
--- sysstat-10.2.1.orig/Makefile.in 2014-01-27 13:16:53.480367396 +0100
|
||||
+++ sysstat-10.2.1/Makefile.in 2014-01-27 13:17:27.744767704 +0100
|
||||
@@ -163,7 +163,7 @@ NLSPOT= $(NLSPO:.po=.pot)
|
||||
% : %.o
|
||||
$(CC) -o $@ $(CFLAGS) $^ $(LFLAGS)
|
||||
|
||||
-all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales
|
||||
+all: sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat locales
|
||||
|
||||
common.o: common.c version.h common.h ioconf.h sysconfig.h
|
||||
|
||||
@@ -247,9 +247,9 @@ mpstat.o: mpstat.c mpstat.h version.h co
|
||||
|
||||
mpstat: mpstat.o librdstats_light.a libsyscom.a
|
||||
|
||||
-nfsiostat.o: nfsiostat.c nfsiostat.h count.h version.h common.h
|
||||
+nfsiostat-sysstat.o: nfsiostat-sysstat.c nfsiostat-sysstat.h count.h version.h common.h
|
||||
|
||||
-nfsiostat: nfsiostat.o librdstats_light.a libsyscom.a
|
||||
+nfsiostat-sysstat: nfsiostat-sysstat.o librdstats_light.a libsyscom.a
|
||||
|
||||
cifsiostat.o: cifsiostat.c cifsiostat.h count.h version.h common.h
|
||||
|
||||
@@ -291,8 +291,8 @@ ifeq ($(INSTALL_DOC),y)
|
||||
$(INSTALL_DATA) $(MANGRPARG) man/mpstat.1 $(DESTDIR)$(MAN1_DIR)
|
||||
rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1*
|
||||
$(INSTALL_DATA) $(MANGRPARG) man/pidstat.1 $(DESTDIR)$(MAN1_DIR)
|
||||
- rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1*
|
||||
- $(INSTALL_DATA) $(MANGRPARG) man/nfsiostat.1 $(DESTDIR)$(MAN1_DIR)
|
||||
+ rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1*
|
||||
+ $(INSTALL_DATA) $(MANGRPARG) man/nfsiostat-sysstat.1 $(DESTDIR)$(MAN1_DIR)
|
||||
rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
|
||||
$(INSTALL_DATA) $(MANGRPARG) man/cifsiostat.1 $(DESTDIR)$(MAN1_DIR)
|
||||
ifeq ($(INSTALL_ISAG),y)
|
||||
@@ -308,7 +308,7 @@ ifeq ($(COMPRESS_MANPG),y)
|
||||
$(ZIP) $(DESTDIR)$(MAN1_DIR)/iostat.1
|
||||
$(ZIP) $(DESTDIR)$(MAN1_DIR)/mpstat.1
|
||||
$(ZIP) $(DESTDIR)$(MAN1_DIR)/pidstat.1
|
||||
- $(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat.1
|
||||
+ $(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1
|
||||
$(ZIP) $(DESTDIR)$(MAN1_DIR)/cifsiostat.1
|
||||
ifeq ($(INSTALL_ISAG),y)
|
||||
$(ZIP) $(DESTDIR)$(MAN1_DIR)/isag.1
|
||||
@@ -348,7 +348,7 @@ endif
|
||||
$(INSTALL_BIN) iostat $(DESTDIR)$(BIN_DIR)
|
||||
$(INSTALL_BIN) mpstat $(DESTDIR)$(BIN_DIR)
|
||||
$(INSTALL_BIN) pidstat $(DESTDIR)$(BIN_DIR)
|
||||
- $(INSTALL_BIN) nfsiostat $(DESTDIR)$(BIN_DIR)
|
||||
+ $(INSTALL_BIN) nfsiostat-sysstat $(DESTDIR)$(BIN_DIR)
|
||||
$(INSTALL_BIN) cifsiostat $(DESTDIR)$(BIN_DIR)
|
||||
ifeq ($(INSTALL_ISAG),y)
|
||||
$(INSTALL_BIN) contrib/isag/isag $(DESTDIR)$(BIN_DIR)
|
||||
@@ -419,7 +419,7 @@ ifeq ($(INSTALL_DOC),y)
|
||||
rm -f $(DESTDIR)$(MAN1_DIR)/iostat.1*
|
||||
rm -f $(DESTDIR)$(MAN1_DIR)/mpstat.1*
|
||||
rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1*
|
||||
- rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1*
|
||||
+ rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1*
|
||||
rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
|
||||
ifeq ($(INSTALL_ISAG),y)
|
||||
rm -f $(DESTDIR)$(MAN1_DIR)/isag.1
|
||||
@@ -447,7 +447,7 @@ uninstall_base: uninstall_man uninstall_
|
||||
rm -f $(DESTDIR)$(BIN_DIR)/iostat
|
||||
rm -f $(DESTDIR)$(BIN_DIR)/mpstat
|
||||
rm -f $(DESTDIR)$(BIN_DIR)/pidstat
|
||||
- rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat
|
||||
+ rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat-sysstat
|
||||
rm -f $(DESTDIR)$(BIN_DIR)/cifsiostat
|
||||
ifeq ($(INSTALL_ISAG),y)
|
||||
rm -f $(DESTDIR)$(BIN_DIR)/isag
|
||||
@@ -513,7 +513,7 @@ po-files:
|
||||
endif
|
||||
|
||||
clean:
|
||||
- rm -f sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat *.o *.a core TAGS
|
||||
+ rm -f sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat *.o *.a core TAGS
|
||||
find nls -name "*.gmo" -exec rm -f {} \;
|
||||
|
||||
almost-distclean: clean nls/sysstat.pot
|
||||
@@ -522,7 +522,7 @@ almost-distclean: clean nls/sysstat.pot
|
||||
rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in
|
||||
rm -f contrib/isag/isag
|
||||
rm -f man/sa1.8 man/sa2.8 man/sadc.8 man/sadf.1 man/sar.1 man/iostat.1 man/sysstat.5
|
||||
- rm -f man/cifsiostat.1 man/nfsiostat.1
|
||||
+ rm -f man/cifsiostat.1 man/nfsiostat-sysstat.1
|
||||
rm -f *.log config.status
|
||||
rm -rf autom4te.cache
|
||||
rm -f *.save *.old .*.swp data
|
||||
Index: sysstat-10.2.1/configure
|
||||
===================================================================
|
||||
--- sysstat-10.2.1.orig/configure 2014-01-27 13:16:53.481367408 +0100
|
||||
+++ sysstat-10.2.1/configure 2014-01-27 13:16:55.461390542 +0100
|
||||
@@ -5432,7 +5432,7 @@ ac_config_files="$ac_config_files man/io
|
||||
# File must be renamed
|
||||
ac_config_files="$ac_config_files man/cifsiostat.1:man/cifsiostat.in"
|
||||
# File must be renamed
|
||||
-ac_config_files="$ac_config_files man/nfsiostat.1:man/nfsiostat.in"
|
||||
+ac_config_files="$ac_config_files man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in"
|
||||
# File must be renamed
|
||||
ac_config_files="$ac_config_files contrib/isag/isag"
|
||||
# Permissions must be changed
|
||||
@@ -6165,7 +6165,7 @@ do
|
||||
"man/sysstat.5") CONFIG_FILES="$CONFIG_FILES man/sysstat.5:man/sysstat.in" ;;
|
||||
"man/iostat.1") CONFIG_FILES="$CONFIG_FILES man/iostat.1:man/iostat.in" ;;
|
||||
"man/cifsiostat.1") CONFIG_FILES="$CONFIG_FILES man/cifsiostat.1:man/cifsiostat.in" ;;
|
||||
- "man/nfsiostat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat.1:man/nfsiostat.in" ;;
|
||||
+ "man/nfsiostat-sysstat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in" ;;
|
||||
"contrib/isag/isag") CONFIG_FILES="$CONFIG_FILES contrib/isag/isag" ;;
|
||||
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
|
||||
|
||||
Index: sysstat-10.2.1/configure.in
|
||||
===================================================================
|
||||
--- sysstat-10.2.1.orig/configure.in 2014-01-27 13:16:53.481367408 +0100
|
||||
+++ sysstat-10.2.1/configure.in 2014-01-27 13:16:55.461390542 +0100
|
||||
@@ -608,7 +608,7 @@ AC_CONFIG_FILES([man/sar.1:man/sar.in])
|
||||
AC_CONFIG_FILES([man/sysstat.5:man/sysstat.in]) # File must be renamed
|
||||
AC_CONFIG_FILES([man/iostat.1:man/iostat.in]) # File must be renamed
|
||||
AC_CONFIG_FILES([man/cifsiostat.1:man/cifsiostat.in]) # File must be renamed
|
||||
-AC_CONFIG_FILES([man/nfsiostat.1:man/nfsiostat.in]) # File must be renamed
|
||||
+AC_CONFIG_FILES([man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in]) # File must be renamed
|
||||
AC_CONFIG_FILES([contrib/isag/isag], [chmod +x contrib/isag/isag]) # Permissions must be changed
|
||||
|
||||
AC_OUTPUT(Makefile)
|
||||
Index: sysstat-10.2.1/nfsiostat.c
|
||||
===================================================================
|
||||
--- sysstat-10.2.1.orig/nfsiostat.c 2014-01-27 13:16:55.461390542 +0100
|
||||
+++ sysstat-10.2.1/nfsiostat.c 2014-01-27 13:17:42.992945828 +0100
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <sys/utsname.h>
|
||||
|
||||
#include "version.h"
|
||||
-#include "nfsiostat.h"
|
||||
+#include "nfsiostat-sysstat.h"
|
||||
#include "count.h"
|
||||
#include "common.h"
|
||||
|
||||
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 18 02:34:05 UTC 2014 - tabraham@suse.com
|
||||
|
||||
- update to 11.0.0
|
||||
* [Cedric Marie]: pidstat now displays task scheduling priority and policy (-R option).
|
||||
* [Cedric Marie]: pidstat: Add option -G to filter processes by name.
|
||||
* pidstat: Update variables type to be consistent with recent 3.x kernels.
|
||||
* sadc/sar/sadf: The standard daily data files may now be named saYYYYMMDD instead of saDD. Option -D has been added to sar and sadc to tell them to write to data files under the name saYYYYMMDD.
|
||||
* sadc/sar/sadf: Take into account alternate locations for standard daily data files.
|
||||
* sa1 and sa2 scripts updated: Don't create a tree of directories any more if HISTORY is greater than 28. Use saYYYYMMDD data files instead.
|
||||
* sa1 and sa2 scripts now take into account two new variables: SA_DIR (directory where sa and sar files are located) and ZIP (compression program to use).
|
||||
* Make sysstat init script source the functions library.
|
||||
* Fix possible buffer overflow.
|
||||
* Small fix with sadc's option -S: It is now possible to enter several comma separated values.
|
||||
* Don't install crontabs when using systemd timer units.
|
||||
* Manual pages updated.
|
||||
* FAQ updated.
|
||||
* NLS updated. Galician and Hungarian translations added.
|
||||
* CREDITS file updated.
|
||||
- removed sysstat-rename_nfsiostat.patch (deprecated)
|
||||
- refreshed the other patches
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 28 07:17:44 UTC 2014 - coolo@suse.com
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: sysstat
|
||||
Version: 10.2.1
|
||||
Version: 11.0.0
|
||||
Release: 0
|
||||
Summary: Sar and Iostat Commands for Linux
|
||||
License: GPL-2.0+
|
||||
@ -39,7 +39,6 @@ Patch2: sysstat-8.0.4-pagesize.diff
|
||||
Patch3: sysstat-8.0.4-sysconfdir.diff
|
||||
# PATCH-FIX-OPENSUSE avoid build dates in generated files
|
||||
Patch4: sysstat-9.0.4-no-build-date.patch
|
||||
Patch5: sysstat-rename_nfsiostat.patch
|
||||
BuildRequires: xz
|
||||
Requires: gettext
|
||||
Requires: procmail
|
||||
@ -77,11 +76,6 @@ from a sysstat package.
|
||||
%patch3
|
||||
%patch4
|
||||
cp %{SOURCE1} %{SOURCE2} %{SOURCE4} .
|
||||
# bnc814447: rename nfsiostat to nfsiostat-sysstat
|
||||
%patch5 -p1
|
||||
mv man/nfsiostat.in man/nfsiostat-sysstat.in
|
||||
mv nfsiostat.c nfsiostat-sysstat.c
|
||||
mv nfsiostat.h nfsiostat-sysstat.h
|
||||
|
||||
%build
|
||||
export conf_dir="%{_sysconfdir}/sysstat"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user