[arch-commits] Commit in ncrack/trunk (PKGBUILD ncrack-nullcheck.patch)

[Levente Polyak]

    Date: Tuesday, March 13, 2018 @ 02:15:02
  Author: anthraxx
Revision: 306748

upgpkg: ncrack 0.6.0-1

Modified:
  ncrack/trunk/PKGBUILD
  ncrack/trunk/ncrack-nullcheck.patch

------------------------+
 PKGBUILD               |   50 ++++++++++++++++++++++++++++-------------------
 ncrack-nullcheck.patch |    4 +--
 2 files changed, 32 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-13 01:28:38 UTC (rev 306747)
+++ PKGBUILD	2018-03-13 02:15:02 UTC (rev 306748)
@@ -1,35 +1,45 @@
-# $Id$
-# Maintainer: Daniel Micay <danielmicay at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
 # Contributor: mickael9 <mickael9 at gmail dot com>
 
 pkgname=ncrack
-pkgver=0.5
-pkgrel=4
-pkgdesc='A high-speed network authentication cracking tool'
-arch=(x86_64)
+pkgver=0.6.0
+pkgrel=1
+pkgdesc='High-speed network authentication cracking tool'
 url='https://nmap.org/ncrack/'
-license=(GPL)
-depends=(openssl-1.0)
-source=("https://nmap.org/ncrack/dist/ncrack-$pkgver.tar.gz"
-         ncrack-nullcheck.patch)
-sha256sums=('dbad9440c861831836d47ece95aeb2bd40374a3eb03a14dea0fe1bfa73ecd4bc'
-            'efb8b466cb51a58277c6f0dc17d478e9d4a9722f0ad2000272de900a9ca804da')
+arch=('x86_64')
+license=('GPL2')
+depends=('openssl')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/nmap/ncrack/archive/v${pkgver}.tar.gz
+        ${pkgname}-openssl1.1-1.patch::https://github.com/nmap/ncrack/commit/1c2f805e65e2e1231ecbe2ba1e5d83245c240da3.patch
+        ${pkgname}-openssl1.1-2.patch::https://github.com/nmap/ncrack/commit/150b06b53a78b6a334f1147504ed6218293f3318.patch
+        ncrack-nullcheck.patch)
+sha256sums=('676a323b1e9066193461f25e31445262bae495fde7dfcaf56555c3056dae24cc'
+            '0795a14aba30d10ec85f1154850a3c22b91dbd6756d4bf8e9dc8cf58ab677fe7'
+            'd046231d64322bd30a46b1214fbee43cc8ef01801d5a1c5d256de7e488a85ee0'
+            'db38a84172ce548614c7e6f2f9f751b31e68716fe3ff68761c21f7e11d6143fc')
+sha512sums=('08d9c19b91b661cb212d2d0061e3498e75438388365c85cbd7d7d0b45b85b8dd8b2ba5de53b375792bdec55513f9c71f331712ef4a13369c6c11425b70a4b53b'
+            'c142b1e8b89b9abbe58fee66b6514b0c91be2687e1675558d5c3ffac0580af925ca2ed092eaed6374b4452adc5472eaed86b2fe46a285ebcd89a5defdd5dedde'
+            'aaf630210150573147feda107abed9612c25571c50873fda938dc879858e84a0c5d1ac030e892565a8c4ab8e758df02615de7bce4f9f27de35b84faac03323ba'
+            'c5648363def2dd8c8f01e5b039824357383b465373f59912abcfcb150873e6702a848c15ce1eea802c64d8e0fd0d3e88ddac190a1b659cd1b23da020f36b1b0b')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd ${pkgname}-${pkgver}
   patch -Np1 -i ../ncrack-nullcheck.patch
+  patch -Np1 -i ../ncrack-openssl1.1-1.patch
+  patch -Np1 -i ../ncrack-openssl1.1-2.patch
 }
 
 build() {
-  cd $pkgname-$pkgver
-  CFLAGS+=" -I/usr/include/openssl-1.0" \
-  CPPFLAGS+=" -I/usr/include/openssl-1.0" \
-  LDFLAGS+=" -L/usr/lib/openssl-1.0" \
-  ./configure --prefix=/usr
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --without-openssl-header-check
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make install DESTDIR="$pkgdir"
+  cd ${pkgname}-${pkgver}
+  make install DESTDIR="${pkgdir}"
+  install -Dm 644 README.md CHANGELOG -t "${pkgdir}/usr/share/doc/${pkgname}"
 }
+
+# vim: ts=2 sw=2 et:

Modified: ncrack-nullcheck.patch
===================================================================
--- ncrack-nullcheck.patch	2018-03-13 01:28:38 UTC (rev 306747)
+++ ncrack-nullcheck.patch	2018-03-13 02:15:02 UTC (rev 306748)
@@ -1,11 +1,11 @@
 diff -ru ncrack-0.5/ncrack_resume.cc ncrack-0.5.new/ncrack_resume.cc
 --- ncrack-0.5/ncrack_resume.cc	2016-04-10 18:56:02.000000000 +0200
 +++ ncrack-0.5.new/ncrack_resume.cc	2017-04-13 17:53:09.369522756 +0200
-@@ -520,7 +520,7 @@
+@@ -527,7 +527,7 @@
  
        j = 0;
        buf[j++] = *q;
--      while (q != '\0' && j < sizeof(buf)) {
+-      while (*q != '\0' && j < sizeof(buf)) {
 +      while ((q != NULL) && (j < sizeof(buf))) {
          q++;
          if (q - filestr >= filelen)