Merge pull request #43 from yast/merge_SLE-15-SP1

Replace novell url in SLE-15-SP2
yast · Jun 9, 2021 · fbe6518 · fbe6518
2 parents b30514c + 2a47ae1
commit fbe6518
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/package/yast2-proxy.changes b/package/yast2-proxy.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 09 09:59:49 UTC 20201 - Knut Anderssen <kanderssen@suse.com>
+
+- Replace novell urls by SUSE ones (bsc#1100366)
+- 4.2.3
+
 -------------------------------------------------------------------
 Thu Aug 22 12:53:15 CEST 2019 - schubi@suse.de
 

diff --git a/package/yast2-proxy.spec b/package/yast2-proxy.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-proxy
-Version:        4.2.2
+Version:        4.2.3
 Release:        0
 Summary:        YaST2 - Proxy Configuration
 License:        GPL-2.0-or-later

diff --git a/src/modules/Proxy.rb b/src/modules/Proxy.rb
@@ -273,8 +273,8 @@ def RunTestProxy(http_proxy, https_proxy, ftp_proxy, proxy_user, proxy_password)
       # /usr/bin/curl --verbose
       # --proxy http://server_name:port_number
       # --proxy-user user:password
-      # --url http://www.novell.com or ftp://ftp.novell.com | suggested for HTTP or FTP test
-      # --url https://secure-www.novell.com --insecure
+      # --url http://www.suse.com or ftp://ftp.suse.com | suggested for HTTP or FTP test
+      # --url https://www.suse.com --insecure
       ret = {}
 
       test_http = http_proxy != "" && http_proxy != "http://" ? true : false
@@ -296,22 +296,22 @@ def RunTestProxy(http_proxy, https_proxy, ftp_proxy, proxy_user, proxy_password)
         http_proxy.shellescape,
         user_pass,
         timeout_sec,
-        "http://www.novell.com"
+        "http://www.suse.com"
       )
       # adding option --insecure to accept the certificate without asking
       https_command = Builtins.sformat(
         command,
         https_proxy.shellescape,
         user_pass,
         timeout_sec,
-        "https://secure-www.novell.com --insecure"
+        "https://www.suse.com --insecure"
       )
       ftp_command = Builtins.sformat(
         command,
         ftp_proxy.shellescape,
         user_pass,
         timeout_sec,
-        "ftp://ftp.novell.com"
+        "ftp://ftp.suse.com"
       )
 
       Builtins.y2milestone("Running HTTP_PROXY test...")