Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 ChangeLog                                           |    3 +
 crypto/keepassxc/0001-fix-build-with-gcc-8.patch    |   24 +++++++++++++++
 crypto/keepassxc/DEPENDS                            |    7 ++--
 crypto/keepassxc/DETAILS                            |    4 +-
 crypto/keepassxc/HISTORY                            |    5 +++
 crypto/keepassxc/PRE_BUILD                          |    5 +++
 crypto/libargon2/BUILD                              |    1 
 crypto/libargon2/DETAILS                            |   31 
++++++++++++++++++++
 crypto/libargon2/HISTORY                            |    3 +
 utils/psmisc/0001-fix-linking-with-glibc-2.28.patch |   25 ++++++++++++++++
 utils/psmisc/HISTORY                                |    3 +
 utils/psmisc/PRE_BUILD                              |    5 +++
 12 files changed, 111 insertions(+), 5 deletions(-)

New commits:
commit fed3d2e6b574ab75904735eaf3934a394fcaf278
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/keepassxc: version 2.3.3

commit 5573a87ec4a691b1ff13a18135f4027a8561519a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    crypto/libargon2: new spell, a password-hashing library

commit ad2b55e04793709d2065807472ddd454db32bdee
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    utils/psmisc: fix build with glibc 2.28

diff --git a/ChangeLog b/ChangeLog
index 602eb5f..6a80291 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * crypto/libargon2: new spell, a password-hashing library
+
 2018-08-03 Treeve Jelbert <treeve AT sourcemage.org>
        * graphics-libs/mesa: added
          rewritten spell for mesa, using meson build ststem - much faster 
build
diff --git a/crypto/keepassxc/0001-fix-build-with-gcc-8.patch 
b/crypto/keepassxc/0001-fix-build-with-gcc-8.patch
new file mode 100644
index 0000000..796fc90
--- /dev/null
+++ b/crypto/keepassxc/0001-fix-build-with-gcc-8.patch
@@ -0,0 +1,24 @@
+From 3eb58af3579a17cce7b319b9baea7e98e7fc1d94 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 6 Aug 2018 22:50:06 +0200
+Subject: [PATCH] fix build with gcc 8
+
+---
+ src/gui/entry/EditEntryWidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/entry/EditEntryWidget.cpp 
b/src/gui/entry/EditEntryWidget.cpp
+index 6fd65c1..683ee77 100644
+--- a/src/gui/entry/EditEntryWidget.cpp
++++ b/src/gui/entry/EditEntryWidget.cpp
+@@ -32,6 +32,7 @@
+ #include <QMimeData>
+ #include <QEvent>
+ #include <QColorDialog>
++#include <QButtonGroup>
+ 
+ #include "autotype/AutoType.h"
+ #include "core/Config.h"
+-- 
+2.18.0
+
diff --git a/crypto/keepassxc/DEPENDS b/crypto/keepassxc/DEPENDS
index ce7f3c8..fa45408 100755
--- a/crypto/keepassxc/DEPENDS
+++ b/crypto/keepassxc/DEPENDS
@@ -1,10 +1,11 @@
 depends -sub CXX gcc &&
-depends qtbase       &&
-depends qttools      &&
 depends cmake        &&
+depends libargon2    &&
 depends libgcrypt    &&
-depends zlib         &&
 depends patchelf     &&
+depends qtbase       &&
+depends qttools      &&
+depends zlib         &&
 
 optional_depends libxtst '' '' 'for auto-type support' &&
 if is_depends_enabled $SPELL libxtst; then
diff --git a/crypto/keepassxc/DETAILS b/crypto/keepassxc/DETAILS
index 769e613..2c65ed8 100755
--- a/crypto/keepassxc/DETAILS
+++ b/crypto/keepassxc/DETAILS
@@ -1,8 +1,8 @@
            SPELL=keepassxc
-         VERSION=2.2.4
+         VERSION=2.3.3
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    
SOURCE_URL[0]=https://github.com/keepassxreboot/${SPELL}/archive/${VERSION}.tar.gz
-     
SOURCE_HASH=sha512:f3308138d63b65a8b384a52f4723507be921d7bbf19031724886fcd12266bf2683326f5531c8f665b0e98ff63cd97251694199ef748191e59a5a8cceb3710025
+     
SOURCE_HASH=sha256:cfff85ef89ba590aec798c59bea4aa3db00626d7bff8cdde0f62ee34aea60ad5:UPSTREAM_HASH
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="https://keepassxc.org/";
       LICENSE[0]=GPL
diff --git a/crypto/keepassxc/HISTORY b/crypto/keepassxc/HISTORY
index 3fff33a..511528f 100644
--- a/crypto/keepassxc/HISTORY
+++ b/crypto/keepassxc/HISTORY
@@ -1,3 +1,8 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.3.3
+       * 0001-fix-build-with-gcc-8.patch, PRE_BUILD: fix build with gcc 8
+       * DEPENDS: add dependency on libargon2
+
 2018-03-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: depend on qttools
 
