Accepting request 331084 from server:proxy

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/331084
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/squid?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2015-09-17 07:21:24 +00:00 committed by Git OBS Bridge
commit 7ff1d84074
3 changed files with 10 additions and 5 deletions

View File

@ -2,7 +2,7 @@ Index: src/cf.data.pre
=================================================================== ===================================================================
--- src/cf.data.pre.orig --- src/cf.data.pre.orig
+++ src/cf.data.pre +++ 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 # Adapt localnet in the ACL section to list your (internal) IP networks
# from where browsing should be allowed # from where browsing should be allowed
http_access allow localnet http_access allow localnet
@ -11,7 +11,7 @@ Index: src/cf.data.pre
http_access allow localhost http_access allow localhost
# And finally deny all other access to this proxy # 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, Instead, if you want Squid to use the entire disk drive,
subtract 20% and use that value. subtract 20% and use that value.
@ -22,7 +22,7 @@ Index: src/cf.data.pre
'L1' is the number of first-level subdirectories which 'L1' is the number of first-level subdirectories which
will be created under the 'Directory'. The default is 16. will be created under the 'Directory'. The default is 16.
@@ -3804,7 +3810,7 @@ DOC_START @@ -3810,7 +3816,7 @@ DOC_START
NOCOMMENT_START NOCOMMENT_START
# Uncomment and adjust the following to add a disk cache directory. # Uncomment and adjust the following to add a disk cache directory.
@ -31,7 +31,7 @@ Index: src/cf.data.pre
NOCOMMENT_END NOCOMMENT_END
DOC_END DOC_END
@@ -4486,7 +4492,7 @@ DOC_END @@ -4507,7 +4513,7 @@ DOC_END
NAME: logfile_rotate NAME: logfile_rotate
TYPE: int TYPE: int

View File

@ -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 Thu Sep 3 12:59:31 UTC 2015 - jkeil@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package squid # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed