From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] squid: Update to 3.4.14
Date: Fri, 07 Aug 2015 21:13:08 +0100
Message-ID: <1438978388.9658.0.camel@ipfire.org>
In-Reply-To: <1438967222-5625-1-git-send-email-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5858881482916804888=="
List-Id: <development.lists.ipfire.org>

--===============5858881482916804888==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Hello,

the rootfile looks okay.

You should remove the old patch files that you do not need any more.
Use "git rm" for that and commit that change so that it will be
included in the patch, too.

Merged this, but I cannot push at the moment.

-Michael

On Fri, 2015-08-07 at 19:07 +0200, matthias.fischer(a)ipfire.org wrote:
> From: Matthias Fischer <matthias.fischer(a)ipfire.org>
> 
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
>  config/rootfiles/common/squid | 3 +++
>  lfs/squid                     | 7 +++----
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/config/rootfiles/common/squid 
> b/config/rootfiles/common/squid
> index 1b78c8e..f0fb6e5 100644
> --- a/config/rootfiles/common/squid
> +++ b/config/rootfiles/common/squid
> @@ -2082,6 +2082,8 @@ usr/lib/squid/errors/tr/error-details.txt
>  usr/lib/squid/ext_edirectory_userip_acl
>  usr/lib/squid/ext_file_userip_acl
>  usr/lib/squid/ext_kerberos_ldap_group_acl
> +usr/lib/squid/negotiate_kerberos_auth
> +usr/lib/squid/negotiate_kerberos_auth_test
>  usr/lib/squid/ext_ldap_group_acl
>  usr/lib/squid/ext_session_acl
>  usr/lib/squid/ext_sql_session_acl
> @@ -2173,6 +2175,7 @@ usr/sbin/updxlrator
>  #usr/share/man/man8/ext_unix_group_acl.8
>  #usr/share/man/man8/ext_wbinfo_group_acl.8
>  #usr/share/man/man8/log_db_daemon.8
> +#usr/share/man/man8/negotiate_kerberos_auth.8
>  #usr/share/man/man8/squid.8
>  #usr/share/man/man8/storeid_file_rewrite.8
>  #var/cache/squid
> diff --git a/lfs/squid b/lfs/squid
> index a338660..d8c8a05 100644
> --- a/lfs/squid
> +++ b/lfs/squid
> @@ -1,7 +1,7 @@
>  ####################################################################
> ###########
>  #                                                                   
>           #
>  # IPFire.org - A linux based firewall                               
>           #
> -# Copyright (C) 2007-2012  IPFire Team  <info(a)ipfire.org>           
>           #
> +# Copyright (C) 2007-2015  IPFire Team  <info(a)ipfire.org>           
>           #
>  #                                                                   
>           #
>  # This program is free software: you can redistribute it and/or 
> modify        #
>  # it under the terms of the GNU General Public License as published 
> by        #
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 3.4.13
> +VER        = 3.4.14
>  
>  THISAPP    = squid-$(VER)
>  DL_FILE    = $(THISAPP).tar.xz
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = a5f6c978b2d7a99b161c8275e1acb470
> +$(DL_FILE)_MD5 = 4e7d7d062159484563ef11f69a0df50a
>  
>  install : $(TARGET)
>  
> @@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) :
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf 
> $(DIR_DL)/$(DL_FILE)
> -	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid
> -3.4-13225.patch
>  	cd $(DIR_APP) && ./configure \
>  		--prefix=/usr \
>  		--sysconfdir=/etc/squid \

--===============5858881482916804888==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjEKCmlRSWNCQUFC
Q2dBR0JRSlZ4UkZVQUFvSkVJQjU4UDl2a0FrSGRqMFAvMjVBSnduZDRLYndCVzFSa3BCSDhTdjgK
YWhpQzhlMXQ0TVhmN25NOGJRcFBJNys5c2ZINkpDTVcrSWlWdm5EdGJEc0pDTW42VGhVTjRmbGdH
M2pla0lEdQpRWWJ6UWtIUy9VS2ZCME9OdXBWYzhLbGJhV01DQWt1SkMyWnBoUkFFbERVZGNEZFdN
NVl3MVNweEMyK0czNHd1Cm52a3pCeWVFdTJXeVdxTHdLaytqWG5uTjkrTlRwUDc2OFBpdjl4eWRj
R0MvcC82TUZURklvOUlIdElOYnh2ZmwKbS9JQ1BGdGFyYzNWKzlodjRxVlVha2tXandRSGdvZG15
R1Q3b2cxUFdlZkQvRFRxM2VxUGxzV3JNc1JOU3E3dQo2aTN3dzZMRWdhb3ZuTW5idVdhbFh6bUVS
bVZjQ1dRRTNweVRCTkdQV3BvRmNhRlN3V2JOaHNsYlltMlloNGFYCjF0U1d6cjBGb3BLL2JOb20y
TVpPc01EY25kNkdXS3VpYlpTdUQ2WHpQaUhpVDhFbExrL0w0MjV2d3dZNktmVy8KT21sdGVqYnVv
M2Rnc2VrWnJBY28vMTNjWmQvY0JjaE5MTzhiTkYyeUl6cGIrL2lCVGVQT1Iwajc1c2V6NHk1aApP
RkNOL04wOGxxeG9FNHg1U3N0SENQUnNWSGRlMkVJMi9CZEYzeDJ0T21SQUs3OVRHaUZYVUF1T0d6
K3NXQTV3CnJFbTZDYnp6bkJRb0xhVDVvRk5ZYlVsMkJGWUxiMUk3Z1pLRlJabHNjWHk5MmRpRnZt
TUpaNXZwN3lGNTlVS3UKd0hVK2RuYXphOStqSUhvWkNpSlRUUHN4eS8xNzkvT2RZVWQ1V2REWWRT
eFdPUTNrVFBmaElmZTRTSEMxMndnaAo5Y0kxQkdzVW1OWUI2NHg0Q2QzYgo9RUdaYQotLS0tLUVO
RCBQR1AgU0lHTkFUVVJFLS0tLS0K

--===============5858881482916804888==--