SOURCES (AC-branch): sysdiag-paths.patch, sysdiag-system-libs.patc...
glen
glen at pld-linux.org
Sun Dec 16 01:10:27 CET 2007
Author: glen Date: Sun Dec 16 00:10:27 2007 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- update to 0.3.0
---- Files affected:
SOURCES:
sysdiag-paths.patch (1.2 -> 1.2.2.1) , sysdiag-system-libs.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/sysdiag-paths.patch
diff -u SOURCES/sysdiag-paths.patch:1.2 SOURCES/sysdiag-paths.patch:1.2.2.1
--- SOURCES/sysdiag-paths.patch:1.2 Wed Feb 25 22:17:40 2004
+++ SOURCES/sysdiag-paths.patch Sun Dec 16 01:10:22 2007
@@ -1,4 +1,3 @@
-diff -burN sysdiag-v0_2_0.orig/src/sysdiag.h sysdiag-v0_2_0/src/sysdiag.h
--- sysdiag-v0_2_0.orig/src/sysdiag.h 2004-02-24 14:54:00.395408040 +0100
+++ sysdiag-v0_2_0/src/sysdiag.h 2004-02-24 15:03:51.725512200 +0100
@@ -79,7 +79,7 @@
@@ -21,8 +20,8 @@
[net]
INQ=ethtool -i <dev>
---- sysdiag-v0_2_0/docs/sysdiag.1.orig 2004-01-02 06:23:43.000000000 +0100
-+++ sysdiag-v0_2_0/docs/sysdiag.1 2004-02-25 21:45:58.802025704 +0100
+--- sysdiag-v0_3_0/docs/sysdiag.1~ 2007-12-16 01:25:24.000000000 +0200
++++ sysdiag-v0_3_0/docs/sysdiag.1 2007-12-16 01:28:59.139630857 +0200
@@ -54,11 +54,11 @@
.TP
@@ -49,6 +48,6 @@
-\fI/usr/local/share\fR
-Directory containing configuration and temporary files.\&.
-
- .SH "MAILING LIST"
+ .SH "DEPENDENCIES"
.PP
================================================================
Index: SOURCES/sysdiag-system-libs.patch
diff -u SOURCES/sysdiag-system-libs.patch:1.1 SOURCES/sysdiag-system-libs.patch:1.1.2.1
--- SOURCES/sysdiag-system-libs.patch:1.1 Wed Feb 25 22:18:23 2004
+++ SOURCES/sysdiag-system-libs.patch Sun Dec 16 01:10:22 2007
@@ -1,70 +1,27 @@
---- sysdiag-v0_2_0/src/Makefile.am.orig 2004-01-02 06:22:10.000000000 +0100
-+++ sysdiag-v0_2_0/src/Makefile.am 2004-02-25 21:42:53.380214104 +0100
-@@ -4,6 +4,6 @@
- sysdiag_SOURCES = sysdiag.c syslist.c sysparse.c syslog.c sysdiag.h sysdb.c
- data_DATA = $(conf_file)
-
--INCLUDES = -I../lib -I../tdb
--LDADD = ../lib/libsysfs.a ../tdb/libtdb.a
-+INCLUDES = -I../tdb
-+LDADD = -lsysfs -ltdb
-
---- sysdiag-v0_2_0/Makefile.am.orig 2004-01-02 06:34:22.000000000 +0100
-+++ sysdiag-v0_2_0/Makefile.am 2004-02-25 21:40:54.868230664 +0100
-@@ -1,3 +1,3 @@
- # EXTRA_DIST = docs
--SUBDIRS = lib tdb src docs
-+SUBDIRS = src docs
-
---- sysdiag-v0_2_0/configure.ac.orig 2004-01-02 06:34:22.000000000 +0100
-+++ sysdiag-v0_2_0/configure.ac 2004-02-25 21:40:44.207851288 +0100
-@@ -10,7 +10,6 @@
- AC_PROG_CC
+--- sysdiag-v0_3_0/configure.ac 2004-02-25 17:14:28.000000000 +0200
++++ sysdiag-v0_3_0-patched/configure.ac 2007-12-16 01:32:30.560376443 +0200
+@@ -11,7 +11,6 @@
AC_PROG_RANLIB
+ AC_CHECK_LIB([sysfs], [sysfs_open_bus], , exit)
-AC_CHECK_LIB([gdbm], [gdbm_open], , exit)
AH_TEMPLATE([HAVE_EVLVIEW],[need to check if evlview is installed])
---- sysdiag-v0_2_0/src/sysdb.c.orig 2004-01-02 06:54:00.000000000 +0100
-+++ sysdiag-v0_2_0/src/sysdb.c 2004-02-25 22:09:00.765935256 +0100
-@@ -434,16 +434,16 @@
- int load_sysdiag_db()
- {
+--- sysdiag-v0_3_0/Makefile.am 2004-02-25 15:04:23.000000000 +0200
++++ sysdiag-v0_3_0-patched/Makefile.am 2007-12-16 01:32:12.982984201 +0200
+@@ -1,3 +1,3 @@
+ # EXTRA_DIST = docs
+-SUBDIRS = tdb src test docs
++SUBDIRS = src docs
-- if (load_default(SYSFS_BUS_DIR, SYSDIAG_BUS_STR) != 0) {
-+ if (load_default(SYSFS_BUS_NAME, SYSDIAG_BUS_STR) != 0) {
- fprintf(stderr, "loading bus information failed !!\n");
- return -1;
- }
-- if (load_default(SYSFS_CLASS_DIR, SYSDIAG_CLASS_STR) != 0) {
-+ if (load_default(SYSFS_CLASS_NAME, SYSDIAG_CLASS_STR) != 0) {
- fprintf(stderr, "loading class information failed !!\n");
- return -1;
- }
-
-- if (load_default(SYSFS_DEVICES_DIR, SYSFS_DEVICES_NAME) != 0) {
-+ if (load_default(SYSFS_DEVICES_NAME, SYSFS_DEVICES_NAME) != 0) {
- fprintf(stderr, "loading root device information failed !!\n");
- return -1;
- }
---- sysdiag-v0_2_0/src/sysdiag.c.orig 2004-01-02 06:22:10.000000000 +0100
-+++ sysdiag-v0_2_0/src/sysdiag.c 2004-02-25 22:09:11.664278456 +0100
-@@ -192,7 +192,7 @@
- struct sysfs_directory *mydir = NULL;
- char *dev_num = NULL;
+--- sysdiag-v0_3_0/src/Makefile.am 2004-02-25 15:05:42.000000000 +0200
++++ sysdiag-v0_3_0-patched/src/Makefile.am 2007-12-16 01:31:56.721696207 +0200
+@@ -4,5 +4,5 @@
+ sysdiag_SOURCES = sysdiag.c syslist.c sysparse.c syslog.c sysdiag.h sysdb.c
+ data_DATA = $(conf_file)
-- if ((classdev = sysfs_open_class_device_by_name("scsi_host",
-+ if ((classdev = sysfs_open_class_device("scsi_host",
- device)) == NULL) {
- fprintf(stdout, "error opening class device %s\n", device);
- return NULL;
-@@ -440,7 +440,7 @@
- }
- }
- else {
-- if ((classdev = sysfs_open_class_device_by_name("scsi_host",
-+ if ((classdev = sysfs_open_class_device("scsi_host",
- DEVICE_NAME)) == NULL) {
- fprintf(stdout, "error opening class device %s\n",
- DEVICE_NAME);
+-INCLUDES = -I../tdb
+-LDADD =-lsysfs ../tdb/libtdb.a
++INCLUDES =
++LDADD = -lsysfs -ltdb
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/sysdiag-paths.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/sysdiag-system-libs.patch?r1=1.1&r2=1.1.2.1&f=u
More information about the pld-cvs-commit
mailing list