@@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 # version number

 VERSION = 5

-PATCHLEVEL = 6

+PATCHLEVEL = 7

 SUBLEVEL =  0

-EXTRAVERSION = -pre2

+EXTRAVERSION = -dev0

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 6

 SUBLEVEL =  0

-EXTRAVERSION = -pre1

+EXTRAVERSION = -pre2

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 6

 SUBLEVEL =  0

-EXTRAVERSION = -pre0

+EXTRAVERSION = -pre1

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 6

 SUBLEVEL =  0

-EXTRAVERSION = -dev4

+EXTRAVERSION = -pre0

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 6

 SUBLEVEL =  0

-EXTRAVERSION = -dev3

+EXTRAVERSION = -dev4

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -283,7 +283,7 @@ ifneq (,$(findstring gcc, $(CC_LONGVER)))

 	# sed with POSIX.1 regex doesn't support |, + or ?

 	# (darwin, solaris ...) => this complicated expression

 	MKDEP=$(CC) -MM -MG

-	#transform gcc version into 2.9x or 3.0

+	#transform gcc version into some well-known versions, or 9 for newer versions

 	CC_SHORTVER:=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \

 				 sed -e 's/[^0-9]*-\(.*\)/\1/'| \

 				 sed -e 's/2\.9.*/2.9x/' \

@@ -310,7 +310,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER)))

 					-e 's/10\.[0-9]\..*/9.0+/' \

 					-e 's/10\.[0-9]$$/9.0+/' \

 					-e 's/11\.[0-9]\..*/9.0+/' \

-					-e 's/11\.[0-9]$$/9.0+/')

+					-e 's/11\.[0-9]$$/9.0+/' \

+					-e 's/12\.[0-9]\..*/9.0+/' \

+					-e 's/12\.[0-9]$$/9.0+/')

 ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 	# dependencies can be generated on-the-fly while compiling *.c

 	CC_MKDEP_OPTS=-MMD -MP

@@ -524,7 +524,12 @@ ifeq ($(OS), darwin)

 	doc_dir = share/doc/$(MAIN_NAME)/

 	man_dir = man/

 	data_dir = share/$(MAIN_NAME)/

+	MACPORTS = $(shell which port 2>/dev/null)

+ifeq ($(MACPORTS),)

 	LOCALBASE ?= /usr/local

+else

+	LOCALBASE ?= /opt/local

+endif

 endif

 LOCALBASE ?= /usr/local

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 6

 SUBLEVEL =  0

-EXTRAVERSION = -dev2

+EXTRAVERSION = -dev3

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -1890,7 +1890,7 @@ ifeq ($(OS), linux)

 	endif

 	ifeq ($(CC_NAME), gcc)

 		# link librt for glibc <= 2.17

-		GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' )

+		GLIBCVER=$(shell ldd --version | head -1 | sed -e 's/^.* //' -e 's/\.//' )

 		ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt)

 			LIBS+=-lrt

 		endif

@@ -1888,6 +1888,13 @@ ifeq ($(OS), linux)

 	ifeq ($(NO_SELECT),)

 		C_DEFS+=-DHAVE_SELECT

 	endif

+	ifeq ($(CC_NAME), gcc)

+		# link librt for glibc <= 2.17

+		GLIBCVER:=$(shell ldd --version | head -1 | awk '{ sub(/\./, "", $NF); print $NF }' )

+		ifeq ($(shell [ $(GLIBCVER) -le 217 ] && echo librt), librt)

+			LIBS+=-lrt

+		endif

+	endif

 endif

 ifeq ($(OS), gnu_kfreebsd)

@@ -308,7 +308,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER)))

 					-e 's/9\.[0-9]\..*/9.0+/' \

 					-e 's/9\.[0-9]$$/9.0+/' \

 					-e 's/10\.[0-9]\..*/9.0+/' \

-					-e 's/10\.[0-9]$$/9.0+/')

+					-e 's/10\.[0-9]$$/9.0+/' \

+					-e 's/11\.[0-9]\..*/9.0+/' \

