Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2020-09-07 21:37:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler" Mon Sep 7 21:37:12 2020 rev:57 rq:832806 version:3.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2020-08-31 16:52:32.472421065 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new.3399/cobbler.changes 2020-09-07 21:37:19.709435587 +0200 @@ -1,0 +2,23 @@ +Mon Sep 7 14:31:58 UTC 2020 - Jochen Breuer <[email protected]> + +- Adding tornado dependency for cobbler tftpd again. + +------------------------------------------------------------------- +Mon Sep 7 12:29:16 UTC 2020 - Jochen Breuer <[email protected]> + +- cgi.parse_qs is deprecated. Using urllib instead. + +- Added: + * cgi_parse_qs_is_deprecated.diff + +------------------------------------------------------------------- +Fri Sep 4 14:21:52 UTC 2020 - Jochen Breuer <[email protected]> + +- Adds requirement for python-distro + +------------------------------------------------------------------- +Fri Sep 4 13:15:34 UTC 2020 - Jochen Breuer <[email protected]> + +- Removes Tornado as dependency and only recommends Ldap3 + +------------------------------------------------------------------- New: ---- cgi_parse_qs_is_deprecated.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.PKnKGM/_old 2020-09-07 21:37:20.441435926 +0200 +++ /var/tmp/diff_new_pack.PKnKGM/_new 2020-09-07 21:37:20.441435926 +0200 @@ -131,6 +131,7 @@ Source: %{name}-%{version}.tar.gz Source1: cobbler.rpmlintrc BuildArch: noarch +Patch0: cgi_parse_qs_is_deprecated.diff BuildRequires: git-core BuildRequires: %{system_release_pkg} @@ -188,13 +189,14 @@ Requires: %{py3_module_cheetah} Requires: %{py3_module_dns} Requires: python%{python3_pkgversion}-future -Requires: python%{python3_pkgversion}-ldap3 Requires: %{apache_mod_wsgi} Requires: python%{python3_pkgversion}-netaddr Requires: %{py3_module_pyyaml} Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-simplejson Requires: python%{python3_pkgversion}-tornado +Requires: python%{python3_pkgversion}-distro +Recommends: python%{python3_pkgversion}-ldap3 %endif @@ -251,6 +253,7 @@ %prep %setup +%patch0 -p1 %if 0%{?suse_version} # Set tftpboot location correctly for SUSE distributions ++++++ cgi_parse_qs_is_deprecated.diff ++++++ diff --git a/cobbler/templar.py b/cobbler/templar.py index 9720a740e..aeb161214 100644 --- a/cobbler/templar.py +++ b/cobbler/templar.py @@ -132,7 +132,7 @@ def render(self, data_input, search_table, out_path, subject=None, template_type # Now apply some magic post-filtering that is used by "cobbler import" and some other places. Forcing folks to # double escape things would be very unwelcome. hp = search_table.get("http_port", "80") - server = search_table.get("server", "server.example.org") + server = search_table.get("server", self.settings.server) if hp not in (80, '80'): repstr = "%s:%s" % (server, hp) else: diff --git a/svc/services.py b/svc/services.py index 7001e0258..fa4be4aac 100644 --- a/svc/services.py +++ b/svc/services.py @@ -63,7 +63,7 @@ def application(environ, start_response): form[field] = t label = not label - form["query_string"] = cgi.parse_qs(environ['QUERY_STRING']) + form["query_string"] = urllib.parse.parse_qs(environ['QUERY_STRING']) # This MAC header is set by anaconda during a kickstart booted with the # kssendmac kernel option. The field will appear here as something
