Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 ChangeLog           |    3 +++
 devel/git/DETAILS   |   27 ++++++++++++---------------
 devel/git/HISTORY   |    3 +++
 devel/git/PRE_BUILD |   28 ++++++++++++++++++++++++----
 kernel.gpg          |binary
 5 files changed, 42 insertions(+), 19 deletions(-)

New commits:
commit 0eb76074cb58faec0f2102efad6cdb71a1072a96
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/git: switched to gpg checking

commit 8c75ab74e671a0c3c2483fc79510906ff8f8eaee
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    kernel.gpg: added Junio C Hamano's key

diff --git a/ChangeLog b/ChangeLog
index 6f4931e..e376310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-12-29 Pavel Vinogradov <public AT sourcemage.org>
+       * kernel.gpg: new key, 96AFE6CB, Junio C Hamano <gitster AT pobox.com>
+
 2017-12-27 Vlad Glagolev <stealth AT sourcemage.org>
        * utils/2fa: new spell, two-factor authentication on the command line
 
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 54ada5c..aef8a99 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,31 +1,28 @@
            SPELL="git"
          VERSION="2.15.1"
-     
SOURCE_HASH="sha512:dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b"
   SECURITY_PATCH="7"
           SOURCE="${SPELL}-${VERSION}.tar.xz"
-#        SOURCE2="${SOURCE}.sign"
-#     SOURCE_GPG="kernel.gpg:${SOURCE}.sign:UPSTREAM_KEY"
+         SOURCE2="${SOURCE%.xz}.sign"
+      SOURCE_GPG="kernel.gpg:${SOURCE2}:UPSTREAM_KEY"
          GIT_URI="${KERNEL_URL}/pub/software/scm/git"
       SOURCE_URL="${GIT_URI}/${SOURCE}"
-#    SOURCE2_URL="${GIT_URI}/${SOURCE2}"
-# SOURCE2_IGNORE="signature"
+     SOURCE2_URL="${GIT_URI}/${SOURCE2}"
+  SOURCE2_IGNORE="signature"
 if [[ "${GIT_DOC}" == "manpages" || "${GIT_DOC}" == "both" ]]; then
          SOURCE3="${SPELL}-manpages-${VERSION}.tar.xz"
-#        SOURCE4="${SOURCE3}.sign"
-#    SOURCE3_GPG="kernel.gpg:${SOURCE3}.sign:UPSTREAM_KEY"
-    
SOURCE3_HASH="sha512:de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18"
+         SOURCE4="${SOURCE3%.xz}.sign"
+     SOURCE3_GPG="kernel.gpg:${SOURCE4}:UPSTREAM_KEY"
      SOURCE3_URL="${GIT_URI}/${SOURCE3}"
-#    SOURCE4_URL="${GIT_URI}/${SOURCE4}"
-# SOURCE4_IGNORE="signature"
+     SOURCE4_URL="${GIT_URI}/${SOURCE4}"
+  SOURCE4_IGNORE="signature"
 fi
 if [[ "${GIT_DOC}" == "htmldocs" || "${GIT_DOC}" == "both" ]]; then
          SOURCE5="${SPELL}-htmldocs-${VERSION}.tar.xz"
-#        SOURCE6="${SOURCE5}.sign"
-#    SOURCE5_GPG="kernel.gpg:${SOURCE5}.sign:UPSTREAM_KEY"
-    
SOURCE5_HASH="sha512:50e53b506c17b046c42a8d9f888741b1f408fb7bb566d981ad6dcda3383f1d310008732a849b4755e7233dc83477f354e9c6d5d4e1fcf0e81af54d49153e8c34"
+         SOURCE6="${SOURCE5%.xz}.sign"
+     SOURCE5_GPG="kernel.gpg:${SOURCE6}:UPSTREAM_KEY"
      SOURCE5_URL="${GIT_URI}/${SOURCE5}"
-#    SOURCE6_URL="${GIT_URI}/${SOURCE6}"
-# SOURCE6_IGNORE="signature"
+     SOURCE6_URL="${GIT_URI}/${SOURCE6}"
+  SOURCE6_IGNORE="signature"
 fi
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
       LICENSE[0]="GPL"
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index cedc594..3838740 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2017-12-29 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS, PRE_BUILD: switched to gpg checking
+
 2017-11-29 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 2.15.1
 
diff --git a/devel/git/PRE_BUILD b/devel/git/PRE_BUILD
index d0f73c7..9184efb 100755
--- a/devel/git/PRE_BUILD
+++ b/devel/git/PRE_BUILD
@@ -1,10 +1,30 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+function new_unpack()
+{
+  local sourcefile="SOURCE${1}" &&
+
+  message "${MESSAGE_COLOR}unxz 
${SOURCE_CACHE}/${!sourcefile}${DEFAULT_COLOR}" &&
+  unxz -k "${SOURCE_CACHE}/${!sourcefile}" &&
+  eval "SOURCE${1}=${!sourcefile%.xz}" &&
+  unpack_file "${1}" &&
+
+  message "${MESSAGE_COLOR}rm 
${SOURCE_CACHE}/${!sourcefile}${DEFAULT_COLOR}" &&
+  rm "${SOURCE_CACHE}/${!sourcefile}" &&
+
+  eval "SOURCE${1}=${!sourcefile}.xz"
+}
+
+cd "${BUILD_DIRECTORY}" &&
+
+mk_source_dir "${SOURCE_DIRECTORY}" &&
+
+new_unpack "" &&
+
+cd "${SOURCE_DIRECTORY}" &&
 
 if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
-  unpack_file 3
+  new_unpack "3"
 fi &&
 
 if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
-  unpack_file 5
+  mew_unpack "5"
 fi
diff --git a/kernel.gpg b/kernel.gpg
index 461fd49..4b53b0f 100644
Binary files a/kernel.gpg and b/kernel.gpg differ