+					-e 's/11\.[0-9]$$/9.0+/')

 ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 	# dependencies can be generated on-the-fly while compiling *.c

 	CC_MKDEP_OPTS=-MMD -MP

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 6

 SUBLEVEL =  0

-EXTRAVERSION = -dev1

+EXTRAVERSION = -dev2

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 6

 SUBLEVEL =  0

-EXTRAVERSION = -dev0

+EXTRAVERSION = -dev1

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -923,8 +923,8 @@ ifeq ($(use_fast_lock), yes)

 	found_lock_method=yes

 endif

-CFLAGS=

-LDFLAGS=

+CFLAGS=-g

+LDFLAGS=-g

 C_INCLUDES=

 # setting CFLAGS

 ifeq ($(mode), release)

@@ -934,7 +934,7 @@ ifeq	($(ARCH), i386)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS=-g $(CC_OPT) -funroll-loops  -Wcast-align $(PROFILE)

+				CFLAGS+=$(CC_OPT) -funroll-loops  -Wcast-align $(PROFILE)

 			#if gcc 9.0+ 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 $(call				set_if_empty,CPUTYPE,generic)

@@ -991,12 +991,12 @@ else		# CC_NAME, gcc

 ifeq		($(CC_NAME), clang)

 $(call                          set_if_empty,CPUTYPE,athlon64)

 					C_DEFS+=-DCC_GCC_LIKE_ASM

-					CFLAGS+=-g -m32 $(CC_OPT) -mtune=$(CPUTYPE)

+					CFLAGS+=-m32 $(CC_OPT) -mtune=$(CPUTYPE)

 					LDFLAGS+=-m32

 else			# CC_NAME, clang

 ifeq		($(CC_NAME), icc)

 			C_DEFS+=-DCC_GCC_LIKE_ASM

-			CFLAGS=-g -O3  -ipo -ipo_obj -unroll  $(PROFILE) \

+			CFLAGS+=-O3  -ipo -ipo_obj -unroll  $(PROFILE) \

 					 -tpp6 -xK  #-openmp  #optimize for PIII

 				# -prefetch doesn't seem to work

 				#( ty to inline acroos files, unroll loops,prefetch,

@@ -1016,7 +1016,7 @@ ifeq	($(ARCH), x86_64)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS=-g $(CC_OPT) -funroll-loops  -Wcast-align $(PROFILE)

+				CFLAGS+=$(CC_OPT) -funroll-loops  -Wcast-align $(PROFILE)

 			#if gcc 4.5+

 ifeq			($(CC_SHORTVER),$(filter $(CC_SHORTVER),4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+))

 $(call				set_if_empty,CPUTYPE,generic)

@@ -1073,13 +1073,13 @@ else		# CC_NAME, gcc

 ifeq            ($(CC_NAME), clang)

 $(call                          set_if_empty,CPUTYPE,opteron)

 					C_DEFS+=-DCC_GCC_LIKE_ASM

-                                        CFLAGS+=-g -m64 \

+                                        CFLAGS+=-m64 \

                                                 $(CC_OPT)

                                         LDFLAGS+=-m64

 else      	# CC_NAME, clang

 ifeq		($(CC_NAME), icc)

 			C_DEFS+=-DCC_GCC_LIKE_ASM

-			CFLAGS=-g -O3  -ipo -ipo_obj -unroll  $(PROFILE) \

+			CFLAGS+=-O3  -ipo -ipo_obj -unroll  $(PROFILE) \

 					 -tpp6 -xK  #-openmp  #optimize for PIII

 				# -prefetch doesn't seem to work

 				#( ty to inline acroos files, unroll loops,prefetch,

@@ -1099,7 +1099,7 @@ ifeq	($(ARCH), sparc64)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM -DSPARC64_MODE

 				#common stuff

-				CFLAGS=-g $(CC_OPT) -funroll-loops  $(PROFILE) \

