From cc2d3b09a36a740fbfdcd4c7f0aaf444ee6fa578 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Mon, 23 Apr 2018 15:53:13 +0200 Subject: [PATCH 1/7] adapt Rakefile and Dockerfile for SLE-12-SP4 --- Dockerfile | 3 ++- Rakefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c148673..57e75e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,4 @@ -FROM yastdevel/ruby:sle12-sp3 +FROM yastdevel/ruby:sle12-sp4 + COPY . /usr/src/app diff --git a/Rakefile b/Rakefile index c684d04..8502314 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ require "yast/rake" -Yast::Tasks.submit_to :sle12sp3 +Yast::Tasks.submit_to :sle12sp4 Yast::Tasks.configuration do |conf| #lets ignore license check for now From 1dfcd49d4fc376ca7c3b53fd84519b307c50a209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 6 Jul 2018 14:07:09 +0100 Subject: [PATCH 2/7] Replace novell sites by SUSE ones for testing. --- CONTRIBUTING.md | 2 +- src/modules/Proxy.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8e2e012..c68864d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ Bug Reports If you find a problem, please report it either using [Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) or [GitHub issues](../../issues). (For Bugzilla, use the [simplified -registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +registration](https://www.suse.com/selfreg/jsp/createSimpleAccount.jsp) if you don't have an account yet.) When creating a bug report, please follow our [bug reporting diff --git a/src/modules/Proxy.rb b/src/modules/Proxy.rb index 0fcea53..50d9a18 100644 --- a/src/modules/Proxy.rb +++ b/src/modules/Proxy.rb @@ -272,8 +272,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 @@ -327,7 +327,7 @@ def RunTestProxy(http_proxy, https_proxy, ftp_proxy, proxy_user, proxy_password) http_proxy, 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( @@ -335,14 +335,14 @@ def RunTestProxy(http_proxy, https_proxy, ftp_proxy, proxy_user, proxy_password) https_proxy, user_pass, timeout_sec, - "https://secure-www.novell.com --insecure" + "https://www.suse.com --insecure" ) ftp_command = Builtins.sformat( command, ftp_proxy, user_pass, timeout_sec, - "ftp://ftp.novell.com" + "ftp://ftp.suse.com" ) Builtins.y2milestone("Running HTTP_PROXY test...") From c255b3e11ec26ba7c36a45c191be6a05e63f7622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20Alejandro=20Anderssen=20Gonz=C3=A1lez?= Date: Fri, 19 Jul 2019 14:00:31 +0100 Subject: [PATCH 3/7] Bump version & changelog. --- package/yast2-proxy.changes | 6 ++++++ package/yast2-proxy.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2-proxy.changes b/package/yast2-proxy.changes index 5d06105..c379c24 100644 --- a/package/yast2-proxy.changes +++ b/package/yast2-proxy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 19 12:59:49 UTC 2019 - Knut Alejandro Anderssen González + +- Replace novel urls by SUSE ones (bsc#1100366) +- 3.1.8 + ------------------------------------------------------------------- Thu May 10 09:18:19 UTC 2018 - mvidner@suse.com diff --git a/package/yast2-proxy.spec b/package/yast2-proxy.spec index 584bee4..a6ca24e 100644 --- a/package/yast2-proxy.spec +++ b/package/yast2-proxy.spec @@ -17,7 +17,7 @@ Name: yast2-proxy -Version: 3.1.7 +Version: 3.1.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build From be027e0752db7d8c43ee652ff40eddbcd985e121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Fri, 19 Jul 2019 14:22:52 +0100 Subject: [PATCH 4/7] adapt Rakefile and Dockerfile for SLE-12-SP5 --- Dockerfile | 3 ++- Rakefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 57e75e9..57087fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM yastdevel/ruby:sle12-sp4 +FROM yastdevel/ruby:sle12-sp5 + COPY . /usr/src/app diff --git a/Rakefile b/Rakefile index 8502314..4d84ae6 100644 --- a/Rakefile +++ b/Rakefile @@ -1,6 +1,6 @@ require "yast/rake" -Yast::Tasks.submit_to :sle12sp4 +Yast::Tasks.submit_to :sle12sp5 Yast::Tasks.configuration do |conf| #lets ignore license check for now From cf9066d11f331f95332846f20e8a13a4fe897379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Mon, 22 Jul 2019 23:50:20 +0100 Subject: [PATCH 5/7] Add Yard options file Borrowed from yast/yast-nfs-server#35 > Add our typical .yardopts file to generate to set doc/autodocs as our > documentation directory. --- .yardopts | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .yardopts diff --git a/.yardopts b/.yardopts new file mode 100644 index 0000000..75b10d4 --- /dev/null +++ b/.yardopts @@ -0,0 +1,7 @@ +--no-private +--markup markdown +--protected +--readme README.md +--output-dir ./doc/autodocs +--files *.md +src/**/*.rb From 6d07b599376b08b9dce6576715c9a77d37391ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADaz=20Gonz=C3=A1lez?= Date: Mon, 22 Jul 2019 16:26:39 +0100 Subject: [PATCH 6/7] Update .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f27e51f..3e8fa64 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ configure configure.ac /coverage/ depcomp +doc/autodocs install-sh *.pot libtool @@ -23,6 +24,7 @@ missing mkinstalldirs stamp-h* Makefile.am.common +.yardoc/ *.ami *.bz2 .dep From b30514c4a820cab037fdacf12699d1ac65e95900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 21 Apr 2020 16:31:35 +0200 Subject: [PATCH 7/7] Adapt Rakefile and Dockerfile for SLE-15-SP2 --- Dockerfile | 2 +- Rakefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 94abc86..159e190 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest +FROM registry.opensuse.org/yast/sle-15/sp2/containers/yast-ruby COPY . /usr/src/app diff --git a/Rakefile b/Rakefile index 927a322..647d07f 100644 --- a/Rakefile +++ b/Rakefile @@ -1,5 +1,7 @@ require "yast/rake" +Yast::Tasks.submit_to :sle15sp2 + Yast::Tasks.configuration do |conf| #lets ignore license check for now conf.skip_license_check << /.*/