commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2020-11-04 18:27:41
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new.11331 (New)
Package is "cobbler"
Wed Nov 4 18:27:41 2020 rev:59 rq:845906 version:3.1.2
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2020-09-29
19:05:54.894060586 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new.11331/cobbler.changes
2020-11-04 18:32:26.468141212 +0100
@@ -1,0 +2,7 @@
+Tue Nov 3 10:57:09 UTC 2020 - Jochen Breuer
+
+- Fixes usage of str.join()
+- Added:
+ * fix-for-old-str.join-usage.diff
+
+---
New:
fix-for-old-str.join-usage.diff
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.1Juyt8/_old 2020-11-04 18:32:27.292139384 +0100
+++ /var/tmp/diff_new_pack.1Juyt8/_new 2020-11-04 18:32:27.296139376 +0100
@@ -134,6 +134,7 @@
Patch0: cgi_parse_qs_is_deprecated.diff
Patch1: refactored_auth_module.diff
Patch2: load_module_apache_suse_fix.diff
+Patch3: fix-for-old-str.join-usage.diff
BuildRequires: git-core
BuildRequires: %{system_release_pkg}
@@ -269,6 +270,7 @@
%if 0%{?suse_version}
%patch2 -p1
%endif
+%patch3 -p1
%if 0%{?suse_version}
# Set tftpboot location correctly for SUSE distributions
++ fix-for-old-str.join-usage.diff ++
>From 72e3bb2b07f300c7848a4e7da1e84f8952e80fb9 Mon Sep 17 00:00:00 2001
From: Jochen Breuer
Date: Tue, 3 Nov 2020 10:51:35 +0100
Subject: [PATCH] Fix for old str.join usage
Fixes #2624
---
cobbler/tftpgen.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cobbler/tftpgen.py b/cobbler/tftpgen.py
index 5c5b1efb..c054eded 100644
--- a/cobbler/tftpgen.py
+++ b/cobbler/tftpgen.py
@@ -975,7 +975,7 @@ class TFTPGen(object):
# out the path based on where the kernel is stored. We do this because
some distros base future downloads on the
# initial URL passed in, so all of the files need to be at this
location (which is why we can't use the images
# link, which just contains the kernel and initrd).
-distro_mirror_name = str.join(distro.kernel.split('/')[-2:-1], '')
+distro_mirror_name = ''.join(distro.kernel.split('/')[-2:-1])
blended = utils.blender(self.api, False, obj)
@@ -1068,7 +1068,7 @@ class TFTPGen(object):
# out the path based on where the kernel is stored. We do this because
some distros base future downloads on the
# initial URL passed in, so all of the files need to be at this
location (which is why we can't use the images
# link, which just contains the kernel and initrd).
-distro_mirror_name = str.join('', distro.kernel.split('/')[-2:-1])
+distro_mirror_name = ''.join(distro.kernel.split('/')[-2:-1])
blended = utils.blender(self.api, False, obj)
--
2.28.0
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2020-09-29 19:05:49
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new.4249 (New)
Package is "cobbler"
Tue Sep 29 19:05:49 2020 rev:58 rq:838538 version:3.1.2
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2020-09-07
21:37:19.709435587 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new.4249/cobbler.changes
2020-09-29 19:05:54.894060586 +0200
@@ -1,0 +2,27 @@
+Tue Sep 22 09:39:25 UTC 2020 - Dominik Gedon
+
+- Add fence-agents package as requirement
+- Fix position of wrong endif
+
+---
+Tue Sep 15 13:42:00 UTC 2020 - Alexander Graul
+
+- Add cobbler-tests subpackage for unit testing for openSUSE/SLE
+
+---
+Fri Sep 11 15:00:02 UTC 2020 - Jochen Breuer
+
+- Adds LoadModule definitions for openSUSE/SLE
+
+- Added:
+ * load_module_apache_suse_fix.diff
+
+---
+Wed Sep 9 07:16:51 UTC 2020 - Dominik Gedon
+
+- Switch to new refactored auth module.
+
+- Added:
+ * refactored_auth_module.diff
+
+---
New:
load_module_apache_suse_fix.diff
refactored_auth_module.diff
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.lsYxx0/_old 2020-09-29 19:05:55.790061491 +0200
+++ /var/tmp/diff_new_pack.lsYxx0/_new 2020-09-29 19:05:55.790061491 +0200
@@ -28,7 +28,7 @@
%define apache_user wwwrun
%define apache_group www
%define apache_log /var/log/apache2
-%define apache_webconfigdir /etc/apache2/vhosts.d
+%define apache_webconfigdir /etc/apache2/conf.d
%define apache_mod_wsgi apache2-mod_wsgi-python%{python3_pkgversion}
%define tftpboot_dir /srv/tftpboot
%define tftpsrv_pkg tftp
@@ -132,6 +132,8 @@
Source1:cobbler.rpmlintrc
BuildArch: noarch
Patch0: cgi_parse_qs_is_deprecated.diff
+Patch1: refactored_auth_module.diff
+Patch2: load_module_apache_suse_fix.diff
BuildRequires: git-core
BuildRequires: %{system_release_pkg}
@@ -182,6 +184,7 @@
Requires: %{apache_pkg}
Requires: %{tftpsrv_pkg}
Requires: %{createrepo_pkg}
+Requires: fence-agents
Requires: rsync
Requires: xorriso
%{?python_enable_dependency_generator}
@@ -250,10 +253,22 @@
Web interface for Cobbler that allows visiting
http://server/cobbler_web to configure the install server.
+%if 0%{?suse_version}
+%package tests
+Summary:Unit tests for cobbler
+Requires: cobbler = %{version}-%{release}
+
+%description tests
+Unit test files from the Cobbler project
+%endif
%prep
%setup
%patch0 -p1
+%patch1 -p1
+%if 0%{?suse_version}
+%patch2 -p1
+%endif
%if 0%{?suse_version}
# Set tftpboot location correctly for SUSE distributions
@@ -273,6 +288,11 @@
mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
mv %{buildroot}%{_sysconfdir}/cobbler/cobblerd_rotate
%{buildroot}%{_sysconfdir}/logrotate.d/cobblerd
+# No VirtualHost definition as it overwrite all the Uyuni RewriteRules
configured in conf.d/
+mkdir -p %{buildroot}%{_sysconfdir}/apache2/conf.d
+mv %{buildroot}%{_sysconfdir}/apache2/vhosts.d/cobbler.conf
%{buildroot}%{_sysconfdir}/apache2/conf.d
+sed -i 's/^.*VirtualHost.*$//g'
%{buildroot}%{_sysconfdir}/apache2/conf.d/cobbler.conf
+
# Create data directories in tftpboot_dir
mkdir -p
%{buildroot}%{tftpboot_dir}/{boot,etc,grub,images{,2},ppc,pxelinux.cfg,s390x}
@@ -286,6 +306,11 @@
# cobbler-web
rm %{buildroot}%{_sysconfdir}/cobbler/cobbler_web.conf
+%if 0%{?suse_version}
+# cobbler-tests
+cp -r tests/ %{buildroot}/%{_datadir}/cobbler/
+%endif
+
%pre
%if %{_vendor} == "debbuild"
@@ -454,7 +479,7 @@
%files web
%license COPYING
%doc AUTHORS.in README.md
-%config(noreplace) %{apache_webconfigdir}/cobbler_web.conf
+%config(noreplace) %{apache_etc}/vhosts.d/cobbler_web.conf
%if %{_vendor} == "debbuild"
# Work around broken attr support
# Cf. https://github.com/debbuild/debbuild/issues/160
@@ -467,5 +492,10 @@
%attr(-,%{apache_user},%{apache_group}) %{apache_dir}/cobbler_webui_content/
%endif
+%if 0%{?suse_version}
+%files tests
+%dir /usr/share/cobbler/tests
+/usr/share/cobbler/tests/*
+%endif
%changelog
++ load_module_apache_suse_fix.diff ++
diff --git a/config/apache/cobbler.conf b/config/apache/cobbler.conf
index e6f7afef..54ddad0a 100644
--- a/config/apache/cobbler.conf
+++ b/config/apache/cobbler.conf
@@ -1,6 +1,10 @@
# This configuration file allows cobbler data
# to be accessed over HTTP.
+LoadModule
commit cobbler for openSUSE:Factory
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
+
+- Adding tornado dependency for cobbler tftpd again.
+
+---
+Mon Sep 7 12:29:16 UTC 2020 - Jochen Breuer
+
+- 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
+
+- Adds requirement for python-distro
+
+---
+Fri Sep 4 13:15:34 UTC 2020 - Jochen Breuer
+
+- 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
commit cobbler for openSUSE:Factory
Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2020-08-31 16:52:12 Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.3399 (New) Package is "cobbler" Mon Aug 31 16:52:12 2020 rev:56 rq:830136 version:3.1.2 Changes: --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2020-06-10 00:48:35.502972539 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new.3399/cobbler.changes 2020-08-31 16:52:32.472421065 +0200 @@ -285,0 +286,5 @@ + Some older bugs need bnc# references as well: + bnc#660126, bnc#671212, bnc#672471, bnc#682665 + bnc#687891, bnc#695955, bnc#722443, bnc#722445, bnc#757062, bnc#763610 + bnc#783671, bnc#790545, bnc#796773, bnc#811025, bnc#812948, bnc#842699 + bnc#846580, bnc#869371, bnc#884051 Other differences: --
commit cobbler for openSUSE:Factory
Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2020-06-10 00:48:32 Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.3606 (New) Package is "cobbler" Wed Jun 10 00:48:32 2020 rev:55 rq:812949 version:3.1.2 Changes: --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2020-04-09 23:14:52.14172 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new.3606/cobbler.changes 2020-06-10 00:48:35.502972539 +0200 @@ -1,0 +2,74 @@ +Thu May 28 14:41:15 UTC 2020 - Thomas Renninger + +- Bring changelog in sync with Uyuni: +- Fixes template engine selection(bsc#1170462) + Fixed mainline by commit 33c769e99 +D fix-template-engine-selection.patch + +- Fixes a template rendering error (bsc#1169779) + Fixed mainline by commit 5e5ef6c8c +D fixes-a-template-rendering-error.patch + + +- use systemctl to restart cobblerd on logfile rotation (bsc#1169207) + Mainline logrotate conf file uses already /sbin/service instead of + outdated: /etc/init.d/cobblerd + +- Fix cobbler sync for DHCP or DNS (bsc#1169553) + Fixed mainline by commit 2d6cfe42da + D fix_cobbler_sync_for_dhcp_or_dns.diff + +- Signatures file now uses "default_autoinstall" which fixes import + problem happening with some distributions (bsc#1159010) + Fixed mainline by commit 33d181199f0da1da + +- Fix for kernel and initrd detection (bsc#1159010) + Fixed mainline by commit 872f505f66c50059 + +--- +Wed May 27 10:20:36 UTC 2020 - Enno Gotthold + +- New: + * For the distro there is now a parameter remote_boot_initrd and remote_boot_kernel () + * For the profile there is now a parameter filename for DHCP. (#2280) + * Signatures for ESXi 6 and 7 (#2308) + * The hardlink command is now detected more dynamically and thus more error resistant (#2297) + * HTTPBoot will now work in some cases out of the bug. (#2295) + * Additional DNS query for a case where the wrong record was queried in the nsupdate system case (#2285) + +- Changes: + * Enabled a lot of tests, removed some and implemented new. (#2202) + * Removed not used files from the codebase. (#2302) + * Exchanged mkisofs to xorrisofs. (#2296) + * Removed duplicate code. (#2224) + * Removed unreachable code. (#2223) + * Snippet creation and deletion now works again via xmlrpc. (#2244) + * Replace createrepo with createrepo_c. (#2266) + * Enable Kerberos through having a case sensitive users.conf. (#2272) + +- Bugfixes: + * General various Bugfixes (#2331, ) + * Makefile usage and commands. (#2344, #2304) + * Fix the dhcp template. (#2314) + * Creation of the management classes and gPXE. (#2310) + * Fix the scm_track module. (#2275, #2279) + * Fix passing the netdevice parameter correctly to the linuxrc. (#2263) + * powerstatus from cobbler now works thanks to a wrapper for ipmitool. (#2267) + * In case the LDAP is used for auth, it now works with ADs. (#2274) + * Fix passthru authentication. (#2271) + +- Other: + * Add Codecov. (#2229) + * Documentation updates. (#2333, #2326, #2305, #2249, #2268) + * Buildprocess: +* Recreation and cleanup of Grub2. (#2278) +* Fix small errors for openSUSE Leap. (#2233) +* Fix rpmlint errors. (#2237) +* Maximum compatibility for debbuild package creation. (#2255, #2292, #2242, #2300) + * Fixes related to our CI Pipeline (#2254, #2269) + * Internal Code cleanup (#2273, #2270) + +- Breaking Changes: + * Hash handling in users.digest file. (#2299) + +--- Old: cobbler-3.1.1+git20200316.25209de3.tar.gz cobbler-rpmlintrc New: cobbler-3.1.2.obscpio cobbler-3.1.2.tar.gz cobbler.rpmlintrc Other differences: -- ++ cobbler.spec ++ --- /var/tmp/diff_new_pack.TvSUhh/_old 2020-06-10 00:48:36.186974329 +0200 +++ /var/tmp/diff_new_pack.TvSUhh/_new 2020-06-10 00:48:36.190974340 +0200 @@ -1,6 +1,3 @@ -# -# RPM spec file for all Cobbler packages -# # Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties @@ -11,17 +8,8 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# -# Supported/tested build targets: -# - Fedora: 30, 31, Rawhide -# - CentOS + EPEL: 7, 8 -# - SLE: 15sp1 -# - OpenSuSE: Leap 15.1, Tumbleweed -# - Debian: 10 -# - Ubuntu: 18.04 -# -# If it doesn't build on the Open Build Service (OBS) it's a bug. -# + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Force bash instead of Debian dash %global
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2020-04-09 23:14:46
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new.3248 (New)
Package is "cobbler"
Thu Apr 9 23:14:46 2020 rev:54 rq:792600 version:3.1.1+git20200316.25209de3
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-11-27
13:54:54.496310558 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new.3248/cobbler.changes
2020-04-09 23:14:52.14172 +0200
@@ -1,0 +2,69 @@
+Mon Feb 24 11:40:36 UTC 2020 - Thomas Renninger
+
+- Removed not needed files in obs. This is now all mainline:
+D logrotate_cobbler
+D fix_hardcoded_libpath_for_websession.patch
+D fence_ipmitool.template
+D cobbler_management_mac.diff
+D AUTHORS
+- Added source files:
+A cobbler.obsinfo
+A cobbler-rpmlintrc
+D exclude_get-loaders_command.patch
+
+Spec file is mostly adopted to mainline spec file.
+Still it is not directly extracted from mainline tarball.
+First the remaining diff has to be submitted mainline.
+
+- Change group to Productivity/Networking/Boot/Servers
+
+- Disable any python_*_dependency_generator macros
+ According to Tomas Chvatal they are much too experimental yet
+ in OBS to be used. They have to be undefined, because of a half
+ baken implementation in SLE 15 SP2 build env (defined but not
+ properly implemented). At some point of time the introduced
+ undefine python_*_dependency_generator
+ will be conditionally removed via suse_version.
+
+---
+Mon Jan 13 09:35:02 UTC 2020 - Enno Gotthold
+
+- Updated to version 3.1.1.
+ * Introduce new packaging from upstream
+ * Changelog see below
+
+- New:
+ * We are now having a cross-distro specfile which can be build in the OBS
+(#2220) - before rewritten it was improved by #2144 & #2174
+ * Grub Submenu for net-booting machines (#2217)
+ * Building the Cent-OS RPMs in Docker (#2190 #2189)
+ * Reintroduced manpage build in setup.py (#2185)
+ * mgmt_parameters are now passed to the dhcp template (#2182)
+ * Using the standard Pyhton3 logger instead of a custom one (#2160 #2139
#2151)
+ * Script for converting the settings file from 3.0.0 to 3.0.1 (#2154)
+ * Docs now inside the repo instead of cobbler.github.io and improved with
sphinx (#2117)
+
+- Changes:
+ * The default tftpboot directory is now /var/lib/tftpboot instead of
previously /srv/tftpboot (#2220)
+ * Distro signatures were adjusted where necessary (#2219 #2134)
+ * Removed requirements.txt and placed the requirements in setup.py (#2204)
+ * Display only entries in grub which are from the same arch (#2191 #2216)
+ * Change the name of the cobbler manpage form cobbler-cli to cobbler back
and move it to section 8 (#2188 #2186)
+
+- Bugfixes:
+ * Incremented Version to 3.1.1 from 3.0.1
+ * S390 Support was cleaned up (#2207 #2178)
+ * PowerPC Support was cleaned up (#2178)
+ * Added a missing import while importing a distro with cobbler import (#2201)
+ * Fixed a case where a stacktrace would be produced so pass none instead
(#2203)
+ * Rename of suse_kopts_textmode_overwrite to kops_overwrite to utils (#2143
#2200)
+ * Fix rsync subprocess call (#2199 #2179)
+ * Fixed an error where the template rendering did not work (#2176)
+ * Fixed some cobbler import errors (#2172)
+ * Wrong shebang in various scripts (#2148)
+ * Fix some imports which fixes errors introduced by the remodularization
(#2150 #2153)
+
+- Other:
+ * Issue Templates for Github (#2187)
+
+---
Old:
AUTHORS
cobbler-3.0.1+git20191120.24c4ae8e.tar.xz
cobbler_management_mac.diff
exclude_get-loaders_command.patch
fence_ipmitool.template
fix_hardcoded_libpath_for_websession.patch
logrotate_cobbler
New:
cobbler-3.1.1+git20200316.25209de3.tar.gz
cobbler-rpmlintrc
cobbler.obsinfo
Other differences:
--
++ cobbler.spec ++
697 lines (skipped)
between /work/SRC/openSUSE:Factory/cobbler/cobbler.spec
and /work/SRC/openSUSE:Factory/.cobbler.new.3248/cobbler.spec
++ _service ++
--- /var/tmp/diff_new_pack.Po6A02/_old 2020-04-09 23:14:53.426224926 +0200
+++ /var/tmp/diff_new_pack.Po6A02/_new 2020-04-09 23:14:53.426224926 +0200
@@ -1,19 +1,19 @@
-
-https://github.com/cobbler/cobbler
+
+git://github.com/cobbler/cobbler.git
git
-HEAD
-disable
-cobbler
-
-3.0.1+git%cd.%h
-
+master
+3.1.1+git%cd.%h
+
+cobbler.spec
+cobbler.rpmlintrc
+
+
+gz
*.tar
-xz
-
++ cobbler-rpmlintrc ++
addFilter('files-duplicate')
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2019-11-27 13:54:15
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new.26869 (New)
Package is "cobbler"
Wed Nov 27 13:54:15 2019 rev:53 rq:751077 version:3.0.1+git20191120.24c4ae8e
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-11-26
17:01:11.280071644 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new.26869/cobbler.changes
2019-11-27 13:54:54.496310558 +0100
@@ -1,0 +2,16 @@
+Tue Nov 26 15:44:24 UTC 2019 - tr...@suse.de
+
+- Update to latest git HEAD code base
+ This version (from mainline so for quite a while already)
+ also includes fixes for "bsc#1149075" and bsc#1151875
+ These patches are mainline already:
+D kopts-utils-path.diff
+D item-repo-import-fix.diff
+D no-system-in-kopts-call.diff
+ This patch is going to be submitted mainline:
+A cobbler_management_mac.diff
+- Fix up manpage creation: Do not zip manpages ourselves
+ Thanks to namtrac.
+
+
+---
Old:
cobbler-3.0.1+git20191025.fbebd758.tar.xz
item-repo-import-fix.diff
kopts-utils-path.diff
no-system-in-kopts-call.diff
New:
cobbler-3.0.1+git20191120.24c4ae8e.tar.xz
cobbler_management_mac.diff
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.bmhO8S/_old 2019-11-27 13:55:00.480308033 +0100
+++ /var/tmp/diff_new_pack.bmhO8S/_new 2019-11-27 13:55:00.496308026 +0100
@@ -25,7 +25,7 @@
%define _binaries_in_noarch_packages_terminate_build 0
%global debug_package %{nil}
Name: cobbler
-Version:3.0.1+git20191025.fbebd758
+Version:3.0.1+git20191120.24c4ae8e
Release:0
Summary:Boot server configurator
License:GPL-2.0-or-later
@@ -39,10 +39,7 @@
Source3:fence_ipmitool.template
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
-
+Patch3: cobbler_management_mac.diff
BuildRequires: python3-Cheetah3
BuildRequires: apache-rpm-macros
@@ -58,7 +55,6 @@
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
@@ -137,24 +133,9 @@
%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}
@@ -263,9 +244,9 @@
%{_datadir}/%{name}/bin/settings-migration-v1-to-v2.sh
%{_datadir}/cobbler/web
%attr(750, root, root) %{_localstatedir}/log/cobbler
-%{_mandir}/man1/cobbler-cli.1%{?ext_man}
-%{_mandir}/man1/cobblerd.1%{?ext_man}
-%{_mandir}/man5/cobbler_conf.5%{?ext_man}
+%{_mandir}/man1/cobbler.1%{?ext_man}
+%{_mandir}/man5/cobbler.conf.5%{?ext_man}
+%{_mandir}/man8/cobblerd.8%{?ext_man}
%{_sbindir}/tftpd.py*
%{_sbindir}/rccobblerd
%{_sbindir}/fence_ipmitool
++ cobbler-3.0.1+git20191025.fbebd758.tar.xz ->
cobbler-3.0.1+git20191120.24c4ae8e.tar.xz ++
2358 lines of diff (skipped)
++ cobbler_management_mac.diff ++
--- a/cobbler/tftpgen.py2019-11-22 10:48:06.917115664 +0100
+++ b/cobbler/tftpgen.py2019-11-26 15:55:55.076953544 +0100
@@ -567,6 +543,7 @@
"""
management_interface = None
+management_mac = None
if system is not None:
blended = utils.blender(self.api, False, system)
# find the first management interface
@@ -574,6 +551,8 @@
for intf in list(system.interfaces.keys()):
if system.interfaces[intf]["management"]:
management_interface = intf
+if system.interfaces[intf]["mac_address"]:
+management_mac =
commit cobbler for openSUSE:Factory
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
+
+- 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 - tr...@suse.de
+
+- Update to latest git HEAD code base (commit fbebd758)
+- Adjusted manpage creation (needs sphinx as BuildRequires)
+
+---
+Tue Oct 8 15:01:22 UTC 2019 - tr...@suse.de
+
+- 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 - tr...@suse.de
+
+- Fix cobbler sync for dhcp and dns enabled due to latest module
+ renaming patches
+
+---
+Tue Sep 17 06:40:42 UTC 2019 - tr...@suse.de
+
+- 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
+
+- 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
commit cobbler for openSUSE:Factory
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 - tr...@suse.de
+
+- 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 - tr...@suse.de
+
+- 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
-
commit cobbler for openSUSE:Factory
Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2019-05-22 15:39:41 Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.5148 (New) Package is "cobbler" Wed May 22 15:39:41 2019 rev:50 rq:704283 version:3.0.0+git20190510.d43461b3 Changes: --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-03-13 09:13:41.399396273 +0100 +++ /work/SRC/openSUSE:Factory/.cobbler.new.5148/cobbler.changes 2019-05-22 15:39:44.494483577 +0200 @@ -1,0 +2,216 @@ +Thu May 16 10:44:38 UTC 2019 - tr...@suse.de + +- Updated to latest git master branch +commit d43461b39073ac01a54a3f52be0b133d36cb8061 +Author: Jochen Breuer +Date: Fri May 10 16:41:32 2019 +0200 + Remove already mainline patches: +D fix-login-error.patch +D remove-newline-from-token.diff +D fixes-distro-none-case.diff +D return-the-name-of-the-unknown-method.patch +D call-with-logger-where-possible.patch +D fix-http-status-code.patch +D create-system-directory-at-the-correct-place.patch +D remodeled-distro-detection.diff +D disable_nsupdate_enabled_by_default.diff +D power_system_xmlrpc_api.patch +D renamed-methods-alias.patch +D changes-return-to-float.diff +D revert-redhat-management-removal.patch +D add-docker-integration-testing.diff +D refactor-unittest-to-pytest.diff +D renamed-methods-alias-part2.patch +D changes-detection-to-distro-like-for-suse-distributions.diff +D rhn-mngmnt-key-field-fix.diff + +--- +Thu May 16 08:46:16 UTC 2019 - Jochen Breuer + +- Re-enabling build for cobbler-test package. + +--- +Wed May 15 13:16:42 UTC 2019 - tr...@suse.de + +- Integrated fixes that came in from mainline from other products + (to calm down obs regression checker): + CVE-2011-4953, fate#312397, bsc#660126, bsc#671212, bsc#672471, bsc#682665 + bsc#687891, bsc#695955, bsc#722443, bsc#722445, bsc#757062, bsc#763610 + bsc#783671, bsc#790545, bsc#796773, bsc#811025, bsc#812948, bsc#842699 + bsc#846580, bsc#869371, bsc#884051, bsc#976826, bsc#984998 + +--- +Thu May 9 14:50:34 UTC 2019 - Jochen Breuer + +- Fix for redhat_management_key not being listed as a choice + during profile rename (bsc#1134588) + +- Added: + * rhn-mngmnt-key-field-fix.diff + +--- +Tue May 7 13:00:33 UTC 2019 - Jochen Breuer + +- Fixes distribution detection in setup.py for SLESo + +- Added: + * changes-detection-to-distro-like-for-suse-distributions.diff + +--- +Tue May 7 09:21:09 UTC 2019 - Jochen Breuer + +- Moving to pytest and adding Docker test integration + +- Added: + * add-docker-integration-testing.diff + * refactor-unittest-to-pytest.diff + +--- +Tue May 7 08:13:34 UTC 2019 - Jochen Breuer + +- Additional compatability changes for old Koan versions. + +- Modified: + * renamed-methods-alias-part2.patch + +--- +Tue Apr 30 14:16:17 UTC 2019 - Jochen Breuer + +- Old Koan versions not only need method aliases, but also need + compatible responses + +- Added: + * renamed-methods-alias-part2.patch + +--- +Tue Apr 23 09:25:21 UTC 2019 - Enno Gotthold + +- Add the redhat_managment_* fields again to enable templating in SUMA. + +- Added: + * revert-redhat-management-removal.patch + +--- +Fri Apr 5 12:14:39 UTC 2019 - Jochen Breuer + +- Changes return of last_modified_time RPC to float + +- Added: + * changes-return-to-float.diff + +--- +Thu Apr 4 14:13:02 CEST 2019 - man...@suse.de + +- provide old name aliases for all renamed methods: + - get_distro_for_koan => get_distro_as_rendered + - get_profile_for_koan=> get_profile_as_rendered + - get_system_for_koan => get_system_as_rendered + - get_repo_for_koan => get_repo_as_rendered + - get_image_for_koan => get_image_as_rendered + - get_mgmtclass_for_koan => get_mgmtclass_as_rendered + - get_package_for_koan=> get_package_as_rendered + - get_file_for_koan => get_file_as_rendered + +- Renamed: + get_system_for_koan.patch => renamed-methods-alias.patch + +--- +Thu Apr 4 10:18:05 CEST 2019 - man...@suse.de + +- provide renamed method "get_system_for_koan" under old name + for old clients. + +- Added: + *
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2019-03-13 09:13:35
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new.28833 (New)
Package is "cobbler"
Wed Mar 13 09:13:35 2019 rev:49 rq:684237 version:3.0+git20190222.9e502a9d
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-03-10
09:39:47.912112688 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new.28833/cobbler.changes
2019-03-13 09:13:41.399396273 +0100
@@ -1,0 +2,8 @@
+Fri Mar 8 10:52:54 UTC 2019 - Enno Gotthold
+
+- Added a patch which fixes an exception when login in with a non-root user.
+
+- Added:
+ * fix-login-error.patch
+
+---
New:
fix-login-error.patch
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.ytIWmF/_old 2019-03-13 09:13:44.595395943 +0100
+++ /var/tmp/diff_new_pack.ytIWmF/_new 2019-03-13 09:13:44.599395942 +0100
@@ -40,6 +40,8 @@
Patch0: fix_hardcoded_libpath_for_websession.patch
Patch1: fix_shebang.patch
Patch2: adds_suse_manager_as_distro.diff
+# Pull Request: https://github.com/cobbler/cobbler/pull/2035
+Patch3: fix-login-error.patch
BuildRequires: Cheetah3
BuildRequires: apache-rpm-macros
BuildRequires: apache2
@@ -122,6 +124,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%python_build
++ fix-login-error.patch ++
diff --git a/cobbler/remote.py b/cobbler/remote.py
index 17089166..8089cde7 100644
--- a/cobbler/remote.py
+++ b/cobbler/remote.py
@@ -1845,7 +1845,7 @@ class CobblerXMLRPCInterface(object):
return False
def check_access(self, token, resource, arg1=None, arg2=None):
-user = self.get_user_from_token(token.data)
+user = self.get_user_from_token(token)
if user == "":
self._log("CLI Authorized", debug=True)
return True
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2019-03-10 09:39:45
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new.28833 (New)
Package is "cobbler"
Sun Mar 10 09:39:45 2019 rev:48 rq:682771 version:3.0+git20190222.9e502a9d
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-03-01
16:48:39.657771072 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new.28833/cobbler.changes
2019-03-10 09:39:47.912112688 +0100
@@ -1,0 +2,42 @@
+Thu Mar 7 17:58:42 UTC 2019 - jgonza...@suse.com
+
+- grub2-i386pc is not really required. Changed to recommended
+ to allow building for architectures other than x86_64
+
+---
+Thu Mar 7 15:40:05 UTC 2019 - Jochen Breuer
+
+- Adds SUSE Manager as a new SUSE distribution
+
+- Added:
+ * adds_suse_manager_as_distro.diff
+
+---
+Fri Mar 1 15:46:24 UTC 2019 - tr...@suse.de
+
+- Checking bug fixes of released products are in latest develop pkg:
+ - remove fix-nameserver-search.fix; bug is invalid (bsc#1029276)
+-> not needed anymore
+ - fix cobbler yaboot handling (bsc#968406, bsc#966622)
+-> no yaboot support anymore
+ - support UEFI boot with cobbler generated tftp tree (bsc#1020376)
+-> upstream
+ - Enabling PXE grub2 support for PowerPC (bsc#986978)
+-> We have grub2 support for ppc64le
+ - (bsc#1048183) fix missing args and location for xen
+-> is in
+ - no koan support anymore:
+bsc#969541, bsc#924118, bsc#967523
+ - not installed (bsc#966841)
+works.
+
+- These still have to be looked at:
+ SUSE system as systemd only (bsc#952844)
+ handle list value for kernel options
+ correctly (bsc#973413)
+ entry in pxe menu (bsc#99)
+
+- This still has to be switched off (at least in internal cobbler versions):
+ Disabling 'get-loaders' command and 'check' fixed. bsc#973418
+
+---
New:
adds_suse_manager_as_distro.diff
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.DeSJ2i/_old 2019-03-10 09:39:50.772112003 +0100
+++ /var/tmp/diff_new_pack.DeSJ2i/_new 2019-03-10 09:39:50.772112003 +0100
@@ -39,6 +39,7 @@
Source3:fence_ipmitool.template
Patch0: fix_hardcoded_libpath_for_websession.patch
Patch1: fix_shebang.patch
+Patch2: adds_suse_manager_as_distro.diff
BuildRequires: Cheetah3
BuildRequires: apache-rpm-macros
BuildRequires: apache2
@@ -57,7 +58,6 @@
Requires: acl
Requires: apache2-mod_wsgi-python3
Requires: fence-agents
-Requires: grub2-i386-pc
Requires: grub2-x86_64-efi
Requires: ipmitool
Requires: logrotate
@@ -79,7 +79,7 @@
Requires(post): grub2
#Requires(post): grub2-x86_64-efi
#Requires(post): grub2-powerpc-ieee1275
-Requires(post): grub2-i386-pc
+Recommends: grub2-i386-pc
Recommends: grub2-arm64-efi
Recommends: grub2-powerpc-ieee1275
BuildArch: noarch
@@ -121,6 +121,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%python_build
++ adds_suse_manager_as_distro.diff ++
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py
index 07c1949e7..872aa2703 100644
--- a/cobbler/action_reposync.py
+++ b/cobbler/action_reposync.py
@@ -692,7 +692,7 @@ def update_permissions(self, repo_path):
# all_path = os.path.join(repo_path, "*")
owner = "root:apache"
distribution = distro.linux_distribution()[0]
-if distribution.lower() in ("sles", "opensuse leap", "opensuse
tumbleweed"):
+if distribution.lower() in ("sles", "opensuse leap", "opensuse
tumbleweed", "suse-manager-server"):
owner = "root:www"
elif "debian" in distribution.lower():
owner = "root:www-data"
diff --git a/cobbler/utils.py b/cobbler/utils.py
index 215e6222c..39f6e7573 100644
--- a/cobbler/utils.py
+++ b/cobbler/utils.py
@@ -895,7 +895,7 @@ def get_family():
return "redhat"
if "debian" in dist or "ubuntu" in dist:
return "debian"
-if dist in ("opensuse tumbleweed", "opensuse leap", "sles"):
+if dist in ("opensuse tumbleweed", "opensuse leap", "sles",
"suse-manager-server"):
return "suse"
return dist
@@ -946,7 +946,7 @@ def os_release():
elif family == "suse":
make = "suse"
distribution, version = distro.linux_distribution()[:2]
-if distribution.lower() not in ("sles", "opensuse leap", "opensuse
tumbleweed"):
+if distribution.lower() not in ("sles", "opensuse leap",
commit cobbler for openSUSE:Factory
Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2019-03-01 16:48:38 Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.28833 (New) Package is "cobbler" Fri Mar 1 16:48:38 2019 rev:47 rq:680156 version:3.0+git20190222.9e502a9d Changes: --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2019-02-26 22:21:57.914075438 +0100 +++ /work/SRC/openSUSE:Factory/.cobbler.new.28833/cobbler.changes 2019-03-01 16:48:39.657771072 +0100 @@ -1,0 +2,11 @@ +Thu Feb 28 14:31:01 UTC 2019 - tr...@suse.de + +- Add python3-requests and removed old python2 requires: + Requires: python-PyYAML + Requires: python-urlgrabber + (originally from jbre...@suse.de) +- Add explicity require to tftp, so it is used for both SLE + and openSUSE (originally from jgonza...@suse.com) +- Moved Recommends according to spec_cleaner + +--- Other differences: -- ++ cobbler.spec ++ --- /var/tmp/diff_new_pack.tHxYuq/_old 2019-03-01 16:48:40.157770883 +0100 +++ /var/tmp/diff_new_pack.tHxYuq/_new 2019-03-01 16:48:40.161770882 +0100 @@ -57,8 +57,6 @@ Requires: acl Requires: apache2-mod_wsgi-python3 Requires: fence-agents -Recommends: grub2-arm64-efi -Recommends: grub2-powerpc-ieee1275 Requires: grub2-i386-pc Requires: grub2-x86_64-efi Requires: ipmitool @@ -66,8 +64,6 @@ Requires: mkisofs Requires: mod_wsgi Requires: python >= 3.0 -Requires: python-PyYAML -Requires: python-urlgrabber Requires: python3-PyYAML Requires: python3-base Requires: python3-distro @@ -75,14 +71,17 @@ Requires: python3-future Requires: python3-ldap Requires: python3-netaddr +Requires: python3-requests Requires: python3-simplejson Requires: rsync -Requires: tftp(server) +Requires: tftp Requires(post): apache2 Requires(post): grub2 #Requires(post): grub2-x86_64-efi #Requires(post): grub2-powerpc-ieee1275 Requires(post): grub2-i386-pc +Recommends: grub2-arm64-efi +Recommends: grub2-powerpc-ieee1275 BuildArch: noarch #Requires(post): grub2-arm64-efi AutoReq:no
commit cobbler for openSUSE:Factory
Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2019-02-26 22:20:21 Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new.28833 (New) Package is "cobbler" Tue Feb 26 22:20:21 2019 rev:46 rq:678980 version:3.0+git20190222.9e502a9d Changes: --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2018-08-24 17:14:01.386779335 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new.28833/cobbler.changes 2019-02-26 22:21:57.914075438 +0100 @@ -1,0 +2,158 @@ +Mon Feb 25 15:48:39 UTC 2019 - tr...@suse.de + +- Require latest apache2-mod_wsgi-python3 package + This fixes interface to http://localhost/cblr/svc/... +- Use latest github cobbler/cobbler master branch in _service file +- cobblerd_needs_apache2_service_started.patch reverted, that is mainline + now: +D cobblerd_needs_apache2_service_started.patch +- Only recommend grub2-arm and grub2-ppc packages or we might not be + able to build on factory where arm/ppc might not be built +- Remove genders package requires. A genders file is generated, but + we do not need/use the genders package. + +--- +Tue Feb 19 11:14:04 UTC 2019 - Ismail Dönmez + +- Cleanup with spec-cleaner + +--- +Thu Feb 14 14:35:56 UTC 2019 - tr...@suse.de + +- Update to latest cobbler version 3.0 mainline git HEAD version + and remove already integrated or not needed anymore patches: +Dcobbler-symlink.diff +Ddetect-parallel-cobbler-sync.patch +Descape-shell-parameters-provided-by-user-on-reposync.patch +Dfix_subprocess_sp_encoding.patch +Dfix-os-release.patch +Ddisable_not_relevant_checks_bnc_828453.patch +Dupdate-outdated-apache-config-bsc956264.patch +Dcve-2018-10931-forbid-exposure-of-private-methods-in.patch +Dfix-broken-tests.diff +Dfix-manpage-creation.patch +Ddo_not_use_grubby_compat_when_grub2_is_in_use.diff +Dfix_hardcoded_libpath_for_websession.patch +Dlooking_for_cobbler_order_changed.diff +Dgrubby-compat.diff +Dfix-restart-paravirt-xen.dif +Dkoan_old_cobbler_compat.diff +Dfix_shebang.patch +Dcatch_cheetah_exception.patch +Dfix-script-endpoint-security-bug-1030582.patch +Dcobbler_web_config.diff +Dfix-koan-port-guessing.dif +Dcobblerd_needs_apache2_service_started.patch +Dfix-powermanagement-status.dif +Dcheck-access-token-when-calling-modify_setting-api-e.patch +Dfix_sle_detection.patch +Dfix_test_create_systems.diff +Dfix_subprocess_sp_encoding.patch +Dcobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch + + +--- +Wed Feb 6 14:49:40 UTC 2019 - tr...@suse.de + +- Serial console support added, did some testing already + Things should start to work as expected + +--- +Tue Jan 29 13:35:00 UTC 2019 - tr...@suse.de + +- Add general grub2 support + +--- +Wed Jan 16 18:05:34 UTC 2019 - tr...@suse.de + +- Put mkgrub.* into mkgrub.sh + +--- +Wed Jan 16 15:46:08 UTC 2019 - tr...@suse.de + +- Add git date and commit to version string for now + +--- +Wed Jan 16 14:49:17 UTC 2019 - tr...@suse.de + +- Add grub2 mkimage scripts: +mkgrub.i386-pc +mkgrub.powerpc-ieee1275 +mkgrub.x86_64-efi +mkgrub.arm64-efi + and generate grub executables with them in the %post section + +--- +Fri Jan 11 13:46:17 UTC 2019 - tr...@suse.de + +** Backported fixes from SLE12 SP3 +- build server wants explicite package in BuildRequires; use tftp +- require tftp(server) instead of atftp +- cleanup: cobbler is noarch, so arch specific requires do not make + sense +- SLES15 is using /etc/os-release instead of /etc/SuSE-release, use + this one for checking also +- Add: + * sles15.patch +- add sles15 distro profile (bsc#1090205) +- Add: + * add-sles15-distro.patch +- fix signature for SLES15 (bsc#1075014) +- Updated: + * add-sles15-distro.patch +- fix signature for SLES15 (bsc#1075014) +- Updated: + * add-sles15-distro.patch + +Missing fixes += + +This SLE fixes are missing. +The reason for this is that koan got split out into a separate +package, these changes (changelog entries) therefore are not relevant +for this package anymore: + +Koan specific: +-- +- fix koan wait parameter initialization + Added: + * fix-wait.patch +- Fix koan shebang +- Add: + * fix-usr-bin-env-bash-koan.diff + +But these patches
commit cobbler for openSUSE:Factory
Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2018-08-24 17:13:37 Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) Package is "cobbler" Fri Aug 24 17:13:37 2018 rev:45 rq:631356 version:2.8.2 Changes: --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2018-08-12 20:54:35.233371527 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2018-08-24 17:14:01.386779335 +0200 @@ -5 +5 @@ - (bsc#1104287) (bsc#1104189) + (CVE-2018-1000225) (bsc#1104287) (bsc#1104189) (bsc#1105442) @@ -7 +7 @@ - (bsc#1104190) + (bsc#1104190) (bsc#1105440) (CVE-2018-1000226) Other differences: --
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2018-08-12 20:54:29
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Sun Aug 12 20:54:29 2018 rev:44 rq:628613 version:2.8.2
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2018-04-27
16:09:01.538943645 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2018-08-12
20:54:35.233371527 +0200
@@ -1,0 +2,12 @@
+Fri Aug 10 10:11:17 UTC 2018 - pablo.suarezhernan...@suse.com
+
+- Forbid exposure of private methods in the API (CVE-2018-10931)
+ (bsc#1104287) (bsc#1104189)
+- Check access token when calling 'modify_setting' API endpoint
+ (bsc#1104190)
+
+- Added:
+ * check-access-token-when-calling-modify_setting-api-e.patch
+ * cve-2018-10931-forbid-exposure-of-private-methods-in.patch
+
+---
New:
check-access-token-when-calling-modify_setting-api-e.patch
cve-2018-10931-forbid-exposure-of-private-methods-in.patch
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.UBnigP/_old 2018-08-12 20:54:35.821372721 +0200
+++ /var/tmp/diff_new_pack.UBnigP/_new 2018-08-12 20:54:35.821372721 +0200
@@ -73,6 +73,10 @@
Patch18:fix-manpage-creation.patch
# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1889 (not merged
yet)
Patch19:escape-shell-parameters-provided-by-user-on-reposync.patch
+# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1921
+Patch20:check-access-token-when-calling-modify_setting-api-e.patch
+# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1920
+Patch21:cve-2018-10931-forbid-exposure-of-private-methods-in.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -188,6 +192,8 @@
%patch17 -p1
%patch18 -p1
%patch19 -p1
+%patch20 -p1
+%patch21 -p1
%build
%{__python2} setup.py build
++ check-access-token-when-calling-modify_setting-api-e.patch ++
>From 9be7835c74346f36fde9e7c1b847cc2e6c209eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
Date: Fri, 10 Aug 2018 10:57:58 +0100
Subject: [PATCH] Check access token when calling 'modify_setting' API
endpoint
---
cobbler/remote.py | 2 ++
1 file changed, 2 insertions(+)
Index: cobbler-2.8.2/cobbler/remote.py
===
--- cobbler-2.8.2.orig/cobbler/remote.py
+++ cobbler-2.8.2/cobbler/remote.py
@@ -854,6 +854,8 @@ class CobblerXMLRPCInterface:
def modify_file(self,object_id,attribute,arg,token):
return self.modify_item("file",object_id,attribute,arg,token)
def modify_setting(self,setting_name,value,token):
+self._log("modify_setting(%s)" % setting_name, token=token)
+self.check_access(token, "modify_setting")
try:
self.api.settings().set(setting_name, value)
return 0
++ cve-2018-10931-forbid-exposure-of-private-methods-in.patch ++
>From 7595977573184d2be3ff35188601efd6806f158c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
Date: Fri, 10 Aug 2018 10:59:04 +0100
Subject: [PATCH] CVE-2018-10931 - forbid exposure of private methods in
the API
---
cobbler/remote.py | 2 ++
1 file changed, 2 insertions(+)
Index: cobbler-2.8.2/cobbler/remote.py
===
--- cobbler-2.8.2.orig/cobbler/remote.py
+++ cobbler-2.8.2/cobbler/remote.py
@@ -2066,6 +2066,8 @@ class ProxiedXMLRPCInterface:
self.logger = self.proxied.api.logger
def _dispatch(self, method, params, **rest):
+if method.startswith('_'):
+raise CX("forbidden method")
if not hasattr(self.proxied, method):
raise CX("unknown remote method")
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2018-04-27 16:08:49
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Fri Apr 27 16:08:49 2018 rev:43 rq:601552 version:2.8.2
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2018-03-11
15:24:53.831977446 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2018-04-27
16:09:01.538943645 +0200
@@ -1,0 +2,9 @@
+Thu Apr 26 12:09:52 UTC 2018 - pablo.suarezhernan...@suse.com
+
+- Escape shell parameters provided by the user for the
+ reposync action (CVE-2017-1000469) (bsc#1074594)
+
+- Added:
+ * escape-shell-parameters-provided-by-user-on-reposync.patch
+
+---
New:
escape-shell-parameters-provided-by-user-on-reposync.patch
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.dVAOJW/_old 2018-04-27 16:09:02.754899048 +0200
+++ /var/tmp/diff_new_pack.dVAOJW/_new 2018-04-27 16:09:02.754899048 +0200
@@ -71,6 +71,8 @@
# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1811 (not merged
yet)
Patch17:fix-script-endpoint-security-bug-1030582.patch
Patch18:fix-manpage-creation.patch
+# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1889 (not merged
yet)
+Patch19:escape-shell-parameters-provided-by-user-on-reposync.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -185,6 +187,7 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
+%patch19 -p1
%build
%{__python2} setup.py build
++ escape-shell-parameters-provided-by-user-on-reposync.patch ++
>From c4d0573eaf3dc9c8a9e3cb3d29829494af4f7543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
Date: Thu, 26 Apr 2018 12:37:43 +0100
Subject: [PATCH] Escape shell parameters provided by user on reposync action
(CVE-2017-1000469)
---
cobbler/action_reposync.py | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/cobbler/action_reposync.py b/cobbler/action_reposync.py
index cfdc41ad..2701d625 100644
--- a/cobbler/action_reposync.py
+++ b/cobbler/action_reposync.py
@@ -23,6 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
import os
import os.path
+import pipes
import urlgrabber
HAS_YUM = True
@@ -203,7 +204,7 @@ class RepoSync:
flags = blended.get("createrepo_flags","(ERROR: FLAGS)")
try:
# BOOKMARK
-cmd = "createrepo %s %s %s" % (" ".join(mdoptions), flags,
dirname)
+cmd = "createrepo %s %s %s" % (" ".join(mdoptions), flags,
pipes.quote(dirname))
utils.subprocess_call(self.logger, cmd)
except:
utils.log_exc(self.logger)
@@ -227,7 +228,7 @@ class RepoSync:
dest_path = os.path.join(self.settings.webdir + "/repo_mirror",
repo.name)
# FIXME: wrapper for subprocess that logs to logger
-cmd = "wget -N -np -r -l inf -nd -P %s %s" % (dest_path, repo_mirror)
+cmd = "wget -N -np -r -l inf -nd -P %s %s" % (pipes.quote(dest_path),
pipes.quote(repo_mirror))
rc = utils.subprocess_call(self.logger, cmd)
if rc != 0:
@@ -259,7 +260,7 @@ class RepoSync:
repo.mirror = "%s/" % repo.mirror
# FIXME: wrapper for subprocess that logs to logger
-cmd = "rsync -rltDv --copy-unsafe-links --delete-after %s --delete
--exclude-from=/etc/cobbler/rsync.exclude %s %s" % (spacer, repo.mirror,
dest_path)
+cmd = "rsync -rltDv --copy-unsafe-links --delete-after %s --delete
--exclude-from=/etc/cobbler/rsync.exclude %s %s" % (spacer,
pipes.quote(repo.mirror), pipes.quote(dest_path))
rc = utils.subprocess_call(self.logger, cmd)
if rc !=0:
@@ -325,7 +326,7 @@ class RepoSync:
if has_rpm_list:
self.logger.warning("warning: --rpm-list is not supported for RHN
content")
rest = repo.mirror[6:] # everything after rhn://
-cmd = "%s %s --repo=%s --download_path=%s" % (cmd, self.rflags, rest,
self.settings.webdir + "/repo_mirror")
+cmd = "%s %s --repo=%s --download_path=%s" % (cmd, self.rflags,
pipes.quote(rest), pipes.quote(self.settings.webdir + "/repo_mirror"))
if repo.name != rest:
args = { "name" : repo.name, "rest" : rest }
utils.die(self.logger,"ERROR: repository %(name)s needs to be
renamed %(rest)s as the name of the cobbler repository must match the name of
the RHN channel" % args)
@@ -392,7 +393,7 @@ class RepoSync:
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2018-03-11 15:24:51
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Sun Mar 11 15:24:51 2018 rev:42 rq:584806 version:2.8.2
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2017-11-27
22:18:41.514023269 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2018-03-11
15:24:53.831977446 +0100
@@ -1,0 +2,6 @@
+Mon Mar 5 13:18:28 UTC 2018 - adam.ma...@suse.de
+
+- Use cdrtools starting with SLE-15 and Leap-15 again.
+ (bnc#1081739)
+
+---
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.9SBCDu/_old 2018-03-11 15:24:55.843905269 +0100
+++ /var/tmp/diff_new_pack.9SBCDu/_new 2018-03-11 15:24:55.847905126 +0100
@@ -108,7 +108,7 @@
%endif
Requires: tftp(server)
-%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 || (0%{?suse_version} > 0 &&
0%{?suse_version} < 1500)
Requires: genisoimage
%else
Requires: mkisofs
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2017-11-27 22:18:41
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Mon Nov 27 22:18:41 2017 rev:41 rq:545980 version:2.8.2
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2017-11-24
10:54:06.265087435 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2017-11-27
22:18:41.514023269 +0100
@@ -1,0 +2,14 @@
+Mon Nov 27 11:55:05 UTC 2017 - pablo.suarezhernan...@suse.com
+
+- Cleanup of the spec file.
+
+---
+Mon Nov 27 10:41:25 UTC 2017 - jloe...@suse.com
+
+- fix creation of manpages:
+option '--release ""' resulted in empty man pages
+
+- added patch:
+ * fix-manpage-creation.patch
+
+---
New:
fix-manpage-creation.patch
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.QUbv3s/_old 2017-11-27 22:18:42.405990896 +0100
+++ /var/tmp/diff_new_pack.QUbv3s/_new 2017-11-27 22:18:42.409990750 +0100
@@ -46,29 +46,31 @@
Source1:cobbler_firewall_settings
Source2:fence_ipmitool.sh
Source3:%{name}.changes
-Patch2: cobbler_web_config.diff
+
+Patch1: cobbler_web_config.diff
%if 0%{?suse_version}
-Patch4: grubby-compat.diff
+Patch2: grubby-compat.diff
%endif
-Patch5: koan_old_cobbler_compat.diff
-Patch6: looking_for_cobbler_order_changed.diff
-Patch7: catch_cheetah_exception.patch
-Patch9: fix-restart-paravirt-xen.dif
-Patch10:disable_not_relevant_checks_bnc_828453.patch
-Patch11:fix-powermanagement-status.dif
-Patch13:fix_sle_detection.patch
-Patch14:do_not_use_grubby_compat_when_grub2_is_in_use.diff
-Patch16:fix-koan-port-guessing.dif
+Patch3: koan_old_cobbler_compat.diff
+Patch4: looking_for_cobbler_order_changed.diff
+Patch5: catch_cheetah_exception.patch
+Patch6: fix-restart-paravirt-xen.dif
+Patch7: disable_not_relevant_checks_bnc_828453.patch
+Patch8: fix-powermanagement-status.dif
+Patch9: fix_sle_detection.patch
+Patch10:do_not_use_grubby_compat_when_grub2_is_in_use.diff
+Patch11:fix-koan-port-guessing.dif
# PATCH-FIX-SLE name-of-file.patch bnc#883487 dmacvi...@suse.de
-Patch18:cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch
-Patch19:fix-broken-tests.diff
-Patch20:fix_test_create_systems.diff
+Patch12:cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch
+Patch13:fix-broken-tests.diff
+Patch14:fix_test_create_systems.diff
# PATCH-FIX-OPENSUSE update-outdated-apache-config-bsc956264.patch bsc#956264
mdi...@suse.de
-Patch21:update-outdated-apache-config-bsc956264.patch
-# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1840 (not merged
yet)
-Patch23:fix-os-release.patch
+Patch15:update-outdated-apache-config-bsc956264.patch
+# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1840
+Patch16:fix-os-release.patch
# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1811 (not merged
yet)
-Patch24:fix-script-endpoint-security-bug-1030582.patch
+Patch17:fix-script-endpoint-security-bug-1030582.patch
+Patch18:fix-manpage-creation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -160,28 +162,29 @@
%prep
%setup -q
%if 0%{?suse_version}
-%patch2
+%patch1
%endif
%if 0%{?suse_version}
-%patch4
+%patch2
%endif
-%patch5
-%patch6
+%patch3
+%patch4
+%patch5 -p1
+%patch6 -p1
%patch7 -p1
+%patch8 -p1
%patch9 -p1
+%if 0%{?suse_version}
%patch10 -p1
+%endif
%patch11 -p1
+%patch12 -p1
%patch13 -p1
-%if 0%{?suse_version}
%patch14 -p1
-%endif
+%patch15 -p0
%patch16 -p1
+%patch17 -p1
%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p0
-%patch23 -p1
-%patch24 -p1
%build
%{__python2} setup.py build
++ fix-manpage-creation.patch ++
Index: cobbler-2.8.2/setup.py
===
--- cobbler-2.8.2.orig/setup.py
+++ cobbler-2.8.2/setup.py
@@ -305,7 +305,7 @@ class build_man(Command):
# It is. Configure it
self.build_one_file(infile, outfile)
-_COMMAND = 'pod2man --center="%s" --release="" %s | gzip -c > %s'
+_COMMAND = 'pod2man --center="%s" %s | gzip -c > %s'
def build_one_file(self, infile, outfile):
man =
os.path.splitext(os.path.splitext(os.path.basename(infile))[0])[0]
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2017-11-24 10:53:59
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Fri Nov 24 10:53:59 2017 rev:40 rq:544574 version:2.8.2
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2017-10-06
11:05:06.174347953 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2017-11-24
10:54:06.265087435 +0100
@@ -1,0 +2,17 @@
+Wed Nov 8 18:08:11 UTC 2017 - aavind...@gmail.com
+
+- Update to latest stable version of cobbler (2.8.2)
+ * many changes since 2.6.6. see: https://cobbler.github.io/posts/
+- rebase patches
+ * koan_old_cobbler_compat.diff
+ * disable_not_relevant_checks_bnc_828453.patch
+ * update-outdated-apache-config-bsc956264.patch
++ potentionally fixed in 3d4db162c7b7c0fe7de00c30fcb81798b7db5039
+- remove fix-cobbler-loaders-server-bsc980577.patch
+ * fixed in 77328c0b05d37878f13704efa31e4daa162fda12
+- remove vendor-files.tar.bz2
+ * use built in manpage instead of vendored one
+ * add cobbler_firewall_settings to package root
+- use py macros to do installation
+
+---
Old:
cobbler-2.6.6.tar.gz
fix-cobbler-loaders-server-bsc980577.patch
vendor-files.tar.bz2
New:
cobbler-2.8.2.tar.gz
cobbler_firewall_settings
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.v5Oidq/_old 2017-11-24 10:54:08.569003281 +0100
+++ /var/tmp/diff_new_pack.v5Oidq/_new 2017-11-24 10:54:08.573003135 +0100
@@ -40,10 +40,10 @@
Group: Applications/System
Name: cobbler
AutoReq:no
-Version:2.6.6
+Version:2.8.2
Release:1%{?dist}
-Source0:cobbler-%{version}.tar.gz
-Source1:vendor-files.tar.bz2
+Source0:
https://github.com/cobbler/cobbler/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:cobbler_firewall_settings
Source2:fence_ipmitool.sh
Source3:%{name}.changes
Patch2: cobbler_web_config.diff
@@ -65,8 +65,6 @@
Patch20:fix_test_create_systems.diff
# PATCH-FIX-OPENSUSE update-outdated-apache-config-bsc956264.patch bsc#956264
mdi...@suse.de
Patch21:update-outdated-apache-config-bsc956264.patch
-# PATCH-FIX-OPENSUSE fix-cobbler-loaders-server-bsc980577.patch bsc#980577
psuarezhernan...@suse.de
-Patch22:fix-cobbler-loaders-server-bsc980577.patch
# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1840 (not merged
yet)
Patch23:fix-os-release.patch
# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1811 (not merged
yet)
@@ -161,7 +159,6 @@
%prep
%setup -q
-%setup -a1
%if 0%{?suse_version}
%patch2
%endif
@@ -183,18 +180,15 @@
%patch19 -p1
%patch20 -p1
%patch21 -p0
-%patch22 -p0
%patch23 -p1
%patch24 -p1
-mv vendor-files/cobbler.1.gz docs
-
%build
-%{__python} setup.py build
+%{__python2} setup.py build
%install
test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
+%{__python2} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
mkdir -p $RPM_BUILD_ROOT/etc/%{apachedir}/conf.d
mv config/cobbler.conf $RPM_BUILD_ROOT/etc/%{apachedir}/conf.d/
@@ -216,8 +210,8 @@
%if 0%{?suse_version}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d
-mv vendor-files/cobbler_firewall_settings
$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
-install -m 755 %{S:2} $RPM_BUILD_ROOT/usr/sbin/fence_ipmitool
+cp %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/sbin/fence_ipmitool
ln -sf service $RPM_BUILD_ROOT/usr/sbin/rccobblerd
chmod 755 $RPM_BUILD_ROOT/usr/sbin/grubby-compat
cp -r tests/ $RPM_BUILD_ROOT/usr/share/cobbler/
@@ -412,9 +406,6 @@
%config(noreplace) /etc/%{apachedir}/conf.d/cobbler.conf
-%if 0%{?fedora} >= 9 || 0%{?rhel} >= 5 || 0%{?suse_version}
-%exclude %{python_sitelib}/cobbler/sub_process.py*
-%endif
%if 0%{?fedora} >= 9 || 0%{?rhel} > 5 || 0%{?suse_version}
%{python_sitelib}/cobbler*.egg-info
%if 0%{?suse_version}
@@ -426,7 +417,7 @@
/tftpboot/images
%endif
-%doc AUTHORS README COPYING
+%doc AUTHORS
%if 0%{?suse_version}
%config /etc/sysconfig/SuSEfirewall2.d/cobbler
/usr/sbin/fence_ipmitool
@@ -472,7 +463,7 @@
%{_mandir}/man1/koan.1.gz
%{_mandir}/man1/cobbler-register.1.gz
%dir /var/log/koan
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING
%package -n cobbler-web
@@ -503,7 +494,7 @@
%files -n cobbler-web
%defattr(-,root,root,-)
-%doc AUTHORS
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2017-10-06 11:05:01
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Fri Oct 6 11:05:01 2017 rev:39 rq:531790 version:2.6.6
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2017-08-10
14:12:48.146545999 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2017-10-06
11:05:06.174347953 +0200
@@ -1,0 +2,14 @@
+Thu Oct 5 15:10:39 UTC 2017 - mihai.di...@suse.com
+
+- fix script endpoint security bug CVE-2016-9605 (bsc#1030582)
+ Add:
+* fix-script-endpoint-security-bug-1030582.patch
+
+---
+Wed Oct 4 13:53:18 UTC 2017 - mihai.di...@suse.com
+
+- fix setup.py to identify SUSE OS correctly bsc#1046679
+ Added:
+ * fix-os-release.patch
+
+---
New:
fix-os-release.patch
fix-script-endpoint-security-bug-1030582.patch
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.kbtPiF/_old 2017-10-06 11:05:09.237884603 +0200
+++ /var/tmp/diff_new_pack.kbtPiF/_new 2017-10-06 11:05:09.273879159 +0200
@@ -17,7 +17,9 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]"
|| echo 0)}
+%endif
%if 0%{?suse_version}
%define www_path /srv/
@@ -65,6 +67,10 @@
Patch21:update-outdated-apache-config-bsc956264.patch
# PATCH-FIX-OPENSUSE fix-cobbler-loaders-server-bsc980577.patch bsc#980577
psuarezhernan...@suse.de
Patch22:fix-cobbler-loaders-server-bsc980577.patch
+# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1840 (not merged
yet)
+Patch23:fix-os-release.patch
+# PATCH-FIX-UPSTREAM https://github.com/cobbler/cobbler/pull/1811 (not merged
yet)
+Patch24:fix-script-endpoint-security-bug-1030582.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -178,6 +184,8 @@
%patch20 -p1
%patch21 -p0
%patch22 -p0
+%patch23 -p1
+%patch24 -p1
mv vendor-files/cobbler.1.gz docs
++ fix-os-release.patch ++
Index: cobbler-2.6.6/setup.py
===
--- cobbler-2.6.6.orig/setup.py
+++ cobbler-2.6.6/setup.py
@@ -508,6 +508,18 @@ class savestate(statebase):
self._copy(os.path.join(etcpath, 'rsync.template'), self.statepath)
+def parse_os_release():
+out = {}
+osreleasepath = "/etc/os-release"
+if os.path.exists(osreleasepath):
+with open(osreleasepath, 'rb') as os_release:
+out.update(
+map(
+lambda line: [it.strip('"\n') for it in line.split('=',
1)],
+[line for line in os_release.xreadlines() if not
line.startswith('#')]
+)
+)
+return out
@@ -526,7 +538,13 @@ if __name__ == "__main__":
logpath = "/var/log/"
statepath = "/tmp/cobbler_settings/devinstall"
-if os.path.exists("/etc/SuSE-release"):
+os_release = parse_os_release()
+suse_release = (
+os.path.exists("/etc/SuSE-release") or
+os_release.get('ID_LIKE', '').lower() == 'suse'
+)
+
+if suse_release:
webconfig = "/etc/apache2/conf.d"
webroot = "/srv/www/"
http_user = "wwwrun"
++ fix-script-endpoint-security-bug-1030582.patch ++
Index: cobbler-2.6.6/cobbler/pxegen.py
===
--- cobbler-2.6.6.orig/cobbler/pxegen.py
+++ cobbler-2.6.6/cobbler/pxegen.py
@@ -1256,9 +1256,16 @@ class PXEGen:
else:
blended['img_path'] = os.path.join("/images",distro.name)
- template =
os.path.normpath(os.path.join("/var/lib/cobbler/scripts",script_name))
- if not os.path.exists(template):
- return "# script template %s not found" % script_name
+ scripts_path = "/var/lib/cobbler/scripts"
+ template = os.path.normpath(os.path.join(scripts_path,script_name))
+
+ available_scripts = []
+ for root, folders, files in os.walk(scripts_path):
+ for file in files:
+ available_scripts.append(os.path.join(root, file))
+
+ if not template in available_scripts:
+ return "# script %s not found" % script_name
template_fh = open(template)
template_data = template_fh.read()
commit cobbler for openSUSE:Factory
Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2017-08-10 14:04:31 Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) Package is "cobbler" Thu Aug 10 14:04:31 2017 rev:38 rq:513077 version:2.6.6 Changes: --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2016-05-23 16:38:59.0 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2017-08-10 14:12:48.146545999 +0200 @@ -1,0 +2,5 @@ +Fri Jul 28 10:38:24 UTC 2017 - tr...@suse.de + +- Recommend fence-agents for broader power switch support + +--- Other differences: -- ++ cobbler.spec ++ --- /var/tmp/diff_new_pack.yrvreh/_old 2017-08-10 14:12:49.062417044 +0200 +++ /var/tmp/diff_new_pack.yrvreh/_new 2017-08-10 14:12:49.070415918 +0200 @@ -139,6 +139,9 @@ %endif %endif +# Power reset implementation of virsh, raritan and a lot other HW +Recommends: fence-agents + %description Cobbler is a network install server. Cobbler supports PXE,
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2016-05-23 16:38:56
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2016-05-08
10:46:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2016-05-23
16:38:59.0 +0200
@@ -1,0 +2,7 @@
+Wed May 18 15:07:29 UTC 2016 - pablo.suarezhernan...@suse.com
+
+- Update cobbler loaders server hostname bsc#980577
+ Added:
+ * fix-cobbler-loaders-server-bsc980577.patch
+
+---
New:
fix-cobbler-loaders-server-bsc980577.patch
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.HH0Dux/_old 2016-05-23 16:39:00.0 +0200
+++ /var/tmp/diff_new_pack.HH0Dux/_new 2016-05-23 16:39:00.0 +0200
@@ -63,6 +63,9 @@
Patch20:fix_test_create_systems.diff
# PATCH-FIX-OPENSUSE update-outdated-apache-config-bsc956264.patch bsc#956264
mdi...@suse.de
Patch21:update-outdated-apache-config-bsc956264.patch
+# PATCH-FIX-OPENSUSE fix-cobbler-loaders-server-bsc980577.patch bsc#980577
psuarezhernan...@suse.de
+Patch22:fix-cobbler-loaders-server-bsc980577.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Url:http://www.cobblerd.org/
@@ -171,6 +174,7 @@
%patch19 -p1
%patch20 -p1
%patch21 -p0
+%patch22 -p0
mv vendor-files/cobbler.1.gz docs
++ fix-cobbler-loaders-server-bsc980577.patch ++
--- cobbler/action_dlcontent.py 2016-05-16 09:41:36.162472416 +0100
+++ cobbler/action_dlcontent.py 2016-05-16 09:45:20.979320038 +0100
@@ -46,7 +46,7 @@
they can still source their cross-arch bootloader content manually.
"""
-content_server = "http://www.cobblerd.org/loaders;
+content_server = "http://cobbler.github.io/loaders;
dest = "/var/lib/cobbler/loaders"
files = (
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2016-05-08 10:45:36
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2016-03-18
21:42:30.0 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2016-05-08
10:46:10.0 +0200
@@ -1,0 +2,6 @@
+Tue May 3 14:55:13 UTC 2016 - mdi...@suse.de
+
+- Update outdated apache config bsc#956264
+ * update-outdated-apache-config-bsc956264.patch
+
+---
New:
update-outdated-apache-config-bsc956264.patch
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.ZHiCSc/_old 2016-05-08 10:46:11.0 +0200
+++ /var/tmp/diff_new_pack.ZHiCSc/_new 2016-05-08 10:46:11.0 +0200
@@ -61,6 +61,8 @@
Patch18:cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch
Patch19:fix-broken-tests.diff
Patch20:fix_test_create_systems.diff
+# PATCH-FIX-OPENSUSE update-outdated-apache-config-bsc956264.patch bsc#956264
mdi...@suse.de
+Patch21:update-outdated-apache-config-bsc956264.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Url:http://www.cobblerd.org/
@@ -168,6 +170,7 @@
%patch18 -p1
%patch19 -p1
%patch20 -p1
+%patch21 -p0
mv vendor-files/cobbler.1.gz docs
++ update-outdated-apache-config-bsc956264.patch ++
Index: config/cobbler.conf
===
--- config/cobbler.conf.orig
+++ config/cobbler.conf
@@ -12,8 +12,7 @@ WSGIScriptAliasMatch ^/cblr/svc/([^/]*)
SetEnv VIRTUALENV @@virtualenv@@
Options Indexes FollowSymLinks
-Order allow,deny
-Allow from all
+Require all granted
ProxyRequests off
@@ -29,7 +28,6 @@ BrowserMatch "MSIE" AuthDigestEnableQuer
Options Indexes FollowSymLinks
-Order allow,deny
-Allow from all
+Require all granted
Index: config/cobbler_web.conf
===
--- config/cobbler_web.conf.orig
+++ config/cobbler_web.conf
@@ -11,8 +11,7 @@
SetEnv VIRTUALENV @@virtualenv@@
Options Indexes MultiViews
AllowOverride None
-Order allow,deny
-Allow from all
+Require all granted
@@ -24,8 +23,7 @@
Options +Indexes +FollowSymLinks
AllowOverride None
-Order allow,deny
-Allow from all
+Require all granted
# Use separate process group for wsgi
@@ -38,15 +36,13 @@ WSGIPassAuthorization On
Options Indexes MultiViews
AllowOverride None
-Order allow,deny
-Allow from all
+Require all granted
Options +Indexes +FollowSymLinks
AllowOverride None
-Order allow,deny
-Allow from all
+Require all granted
= 2.4>
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2016-03-18 21:42:28
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is "cobbler"
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2015-02-06
22:37:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2016-03-18
21:42:30.0 +0100
@@ -1,0 +2,5 @@
+Wed Mar 9 17:38:45 UTC 2016 - bwiedem...@suse.com
+
+- Replace builddate with changelog date to fix build-compare (bsc#969538)
+
+---
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.cZzzUr/_old 2016-03-18 21:42:31.0 +0100
+++ /var/tmp/diff_new_pack.cZzzUr/_new 2016-03-18 21:42:31.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cobbler
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,6 +43,7 @@
Source0:cobbler-%{version}.tar.gz
Source1:vendor-files.tar.bz2
Source2:fence_ipmitool.sh
+Source3:%{name}.changes
Patch2: cobbler_web_config.diff
%if 0%{?suse_version}
Patch4: grubby-compat.diff
@@ -192,6 +193,8 @@
%endif
rm -f $RPM_BUILD_ROOT/etc/cobbler/cobblerd
+changelogdate=$(perl -ne 'if(m/^((?:[A-Z][a-z]{2} )?[A-Z][a-z]{2} +\d+
\d+:\d+:\d+) (?:[A-Z]+ )?(\d{4})/) {print "$1 $2"; exit 0}' %{S:3} )
+sed -i "s/builddate = .*/builddate = $changelogdate/"
$RPM_BUILD_ROOT/%{_sysconfdir}/cobbler/version
%if 0%{?suse_version}
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2015-02-06 22:37:46
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2014-09-12
12:22:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2015-02-06
22:37:47.0 +0100
@@ -1,0 +2,86 @@
+Thu Jan 15 09:36:07 UTC 2015 - fcaste...@suse.com
+
+- Added 'fix_test_create_systems.diff': fixes the create_systens unit test
+
+---
+Tue Jan 13 09:37:53 UTC 2015 - fcaste...@suse.com
+
+- Fix runtime dependency: ensure the yaml module is available.
+
+---
+Tue Jan 13 08:51:03 UTC 2015 - fcaste...@suse.com
+
+- Install the right cobblerd.service file
+
+---
+Mon Jan 12 17:07:27 UTC 2015 - fcaste...@suse.com
+
+- Do not ship cobbler_web.conf inside of the cobbler package, get rid
+ of part of our patches to setup.py,
+
+---
+Fri Dec 19 17:48:20 UTC 2014 - fcaste...@suse.com
+
+- Added new patch required to fix the broken unit tests:
+ * fix-broken-tests.diff
+
+---
+Thu Dec 18 14:59:08 UTC 2014 - fcaste...@suse.com
+
+- Removed another no longer needed patch:
+ * fix-textmode-for-SUSE.dif
+
+---
+Thu Dec 18 14:51:32 UTC 2014 - fcaste...@suse.com
+
+- Update to latest stable version of cobbler (2.6.6)
+- Removed no longer needed patches
+ * bnc_877009.patch
+ * cobbler-2.4.2-Fix-koan-s-get_insert_script.patch
+ * fix-broken-tests.diff
+ * fix-initscript.diff
+ * suse_config.diff
+- Fixed old patches to apply against the new code:
+ * catch_cheetah_exception.patch
+ * grubby-compat.diff
+ * setup_py.diff
+
+---
+Mon Dec 15 10:20:53 UTC 2014 - fcaste...@suse.com
+
+- Fix the broken unit tests
+
+---
+Thu Dec 11 16:34:35 UTC 2014 - mse...@suse.de
+
+- Created sub package for unit tests
+
+---
+Tue Dec 9 15:35:25 CET 2014 - m...@suse.de
+
+- use fdupes only on SUSE
+
+---
+Mon Dec 8 09:27:33 UTC 2014 - dmacvi...@suse.de
+
+- Fix for re-installation of machines on SLE with static
+ network configuration (bnc#883487)
+- Added patches:
+ * cobbler-2.4.2-Fix-koan-s-get_insert_script.patch
+ * cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch
+
+---
+Thu Nov 27 10:01:30 CET 2014 - m...@suse.de
+
+- fix port guessing in koan (bsc#855389)
+ * fix-koan-port-guessing.dif
+- add copy-default option to grubby-compat (bsc#855389)
+- handle elilo in SUSE (bsc#855389)
+
+---
+Wed Nov 26 13:46:30 CET 2014 - m...@suse.de
+
+- fix wrong option text in SUSE environment (bsc#901058)
+ * fix-textmode-for-SUSE.dif
+
+---
Old:
bnc_877009.patch
cobbler-2.4.2.tar.gz
fix-initscript.diff
setup_py.diff
suse_config.diff
New:
cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch
cobbler-2.6.6.tar.gz
fix-broken-tests.diff
fix-koan-port-guessing.dif
fix_test_create_systems.diff
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.v2uC2B/_old 2015-02-06 22:37:48.0 +0100
+++ /var/tmp/diff_new_pack.v2uC2B/_new 2015-02-06 22:37:48.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cobbler
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,15 +38,12 @@
Group: Applications/System
Name: cobbler
AutoReq:no
-Version:2.4.2
+Version:2.6.6
Release:1%{?dist}
Source0:cobbler-%{version}.tar.gz
Source1:vendor-files.tar.bz2
Source2:fence_ipmitool.sh
-Patch0: fix-initscript.diff
-Patch1: suse_config.diff
Patch2: cobbler_web_config.diff
-Patch3: setup_py.diff
%if 0%{?suse_version}
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2014-09-12 11:28:40
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2014-08-03
15:37:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2014-09-12
12:22:57.0 +0200
@@ -1,0 +2,13 @@
+Thu Sep 4 09:43:01 UTC 2014 - fcaste...@suse.com
+
+- Added do_not_use_grubby_compat_when_grub2_is_in_use.diff: prevents
+ usage of grubby-compat when grub2 is active. Use grub2 features
+ do modify the boot loader.
+
+---
+Tue Sep 2 15:08:40 UTC 2014 - fcaste...@suse.com
+
+- Moved grubby-compat inside of the koan sub-package. The scrit was
accidentally
+ moved into the cobbler package.
+
+---
New:
do_not_use_grubby_compat_when_grub2_is_in_use.diff
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.9wzB3p/_old 2014-09-12 12:22:58.0 +0200
+++ /var/tmp/diff_new_pack.9wzB3p/_new 2014-09-12 12:22:58.0 +0200
@@ -58,6 +58,7 @@
Patch11:fix-powermanagement-status.dif
Patch12:bnc_877009.patch
Patch13:fix_sle_detection.patch
+Patch14:do_not_use_grubby_compat_when_grub2_is_in_use.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -67,10 +68,10 @@
BuildRequires: git
BuildRequires: python-cheetah
%if 0%{?suse_version}
-BuildRequires: python-PyYAML
-BuildRequires: distribution-release
-BuildRequires: atftp
BuildRequires: apache2
+BuildRequires: atftp
+BuildRequires: distribution-release
+BuildRequires: python-PyYAML
Requires: apache2-mod_wsgi
Requires: ipmitool
%else
@@ -163,6 +164,7 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
mv vendor-files/cobbler.1.gz docs
@@ -404,7 +406,6 @@
%config /etc/apache2/vhosts.d/cobbler_web.conf
%config /etc/sysconfig/SuSEfirewall2.d/cobbler
/usr/sbin/fence_ipmitool
-/usr/sbin/grubby-compat
/usr/sbin/rccobblerd
%endif
@@ -434,6 +435,9 @@
%{_bindir}/ovz-install
%{_bindir}/cobbler-register
%{python_sitelib}/koan
+%if 0%{?suse_version}
+%attr(0755,root,root) /usr/sbin/grubby-compat
+%endif
%if 0%{?fedora} = 9 || 0%{?rhel} = 5 || 0%{?suse_version}
%exclude %{python_sitelib}/koan/sub_process.py*
++ do_not_use_grubby_compat_when_grub2_is_in_use.diff ++
diff --git a/koan/app.py b/koan/app.py
index a732309..4a125f8 100644
--- a/koan/app.py
+++ b/koan/app.py
@@ -1042,9 +1042,12 @@ class Koan:
raise InfoException, grub2 is not installed
use_grub2 = True
elif (make == suse):
-if not os.path.exists(/usr/sbin/grubby-compat):
-raise InfoException, grub2 is not installed
-use_grubby_compat = True
+if os.path.exists(/usr/sbin/grub2-install):
+ use_grub2 = True
+else:
+if not os.path.exists(/usr/sbin/grubby-compat):
+ raise InfoException, grubby-compat is not installed
+use_grubby_compat = True
else:
if not os.path.exists(/sbin/grubby):
raise InfoException, grubby is not installed
@@ -1175,10 +1178,13 @@ class Koan:
# Set paths for Ubuntu/Debian
# TODO: Add support for other distros when they ship grub2
-if make in ['ubuntu', 'debian']:
+if make in ['ubuntu', 'debian', 'suse']:
grub_file = /etc/grub.d/42_koan
grub_default_file = /etc/default/grub
-cmd = [update-grub]
+if make in ['suse']:
+cmd = ['/sbin/update-bootloader', '--refresh']
+else:
+cmd = [update-grub]
default_cmd = ['sed', '-i',
's/^GRUB_DEFAULT\=.*$/GRUB_DEFAULT=%s/g' % name, grub_default_file]
# Create grub2 menuentry
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2014-08-03 15:36:55
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2013-08-14
23:04:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2014-08-03
15:37:00.0 +0200
@@ -1,0 +2,72 @@
+Fri Jul 25 15:51:39 UTC 2014 - fcaste...@suse.com
+
+- Added fix_sle_detection.patch: ensures SLE12 is properly detected.
+
+---
+Fri Jul 25 13:28:15 UTC 2014 - fcaste...@suse.com
+
+- Did some cleanup of the spec file.
+
+---
+Tue Jul 15 15:17:06 UTC 2014 - fcaste...@suse.com
+
+- Fix source of cobbler package inside of spec file (required by
openSUSE:Factory)
+
+---
+Tue Jul 15 13:02:42 UTC 2014 - fcaste...@suse.com
+
+- Added bnc_877009.patch, fixes CVE-2014-3225: cobbler: Local file inclusion
(bnc#877009)
+
+---
+Mon Jul 14 16:27:59 UTC 2014 - fcaste...@suse.com
+
+- Got rid of some of the rpmlint warnings.
+- Fixed error inside of koan tool introduced by the 'grubby-compat.diff' patch.
+
+---
+Fri Jul 11 10:18:57 UTC 2014 - mse...@suse.de
+
+- Requires tfpt-server but atftp/tftpt packages provide tfpt(server)
+- Added conditional requires for s390x and syslinux-x86_64
+- Added patches:
+ + catch_cheetah_exception.patch
+ - forward cheetah exception as 500 SERVER ERROR (bnc#787879)
+ + disable_not_relevant_checks_bnc_828453.patch
+ + fence_ipmitool.sh
+- add fence_ipmitool script for power management
+ + fix-powermanagement-status.dif
+- fix evaluation of power status calls
+ + fix-restart-paravirt-xen.dif
+- fix XEN fullvirt installation
+ + grubby-compat.diff
+ + koan_old_cobbler_compat.diff
+- add new grubby-compat tool
+ + looking_for_cobbler_order_changed.diff
+- fix cobbler checks on SUSE (bnc#828453)
+ + setup_py.diff
+- update paths for suse apache
+
+- Modified fix-initscript.diff -Failed to patch due to new line in newer
version
+
+- Removed patches:
+ - suse_newver.patch - Upstreamed
+ - users_patch.diff - Upstreamed
+ - cheetah_template_autoescape.patch - No longer needed
+
+---
+Fri Feb 14 11:47:04 CET 2014 - m...@suse.de
+
+- update to version 2.4.2
+ + Adding support for gPXE
+ + Adding support for ESXi5
+ + fix install=... kernel parameter when importing a SUSE distro
+ + koan: Port xen creation to virt-install
+ + koan: Port qcreate to virt-install
+ + Port koan from virtinst to virt-install command (v2)
+ + add qcow2 driver type
+ + Adding ability to use https for API calls (cobbler CLI)
+ + Use ip instead of ifconfig for network snippets
+ + minor modifications to templar to show template rendering errors
+ + bugfixes and refactoring
+
+---
Old:
cobbler-2.4.0-1.tar.bz2
fix-initscript.dif
suse_newver.patch
users_patch.diff
New:
bnc_877009.patch
catch_cheetah_exception.patch
cobbler-2.4.2.tar.gz
disable_not_relevant_checks_bnc_828453.patch
fence_ipmitool.sh
fix-initscript.diff
fix-powermanagement-status.dif
fix-restart-paravirt-xen.dif
fix_sle_detection.patch
grubby-compat.diff
koan_old_cobbler_compat.diff
looking_for_cobbler_order_changed.diff
setup_py.diff
Other differences:
--
++ cobbler.spec ++
799 lines (skipped)
between /work/SRC/openSUSE:Factory/cobbler/cobbler.spec
and /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.spec
++ bnc_877009.patch ++
611 lines (skipped)
++ catch_cheetah_exception.patch ++
Index: cobbler-2.4.0/bin/services.py
===
--- cobbler-2.4.0.orig/bin/services.py
+++ cobbler-2.4.0/bin/services.py
@@ -22,6 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fi
import yaml
import os
import urllib
+import xmlrpclib
import cgi
from cobbler.services import CobblerSvc
@@ -76,21 +77,25 @@ def application(environ, start_response)
# Execute corresponding operation on the CobblerSvc object:
func = getattr( cw, mode )
-content = func( **form )
+try:
+content = func( **form )
-content = unicode(content).encode('utf-8')
-status = '200 OK'
-
-if content.find(# *** ERROR
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2013-08-14 23:04:21
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2013-04-12
20:23:27.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2013-08-14
23:04:22.0 +0200
@@ -1,0 +2,37 @@
+Tue Aug 13 11:41:27 UTC 2013 - kkae...@suse.com
+
+- Update to 2.4.0
+ Major Features:
+ - Dynamic Settings
+ - Distro Signatures
+ - Vastly improved support for Ubuntu, OpenSUSE and VMware ESXi (5.0 and 5.1)
+ - Added in new templated scripting support (needs documentation)
+ - New web interface improvements (tabs, etc.)
+ - Added apt-specific fields for repositories to make mirroring them easier
+ - Support for parameterized classes and defines in puppet using management
classes
+
+ Minor Features:
+ - Added the bonded_bridge_slave interface type:
+ - Improved template error reporting
+ - Variables in fields are now evaluated through the templating engine
+ - Added openvz as a virtualization type for koan
+ - Added --virt-pxe-boot option for koan to force PXE booting of new systems
+ - Added a per-interface gateway option, for systems that support it
+ - Added support for new puppet command syntax
+ - Exposed replication rsync options
+
+ Major Bugfixes:
+ - --available-as no longer copies all files.
+ - Improved gPXE/iPXE support, including FreeBSD
+ - Deleting objects now respects the --recursive option again
+
+ Minor Bugfixes:
+ - Too many to list
+
+---
+Wed Aug 7 15:59:31 CEST 2013 - r...@suse.de
+
+- fix filelist to fix build on factory: rpm does not allow to
+ mark a non-directory as dir anymore
+
+---
Old:
cobbler-2.2.3.tar.bz2
New:
cobbler-2.4.0-1.tar.bz2
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.spT3QO/_old 2013-08-14 23:04:23.0 +0200
+++ /var/tmp/diff_new_pack.spT3QO/_new 2013-08-14 23:04:23.0 +0200
@@ -33,9 +33,9 @@
Summary: Boot server configurator
Name: cobbler
License:GPL-2.0+
-Version: 2.2.3
+Version: 2.4.0
Release: 2
-Source0: cobbler-%{version}.tar.bz2
+Source0: cobbler-%{version}-1.tar.bz2
Source1: vendor-files.tar.bz2
Patch0: fix-initscript.dif
Patch1: suse_config.diff
@@ -66,9 +66,16 @@
#%if 0%{?fedora} = 11 || 0%{?rhel} = 6
#Requires: genisoimage
#%else
+%if 0%{?suse_version}
+# for /usr/bin/mkisofs
+Requires: cdrkit-cdrtools-compat
+%else
Requires: mkisofs
+%endif
#%endif
+%if !0%{?suse_version}
Requires: libyaml-0-2
+%endif
Requires: python-cheetah
Requires: python-netaddr
Requires: python-simplejson
@@ -105,6 +112,10 @@
#Requires: python(abi) = %{pyver}
#%endif
+%if 0%{?suse_version} 01020
+BuildRequires: fdupes
+%endif
+
BuildRequires: python-yaml
BuildRequires: python-cheetah
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -125,15 +136,15 @@
a XMLRPC API for integration with other applications.
%prep
-%setup -q
-%setup -a1
+%setup -q -n %{name}-%{name}-%{version}-1
+%setup -a1 -n %{name}-%{name}-%{version}-1
%if 0%{?suse_version}
-%patch0
-%patch1
+%patch0 -p1
+%patch1 -p1
%patch2
-%patch13
+%patch13 -p1
sed -i 's/\r//' config/distro_signatures.json
-%patch14
+%patch14 -p1
sed -i 's/$'/`echo \\\r`/ config/distro_signatures.json
%endif
mv vendor-files/cobbler.1.gz docs
@@ -155,6 +166,12 @@
mkdir -p $RPM_BUILD_ROOT/usr/sbin
ln -sf ../../etc/init.d/cobblerd $RPM_BUILD_ROOT/usr/sbin/rccobblerd
+%if 0%{?suse_version} 01020
+# can't fdupes full buildroot as this will create cross-partition
+# hardlinks and rpmlint will complain
+%fdupes %{buildroot}/usr/lib/python2.7/site-packages/cobbler
+%endif
+
%pre
%if 0%{?suse_version} = 1230
%service_add_pre cobblerd.service
@@ -256,7 +273,7 @@
%endif
%if 0%{?suse_version} = 1110
%defattr(755,root,root)
-%dir /%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
+/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
%defattr(755,wwwrun,www)
%else
%defattr(755,apache,apache)
@@ -308,6 +325,8 @@
%config(noreplace) /var/lib/cobbler/kickstarts/*.ks
%config(noreplace) /var/lib/cobbler/kickstarts/*.xml
%config(noreplace) /var/lib/cobbler/kickstarts/*.seed
+%config(noreplace) /var/lib/cobbler/scripts/preseed_early_default
+%config(noreplace) /var/lib/cobbler/scripts/preseed_late_default
%config(noreplace) /etc/cobbler/*.template
%config(noreplace) /etc/cobbler/pxe/*.template
%config(noreplace) /etc/cobbler/reporting/*.template
@@ -364,6 +383,7 @@
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2013-04-12 20:23:25
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler, Maintainer is u...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-05-21
07:24:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2013-04-12
20:23:27.0 +0200
@@ -1,0 +2,30 @@
+Wed Apr 10 11:23:44 UTC 2013 - rbrown...@opensuse.org
+
+- use systemd for openSUSE 12.3 and later
+- change release number to match upstream
+- drop obsolete setup_py.diff
+- add required apache modules for cobbler-web
+- add suse_newver.patch to add support for SLES11 SP3,
+ openSUSE 12.3 and openSUSE 13.1
+
+---
+Tue Apr 9 15:45:11 UTC 2013 - rbrown...@opensuse.org
+
+- update to 2.2.3
+ + Multiple security fixes
+ + CSRF support for the web GUI, which will now default to using
+https too.
+ + Power management subsystem completely re-worked to prevent
+command-injection (CVE-2012-2395)
+ + Support for bind in chroot'd environments
+ + Koan now uses virt-install CLI instead of directly accessing
+the virtinst API
+ + Various improvements for SuSE and autoyast, especially for
+PPC64-based systems.
+ + BETA support for ESXi5 and gPXE
+ + BETA support for using other template languages, like jinja2
+- rebase patches
+- drop obsolete manage_import_suse.py
+- no longer requires mod_python
+
+---
Old:
cobbler-2.2.2.tar.bz2
fix_suse_import.diff
setup_py.diff
New:
cobbler-2.2.3.tar.bz2
suse_newver.patch
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.J6kNlr/_old 2013-04-12 20:25:15.0 +0200
+++ /var/tmp/diff_new_pack.J6kNlr/_new 2013-04-12 20:25:15.0 +0200
@@ -33,32 +33,29 @@
Summary: Boot server configurator
Name: cobbler
License:GPL-2.0+
-Version: 2.2.2
-Release: 6
+Version: 2.2.3
+Release: 2
Source0: cobbler-%{version}.tar.bz2
Source1: vendor-files.tar.bz2
Patch0: fix-initscript.dif
Patch1: suse_config.diff
Patch2: cobbler_web_config.diff
Patch13: users_patch.diff
-Patch14: setup_py.diff
-Patch20: fix_suse_import.diff
+Patch14: suse_newver.patch
Group: Applications/System
Requires: python = 2.3
%if 0%{?suse_version} = 1000
Requires: apache2
-Requires: apache2-mod_python
Requires: apache2-mod_wsgi
#Requires: tftp
%ifarch %ix86 x86_64
Requires: syslinux
%endif
-BuildRequires: apache2 apache2-mod_python tftp distribution-release
+BuildRequires: apache2 tftp distribution-release
%else
Requires: httpd
Requires: tftp-server
-Requires: mod_python
%endif
Requires: createrepo
@@ -89,11 +86,14 @@
#%if 0%{?fedora} = 6 || 0%{?rhel} = 5
Requires: yum-utils
#%endif
-
+%if 0%{?suse_version} = 1230
+BuildRequires: systemd
+%{?systemd_requires}
+%else
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
-
Requires(preun): /sbin/service
+%endif
%if 0%{?suse_version}
Requires(post): %fillup_prereq %insserv_prereq
@@ -131,10 +131,11 @@
%patch0
%patch1
%patch2
-%endif
%patch13
+sed -i 's/\r//' config/distro_signatures.json
%patch14
-%patch20
+sed -i 's/$'/`echo \\\r`/ config/distro_signatures.json
+%endif
mv vendor-files/cobbler.1.gz docs
%build
@@ -148,15 +149,16 @@
mv vendor-files/cobbler_firewall_settings
$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
%endif
PREFIX=--prefix=/usr
-mkdir -p $RPM_BUILD_ROOT/etc/apache2/vhosts.d
%endif
mkdir -p $RPM_BUILD_ROOT/%{www_path}/www/logs
%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
mkdir -p $RPM_BUILD_ROOT/usr/sbin
ln -sf ../../etc/init.d/cobblerd $RPM_BUILD_ROOT/usr/sbin/rccobblerd
-#%if 0%{?suse_version} = 1000
-#mv $RPM_BUILD_ROOT/etc/httpd/conf.d/* $RPM_BUILD_ROOT/etc/apache2/vhosts.d/
-#%endif
+
+%pre
+%if 0%{?suse_version} = 1230
+%service_add_pre cobblerd.service
+%endif
%post
if [ $1 = 1 ];
@@ -165,9 +167,10 @@
%if 0%{?suse_version}
%{fillup_and_insserv cobblerd}
sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES proxy
-sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES python
sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES proxy_http
sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES proxy_connect
+sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES rewrite
+sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES ssl
sysconf_addword /etc/sysconfig/apache2 APACHE_MODULES wsgi
%else
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2012-05-21 07:24:04
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler, Maintainer is u...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-04-20
15:12:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-05-21
07:24:05.0 +0200
@@ -1,0 +2,5 @@
+Thu May 3 10:35:30 CEST 2012 - u...@suse.de
+
+- require syslinux only on x86 arch
+
+---
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.nMmdxf/_old 2012-05-21 07:24:06.0 +0200
+++ /var/tmp/diff_new_pack.nMmdxf/_new 2012-05-21 07:24:06.0 +0200
@@ -51,7 +51,9 @@
Requires: apache2-mod_python
Requires: apache2-mod_wsgi
#Requires: tftp
+%ifarch %ix86 x86_64
Requires: syslinux
+%endif
BuildRequires: apache2 apache2-mod_python tftp distribution-release
%else
Requires: httpd
@@ -125,7 +127,7 @@
%prep
%setup -q
%setup -a1
-%if 0%{suse_version}
+%if 0%{?suse_version}
%patch0
%patch1
%patch2
@@ -140,13 +142,15 @@
%install
test x$RPM_BUILD_ROOT != x rm -rf $RPM_BUILD_ROOT
-%if 0%{?suse_version} = 1000
+%if 0%{?suse_version}
+%if 0%{?suse_version} = 1110
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d
mv vendor-files/cobbler_firewall_settings
$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
+%endif
PREFIX=--prefix=/usr
mkdir -p $RPM_BUILD_ROOT/etc/apache2/vhosts.d
-mkdir -p $RPM_BUILD_ROOT/%{www_path}/www/logs
%endif
+mkdir -p $RPM_BUILD_ROOT/%{www_path}/www/logs
%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
mkdir -p $RPM_BUILD_ROOT/usr/sbin
ln -sf ../../etc/init.d/cobblerd $RPM_BUILD_ROOT/usr/sbin/rccobblerd
@@ -232,11 +236,11 @@
%files
-%if 0%{suse_version} 1120
+%if 0%{?suse_version} 1120
%defattr(755,root,root)
%dir /%{_sysconfdir}/sysconfig/SuSEfirewall2.d
%endif
-%if 0%{suse_version}
+%if 0%{?suse_version} = 1110
%defattr(755,root,root)
%dir /%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
%defattr(755,wwwrun,www)
@@ -261,7 +265,7 @@
%dir /var/log/cobbler
%dir /var/log/cobbler/tasks
%dir /var/log/cobbler/kicklog
-%if 0%{suse_version}
+%if 0%{?suse_version}
%defattr(755,wwwrun,www)
%else
%defattr(755,apache,apache)
@@ -272,7 +276,7 @@
%dir /%{www_path}/www/cobbler/ks_mirror
%dir /%{www_path}/www/cobbler/ks_mirror/config
%dir /%{www_path}/www/cobbler/links
-%dir /srv/www/cobbler/aux
+%dir /%{www_path}/www/cobbler/aux
%defattr(444,%{apache_user},%{apache_group})
/%{www_path}/www/cobbler/aux/anamon
/%{www_path}/www/cobbler/aux/anamon.init
@@ -331,12 +335,12 @@
%endif
%{_mandir}/man1/cobbler.1.gz
/etc/init.d/cobblerd
-#%if 0%{?suse_version} = 1000
+%if 0%{?suse_version} = 1000
%config(noreplace) /etc/apache2/conf.d/cobbler.conf
#%config(noreplace) /etc/apache2/conf.d/cobbler_wsgi.conf
-#%else
-#%config(noreplace) /etc/httpd/conf.d/cobbler.conf
-#%endif
+%else
+%config(noreplace) /etc/httpd/conf.d/cobbler.conf
+%endif
%dir /var/log/cobbler/syslog
%dir /var/log/cobbler/anamon
@@ -395,7 +399,9 @@
%defattr(664,root,root)
%defattr(-,root,root)
+%if 0%{?suse_version} = 1110
%{python_sitelib}/cobbler-%{version}-py%{py_ver}.egg-info
+%endif
%doc AUTHORS CHANGELOG README COPYING
%package -n koan
@@ -475,7 +481,7 @@
%defattr(-,%{apache_user},%{apache_group})
%dir /usr/share/cobbler/web
/usr/share/cobbler/web/*
-%if 0%{?suse_version} = 1030
+%if 0%{?suse_version} = 1010
%config(noreplace) /etc/apache2/vhosts.d/cobbler_web.conf
%else
%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
++ setup_py.diff ++
--- /var/tmp/diff_new_pack.nMmdxf/_old 2012-05-21 07:24:06.0 +0200
+++ /var/tmp/diff_new_pack.nMmdxf/_new 2012-05-21 07:24:06.0 +0200
@@ -14,7 +14,7 @@
webroot = /usr/share/cobbler/webroot/
else:
webconfig = /etc/httpd/conf.d
-+vhostconfig = /etc/apache2/conf.d
++vhostconfig = /etc/httpd/conf.d
webroot = /var/www/
webcontent = webroot + cobbler_webui_content/
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2012-04-20 15:11:45
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler, Maintainer is u...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-04-19
08:48:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-04-20
15:12:05.0 +0200
@@ -1,0 +2,7 @@
+Thu Apr 19 10:57:50 CEST 2012 - u...@suse.de
+
+- moved the secret generation from RPM post-script to the
+ init-script, to avoid that all appliances will still have the
+ same key
+
+---
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.1zVpkv/_old 2012-04-20 15:12:06.0 +0200
+++ /var/tmp/diff_new_pack.1zVpkv/_new 2012-04-20 15:12:06.0 +0200
@@ -60,6 +60,7 @@
%endif
Requires: createrepo
+Requires: openssl
#%if 0%{?fedora} = 11 || 0%{?rhel} = 6
#Requires: fence-agents
#%endif
@@ -466,13 +467,6 @@
#BuildArch: noarch
Url: http://fedorahosted.org/cobbler/
-%post -n cobbler-web
-# Change the SECRET_KEY option in the Django settings.py file
-# required for security reasons, should be unique on all systems
-RAND_SECRET=$(openssl rand -base64 40 | sed 's/\//\\\//g')
-sed -i -e s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/
/usr/share/cobbler/web/settings.py
-
-
%description -n cobbler-web
Web interface for Cobbler that allows visiting http://server/cobbler_web to
configure the install server.
++ fix-initscript.dif ++
--- /var/tmp/diff_new_pack.1zVpkv/_old 2012-04-20 15:12:06.0 +0200
+++ /var/tmp/diff_new_pack.1zVpkv/_new 2012-04-20 15:12:06.0 +0200
@@ -1,7 +1,5 @@
-Index: config/cobblerd
-===
config/cobblerd.orig
-+++ config/cobblerd
+--- config/cobblerd
config/cobblerd2012/04/19 08:55:40
@@ -7,8 +7,9 @@
### BEGIN INIT INFO
@@ -14,10 +12,17 @@
# Default-Stop: 0 1 2 6
# Short-Description: daemon for libvirt virtualization API
# Description: This is a daemon that a provides remote cobbler API
-@@ -50,8 +51,26 @@ RETVAL=0
+@@ -50,8 +51,33 @@
start() {
echo -n $Starting cobbler daemon:
++# Change the SECRET_KEY option in the Django settings.py file
++# required for security reasons, should be unique on all systems
++# the default is empty - SECRET_KEY = ''
++# such a key will be changed now
++# (moved from the post-section of the RPM to the init-script for
appliances)
++RAND_SECRET=$(openssl rand -base64 40 | sed 's/\//\\\//g')
++sed -i -e s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/
/usr/share/cobbler/web/settings.py
+if ! grep '\[tftpd\]' /etc/cobbler/modules.conf /dev/null 21; then
+echo
+echo no [tftpd] section found in /etc/cobbler/modules.conf
@@ -42,7 +47,7 @@
rc_status -v
elif [ -e $DEBIAN_VERSION ]; then
if [ -f $LOCKFILE ]; then
-@@ -66,7 +85,7 @@ start() {
+@@ -66,7 +92,7 @@
fi
RETVAL=$?
echo
@@ -51,7 +56,7 @@
return $RETVAL
}
-@@ -91,7 +110,9 @@ stop() {
+@@ -91,7 +117,9 @@
RETVAL=$?
echo
if [ $RETVAL -eq 0 ]; then
@@ -62,7 +67,7 @@
rm -f /var/run/$SERVICE.pid
fi
}
-@@ -111,6 +132,7 @@ case $1 in
+@@ -111,6 +139,7 @@
echo -n Checking for service cobblerd
checkproc /usr/bin/cobblerd
rc_status -v
@@ -70,7 +75,7 @@
elif [ -f $DEBIAN_VERSION ]; then
if [ -f $LOCKFILE ]; then
RETVAL=0
-@@ -125,7 +147,7 @@ case $1 in
+@@ -125,7 +154,7 @@
fi
;;
condrestart)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2012-04-19 08:48:39
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler, Maintainer is u...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-03-30
14:19:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-04-19
08:48:47.0 +0200
@@ -1,0 +2,5 @@
+Tue Apr 17 17:11:59 CEST 2012 - u...@suse.de
+
+- create a secret during installation
+
+---
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.gDVgrT/_old 2012-04-19 08:48:49.0 +0200
+++ /var/tmp/diff_new_pack.gDVgrT/_new 2012-04-19 08:48:49.0 +0200
@@ -19,6 +19,16 @@
%{!?python_sitearch: %global python_sitearch %(%{__python} -c from
distutils.sysconfig import get_python_lib; print(get_python_lib(1)))}
#%{!?python_sitelib: %define python_sitelib %(%{__python} -c from
distutils.sysconfig import get_python_lib; print get_python_lib())}
+%if 0%{?suse_version}
+%define www_path /srv/
+%define apache_user wwwrun
+%define apache_group www
+%else
+%define www_path %{_var}
+%define apache_user apache
+%define apache_group apache
+%endif
+
%define _binaries_in_noarch_packages_terminate_build 0
Summary: Boot server configurator
Name: cobbler
@@ -40,11 +50,9 @@
Requires: apache2
Requires: apache2-mod_python
Requires: apache2-mod_wsgi
-BuildRequires: distribution-release
#Requires: tftp
Requires: syslinux
-#BuildRequires: apache2 apache2-mod_python tftp distribution-release
-BuildRequires: apache2 apache2-mod_python tftp
+BuildRequires: apache2 apache2-mod_python tftp distribution-release
%else
Requires: httpd
Requires: tftp-server
@@ -136,7 +144,7 @@
mv vendor-files/cobbler_firewall_settings
$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/cobbler
PREFIX=--prefix=/usr
mkdir -p $RPM_BUILD_ROOT/etc/apache2/vhosts.d
-mkdir -p $RPM_BUILD_ROOT/srv/www/logs
+mkdir -p $RPM_BUILD_ROOT/%{www_path}/www/logs
%endif
%{__python} setup.py install --optimize=1 --root=$RPM_BUILD_ROOT $PREFIX
mkdir -p $RPM_BUILD_ROOT/usr/sbin
@@ -234,8 +242,8 @@
%else
%defattr(755,apache,apache)
%endif
-%dir /srv/www/cobbler/svc/
-/srv/www/cobbler/svc/*
+%dir /%{www_path}/www/cobbler/svc/
+/%{www_path}/www/cobbler/svc/*
%{_sbindir}/rccobblerd
%defattr(755,root,root)
@@ -257,22 +265,16 @@
%else
%defattr(755,apache,apache)
%endif
-%dir /srv/www/cobbler/
-%dir /srv/www/cobbler/localmirror
-%dir /srv/www/cobbler/repo_mirror
-%dir /srv/www/cobbler/ks_mirror
-%dir /srv/www/cobbler/ks_mirror/config
-%dir /srv/www/cobbler/links
-#%dir /var/www/cobbler/webui (MOVED to cobbler-web)
+%dir /%{www_path}/www/cobbler/
+%dir /%{www_path}/www/cobbler/localmirror
+%dir /%{www_path}/www/cobbler/repo_mirror
+%dir /%{www_path}/www/cobbler/ks_mirror
+%dir /%{www_path}/www/cobbler/ks_mirror/config
+%dir /%{www_path}/www/cobbler/links
%dir /srv/www/cobbler/aux
-%if 0%{suse_version}
-%defattr(444,wwwrun,www)
-%else
-%defattr(444,apache,apache)
-%endif
-#/var/www/cobbler/webui/*(MOVED TO cobbler-web)
-/srv/www/cobbler/aux/anamon
-/srv/www/cobbler/aux/anamon.init
+%defattr(444,%{apache_user},%{apache_group})
+/%{www_path}/www/cobbler/aux/anamon
+/%{www_path}/www/cobbler/aux/anamon.init
%defattr(755,root,root)
%{_bindir}/cobbler
@@ -464,16 +466,19 @@
#BuildArch: noarch
Url: http://fedorahosted.org/cobbler/
+%post -n cobbler-web
+# Change the SECRET_KEY option in the Django settings.py file
+# required for security reasons, should be unique on all systems
+RAND_SECRET=$(openssl rand -base64 40 | sed 's/\//\\\//g')
+sed -i -e s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/
/usr/share/cobbler/web/settings.py
+
+
%description -n cobbler-web
Web interface for Cobbler that allows visiting http://server/cobbler_web to
configure the install server.
%files -n cobbler-web
-%if 0%{suse_version}
-%defattr(-,wwwrun,www)
-%else
-%defattr(-,apache,apache)
-%endif
+%defattr(-,%{apache_user},%{apache_group})
%dir /usr/share/cobbler/web
/usr/share/cobbler/web/*
%if 0%{?suse_version} = 1030
@@ -482,9 +487,9 @@
%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
%endif
%dir /var/lib/cobbler/webui_sessions
-%dir /srv/www/cobbler_webui_content
-%dir /srv/www/logs
-/srv/www/cobbler_webui_content/*
+%dir /%{www_path}/www/cobbler_webui_content
+%dir /%{www_path}/www/logs
+/%{www_path}/www/cobbler_webui_content/*
%doc AUTHORS COPYING CHANGELOG README
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail:
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2012-03-30 14:18:35
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler, Maintainer is u...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-02-21
12:16:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-03-30
14:19:01.0 +0200
@@ -1,0 +2,8 @@
+Tue Mar 27 10:50:05 UTC 2012 - ch...@computersalat.de
+
+- update to 2.2.2
+ * please see CHANGELOG for more info
+- remove obsolete virt-auto-boot patch
+- rebase patches
+
+---
Old:
cobbler-2.2.1.tar.gz
virt-auto-boot.diff
New:
cobbler-2.2.2.tar.bz2
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.LZ56Xh/_old 2012-03-30 14:19:05.0 +0200
+++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.0 +0200
@@ -23,16 +23,15 @@
Summary: Boot server configurator
Name: cobbler
License:GPL-2.0+
-Version: 2.2.1
+Version: 2.2.2
Release: 6
-Source0: cobbler-%{version}.tar.gz
+Source0: cobbler-%{version}.tar.bz2
Source1: vendor-files.tar.bz2
Patch0: fix-initscript.dif
Patch1: suse_config.diff
Patch2: cobbler_web_config.diff
Patch13: users_patch.diff
Patch14: setup_py.diff
-Patch15: virt-auto-boot.diff
Patch20: fix_suse_import.diff
Group: Applications/System
@@ -124,7 +123,6 @@
%endif
%patch13
%patch14
-%patch15 -p1
%patch20
mv vendor-files/cobbler.1.gz docs
++ cobbler-2.2.1.tar.gz - cobbler-2.2.2.tar.bz2 ++
16456 lines of diff (skipped)
++ cobbler_web_config.diff ++
--- /var/tmp/diff_new_pack.LZ56Xh/_old 2012-03-30 14:19:05.0 +0200
+++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.0 +0200
@@ -1,6 +1,8 @@
config/cobbler_web.conf
-+++ config/cobbler_web.conf2011/04/07 09:51:48
-@@ -8,6 +8,20 @@
+Index: config/cobbler_web.conf
+===
+--- config/cobbler_web.conf.orig
config/cobbler_web.conf
+@@ -8,6 +8,20 @@ SetEnvIf Request_URI .*/op/events/user/
# Log only what remains
CustomLog logs/access_log combined env=!dontlog
++ fix-initscript.dif ++
--- /var/tmp/diff_new_pack.LZ56Xh/_old 2012-03-30 14:19:05.0 +0200
+++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.0 +0200
@@ -1,5 +1,7 @@
config/cobblerd
-+++ config/cobblerd2012/02/13 16:50:58
+Index: config/cobblerd
+===
+--- config/cobblerd.orig
config/cobblerd
@@ -7,8 +7,9 @@
### BEGIN INIT INFO
@@ -12,7 +14,7 @@
# Default-Stop: 0 1 2 6
# Short-Description: daemon for libvirt virtualization API
# Description: This is a daemon that a provides remote cobbler API
-@@ -50,8 +51,26 @@
+@@ -50,8 +51,26 @@ RETVAL=0
start() {
echo -n $Starting cobbler daemon:
@@ -40,7 +42,7 @@
rc_status -v
elif [ -e $DEBIAN_VERSION ]; then
if [ -f $LOCKFILE ]; then
-@@ -66,7 +85,7 @@
+@@ -66,7 +85,7 @@ start() {
fi
RETVAL=$?
echo
@@ -49,7 +51,7 @@
return $RETVAL
}
-@@ -91,7 +110,9 @@
+@@ -91,7 +110,9 @@ stop() {
RETVAL=$?
echo
if [ $RETVAL -eq 0 ]; then
@@ -60,7 +62,7 @@
rm -f /var/run/$SERVICE.pid
fi
}
-@@ -111,6 +132,7 @@
+@@ -111,6 +132,7 @@ case $1 in
echo -n Checking for service cobblerd
checkproc /usr/bin/cobblerd
rc_status -v
@@ -68,7 +70,7 @@
elif [ -f $DEBIAN_VERSION ]; then
if [ -f $LOCKFILE ]; then
RETVAL=0
-@@ -125,7 +147,7 @@
+@@ -125,7 +147,7 @@ case $1 in
fi
;;
condrestart)
++ fix_suse_import.diff ++
--- /var/tmp/diff_new_pack.LZ56Xh/_old 2012-03-30 14:19:05.0 +0200
+++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.0 +0200
@@ -1,6 +1,8 @@
cobbler/modules/manage_import_suse.py
-+++ cobbler/modules/manage_import_suse.py 2011/12/22 12:22:40
-@@ -476,7 +476,7 @@
+Index: cobbler/modules/manage_import_suse.py
+===
+--- cobbler/modules/manage_import_suse.py.orig
cobbler/modules/manage_import_suse.py
+@@ -352,7 +352,7 @@ class ImportSuseManager:
distro.set_initrd(initrd)
distro.set_arch(pxe_arch)
distro.set_breed(self.breed)
++ setup_py.diff ++
--- /var/tmp/diff_new_pack.LZ56Xh/_old 2012-03-30 14:19:05.0 +0200
+++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory checked
in at 2012-02-21 12:16:37
Comparing /work/SRC/openSUSE:Factory/cobbler (Old)
and /work/SRC/openSUSE:Factory/.cobbler.new (New)
Package is cobbler, Maintainer is u...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2011-10-26
15:34:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-02-21
12:16:47.0 +0100
@@ -1,0 +2,15 @@
+Mon Feb 13 17:52:57 CET 2012 - u...@suse.de
+
+- fixed return value of rccobblerd status
+
+---
+Mon Feb 13 10:45:06 UTC 2012 - co...@suse.com
+
+- patch license to follow spdx.org standard
+
+---
+Thu Dec 22 13:23:01 CET 2011 - u...@suse.de
+
+- fix install=... kernel option when you import a SUSE distro
+
+---
New:
fix_suse_import.diff
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.X26IHi/_old 2012-02-21 12:16:48.0 +0100
+++ /var/tmp/diff_new_pack.X26IHi/_new 2012-02-21 12:16:48.0 +0100
@@ -22,7 +22,7 @@
%define _binaries_in_noarch_packages_terminate_build 0
Summary: Boot server configurator
Name: cobbler
-License: GPLv2+
+License:GPL-2.0+
Version: 2.2.1
Release: 6
Source0: cobbler-%{version}.tar.gz
@@ -33,6 +33,7 @@
Patch13: users_patch.diff
Patch14: setup_py.diff
Patch15: virt-auto-boot.diff
+Patch20: fix_suse_import.diff
Group: Applications/System
Requires: python = 2.3
@@ -124,6 +125,7 @@
%patch13
%patch14
%patch15 -p1
+%patch20
mv vendor-files/cobbler.1.gz docs
%build
++ fix-initscript.dif ++
--- /var/tmp/diff_new_pack.X26IHi/_old 2012-02-21 12:16:48.0 +0100
+++ /var/tmp/diff_new_pack.X26IHi/_new 2012-02-21 12:16:48.0 +0100
@@ -1,5 +1,5 @@
--- config/cobblerd
-+++ config/cobblerd2011/10/07 14:35:57
config/cobblerd2012/02/13 16:50:58
@@ -7,8 +7,9 @@
### BEGIN INIT INFO
@@ -60,7 +60,15 @@
rm -f /var/run/$SERVICE.pid
fi
}
-@@ -125,7 +146,7 @@
+@@ -111,6 +132,7 @@
+ echo -n Checking for service cobblerd
+ checkproc /usr/bin/cobblerd
+ rc_status -v
++RETVAL=$?
+ elif [ -f $DEBIAN_VERSION ]; then
+ if [ -f $LOCKFILE ]; then
+ RETVAL=0
+@@ -125,7 +147,7 @@
fi
;;
condrestart)
++ fix_suse_import.diff ++
--- cobbler/modules/manage_import_suse.py
+++ cobbler/modules/manage_import_suse.py 2011/12/22 12:22:40
@@ -476,7 +476,7 @@
distro.set_initrd(initrd)
distro.set_arch(pxe_arch)
distro.set_breed(self.breed)
-
distro.set_kernel_options(install=http://@@http_server@@/cblr/links/%s; %
(name))
+distro.set_kernel_options(install=http://%s/cblr/links/%s; %
(self.settings.server, name))
# If a version was supplied on command line, we set it now
if self.os_version:
distro.set_os_version(self.os_version)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cobbler for openSUSE:Factory
Hello community, here is the log from the commit of package cobbler for openSUSE:Factory checked in at 2011-10-26 15:21:24 Comparing /work/SRC/openSUSE:Factory/cobbler (Old) and /work/SRC/openSUSE:Factory/.cobbler.new (New) Package is cobbler, Maintainer is u...@suse.com Changes: --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2011-10-11 16:52:13.0 +0200 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2011-10-26 15:34:37.0 +0200 @@ -1,0 +2,5 @@ +Wed Oct 26 14:15:24 CEST 2011 - u...@suse.de + +- virtual machines autostart on boot fixed + +--- New: virt-auto-boot.diff Other differences: -- ++ cobbler.spec ++ --- /var/tmp/diff_new_pack.34GM6s/_old 2011-10-26 15:34:44.0 +0200 +++ /var/tmp/diff_new_pack.34GM6s/_new 2011-10-26 15:34:44.0 +0200 @@ -32,6 +32,7 @@ Patch2: cobbler_web_config.diff Patch13: users_patch.diff Patch14: setup_py.diff +Patch15: virt-auto-boot.diff Group: Applications/System Requires: python = 2.3 @@ -122,6 +123,7 @@ %endif %patch13 %patch14 +%patch15 -p1 mv vendor-files/cobbler.1.gz docs %build ++ virt-auto-boot.diff ++ diff --git a/koan/qcreate.py b/koan/qcreate.py index beab3fa..1116b19 100755 --- a/koan/qcreate.py +++ b/koan/qcreate.py @@ -158,6 +158,7 @@ def start_install(name=None, guest.set_name(name) guest.set_memory(ram) guest.set_vcpus(vcpus) +guest.set_autostart(virt_auto_boot) # for KVM, we actually can't disable this, since it's the only # console it has other than SDL guest.set_graphics(vnc) diff --git a/koan/xencreate.py b/koan/xencreate.py index b86c2ff..2228d69 100755 --- a/koan/xencreate.py +++ b/koan/xencreate.py @@ -113,6 +113,7 @@ def start_install(name=None, guest.set_name(name) guest.set_memory(ram) guest.set_vcpus(vcpus) +guest.set_autostart(virt_auto_boot) if not no_gfx: guest.set_graphics(vnc) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory
checked in at Tue Oct 11 16:52:05 CEST 2011.
--- openSUSE:Factory/cobbler/cobbler.changes2011-09-23 01:53:45.0
+0200
+++ /mounts/work_src_done/STABLE/cobbler/cobbler.changes2011-10-07
16:47:07.0 +0200
@@ -1,0 +2,24 @@
+Fri Oct 7 16:44:05 CEST 2011 - u...@suse.de
+
+- Import modules, which allowed easy integration of...
+- Ubuntu and Debian support again!
+- Better support for SuSE
+- Support for FreeBSD
+- Support for ESX 4+/ESXi
+- Integration with the python TFTP server pytftpd
+- fetchable files and boot files support for distros that need to
+ get more files from the TFTP server
+- Faster sync using link cache
+- Support for EFI grub booting
+- Support for bridged interfaces
+- WSGI instead of mod_python for the web interface.
+- Lots of Web UI improvements
+- A lot more I'm sure I missed when going through the change log
+- version 2.2.1
+
+---
+Sat Sep 17 23:18:43 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+
+---
calling whatdependson for head-i586
Old:
0001-added-autoyast-.-parameter-to-the-ISO-building-code-.patch
0001-render-the-cheetah-template-before-passing-the-XML-t.patch
0002-calculate-meta-data-in-the-XML-file-without-cheetah-.patch
added-SUSE-breed-to-import-webui.diff
build_iso_for_suse.diff
cobbler-2.1.0.tar.gz
handle-autoyast-XML-files.diff
import_suse_support.diff
koan_install_tree_fix_for_suse.diff
suse_tftp_root.diff
upstream_patch_tainted_files.diff
New:
cobbler-2.2.1.tar.gz
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.O67SFV/_old 2011-10-11 16:52:02.0 +0200
+++ /var/tmp/diff_new_pack.O67SFV/_new 2011-10-11 16:52:02.0 +0200
@@ -15,19 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%{!?python_sitelib: %global python_sitelib %(%{__python} -c from
distutils.sysconfig import get_python_lib; print(get_python_lib()))}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c from
distutils.sysconfig import get_python_lib; print(get_python_lib(1)))}
#%{!?python_sitelib: %define python_sitelib %(%{__python} -c from
distutils.sysconfig import get_python_lib; print get_python_lib())}
%define _binaries_in_noarch_packages_terminate_build 0
Summary:Boot server configurator
-
Name: cobbler
License:GPLv2+
-AutoReq:no
-Version:2.1.0
-Release:8
+Version: 2.2.1
+Release: 6
Source0:cobbler-%{version}.tar.gz
Source1:vendor-files.tar.bz2
Patch0: fix-initscript.dif
@@ -35,17 +32,6 @@
Patch2: cobbler_web_config.diff
Patch13:users_patch.diff
Patch14:setup_py.diff
-Patch15:import_suse_support.diff
-Patch16:suse_tftp_root.diff
-Patch17:koan_install_tree_fix_for_suse.diff
-Patch18:handle-autoyast-XML-files.diff
-Patch19:build_iso_for_suse.diff
-Patch20:added-SUSE-breed-to-import-webui.diff
-Patch21:upstream_patch_tainted_files.diff
-Patch22:0001-render-the-cheetah-template-before-passing-the-XML-t.patch
-Patch23:0002-calculate-meta-data-in-the-XML-file-without-cheetah-.patch
-Patch24:0001-added-autoyast-.-parameter-to-the-ISO-building-code-.patch
-#Patch100: importer.diff
Group: Applications/System
Requires: python = 2.3
@@ -109,11 +95,12 @@
BuildRequires: python-yaml
BuildRequires: python-cheetah
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
#BuildArch: noarch
Url:http://fedorahosted.org/cobbler
%description
+
Cobbler is a network install server. Cobbler
supports PXE, virtualized installs, and
reinstalling existing Linux machines. The last two
@@ -135,17 +122,6 @@
%endif
%patch13
%patch14
-%patch15 -p1
-%patch16
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-#%patch100
mv vendor-files/cobbler.1.gz docs
%build
@@ -243,9 +219,6 @@
%endif
-%clean
-test x$RPM_BUILD_ROOT != x rm -rf $RPM_BUILD_ROOT
-
%files
%if 0%{suse_version} 1120
@@ -334,8 +307,15 @@
%config(noreplace) /etc/cobbler/ldap/ldap_authconfig.template
%config(noreplace) /etc/cobbler/version
+# new in 2.2.1
+%dir /etc/cobbler/iso
+%config(noreplace) /etc/cobbler/mongodb.conf
+%config(noreplace) /etc/cobbler/iso/buildiso.template
+%config(noreplace) /etc/cobbler/cobblerd.service
+
%{_sbindir}/tftpd.py
+
%dir %{python_sitelib}/cobbler
%dir %{python_sitelib}/cobbler/modules
%{python_sitelib}/cobbler/*.py*
@@ -415,7
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory
checked in at Thu Sep 1 16:05:41 CEST 2011.
--- cobbler/cobbler.changes 2011-06-10 16:40:34.0 +0200
+++ /mounts/work_src_done/STABLE/cobbler/cobbler.changes2011-08-31
16:46:53.0 +0200
@@ -1,0 +2,6 @@
+Wed Aug 31 16:45:43 CEST 2011 - u...@suse.de
+
+- LOCKFILE usage removed on openSUSE
+ (bnc#714618)
+
+---
calling whatdependson for head-i586
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.beQyuH/_old 2011-09-01 16:05:06.0 +0200
+++ /var/tmp/diff_new_pack.beQyuH/_new 2011-09-01 16:05:06.0 +0200
@@ -27,7 +27,7 @@
License:GPLv2+
AutoReq:no
Version:2.1.0
-Release:1
+Release:8
Source0:cobbler-%{version}.tar.gz
Source1:vendor-files.tar.bz2
Patch0: fix-initscript.dif
++ fix-initscript.dif ++
--- /var/tmp/diff_new_pack.beQyuH/_old 2011-09-01 16:05:07.0 +0200
+++ /var/tmp/diff_new_pack.beQyuH/_new 2011-09-01 16:05:07.0 +0200
@@ -1,5 +1,5 @@
--- config/cobblerd
-+++ config/cobblerd2011/04/07 10:10:55
config/cobblerd2011/08/31 14:44:00
@@ -7,9 +7,9 @@
### BEGIN INIT INFO
@@ -41,3 +41,32 @@
rc_status -v
elif [ -e $DEBIAN_VERSION ]; then
if [ -f $LOCKFILE ]; then
+@@ -67,7 +85,7 @@
+ fi
+ RETVAL=$?
+ echo
+-[ $RETVAL -eq 0 ] touch $LOCKFILE
++[ $RETVAL -eq 0 ] [ -f $DEBIAN_VERSION ] touch $LOCKFILE
+ return $RETVAL
+ }
+
+@@ -92,7 +110,9 @@
+ RETVAL=$?
+ echo
+ if [ $RETVAL -eq 0 ]; then
+-rm -f $LOCKFILE
++if [ -f $DEBIAN_VERSION ]; then
++rm -f $LOCKFILE
++fi
+ rm -f /var/run/$SERVICE.pid
+ fi
+ }
+@@ -126,7 +146,7 @@
+ fi
+ ;;
+ condrestart)
+-[ -f $LOCKFILE ] restart || :
++[ -f $DEBIAN_VERSION ] [ -f $LOCKFILE ] restart || :
+ ;;
+ reload)
+ echo can't reload configuration, you have to restart it
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory
checked in at Thu Aug 4 10:24:01 CEST 2011.
--- cobbler/cobbler.changes 2011-02-28 18:25:30.0 +0100
+++ /mounts/work_src_done/STABLE/cobbler/cobbler.changes2011-06-10
16:40:34.0 +0200
@@ -1,0 +2,86 @@
+Fri Jun 10 16:38:53 CEST 2011 - u...@suse.de
+
+- fixed the handling of cheetah template code in
+ AutoYaST XML files
+ (thanks to Jörgen Maas for pointing me to the bug)
+- fixed parameter list in build-ISO code
+ (thanks to Jörgen Maas for the patch)
+
+---
+Thu Apr 7 17:46:03 CEST 2011 - u...@suse.de
+
+- added a backported upstream patch for tainted file error
+ message
+
+---
+Thu Apr 7 13:30:16 CEST 2011 - u...@suse.de
+
+- fix hostname in install=...
+
+---
+Thu Apr 7 12:11:35 CEST 2011 - u...@suse.de
+
+- fix init-script
+
+---
+Thu Apr 7 10:34:06 CEST 2011 - u...@suse.de
+
+- fixed apache config typo
+
+---
+Wed Apr 6 15:39:59 CEST 2011 - u...@suse.de
+
+- added SUSE breed to import-webui
+
+---
+Wed Apr 6 12:31:29 CEST 2011 - u...@suse.de
+
+- build ISO for SUSE fixed
+
+---
+Wed Apr 6 12:25:04 CEST 2011 - u...@suse.de
+
+- added patch for autoyast XML files and cobbler triggers
+
+---
+Wed Apr 6 10:52:03 CEST 2011 - u...@suse.de
+
+- added patch to fix koan with SUSE dists
+
+---
+Tue Apr 5 15:29:57 CEST 2011 - u...@suse.de
+
+- fixed tftp-root path on SUSE
+
+---
+Tue Apr 5 13:33:26 CEST 2011 - u...@suse.de
+
+- added support for importing a SUSE distribution
+
+---
+Mon Apr 4 14:11:29 CEST 2011 - u...@suse.de
+
+- fixed the start of cobblerd when [tftpd] section is missing
+ in the modules.conf
+
+---
+Mon Apr 4 10:46:50 CEST 2011 - u...@suse.de
+
+- version from 2.0.10 to 2.1.0
+
+---
+Wed Mar 23 14:16:58 CET 2011 - u...@suse.de
+
+- changed logfiles to root:root (bnc#678433)
+
+---
+Tue Mar 22 13:47:40 CET 2011 - u...@suse.de
+
+- changed permissions in /var/log/ to root:www (bnc#678433)
+
+---
+Fri Mar 4 14:08:33 CET 2011 - u...@suse.de
+
+- patches cleaned up
+
+---
calling whatdependson for head-i586
Old:
autoyast1.diff
bugfixes.dif
build_iso.diff
cheetah_class_fix.diff
cobbler-2.0.10.tar.gz
fhs.diff
fhs_pathes_lazy_patch.diff
koan-install_tree.diff
lazy_suse_sync.diff
users_lazy_patch.diff
webui_vhost.diff
New:
0001-added-autoyast-.-parameter-to-the-ISO-building-code-.patch
0001-render-the-cheetah-template-before-passing-the-XML-t.patch
0002-calculate-meta-data-in-the-XML-file-without-cheetah-.patch
added-SUSE-breed-to-import-webui.diff
build_iso_for_suse.diff
cobbler-2.1.0.tar.gz
cobbler_web_config.diff
handle-autoyast-XML-files.diff
import_suse_support.diff
koan_install_tree_fix_for_suse.diff
suse_config.diff
suse_tftp_root.diff
upstream_patch_tainted_files.diff
users_patch.diff
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.MRqPtW/_old 2011-08-04 10:21:04.0 +0200
+++ /var/tmp/diff_new_pack.MRqPtW/_new 2011-08-04 10:21:04.0 +0200
@@ -26,22 +26,25 @@
Name: cobbler
License:GPLv2+
AutoReq:no
-Version:2.0.10
-Release:18
+Version:2.1.0
+Release:1
Source0:cobbler-%{version}.tar.gz
Source1:vendor-files.tar.bz2
Patch0: fix-initscript.dif
-Patch1: bugfixes.dif
-Patch10:fhs.diff
-Patch12:fhs_pathes_lazy_patch.diff
-Patch13:users_lazy_patch.diff
-Patch14:webui_vhost.diff
-Patch15:autoyast1.diff
-Patch16:build_iso.diff
-Patch17:koan-install_tree.diff
-Patch18:setup_py.diff
-Patch19:cheetah_class_fix.diff
-Patch20:lazy_suse_sync.diff
+Patch1: suse_config.diff
+Patch2: cobbler_web_config.diff
+Patch13:users_patch.diff
+Patch14:setup_py.diff
commit cobbler for openSUSE:Factory
Hello community,
here is the log from the commit of package cobbler for openSUSE:Factory
checked in at Tue Mar 1 10:05:38 CET 2011.
--- cobbler/cobbler.changes 2011-02-17 17:25:32.0 +0100
+++ /mounts/work_src_done/STABLE/cobbler/cobbler.changes2011-02-28
18:25:30.0 +0100
@@ -1,0 +2,5 @@
+Mon Feb 28 18:23:38 CET 2011 - u...@suse.de
+
+- fixed a crash because xml.dom.ext is not available on 11.4
+
+---
calling whatdependson for head-i586
Other differences:
--
++ cobbler.spec ++
--- /var/tmp/diff_new_pack.r6O713/_old 2011-03-01 10:04:55.0 +0100
+++ /var/tmp/diff_new_pack.r6O713/_new 2011-03-01 10:04:55.0 +0100
@@ -27,7 +27,7 @@
License:GPLv2+
AutoReq:no
Version:2.0.10
-Release:17
+Release:18
Source0:cobbler-%{version}.tar.gz
Source1:vendor-files.tar.bz2
Patch0: fix-initscript.dif
++ autoyast1.diff ++
--- /var/tmp/diff_new_pack.r6O713/_old 2011-03-01 10:04:55.0 +0100
+++ /var/tmp/diff_new_pack.r6O713/_new 2011-03-01 10:04:55.0 +0100
@@ -5,7 +5,7 @@
from utils import _
+import xml.dom.minidom
-+import xml.dom.ext
++#import xml.dom.ext
+from StringIO import StringIO
class KickGen:
@@ -99,9 +99,9 @@
+self.addAutoYaSTScript( document, pre-scripts, runpre % ( srv,
what, name ) )
+self.addAutoYaSTScript( document, init-scripts, runpost % (
srv, what, name ) )
+
-+raw_result = StringIO();
-+xml.dom.ext.PrettyPrint(document,raw_result)
-+return raw_result.getvalue()
++#raw_result = StringIO();
++return document.toprettyxml()
++#return raw_result.getvalue()
+
+
def generate_kickstart_signal(self, is_pre=0, profile=None, system=None):
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