+				CFLAGS+=$(CC_OPT) -funroll-loops  $(PROFILE) \

 					#-Wcast-align \

 					#-Wmissing-prototypes

 				#if gcc 9.0+ 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

@@ -1175,7 +1175,7 @@ else		#CC_NAME, gcc

 ifeq		($(CC_NAME), suncc)

 			C_DEFS+=-DCC_GCC_LIKE_ASM

 			C_DEFS+=-DSPARC64_MODE

-			CFLAGS+= -m64 -g -xO3 -xtarget=native -xmemalign=8i \

+			CFLAGS+= -m64 -xO3 -xtarget=native -xmemalign=8i \

 					-fma=fused -fns=yes \

 					-xc99 # C99 support

 			LDFLAGS+=-m64

@@ -1193,7 +1193,7 @@ ifeq	($(ARCH), sparc)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS=-g $(CC_OPT) -funroll-loops  $(PROFILE) \

+				CFLAGS+=$(CC_OPT) -funroll-loops  $(PROFILE) \

 					#-Wcast-align \

 					#-Wmissing-prototypes

 				#if gcc 5.0+, 4.5+ or 4.2+

@@ -1243,7 +1243,7 @@ endif			#CC_SHORTVER, 9.0+ 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 else		#CC_NAME, gcc

 ifeq		($(CC_NAME), suncc)

 			C_DEFS+=-DCC_GCC_LIKE_ASM

-			CFLAGS+= -g -xO3 -xtarget=native -xmemalign=4i \

+			CFLAGS+=-xO3 -xtarget=native -xmemalign=4i \

 					-fma=fused -fns=yes \

 					-xc99 # C99 support

 			# -Dinline="" # add this if cc < 5.3 (define inline as null)

@@ -1260,7 +1260,7 @@ ifeq	($(ARCH), arm)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS=-marm -march=armv5t $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)

+				CFLAGS+=-marm -march=armv5t $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)

 			#if gcc 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 					CFLAGS+= -ftree-vectorize -fno-strict-overflow

@@ -1308,7 +1308,7 @@ ifeq	($(ARCH), arm6)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS=-march=armv6 $(CC_OPT) -funroll-loops -fsigned-char \

+				CFLAGS+=-march=armv6 $(CC_OPT) -funroll-loops -fsigned-char \

 						$(PROFILE)

 			#if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

@@ -1355,7 +1355,7 @@ ifeq	($(ARCH), arm7)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff, use armv7-a as lowest common architecture

-				CFLAGS=-march=armv7-a $(CC_OPT) -funroll-loops -fsigned-char \

+				CFLAGS+=-march=armv7-a $(CC_OPT) -funroll-loops -fsigned-char \

 						$(PROFILE)

 			#if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

@@ -1402,7 +1402,7 @@ ifeq	($(ARCH), mips)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS=$(CC_OPT) -funroll-loops  $(PROFILE)

+				CFLAGS+=$(CC_OPT) -funroll-loops  $(PROFILE)

 			#if gcc 9.0+ 8.0+, 7.0+, 6.0, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 					CFLAGS+=-mfp32 -march=r3000 \

@@ -1451,7 +1451,7 @@ ifeq	($(ARCH), mips2)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE)

+				CFLAGS+= $(CC_OPT) -funroll-loops $(PROFILE)

 			#if gcc 9.0+ 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 					CFLAGS+=-ftree-vectorize -fno-strict-overflow

@@ -1497,7 +1497,7 @@ ifeq	($(ARCH), mips64)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE)

+				CFLAGS+= $(CC_OPT) -funroll-loops $(PROFILE)

 			#if gcc 9.0+ 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 					CFLAGS+=-ftree-vectorize -fno-strict-overflow

@@ -1544,7 +1544,7 @@ ifeq	($(ARCH), alpha)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS= $(CC_OPT) -funroll-loops $(PROFILE)

+				CFLAGS+= $(CC_OPT) -funroll-loops $(PROFILE)

 			#if gcc 5.0+, 4.5 or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 					CFLAGS+= -fno-strict-overflow

