--- ./src/ip/Address.cc.orig	2020-08-03 03:05:13 +0000
+++ ./src/ip/Address.cc	2020-08-03 03:05:30 +0000
@@ -599,7 +599,7 @@
 
     // set defaults
     // Mac OS X does not emit a flag indicating the output is numeric (IP address)
-#if _SQUID_APPLE_
+#if _SQUID_APPLE_ || _AIX
     dst->ai_flags = 0;
 #else
     dst->ai_flags = AI_NUMERICHOST;
--- ./src/Makefile.in.orig	2020-08-03 04:44:52 +0000
+++ ./src/Makefile.in	2020-08-03 05:08:05 +0000
@@ -783,7 +783,12 @@
 	tests/testDiskIO.$(OBJEXT) tests/testStoreSupport.$(OBJEXT) \
 	tests/stub_time.$(OBJEXT) $(am__objects_12) \
 	tests/stub_libanyp.$(OBJEXT) $(am__objects_13) \
-	wordlist.$(OBJEXT) tests/stub_tools.$(OBJEXT)
+	wordlist.$(OBJEXT) tests/stub_tools.$(OBJEXT) ipc/Queue.$(OBJEXT) ipc/TypedMsgHdr.$(OBJEXT) ipc/StrandSearch.$(OBJEXT) \
+	ipc/StoreMap.$(OBJEXT) ipc/mem/Segment.$(OBJEXT) ipc/ReadWriteLock.$(OBJEXT) \
+	ipc/StrandCoord.$(OBJEXT) ipc/mem/Pages.$(OBJEXT) \
+	ipc/mem/PagePool.$(OBJEXT) ipc/mem/PageStack.$(OBJEXT) ipc/mem/Page.$(OBJEXT) \
+	acl/FilledChecklist.$(OBJEXT) acl/Gadgets.$(OBJEXT) acl/UserData.$(OBJEXT) \
+	adaptation/icap/Elements.$(OBJEXT)
 nodist_tests_testDiskIO_OBJECTS = $(am__objects_18) \
 	SquidMath.$(OBJEXT) swap_log_op.$(OBJEXT)
 tests_testDiskIO_OBJECTS = $(am_tests_testDiskIO_OBJECTS) \
@@ -1106,7 +1111,8 @@
 	tests/stub_stmem.$(OBJEXT) tests/stub_store.$(OBJEXT) \
 	tests/stub_store_stats.$(OBJEXT) tests/stub_tools.$(OBJEXT) \
 	tests/testHttp1Parser.$(OBJEXT) tests/stub_time.$(OBJEXT) \
-	tests/stub_libanyp.$(OBJEXT) wordlist.$(OBJEXT)
+	tests/stub_libanyp.$(OBJEXT) wordlist.$(OBJEXT) ip/Address.$(OBJEXT) \
+	ip/tools.$(OBJEXT) anyp/ProtocolType.$(OBJEXT)
 nodist_tests_testHttp1Parser_OBJECTS = $(am__objects_18)
 tests_testHttp1Parser_OBJECTS = $(am_tests_testHttp1Parser_OBJECTS) \
 	$(nodist_tests_testHttp1Parser_OBJECTS)
@@ -1144,7 +1150,9 @@
 	tests/stub_store_stats.$(OBJEXT) tests/stub_tools.$(OBJEXT) \
 	tests/stub_HttpRequest.$(OBJEXT) tests/testHttpReply.$(OBJEXT) \
 	tests/stub_time.$(OBJEXT) tests/stub_libanyp.$(OBJEXT) \
-	wordlist.$(OBJEXT)
+	wordlist.$(OBJEXT) acl/Gadgets.$(OBJEXT) ipc/Inquirer.$(OBJEXT) \
+	ipc/TypedMsgHdr.$(OBJEXT) ipc/Port.$(OBJEXT) ipc/UdsOp.$(OBJEXT) \
+	ipc/FdNotes.$(OBJEXT)
 nodist_tests_testHttpReply_OBJECTS = $(am__objects_18)
 tests_testHttpReply_OBJECTS = $(am_tests_testHttpReply_OBJECTS) \
 	$(nodist_tests_testHttpReply_OBJECTS)
