diff --git a/opensips-0005-Don-t-remove-pthread-library-explicitly-from-mi_xmlr.patch b/opensips-0005-Don-t-remove-pthread-library-explicitly-from-mi_xmlr.patch
new file mode 100644
index 0000000..7c66faf
--- /dev/null
+++ b/opensips-0005-Don-t-remove-pthread-library-explicitly-from-mi_xmlr.patch
@@ -0,0 +1,28 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Wed, 26 Mar 2014 13:10:07 +0400
+Subject: [PATCH] Don't remove pthread library explicitly from mi_xmlrpc
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/obsolete_modules/mi_xmlrpc/Makefile b/obsolete_modules/mi_xmlrpc/Makefile
+index 762c2dda2..955528f10 100644
+--- a/obsolete_modules/mi_xmlrpc/Makefile
++++ b/obsolete_modules/mi_xmlrpc/Makefile
+@@ -76,7 +76,7 @@ ifeq ($(NEW),yes)
+ 	# remove the abyss library - we already have
+ 	# the code in the module
+ 	MY_DEFS+=-D_UNIX
+-	MY_LIBS:=$(filter-out %xmlrpc_abyss %xmlrpc_server_abyss %pthread, $(MY_LIBS))
++	MY_LIBS:=$(filter-out %xmlrpc_abyss %xmlrpc_server_abyss, $(MY_LIBS))
+ else
+ 	# remove from compiling the code we have in the
+ 	# module for abyss server
+@@ -90,7 +90,7 @@ endif
+ 
+ 
+ DEFS+=$(MY_DEFS)
+-LIBS=$(MY_LIBS)
++LIBS=$(MY_LIBS) -lpthread
+ 
+ 
+ include ../../Makefile.modules
diff --git a/opensips-0005-Use-additional-auth-field-Sip-Source-IP-Address.patch b/opensips-0005-Use-additional-auth-field-Sip-Source-IP-Address.patch
deleted file mode 100644
index fd15cb4..0000000
--- a/opensips-0005-Use-additional-auth-field-Sip-Source-IP-Address.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 10 Aug 2011 17:30:51 +0400
-Subject: [PATCH] Use additional auth field - Sip-Source-IP-Address
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/aaa/aaa_avp.h b/aaa/aaa_avp.h
-index fd73dccdd..5c39d4ce1 100644
---- a/aaa/aaa_avp.h
-+++ b/aaa/aaa_avp.h
-@@ -56,7 +56,8 @@
- #define	A_TIME_STAMP					28
- #define	A_SIP_CALL_ID					29
- #define	A_SIP_REQUEST_HASH				30
--#define	A_MAX							31
-+#define	A_SIP_SOURCE_IP_ADDRESS				31
-+#define	A_MAX						32
- 
- #define	V_STATUS_START			0
- #define	V_STATUS_STOP			1
-diff --git a/modules/auth_aaa/authaaa_mod.c b/modules/auth_aaa/authaaa_mod.c
-index c4501454e..77aa79f2c 100644
---- a/modules/auth_aaa/authaaa_mod.c
-+++ b/modules/auth_aaa/authaaa_mod.c
-@@ -163,6 +163,7 @@ static int mod_init(void)
- 	attrs[A_SERVICE_TYPE].name			= "Service-Type";
- 	attrs[A_SIP_URI_USER].name			= "Sip-URI-User";
- 	attrs[A_SIP_URI_HOST].name			= "SIP-URI-Host";
-+	attrs[A_SIP_SOURCE_IP_ADDRESS].name			= "Sip-Source-IP-Address";
- 	attrs[A_DIGEST_RESPONSE].name		= "Digest-Response";
- 	attrs[A_DIGEST_ALGORITHM].name		= "Digest-Algorithm";
- 	attrs[A_DIGEST_BODY_DIGEST].name	= "Digest-Body-Digest";
-diff --git a/modules/auth_aaa/sterman.c b/modules/auth_aaa/sterman.c
-index 92df9b9bd..a0fa42aa1 100644
---- a/modules/auth_aaa/sterman.c
-+++ b/modules/auth_aaa/sterman.c
-@@ -87,6 +87,7 @@ int aaa_authorize_sterman(struct sip_msg* _msg, dig_cred_t* _cred, str* _method,
- 	uint32_t service;
- 	str method, user, user_name;
- 	str *ruri;
-+	str ip;
- 
- 	send = received = NULL;
- 
-@@ -229,6 +230,14 @@ int aaa_authorize_sterman(struct sip_msg* _msg, dig_cred_t* _cred, str* _method,
- 		goto err;
- 	}
- 
-+	/* Add SIP source IP address as a check item */
-+	ip.s = ip_addr2a(&_msg->rcv.src_ip);
-+	ip.len = strlen(ip.s);
-+	if (proto.avp_add(conn, send, &attrs[A_SIP_SOURCE_IP_ADDRESS], ip.s,ip.len,0)) {
-+		LM_ERR("unable to add Sip-URI-User attribute\n");
-+		goto err;
-+	}
-+
- 	/* Add CALL-ID in Acct-Session-Id Attribute */
- 	if ( _msg->callid==NULL &&
- 		(parse_headers(_msg, HDR_CALLID_F, 0)==-1 || _msg->callid==NULL)  ) {
diff --git a/opensips-0006-Don-t-remove-pthread-library-explicitly-from-mi_xmlr.patch b/opensips-0006-Don-t-remove-pthread-library-explicitly-from-mi_xmlr.patch
deleted file mode 100644
index 7c66faf..0000000
--- a/opensips-0006-Don-t-remove-pthread-library-explicitly-from-mi_xmlr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 26 Mar 2014 13:10:07 +0400
-Subject: [PATCH] Don't remove pthread library explicitly from mi_xmlrpc
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/obsolete_modules/mi_xmlrpc/Makefile b/obsolete_modules/mi_xmlrpc/Makefile
-index 762c2dda2..955528f10 100644
---- a/obsolete_modules/mi_xmlrpc/Makefile
-+++ b/obsolete_modules/mi_xmlrpc/Makefile
-@@ -76,7 +76,7 @@ ifeq ($(NEW),yes)
- 	# remove the abyss library - we already have
- 	# the code in the module
- 	MY_DEFS+=-D_UNIX
--	MY_LIBS:=$(filter-out %xmlrpc_abyss %xmlrpc_server_abyss %pthread, $(MY_LIBS))
-+	MY_LIBS:=$(filter-out %xmlrpc_abyss %xmlrpc_server_abyss, $(MY_LIBS))
- else
- 	# remove from compiling the code we have in the
- 	# module for abyss server
-@@ -90,7 +90,7 @@ endif
- 
- 
- DEFS+=$(MY_DEFS)
--LIBS=$(MY_LIBS)
-+LIBS=$(MY_LIBS) -lpthread
- 
- 
- include ../../Makefile.modules
diff --git a/opensips-0006-Dont-try-modifying-CFLAGS.patch b/opensips-0006-Dont-try-modifying-CFLAGS.patch
new file mode 100644
index 0000000..8bc62d2
--- /dev/null
+++ b/opensips-0006-Dont-try-modifying-CFLAGS.patch
@@ -0,0 +1,534 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sun, 2 Dec 2018 11:17:55 +0300
+Subject: [PATCH] Dont' try modifying CFLAGS
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/Makefile.defs b/Makefile.defs
+index 8ffc5ea83..591c122e9 100644
+--- a/Makefile.defs
++++ b/Makefile.defs
+@@ -794,523 +794,8 @@ endif
+ CFLAGS=$(shell echo "$${CFLAGS}")
+ LDFLAGS+=
+ 
+-ifneq (,$(findstring CC_O0, $(DEFS)))
+-	CC_OPTIMIZE_FLAG?=-O0
+-endif
+-
+-ifeq	($(CC_NAME), gcc)
+-	CC_OPTIMIZE_FLAG?=-O9
+-endif
+-ifeq	($(CC_NAME), icc)
+-	CC_OPTIMIZE_FLAG?=-O3
+-endif
+-ifeq	($(CC_NAME), clang)
+-	CC_OPTIMIZE_FLAG?=-O3
+-endif
+-
+ ifeq (,$(CFLAGS))
+ 
+-#common stuff
+-CFLAGS+=$(DEBUGSYM)
+-
+-# setting more CFLAGS
+-ifeq ($(mode), release)
+-
+-#if i386
+-ifeq	($(ARCH), i386)
+-	# These CPU optimization assumes that you run a Intel processor.
+-	# If you use a AMD CPU, you could ajust the settings here for better
+-	# performance. For gcc 4.x use CPU_TYPE ?= athlon-xp
+-		# if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=-m32 $(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
+-					-Wall
+-				LDFLAGS+=-m32
+-			#if gcc 4.0+
+-ifeq			($(CC_CLASS), 4.x)
+-					ARCH_VER=$(shell $(GETARCH))
+-ifeq 				($(ARCH_VER), i386)
+-						CPU_TYPE ?= i686
+-else
+-						CPU_TYPE ?= prescott
+-endif
+-					CFLAGS+=-minline-all-stringops \
+-							-falign-loops \
+-							-ftree-vectorize \
+-							-mtune=$(CPU_TYPE) \
+-					-Wold-style-definition -Wmissing-field-initializers -Wredundant-decls
+-
+-else
+-			#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-					CPU_TYPE ?= pentium4
+-					CFLAGS+=-minline-all-stringops \
+-							-falign-loops
+-ifeq				(X,$(shell echo "$(CC_SHORTVER)" | sed -e 's/3\.[0-3]/X/'))
+-					CFLAGS+=-mcpu=$(CPU_TYPE)
+-else
+-					CFLAGS+=-mtune=$(CPU_TYPE)
+-endif
+-else
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
+-					for better results)
+-
+-					CFLAGS+=-m486 \
+-							-malign-loops=4
+-else
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version  ($(CC_SHORTVER)), compile at your own risk!)
+-
+-endif			# CC_CLASS, 2.9x
+-endif			# CC_CLASS, 3.x
+-endif			# CC_CLASS, 4.x
+-
+-else		# CC_NAME, gcc
+-ifeq		($(CC_NAME), icc)
+-			CFLAGS+=$(CC_OPTIMIZE_FLAG)  -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,
+-				# optimize for PIII, use PIII instructions & vect.,
+-				# mutlithread loops)
+-else		#CC_NAME, icc
+-ifeq		($(CC_NAME), suncc)
+-			CFLAGS+=-xO5 -fast -native -xCC \
+-					-xc99=no_lib # C99 support
+-			# -Dinline="" # add this if cc < 5.3 (define inline as null)
+-else
+-ifeq		($(CC_NAME), clang)
+-			CFLAGS+=$(CC_OPTIMIZE_FLAG) -Wall -funroll-loops
+-else
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, clang
+-endif		#CC_NAME, suncc
+-endif		#CC_NAME, icc
+-endif		#CC_NAME, gcc
+-endif	#ARCH, i386
+-
+-#x86_64
+-ifeq	($(ARCH), x86_64)
+-	# These CPU optimization assumes that you run a Intel 64 processor.
+-	# If you use a AMD 64 CPU, you could ajust the settings here for better
+-	# performance. For gcc 4.x use CPU_TYPE ?= athlon64
+-	# Perhaps it makes sense to use '-m64' here?
+-		# if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
+-					-Wall
+-			#if gcc 4.0+
+-ifeq			($(CC_CLASS), 4.x)
+-					CPU_TYPE ?= nocona
+-					CFLAGS+=-minline-all-stringops \
+-							-falign-loops \
+-							-ftree-vectorize \
+-							-mtune=$(CPU_TYPE) \
+-					-Wold-style-definition -Wmissing-field-initializers -Wredundant-decls
+-else
+-			#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-					CPU_TYPE ?= nocona
+-					CFLAGS+=-minline-all-stringops \
+-							-falign-loops \
+-							-mtune=$(CPU_TYPE)
+-else
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
+-					for better results)
+-
+-					CFLAGS+=-m486 \
+-							-malign-loops=4
+-else
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version  ($(CC_SHORTVER)), compile at your own risk!)
+-
+-endif			# CC_CLASS, 2.9x
+-endif			# CC_CLASS, 3.x
+-endif			# CC_CLASS, 4.x
+-
+-else		# CC_NAME, gcc
+-ifeq		($(CC_NAME), icc)
+-			CFLAGS+=$(CC_OPTIMIZE_FLAG) -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,
+-				# optimize for PIII, use PIII instructions & vect.,
+-				# mutlithread loops)
+-else
+-ifeq		($(CC_NAME), suncc)
+-			CFLAGS+=-xO5 -fast -native -xCC \
+-				-xc99=no_lib # C99 support
+-				# -Dinline="" # add this if cc < 5.3 (define inline as null)
+-else
+-ifeq		($(CC_NAME), clang)
+-			CFLAGS+=$(CC_OPTIMIZE_FLAG) -Wall -funroll-loops
+-else
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, clang
+-endif		#CC_NAME, icc
+-endif		#CC_NAME, gcc
+-endif		#CC_NAME, suncc
+-endif	#ARCH, x86_64
+-
+-	#if sparc
+-ifeq	($(ARCH), sparc64)
+-			#if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  $(PROFILE) \
+-					-Wall\
+-					#-Wcast-align \
+-					#-Wmissing-prototypes
+-				#if gcc 4.x
+-ifeq			($(CC_CLASS), 4.x)
+-
+-					# Processors of Family UltraSparc II
+-					ifeq ($(CHIP), ultrasparc-ii)
+-						CFLAGS+= -ftree-vectorize -mcpu=ultrasparc -mtune=ultrasparc -mvis
+-					endif
+-
+-					# Processors of Family UltraSparc III (III, III, IIIi, IIICu)
+-					ifeq ($(CHIP), ultrasparc-iiii)
+-						CFLAGS+= -ftree-vectorize -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
+-					endif
+-
+-					ifeq ($(CHIP), ultrasparc-iii)
+-						CFLAGS+= -ftree-vectorize -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
+-					endif
+-
+-					ifeq ($(CHIP), ultrasparc-iiicu)
+-						CFLAGS+= -ftree-vectorize -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
+-					endif
+-
+-					# Processors of Family UltraSparc T1
+-					ifeq ($(CHIP), ultrasparc-t1)
+-						# niagara switch is not supported on GCC < 4.2
+-						# Sets to default ultrasparc
+-						ifeq ($(CC_SHORTVER), 4.2)
+-							CFLAGS+= -ftree-vectorize -mcpu=niagara -mtune=niagara -mvis
+-						else
+-							ifeq ($(CC_SHORTVER), 4.3)
+-								CFLAGS+= -ftree-vectorize -mcpu=niagara -mtune=niagara -mvis
+-							else
+-								CFLAGS+= -ftree-vectorize -mcpu=ultrasparc -mtune=ultrasparc -mvis
+-							endif
+-						endif
+-					endif
+-
+-					# If processor detection fails, defaults to UltraSPARC without VIS
+-					ifeq (,$(CHIP))
+-						#CPU_TYPE=ultrasparc
+-						CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
+-					endif
+-
+-					# use -m64 to force 64 bit (but add it also to LDFLAGS),
+-					# -m32 for 32 bit (default on solaris),
+-					# nothing for arch. default
+-					# -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu
+-					#-mno-epilogue #try to inline function exit code
+-					#-mflat # omit save/restore
+-					#-,faster-structs #faster non Sparc ABI structure copy ops
+-
+-else
+-				#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-
+-					# Processors of Family UltraSparc II
+-					ifeq ($(CHIP), ultrasparc-ii)
+-						#CPU_TYPE=ultrasparc
+-						CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc -mvis
+-					endif
+-
+-					# Processors of Family UltraSparc III
+-					ifeq ($(CHIP), ultrasparc-iiii)
+-						CFLAGS+= -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
+-					endif
+-
+-					ifeq ($(CHIP), ultrasparc-iiii)
+-						CFLAGS+= -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
+-					endif
+-
+-					ifeq ($(CHIP), ultrasparc-iiicu)
+-						CFLAGS+= -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
+-					endif
+-
+-					# Processors of Family UltraSparc T1
+-					ifeq ($(CHIP), ultrasparc-t1)
+-						# niagara switch is not supported on GCC < 4.2
+-						# Sets to default ultrasparc
+-						CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc -mvis
+-					endif
+-
+-					# If processor detection fails, defaults to UltraSPARC without VIS
+-					ifeq (,$(CHIP))
+-						#CPU_TYPE=ultrasparc
+-						CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
+-					endif
+-
+-					# use -m64 to force 64 bit (but add it also to LDFLAGS),
+-					# -m32 for 32 bit (default on solaris),
+-					# nothing for arch. default
+-					# -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu
+-					#-mno-epilogue #try to inline function exit code
+-					#-mflat # omit save/restore
+-					#-,faster-structs #faster non Sparc ABI structure copy ops
+-
+-else			# CC_CLASS, 3.0
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
+-					for better results)
+-ifneq				($(OS), netbsd)
+-						# on netbsd/sparc64,  gcc 2.95.3 does not compile
+-						# opensips with -mv8
+-						CFLAGS+= -mv8
+-endif
+-ifeq					($(ASTYPE), solaris)
+-							CFLAGS+= -Wa,-xarch=v8plus
+-endif
+-else			#CC_CLASS, 2.9x
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version ($(CC_SHORTVER)), compile at your own risk!)
+-
+-					CFLAGS+= -mv8
+-ifeq					($(ASTYPE), solaris)
+-							CFLAGS+= -Wa,-xarch=v8plus
+-endif
+-
+-endif			#CC_CLASS, 2.9x
+-endif			#CC_CLASS, 3.x
+-endif			#CC_CLASS, 4.x
+-
+-else		#CC_NAME, gcc
+-ifeq		($(CC_NAME), suncc)
+-			CFLAGS+=-xO5 -fast -native -xarch=v8plusa -xCC \
+-					-xc99=no_lib # C99 support
+-			# -Dinline="" # add this if cc < 5.3 (define inline as null)
+-else
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, suncc
+-endif		#CC_NAME, gcc
+-endif	#ARCH, sparc64
+-
+-	#if ipaq/netwinder
+-ifeq	($(ARCH), arm)
+-		# if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
+-					-Wall -marm
+-			#if gcc 4.x+
+-ifeq			($(CC_CLASS), 4.x)
+-					CFLAGS+=-mcpu=strongarm1100 -ftree-vectorize
+-else
+-			#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-					CFLAGS+= -mcpu=strongarm1100
+-else
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
+-					for better results)
+-
+-					CFLAGS+=
+-else
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version ($(CC_SHORTVER)), compile at your own risk!)
+-
+-endif			# CC_CLASS, 2.9x
+-endif			# CC_CLASS, 3.x
+-endif			# CC_CLASS, 4.x
+-
+-else		# CC_NAME, gcc
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, gcc
+-endif	#ARCH, arm
+-
+-	#if  mips (R3000)
+-ifeq	($(ARCH), mips)
+-		# if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
+-					-Wall
+-			#if gcc 4.0+
+-ifeq			($(CC_CLASS), 4.x)
+-					CFLAGS+=-mcpu=r3000 -minline-all-stringops \
+-							-ftree-vectorize
+-else
+-			#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-					CFLAGS+= -mcpu=r3000
+-							#-mcpu=athlon
+-else
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
+-					for better results)
+-
+-					CFLAGS+=-mcpu=r3000
+-else
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version ($(CC_SHORTVER)), compile at your own risk!)
+-
+-endif			# CC_CLASS, 2.9x
+-endif			# CC_CLASS, 3.x
+-endif			# CC_CLASS, 4.x
+-
+-else		# CC_NAME, gcc
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, gcc
+-endif	#ARCH, mips
+-
+-	#if  >=mips2 (R4000, R5000, R6000 ....)
+-ifeq	($(ARCH), mips2)
+-		# if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=$(CC_OPTIMIZE_FLAG) -mips2 -funroll-loops $(PROFILE) \
+-					-Wall
+-			#if gcc 4.0+
+-ifeq			($(CC_CLASS), 4.x)
+-					CFLAGS+=-minline-all-stringops -ftree-vectorize
+-else
+-			#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-					CFLAGS+=
+-else
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
+-					for better results)
+-					CFLAGS+=
+-else
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version ($(CC_SHORTVER)), compile at your own risk!)
+-
+-endif			# CC_CLASS, 2.9x
+-endif			# CC_CLASS, 3.x
+-endif			# CC_CLASS, 4.x
+-
+-else		# CC_NAME, gcc
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, gcc
+-endif	#ARCH, mips2
+-
+-#if  alpha
+-ifeq	($(ARCH), alpha)
+-		# if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops $(PROFILE)  -Wall
+-			#if gcc 4.0+
+-ifeq			($(CC_CLASS), 4.x)
+-					CFLAGS+=-minline-all-stringops
+-else
+-			#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-					CFLAGS+=
+-else
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
+-					for better results)
+-					CFLAGS+=
+-else
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version ($(CC_SHORTVER)), compile at your own risk!)
+-
+-endif			# CC_CLASS, 2.9x
+-endif			# CC_CLASS, 3.x
+-endif			# CC_CLASS, 4.x
+-
+-else		# CC_NAME, gcc
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, gcc
+-endif	#ARCH, alpha
+-
+-#if  ppc
+-ifeq	($(ARCH), ppc)
+-		# if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops $(PROFILE)  -Wall
+-			#if gcc 4.0+
+-ifeq			($(CC_CLASS), 4.x)
+-					CPU_TYPE ?= powerpc
+-					CFLAGS+=-ftree-vectorize \
+-							-mtune=$(CPU_TYPE) -maltivec
+-else
+-			#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-					CFLAGS+=
+-else
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
+-					for better results)
+-					CFLAGS+=
+-else
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version ($(CC_SHORTVER)), compile at your own risk!)
+-
+-endif			# CC_CLASS, 2.9x
+-endif			# CC_CLASS, 3.x
+-endif			# CC_CLASS, 4.x
+-
+-else		# CC_NAME, gcc
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, gcc
+-endif	#ARCH, ppc
+-
+-#if  ppc64
+-ifeq	($(ARCH), ppc64)
+-		# if gcc
+-ifeq		($(CC_NAME), gcc)
+-				#common stuff
+-				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops $(PROFILE)  -Wall
+-ifeq			($(CC_CLASS), 4.x)
+-					CPU_TYPE ?= powerpc64
+-					CFLAGS+=-ftree-vectorize \
+-							-mtune=$(CPU_TYPE) -maltivec
+-else
+-			#if gcc 3.0+
+-ifeq			($(CC_CLASS), 3.x)
+-					CFLAGS+=
+-else
+-ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
+-$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
+-					for better results)
+-					CFLAGS+=
+-else
+-				#really old version
+-$(warning			You are using an old and unsupported gcc \
+-					 version ($(CC_SHORTVER)), compile at your own risk!)
+-
+-endif			# CC_CLASS, 2.9x
+-endif			# CC_CLASS, 3.x
+-endif			# CC_CLASS, 4.x
+-
+-else		# CC_NAME, gcc
+-				#other compilers
+-$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
+-endif		#CC_NAME, gcc
+-endif	#ARCH, ppc
+-
+-endif   # CFLAGS not set
+-
+ LD_EXTRA_OPTS ?=
+ 
+ # setting LDFLAGS
diff --git a/opensips-0007-Dont-try-modifying-CFLAGS.patch b/opensips-0007-Dont-try-modifying-CFLAGS.patch
deleted file mode 100644
index 6f34b22..0000000
--- a/opensips-0007-Dont-try-modifying-CFLAGS.patch
+++ /dev/null
@@ -1,534 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Sun, 2 Dec 2018 11:17:55 +0300
-Subject: [PATCH] Dont' try modifying CFLAGS
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-
-diff --git a/Makefile.defs b/Makefile.defs
-index 26af10269..e604b2ff6 100644
---- a/Makefile.defs
-+++ b/Makefile.defs
-@@ -794,523 +794,8 @@ endif
- CFLAGS=$(shell echo "$${CFLAGS}")
- LDFLAGS+=
- 
--ifneq (,$(findstring CC_O0, $(DEFS)))
--	CC_OPTIMIZE_FLAG?=-O0
--endif
--
--ifeq	($(CC_NAME), gcc)
--	CC_OPTIMIZE_FLAG?=-O9
--endif
--ifeq	($(CC_NAME), icc)
--	CC_OPTIMIZE_FLAG?=-O3
--endif
--ifeq	($(CC_NAME), clang)
--	CC_OPTIMIZE_FLAG?=-O3
--endif
--
- ifeq (,$(CFLAGS))
- 
--#common stuff
--CFLAGS+=$(DEBUGSYM)
--
--# setting more CFLAGS
--ifeq ($(mode), release)
--
--#if i386
--ifeq	($(ARCH), i386)
--	# These CPU optimization assumes that you run a Intel processor.
--	# If you use a AMD CPU, you could ajust the settings here for better
--	# performance. For gcc 4.x use CPU_TYPE ?= athlon-xp
--		# if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=-m32 $(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
--					-Wall
--				LDFLAGS+=-m32
--			#if gcc 4.0+
--ifeq			($(CC_CLASS), 4.x)
--					ARCH_VER=$(shell $(GETARCH))
--ifeq 				($(ARCH_VER), i386)
--						CPU_TYPE ?= i686
--else
--						CPU_TYPE ?= prescott
--endif
--					CFLAGS+=-minline-all-stringops \
--							-falign-loops \
--							-ftree-vectorize \
--							-mtune=$(CPU_TYPE) \
--					-Wold-style-definition -Wmissing-field-initializers -Wredundant-decls
--
--else
--			#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--					CPU_TYPE ?= pentium4
--					CFLAGS+=-minline-all-stringops \
--							-falign-loops
--ifeq				(X,$(shell echo "$(CC_SHORTVER)" | sed -e 's/3\.[0-3]/X/'))
--					CFLAGS+=-mcpu=$(CPU_TYPE)
--else
--					CFLAGS+=-mtune=$(CPU_TYPE)
--endif
--else
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
--					for better results)
--
--					CFLAGS+=-m486 \
--							-malign-loops=4
--else
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version  ($(CC_SHORTVER)), compile at your own risk!)
--
--endif			# CC_CLASS, 2.9x
--endif			# CC_CLASS, 3.x
--endif			# CC_CLASS, 4.x
--
--else		# CC_NAME, gcc
--ifeq		($(CC_NAME), icc)
--			CFLAGS+=$(CC_OPTIMIZE_FLAG)  -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,
--				# optimize for PIII, use PIII instructions & vect.,
--				# mutlithread loops)
--else		#CC_NAME, icc
--ifeq		($(CC_NAME), suncc)
--			CFLAGS+=-xO5 -fast -native -xCC \
--					-xc99=no_lib # C99 support
--			# -Dinline="" # add this if cc < 5.3 (define inline as null)
--else
--ifeq		($(CC_NAME), clang)
--			CFLAGS+=$(CC_OPTIMIZE_FLAG) -Wall -funroll-loops
--else
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, clang
--endif		#CC_NAME, suncc
--endif		#CC_NAME, icc
--endif		#CC_NAME, gcc
--endif	#ARCH, i386
--
--#x86_64
--ifeq	($(ARCH), x86_64)
--	# These CPU optimization assumes that you run a Intel 64 processor.
--	# If you use a AMD 64 CPU, you could ajust the settings here for better
--	# performance. For gcc 4.x use CPU_TYPE ?= athlon64
--	# Perhaps it makes sense to use '-m64' here?
--		# if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
--					-Wall
--			#if gcc 4.0+
--ifeq			($(CC_CLASS), 4.x)
--					CPU_TYPE ?= nocona
--					CFLAGS+=-minline-all-stringops \
--							-falign-loops \
--							-ftree-vectorize \
--							-mtune=$(CPU_TYPE) \
--					-Wold-style-definition -Wmissing-field-initializers -Wredundant-decls
--else
--			#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--					CPU_TYPE ?= nocona
--					CFLAGS+=-minline-all-stringops \
--							-falign-loops \
--							-mtune=$(CPU_TYPE)
--else
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
--					for better results)
--
--					CFLAGS+=-m486 \
--							-malign-loops=4
--else
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version  ($(CC_SHORTVER)), compile at your own risk!)
--
--endif			# CC_CLASS, 2.9x
--endif			# CC_CLASS, 3.x
--endif			# CC_CLASS, 4.x
--
--else		# CC_NAME, gcc
--ifeq		($(CC_NAME), icc)
--			CFLAGS+=$(CC_OPTIMIZE_FLAG) -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,
--				# optimize for PIII, use PIII instructions & vect.,
--				# mutlithread loops)
--else
--ifeq		($(CC_NAME), suncc)
--			CFLAGS+=-xO5 -fast -native -xCC \
--				-xc99=no_lib # C99 support
--				# -Dinline="" # add this if cc < 5.3 (define inline as null)
--else
--ifeq		($(CC_NAME), clang)
--			CFLAGS+=$(CC_OPTIMIZE_FLAG) -Wall -funroll-loops
--else
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, clang
--endif		#CC_NAME, icc
--endif		#CC_NAME, gcc
--endif		#CC_NAME, suncc
--endif	#ARCH, x86_64
--
--	#if sparc
--ifeq	($(ARCH), sparc64)
--			#if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  $(PROFILE) \
--					-Wall\
--					#-Wcast-align \
--					#-Wmissing-prototypes
--				#if gcc 4.x
--ifeq			($(CC_CLASS), 4.x)
--
--					# Processors of Family UltraSparc II
--					ifeq ($(CHIP), ultrasparc-ii)
--						CFLAGS+= -ftree-vectorize -mcpu=ultrasparc -mtune=ultrasparc -mvis
--					endif
--
--					# Processors of Family UltraSparc III (III, III, IIIi, IIICu)
--					ifeq ($(CHIP), ultrasparc-iiii)
--						CFLAGS+= -ftree-vectorize -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
--					endif
--
--					ifeq ($(CHIP), ultrasparc-iii)
--						CFLAGS+= -ftree-vectorize -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
--					endif
--
--					ifeq ($(CHIP), ultrasparc-iiicu)
--						CFLAGS+= -ftree-vectorize -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
--					endif
--
--					# Processors of Family UltraSparc T1
--					ifeq ($(CHIP), ultrasparc-t1)
--						# niagara switch is not supported on GCC < 4.2
--						# Sets to default ultrasparc
--						ifeq ($(CC_SHORTVER), 4.2)
--							CFLAGS+= -ftree-vectorize -mcpu=niagara -mtune=niagara -mvis
--						else
--							ifeq ($(CC_SHORTVER), 4.3)
--								CFLAGS+= -ftree-vectorize -mcpu=niagara -mtune=niagara -mvis
--							else
--								CFLAGS+= -ftree-vectorize -mcpu=ultrasparc -mtune=ultrasparc -mvis
--							endif
--						endif
--					endif
--
--					# If processor detection fails, defaults to UltraSPARC without VIS
--					ifeq (,$(CHIP))
--						#CPU_TYPE=ultrasparc
--						CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
--					endif
--
--					# use -m64 to force 64 bit (but add it also to LDFLAGS),
--					# -m32 for 32 bit (default on solaris),
--					# nothing for arch. default
--					# -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu
--					#-mno-epilogue #try to inline function exit code
--					#-mflat # omit save/restore
--					#-,faster-structs #faster non Sparc ABI structure copy ops
--
--else
--				#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--
--					# Processors of Family UltraSparc II
--					ifeq ($(CHIP), ultrasparc-ii)
--						#CPU_TYPE=ultrasparc
--						CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc -mvis
--					endif
--
--					# Processors of Family UltraSparc III
--					ifeq ($(CHIP), ultrasparc-iiii)
--						CFLAGS+= -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
--					endif
--
--					ifeq ($(CHIP), ultrasparc-iiii)
--						CFLAGS+= -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
--					endif
--
--					ifeq ($(CHIP), ultrasparc-iiicu)
--						CFLAGS+= -mcpu=ultrasparc3 -mtune=ultrasparc3 -mvis
--					endif
--
--					# Processors of Family UltraSparc T1
--					ifeq ($(CHIP), ultrasparc-t1)
--						# niagara switch is not supported on GCC < 4.2
--						# Sets to default ultrasparc
--						CFLAGS+= -mcpu=ultrasparc -mtune=ultrasparc -mvis
--					endif
--
--					# If processor detection fails, defaults to UltraSPARC without VIS
--					ifeq (,$(CHIP))
--						#CPU_TYPE=ultrasparc
--						CFLAGS += -mcpu=ultrasparc -mtune=ultrasparc
--					endif
--
--					# use -m64 to force 64 bit (but add it also to LDFLAGS),
--					# -m32 for 32 bit (default on solaris),
--					# nothing for arch. default
--					# -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu
--					#-mno-epilogue #try to inline function exit code
--					#-mflat # omit save/restore
--					#-,faster-structs #faster non Sparc ABI structure copy ops
--
--else			# CC_CLASS, 3.0
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc >= 3.1 \
--					for better results)
--ifneq				($(OS), netbsd)
--						# on netbsd/sparc64,  gcc 2.95.3 does not compile
--						# opensips with -mv8
--						CFLAGS+= -mv8
--endif
--ifeq					($(ASTYPE), solaris)
--							CFLAGS+= -Wa,-xarch=v8plus
--endif
--else			#CC_CLASS, 2.9x
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version ($(CC_SHORTVER)), compile at your own risk!)
--
--					CFLAGS+= -mv8
--ifeq					($(ASTYPE), solaris)
--							CFLAGS+= -Wa,-xarch=v8plus
--endif
--
--endif			#CC_CLASS, 2.9x
--endif			#CC_CLASS, 3.x
--endif			#CC_CLASS, 4.x
--
--else		#CC_NAME, gcc
--ifeq		($(CC_NAME), suncc)
--			CFLAGS+=-xO5 -fast -native -xarch=v8plusa -xCC \
--					-xc99=no_lib # C99 support
--			# -Dinline="" # add this if cc < 5.3 (define inline as null)
--else
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, suncc
--endif		#CC_NAME, gcc
--endif	#ARCH, sparc64
--
--	#if ipaq/netwinder
--ifeq	($(ARCH), arm)
--		# if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
--					-Wall -marm
--			#if gcc 4.x+
--ifeq			($(CC_CLASS), 4.x)
--					CFLAGS+=-mcpu=strongarm1100 -ftree-vectorize
--else
--			#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--					CFLAGS+= -mcpu=strongarm1100
--else
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
--					for better results)
--
--					CFLAGS+=
--else
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version ($(CC_SHORTVER)), compile at your own risk!)
--
--endif			# CC_CLASS, 2.9x
--endif			# CC_CLASS, 3.x
--endif			# CC_CLASS, 4.x
--
--else		# CC_NAME, gcc
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, gcc
--endif	#ARCH, arm
--
--	#if  mips (R3000)
--ifeq	($(ARCH), mips)
--		# if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops  -Wcast-align $(PROFILE) \
--					-Wall
--			#if gcc 4.0+
--ifeq			($(CC_CLASS), 4.x)
--					CFLAGS+=-mcpu=r3000 -minline-all-stringops \
--							-ftree-vectorize
--else
--			#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--					CFLAGS+= -mcpu=r3000
--							#-mcpu=athlon
--else
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
--					for better results)
--
--					CFLAGS+=-mcpu=r3000
--else
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version ($(CC_SHORTVER)), compile at your own risk!)
--
--endif			# CC_CLASS, 2.9x
--endif			# CC_CLASS, 3.x
--endif			# CC_CLASS, 4.x
--
--else		# CC_NAME, gcc
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, gcc
--endif	#ARCH, mips
--
--	#if  >=mips2 (R4000, R5000, R6000 ....)
--ifeq	($(ARCH), mips2)
--		# if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=$(CC_OPTIMIZE_FLAG) -mips2 -funroll-loops $(PROFILE) \
--					-Wall
--			#if gcc 4.0+
--ifeq			($(CC_CLASS), 4.x)
--					CFLAGS+=-minline-all-stringops -ftree-vectorize
--else
--			#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--					CFLAGS+=
--else
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
--					for better results)
--					CFLAGS+=
--else
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version ($(CC_SHORTVER)), compile at your own risk!)
--
--endif			# CC_CLASS, 2.9x
--endif			# CC_CLASS, 3.x
--endif			# CC_CLASS, 4.x
--
--else		# CC_NAME, gcc
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, gcc
--endif	#ARCH, mips2
--
--#if  alpha
--ifeq	($(ARCH), alpha)
--		# if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops $(PROFILE)  -Wall
--			#if gcc 4.0+
--ifeq			($(CC_CLASS), 4.x)
--					CFLAGS+=-minline-all-stringops
--else
--			#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--					CFLAGS+=
--else
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
--					for better results)
--					CFLAGS+=
--else
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version ($(CC_SHORTVER)), compile at your own risk!)
--
--endif			# CC_CLASS, 2.9x
--endif			# CC_CLASS, 3.x
--endif			# CC_CLASS, 4.x
--
--else		# CC_NAME, gcc
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, gcc
--endif	#ARCH, alpha
--
--#if  ppc
--ifeq	($(ARCH), ppc)
--		# if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops $(PROFILE)  -Wall
--			#if gcc 4.0+
--ifeq			($(CC_CLASS), 4.x)
--					CPU_TYPE ?= powerpc
--					CFLAGS+=-ftree-vectorize \
--							-mtune=$(CPU_TYPE) -maltivec
--else
--			#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--					CFLAGS+=
--else
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
--					for better results)
--					CFLAGS+=
--else
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version ($(CC_SHORTVER)), compile at your own risk!)
--
--endif			# CC_CLASS, 2.9x
--endif			# CC_CLASS, 3.x
--endif			# CC_CLASS, 4.x
--
--else		# CC_NAME, gcc
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, gcc
--endif	#ARCH, ppc
--
--#if  ppc64
--ifeq	($(ARCH), ppc64)
--		# if gcc
--ifeq		($(CC_NAME), gcc)
--				#common stuff
--				CFLAGS+=$(CC_OPTIMIZE_FLAG) -funroll-loops $(PROFILE)  -Wall
--ifeq			($(CC_CLASS), 4.x)
--					CPU_TYPE ?= powerpc64
--					CFLAGS+=-ftree-vectorize \
--							-mtune=$(CPU_TYPE) -maltivec
--else
--			#if gcc 3.0+
--ifeq			($(CC_CLASS), 3.x)
--					CFLAGS+=
--else
--ifeq			($(CC_CLASS), 2.9x) #older gcc version (2.9[1-5])
--$(warning 			Old gcc detected ($(CC_SHORTVER)), use  gcc 3.0.x \
--					for better results)
--					CFLAGS+=
--else
--				#really old version
--$(warning			You are using an old and unsupported gcc \
--					 version ($(CC_SHORTVER)), compile at your own risk!)
--
--endif			# CC_CLASS, 2.9x
--endif			# CC_CLASS, 3.x
--endif			# CC_CLASS, 4.x
--
--else		# CC_NAME, gcc
--				#other compilers
--$(error 			Unsupported compiler ($(CC):$(CC_NAME)), try gcc)
--endif		#CC_NAME, gcc
--endif	#ARCH, ppc
--
--endif   # CFLAGS not set
--
- LD_EXTRA_OPTS ?=
- 
- # setting LDFLAGS
diff --git a/opensips.spec b/opensips.spec
index 085684d..c3aac19 100644
--- a/opensips.spec
+++ b/opensips.spec
@@ -4,7 +4,7 @@
 
 Summary:  Open Source SIP Server
 Name:     opensips
