Source Mage code commit list

[Treeve Jelbert <scm AT sourcemage.org>]

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

 dev/null                   |binary
 devel/git/HISTORY          |    3 +++
 devel/git/PRE_BUILD        |    4 ++++
 libs/re2/DETAILS           |    4 ++--
 libs/re2/HISTORY           |    3 +++
 net/iputils-base/CONFIGURE |    2 +-
 net/iputils-base/CONFLICTS |    1 +
 net/iputils-base/DETAILS   |    4 ++--
 net/iputils-base/HISTORY   |    5 +++++
 net/iputils-base/INSTALL   |    2 +-
 10 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 85995cbbd8043b5f76722c96c4eece9ecc8b220c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    git - avoid segfault with gettext-tiny

commit a6a5cb6d4cc03a8b6170e2713a91c705180be963
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    re2: => 2019-07-01

commit 964bb83d1b22d1c07b3270973f448d76170e11e3
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    iputils-base: => 20151218

diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index a3c54ef..6eb9f0d 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2019-07-07 Treeve Jelbert <treeve AT sourcemage.org>
+       * PRE_BUILD: avoid segfault with gettext-tiny
+
 2019-06-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.22.0
 
diff --git a/devel/git/PRE_BUILD b/devel/git/PRE_BUILD
index 9fc6f1b..bb54013 100755
--- a/devel/git/PRE_BUILD
+++ b/devel/git/PRE_BUILD
@@ -27,4 +27,8 @@ fi &&
 
 if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
   new_unpack "5"
+fi &&
+if ! is_depends_enabled $SPELL gettext;then
+# these cause a segfault with gettext-tiny
+  rm po/{ca,el,ru}.po
 fi
diff --git a/libs/re2/DETAILS b/libs/re2/DETAILS
index 6302546..357e00c 100755
--- a/libs/re2/DETAILS
+++ b/libs/re2/DETAILS
@@ -1,7 +1,7 @@
 source $GRIMOIRE/CMAKE_FUNCTIONS
            SPELL=re2
-         VERSION=2019-06-01
-     
SOURCE_HASH=sha512:ba7e4c605625b5d0f3fad3df2d23b6b820d107dfb606157df7ec35820c25be1057b9c1320358594e59e003ee0eb83d3b31b7328ad47a1dd6c24a119590c268e3
+         VERSION=2019-07-01
+     
SOURCE_HASH=sha512:a41c6b2a14e3a26d86c75dfd7228c01318f49a6776a3b7c478bd1cfbfb7ad24cfb0ce52982b2e9af4361c6a8b20a01afa58bf7d165e0acc61bd89d7e327e40ad
           SOURCE=$SPELL-v$VERSION.tar.gz
 SOURCE_URL=https://github.com/google/re2/archive/$VERSION.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
diff --git a/libs/re2/HISTORY b/libs/re2/HISTORY
index 3b0b8f4..6a57515 100644
--- a/libs/re2/HISTORY
+++ b/libs/re2/HISTORY
@@ -1,3 +1,6 @@
+2019-07-06 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2019-07-01
+
 2019-06-02 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2019-06-01
 
diff --git a/net/iputils-base/CONFIGURE b/net/iputils-base/CONFIGURE
index 80ae426..f559a89 100755
--- a/net/iputils-base/CONFIGURE
+++ b/net/iputils-base/CONFIGURE
@@ -6,5 +6,5 @@ config_query "IPUTILS_RARPD" "Install rarpd?" y        &&
 config_query "IPUTILS_TPATH" "Install tracepath?" y    &&
 config_query "IPUTILS_TPATH6" "Install tracepath6?" y  &&
 config_query "IPUTILS_TROUTE" "Install traceroute6?" y && 
-config_query "IPUTILS_TFTP" "Install tftpd?" y         &&
+config_query "IPUTILS_TFTPD" "Install tftpd?" y         &&
 config_query "IPUTILS_RDISC" "Install rdisc?" y   
diff --git a/net/iputils-base/CONFLICTS b/net/iputils-base/CONFLICTS
index 4d8c934..8bc67dc 100755
--- a/net/iputils-base/CONFLICTS
+++ b/net/iputils-base/CONFLICTS
@@ -3,3 +3,4 @@ conflicts netkit-ping
 conflicts netkit-tftp
 conflicts iputils-ping
 conflicts iputils-tracepath
+conflicts tftp-hpa
diff --git a/net/iputils-base/DETAILS b/net/iputils-base/DETAILS
index bac3899..4e05144 100755
--- a/net/iputils-base/DETAILS
+++ b/net/iputils-base/DETAILS
@@ -1,11 +1,11 @@
            SPELL=iputils-base
-         VERSION=20100418
+         VERSION=20151218
+     
SOURCE_HASH=sha512:4bf0eed0ae5603e872afb0e09be039df3822a7723e8cbb8cbe578d69d8c457ffac9bdbe2eb17b32c95968e5e4ad6204af955617482c5701671f0f476b560b65c
           SOURCE=iputils-s${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/iputils-s${VERSION}
    SOURCE_URL[0]=http://www.skbuff.net/iputils/${SOURCE}
         
WEB_SITE=http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils
          ENTERED=20030509
-      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
       LICENSE[0]=GPL
             DOCS="README"
         KEYWORDS="net"
diff --git a/net/iputils-base/HISTORY b/net/iputils-base/HISTORY
index 2171974..6baa2a1 100644
--- a/net/iputils-base/HISTORY
+++ b/net/iputils-base/HISTORY
@@ -1,3 +1,8 @@
+2019-07-05 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 20151218
+       * CONFLICTS: add tftp-hpa
+       * CONFIGURE: fix typo
+
 2011-10-23 Tommy Boatman <tboatman AT sourcemage.org>
        * INSTALL: fixed ping6 install
 
diff --git a/net/iputils-base/INSTALL b/net/iputils-base/INSTALL
index 537ccb8..da5a4e1 100755
--- a/net/iputils-base/INSTALL
+++ b/net/iputils-base/INSTALL
@@ -54,7 +54,7 @@ if is_depends_enabled $SPELL opensp ; then
   if [ "$IPUTILS_TROUTE6" == "y" ]; then
      install  -m 644  doc/traceroute6.8  
$INSTALL_ROOT/usr/share/man/man8/traceroute6.8
   fi  &&
-  if [ "$IPUTILS_TFTPD" == "y" ]; then
+  if [ "$IPUTILS_TFTP" == "y" ]; then
      install  -m 644  doc/tftpd.8  $INSTALL_ROOT/usr/share/man/man8/tftpd.8
   fi  &&
   if [ "$IPUTILS_RDISC" == "y" ]; then
diff --git a/net/iputils-base/iputils-s20100418.tar.bz2.sig 
b/net/iputils-base/iputils-s20100418.tar.bz2.sig
deleted file mode 100644
index 2712334..0000000
Binary files a/net/iputils-base/iputils-s20100418.tar.bz2.sig and /dev/null 
differ