Merge remote-tracking branch 'upstream/master'

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

docx2txt/PKGBUILD

@@ -0,0 +1,22 @@
+# Maintainer: Matthias Aßhauer <mha1993@live.de>
+
+_realname=docx2txt
+
+pkgname=("${_realname}")
+pkgver=1.4
+pkgrel=1
+pkgdesc="docx2txt is a perl based command line utility to convert Microsoft Office(Tm) Docx documents to equivalent Text documents."
+arch=('i686' 'x86_64')
+license=('GPL3+')
+url="http://${_realname}.sourceforge.net/"
+source=("http://sourceforge.net/projects/${_realname}/files/${_realname}/v${pkgver}/${_realname}-${pkgver}.tgz/download")
+sha1sums=('a23f83ec5e1d479888815255e81063c02c932c2f')
+provides=('${_realname}')
+depends=('perl' 'unzip')
+
+package() {
+  cd ${srcdir}/${_realname}-${pkgver}
+  make BINDIR=$pkgdir/usr/bin installbin
+  make CONFIGDIR=$pkgdir/etc installconfig
+  mv -f $pkgdir/usr/bin/docx2txt.sh $pkgdir/usr/bin/docx2txt
+}

git-flow/PKGBUILD

@@ -0,0 +1,45 @@
+# Maintainer: Johannes Schindelin <johannes.schindelin@gmx.de>
+
+_realname=git-flow
+pkgname=("${_realname}")
+pkgver=0.4.1.108.g15aab26
+pkgrel=1
+pkgdesc="Git extensions to provide high-level repository operations for Vincent Driessen's branching model"
+arch=('i686' 'x86_64')
+license=('BSD')
+depends=('git' 'util-linux')
+url="http://nvie.com/posts/a-successful-git-branching-model/"
+source=("${_realname}"::"git+https://github.com/nvie/gitflow.git#branch=develop")
+sha1sums=('SKIP')
+
+pkgver() {
+  cd "${srcdir}/${_realname}"
+
+  # Need to create sane tags to allow `git describe` to work
+  for t in $(git tag -l | grep '^[0-9]')
+  do
+    git rev-parse --quiet --verify v$t >/dev/null ||
+    git tag v$t $t^2
+  done
+
+  git describe --tags |
+  sed -e 's/^v//' -e 'y/-/./'
+}
+
+prepare () {
+  cd "${srcdir}/${_realname}"
+
+  git submodule update --init
+
+  # Make sure that gitflow-shFlags is handled properly
+  test true = "$(git config core.symlinks)" || {
+    git config core.symlinks true
+    git reset --hard
+  }
+}
+
+package() {
+  cd "${srcdir}/${_realname}"
+
+  make prefix="${pkgdir}/usr/" install
+}

git/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=git
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 pkgdesc="The fast distributed version control system"
 arch=('i686' 'x86_64')
@@ -47,7 +47,7 @@ source=("${pkgname}-${pkgver}.tar.gz"::https://github.com/git/git/archive/v${pkg
         git-1.9.0-manifest-msys2.patch
         git-1.8.4-msys2.patch
         git-2.3.5-mingw-pwd.patch)
-md5sums=('7aefd2f2f1268f2ffbf5091a3cf5c909'
+md5sums=('9f71427cc9c78d5dc21f382ac90ef423'
          'c33c9dfa2944a0de9151a7af7a63a27b'
          'f5975b367aa0979006bb07b297ef081b'
          '9f9170a30dfb7643df4948cdae5bb864'

gnutls/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase=gnutls
 pkgname=('gnutls' 'libgnutls' 'libgnutls-devel')
-pkgver=3.4.4.1
+pkgver=3.4.5
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('x86_64' 'i686')
@@ -17,9 +17,9 @@ makedepends=('gettext-devel'
              'libtasn1-devel'
              'zlib-devel')
 #optdepends=('guile: for use with Guile bindings')
-source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}
+source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v${pkgver%.*}/${pkgname}-${pkgver}.tar.xz{,.sig}
         gnutls-3.4.0-msysize.patch)