@@ -1301,7 +1309,7 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testHttpRequest_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_tests_testIcmp_OBJECTS = tests/testIcmp.$(OBJEXT)
+am_tests_testIcmp_OBJECTS = tests/testIcmp.$(OBJEXT) ip/Address.$(OBJEXT) ip/tools.$(OBJEXT)
 nodist_tests_testIcmp_OBJECTS = tests/stub_debug.$(OBJEXT) \
 	tests/stub_libmem.$(OBJEXT) tests/stub_SBuf.$(OBJEXT) \
 	time.$(OBJEXT) globals.$(OBJEXT)
@@ -1314,7 +1322,7 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
 	$(AM_CXXFLAGS) $(CXXFLAGS) $(tests_testIcmp_LDFLAGS) \
 	$(LDFLAGS) -o $@
-am_tests_testIpAddress_OBJECTS = tests/testAddress.$(OBJEXT)
+am_tests_testIpAddress_OBJECTS = tests/testAddress.$(OBJEXT) ip/Address.$(OBJEXT) ip/tools.$(OBJEXT)
 nodist_tests_testIpAddress_OBJECTS = tests/stub_debug.$(OBJEXT) \
 	tests/stub_libmem.$(OBJEXT) tests/stub_tools.$(OBJEXT)
 tests_testIpAddress_OBJECTS = $(am_tests_testIpAddress_OBJECTS) \
@@ -1342,7 +1350,7 @@
 am_tests_testNetDb_OBJECTS = tests/testNetDb.$(OBJEXT)
 nodist_tests_testNetDb_OBJECTS = tests/stub_debug.$(OBJEXT) \
 	tests/stub_libmem.$(OBJEXT) tests/stub_SBuf.$(OBJEXT) \
-	time.$(OBJEXT) globals.$(OBJEXT)
+	time.$(OBJEXT) globals.$(OBJEXT) ip/Address.$(OBJEXT) ip/tools.$(OBJEXT)
 tests_testNetDb_OBJECTS = $(am_tests_testNetDb_OBJECTS) \
 	$(nodist_tests_testNetDb_OBJECTS)
 tests_testNetDb_DEPENDENCIES = icmp/libicmp.la ip/libip.la \
@@ -1595,7 +1603,8 @@
 	tests/testStoreHashIndex.$(OBJEXT) \
 	tests/testStoreSupport.$(OBJEXT) tests/TestSwapDir.$(OBJEXT) \
 	tests/stub_time.$(OBJEXT) tests/stub_libanyp.$(OBJEXT) \
-	wordlist.$(OBJEXT)
+	wordlist.$(OBJEXT) ipc/StoreMap.$(OBJEXT) ipc/ReadWriteLock.$(OBJEXT) ipc/mem/Segment.$(OBJEXT) \
+        ipc/TypedMsgHdr.$(OBJEXT)  acl/Gadgets.$(OBJEXT)
 nodist_tests_testStore_OBJECTS = $(am__objects_18) SquidMath.$(OBJEXT) \
 	swap_log_op.$(OBJEXT)
 tests_testStore_OBJECTS = $(am_tests_testStore_OBJECTS) \
@@ -1623,7 +1632,7 @@
 	tests/stub_debug.$(OBJEXT) \
 	tests/stub_HelperChildConfig.$(OBJEXT) \
 	tests/stub_libmem.$(OBJEXT) tests/stub_tools.$(OBJEXT) \
-	tests/stub_time.$(OBJEXT) wordlist.$(OBJEXT)
+	tests/stub_time.$(OBJEXT) wordlist.$(OBJEXT) ip/Address.$(OBJEXT) ip/tools.$(OBJEXT)
 nodist_tests_testString_OBJECTS = $(am__objects_18)
 tests_testString_OBJECTS = $(am_tests_testString_OBJECTS) \
 	$(nodist_tests_testString_OBJECTS)
