]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 4 Jul 2011 10:53:27 +0000 (12:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 4 Jul 2011 10:53:27 +0000 (12:53 +0200)
config/rootfiles/core/50/filelists/squid [new symlink]
lfs/squid

diff --git a/config/rootfiles/core/50/filelists/squid b/config/rootfiles/core/50/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
index bdc164620a72059bedf41951a80fb6ea25ff2866..ef676a2a5f7ce69ada12598b89654c9c1e028ba9 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.1.11
+VER        = 3.1.13
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4b071d2bf4959f2d081344f2f69dd2f1
+$(DL_FILE)_MD5 = 78e756135c2bd6bbaf52eb5520f8b934
 
 install : $(TARGET)