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 efccb4330333aa4460475fa96539e1613697896b (commit) via 86eda7b5521f04fbf3648534a35f89409a94837a (commit) via fb196971e9bac3b8055547f8273e4bad786f896d (commit) via 03306ff6a25238e01a1f2b39fbb929cf56615934 (commit) from be700f1806ed83225923dbd85b4574b8220db698 (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 efccb4330333aa4460475fa96539e1613697896b Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat May 7 13:01:58 2016 +0200

squid: Update to 3.5.18

Removed unecessary quotations and two configure-options, see: ftp://ftp.fu-berlin.de/unix/www/squid/archive/3.1/squid-3.1.0.16-RELEASENOTES.html

--with-aio Deprecated. POSIX AIO is now auto-detected and enabled. Use --without-aio to disable, but only if you really have to.

--with-pthreads Deprecated. pthreads library is now auto-detected and enabled. Use --without-pthreads to disable, but only if you really have to.

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 86eda7b5521f04fbf3648534a35f89409a94837a Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 7 13:23:28 2016 +0100

tor: Update to 0.2.7.6

Fixes #11117

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit fb196971e9bac3b8055547f8273e4bad786f896d Merge: 03306ff be700f1 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat May 7 12:32:27 2016 +0100

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 03306ff6a25238e01a1f2b39fbb929cf56615934 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 3 22:50:53 2016 +0100

general-functions.pl: Allow underscores in domain names

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/cfgroot/general-functions.pl | 13 ++++--------- lfs/squid | 12 +++++------- lfs/tor | 6 +++--- 3 files changed, 12 insertions(+), 19 deletions(-)

Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index f3a2e47..d3d7251 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -633,15 +633,10 @@ sub validdomainname # Each part should be no more than 63 characters in length if (length ($part) < 1 || length ($part) > 63) { return 0;} - # Only valid characters are a-z, A-Z, 0-9 and - - if ($part !~ /^[a-zA-Z0-9-]*$/) { - return 0;} - # First character can only be a letter or a digit - if (substr ($part, 0, 1) !~ /^[a-zA-Z0-9]*$/) { - return 0;} - # Last character can only be a letter or a digit - if (substr ($part, -1, 1) !~ /^[a-zA-Z0-9]*$/) { - return 0;} + # Only valid characters are a-z, A-Z, 0-9, _ and - + if ($part !~ /^[a-zA-Z0-9_-]*$/) { + return 0; + } } return 1; } diff --git a/lfs/squid b/lfs/squid index 66ad875..a7edc9d 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@

include Config

-VER = 3.5.17 +VER = 3.5.18

THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 2dc73cc01e77b1bd16d9070780ae79b1 +$(DL_FILE)_MD5 = 9ae3843c341e8a142e963ab937c51cdd

install : $(TARGET)

@@ -92,10 +92,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-ipv6 \ --enable-poll \ --enable-ident-lookups \ - --enable-storeio="aufs,diskd,ufs" \ + --enable-storeio=aufs,diskd,ufs \ --enable-underscores \ --enable-http-violations \ - --enable-removal-policies="heap,lru" \ + --enable-removal-policies=heap,lru \ --enable-delay-pools \ --enable-linux-netfilter \ --enable-snmp \ @@ -119,11 +119,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-kill-parent-hack \ --enable-icap-client \ --enable-zph-qos \ - --with-pthreads \ --with-dl \ --with-filedescriptors=$$(( 16384 * 64 )) \ - --with-large-files \ - --with-aio + --with-large-files

cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/tor b/lfs/tor index 91eab09..4cecf23 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@

include Config

-VER = 0.2.6.9 +VER = 0.2.7.6

THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 15 +PAK_VER = 16

DEPS = ""

@@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 4a1b334c30d7b37ea72fa33425220d5d +$(DL_FILE)_MD5 = cc19107b57136a68e8c563bf2d35b072

install : $(TARGET)

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