Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2019-07-24 20:37:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cobbler" Wed Jul 24 20:37:49 2019 rev:51 rq:718255 version:3.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-05-22 15:39:44.494483577 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new.4126/cobbler.changes 2019-07-24 20:37:50.754558875 +0200 @@ -1,0 +2,32 @@ +Tue Jul 23 15:14:36 UTC 2019 - [email protected] + +- Update to latest v3.0.0 cobbler release +- Add previouly added patch: exclude_get-loaders_command.patch to + the list of patches to apply. + +------------------------------------------------------------------- +Mon Jun 3 10:13:53 UTC 2019 - [email protected] + +- Fix log file world readable (as suggested by Matthias Gerstner) + and change file attributes via attr in spec file +- Do not allow get-loaders command (download of third party + provided network boot loaders we do not trust) +A exclude_get-loaders_command.patch +- Add apache min version requires to 2.4 (due to mainline commit: + 31a1aa31d26c4a096f0e0 + Remove apache IfVersion tags from apache configs +- Fix Tumbleweed build where python2-Cheetah3 and python3-Cheetah3 + are build for a while by changing (Build- and) Requires from: + Cheetah3 to python3-Cheetah3 +- Setting test package group to a valid one +- Fix test files to be added to test package, not only the directory +- Remove general dir from file section: %{_datadir} +- Fix test package requires + missing Requires: python3-pytest python3-pyflakes python3-pycodestyle +- Mainline fixes: + 3172d1df9b9cc8 Add missing help text in redhat_management_key field + c8f5490e507a72 Set default interface if cobbler system add has no + --interface= param + 31a1aa31d26c4a Remove apache IfVersion tags from apache configs + +------------------------------------------------------------------- Old: ---- cobbler-3.0.0+git20190510.d43461b3.tar.xz New: ---- cobbler-3.0.0.tar.xz exclude_get-loaders_command.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cobbler.spec ++++++ --- /var/tmp/diff_new_pack.uhzQKC/_old 2019-07-24 20:37:51.258558820 +0200 +++ /var/tmp/diff_new_pack.uhzQKC/_new 2019-07-24 20:37:51.258558820 +0200 @@ -25,13 +25,13 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global debug_package %{nil} Name: cobbler -Version: 3.0.0+git20190510.d43461b3 +Version: 3.0.0 Release: 0 Summary: Boot server configurator License: GPL-2.0-or-later Group: Productivity/Networking/Boot/Servers URL: https://cobbler.github.io/ -Source0: cobbler-3.0.0+git20190510.d43461b3.tar.xz +Source0: cobbler-%{version}.tar.xz # Manually generated AUTHORS file because the git repo is not included in the # sources. Source1: AUTHORS @@ -39,10 +39,11 @@ Source3: fence_ipmitool.template Patch0: fix_hardcoded_libpath_for_websession.patch Patch1: fix_shebang.patch +Patch2: exclude_get-loaders_command.patch -BuildRequires: Cheetah3 +BuildRequires: python3-Cheetah3 BuildRequires: apache-rpm-macros -BuildRequires: apache2 +BuildRequires: apache2 >= 2.4 BuildRequires: distribution-release BuildRequires: fdupes BuildRequires: pkgconfig @@ -53,10 +54,14 @@ BuildRequires: python3-coverage BuildRequires: python3-future BuildRequires: python3-setuptools -BuildRequires: tftp BuildRequires: pkgconfig(systemd) -Requires: Cheetah3 +# Workaround so that /srv/tftpboot file exists during +# build, but is not owned by cobbler +BuildRequires: tftp + +Requires: python3-Cheetah3 Requires: acl +Requires: apache2 >= 2.4 Requires: apache2-mod_wsgi-python3 Requires: fence-agents Requires: ipmitool @@ -74,8 +79,8 @@ Requires: python3-requests Requires: python3-simplejson Requires: rsync -Requires: tftp -Requires(post): apache2 +Requires: tftp(server) +Requires(post): apache2 >= 2.4 Requires(post): grub2 #Requires(post): grub2-x86_64-efi #Requires(post): grub2-powerpc-ieee1275 @@ -122,6 +127,7 @@ %setup -q -n cobbler-%{version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %python_build @@ -166,13 +172,6 @@ sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES proxy_connect sysconf_addword %{_sysconfdir}/sysconfig/apache2 APACHE_MODULES wsgi - if [ -x %{_sbindir}/a2enmod ]; then - if !a2enmod -q version >&/dev/null; then - echo enabling apache version module - a2enmod version - fi - fi - elif [ "$1" -ge "2" ]; then # backup config if [ -e %{_localstatedir}/lib/cobbler/distros ]; then @@ -226,7 +225,6 @@ fi %posttrans -# We need version apache2 module running %{apache_restart_if_needed} %post web @@ -236,15 +234,15 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" %{python_sitelib}/cobbler/web/settings.py %files -%doc AUTHORS +%doc AUTHORS README.md +%license COPYING /%{www_path}/www/cobbler %{_bindir}/cobbler %{_bindir}/cobbler-ext-nodes %{_bindir}/cobblerd -%{_datadir}/ %{_datadir}/%{name}/bin/mkgrub.sh %{_datadir}/cobbler/web -%{_localstatedir}/log/cobbler +%attr(750, root, root) %{_localstatedir}/log/cobbler %{_mandir}/man1/cobbler.1%{?ext_man} %{_sbindir}/tftpd.py* %{_sbindir}/rccobblerd @@ -264,7 +262,10 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/bin + +# These are part of the test package %exclude %dir %{_datadir}/%{name}/tests +%exclude %{_datadir}/%{name}/tests/* %dir /srv/tftpboot/images @@ -280,17 +281,20 @@ %package -n cobbler-tests Summary: Unit tests for Cobbler -Group: Applications/System +Group: Productivity/Networking/Boot/Servers Requires: cobbler +Requires: python3-pytest +Requires: python3-pyflakes +Requires: python3-pycodestyle %description -n cobbler-tests Unit test files from the Cobbler project %files -n cobbler-tests -%defattr(-,root,root,-) -%exclude %dir %{_datadir}/%{name} +%doc %{_datadir}/%{name}/tests/README.md %dir %{_datadir}/%{name}/tests +%{_datadir}/%{name}/tests/* %endif #suse_version %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.uhzQKC/_old 2019-07-24 20:37:51.302558815 +0200 +++ /var/tmp/diff_new_pack.uhzQKC/_new 2019-07-24 20:37:51.302558815 +0200 @@ -2,10 +2,13 @@ <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/cobbler/cobbler</param> <param name="scm">git</param> - <param name="revision">master</param> + <param name="revision">v3.0.0</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> + --> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ cobbler-3.0.0+git20190510.d43461b3.tar.xz -> cobbler-3.0.0.tar.xz ++++++ ++++ 1807 lines of diff (skipped) ++++++ exclude_get-loaders_command.patch ++++++ Index: cobbler-3.0.0+git20190529.1ba49e14/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 OBJECT_ACTIONS = [] for actions in list(OBJECT_ACTIONS_MAP.values()): OBJECT_ACTIONS += actions -DIRECT_ACTIONS = "aclsetup buildiso import list replicate report reposync sync validate-autoinstalls version signature get-loaders hardlink".split() +DIRECT_ACTIONS = "aclsetup buildiso import list replicate report reposync sync validate-autoinstalls version signature hardlink".split() #################################################### @@ -587,9 +587,7 @@ class CobblerCLI(object): (options, args) = self.parser.parse_args() task_id = self.start_task("validate_autoinstall_files", options) elif action_name == "get-loaders": - self.parser.add_option("--force", dest="force", action="store_true", help="overwrite any existing content in /var/lib/cobbler/loaders") - (options, args) = self.parser.parse_args() - task_id = self.start_task("dlcontent", options) + print ("Command 'get-loaders' is not supported in this version of cobbler") elif action_name == "import": self.parser.add_option("--arch", dest="arch", help="OS architecture being imported") self.parser.add_option("--breed", dest="breed", help="the breed being imported")
