[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 11073720a2bc5bfd8ce4b9e28c8dc311f1c4edf4

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 11073720a2bc5bfd8ce4b9e28c8dc311f1c4edf4

[git]

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  11073720a2bc5bfd8ce4b9e28c8dc311f1c4edf4 (commit)
      from  1b4d5ad9af5d3603331f31aef5dca67833808694 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 11073720a2bc5bfd8ce4b9e28c8dc311f1c4edf4
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Wed Oct 12 21:04:48 2016 +0200

    squid: Update to 3.5.22
    
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/squid                                                           | 6 +++---
 ...escriptors.patch => squid-3.5.22-fix-max-file-descriptors.patch} | 0
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename src/patches/{squid-3.5.21-fix-max-file-descriptors.patch => squid-3.5.22-fix-max-file-descriptors.patch} (100%)

Difference in files:
diff --git a/lfs/squid b/lfs/squid
index ae8e1e9..269c663 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.5.21
+VER        = 3.5.22
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = e6745a6e4ac0b48b7283861f64a40ae5
+$(DL_FILE)_MD5 = afb82d2748c06c95815c171463b4aa14
 
 install : $(TARGET)
 
@@ -70,7 +70,7 @@ $(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 -i $(DIR_SRC)/src/patches/squid-3.5.21-fix-max-file-descriptors.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.22-fix-max-file-descriptors.patch
 
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/squid-3.5.21-fix-max-file-descriptors.patch b/src/patches/squid-3.5.21-fix-max-file-descriptors.patch
deleted file mode 100644
index b740b61..0000000
--- a/src/patches/squid-3.5.21-fix-max-file-descriptors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.ac.~	Wed Apr 20 14:26:07 2016
-+++ configure.ac	Fri Apr 22 17:20:46 2016
-@@ -3135,6 +3135,9 @@
-     ;;
- esac
- 
-+SQUID_CHECK_DEFAULT_FD_SETSIZE
-+SQUID_CHECK_MAXFD
-+
- dnl --with-maxfd present for compatibility with Squid-2.
- dnl undocumented in ./configure --help  to encourage using the Squid-3 directive
- AC_ARG_WITH(maxfd,,
-@@ -3165,8 +3168,6 @@
-     esac
- ])
- 
--SQUID_CHECK_DEFAULT_FD_SETSIZE
--SQUID_CHECK_MAXFD
- if test "x$squid_filedescriptors_num" != "x"; then
-   AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
- fi
diff --git a/src/patches/squid-3.5.22-fix-max-file-descriptors.patch b/src/patches/squid-3.5.22-fix-max-file-descriptors.patch
new file mode 100644
index 0000000..b740b61
--- /dev/null
+++ b/src/patches/squid-3.5.22-fix-max-file-descriptors.patch
@@ -0,0 +1,21 @@
+--- configure.ac.~	Wed Apr 20 14:26:07 2016
++++ configure.ac	Fri Apr 22 17:20:46 2016
+@@ -3135,6 +3135,9 @@
+     ;;
+ esac
+ 
++SQUID_CHECK_DEFAULT_FD_SETSIZE
++SQUID_CHECK_MAXFD
++
+ dnl --with-maxfd present for compatibility with Squid-2.
+ dnl undocumented in ./configure --help  to encourage using the Squid-3 directive
+ AC_ARG_WITH(maxfd,,
+@@ -3165,8 +3168,6 @@
+     esac
+ ])
+ 
+-SQUID_CHECK_DEFAULT_FD_SETSIZE
+-SQUID_CHECK_MAXFD
+ if test "x$squid_filedescriptors_num" != "x"; then
+   AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
+ fi


hooks/post-receive
--
IPFire 2.x development tree