From 25c0af735ae7324a3bb16f2439abbe9db61a4be3 Mon Sep 17 00:00:00 2001
From: wittinobi <wittinobi@wittinobi.de>
Date: Thu, 11 Oct 2012 21:47:37 +0200
Subject: [PATCH] fix links, update hotplug

---
 archive-patches/hotplug.diff | 20 +++++++++++++
 make/applications.mk         |  1 +
 make/plugins.mk              | 56 ++++++++++++++++++------------------
 3 files changed, 49 insertions(+), 28 deletions(-)
 create mode 100644 archive-patches/hotplug.diff

diff --git a/archive-patches/hotplug.diff b/archive-patches/hotplug.diff
new file mode 100644
index 0000000..440fc3a
--- /dev/null
+++ b/archive-patches/hotplug.diff
@@ -0,0 +1,20 @@
+diff -Naur hotplug/hotplug.c hotplug_/hotplug.c
+--- hotplug/hotplug.c	2012-10-06 16:28:13.000000000 +0200
++++ hotplug_/hotplug.c	2012-10-06 16:33:05.000000000 +0200
+@@ -63,7 +63,7 @@
+ {
+ 	char *devpath, *firmware, *action;
+ 	struct stat sbuf;
+-	int fw_fd, count;
++	int fw_fd =-1, count;
+ 	int rc;
+ 	char *fw_path, *data_path;
+ 	char *fw_buffer;
+@@ -615,6 +615,7 @@
+ 			/* put notification data into the FIFO /dev/shm/hotplug */
+ 			_write_fifo2(addc, 'I', "Network");
+ 			_write_fifo(addc, 'N', &buf[pos]);
++			free(buf);
+ 		}
+ 	}
+ 	else if (strncmp(argv[1], "firmware", 8) == 0)
diff --git a/make/applications.mk b/make/applications.mk
index 78f09a4..a01bc34 100755
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -130,6 +130,7 @@ $(D)/e2fsprogs-new: $(ARCHIVE)/e2fsprogs-1.41.14.tar.gz | $(TARGETPREFIX)
 $(D)/hotplug: $(D)/libblkid $(D)/libuuid | $(TARGETPREFIX)
 	tar -C $(SOURCE_DIR)/svn/THIRDPARTY/applications/tools -cp hotplug --exclude=.svn | tar -C $(BUILD_TMP) -x
 	pushd $(BUILD_TMP)/hotplug && \
+		$(PATCH)/hotplug.diff && \
 		$(TARGET)-gcc -Wall -Wextra -Wshadow -O2 -g \
 			-I$(TARGETPREFIX)/include -L$(TARGETPREFIX)/lib \
 			-lblkid -luuid \
diff --git a/make/plugins.mk b/make/plugins.mk
index 64907e4..9450057 100644
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -92,20 +92,20 @@ $(D)/lbreakout: $(D)/libsdl $(D)/libsdl-mixer
 $(D)/links:
 	cp -a $(SOURCE_DIR)/svn/THIRDPARTY/applications/plugins/links $(BUILD_TMP)/ && \
 	pushd $(BUILD_TMP)/links && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		LD_LIBRARY_PATH=$(TARGETPREFIX)/lib \
-		CC=$(TARGET)-gcc \
-		AR=$(TARGET)-ar \
-		NM=$(TARGET)-nm \
-		RANLIB=$(TARGET)-ranlib \
-		OBJDUMP=$(TARGET)-objdump \
-		STRIP=$(TARGET)-strip \
-		CFLAGS="-I$(TARGETPREFIX)/include/directfb" \
-		CPPFLAGS="-I$(TARGETPREFIX)/include" \
-		LIBS="-Wl,--rpath-link -Wl,$(TARGETPREFIX)/lib" \
-		CCPATH= \
-		DESTDIR=$(TARGETPREFIX) \
-		PATH=/bin:$(PATH) \
+		export PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig && \
+		export LD_LIBRARY_PATH=$(TARGETPREFIX)/lib && \
+		export CC=$(TARGET)-gcc && \
+		export AR=$(TARGET)-ar && \
+		export NM=$(TARGET)-nm && \
+		export RANLIB=$(TARGET)-ranlib && \
+		export OBJDUMP=$(TARGET)-objdump && \
+		export STRIP=$(TARGET)-strip && \
+		export CFLAGS="-I$(TARGETPREFIX)/include/directfb" && \
+		export CPPFLAGS="-I$(TARGETPREFIX)/include" && \
+		export LIBS="-Wl,--rpath-link -Wl,$(TARGETPREFIX)/lib" && \
+		export CCPATH= && \
+		export DESTDIR=$(TARGETPREFIX) && \
+		export PATH=/bin:$(PATH) && \
 		./configure \
 			--host=$(TARGET) \
 			--build=$(BUILD) \
@@ -139,20 +139,20 @@ $(D)/links:
 $(D)/links-new:
 	cp -a $(GIT_PLUGINS)/links $(BUILD_TMP)/ && \
 	pushd $(BUILD_TMP)/links && \
-		PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig \
-		LD_LIBRARY_PATH=$(TARGETPREFIX)/lib \
-		CC=$(TARGET)-gcc \
-		AR=$(TARGET)-ar \
-		NM=$(TARGET)-nm \
-		RANLIB=$(TARGET)-ranlib \
-		OBJDUMP=$(TARGET)-objdump \
-		STRIP=$(TARGET)-strip \
-		CFLAGS="-I$(TARGETPREFIX)/include/directfb" \
-		CPPFLAGS="-I$(TARGETPREFIX)/include" \
-		LIBS="-Wl,--rpath-link -Wl,$(TARGETPREFIX)/lib" \
-		CCPATH= \
-		DESTDIR=$(TARGETPREFIX) \
-		PATH=/bin:$(PATH) \
+		export PKG_CONFIG_PATH=$(TARGETPREFIX)/lib/pkgconfig && \
+		export LD_LIBRARY_PATH=$(TARGETPREFIX)/lib && \
+		export CC=$(TARGET)-gcc && \
+		export AR=$(TARGET)-ar && \
+		export NM=$(TARGET)-nm && \
+		export RANLIB=$(TARGET)-ranlib && \
+		export OBJDUMP=$(TARGET)-objdump && \
+		export STRIP=$(TARGET)-strip && \
+		export CFLAGS="-I$(TARGETPREFIX)/include/directfb" && \
+		export CPPFLAGS="-I$(TARGETPREFIX)/include" && \
+		export LIBS="-Wl,--rpath-link -Wl,$(TARGETPREFIX)/lib" && \
+		export CCPATH= && \
+		export DESTDIR=$(TARGETPREFIX) && \
+		export PATH=/bin:$(PATH) && \
 		./configure \
 			--host=$(TARGET) \
 			--build=$(BUILD) \
-- 
2.39.5