Source Mage code commit list

[Eric Sandall <scm AT sourcemage.org>]

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

 disk/btrfs-progs/DETAILS   |   10 ++++++++--
 disk/btrfs-progs/HISTORY   |    6 ++++++
 disk/btrfs-progs/PRE_BUILD |   18 +++++++++++++++++-
 disk/btrfs-progs/btrfs.gpg |binary
 4 files changed, 31 insertions(+), 3 deletions(-)

New commits:
commit 98a9dacafda87401847e50d22884472b740b5e8f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    btrfs-progs: Updated to 4.11
    
    Source matches upstream has per 
https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
    btrfs.gpg: Per https://github.com/kdave/btrfs-progs
    Verify uncompressed SOURCE with GPG, then proceed.

diff --git a/disk/btrfs-progs/DETAILS b/disk/btrfs-progs/DETAILS
index 89ae84c..65d7d01 100755
--- a/disk/btrfs-progs/DETAILS
+++ b/disk/btrfs-progs/DETAILS
@@ -8,12 +8,18 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
 else
-         VERSION=4.8.3
+         VERSION=4.11
           SOURCE=${SPELL}-v${VERSION}.tar.xz
-     
SOURCE_HASH=sha256:c1a60c317d2fcaf8420779d2d0717ae53882c2bc22bc44e3bdcd5efb7ca68ef2
+#     
SOURCE_HASH=sha256:e17a68cc52a27d905b715445e91ddbaa4d42de4847d54836d6ed21e012dabf0e
+         SOURCE2=${SPELL}-v${VERSION}.tar.sign
+      SOURCE_GPG="btrfs.gpg:${SOURCE2}:UPSTREAM_HASH"
    
SOURCE_URL[0]=${KERNEL_URL}/pub/linux/kernel/people/kdave/${SPELL}/${SOURCE}
    SOURCE_URL[1]=http://ftp.sourcemage.us/mirror/${SOURCE}
    SOURCE_URL[2]=http://download.sourcemage.org/distro/${SOURCE}
+  
SOURCE2_URL[0]=${KERNEL_URL}/pub/linux/kernel/people/kdave/${SPELL}/${SOURCE2}
+  SOURCE2_URL[1]=http://ftp.sourcemage.us/mirror/${SOURCE2}
+  SOURCE2_URL[2]=http://download.sourcemage.org/distro/${SOURCE2}
+  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-v${VERSION}"
 fi
         WEB_SITE=http://btrfs.wiki.kernel.org/
diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index 81d7219..e5118fe 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,9 @@
+2017-05-22 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 4.11
+         Source matches upstream has per 
https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
+       * btrfs.gpg: Per https://github.com/kdave/btrfs-progs
+       * PRE_BUILD: Verify uncompressed SOURCE with GPG, then proceed.
+
 2016-11-14 Eric Sandall <sandalle AT sourcemage.org>
        * DETAILS: Updated to 4.8.3
          No longer installs udev rules on udev < 190
diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
index 66e1aa3..e86337e 100755
--- a/disk/btrfs-progs/PRE_BUILD
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -1,4 +1,20 @@
-default_pre_build &&
+mk_source_dir "${SOURCE_DIRECTORY}"  &&
+# Make sure our target doesn't exist before uncompressing
+if [[ -f "${SOURCE_CACHE}/${SOURCE/.xz}" ]]; then
+  rm "${SOURCE_CACHE}/${SOURCE/.xz}"
+fi  &&
+unxz -k "${SOURCE_CACHE}/${SOURCE}"  &&
+
+# Fake new SOURCE for unpack_file and verify_file
+cd "${BUILD_DIRECTORY}"  &&
+SOURCE=${SOURCE/.xz}     &&
+verify_file ''           &&
+unpack_file ''           &&
+
+# Clean up
+message "${MESSAGE_COLOR}Removing temporary 
${SOURCE_CACHE}/${SOURCE}...${DEFAULT_COLOR}"  &&
+rm "${SOURCE_CACHE}/${SOURCE}" &&
+
 cd "$SOURCE_DIRECTORY" &&
 
 if [[ "$BTRFS_PROGS_BRANCH" == scm ]]; then
diff --git a/disk/btrfs-progs/btrfs.gpg b/disk/btrfs-progs/btrfs.gpg
new file mode 100644
index 0000000..dbe2c5d
Binary files /dev/null and b/disk/btrfs-progs/btrfs.gpg differ