@@ -1885,7 +1894,11 @@
 	tests/stub_access_log.$(OBJEXT) refresh.$(OBJEXT) \
 	tests/stub_store_client.$(OBJEXT) tests/stub_tools.$(OBJEXT) \
 	tests/testStoreSupport.$(OBJEXT) time.$(OBJEXT) \
-	wordlist.$(OBJEXT)
+	wordlist.$(OBJEXT) acl/Gadgets.$(OBJEXT) acl/UserData.$(OBJEXT) adaptation/icap/Elements.$(OBJEXT) \
+        ipc/StoreMap.$(OBJEXT) ipc/ReadWriteLock.$(OBJEXT) ipc/TypedMsgHdr.$(OBJEXT) ipc/Queue.$(OBJEXT) \
+        ipc/mem/Segment.$(OBJEXT) ipc/mem/PageStack.$(OBJEXT) ipc/mem/Pages.$(OBJEXT) ipc/mem/PagePool.$(OBJEXT) \
+        ipc/StrandCoord.$(OBJEXT) ipc/StrandSearch.$(OBJEXT) mgr/Action.$(OBJEXT) mgr/StoreIoAction.$(OBJEXT) \
+        mgr/Response.$(OBJEXT) ipc/mem/Page.$(OBJEXT)
 nodist_tests_testUfs_OBJECTS = $(am__objects_18) SquidMath.$(OBJEXT) \
 	swap_log_op.$(OBJEXT)
 tests_testUfs_OBJECTS = $(am_tests_testUfs_OBJECTS) \
@@ -3454,13 +3467,11 @@
 	CommCalls.o \
 	http/libhttp.la \
 	parser/libparser.la \
-	acl/libacls.la \
 	acl/libapi.la \
 	acl/libstate.la \
 	anyp/libanyp.la \
 	ip/libip.la \
 	base/libbase.la \
-	ipc/libipc.la \
 	mem/libmem.la \
 	sbuf/libsbuf.la \
 	$(top_builddir)/lib/libmisccontainers.la \
@@ -4027,14 +4038,11 @@
 	SquidConfig.o \
 	CommCalls.o \
 	ident/libident.la \
-	acl/libacls.la \
 	acl/libstate.la \
 	comm/libcomm.la \
 	ip/libip.la \
 	fs/libfs.la \
-	ipc/libipc.la \
 	$(REPL_OBJS) \
-	$(ADAPTATION_LIBS) \
 	DiskIO/libdiskio.la \
 	acl/libapi.la \
 	anyp/libanyp.la \
@@ -4803,8 +4811,8 @@
 tests_testTokenizer_LDFLAGS = $(LIBADD_DL)
 tests_testTokenizer_LDADD = \
 	parser/libparser.la \
-	base/libbase.la \
 	sbuf/libsbuf.la \
+	base/libbase.la \
 	$(top_builddir)/lib/libmiscutil.la \
 	$(LIBCPPUNIT_LIBS) \
 	$(COMPAT_LIB) \
@@ -4847,10 +4855,8 @@
 tests_testHttp1Parser_LDADD = \
 	http/libhttp.la \
 	parser/libparser.la \
-	anyp/libanyp.la \
 	SquidConfig.o \
 	base/libbase.la \
-	ip/libip.la \
 	sbuf/libsbuf.la \
 	$(top_builddir)/lib/libmiscutil.la \
 	$(SSLLIB) \
@@ -5112,7 +5118,6 @@
 tests_testIcmp_LDFLAGS = $(LIBADD_DL)
 tests_testIcmp_LDADD = \
 	icmp/libicmpcore.la \
-	ip/libip.la \
 	base/libbase.la \
 	$(LIBCPPUNIT_LIBS) \
 	$(COMPAT_LIB) \
@@ -5133,7 +5138,6 @@
 tests_testNetDb_LDFLAGS = $(LIBADD_DL)
 tests_testNetDb_LDADD = \
 	icmp/libicmp.la \
-	ip/libip.la \
 	base/libbase.la \
 	$(top_builddir)/lib/libmisccontainers.la \
 	$(LIBCPPUNIT_LIBS) \
@@ -5151,7 +5155,6 @@
 	tests/stub_tools.cc
 
 tests_testIpAddress_LDADD = \
