diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-admin/apachetop | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-admin/apachetop')
-rw-r--r-- | app-admin/apachetop/Manifest | 1 | ||||
-rw-r--r-- | app-admin/apachetop/apachetop-0.12.6-r1.ebuild | 45 | ||||
-rw-r--r-- | app-admin/apachetop/apachetop-0.12.6-r2.ebuild | 37 | ||||
-rw-r--r-- | app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch | 12 | ||||
-rw-r--r-- | app-admin/apachetop/files/apachetop-0.12.6-configure.patch | 101 | ||||
-rw-r--r-- | app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch | 13 | ||||
-rw-r--r-- | app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch | 39 | ||||
-rw-r--r-- | app-admin/apachetop/metadata.xml | 8 |
8 files changed, 256 insertions, 0 deletions
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest new file mode 100644 index 000000000000..40174c1081f3 --- /dev/null +++ b/app-admin/apachetop/Manifest @@ -0,0 +1 @@ +DIST apachetop-0.12.6.tar.gz 126930 SHA256 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29 SHA512 35081772f817c6a83a1fcf78790d2a288a9e4e48234c4b3163a09ad15f49a78d649b77f41aa002940fb9416c263cea159c5092a9b87285488eb450964c823c3a WHIRLPOOL 8b23d825b26c0ce43d1536edb3e6b613d9773c93cd62d02b84e479b9d1b0e89ef0f03b09b3e0cf3616fd3f05f2304b19c261c87e78c623bdabedfecbb5a5e8ae diff --git a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild new file mode 100644 index 000000000000..ac608e7ac599 --- /dev/null +++ b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="2" + +inherit eutils autotools + +DESCRIPTION="A realtime Apache log analyzer" +HOMEPAGE="http://www.webta.org/projects/apachetop" +SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 hppa ~mips ppc sparc x86" +IUSE="fam pcre adns" + +DEPEND="fam? ( virtual/fam ) + pcre? ( dev-libs/libpcre ) + adns? ( net-libs/adns )" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc41.patch + epatch "${FILESDIR}"/${P}-configure.patch + epatch "${FILESDIR}"/${P}-maxpathlen.patch + epatch "${FILESDIR}"/${P}-ac_config_header.patch + eautoreconf +} + +src_configure() { + econf --with-logfile=/var/log/apache2/access_log \ + $(use_with fam) \ + $(use_with pcre) \ + $(use_with adns) +} + +src_compile() { + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc AUTHORS ChangeLog INSTALL NEWS README TODO +} diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild new file mode 100644 index 000000000000..d6a0ccbc743d --- /dev/null +++ b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils autotools + +DESCRIPTION="A realtime Apache log analyzer" +HOMEPAGE="http://www.webta.org/projects/apachetop" +SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 hppa ~mips ppc sparc x86" +IUSE="fam pcre" + +RDEPEND=" + fam? ( virtual/fam ) + pcre? ( dev-libs/libpcre ) +" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc41.patch + epatch "${FILESDIR}"/${P}-configure.patch + epatch "${FILESDIR}"/${P}-maxpathlen.patch + epatch "${FILESDIR}"/${P}-ac_config_header.patch + eautoreconf +} + +src_configure() { + econf \ + --with-logfile=/var/log/apache2/access_log \ + --without-adns \ + $(use_with fam) \ + $(use_with pcre) +} diff --git a/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch new file mode 100644 index 000000000000..aabdb13d75f3 --- /dev/null +++ b/app-admin/apachetop/files/apachetop-0.12.6-ac_config_header.patch @@ -0,0 +1,12 @@ +diff -uNr apachetop-0.12.6.orig/configure.ac apachetop-0.12.6/configure.ac +--- apachetop-0.12.6.orig/configure.ac 2013-07-09 14:06:14.000000000 -0400 ++++ apachetop-0.12.6/configure.ac 2013-07-09 14:07:36.000000000 -0400 +@@ -6,7 +6,7 @@ + AC_CONFIG_AUX_DIR(config) + #AC_CONFIG_MACRO_DIR(m4) # 2.58 + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADER(config.h) + AM_INIT_AUTOMAKE(apachetop, 0.12.6) # 2.53 only? + + # Add non-standard directories to the include path diff --git a/app-admin/apachetop/files/apachetop-0.12.6-configure.patch b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch new file mode 100644 index 000000000000..38a1fc7f6a1a --- /dev/null +++ b/app-admin/apachetop/files/apachetop-0.12.6-configure.patch @@ -0,0 +1,101 @@ +Index: apachetop-0.12.6/configure.ac +=================================================================== +--- apachetop-0.12.6.orig/configure.ac ++++ apachetop-0.12.6/configure.ac +@@ -52,48 +52,60 @@ AC_FUNC_VPRINTF + AC_CHECK_FUNCS([inet_aton memset strchr strdup kqueue strerror strstr]) + + # pcre {{{ +-AC_ARG_WITH(pcre, +- [ --with-pcre=<path> prefix of pcre installation (eg /usr/local)], +- [ +- CPPFLAGS="$CPPFLAGS -I $withval/include" +- LDFLAGS="$LDFLAGS -L $withval/lib" +- ] +-) +- +-AC_CHECK_HEADERS(pcre.h, +- AC_SEARCH_LIBS([pcre_compile], [pcre]) , +- AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]) +-) ++AC_ARG_WITH([pcre], ++ [ --with-pcre=<path> prefix of pcre installation (eg /usr/local)], ++ [case "${withval}" in ++ yes) with_pcre="/usr";; ++ no) with_pcre="no";; ++ *) with_pcre="/usr";; ++ esac], ++ [with_pcre="/usr"]) ++ ++if test x$with_pcre != xno; then ++ CPPFLAGS="$CPPFLAGS -I $withval/include" ++ LDFLAGS="$LDFLAGS -L $withval/lib" ++ AC_CHECK_HEADERS(pcre.h, ++ AC_SEARCH_LIBS([pcre_compile], [pcre]), ++ AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre])) ++fi + # }}} + + # fam {{{ +-AC_ARG_WITH(fam, +- [ --with-fam=<path> prefix of fam installation (eg /usr/local)], +- [ +- CPPFLAGS="$CPPFLAGS -I $withval/include" +- LDFLAGS="$LDFLAGS -L $withval/lib" +- ] +-) +- +-AC_CHECK_HEADERS(fam.h, +- AC_SEARCH_LIBS([FAMOpen], [fam]) , +- AC_MSG_WARN([*** fam.h not found -- consider using --with-fam]) +-) ++AC_ARG_WITH([fam], ++ [ --with-fam=<path> prefix of fam installation (eg /usr/local)], ++ [case "${withval}" in ++ yes) with_fam="/usr";; ++ no) with_fam="no";; ++ *) with_fam="/usr";; ++ esac], ++ [with_fam="/usr"]) ++ ++if test x$with_fam != xno; then ++ CPPFLAGS="$CPPFLAGS -I $with_fam/include" ++ LDFLAGS="$LDFLAGS -L $with_fam/lib" ++ AC_CHECK_HEADERS(fam.h, ++ AC_SEARCH_LIBS([FAMOpen], [fam]), ++ AC_MSG_WARN([*** fam.h not found -- consider using --with-fam])) ++fi + # }}} + + # adns {{{ +-AC_ARG_WITH(adns, +- [ --with-adns=<path> prefix of adns installation (eg /usr/local)], +- [ +- CPPFLAGS="$CPPFLAGS -I $withval/include" +- LDFLAGS="$LDFLAGS -L $withval/lib" +- ] +-) +- +-AC_CHECK_HEADERS(adns.h, +- AC_SEARCH_LIBS([adns_submit], [adns]) , +- AC_MSG_WARN([*** adns.h not found -- consider using --with-adns]) +-) ++AC_ARG_WITH([adns], ++ [ --with-adns=<path> prefix of adns installation (eg /usr/local)], ++ [case "${withval}" in ++ yes) with_adns="/usr";; ++ no) with_adns="no";; ++ *) with_adns="/usr";; ++ esac], ++ [with_adns="/usr"]) ++ ++if test x$with_adns != xno; then ++ CPPFLAGS="$CPPFLAGS -I $with_adns/include" ++ LDFLAGS="$LDFLAGS -L $with_adns/lib" ++ AC_CHECK_HEADERS(adns.h, ++ AC_SEARCH_LIBS([adns_submit], [adns]), ++ AC_MSG_WARN([*** adns.h not found -- consider using --with-adns])) ++fi + # }}} + + # --with-logfile {{{ diff --git a/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch new file mode 100644 index 000000000000..566c9226a3f7 --- /dev/null +++ b/app-admin/apachetop/files/apachetop-0.12.6-gcc41.patch @@ -0,0 +1,13 @@ +--- src/resolver.h ++++ src/resolver.h +@@ -10,8 +10,8 @@ + class Resolver + { + public: +- Resolver::Resolver(void); +- Resolver::~Resolver(void); ++ Resolver(void); ++ ~Resolver(void); + int add_request(char *request, enum resolver_action act); + + diff --git a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch new file mode 100644 index 000000000000..b648b07cbfc5 --- /dev/null +++ b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch @@ -0,0 +1,39 @@ +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/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml new file mode 100644 index 000000000000..48919ac33d6c --- /dev/null +++ b/app-admin/apachetop/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer> + <email>neurogeek@gentoo.org</email> + <name>Jesus Rivero</name> +</maintainer> +</pkgmetadata> |