diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | PKGBUILD | 33 | ||||
| -rw-r--r-- | fix-SCAN_OFFSET.patch | 19 | ||||
| -rw-r--r-- | fix-link-order-ftbfs-gcc4.6.patch | 10 |
4 files changed, 80 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..741615c8c710 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,18 @@ +pkgbase = mergelog + pkgdesc = Utility that merges httpd log files by date + pkgver = 4.5 + pkgrel = 1 + url = http://mergelog.sourceforge.net/ + arch = i686 + arch = x86_64 + license = GPL + depends = zlib + source = http://prdownloads.sourceforge.net/mergelog/mergelog-4.5.tar.gz + source = fix-SCAN_OFFSET.patch + source = fix-link-order-ftbfs-gcc4.6.patch + md5sums = d748039b14092315881fa329beeb6682 + md5sums = 2c6f6678b0ed29e796b17ccc3eaa3b44 + md5sums = e8e6b94391f98fd1f2c8d5d91c9bd47a + +pkgname = mergelog + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..a3f39e951749 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Mike Javorski <mike.javorski@gmail.com> + +pkgname=mergelog +pkgver=4.5 +pkgrel=1 +pkgdesc='Utility that merges httpd log files by date' +arch=('i686' 'x86_64') +url="http://mergelog.sourceforge.net/" +license=('GPL') +depends=( 'zlib' ) +source=("http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'fix-SCAN_OFFSET.patch' + 'fix-link-order-ftbfs-gcc4.6.patch') +sha256sums=('fd97c5b9ae88fbbf57d3be8d81c479e0df081ed9c4a0ada48b1ab8248a82676d' + 'c58e734c1b4cce5476d0815dadf9ab685a8f03f242124977ecb3fa545f1806f4' + 'cb189b7d6d3104ff6a186b72e497920ed51124249c8db72b457ffb0bc39d1579') +prepare() { + cd "$pkgname-$pkgver" + patch -p1 -i "$srcdir/fix-SCAN_OFFSET.patch" + patch -p1 -i "$srcdir/fix-link-order-ftbfs-gcc4.6.patch" + autoreconf -i -f +} + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/fix-SCAN_OFFSET.patch b/fix-SCAN_OFFSET.patch new file mode 100644 index 000000000000..e1d96af1e485 --- /dev/null +++ b/fix-SCAN_OFFSET.patch @@ -0,0 +1,19 @@ +commit 53c029127dfbbd5b389c97d1ca585b700aea7307 +Author: Ryan Niebur <ryanryan52@gmail.com> +Date: Mon Sep 7 14:40:23 2009 -0700 + + set SCAN_OFFSET to 8 (Closes: #538859) + +diff --git a/src/mergelog.c b/src/mergelog.c +index 9cdb0fa..0ec5f80 100644 +--- a/src/mergelog.c ++++ b/src/mergelog.c +@@ -32,7 +32,7 @@ + + #define BUFFER_SIZE 32768 + #define DATE_SIZE 14 +-#define SCAN_OFFSET 9 ++#define SCAN_OFFSET 8 + #define SCAN_SIZE 512 + + diff --git a/fix-link-order-ftbfs-gcc4.6.patch b/fix-link-order-ftbfs-gcc4.6.patch new file mode 100644 index 000000000000..f6294d31f5a2 --- /dev/null +++ b/fix-link-order-ftbfs-gcc4.6.patch @@ -0,0 +1,10 @@ +Index: mergelog-4.5.1/src/Makefile.am +=================================================================== +--- mergelog-4.5.1.orig/src/Makefile.am 2011-09-13 17:03:08.000000000 -0400 ++++ mergelog-4.5.1/src/Makefile.am 2011-09-13 17:04:15.000000000 -0400 +@@ -4,4 +4,4 @@ + $(COMPILE) $(LIBS) -DVERSION=\"$(VERSION)\" -Wall mergelog.c -o $@ + + zmergelog: mergelog.c +- $(COMPILE) $(LIBS) -DVERSION=\"$(VERSION)\" -Wall -DUSE_ZLIB mergelog.c -o $@ ++ $(COMPILE) -DVERSION=\"$(VERSION)\" -Wall -DUSE_ZLIB mergelog.c -o $@ $(LIBS) |