From 27dabfab5419cbf00f3b80683f31453db8bed1f9 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 10 Dec 2019 10:08:41 +0100
Subject: T1843: fix proxy URL handling when running through GCC preprocessor

Newer GCC version (8.3 in Debian Buster) no longer support the -ansi option as
in GCC 4 used in Debian Jessie. Thus the URL which is used as regex for the
proxy must be escaped properly - else the // in the URL is treated as C++
comment.
---
 Makefile                                  | 2 +-
 interface-definitions/system-proxy.xml.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 97e933694..c085872a1 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ obj = $(src:.xml.in=.xml)
 	# -nostdinc  Do not search the standard system directories for header files
 	# -P         Inhibit generation of linemarkers in the output from the
 	#            preprocessor
-	@$(CC) -ansi -x c -E -undef -nostdinc -P -I$(CURDIR)/interface-definitions -o $(BUILD_DIR)/$@ -c $<
+	@$(CC) -x c-header -E -undef -nostdinc -P -I$(CURDIR)/interface-definitions -o $(BUILD_DIR)/$@ -c $<
 
 $(BUILD_DIR):
 	install -d -m 0755 $(BUILD_DIR)/interface-definitions
diff --git a/interface-definitions/system-proxy.xml.in b/interface-definitions/system-proxy.xml.in
index 4b21139a6..540fa97e3 100644
--- a/interface-definitions/system-proxy.xml.in
+++ b/interface-definitions/system-proxy.xml.in
@@ -11,7 +11,7 @@
             <properties>
               <help>Proxy URL</help>
               <constraint>
-                <regex>http://[a-z0-9\.]+$</regex>
+                <regex>http:\/\/[a-z0-9\.]+$</regex>
               </constraint>
             </properties>
           </leafNode>
@@ -27,7 +27,7 @@
             <properties>
               <help>Proxy username</help>
               <constraint>
-                <regex>^[a-z0-9-_\.]{1,100}$</regex>
+                <regex>[a-z0-9-_\.]{1,100}$</regex>
               </constraint>
             </properties>
           </leafNode>
-- 
cgit v1.2.3