-	ip/libip.la \
 	base/libbase.la \
 	$(LIBCPPUNIT_LIBS) \
 	$(COMPAT_LIB) \
@@ -5293,21 +5296,16 @@
 	libsquid.la \
 	http/libhttp.la \
 	parser/libparser.la \
-	ident/libident.la \
-	acl/libacls.la \
 	acl/libstate.la \
 	acl/libapi.la \
 	dns/libdns.la \
 	base/libbase.la \
 	ip/libip.la \
-	fs/libfs.la \
 	mgr/libmgr.la \
-	ipc/libipc.la \
 	anyp/libanyp.la \
 	mem/libmem.la \
 	store/libstore.la \
 	sbuf/libsbuf.la \
-	DiskIO/libdiskio.la \
 	$(top_builddir)/lib/libmisccontainers.la \
 	$(top_builddir)/lib/libmiscencoding.la \
 	$(top_builddir)/lib/libmiscutil.la \
@@ -5346,7 +5344,6 @@
 tests_testString_LDADD = \
 	base/libbase.la \
 	libsquid.la \
-	ip/libip.la \
 	sbuf/libsbuf.la \
 	$(top_builddir)/lib/libmiscutil.la \
 	$(REGEXLIB) \
@@ -5512,27 +5509,22 @@
 	parser/libparser.la \
 	CommCalls.o \
 	ident/libident.la \
-	acl/libacls.la \
 	acl/libstate.la \
 	acl/libapi.la \
 	libsquid.la \
 	ip/libip.la \
 	fs/libfs.la \
-	mgr/libmgr.la \
 	$(REPL_OBJS) \
-	acl/libacls.la \
 	DiskIO/libdiskio.la \
 	acl/libapi.la \
 	anyp/libanyp.la \
 	$(SSL_LIBS) \
-	ipc/libipc.la \
 	comm/libcomm.la \
 	dns/libdns.la \
 	base/libbase.la \
 	ip/libip.la \
 	mem/libmem.la \
 	store/libstore.la \
-	$(ADAPTATION_LIBS) \
 	sbuf/libsbuf.la \
 	$(top_builddir)/lib/libmisccontainers.la \
 	$(top_builddir)/lib/libmiscencoding.la \
@@ -5701,7 +5693,6 @@
 	$(COMMON_LIBS) \
 	$(REPL_OBJS) \
 	DiskIO/libdiskio.la \
-	acl/libacls.la \
 	acl/libapi.la \
 	acl/libstate.la \
 	anyp/libanyp.la \
@@ -5711,7 +5702,6 @@
 	base/libbase.la \
 	mem/libmem.la \
 	store/libstore.la \
-	$(ADAPTATION_LIBS) \
 	sbuf/libsbuf.la \
 	$(top_builddir)/lib/libmisccontainers.la \
 	$(top_builddir)/lib/libmiscencoding.la \
@@ -6028,8 +6018,6 @@
 	$(TESTSOURCES)
 
 tests_testConfigParser_LDADD = \
-	libsquid.la \
-	ip/libip.la \
 	sbuf/libsbuf.la \
 	base/libbase.la \
 	$(top_builddir)/lib/libmiscutil.la \
--- src/Makefile.in.orig	2020-08-03 09:25:06 +0000
+++ src/Makefile.in	2020-08-03 09:25:25 +0000
@@ -1449,7 +1449,7 @@
 	tests/stub_store_rebuild.$(OBJEXT) \
 	tests/stub_store_stats.$(OBJEXT) tests/stub_tools.$(OBJEXT) \
 	time.$(OBJEXT) tests/stub_libanyp.$(OBJEXT) wordlist.$(OBJEXT) \
-	$(am__objects_3) $(am__objects_12)
+	$(am__objects_3) $(am__objects_12) acl/Gadgets.$(OBJEXT)  adaptation/icap/Elements.$(OBJEXT)
 nodist_tests_testRock_OBJECTS = swap_log_op.$(OBJEXT) \
 	SquidMath.$(OBJEXT) $(am__objects_18)
 tests_testRock_OBJECTS = $(am_tests_testRock_OBJECTS) \