rebus pushed to medusa (master). "bump to up-stream 2.2 release candidate 1"

[notifications at fedoraproject.org]

From 8cfebb4ceb9b2aff011bc554daf0fe80670361f9 Mon Sep 17 00:00:00 2001
From: Michal Ambroz <rebus at seznam.cz>
Date: Fri, 29 May 2015 11:25:59 +0200
Subject: bump to up-stream 2.2 release candidate 1


diff --git a/.gitignore b/.gitignore
index 1591446..2a29a40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /medusa-2.0.tar.gz
 /medusa-2.1.tar.gz
 /medusa-2.1.1.tar.gz
+/medusa-2.2-b0e8c5c.tar.gz
diff --git a/medusa-configure.patch b/medusa-configure.patch
deleted file mode 100644
index 2b57f34..0000000
--- a/medusa-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- medusa-2.1.1/configure.in   2012-05-25 23:59:27.000000000 +0200
-+++ medusa-2.1.1.new/configure.in       2013-02-02 21:26:12.068909429 +0100
-@@ -100,7 +100,7 @@
- AS_MESSAGE([checking for AFPFS-NG Library and Header files...])
- AC_CHECK_HEADER([afpfs-ng/afp_protocol.h], 
-   [AC_CHECK_LIB(afpclient, main,
--    [AC_DEFINE(HAVE_LIBAFPFS, 1, [Found AFPFS-NG Library]) MODULE_LIBS="$MODULE_LIBS /usr/lib/libafpclient.so.0" check_module_afp="true"],
-+    [AC_DEFINE(HAVE_LIBAFPFS, 1, [Found AFPFS-NG Library]) MODULE_LIBS="$MODULE_LDFLAGS -lafpclient" check_module_afp="true"],
-     [AC_MSG_WARN([ *** AFPFS-NG library required for AFP module. ***
-       
-       The AFPFS-NG package must be installed for the AFP module to function. This includes
diff --git a/medusa-trace-overflow.patch b/medusa-trace-overflow.patch
deleted file mode 100644
index 321724f..0000000
--- a/medusa-trace-overflow.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Fix buffer overflow in medusa-trace.c caused by printing password in hex formatting buffer too small.
-Reported to jmk at foofus.net on 2013/02/02.
-diff -ru medusa-2.1/src/medusa-trace.c medusa-2.1.new/src/medusa-trace.c
---- medusa-2.1/src/medusa-trace.c       2012-03-01 18:39:35.000000000 +0100
-+++ medusa-2.1.new/src/medusa-trace.c   2013-02-02 18:10:47.718761727 +0100
-@@ -35,7 +35,7 @@
- void writeVerbose(int iLevel, char *pMsg, ...) {
-   va_list ap;
-   char buf[512];
--  char bufOut[1024];
-+  char bufOut[2049]; // 1 special char can take up to 4 chars in hex formatting
-   char temp[6];
-   unsigned char cTemp;
-   int i = 0;
-@@ -45,8 +45,8 @@
-   }
-   else if (iLevel <= iVerboseLevel) {
-     va_start(ap, pMsg);
--    memset(bufOut, 0, 1024);
--    memset(buf, 0, 512);
-+    memset(bufOut, 0, sizeof(bufOut));
-+    memset(buf, 0, sizeof(buf));
-     vsnprintf(buf, sizeof(buf) - 1, pMsg, ap);
- 
-     /*
-@@ -60,11 +60,11 @@
-       cTemp = (unsigned char)buf[i];
-       if ((cTemp < 32 && cTemp > 0 && cTemp != 9 && cTemp != 10 && cTemp != 13) || cTemp > 126)
-       {
--        sprintf(temp, "[%02X]", cTemp);        
-+        sprintf(temp, "[%02X]", cTemp);
-       }
-       else
-         sprintf(temp, "%c", cTemp);
--      
-+
-       strncat(bufOut, temp, 6);
-     }
- 
diff --git a/medusa.spec b/medusa.spec
index 5a31ff8..843735b 100644
--- a/medusa.spec
+++ b/medusa.spec
@@ -1,16 +1,18 @@
+%define         gituser         jmk-foofus
+%define         gitname         medusa
+%global         commit          b0e8c5cd4a00fe1fa875d02cb1ebed4e231f2491
+%global         shortcommit     %(c=%{commit}; echo ${c:0:7})
+
 Summary:       Parallel brute forcing password cracker
 Name:          medusa
-Version:       2.1.1
-Release:       5%{?dist}
+Version:       2.2
+Release:       0.rc1%{?dist}
 License:       GPLv2
 Group:         Applications/System
 URL:           http://www.foofus.net/jmk/medusa/medusa.html
-Source0:       http://www.foofus.net/jmk/tools/%{name}-%{version}.tar.gz
-Patch1:        medusa-configure.patch
+#Source0:      http://www.foofus.net/jmk/tools/%{name}-%{upversion}.tar.gz
+Source0:       https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 
-#fix buffer oveflow in the medusa-trace.c printing special chars in hexa
-#reported upstream on 2013/02/02
-Patch2:        medusa-trace-overflow.patch
 
 BuildRequires: autoconf automake libtool
 BuildRequires: openssl-devel apr-devel libssh2-devel
@@ -39,9 +41,8 @@ Some of the key features of Medusa are:
       the supported list of services for brute-forcing.
 
 %prep
-%setup -q
-%patch1 -p1 -b .configure
-%patch2 -p1 -b .trace
+#%setup -q
+%setup -qn %{gitname}-%{commit}
 
 %build
 autoreconf -vif
@@ -67,6 +68,9 @@ make DESTDIR=%{buildroot} install
 %{_libdir}/medusa/*
 
 %changelog
+* Thu May 28 2015 Michal Ambroz <rebus AT seznam.cz> - 2.2-0.rc1
+- update to version 2.2 rc1
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 9c309ea..13a122a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36f00501e48fe765ac37ad9b2377936b  medusa-2.1.1.tar.gz
+494dca2c7cafed01ea4a89fa267a17a1  medusa-2.2-b0e8c5c.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/medusa.git/commit/?h=master&id=8cfebb4ceb9b2aff011bc554daf0fe80670361f9