From 241b765d8566546ecabc19413d5d353f233fa290 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Sat, 7 Feb 2015 19:10:09 +0700
Subject: network/squidGuard: Add missing patches.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/squidGuard/squidGuard.SlackBuild | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'network/squidGuard/squidGuard.SlackBuild')

diff --git a/network/squidGuard/squidGuard.SlackBuild b/network/squidGuard/squidGuard.SlackBuild
index aff5b9e326..b79867661b 100644
--- a/network/squidGuard/squidGuard.SlackBuild
+++ b/network/squidGuard/squidGuard.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=squidGuard
 VERSION=${VERSION:-1.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -63,18 +63,6 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 
-# Fixes a buffer overflow problem and prevents squidGuard from going into
-# emergency mode when overlong URLs are encountered (they can be perfectly
-# legal).
-tar xvf $CWD/patches/$PRGNAM-$VERSION-patch-20091015.tar.gz
-cat $PRGNAM-$VERSION-patch-20091015/sgLog.c > $PRGNAM-$VERSION/src/sgLog.c
-
-# Fixes two bypass problems with URLs having a length closed to the defined
-# MAX_BUF value (4096).
-tar xvf $CWD/patches/$PRGNAM-$VERSION-patch-20091019.tar.gz
-cat $PRGNAM-$VERSION-20091019/sg.h.in > $PRGNAM-$VERSION/src/sg.h.in
-cat $PRGNAM-$VERSION-20091019/sgDiv.c.in > $PRGNAM-$VERSION/src/sgDiv.c.in
-
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -83,6 +71,15 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# Fixes a buffer overflow problem and prevents squidGuard from going into
+# emergency mode when overlong URLs are encountered (they can be perfectly
+# legal).
+
+# Fixes two bypass problems with URLs having a length closed to the defined
+# MAX_BUF value (4096).
+patch -p1 < $CWD/squidGuard.patch
+
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-- 
cgit v1.2.3-80-g2a13