- don't use functions that are marked LEGACY in SUSv3

2 files changed, 64 insertions, 3 deletions

diff --git a/package/lm-sensors/lm-sensors.01.susv3-legacy.patch b/package/lm-sensors/lm-sensors.01.susv3-legacy.patch
new file mode 100644
index 000000000..85d84b773
--- /dev/null
+++ b/package/lm-sensors/lm-sensors.01.susv3-legacy.patch
@@ -0,0 +1,57 @@
+diff -rdup lm_sensors-2.10.4.oorig/lib/proc.c lm_sensors-2.10.4/lib/proc.c
+--- lm_sensors-2.10.4.oorig/lib/proc.c	2007-07-17 06:53:06.000000000 +0200
++++ lm_sensors-2.10.4/lib/proc.c	2007-09-20 13:30:39.000000000 +0200
+@@ -93,16 +93,16 @@ int sensors_read_proc_bus(void)
+   while (fgets(line,255,f)) {
+     if (strlen(line) > 0)
+       line[strlen(line)-1] = '\0';
+-    if (! (border = rindex(line,'\t')))
++    if (! (border = strrchr(line,'\t')))
+       goto ERROR;
+     /* Skip algorithm name */
+     *border='\0';
+-    if (! (border = rindex(line,'\t')))
++    if (! (border = strrchr(line,'\t')))
+       goto ERROR;
+     if (! (entry.adapter = strdup(border + 1)))
+       goto FAT_ERROR;
+     *border='\0';
+-    if (! (border = rindex(line,'\t')))
++    if (! (border = strrchr(line,'\t')))
+       goto ERROR;
+     *border='\0';
+     if (strncmp(line,"i2c-",4))
+@@ -155,8 +155,8 @@ int sensors_read_proc(sensors_chip_name 
+ 		strcpy(n, name.busname);
+ 		strcat(n, "/");
+ 		strcpy(altn, n);
+-		/* use rindex to append sysname to n */
+-		getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
++		/* use strrchr to append sysname to n */
++		getsysname(the_feature, strrchr(n, '\0'), &mag, strrchr(altn, '\0'));
+ 		if ((f = fopen(n, "r")) != NULL
+ 		 || (f = fopen(altn, "r")) != NULL) {
+ 			int res = fscanf(f, "%lf", value);
+@@ -198,8 +198,8 @@ int sensors_write_proc(sensors_chip_name
+ 		strcpy(n, name.busname);
+ 		strcat(n, "/");
+ 		strcpy(altn, n);
+-		/* use rindex to append sysname to n */
+-		getsysname(the_feature, rindex(n, '\0'), &mag, rindex(altn, '\0'));
++		/* use strrchr to append sysname to n */
++		getsysname(the_feature, strrchr(n, '\0'), &mag, strrchr(altn, '\0'));
+ 		if ((f = fopen(n, "w")) != NULL
+ 		 || (f = fopen(altn, "w")) != NULL) {
+ 			for (; mag > 0; mag --)
+diff -rdup lm_sensors-2.10.4.oorig/prog/dump/i2cbusses.c lm_sensors-2.10.4/prog/dump/i2cbusses.c
+--- lm_sensors-2.10.4.oorig/prog/dump/i2cbusses.c	2007-07-17 06:53:10.000000000 +0200
++++ lm_sensors-2.10.4/prog/dump/i2cbusses.c	2007-09-20 13:29:19.000000000 +0200
+@@ -185,7 +185,7 @@ found:
+ 				fprintf(stderr, "%s: read error\n", n);
+ 				continue;
+ 			}
+-			if((border = index(x, '\n')) != NULL)
++			if((border = strchr(x, '\n')) != NULL)
+ 				*border = 0;
+ 			if(count++ == 0 && !procfmt)
+ 				fprintf(stderr,"  Installed I2C busses:\n");
diff --git a/package/lm-sensors/lm-sensors.mk b/package/lm-sensors/lm-sensors.mk
index 532061b58..89e8f757a 100644
--- a/package/lm-sensors/lm-sensors.mk
+++ b/package/lm-sensors/lm-sensors.mk
@@ -6,7 +6,7 @@
 LM_SENSORS_VERSION:=2.10.4
 LM_SENSORS_SOURCE:=lm-sensors_$(LM_SENSORS_VERSION).orig.tar.gz
 LM_SENSORS_PATCH:=lm-sensors_$(LM_SENSORS_VERSION)-1.diff.gz
-LM_SENSORS_SITE:=ftp://ftp.debian.org/debian/pool/main/l/lm-sensors/
+LM_SENSORS_SITE:=http://ftp.debian.org/debian/pool/main/l/lm-sensors/
 LM_SENSORS_DIR:=$(BUILD_DIR)/lm_sensors-$(LM_SENSORS_VERSION)
 LM_SENSORS_CAT:=$(ZCAT)
 LM_SENSORS_BINARY:=prog/sensors/sensors
@@ -15,16 +15,20 @@ LM_SENSORS_TARGET_BINARY:=usr/bin/sensors
 $(DL_DIR)/$(LM_SENSORS_SOURCE):
 	$(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_SOURCE)
 
+ifneq ($(LM_SENSORS_PATCH),)
+LM_SENSORS_PATCH_FILE:=$(DL_DIR)/$(LM_SENSORS_PATCH)
 $(DL_DIR)/$(LM_SENSORS_PATCH):
 	$(WGET) -P $(DL_DIR) $(LM_SENSORS_SITE)/$(LM_SENSORS_PATCH)
+endif
 
-lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(DL_DIR)/$(LM_SENSORS_PATCH)
+lm-sensors-source: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(LM_SENSORS_PATCH_FILE)
 
 $(LM_SENSORS_DIR)/.unpacked: $(DL_DIR)/$(LM_SENSORS_SOURCE) $(DL_DIR)/$(LM_SENSORS_PATCH)
 	$(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	toolchain/patch-kernel.sh $(LM_SENSORS_DIR) package/lm-sensors/ lm-sensors\*.patch
 ifneq ($(LM_SENSORS_PATCH),)
-	(cd $(LM_SENSORS_DIR) && $(LM_SENSORS_CAT) $(DL_DIR)/$(LM_SENSORS_PATCH) | patch -p1)
+	(cd $(LM_SENSORS_DIR) && \
+	 $(LM_SENSORS_CAT) $(LM_SENSORS_PATCH_FILE) | patch -p1)
 	if [ -d $(LM_SENSORS_DIR)/debian/patches ]; then \
 		toolchain/patch-kernel.sh $(LM_SENSORS_DIR) $(LM_SENSORS_DIR)/debian/patches \*.patch; \
 	fi