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>:

 devel/git-cola/DETAILS |    4 ++--
 devel/git-cola/HISTORY |    3 +++
 devel/git/DETAILS      |    8 ++++----
 devel/git/HISTORY      |    5 ++++-
 ftp/lftp/DETAILS       |    2 +-
 ftp/lftp/HISTORY       |    4 ++++
 ftp/lftp/gets.patch    |   19 ++++++++++++++++---
 7 files changed, 34 insertions(+), 11 deletions(-)

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

    devel/git: version 2.5.2

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

    devel/git-cola: version 2.3

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

    ftp/lftp: version 4.6.4

diff --git a/devel/git-cola/DETAILS b/devel/git-cola/DETAILS
index d6c5140..4744bf4 100755
--- a/devel/git-cola/DETAILS
+++ b/devel/git-cola/DETAILS
@@ -1,8 +1,8 @@
            SPELL=git-cola
-         VERSION=2.1.2
+         VERSION=2.3
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://github.com/${SPELL}/${SPELL}/archive/v${VERSION}.tar.gz
-     
SOURCE_HASH=sha512:79eae7937db148cde22b3d5dc1564180c3919965c35c11853270525be4eb19c7f223ddc215ba8122ed8bcb70e0e6ec57948f1e02aeeae1a9c3e7c98efef1e42d
+     
SOURCE_HASH=sha512:2be0e971cd23aa0a1f8ec92ffd05f64cdd0ee34fb1e3c9bd3a98df0556968e9613d6494002e973db8de8ab389c48205ab1db42823d46e523c24a029cf25e3023
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://git-cola.github.com/";
       LICENSE[0]=GPL
diff --git a/devel/git-cola/HISTORY b/devel/git-cola/HISTORY
index b8cff33..4554d0e 100644
--- a/devel/git-cola/HISTORY
+++ b/devel/git-cola/HISTORY
@@ -1,3 +1,6 @@
+2015-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.3
+
 2015-03-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.1.2
 
diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 9bf1575..648d243 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,6 +1,6 @@
            SPELL=git
-         VERSION=2.5.0
-     
SOURCE_HASH=sha512:ef7538c9f5ba5b2ac08962401c30e5fd51323b54b9fb5315d259adccec346e8fae9362815832dc2b5ce63a259b315c40e419bb2385dde04d84b992e62f6789b6
+         VERSION=2.5.2
+     
SOURCE_HASH=sha512:b553aa521ac43c33323fc9ceed084a411fb5924ee48f6f30808152dd1185f36d339678788d05d8e62099d496be22a4b6b0242529505cff702884c394e13c58aa
   SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.xz
 #         SOURCE2=$SOURCE.sign
@@ -12,7 +12,7 @@ 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:b3a5f2e8107c529ce81c1570a82472195e205ff1a8ddc75f4f0cbbf25f37a916700156df4418888c8a8a153ab58d5507a31027fb31faadeb5d4ba242847ab28d
+    
SOURCE3_HASH=sha512:f9a9d9f4d96c19550702ac7eaa94a9308e1c7b39e1290baf81ab74709398db97261a884d8e9e1c71c899dd17cc485fede276c25c601cf7dfa6384b18170915a1
      SOURCE3_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE3
 #     SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
 #  SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ 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:921ae8dd482719912f79f5affb6fa239290a954fb40625ac9fae2edf902989e5126ae7ca5c367b2b55c5387fb3cc3035ddf4e8b360743dbdee0f1b55ec33653c
+    
SOURCE5_HASH=sha512:5276e5aa82845d7a661a2f79d54d1b3e7a95f95220bd4b855cf8c6c13ed456d8c80682c3ccae280317172c515733968a0a61758e3a634a8f1b1a08a6e43f04fb
      SOURCE5_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE5
 #     SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
 #  SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index 4a426b6..2a0434a 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,4 +1,7 @@
-2016-08-01 Treeve Jelbert <treeve AT sourcemage.org>
+2015-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.5.2
+
+2015-08-01 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.5.0
 
 2015-07-22 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/ftp/lftp/DETAILS b/ftp/lftp/DETAILS
index 776d398..f37d863 100755
--- a/ftp/lftp/DETAILS
+++ b/ftp/lftp/DETAILS
@@ -1,5 +1,5 @@
            SPELL=lftp
-         VERSION=4.6.1
+         VERSION=4.6.4
           SOURCE=$SPELL-$VERSION.tar.xz
          SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/lftp/HISTORY b/ftp/lftp/HISTORY
index 4c23717..b23c822 100644
--- a/ftp/lftp/HISTORY
+++ b/ftp/lftp/HISTORY
@@ -1,3 +1,7 @@
+2015-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4.6.4
+       * gets.patch: regenerate patch
+
 2015-01-08 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS, DEPENDS: Fixed SOURCE_URL[0]
          Updated spell to 4.6.1
diff --git a/ftp/lftp/gets.patch b/ftp/lftp/gets.patch
index b0a6fbb..6715253 100644
--- a/ftp/lftp/gets.patch
+++ b/ftp/lftp/gets.patch
@@ -1,16 +1,29 @@
+From d8cb49a7029cd09f8f7a9bd49259fb5db61cf41f Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sun, 13 Sep 2015 11:16:32 +0200
+Subject: [PATCH] fix build against glibc >= 2.16
 
+---
+ lib/stdio.in.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/stdio.in.h b/lib/stdio.in.h
+index ec43874..ab445a1 100644
 --- a/lib/stdio.in.h
 +++ b/lib/stdio.in.h
-@@ -702,10 +702,12 @@
+@@ -722,10 +722,12 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
  /* It is very rare that the developer ever has full control of stdin,
     so any use of gets warrants an unconditional warning; besides, C11
     removed it.  */
 +#ifdef gets
  #undef gets
- #if HAVE_RAW_DECL_GETS
+ #if HAVE_RAW_DECL_GETS && !defined __cplusplus
  _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
  #endif
 +#endif
  
- 
  #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
+ struct obstack;
+-- 
+2.5.0
+