Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 disk/dmapi/HISTORY       |    4 ++++
 disk/dmapi/PRE_BUILD     |    4 ++++
 disk/dmapi/headers.patch |   12 ++++++++++++
 disk/xfsdump/DETAILS     |    2 +-
 disk/xfsdump/HISTORY     |    4 ++++
 disk/xfsdump/PRE_BUILD   |    4 +---
 disk/xfsprogs/BUILD      |    4 +---
 disk/xfsprogs/DEPENDS    |    5 +++++
 disk/xfsprogs/DETAILS    |    2 +-
 disk/xfsprogs/HISTORY    |    6 ++++++
 disk/xfsprogs/INSTALL    |    4 +---
 11 files changed, 40 insertions(+), 11 deletions(-)

New commits:
commit 375f210ce48311a46e66244a50d1436180014ff1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    xfsdump: => 3.1.6

commit b5008607831495a8f5e9e6684d4120ee5b5ed207
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    dmapi: fixed build with recent xfsprogs

commit edd0e1e96ffd34d4dc860a2dec1afdfc4ab531c4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    xfsprogs: => 4.5.0

diff --git a/disk/dmapi/HISTORY b/disk/dmapi/HISTORY
index 2c044cd..edd2156 100644
--- a/disk/dmapi/HISTORY
+++ b/disk/dmapi/HISTORY
@@ -1,3 +1,7 @@
+2016-07-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * PRE_BUILD: apply patch
+       * headers.patch: fixed build with recent xfsprogs
+
 2012-12-16 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.2.12
          converted to upstream signature checking
diff --git a/disk/dmapi/PRE_BUILD b/disk/dmapi/PRE_BUILD
new file mode 100755
index 0000000..9901e4e
--- /dev/null
+++ b/disk/dmapi/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p0 < "${SPELL_DIRECTORY}/headers.patch"
diff --git a/disk/dmapi/headers.patch b/disk/dmapi/headers.patch
new file mode 100644
index 0000000..ee955eb
--- /dev/null
+++ b/disk/dmapi/headers.patch
@@ -0,0 +1,12 @@
+--- libdm/dm_handle2path.c.orig
++++ libdm/dm_handle2path.c
+@@ -20,6 +20,9 @@
+ #include <dmapi_kern.h>
+ #include "dmapi_lib.h"
+ 
++#include <fcntl.h> /* open */
++#include <unistd.h> /* close */
++#include <string.h> /* strlen */
+ #include <mntent.h>
+ #include <dirent.h>
+ #ifdef linux
diff --git a/disk/xfsdump/DETAILS b/disk/xfsdump/DETAILS
index af984fa..757e95c 100755
--- a/disk/xfsdump/DETAILS
+++ b/disk/xfsdump/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xfsdump
-         VERSION=3.1.4
+         VERSION=3.1.6
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/xfsdump/HISTORY b/disk/xfsdump/HISTORY
index 40a09a5..2914994 100644
--- a/disk/xfsdump/HISTORY
+++ b/disk/xfsdump/HISTORY
@@ -1,3 +1,7 @@
+2016-07-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.1.6
+       * PRE_BUILD: dropped autoconf, no longer needed
+
 2015-01-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 3.1.4
 
diff --git a/disk/xfsdump/PRE_BUILD b/disk/xfsdump/PRE_BUILD
index 46af1fc..77b906e 100755
--- a/disk/xfsdump/PRE_BUILD
+++ b/disk/xfsdump/PRE_BUILD
@@ -1,6 +1,4 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-patch -p0 < "$SPELL_DIRECTORY/symlink.patch" &&
-
-autoconf
+patch -p0 < "$SPELL_DIRECTORY/symlink.patch"
diff --git a/disk/xfsprogs/BUILD b/disk/xfsprogs/BUILD
index bdb22e5..04f39e2 100755
--- a/disk/xfsprogs/BUILD
+++ b/disk/xfsprogs/BUILD
@@ -7,6 +7,4 @@ OPTS="DEBUG=-DNDEBUG \
   --sbindir=$DEFAULT_ROOT/sbin \
   $OPTS" &&
 
-OPTIMIZER=$CFLAGS make_single &&
-default_build &&
-make_normal
+OPTIMIZER=$CFLAGS default_build
diff --git a/disk/xfsprogs/DEPENDS b/disk/xfsprogs/DEPENDS
index 841ec37..aad7435 100755
--- a/disk/xfsprogs/DEPENDS
+++ b/disk/xfsprogs/DEPENDS
@@ -7,6 +7,11 @@ optional_depends gettext \
                  "--disable-gettext" \
                  "for alternate language support" &&
 
+optional_depends util-linux \
+                 "--enable-blkid" \
+                 "--disable-blkid" \
+                 "to use block device id library" &&
+
 optional_depends readline \
                  "--enable-readline" \
                  "--disable-readline" \
diff --git a/disk/xfsprogs/DETAILS b/disk/xfsprogs/DETAILS
index 5ca1f07..ce7647f 100755
--- a/disk/xfsprogs/DETAILS
+++ b/disk/xfsprogs/DETAILS
@@ -1,5 +1,5 @@
            SPELL=xfsprogs
-         VERSION=3.2.2
+         VERSION=4.5.0
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.sig
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/disk/xfsprogs/HISTORY b/disk/xfsprogs/HISTORY
index 87ba193..9facc01 100644
--- a/disk/xfsprogs/HISTORY
+++ b/disk/xfsprogs/HISTORY
@@ -1,3 +1,9 @@
+2016-07-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.5.0
+       * DEPENDS: added util-linux for blkid support
+       * BUILD, INSTALL: dropped make_single, seems to be fixed by upstream;
+         dropped outdated target
+
 2015-01-02 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 3.2.2
 
diff --git a/disk/xfsprogs/INSTALL b/disk/xfsprogs/INSTALL
index 7f0b31f..c60ac81 100755
--- a/disk/xfsprogs/INSTALL
+++ b/disk/xfsprogs/INSTALL
@@ -1,3 +1 @@
-make_single &&
-make install install-dev install-qa &&
-make_normal
+make install install-dev