From 053030aa8bded4213c53bff2b2cd762bd8c3e10c Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Tue, 31 Jul 2012 11:20:14 +0000
Subject: testing/squidguard: fix incompatibility with DB >= 5

---
 testing/squidguard/APKBUILD                | 14 ++++++++++----
 testing/squidguard/squidguard.post-install |  3 ---
 2 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 testing/squidguard/squidguard.post-install

(limited to 'testing/squidguard')

diff --git a/testing/squidguard/APKBUILD b/testing/squidguard/APKBUILD
index 4187bfb1a..719ce130f 100644
--- a/testing/squidguard/APKBUILD
+++ b/testing/squidguard/APKBUILD
@@ -2,19 +2,22 @@
 pkgname=squidguard
 _realname=squidGuard
 pkgver=1.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Squid URL redirector"
 url="http://www.squidguard.org"
 arch="all"
 license="GPL"
 depends=
 makedepends="flex bison db-dev"
-install="$pkgname.post-install"
+install=
+pkguser="squid"
+pkggroup="squid"
 subpackages=""
 source="http://www.squidguard.org/Downloads/$_realname-$pkgver.tar.gz
 	squidguard-1.4-gentoo.patch
 	squidguard-1.4-upstream-fixes.patch
-	squidguard-1.4-vsnprintf.patch"
+	squidguard-1.4-vsnprintf.patch
+	squidguard-1.4-debian-bdb-51.patch"
 
 _builddir="$srcdir"/$_realname-$pkgver
 
@@ -23,6 +26,7 @@ prepare() {
 	patch -p1 < ../../squidguard-1.4-gentoo.patch
 	patch -p1 < ../../squidguard-1.4-upstream-fixes.patch
 	patch -p1 < ../../squidguard-1.4-vsnprintf.patch
+	patch -p1 < ../../squidguard-1.4-debian-bdb-51.patch
 }
 
 build() {
@@ -39,9 +43,11 @@ package() {
 	make INSTDIR="$pkgdir" install
 	install -D -m644 ../../squidGuard.conf.blocksites $pkgdir/etc/squidGuard/squidGuard.conf
 	install -D -m644 ../../blockedsites $pkgdir/etc/squidGuard/blockedsites
+	mkdir -p "$pkgdir"/var/log/squidGuard && chown squid.squid "$pkgdir"/var/log/squidGuard
 }
 
 md5sums="de834150998c1386c30feae196f16b06  squidGuard-1.4.tar.gz
 ba58e934fe2f75fcb5dfbe054e045449  squidguard-1.4-gentoo.patch
 4b512e930dede70ddf36d4f7c75a598f  squidguard-1.4-upstream-fixes.patch
-8878c72f27e45dab99e5d0197d50caec  squidguard-1.4-vsnprintf.patch"
+8878c72f27e45dab99e5d0197d50caec  squidguard-1.4-vsnprintf.patch
+ea2deca296c41107bc981d1a2a093846  squidguard-1.4-debian-bdb-51.patch"
diff --git a/testing/squidguard/squidguard.post-install b/testing/squidguard/squidguard.post-install
deleted file mode 100644
index 2620de05f..000000000
--- a/testing/squidguard/squidguard.post-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-mkdir /var/log/squidGuard &>/dev/null
-chown squid.squid /var/log/squidGuard
-- 
cgit v1.2.3