From 07031411bd45bc1657369a9bbc916991fee64b0927a9d83c93bf5b912951728d Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Fri, 4 Sep 2015 15:19:22 +0000
Subject: [PATCH] rebase squid-config.patch

OBS-URL: https://build.opensuse.org/package/show/server:proxy/squid?expand=0&rev=87
---
 squid-config.patch | 8 ++++----
 squid.changes      | 5 +++++
 squid.spec         | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/squid-config.patch b/squid-config.patch
index 262b55f..2975cdc 100644
--- a/squid-config.patch
+++ b/squid-config.patch
@@ -2,7 +2,7 @@ Index: src/cf.data.pre
 ===================================================================
 --- src/cf.data.pre.orig
 +++ src/cf.data.pre
-@@ -1458,6 +1458,8 @@ http_access deny manager
+@@ -1460,6 +1460,8 @@ http_access deny manager
  # Adapt localnet in the ACL section to list your (internal) IP networks
  # from where browsing should be allowed
  http_access allow localnet
@@ -11,7 +11,7 @@ Index: src/cf.data.pre
  http_access allow localhost
  
  # And finally deny all other access to this proxy
-@@ -3686,6 +3688,10 @@ DOC_START
+@@ -3692,6 +3694,10 @@ DOC_START
  	Instead, if you want Squid to use the entire disk drive,
  	subtract 20% and use that value.
  
@@ -22,7 +22,7 @@ Index: src/cf.data.pre
  	'L1' is the number of first-level subdirectories which
  	will be created under the 'Directory'.  The default is 16.
  
-@@ -3804,7 +3810,7 @@ DOC_START
+@@ -3810,7 +3816,7 @@ DOC_START
  NOCOMMENT_START
  
  # Uncomment and adjust the following to add a disk cache directory.
@@ -31,7 +31,7 @@ Index: src/cf.data.pre
  NOCOMMENT_END
  DOC_END
  
-@@ -4486,7 +4492,7 @@ DOC_END
+@@ -4507,7 +4513,7 @@ DOC_END
  
  NAME: logfile_rotate
  TYPE: int
diff --git a/squid.changes b/squid.changes
index bf7ccb5..0b5dc3b 100644
--- a/squid.changes
+++ b/squid.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep  4 15:18:54 UTC 2015 - chris@computersalat.de
+
+- rebase squid-config.patch
+
 -------------------------------------------------------------------
 Thu Sep  3 12:59:31 UTC 2015 - jkeil@suse.de
 
diff --git a/squid.spec b/squid.spec
index 1100448..6fe085e 100644
--- a/squid.spec
+++ b/squid.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package squid
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed