diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2016-04-04 00:07:42 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2016-04-04 00:07:42 -0500 |
| commit | 7380a0a7582e45160ec1a1f29d6d9ed60da7b91b (patch) | |
| tree | c2e495eac2d7c7b81470bdd7bf131a9b2b869d48 /network/squid/squid.SlackBuild | |
| parent | a60d6cca8dd55484ea26f9ebdfc2325df901c384 (diff) | |
network/squid: Included upstream patches to 3.4.x branch
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network/squid/squid.SlackBuild')
| -rw-r--r-- | network/squid/squid.SlackBuild | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild index 6182991c7faf6..9a41802cb0cfb 100644 --- a/network/squid/squid.SlackBuild +++ b/network/squid/squid.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=squid VERSION=${VERSION:-3.4.14} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -73,6 +73,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Include patches intended for inclusion in 3.4.next +# http://www.squid-cache.org/Versions/v3/3.4/changesets/ +patch -p0 < $CWD/patches/squid-3.4-13228.patch +patch -p0 < $CWD/patches/squid-3.4-13229.patch +patch -p0 < $CWD/patches/squid-3.4-13230.patch +patch -p0 < $CWD/patches/squid-3.4-13231.patch +patch -p0 < $CWD/patches/squid-3.4-13232.patch + # last option is needed on current CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ |