From 70461d75591266a9b6bf6e123c66921d22b94abd Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jun 21 2015 00:57:25 +0000
Subject: Upgrade to 0.15.6 (#1230464)


---

diff --git a/.gitignore b/.gitignore
index 84e5c7a..b40f901 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-apachetop-0.12.6.tar.gz
+/apachetop-0.??.?.tar.gz
diff --git a/apachetop-0.12.6-maxpathlen.patch b/apachetop-0.12.6-maxpathlen.patch
deleted file mode 100644
index b648b07..0000000
--- a/apachetop-0.12.6-maxpathlen.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Patch by Robert Scheck <robert@fedoraproject.org> for apachetop <= 0.12.6, which
-adds some includes in order to have a real change to get MAXPATHLEN defined with
-a valid value. Once MAXPATHLEN really gets filled with 128, it will just cause a
-buffer overflow.
-
-See Red Hat Bugzilla #446199 (https://bugzilla.redhat.com/show_bug.cgi?id=446199)
-for more information. This patch should solve the mentioned bug report and should
-be sane enough to get included by upstream of apachetop for the next release. It
-is important to run autoheader before ./configure to get these changes activated.
-
---- apachetop-0.12.6/configure.ac		2005-10-27 18:39:25.000000000 +0200
-+++ apachetop-0.12.6/configure.ac.maxpathlen	2008-06-21 16:00:38.000000000 +0200
-@@ -34,7 +34,8 @@
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
--		string.h strings.h sys/socket.h time.h sys/time.h])
-+		string.h strings.h sys/socket.h time.h sys/time.h \
-+		limits.h sys/param.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- #AC_HEADER_STDBOOL # not in 2.53?
---- apachetop-0.12.6/src/apachetop.h		2005-10-15 18:10:01.000000000 +0200
-+++ apachetop-0.12.6/src/apachetop.h.maxpatlen	2008-06-21 16:02:00.000000000 +0200
-@@ -89,8 +89,12 @@
- #define getMIN(a,b) (a < b ? a : b)
- #define getMAX(a,b) (a > b ? a : b)
- 
--#ifndef MAXPATHLEN
--# define MAXPATHLEN 128
-+#ifdef HAVE_SYS_PARAM_H
-+# include <sys/param.h>
-+#endif
-+ 
-+#if HAVE_LIMITS_H
-+# include <limits.h>
- #endif
- 
- /* upon startup, each input file is put into an element of this array,
diff --git a/apachetop.spec b/apachetop.spec
index 17f88cd..e0ca63c 100644
--- a/apachetop.spec
+++ b/apachetop.spec
@@ -1,16 +1,15 @@
 Name:           apachetop
-Version:        0.12.6
-Release:        17%{?dist}
+Version:        0.15.6
+Release:        1%{?dist}
 Summary:        A top-like display of Apache logs
 
 Group:          Applications/Internet
 License:        BSD
-URL:            http://www.webta.org/projects/apachetop
-Source0:        http://www.webta.org/apachetop/apachetop-%{version}.tar.gz
-Patch:          apachetop-0.12.6-maxpathlen.patch
+URL:            https://github.com/tessus/apachetop
+Source0:        https://github.com/tessus/apachetop/releases/download/%{version}/apachetop-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ncurses-devel, m4, readline-devel, autoconf, automake
+BuildRequires:  ncurses-devel, m4, readline-devel, pcre-devel
 
 %description
 ApacheTop watches a logfile generated by Apache (in standard common or
@@ -20,12 +19,9 @@ fields in combined) and generates human-parsable output in realtime.
 
 %prep
 %setup -q
-%patch -p1 -b .maxpathlen
-autoheader
 
 
 %build
-autoreconf -vif #BZ925005 - support aarch64 
 %configure --with-logfile=%{_localstatedir}/log/httpd/access_log
 make %{?_smp_mflags}
 
@@ -41,12 +37,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(-,root,root,-)
-%doc AUTHORS LICENSE ChangeLog README TODO
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc AUTHORS ChangeLog README
 %{_bindir}/*
 %{_mandir}/man[^3]/*
 
 
 %changelog
+* Sun Jun 21 2015 Robert Scheck <robert@fedoraproject.org> 0.15.6-1
+- Upgrade to 0.15.6 (#1230464)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.12.6-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 94f6640..7add246 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-604283ac4bbbddd98fc9b1f11381657e  apachetop-0.12.6.tar.gz
+69896c163abd3fd1961f5939fbe6c4cf  apachetop-0.15.6.tar.gz