Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2019-11-26 17:00:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler" Tue Nov 26 17:00:42 2019 rev:52 rq:750674 version:3.0.1+git20191025.fbebd758 Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-07-24 20:37:50.754558875 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new.26869/cobbler.changes 2019-11-26 17:01:11.280071644 +0100 @@ -1,0 +2,53 @@ +Tue Nov 19 10:20:39 UTC 2019 - Jochen Breuer <[email protected]> + +- Fix for cobbler import and buildiso (bsc#1156574) + +- Added: + * kopts-utils-path.diff + * no-system-in-kopts-call.diff + * item-repo-import-fix.diff + +------------------------------------------------------------------- +Fri Oct 25 16:19:06 UTC 2019 - [email protected] + +- Update to latest git HEAD code base (commit fbebd758) +- Adjusted manpage creation (needs sphinx as BuildRequires) + +------------------------------------------------------------------- +Tue Oct 8 15:01:22 UTC 2019 - [email protected] + +- Switch to openSUSE latest_mulitarch_work for shortterm until + everything is in place and submitted mainline +- started to switch to Sphinx manpage generation, but comment out. + SuMa people must have done this already somewhere. +- Already mainline: +D fix_module_renaming.diff + +------------------------------------------------------------------- +Wed Sep 18 14:28:06 UTC 2019 - [email protected] + +- Fix cobbler sync for dhcp and dns enabled due to latest module + renaming patches + +------------------------------------------------------------------- +Tue Sep 17 06:40:42 UTC 2019 - [email protected] + +- Update to latest git HEAD + - Fixes permission denied in apache2 context when trying to write + cobbler log + - Fixes a bad import in import_signature (item) + - Fixes bad shebang bash path in mkgrub.sh (used in post section) + +------------------------------------------------------------------- +Wed Sep 11 10:21:46 UTC 2019 - Christian Vögl <[email protected]> + +- Now track Github master branch + WARNING: This release contains breaking changes for your settings file! + * Notable changes: + - Now using standard python logger + - Updated dhcpd.template +- Removed fix_shebang.patch: now in upstream. +- added -s parameter to fdupes call to prevent hardlink across + partititons + +------------------------------------------------------------------- Old: ---- cobbler-3.0.0.tar.xz fix_shebang.patch New: ---- cobbler-3.0.1+git20191025.fbebd758.tar.xz item-repo-import-fix.diff kopts-utils-path.diff no-system-in-kopts-call.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.cZwWtS/_old 2019-11-26 17:01:12.436071263 +0100 +++ /var/tmp/diff_new_pack.cZwWtS/_new 2019-11-26 17:01:12.436071263 +0100 @@ -25,7 +25,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global debug_package %{nil} Name: cobbler -Version: 3.0.0 +Version: 3.0.1+git20191025.fbebd758 Release: 0 Summary: Boot server configurator License: GPL-2.0-or-later @@ -37,9 +37,12 @@ Source1: AUTHORS Source2: logrotate_cobbler Source3: fence_ipmitool.template -Patch0: fix_hardcoded_libpath_for_websession.patch -Patch1: fix_shebang.patch +Patch1: fix_hardcoded_libpath_for_websession.patch Patch2: exclude_get-loaders_command.patch +Patch3: kopts-utils-path.diff +Patch4: no-system-in-kopts-call.diff +Patch5: item-repo-import-fix.diff + BuildRequires: python3-Cheetah3 BuildRequires: apache-rpm-macros @@ -54,6 +57,8 @@ BuildRequires: python3-coverage BuildRequires: python3-future BuildRequires: python3-setuptools +BuildRequires: python3-Sphinx +BuildRequires: gzip BuildRequires: pkgconfig(systemd) # Workaround so that /srv/tftpboot file exists during # build, but is not owned by cobbler @@ -124,18 +129,32 @@ http://server/cobbler_web to configure the install server. %prep -%setup -q -n cobbler-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autosetup -p1 %build %python_build cp %{SOURCE1} AUTHORS +%python_exec setup.py build_sphinx -b man + +for manpage in build/sphinx/man/*;do + if [ %{?ext_man} == ".xz" ];then + ZIPPER="xz --stdout " + elif [ %{?ext_man} == ".gz" ];then + ZIPPER="gzip --stdout " + else + ZIPPER="gzip --stdout " + fi + $ZIPPER --stdout $manpage >$manpage%{?ext_man}; +done + %install %python_install +install -D -m 0600 build/sphinx/man/cobbler-cli.1%{?ext_man} %{buildroot}%{_mandir}/man1/cobbler-cli.1%{?ext_man} +install -D -m 0600 build/sphinx/man/cobblerd.1%{?ext_man} %{buildroot}%{_mandir}/man1/cobblerd.1%{?ext_man} +install -D -m 0600 build/sphinx/man/cobbler.conf.5%{?ext_man} %{buildroot}%{_mandir}/man5/cobbler_conf.5%{?ext_man} + ln -sf service %{buildroot}%{_sbindir}/rccobblerd rm -rf %{buildroot}%{_initddir} mkdir -p %{buildroot}%{_unitdir} @@ -156,7 +175,7 @@ cp -r tests/ $RPM_BUILD_ROOT/usr/share/cobbler/ %endif -%fdupes %{buildroot}%{_prefix} +%fdupes -s %{buildroot}%{_prefix} %pre %service_add_pre cobblerd.service @@ -241,9 +260,12 @@ %{_bindir}/cobbler-ext-nodes %{_bindir}/cobblerd %{_datadir}/%{name}/bin/mkgrub.sh +%{_datadir}/%{name}/bin/settings-migration-v1-to-v2.sh %{_datadir}/cobbler/web %attr(750, root, root) %{_localstatedir}/log/cobbler -%{_mandir}/man1/cobbler.1%{?ext_man} +%{_mandir}/man1/cobbler-cli.1%{?ext_man} +%{_mandir}/man1/cobblerd.1%{?ext_man} +%{_mandir}/man5/cobbler_conf.5%{?ext_man} %{_sbindir}/tftpd.py* %{_sbindir}/rccobblerd %{_sbindir}/fence_ipmitool @@ -254,7 +276,7 @@ %config(noreplace) %{_sysconfdir}/cobbler %config(noreplace) %{_localstatedir}/lib/cobbler -%config(noreplace) %{_sysconfdir}/%{apachedir}/conf.d/cobbler.conf +%config(noreplace) %{_sysconfdir}/%{apachedir}/vhosts.d/cobbler.conf # ToDo: This is used by systemd service file: # ExecStartPost=/usr/bin/touch /usr/share/cobbler/web/cobbler.wsgi # Get this into cobbler-web somehow @@ -272,7 +294,7 @@ %files web %license COPYING %doc AUTHORS -%config(noreplace) %{_sysconfdir}/%{apachedir}/conf.d/cobbler_web.conf +%config(noreplace) %{_sysconfdir}/%{apachedir}/vhosts.d/cobbler_web.conf %defattr(-,%{apache_user},%{apache_group},-) /%{www_path}/www/cobbler_webui_content/ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.cZwWtS/_old 2019-11-26 17:01:12.500071242 +0100 +++ /var/tmp/diff_new_pack.cZwWtS/_new 2019-11-26 17:01:12.500071242 +0100 @@ -2,13 +2,14 @@ <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/cobbler/cobbler</param> <param name="scm">git</param> - <param name="revision">v3.0.0</param> + <param name="revision">HEAD</param> <param name="changesgenerate">disable</param> <param name="filename">cobbler</param> - <param name="versionformat">3.0.0</param> <!-- - <param name="versionformat">3.0.0+git%cd.%h</param> + <param name="versionformat">3.0.1</param> --> + <param name="versionformat">3.0.1+git%cd.%h</param> + </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ exclude_get-loaders_command.patch ++++++ --- /var/tmp/diff_new_pack.cZwWtS/_old 2019-11-26 17:01:12.516071237 +0100 +++ /var/tmp/diff_new_pack.cZwWtS/_new 2019-11-26 17:01:12.516071237 +0100 @@ -1,8 +1,8 @@ -Index: cobbler-3.0.0+git20190529.1ba49e14/cobbler/cli.py +Index: cobbler-3.0.1+git20191008.21acab67/cobbler/cli.py =================================================================== ---- cobbler-3.0.0+git20190529.1ba49e14.orig/cobbler/cli.py 2019-05-29 17:37:14.000000000 +0200 -+++ cobbler-3.0.0+git20190529.1ba49e14/cobbler/cli.py 2019-06-03 15:38:27.347073554 +0200 -@@ -63,7 +63,7 @@ OBJECT_TYPES = list(OBJECT_ACTIONS_MAP.k +--- cobbler-3.0.1+git20191008.21acab67.orig/cobbler/cli.py 2019-10-08 16:08:04.000000000 +0200 ++++ cobbler-3.0.1+git20191008.21acab67/cobbler/cli.py 2019-10-08 16:37:26.492555510 +0200 +@@ -56,7 +56,7 @@ OBJECT_TYPES = list(OBJECT_ACTIONS_MAP.k OBJECT_ACTIONS = [] for actions in list(OBJECT_ACTIONS_MAP.values()): OBJECT_ACTIONS += actions @@ -11,7 +11,7 @@ #################################################### -@@ -587,9 +587,7 @@ class CobblerCLI(object): +@@ -580,9 +580,7 @@ class CobblerCLI(object): (options, args) = self.parser.parse_args() task_id = self.start_task("validate_autoinstall_files", options) elif action_name == "get-loaders": ++++++ fix_hardcoded_libpath_for_websession.patch ++++++ --- /var/tmp/diff_new_pack.cZwWtS/_old 2019-11-26 17:01:12.536071230 +0100 +++ /var/tmp/diff_new_pack.cZwWtS/_new 2019-11-26 17:01:12.540071229 +0100 @@ -8,11 +8,11 @@ Signed-off-by: Thomas Renninger <[email protected]> -Index: cobbler-3.0.0+git20190510.d43461b3/setup.py +Index: cobbler-3.0.1+git20191008.21acab67/setup.py =================================================================== ---- cobbler-3.0.0+git20190510.d43461b3.orig/setup.py 2019-05-10 16:41:32.000000000 +0200 -+++ cobbler-3.0.0+git20190510.d43461b3/setup.py 2019-05-15 16:14:04.414735035 +0200 -@@ -364,10 +364,6 @@ class install(_install): +--- cobbler-3.0.1+git20191008.21acab67.orig/setup.py 2019-10-08 16:08:04.000000000 +0200 ++++ cobbler-3.0.1+git20191008.21acab67/setup.py 2019-10-08 16:36:37.312552860 +0200 +@@ -304,10 +304,6 @@ class install(_install): # Run the usual stuff. _install.run(self) @@ -23,7 +23,7 @@ # Hand over some directories to the webserver user path = os.path.join(self.install_data, 'share/cobbler/web') try: -@@ -378,9 +374,7 @@ class install(_install): +@@ -318,9 +314,7 @@ class install(_install): if not os.path.abspath(libpath): # The next line only works for absolute libpath raise Exception("libpath is not absolute.") ++++++ item-repo-import-fix.diff ++++++ diff --git a/cobbler/modules/managers/import_signatures.py b/cobbler/modules/managers/import_signatures.py index 44bf52798..f7085ddc1 100644 --- a/cobbler/modules/managers/import_signatures.py +++ b/cobbler/modules/managers/import_signatures.py @@ -41,6 +41,7 @@ import cobbler.templar as templar import cobbler.utils as utils +import cobbler.items.repo as item_repo def register(): ++++++ kopts-utils-path.diff ++++++ diff --git a/cobbler/actions/buildiso.py b/cobbler/actions/buildiso.py index 00ed74d89..35ddd7080 100644 --- a/cobbler/actions/buildiso.py +++ b/cobbler/actions/buildiso.py @@ -167,7 +167,7 @@ def generate_netboot_iso(self, imagesdir, isolinuxdir, profiles=None, systems=No data = utils.blender(self.api, False, profile) # SUSE is not using 'text'. Instead 'textmode' is used as kernel option. - kopts_overwrite(system, dist, data['kernel_options'], self.api.settings()) + utils.kopts_overwrite(system, dist, data['kernel_options'], self.api.settings()) if not re.match(r"[a-z]+://.*", data["autoinstall"]): data["autoinstall"] = "http://%s:%s/cblr/svc/op/autoinstall/profile/%s"; % ( @@ -495,7 +495,7 @@ def generate_standalone_iso(self, imagesdir, isolinuxdir, distname, filesource, data = utils.blender(self.api, False, descendant) # SUSE is not using 'text'. Instead 'textmode' is used as kernel option. - kopts_overwrite(None, distro, data['kernel_options'], self.settings) + utils.kopts_overwrite(None, distro, data['kernel_options'], self.settings) cfg.write("\n") cfg.write("LABEL %s\n" % descendant.name) ++++++ no-system-in-kopts-call.diff ++++++ diff --git a/cobbler/actions/buildiso.py b/cobbler/actions/buildiso.py index 35ddd7080..69bf4ba14 100644 --- a/cobbler/actions/buildiso.py +++ b/cobbler/actions/buildiso.py @@ -167,7 +167,7 @@ def generate_netboot_iso(self, imagesdir, isolinuxdir, profiles=None, systems=No data = utils.blender(self.api, False, profile) # SUSE is not using 'text'. Instead 'textmode' is used as kernel option. - utils.kopts_overwrite(system, dist, data['kernel_options'], self.api.settings()) + utils.kopts_overwrite(None, dist, data['kernel_options'], self.api.settings()) if not re.match(r"[a-z]+://.*", data["autoinstall"]): data["autoinstall"] = "http://%s:%s/cblr/svc/op/autoinstall/profile/%s"; % (