@@ -1590,7 +1590,7 @@ ifeq	($(ARCH), ppc)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS=

+				CFLAGS+=

 			#if gcc 9.0+ 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 $(call				set_if_empty,CPUTYPE,powerpc)

@@ -1647,7 +1647,7 @@ ifeq	($(ARCH), ppc64)

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

 				#common stuff

-				CFLAGS= $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)

+				CFLAGS+= $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)

 			#if gcc 9.0+ 8.0+, 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 $(call				set_if_empty,CPUTYPE,powerpc64)

@@ -1745,7 +1745,7 @@ LIB_LDFLAGS+= $(LD_EXTRA_OPTS) $(LD_PMUTEX_OPTS)

 else	#mode,release

 ifeq	($(CC_NAME), gcc)

-		CFLAGS=-g -Wcast-align $(PROFILE)

+		CFLAGS+=-Wcast-align $(PROFILE)

 		C_DEFS+=-DCC_GCC_LIKE_ASM

 ifeq		($(ARCH), sparc64)

 			C_DEFS+=SPARC64_MODE

@@ -1754,14 +1754,14 @@ ifeq		($(ARCH), sparc64)

 endif

 ifeq		($(LDTYPE), solaris)

 			#solaris ld

-			LDFLAGS+=-g $(PROFILE)

+			LDFLAGS+=$(PROFILE)

 			MOD_LDFLAGS:=-G $(LDFLAGS)

 			LIB_LDFLAGS:=-G $(LDFLAGS)

 			LIB_SONAME=-Wl,-h,

 			LD_RPATH=-Wl,-R,

 else

 			#gnu or other ld type

-			LDFLAGS+=-g -Wl,-E $(PROFILE)

+			LDFLAGS+=-Wl,-E $(PROFILE)

 			MOD_LDFLAGS:=-shared $(LDFLAGS)

 			LIB_LDFLAGS:=-shared $(LDFLAGS)

 			LIB_SONAME=-Wl,-soname,

@@ -1770,16 +1770,16 @@ endif

 endif

 ifeq	($(CC_NAME), icc)

 		C_DEFS+=-DCC_GCC_LIKE_ASM

-		CFLAGS=-g  $(PROFILE)

-		LDFLAGS+=-g -Wl,-E $(PROFILE)

+		CFLAGS+=$(PROFILE)

+		LDFLAGS+=-Wl,-E $(PROFILE)

 		MOD_LDFLAGS:=-shared $(LDFLAGS)

 		LIB_LDFLAGS:=-shared $(LDFLAGS)

 		LIB_SONAME=-Wl,-soname,

 		LD_RPATH=-Wl,-rpath,

 endif

 ifeq	($(CC_NAME), suncc)

-		CFLAGS= -g $(PROFILE)

-		LDFLAGS+=-g $(PROFILE)

+		CFLAGS+=$(PROFILE)

+		LDFLAGS+=$(PROFILE)

 		MOD_LDFLAGS:=-G $(LDFLAGS)

 		LIB_LDFLAGS:=-G $(LDFLAGS)

 		LIB_SONAME=-Wl,-h,

@@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 # version number

 VERSION = 5

-PATCHLEVEL = 5

+PATCHLEVEL = 6

 SUBLEVEL =  0

-EXTRAVERSION = -pre1

+EXTRAVERSION = -dev0

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -pre0

+EXTRAVERSION = -pre1

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -dev6

+EXTRAVERSION = -pre0

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -dev5

+EXTRAVERSION = -dev6

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -dev4

+EXTRAVERSION = -dev5

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -dev3

+EXTRAVERSION = -dev4

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -673,11 +673,11 @@ data_target = $(prefix)/$(data_dir)

 # -DUSE_DNS_FAILOVER

 #		if the destination resolves to multiple ips, on send error fall back

 #		to the others

-# -DUSE_DST_BLACKLIST

-#		blacklist bad destination (timeout, failed to connect, error sending

+# -DUSE_DST_BLOCKLIST