diff --git a/crypto/keepassxc/PRE_BUILD b/crypto/keepassxc/PRE_BUILD
new file mode 100755
index 0000000..41b987a
--- /dev/null
+++ b/crypto/keepassxc/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-build-with-gcc-8.patch"
+
diff --git a/crypto/libargon2/BUILD b/crypto/libargon2/BUILD
new file mode 100755
index 0000000..6dfecc1
--- /dev/null
+++ b/crypto/libargon2/BUILD
@@ -0,0 +1 @@
+default_build_make
diff --git a/crypto/libargon2/DETAILS b/crypto/libargon2/DETAILS
new file mode 100755
index 0000000..f900d31
--- /dev/null
+++ b/crypto/libargon2/DETAILS
@@ -0,0 +1,31 @@
+           SPELL=libargon2
+         VERSION=20171227
+          SOURCE="$SPELL-$VERSION.tar.gz"
+   
SOURCE_URL[0]=https://github.com/P-H-C/phc-winner-argon2/archive/${VERSION}.tar.gz
+     
SOURCE_HASH=sha512:9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/phc-winner-argon2-20171227"
+        WEB_SITE="https://github.com/p-h-c/phc-winner-argon2";
+      LICENSE[0]=CC0 or Apache
+         ENTERED=20180806
+           SHORT="a password hashing function"
+cat << EOF
+Argon2 is a password-hashing function that summarizes the state of the art
+in the design of memory-hard functions and can be used to hash passwords
+for credential storage, key derivation, or other applications.
+
+It has a simple design aimed at the highest memory filling rate and effective
+use of multiple computing units, while still providing defense against
+tradeoff attacks (by exploiting the cache and memory organization of the 
recent
+         processors).
+
+Argon2 has three variants: Argon2i, Argon2d, and Argon2id. Argon2d is faster
+and uses data-depending memory access, which makes it highly resistant
+against GPU cracking attacks and suitable for applications with no threats
+from side-channel timing attacks (eg. cryptocurrencies). Argon2i instead uses
+data-independent memory access, which is preferred for password hashing and
+password-based key derivation, but it is slower as it makes more passes over
+the memory to protect from tradeoff attacks. Argon2id is a hybrid of Argon2i
+and Argon2d, using a combination of data-depending and data-independent
+memory accesses, which gives some of Argon2i's resistance to side-channel
+cache timing attacks and much of Argon2d's resistance to GPU cracking 
attacks.
+EOF
diff --git a/crypto/libargon2/HISTORY b/crypto/libargon2/HISTORY
new file mode 100644
index 0000000..ea074bf
--- /dev/null
+++ b/crypto/libargon2/HISTORY
@@ -0,0 +1,3 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * BUILD, DETAILS: spell created
+
diff --git a/utils/psmisc/0001-fix-linking-with-glibc-2.28.patch 
b/utils/psmisc/0001-fix-linking-with-glibc-2.28.patch
new file mode 100644
index 0000000..bd36904
--- /dev/null
+++ b/utils/psmisc/0001-fix-linking-with-glibc-2.28.patch
@@ -0,0 +1,25 @@
+From 7e2e8428e5998a5ea54ed43f81e13a1f2fa92fd1 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Mon, 6 Aug 2018 22:31:39 +0200
+Subject: [PATCH] fix linking with glibc 2.28
+
+---
+ src/fuser.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/fuser.c b/src/fuser.c
+index b485f65..997bbcc 100644
+--- a/src/fuser.c
++++ b/src/fuser.c
+@@ -49,6 +49,8 @@
+ #include <getopt.h>
+ #include <setjmp.h>
+ #include <limits.h>
++#include <sys/sysmacros.h>
++
+ /* MAXSYMLINKS is a BSDism.  If it doesn't exist, fall back to SYMLINK_MAX,
+    which is the POSIX name. */
+ #ifndef MAXSYMLINKS
+-- 
+2.18.0
+
diff --git a/utils/psmisc/HISTORY b/utils/psmisc/HISTORY
index 7590d05..c195ee2 100644
--- a/utils/psmisc/HISTORY
+++ b/utils/psmisc/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, 0001-fix-linking-with-glibc-2.28.patch: fix build with 
glibc 2.28
+
 2016-04-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 22.21
 
diff --git a/utils/psmisc/PRE_BUILD b/utils/psmisc/PRE_BUILD
new file mode 100755
index 0000000..82da78f
--- /dev/null
+++ b/utils/psmisc/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build      &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-fix-linking-with-glibc-2.28.patch"
+