fishHEADmaster

3 files changed, 144 insertions, 0 deletions

diff --git a/package/system/utils/e2fsprogs/patches/.svn/entries b/package/system/utils/e2fsprogs/patches/.svn/entries
new file mode 100644
index 0000000..df7e90a
--- /dev/null
+++ b/package/system/utils/e2fsprogs/patches/.svn/entries
@@ -0,0 +1,96 @@
+10
+
+dir
+36060
+svn://svn.openwrt.org/openwrt/trunk/package/system/utils/e2fsprogs/patches
+svn://svn.openwrt.org/openwrt
+
+
+
+2013-01-29T10:48:46.063504Z
+35375
+nbd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+3c298f89-4303-0410-b956-a3cf2f4a3e73
+
+002-no_malloc_h.patch
+file
+
+
+
+
+2013-03-17T12:13:15.000000Z
+db14c4a8661c5baca981364df0acc46b
+2013-01-29T10:48:46.063504Z
+35375
+nbd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+195
+
+001-link-against-libuuid.patch
+file
+
+
+
+
+2013-03-17T12:13:15.000000Z
+4bee56cfb835cafa926d833ba45e73fc
+2013-01-29T10:48:46.063504Z
+35375
+nbd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1424
+
diff --git a/package/system/utils/e2fsprogs/patches/.svn/text-base/001-link-against-libuuid.patch.svn-base b/package/system/utils/e2fsprogs/patches/.svn/text-base/001-link-against-libuuid.patch.svn-base
new file mode 100644
index 0000000..e0564dc
--- /dev/null
+++ b/package/system/utils/e2fsprogs/patches/.svn/text-base/001-link-against-libuuid.patch.svn-base
@@ -0,0 +1,38 @@
+--- a/configure
++++ b/configure
+@@ -5038,7 +5038,7 @@ if test "${ac_cv_lib_blkid_blkid_get_cac
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lblkid $LIBBLKID $LIBS"
++LIBS="-lblkid $LIBBLKID $LIBUUID $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -146,10 +146,10 @@ partinfo: partinfo.o
+ 	$(E) "	LD $@"
+ 	$(Q) $(CC) $(ALL_LDFLAGS) -o partinfo partinfo.o
+ 
+-e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(LIBEXT2FS)
++e2initrd_helper: e2initrd_helper.o $(DEPLIBS) $(DEPLIBBLKID) $(DEPLIBUUID) $(LIBEXT2FS)
+ 	$(E) "	LD $@"
+ 	$(Q) $(CC) $(ALL_LDFLAGS) -o e2initrd_helper e2initrd_helper.o $(LIBS) \
+-		$(LIBBLKID) $(LIBEXT2FS) $(LIBINTL)
++		$(LIBBLKID) $(LIBUUID) $(LIBEXT2FS) $(LIBINTL)
+ 
+ tune2fs: $(TUNE2FS_OBJS) $(DEPLIBS) $(DEPLIBS_E2P) $(DEPLIBBLKID) \
+ 		$(DEPLIBUUID) $(DEPLIBQUOTA) $(LIBEXT2FS)
+@@ -289,9 +289,9 @@ dumpe2fs.profiled: $(PROFILED_DUMPE2FS_O
+ 		$(PROFILED_DUMPE2FS_OBJS) $(PROFILED_LIBS) \
+ 		$(PROFILED_LIBE2P) $(PROFILED_LIBUUID) $(LIBINTL)
+ 
+-fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
++fsck: $(FSCK_OBJS) $(DEPLIBBLKID) $(DEPLIBUUID)
+ 	$(E) "	LD $@"
+-	$(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
++	$(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBUUID) $(LIBINTL)
+ 
+ fsck.profiled: $(PROFILED_FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
+ 	$(E) "	LD $@"
diff --git a/package/system/utils/e2fsprogs/patches/.svn/text-base/002-no_malloc_h.patch.svn-base b/package/system/utils/e2fsprogs/patches/.svn/text-base/002-no_malloc_h.patch.svn-base
new file mode 100644
index 0000000..209b47c
--- /dev/null
+++ b/package/system/utils/e2fsprogs/patches/.svn/text-base/002-no_malloc_h.patch.svn-base
@@ -0,0 +1,10 @@
+--- a/util/symlinks.c
++++ b/util/symlinks.c
+@@ -8,7 +8,6 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <fcntl.h>
+ #include <sys/param.h>