For details see: http://www.squid-cache.org/Versions/v5/changesets/
P.S.: For a better overview the 'squid-gcc11'-patch has been renamed and moved to an own squid-patch-directory.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org --- lfs/squid | 7 ++++--- .../{squid-gcc11.patch => squid/01_squid-gcc11.patch} | 0 2 files changed, 4 insertions(+), 3 deletions(-) rename src/patches/{squid-gcc11.patch => squid/01_squid-gcc11.patch} (100%)
diff --git a/lfs/squid b/lfs/squid index b25f594a9..034f4a3e9 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 5.2 +VER = 5.4
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 102984f3ea382a1fa5bd917c2ee155ec +$(DL_FILE)_MD5 = ea256e86fac6251f71ba4da529a1fd87
install : $(TARGET)
@@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid-gcc11.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/squid-gcc11.patch b/src/patches/squid/01_squid-gcc11.patch similarity index 100% rename from src/patches/squid-gcc11.patch rename to src/patches/squid/01_squid-gcc11.patch
Looks good to me, thank you very much for this.
@Arne: Could you pick this up for Core Update 164 please?
Reviewed-by: Peter Müller peter.mueller@ipfire.org
For details see: http://www.squid-cache.org/Versions/v5/changesets/
P.S.: For a better overview the 'squid-gcc11'-patch has been renamed and moved to an own squid-patch-directory.
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
lfs/squid | 7 ++++--- .../{squid-gcc11.patch => squid/01_squid-gcc11.patch} | 0 2 files changed, 4 insertions(+), 3 deletions(-) rename src/patches/{squid-gcc11.patch => squid/01_squid-gcc11.patch} (100%)
diff --git a/lfs/squid b/lfs/squid index b25f594a9..034f4a3e9 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 5.2 +VER = 5.4
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 102984f3ea382a1fa5bd917c2ee155ec +$(DL_FILE)_MD5 = ea256e86fac6251f71ba4da529a1fd87
install : $(TARGET)
@@ -77,7 +77,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid-gcc11.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squid/01_squid-gcc11.patch
- cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/squid-gcc11.patch b/src/patches/squid/01_squid-gcc11.patch similarity index 100% rename from src/patches/squid-gcc11.patch rename to src/patches/squid/01_squid-gcc11.patch