+#		blocklist bad destination (timeout, failed to connect, error sending

 #        a.s.o)

-# -DUSE_DST_BLACKLIST_STATS

-#		turns on blacklist bad destination measurements

+# -DUSE_DST_BLOCKLIST_STATS

+#		turns on blocklist bad destination measurements

 # -DPROFILING

 #		if enabled profiling will be enabled for child processes

 #		Don't forget to set PROFILE (see below)

@@ -724,11 +724,11 @@ C_DEFS+= -DSHM_MMAP \

 	 -DHAVE_RESOLV_RES \

 	 -DUSE_DNS_CACHE \

 	 -DUSE_DNS_FAILOVER \

-	 -DUSE_DST_BLACKLIST \

+	 -DUSE_DST_BLOCKLIST \

 	 -DUSE_NAPTR \

 	 -DWITH_XAVP \

 	 #-DUSE_DNS_CACHE_STATS \

-	 #-DUSE_DST_BLACKLIST_STATS \

+	 #-DUSE_DST_BLOCKLIST_STATS \

 	 #-DDNS_WATCHDOG_SUPPORT \

 	 #-DLL_MALLOC \

 	 #-DSF_MALLOC \

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -dev2

+EXTRAVERSION = -dev3

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -dev1

+EXTRAVERSION = -dev2

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -1981,12 +1981,11 @@ ifeq ($(OS), freebsd)

 	ifeq ($(RAW_SOCKS), yes)

 		C_DEFS+= -DUSE_RAW_SOCKS

 	endif

+	LIBS= -lm   # resolv and dlopen is in libc

 	ifneq ($(found_lock_method), yes)

 		C_DEFS+= -DUSE_PTHREAD_MUTEX  # try pthread sems

 		found_lock_method=yes

-		LIBS+= -pthread   #dlopen is in libc

-	else

-		LIBS=   #dlopen is in libc

+		LIBS+= -pthread

 	endif

 	# check for ver >= 4.1

 	ifeq ($(shell [ $(OSREL_N) -gt 4001 ] && echo has_kqueue), has_kqueue)

@@ -275,7 +275,7 @@ ifneq (,$(findstring gcc, $(CC_LONGVER)))

 	RPAREN=)

 	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version 2>/dev/null|head -n 1|\

 				sed  -e 's/([^$(RPAREN)]*)//g' \

-					 -e 's/^.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/'\

+					 -e 's/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/'\

 					 -e 's/^[^0-9].*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')

 #	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|cut -d" " -f 3\

 #				|sed -e 's/^.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/'\

@@ -306,7 +306,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER)))

 					-e 's/8\.[0-9]\..*/8.0+/' \

 					-e 's/8\.[0-9]$$/8.0+/' \

 					-e 's/9\.[0-9]\..*/9.0+/' \

-					-e 's/9\.[0-9]$$/9.0+/')

+					-e 's/9\.[0-9]$$/9.0+/' \

+					-e 's/10\.[0-9]\..*/9.0+/' \

+					-e 's/10\.[0-9]$$/9.0+/')

 ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

 	# dependencies can be generated on-the-fly while compiling *.c

 	CC_MKDEP_OPTS=-MMD -MP

@@ -273,7 +273,7 @@ MKTAGS=ctags

 ifneq (,$(findstring gcc, $(CC_LONGVER)))

 	CC_NAME=gcc

 	RPAREN=)

-	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\

+	CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version 2>/dev/null|head -n 1|\

 				sed  -e 's/([^$(RPAREN)]*)//g' \

 					 -e 's/^.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/'\

 					 -e 's/^[^0-9].*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')

@@ -335,7 +335,7 @@ endif

 ifneq (, $(findstring clang, $(CC_LONGVER)))

 	#clang should be gcc compatible

 	CC_NAME=clang

-	CC_FULLVER:=$(shell echo "$(CC_LONGVER)" | head -n 1 |  sed -e 's/.*version \([0-9]\.[0-9]\).*/\1/g' )