-Version:  3.0.1
+Version:  3.0.2
 Release:  1%{?dist}
 License:  GPLv2+
 Source0:  https://github.com/%{name}/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
@@ -13,15 +13,8 @@ Patch1: opensips-0001-Consistently-use-rtpproxy-switches.patch
 Patch2: opensips-0002-Cleanup-Oracle-s-makefiles.patch
 Patch3: opensips-0003-db_ora-null-terminating-string-is-more-safely-most-m.patch
 Patch4: opensips-0004-Return-actual-payload-ID-in-case-of-a-dynamic-payloa.patch
-Patch5: opensips-0005-Use-additional-auth-field-Sip-Source-IP-Address.patch
-Patch6: opensips-0006-Don-t-remove-pthread-library-explicitly-from-mi_xmlr.patch
-Patch7: opensips-0007-Dont-try-modifying-CFLAGS.patch
-
-# Backported from 3.0 branch
-# none
-
-# Backported from master branch
-# none
+Patch5: opensips-0005-Don-t-remove-pthread-library-explicitly-from-mi_xmlr.patch
+Patch6: opensips-0006-Dont-try-modifying-CFLAGS.patch
 
 URL:      https://opensips.org
 
@@ -766,8 +759,6 @@ clients.
 
 %prep
 %autosetup -p1