-md5sums=('474efaba6fd6c6c6c0ebac2a3f431946'
+md5sums=('f5dae0e0ecda28aab12386e6c0705d4c'
          'SKIP'
          '5a7e8599b152ecef6b1103cbf0652167')
 validpgpkeys=('0424D4EE81A0E3D119C6F835EDA21E94B565716F'

help2man/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=help2man
-pkgver=1.47.1
+pkgver=1.47.2
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('perl-Locale-Gettext' 'libintl')
 install=help2man.install
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
         1.40.4-cygwin-nls.patch)
-sha256sums=('c59b26f60cb06e45b00e729dea721e7a17220e2c17d800eb428271a750382b06'
+sha256sums=('c4c5606773e51039a06b7328ed4934913df142747a9a185d2a6ab9300d7f3f7c'
             'SKIP'
             '6cf5541d6233b6c0ce0248ecb6376682646ee56f795b19906f0acc63d83de482')
 

mercurial/PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=mercurial
-pkgver=3.5
+pkgver=3.5.1
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -11,10 +11,11 @@ groups=('VCS')
 depends=('python2')
 #optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
-source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
+source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'mercurial.profile'
         'mercurial-2.6.1-msys2.patch')
-md5sums=('3e3010e12759d3783ab7ed93de627da1'
+md5sums=('796a778075ec6358235e9258f9a54224'
+         'SKIP'
          '43e1d36564d4c7fbe9a091d3ea370a44'
          'c4fe47468f6fef63ce1c72d14307d312')
 

msys2-runtime/0001-dcrt0.cc-Untangle-allow_glob-from-winshell.patch

@@ -1,4 +1,4 @@
-From 0681f64468e3966e179abf5fbe9e6d702a7ae777 Mon Sep 17 00:00:00 2001
+From 1964c47b6ebe0b554c3f027c1734c79b92328a34 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 12:52:09 +0100
 Subject: [PATCH 1/5] dcrt0.cc: Untangle allow_glob from winshell
@@ -7,13 +7,39 @@ Otherwise if globbing is allowed and we get called from a
 Windows program, build_argv thinks we've been called from
 a Cygwin program.
 ---
- winsup/cygwin/dcrt0.cc | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
+ winsup/cygwin/dcrt0.cc | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 5bd1f1d..b7600b6 100644
+index 5bd1f1d..2dbc562 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
+@@ -157,12 +157,12 @@ isquote (char c)
+
+ /* Step over a run of characters delimited by quotes */
+ static /*__inline*/ char *
+-quoted (char *cmd, int winshell)
++quoted (char *cmd, int winshell, int glob)
+ {
+   char *p;
+   char quote = *cmd;
+
+-  if (!winshell)
++  if (!winshell || !glob)
+     {
+       char *p;
+       strcpy (cmd, cmd + 1);
+@@ -172,8 +172,8 @@ quoted (char *cmd, int winshell)
+     }
+
+   const char *s = quote == '\'' ? "'" : "\\\"";
+-  /* This must have been run from a Windows shell, so preserve
+-     quotes for globify to play with later. */
++  /* This must have been run from a Windows shell and globbing is enabled,
++     so preserve quotes for globify to play with later. */
+   while (*cmd && *++cmd)
+     if ((p = strpbrk (cmd, s)) == NULL)
+       {
 @@ -294,7 +294,7 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
  /* Build argv, argc from string passed from Windows.  */
 
@@ -23,6 +49,15 @@ index 5bd1f1d..b7600b6 100644
  {
    int argvlen = 0;
    int nesting = 0;		// monitor "nesting" from insert_file
+@@ -328,7 +328,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
+ 		 a Cygwin process, or if the word starts with a '@'.
+ 		 In this case, the insert_file function needs an unquoted
+ 		 DOS filename and globbing isn't performed anyway. */
+-	      cmd = quoted (cmd, winshell && argc > 0 && *word != '@');
++	      cmd = quoted (cmd, winshell && argc > 0 && *word != '@', glob);
+ 	    }
+ 	  if (issep (*cmd))	// End of argument if space
+ 	    break;
 @@ -354,7 +354,7 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell)
  	}
 
@@ -41,5 +76,5 @@ index 5bd1f1d..b7600b6 100644
 
        /* Convert argv[0] to posix rules if it's currently blatantly
 -- 
-2.5.0
+2.5.1
 

msys2-runtime/0002-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch

@@ -1,4 +1,4 @@
-From b918037c52b21913054f1e7b62ba8ca2d79b6ee9 Mon Sep 17 00:00:00 2001
+From 8086cdb2e8112e101e8ee934c0bf6b54db79975f Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 24 Aug 2015 00:48:06 +0100
 Subject: [PATCH 2/5] dcrt0.cc (globify): Don't quote literal strings
@@ -30,7 +30,7 @@ the expense of sensible forward-slash-containing input.
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index b7600b6..89e095e 100644
+index 2dbc562..395c8c9 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -239,10 +239,20 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
@@ -56,5 +56,5 @@ index b7600b6..89e095e 100644
  	    size_t cnt = isascii (*s) ? 1 : mbtowc (NULL, s, MB_CUR_MAX);
  	    if (cnt <= 1 || cnt == (size_t)-1)
 -- 
-2.5.0
+2.5.1
 

msys2-runtime/0003-strace.cc-Don-t-set-MSYS-noglob.patch

@@ -1,4 +1,4 @@
-From c928f9023fd5576cfc627f2b0ad31324c8241b0f Mon Sep 17 00:00:00 2001
+From a53e129f1deabd70a9ed3d5c47219fe61deda09c Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Sun, 23 Aug 2015 20:47:30 +0100
 Subject: [PATCH 3/5] strace.cc: Don't set MSYS=noglob
@@ -63,5 +63,5 @@ index 6d9d727..dc3ef55 100644
  		       NULL,	/* Security */
  		       NULL,	/* thread */
 -- 
-2.5.0
+2.5.1
 

msys2-runtime/0004-Add-debugging-for-build_argv.patch

@@ -1,4 +1,4 @@
-From 86e1a43670375071a6285cf89c647063418456ab Mon Sep 17 00:00:00 2001
+From 5d3c7782f022d47f2d063613813d926692b0f7e9 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 12:18:52 +0100
 Subject: [PATCH 4/5] Add debugging for build_argv
@@ -8,7 +8,7 @@ Subject: [PATCH 4/5] Add debugging for build_argv
  1 file changed, 2 insertions(+)
 
 diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
-index 89e095e..621d469 100644
+index 395c8c9..1006c3e 100644
 --- a/winsup/cygwin/dcrt0.cc
 +++ b/winsup/cygwin/dcrt0.cc
 @@ -313,6 +313,8 @@ build_argv (char *cmd, char **&argv, int &argc, int winshell, int glob)
@@ -21,5 +21,5 @@ index 89e095e..621d469 100644
    while (*cmd)
      {
 -- 
-2.5.0
+2.5.1
 

msys2-runtime/0005-Add-debugging-for-strace-make_command_line.patch

@@ -1,4 +1,4 @@
-From 8d4c1ebb7911c49c927cf1d2ad88397cb6cba2e1 Mon Sep 17 00:00:00 2001
+From 97d948be568720249cad1571454eab74513952ee Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Fri, 21 Aug 2015 09:52:47 +0100
 Subject: [PATCH 5/5] Add debugging for strace make_command_line
@@ -20,5 +20,5 @@ index dc3ef55..ead4c04 100644
    SetConsoleCtrlHandler (NULL, 0);
  /* Commit message for this code was:
 -- 
-2.5.0
+2.5.1
 

msys2-runtime/PKGBUILD

@@ -32,17 +32,16 @@ source=('msys2-runtime'::'git+https://github.com/git-for-windows/msys2-runtime.g
         '0004-Add-debugging-for-build_argv.patch'
         '0005-Add-debugging-for-strace-make_command_line.patch')
 md5sums=('SKIP'
-         'c3c22297f0402edf02843e09d3ee9733'
-         '1d6f11e1106395671e861f372fe1e5de'
-         '4653f7d0dc64e872400346b02164d1e6'
-         'cc78a30ea8b6ba377bc1cd6ee23ea146'
-         'a3b123ebbf961a79815ecad574591a19')
+         '6b959c674a687709d93fb562143c2cbc'
+         '8666904817991a621b64e3382a53f452'
+         '923b7800812f2654c395e8c07ad404bd'
+         '5055fa5115d611d8501989d0e345199e'
+         '77b4c20306527ad2e5a8845c4c37e386')
 
 pkgver() {
-  cd "${srcdir}/msys2-runtime"
+  cd "${srcdir}"/msys2-runtime
   local gitver=$(git describe --tags | sed 's|cygwin-||g' | sed 's|_|.|g')
   gitver=${gitver//-*}
-  #printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
   printf "%s.%s.%s" "${gitver}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
@@ -52,7 +51,7 @@ prepare() {
   git am "${srcdir}"/0002-dcrt0.cc-globify-Don-t-quote-literal-strings-differe.patch
   git am "${srcdir}"/0003-strace.cc-Don-t-set-MSYS-noglob.patch
   git am "${srcdir}"/0004-Add-debugging-for-build_argv.patch
-# git am "${srcdir}"/0005-Add-debugging-for-strace-make_command_line.patch
+  git am "${srcdir}"/0005-Add-debugging-for-strace-make_command_line.patch
 }
 
 build() {