[PATCH] squid: Update to 3.4.14

[PATCH] squid: Update to 3.4.14

[matthias.fischer]

[-- Attachment #1: Type: text/plain, Size: 2638 bytes --]

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 \
-- 
2.5.0

Re: [PATCH] squid: Update to 3.4.14

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3050 bytes --]

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 \

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]