-rm -f modules/db_oracle/asynch.c
-rm -f modules/db_oracle/asynch.h
 
 %build
 LOCALBASE=/usr NICER=0 CFLAGS="%{optflags} -fgnu89-inline" LDFLAGS="%{?__global_ldflags}" %{?_with_oracle:ORAHOME="$ORACLE_HOME"} %{__make} all modules-readme %{?_smp_mflags} TLS=1 \
@@ -1365,6 +1356,11 @@ useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \
 
 
 %changelog
+* Tue Jan 28 2020 Peter Lemenkov <lemenkov@gmail.com> - 3.0.2-1
+- Ver. 3.0.2
+- Removed patch #5 (opensips-0005-Use-additional-auth-field-Sip-Source-IP-Address.patch).
+  Use $acc_extra variable instead.
+
 * Thu Nov 28 2019 Peter Lemenkov <lemenkov@gmail.com> - 3.0.1-1
 - Ver. 3.0.1
 - Module mi_json was renamed to mi_http
diff --git a/sources b/sources
index a19ca7e..f48a4b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (opensips-3.0.1.tar.gz) = 41f94567e35dc77b6b4df7defc5ef33c12a2f376570ed9158f5792570c8e254e9c30ddc9d0921bc956807950be36c6d69d1a29dbcfde0fae0ae2e2682c7600af
+SHA512 (opensips-3.0.2.tar.gz) = 569e44ad89fbe6ee1696298c8a6f460f79c4c9fb7517a5ab4dcdb612f28b8115d86f81c5397e325acfc8ff2522f5034d865f8b28a50b3c9ba6df561013fe65e3