reinit the tree, so we can have metadata

4 files changed, 145 insertions, 0 deletions

diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch
new file mode 100644
index 000000000000..8c89374588fb
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-parallel-make.patch
@@ -0,0 +1,11 @@
+--- dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in.orig	2016-09-20 12:54:09.416628404 +0200
++++ dmraid/1.0.0.rc16-3/dmraid/lib/Makefile.in	2016-09-20 12:55:06.343698229 +0200
+@@ -79,7 +79,7 @@
+ 		-Wl,-soname,$(notdir $@).$(DMRAID_LIB_MAJOR) \
+ 		$(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(DL_LIBS) $(LIBS)
+ 
+-$(LIB_EVENTS_SHARED): $(OBJECTS2)
++$(LIB_EVENTS_SHARED): $(OBJECTS2) $(LIB_SHARED)
+ 	$(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJECTS2) \
+ 		-shared -Wl,--discard-all -Wl,--no-undefined -Wl,-soname,$(notdir $@) \
+ 		$(LIB_SHARED) $(DEVMAPPEREVENT_LIBS) $(DEVMAPPER_LIBS) $(PTHREAD_LIBS) $(LIBS)
diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch
new file mode 100644
index 000000000000..1e6c71322498
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-return-all-sets.patch
@@ -0,0 +1,11 @@
+--- a/1.0.0.rc16/lib/metadata/metadata.c	2009-11-27 21:57:50.182129589 -0800
++++ b/1.0.0.rc16/lib/metadata/metadata.c	2009-11-27 21:57:58.950964293 -0800
+@@ -839,7 +839,7 @@
+ 		 */
+ 		if (T_GROUP(rs)) {
+ 			_discover_partitions(lc, &rs->sets);
+-			return;
++			continue;
+ 		}
+ 
+ 		/*
diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-static-build-fixes.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-static-build-fixes.patch
new file mode 100644
index 000000000000..298811701e4e
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-static-build-fixes.patch
@@ -0,0 +1,110 @@
+--- tools/Makefile.in.old	2010-05-31 07:18:31.000000000 -0400
++++ tools/Makefile.in	2010-12-13 13:15:22.000000000 -0500
+@@ -60,17 +60,23 @@
+ ifeq ("@KLIBC@", "no")
+ 	ifeq ("@STATIC_LINK@", "no")
+ 		LDFLAGS += -rdynamic
++		MYLIBOBJ=$(top_builddir)/lib/libdmraid.so
+ 	else
+ 		LDFLAGS += -static
++		MYLIBOBJ=$(top_builddir)/lib/libdmraid.a
++		DMRAIDLIBS += \
++			$(DEVMAPPEREVENT_LIBS) \
++			$(DEVMAPPER_LIBS) \
++			$(DL_LIBS)
+ 	endif
+ endif
+ 
+ .PHONY: install_dmraid_tools
+ 
+-dmraid: $(OBJECTS) $(top_builddir)/lib/libdmraid.a
++dmraid: $(OBJECTS) $(MYLIBOBJ)
+ 	$(CC) -o $@ $(OBJECTS) $(LDFLAGS) -L$(top_builddir)/lib $(DMRAIDLIBS) $(LIBS)
+ 
+-dmevent_tool: $(OBJECTS2) $(top_builddir)/lib/libdmraid.a
++dmevent_tool: $(OBJECTS2) $(MYLIBOBJ)
+ 	$(CC) -o $@ $(OBJECTS2) $(INCLUDES) $(LDFLAGS) -L$(top_builddir)/lib \
+ 		$(DMEVENTTOOLLIBS) $(DMRAIDLIBS) $(LIBS)
+ 
+--- lib/Makefile.in.old	2010-10-27 07:31:46.000000000 -0400
++++ lib/Makefile.in	2010-12-13 13:04:16.000000000 -0500
+@@ -60,11 +60,11 @@
+ USRLIB_RELPATH = $(shell echo $(abspath $(usrlibdir) $(libdir)) | \
+   $(AWK) -f $(top_srcdir)/tools/relpath.awk)
+ 
+-TARGETS = $(LIB_STATIC)
++TARGETS = $(LIB_STATIC) $(LIB_SHARED) $(LIB_EVENTS_SHARED)
+ 
+ ifeq ("@KLIBC@", "no")
+ 	ifeq ("@STATIC_LINK@", "no")
+-		TARGETS += $(LIB_SHARED) $(LIB_EVENTS_SHARED)
++		TARGETS = $(LIB_SHARED) $(LIB_EVENTS_SHARED)
+ 	endif
+ endif
+ 
+--- configure.in	2010-05-31 07:18:30.000000000 -0400
++++ configure.in.new	2010-12-07 13:30:40.000000000 -0500
+@@ -155,6 +155,15 @@
+     Default is dynamic linking]),
+   [STATIC_LINK=$enableval], [STATIC_LINK=no])
+ 
++if test "x$STATIC_LINK" != "xno"; then
++  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++        AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
++  fi
++  PKG_CONFIG="${PKG_CONFIG} --static"
++  ac_cv_env_PKG_CONFIG_set=set
++fi
++PKG_PROG_PKG_CONFIG([0.2])
++
+ dnl Enables shared libdmraid
+ AC_ARG_ENABLE(shared_lib,
+   AC_HELP_STRING([--enable-shared_lib], [Use this to generate shared
+@@ -248,23 +257,31 @@
+ 	AC_HELP_STRING([--with-devmapper-prefix=PFX],
+ 		[Where is devmapper library installed]),
+ 	[DEVMAPPER_LIBS="-L$withval/lib"
+-	 DEVMAPPER_CFLAGS="-I$withval/include"],
++	 DEVMAPPER_CFLAGS="-I$withval/include"
++	 dmprefix=$withval],
+ 	[DEVMAPPER_LIBS=
+-	 DEVMAPPER_CFLAGS=])
+-save_LDFLAGS=$LDFLAGS
+-save_CPPFLAGS=$CPPFLAGS
+-LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS"
+-CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS"
+-AC_CHECK_LIB(devmapper-event, dm_event_handler_create,
+-	[DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"],
+-	[AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])])
+-AC_CHECK_LIB(devmapper, dm_task_set_name,
+-	[DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"],
+-	[AC_MSG_ERROR([device-mapper library is missing])])
+-AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,,
+-	[AC_MSG_ERROR([Missing headers device-mapper headers])])
+-CPPFLAGS=$save_CPPFLAGS
+-LDFLAGS=$save_LDFLAGS
++	 DEVMAPPER_CFLAGS=
++	 dmprefix=no])
++if test "x$dmprefix" = xno ; then
++	PKG_CHECK_MODULES([DEVMAPPER],[devmapper],
++		[PKG_CHECK_MODULES([DEVMAPPEREVENT],[devmapper-event])
++		])
++else
++	save_LDFLAGS=$LDFLAGS
++	save_CPPFLAGS=$CPPFLAGS
++	LDFLAGS="$LDFLAGS $DEVMAPPER_LIBS"
++	CPPFLAGS="$CPPFLAGS $DEVMAPPER_CFLAGS"
++	AC_CHECK_LIB(devmapper-event, dm_event_handler_create,
++		[DEVMAPPEREVENT_LIBS="$DEVMAPPER_LIBS -ldevmapper-event"],
++		[AC_MSG_ERROR([device-mapper-event library is either missing or is too old and badly linked])])
++	AC_CHECK_LIB(devmapper, dm_task_set_name,
++		[DEVMAPPER_LIBS="$DEVMAPPER_LIBS -ldevmapper"],
++		[AC_MSG_ERROR([device-mapper library is missing])])
++	AC_CHECK_HEADERS(libdevmapper.h libdevmapper-event.h,,
++		[AC_MSG_ERROR([Missing headers device-mapper headers])])
++	CPPFLAGS=$save_CPPFLAGS
++	LDFLAGS=$save_LDFLAGS
++fi
+ 
+ VERSION=$srcdir/tools/VERSION
+ DMRAID_LIB_MAJOR=$(cut -d. -f1 $VERSION)
\ No newline at end of file
diff --git a/sys-fs/dmraid/files/dmraid-1.0.0_rc16-undo-p-rename.patch b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-undo-p-rename.patch
new file mode 100644
index 000000000000..6636b0563086
--- /dev/null
+++ b/sys-fs/dmraid/files/dmraid-1.0.0_rc16-undo-p-rename.patch
@@ -0,0 +1,13 @@
+Author: Giuseppe Iuculano <giuseppe@iuculano.it>
+Description: Removed "p" from device name. A proper upgrade script is needed before using it.
+--- a/1.0.0.rc15/lib/format/partition/dos.c
++++ b/1.0.0.rc15/lib/format/partition/dos.c
+@@ -31,7 +31,7 @@ _name(struct lib_context *lc, struct rai
+ {
+ 	const char *base = get_basename(lc, rd->di->path);
+ 
+-	return type ? snprintf(str, len, "%s%s%u", base, OPT_STR_PARTCHAR(lc),
++	return type ? snprintf(str, len, "%s%u", base,
+ 			       partition) : snprintf(str, len, "%s", base);
+ }
+