+	CC_FULLVER:=$(shell $(CC) --version 2>/dev/null | head -n 1 | sed -e 's/.*version \([0-9]\.[0-9]\).*/\1/g' )

 	CC_SHORTVER:=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 )

 	CC_VER=$(CC) $(CC_FULLVER)

 	CC_OPT=-O3

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -dev0

+EXTRAVERSION = -dev1

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 # version number

 VERSION = 5

-PATCHLEVEL = 4

+PATCHLEVEL = 5

 SUBLEVEL =  0

-EXTRAVERSION = -pre2

+EXTRAVERSION = -dev0

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -pre1

+EXTRAVERSION = -pre2

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -pre0

+EXTRAVERSION = -pre1

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -dev6

+EXTRAVERSION = -pre0

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -dev5

+EXTRAVERSION = -dev6

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -dev4

+EXTRAVERSION = -dev5

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -2166,10 +2166,10 @@ export exported_vars

 # variable changeable only at configure time (once saved in config.mak they

 #  cannot be overwritten from environment or command line, unless make cfg

 #  is run)

-saved_fixed_vars:=	MAIN_NAME  CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \

+saved_fixed_vars:=	MAIN_NAME CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \

 		SRC_NAME RELEASE OS ARCH \

 		C_DEFS DEFS_RM PROFILE CC LD MKDEP MKTAGS LDFLAGS C_INCLUDES \

-		CC_MKDEP_OPTS \

+		CC_NAME CC_MKDEP_OPTS \

 		MOD_LDFLAGS LIB_LDFLAGS UTILS_LDFLAGS LIB_SONAME LD_RPATH \

 		LIB_SUFFIX LIB_PREFIX \

 		LIBS \

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -dev3

+EXTRAVERSION = -dev4

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -210,9 +210,18 @@ endif

 endif

+# dlopen requires -ldl on some systems, but not others.  Until there

+# is clarity on which require -ldl, add just enough ifeq to fix

+# systems known not to use it.

+ifeq ($(OS), netbsd)

+LIBDL=""

+else

+LIBDL="-ldl"

+endif

+

 ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1)

 CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED

-LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions

+LD_PMUTEX_OPTS = -pthread -rdynamic $(LIBDL) -Wl,-Bsymbolic-functions

 else

 CC_PMUTEX_OPTS =

 LD_PMUTEX_OPTS =

@@ -2056,7 +2056,7 @@ ifeq ($(OS), netbsd)

 		C_DEFS+=-DHAVE_SELECT

 	endif

 	YACC=yacc

-	LIBS=

+	LIBS=-lm

 endif

 # OS X support, same as freebsd

@@ -1821,7 +1821,7 @@ ifeq ($(YACC),)

 endif

 YACC_FLAGS=-d -b core/cfg

 # on solaris add -lxnet (e.g. LIBS= -lxnet)

-LIBS= -ldl -lresolv

+LIBS= -ldl -lresolv -lm

 LIB_PREFIX:=lib

 LIB_SUFFIX:=.so

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -dev2

+EXTRAVERSION = -dev3

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -211,8 +211,11 @@ endif

 endif

 ifeq ($(LIBSSL_SET_MUTEX_SHARED), 1)

-CC_EXTRA_OPTS+= -pthread -DKSR_PTHREAD_MUTEX_SHARED

-LD_EXTRA_OPTS+= -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions

+CC_PMUTEX_OPTS = -pthread -DKSR_PTHREAD_MUTEX_SHARED

+LD_PMUTEX_OPTS = -pthread -rdynamic -ldl -Wl,-Bsymbolic-functions

+else

+CC_PMUTEX_OPTS =

+LD_PMUTEX_OPTS =

 endif

 ifeq ($(OS), solaris)

@@ -1676,7 +1679,7 @@ $(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)

 endif		#CC_NAME, gcc

 endif	#ARCH, ppc

-CFLAGS+= $(CC_EXTRA_OPTS)

+CFLAGS+= $(CC_EXTRA_OPTS) $(CC_PMUTEX_OPTS)

 # setting LDFLAGS

