libssh: Update to 0.9.1

mingw-w64-libssh/PKGBUILD

@@ -3,7 +3,7 @@
 _realname=libssh
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries (mingw-w64)"
 arch=('any')
@@ -20,20 +20,28 @@ options=('staticlibs' 'strip')
 validpgpkeys=('8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D') # Andreas Schneider <asn@cryptomilk.org>
 source=("https://www.libssh.org/files/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
         "https://www.libssh.org/files/${pkgver%.*}/${_realname}-${pkgver}.tar.xz.asc"
-        "mingw-as-unix.patch"
-        "mingw-DATADIR-conflict.patch")
-sha256sums=('25303c2995e663cd169fdd902bae88106f48242d7e96311d74f812023482c7a5'
+        "mingw-as-unix.patch")
+sha256sums=('33249bb616bb696e184cf930ea5d14239b65bb999c0815589efc35e5ed895787'
             'SKIP'
-            '8db580bf64d37f3d6b9a13558696eae8586edd3195eb2e930b7e326b98a9aef9'
-            'a56298da4ff75d7c2a7f4c4068a814c67f34773ea23601b2c236b669de320af6')
+            'bac0a32f54368f55abbce14dea3dfba27a24321d590022b93bb8369a2aaa4993')
+noextract=(${_realname}-${pkgver}.tar.xz)
 
 prepare() {
+  [[ -d ${_realname}-${pkgver} ]] && rm -rf ${_realname}-${pkgver}
+  tar -xJvf ${_realname}-${pkgver}.tar.xz -C ${srcdir} || true
+
   cd ${srcdir}/${_realname}-${pkgver}
   patch -p1 -i ${srcdir}/mingw-as-unix.patch
-  patch -p1 -i ${srcdir}/mingw-DATADIR-conflict.patch
 }
 
 build() {
+  declare -a extra_config
+  if check_option "debug" "n"; then
+    extra_config+=("-DCMAKE_BUILD_TYPE=Release")
+  else
+    extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
+  fi
+
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
 
@@ -41,7 +49,7 @@ build() {
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
+    ${extra_config} \
     -DWITH_GSSAPI=OFF \
     -DUNIT_TESTING=ON \
     -DWITH_STATIC_LIB=ON \

mingw-w64-libssh/mingw-DATADIR-conflict.patch

@@ -1,24 +0,0 @@
-diff -Naur libssh-0.8.1.orig/config.h.cmake libssh-0.8.1/config.h.cmake
---- libssh-0.8.1.orig/config.h.cmake	2018-08-21 08:30:18.361515500 -0400
-+++ libssh-0.8.1/config.h.cmake	2018-08-21 08:39:31.704597800 -0400
-@@ -5,7 +5,7 @@
- #cmakedefine VERSION "${PROJECT_VERSION}"
- 
- #cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}"
--#cmakedefine DATADIR "${DATADIR}"
-+#cmakedefine DATA_DIR "${DATA_DIR}"
- #cmakedefine LIBDIR "${LIBDIR}"
- #cmakedefine PLUGINDIR "${PLUGINDIR}"
- #cmakedefine SYSCONFDIR "${SYSCONFDIR}"
-diff -Naur libssh-0.8.1.orig/ConfigureChecks.cmake libssh-0.8.1/ConfigureChecks.cmake
---- libssh-0.8.1.orig/ConfigureChecks.cmake	2018-08-21 08:30:18.361515500 -0400
-+++ libssh-0.8.1/ConfigureChecks.cmake	2018-08-21 08:39:55.719325200 -0400
-@@ -9,7 +9,7 @@
- 
- set(PACKAGE ${PROJECT_NAME})
- set(VERSION ${PROJECT_VERSION})
--set(DATADIR ${DATA_INSTALL_DIR})
-+set(DATA_DIR ${DATA_INSTALL_DIR})
- set(LIBDIR ${LIB_INSTALL_DIR})
- set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
- set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})

mingw-w64-libssh/mingw-as-unix.patch

@@ -1,12 +1,3 @@
-diff -Naur libssh-0.8.1.orig/cmake/Modules/DefineInstallationPaths.cmake libssh-0.8.1/cmake/Modules/DefineInstallationPaths.cmake
---- libssh-0.8.1.orig/cmake/Modules/DefineInstallationPaths.cmake	2018-08-21 08:30:18.455197300 -0400
-+++ libssh-0.8.1/cmake/Modules/DefineInstallationPaths.cmake	2018-08-21 08:37:15.702630000 -0400
-@@ -1,4 +1,4 @@
--if (UNIX OR OS2)
-+if (UNIX OR OS2 OR MINGW)
-   IF (NOT APPLICATION_NAME)
-     MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
-     SET(APPLICATION_NAME ${PROJECT_NAME})
 diff -Naur libssh-0.8.1.orig/CMakeLists.txt libssh-0.8.1/CMakeLists.txt
 --- libssh-0.8.1.orig/CMakeLists.txt	2018-08-21 08:30:18.377098700 -0400
 +++ libssh-0.8.1/CMakeLists.txt	2018-08-21 08:37:16.760077700 -0400
@@ -37,14 +28,14 @@ diff -Naur libssh-0.8.1.orig/libssh.pc.cmake libssh-0.8.1/libssh.pc.cmake
 -Name: ${PROJECT_NAME}
 +prefix=@CMAKE_INSTALL_PREFIX@
 +exec_prefix=${prefix}/bin
-+libdir=@LIB_INSTALL_DIR@
-+includedir=@INCLUDE_INSTALL_DIR@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 +
 +Name: @PROJECT_NAME@
  Description: The SSH Library
 -Version: ${PROJECT_VERSION}
--Libs: -L${LIB_INSTALL_DIR} -lssh
--Cflags: -I${INCLUDE_INSTALL_DIR}
+-Libs: -L${CMAKE_INSTALL_FULL_LIBDIR} -lssh
+-Cflags: -I${CMAKE_INSTALL_FULL_INCLUDEDIR}
 +Version: @PROJECT_VERSION@
 +Libs: -L${libdir} -lssh
 +Cflags: -I${includedir}