From e85243c4264fdc4762f77860f5e0c61f4178090f Mon Sep 17 00:00:00 2001 From: fake Date: Mon, 29 Nov 2004 19:12:09 +0000 Subject: [PATCH] fake: sysstat: update to 5.1.3 [2004112416131200863] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4905 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/sysstat/ioconf-max_blkdev.patch | 11 ++++ package/base/sysstat/prefix.patch | 60 +++++--------------- package/base/sysstat/sysstat.desc | 4 +- 3 files changed, 28 insertions(+), 47 deletions(-) create mode 100644 package/base/sysstat/ioconf-max_blkdev.patch diff --git a/package/base/sysstat/ioconf-max_blkdev.patch b/package/base/sysstat/ioconf-max_blkdev.patch new file mode 100644 index 000000000..e0677a5a2 --- /dev/null +++ b/package/base/sysstat/ioconf-max_blkdev.patch @@ -0,0 +1,11 @@ +--- ./ioconf.c.orig 2004-11-24 15:55:02.129278032 +0100 ++++ ./ioconf.c 2004-11-24 15:55:12.279734928 +0100 +@@ -37,6 +37,8 @@ + #define _(string) (string) + #endif + ++#define MAX_BLKDEV 255 ++ + static unsigned int ioc_parsed = 0; + static struct ioc_entry *ioconf[MAX_BLKDEV+1]; + diff --git a/package/base/sysstat/prefix.patch b/package/base/sysstat/prefix.patch index 3bd68fcb0..3bacecb86 100644 --- a/package/base/sysstat/prefix.patch +++ b/package/base/sysstat/prefix.patch @@ -1,49 +1,31 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/sysstat/prefix.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -Nur sysstat-5.0.0.orig/build/CONFIG sysstat-5.0.0/build/CONFIG ---- sysstat-5.0.0.orig/build/CONFIG 2003-11-05 20:45:35.000000000 +0100 -+++ sysstat-5.0.0/build/CONFIG 2003-11-29 02:34:02.000000000 +0100 -@@ -2,7 +2,7 @@ - # (C) 2000 Sebastien GODARD +--- ./build/CONFIG.orig 2004-11-24 15:37:27.887547136 +0100 ++++ ./build/CONFIG 2004-11-24 15:38:25.342812608 +0100 +@@ -2,8 +2,8 @@ + # (C) 2000 Sebastien GODARD (sysstat wanadoo.fr) # Directories -PREFIX = /usr/local +-SA_LIB_DIR = /usr/local/lib/sa +PREFIX = /usr ++SA_LIB_DIR = /usr/lib/sa SA_DIR = /var/log/sa MAN_DIR = ${PREFIX}/man CLEAN_SA_DIR = n -diff -Nur sysstat-5.0.0.orig/build/CONFIG.def sysstat-5.0.0/build/CONFIG.def ---- sysstat-5.0.0.orig/build/CONFIG.def 2002-05-05 18:54:39.000000000 +0200 -+++ sysstat-5.0.0/build/CONFIG.def 2003-11-29 02:33:43.000000000 +0100 -@@ -2,7 +2,7 @@ - # (C) 2000 Sebastien GODARD +--- ./build/CONFIG.def.orig 2004-11-24 15:38:02.224327152 +0100 ++++ ./build/CONFIG.def 2004-11-24 15:38:19.258737528 +0100 +@@ -2,8 +2,8 @@ + # (C) 2000 Sebastien GODARD (sysstat wanadoo.fr) # Directories -PREFIX = /usr/local +-SA_LIB_DIR = /usr/local/lib/sa +PREFIX = /usr ++SA_LIB_DIR = /usr/lib/sa SA_DIR = /var/log/sa MAN_DIR = ${PREFIX}/man CLEAN_SA_DIR = n -diff -Nur sysstat-5.0.0.orig/build/Configure.sh sysstat-5.0.0/build/Configure.sh ---- sysstat-5.0.0.orig/build/Configure.sh 2003-01-02 21:32:11.000000000 +0100 -+++ sysstat-5.0.0/build/Configure.sh 2003-11-29 02:34:30.000000000 +0100 +--- ./build/Configure.sh.orig 2004-11-24 15:39:45.218669632 +0100 ++++ ./build/Configure.sh 2004-11-24 15:39:01.481318720 +0100 @@ -10,10 +10,10 @@ # Installation directory @@ -57,16 +39,4 @@ diff -Nur sysstat-5.0.0.orig/build/Configure.sh sysstat-5.0.0/build/Configure.sh + PREFIX=/usr fi - # System Activity directory -diff -Nur sysstat-5.0.0.orig/sa.h sysstat-5.0.0/sa.h ---- sysstat-5.0.0.orig/sa.h 2003-11-05 20:42:36.000000000 +0100 -+++ sysstat-5.0.0/sa.h 2003-11-29 02:31:58.000000000 +0100 -@@ -118,7 +118,7 @@ - #define NET_SOCKSTAT "/proc/net/sockstat" - #define SADC "sadc" - #define SADC_PATH "/usr/lib/sa/sadc" --#define SADC_LOCAL_PATH "/usr/local/lib/sa/sadc" -+#define SADC_LOCAL_PATH "/usr/lib/sa/sadc" - #define LOADAVG "/proc/loadavg" - #define VMSTAT "/proc/vmstat" - + # sadc directory diff --git a/package/base/sysstat/sysstat.desc b/package/base/sysstat/sysstat.desc index 6863a3639..38b86d450 100644 --- a/package/base/sysstat/sysstat.desc +++ b/package/base/sysstat/sysstat.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 5.0.3 +[V] 5.1.3 [P] X -?---5---9 164.600 -[D] 2547764175 sysstat-5.0.3.tar.bz2 http://www.ibiblio.org/pub/Linux/system/status/ +[D] 2159267396 sysstat-5.1.3.tar.bz2 http://www.ibiblio.org/pub/Linux/system/status/