@@ -1725,9 +1728,9 @@ ifeq ($(CC_NAME), clang)

 	LD_RPATH=-Wl,-rpath,

 endif

-LDFLAGS+= $(LD_EXTRA_OPTS)

-MOD_LDFLAGS+= $(LD_EXTRA_OPTS)

-LIB_LDFLAGS+= $(LD_EXTRA_OPTS)

+LDFLAGS+= $(LD_EXTRA_OPTS) $(LD_PMUTEX_OPTS)

+MOD_LDFLAGS+= $(LD_EXTRA_OPTS) $(LD_PMUTEX_OPTS)

+LIB_LDFLAGS+= $(LD_EXTRA_OPTS) $(LD_PMUTEX_OPTS)

 else	#mode,release

 ifeq	($(CC_NAME), gcc)

@@ -2171,7 +2174,8 @@ saved_fixed_vars:=	MAIN_NAME  CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \

 # variable changeable at compile time

 # extra: prefix DESTDIR BASEDIR basedirt

 saved_chg_vars:=\

-		CC_EXTRA_OPTS CPUTYPE CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \

+		CC_EXTRA_OPTS CC_PMUTEX_OPTS CPUTYPE CFLAGS_RM CFLAGS MOD_CFLAGS \

+		LIB_CFLAGS UTILS_CFLAGS \

 		BASEDIR basedir DESTDIR LIBDIR RUNBASEDIR runbasedir \

 		PREFIX prefix \

 		cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -dev1

+EXTRAVERSION = -dev2

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -dev0

+EXTRAVERSION = -dev1

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 # version number

 VERSION = 5

-PATCHLEVEL = 3

+PATCHLEVEL = 4

 SUBLEVEL =  0

-EXTRAVERSION = -pre2

+EXTRAVERSION = -dev0

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)

 VERSION = 5

 PATCHLEVEL = 3

 SUBLEVEL =  0

-EXTRAVERSION = -pre1

+EXTRAVERSION = -pre2

 # memory manager switcher

 # 0 - f_malloc (fast malloc)

@@ -1340,9 +1340,8 @@ ifeq	($(ARCH), arm7)

 		# if gcc

 ifeq		($(CC_NAME), gcc)

 				C_DEFS+=-DCC_GCC_LIKE_ASM

-				#common stuff, use armv7-a similar to debian

-				#build flags from https://wiki.debian.org/ArmHardFloatPort

-				CFLAGS=-march=armv7-a -mfpu=vfpv3-d16 $(CC_OPT) -funroll-loops -fsigned-char \

+				#common stuff, use armv7-a as lowest common architecture

+				CFLAGS=-march=armv7-a $(CC_OPT) -funroll-loops -fsigned-char \

 						$(PROFILE)

 			#if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+

 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))

@@ -863,12 +863,10 @@ endif

 ifeq ($(ARCH), arm6)

 	use_fast_lock=yes

-	C_DEFS+=-DNOSMP # memory barriers not implemented for arm

 endif

 ifeq ($(ARCH), arm7)

 	use_fast_lock=yes

-	C_DEFS+=-DNOSMP # memory barriers not implemented for arm

 endif

 ifeq ($(ARCH), aarch64)

@@ -136,6 +136,7 @@ endif

 HOST_ARCH := $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4[uv]/sparc64/  \

 			-e s/armv[3-5].*/arm/  -e s/armv6.*/arm6/ \

+			-e s/armv7.*/arm7/ -e s/armv8.*/arm8/ \

 			-e "s/Power Macintosh/ppc/" \

 			-e "s/cobalt/mips2/" \

 			-e s/amd64/x86_64/ -e s/sparcv9/sparc64/ )

@@ -350,6 +351,9 @@ sparc_macros= __sparc__ __sparc __sparcv8

 sparc64_macros= __sparcv9 __sparc_v9__

 arm_macros= __arm__ __thumb__

+arm8_macros= __ARM_ARCH_8__

+arm8a_macros= __ARM_ARCH_8A__