upgrading package: squid 3.5.28 -> 4.6

squid/squid.patch

@@ -1,7 +1,7 @@
 Index: errors/Makefile.in
---- errors/Makefile.in.orig	2017-01-28 04:56:15.000000000 +0100
-+++ errors/Makefile.in	2017-02-12 10:47:17.845922000 +0100
-@@ -766,7 +766,7 @@
+--- errors/Makefile.in.orig	2019-02-19 04:04:37.000000000 +0100
++++ errors/Makefile.in	2019-02-27 20:05:54.197567000 +0100
+@@ -773,7 +773,7 @@
  	$(INSTALL_DATA) $(srcdir)/TRANSLATORS $(DESTDIR)$(DEFAULT_ERROR_DIR)/TRANSLATORS; \
  	$(INSTALL_DATA) $(srcdir)/COPYRIGHT $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT; \
  	$(INSTALL_DATA) $(srcdir)/errorpage.css $(DESTDIR)$(DEFAULT_STYLESHEET).default; \
@@ -10,7 +10,7 @@ Index: errors/Makefile.in
  
  uninstall-local:
  	for l in $(TRANSLATE_LANGUAGES) templates; do \
-@@ -793,7 +793,7 @@
+@@ -800,7 +800,7 @@
  	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT
  
  upgrade: install
@@ -20,8 +20,8 @@ Index: errors/Makefile.in
  dist-hook: translate
  	for lang in $(TRANSLATE_LANGUAGES); do \
 Index: errors/alias-link.sh
---- errors/alias-link.sh.orig	2017-01-28 04:54:46.000000000 +0100
-+++ errors/alias-link.sh	2017-02-12 10:47:17.846055000 +0100
+--- errors/alias-link.sh.orig	2019-02-19 03:46:22.000000000 +0100
++++ errors/alias-link.sh	2019-02-27 20:05:54.197689000 +0100
 @@ -16,8 +16,9 @@
  
  LN="${1}"
@@ -45,21 +45,34 @@ Index: errors/alias-link.sh
  	done
  done
 Index: src/Debug.h
---- src/Debug.h.orig	2017-01-28 04:54:46.000000000 +0100
-+++ src/Debug.h	2017-02-12 10:47:17.846192000 +0100
-@@ -11,6 +11,8 @@
- #ifndef SQUID_DEBUG_H
- #define SQUID_DEBUG_H
+--- src/Debug.h.orig	2019-02-19 03:46:22.000000000 +0100
++++ src/Debug.h	2019-02-27 20:05:54.197833000 +0100
+@@ -15,6 +15,8 @@
+ // XXX should be mem/forward.h once it removes dependencies on typedefs.h
+ #include "mem/AllocatorProxy.h"
  
 +#include <stdio.h>
 +
  #include <iostream>
  #undef assert
  #include <sstream>
+Index: src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc
+--- src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc.orig	2019-02-19 03:46:22.000000000 +0100
++++ src/acl/external/eDirectory_userip/ext_edirectory_userip_acl.cc	2019-02-27 20:05:54.199119000 +0100
+@@ -56,6 +56,9 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <ctime>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #ifdef HAVE_ARPA_INET_H
+ #include <arpa/inet.h>
+ #endif
 Index: src/cf.data.pre
---- src/cf.data.pre.orig	2017-01-28 04:54:46.000000000 +0100
-+++ src/cf.data.pre	2017-02-12 10:47:17.847197000 +0100
-@@ -1932,7 +1932,7 @@
+--- src/cf.data.pre.orig	2019-02-19 03:46:22.000000000 +0100
++++ src/cf.data.pre	2019-02-27 20:05:54.198824000 +0100
+@@ -2304,7 +2304,7 @@
  NOCOMMENT_START
  
  # Squid normally listens to port 3128

squid/squid.spec

@@ -22,9 +22,8 @@
 ##
 
 #   package version
-%define       V_maj  3
-%define       V_min  5
-%define       V_rev  28
+%define       V_maj  4
+%define       V_min  6
 
 #   package information
 Name:         squid
@@ -36,8 +35,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Web
 License:      GPL
-Version:      %{V_maj}.%{V_min}.%{V_rev}
-Release:      20180716
+Version:      %{V_maj}.%{V_min}
+Release:      20190227
 
 #   package options
 %option       with_fsl        yes
@@ -50,7 +49,7 @@ Release:      20180716
 %option       with_esi        no
 
 #   list of sources
-Source0:      http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/squid-%{V_maj}.%{V_min}.%{V_rev}.tar.gz
+Source0:      http://www.squid-cache.org/Versions/v%{V_maj}/squid-%{V_maj}.%{V_min}.tar.gz
 Source1:      rc.squid
 Source2:      fsl.squid
 Source3:      squid.conf
@@ -85,13 +84,13 @@ BuildPreReq:  libecap
 
 %track
     prog squid = {
-        version   = %{V_maj}.%{V_min}.%{V_rev}
-        url       = http://www.squid-cache.org/Versions/v%{V_maj}/%{V_maj}.%{V_min}/
-        regex     = squid-(%{V_maj}\.\d+(?:\.\d+)+)\.tar\.gz
+        version   = %{V_maj}.%{V_min}
+        url       = http://www.squid-cache.org/Versions/v%{V_maj}/
+        regex     = squid-(\d+\.\d+)\.tar\.gz
     }
 
 %prep
-    %setup -q -n squid-%{V_maj}.%{V_min}.%{V_rev}
+    %setup -q
     %patch -p0
 
 %build