|
|
@ -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 <sebastien.godard@wanadoo.fr> |
|
|
|
--- ./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 <at> 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 <sebastien.godard@wanadoo.fr> |
|
|
|
--- ./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 <at> 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 |