Index: errors/Makefile.in
--- 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; \
-	$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
+	$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)" "$(DEFAULT_ERROR_DIR)" "$(srcdir)/aliases" || exit 1 ;
 
 uninstall-local:
 	for l in $(TRANSLATE_LANGUAGES) templates; do \
@@ -800,7 +800,7 @@
 	rm -f $(DESTDIR)$(DEFAULT_ERROR_DIR)/COPYRIGHT
 
 upgrade: install
-	$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)$(DEFAULT_ERROR_DIR)" "$(srcdir)/alias-upgrade" || exit 1 ;
+	$(SHELL) $(srcdir)/alias-link.sh "$(LN)" "$(RM)" "$(DESTDIR)" "$(DEFAULT_ERROR_DIR)" "$(srcdir)/alias-upgrade" || exit 1 ;
 
 dist-hook: translate
 	for lang in $(TRANSLATE_LANGUAGES); do \
Index: errors/alias-link.sh
--- 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}"
 RM="${2}"
-DIR="${3}"
-ALIASFILE="${4}"
+DESTDIR="${3}"
+DIR="${4}"
+ALIASFILE="${5}"
 
 if ! test -f ${ALIASFILE} ; then
 	echo "FATAL: Alias file ${ALIASFILE} does not exist!"
@@ -45,7 +46,7 @@
 	# split aliases based on whitespace and create a symlink for each
 	# Remove and replace any pre-existing content/link
 	for alia in ${aliases}; do
-		${RM} -f -r ${DIR}/${alia} || exit 1
-		${LN} -s ${base} ${DIR}/${alia} || exit 1
+		${RM} -f -r ${DESTDIR}${DIR}/${alia} || exit 1
+		${LN} -s ${DIR}/${base} ${DESTDIR}${DIR}/${alia} || exit 1
 	done
 done
Index: src/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	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
-http_port @DEFAULT_HTTP_PORT@
+http_port 127.0.0.1:@DEFAULT_HTTP_PORT@
 NOCOMMENT_END
 DOC_END