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.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2015-02-06 22:37:47.000000000 +0100
@@ -1,0 +2,86 @@
+Thu Jan 15 09:36:07 UTC 2015 - fcastelli@suse.com
+
+- Added 'fix_test_create_systems.diff': fixes the "create_systens" unit test
+
+-------------------------------------------------------------------
+Tue Jan 13 09:37:53 UTC 2015 - fcastelli@suse.com
+
+- Fix runtime dependency: ensure the yaml module is available.
+
+-------------------------------------------------------------------
+Tue Jan 13 08:51:03 UTC 2015 - fcastelli@suse.com
+
+- Install the right cobblerd.service file
+
+-------------------------------------------------------------------
+Mon Jan 12 17:07:27 UTC 2015 - fcastelli@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 - fcastelli@suse.com
+
+- Added new patch required to fix the broken unit tests:
+ * fix-broken-tests.diff
+
+-------------------------------------------------------------------
+Thu Dec 18 14:59:08 UTC 2014 - fcastelli@suse.com
+
+- Removed another no longer needed patch:
+ * fix-textmode-for-SUSE.dif
+
+-------------------------------------------------------------------
+Thu Dec 18 14:51:32 UTC 2014 - fcastelli@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 - fcastelli@suse.com
+
+- Fix the broken unit tests
+
+-------------------------------------------------------------------
+Thu Dec 11 16:34:35 UTC 2014 - mseidl@suse.de
+
+- Created sub package for unit tests
+
+-------------------------------------------------------------------
+Tue Dec 9 15:35:25 CET 2014 - mc@suse.de
+
+- use fdupes only on SUSE
+
+-------------------------------------------------------------------
+Mon Dec 8 09:27:33 UTC 2014 - dmacvicar@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 - mc@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 - mc@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.000000000 +0100
+++ /var/tmp/diff_new_pack.v2uC2B/_new 2015-02-06 22:37:48.000000000 +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}
Patch4: grubby-compat.diff
%endif
@@ -56,27 +53,30 @@
Patch9: fix-restart-paravirt-xen.dif
Patch10: disable_not_relevant_checks_bnc_828453.patch
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
-
+Patch16: fix-koan-port-guessing.dif
+# PATCH-FIX-SLE name-of-file.patch bnc#883487 dmacvicar@suse.de
+Patch18: cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch
+Patch19: fix-broken-tests.diff
+Patch20: fix_test_create_systems.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Url: http://www.cobblerd.org/
-BuildRequires: fdupes
BuildRequires: git
BuildRequires: python-cheetah
%if 0%{?suse_version}
BuildRequires: apache2
BuildRequires: atftp
BuildRequires: distribution-release
-BuildRequires: python-PyYAML
+BuildRequires: fdupes
Requires: apache2-mod_wsgi
Requires: ipmitool
+Requires: python-PyYAML
%else
-BuildRequires: PyYAML
BuildRequires: redhat-rpm-config
+Requires: PyYAML
Requires: httpd
Requires: mod_wsgi
%endif
@@ -123,7 +123,7 @@
Requires(preun): systemd-units
Requires(postun): systemd-units
%else
-%if 0%{?suse_version} >= 1230
+%if 0%{?suse_version}
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%else
@@ -148,11 +148,8 @@
%setup -q
%setup -a1
%if 0%{?suse_version}
-%patch0 -p1
-%patch1
%patch2
%endif
-%patch3
%if 0%{?suse_version}
%patch4
%endif
@@ -162,9 +159,14 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
%patch13 -p1
+%if 0%{?suse_version}
%patch14 -p1
+%endif
+%patch16 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
mv vendor-files/cobbler.1.gz docs
@@ -176,7 +178,6 @@
%{__python} 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/
-mv config/cobbler_web.conf $RPM_BUILD_ROOT/etc/%{apachedir}/conf.d/
mkdir -p $RPM_BUILD_ROOT/var/spool/koan
@@ -198,19 +199,22 @@
install -m 755 %{S:2} $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/
%endif
%if 0%{?fedora} >= 16 || 0%{?suse_version}
rm -rf $RPM_BUILD_ROOT/etc/init.d
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m0644 config/cobblerd.service $RPM_BUILD_ROOT%{_unitdir}
+mv $RPM_BUILD_ROOT%{_sysconfdir}/cobbler/cobblerd.service $RPM_BUILD_ROOT%{_unitdir}
+%endif
+%if 0%{?suse_version}
%fdupes %{buildroot}/usr
+%endif
%if 0%{?suse_version}
%pre
%service_add_pre cobblerd.service
-%endif
%post
if [ $1 -eq 1 ] ; then
@@ -401,9 +405,8 @@
/tftpboot/images
%endif
-%doc AUTHORS CHANGELOG README COPYING
+%doc AUTHORS README COPYING
%if 0%{?suse_version}
-%config /etc/apache2/vhosts.d/cobbler_web.conf
%config /etc/sysconfig/SuSEfirewall2.d/cobbler
/usr/sbin/fence_ipmitool
/usr/sbin/rccobblerd
@@ -448,7 +451,7 @@
%{_mandir}/man1/koan.1.gz
%{_mandir}/man1/cobbler-register.1.gz
%dir /var/log/koan
-%doc AUTHORS COPYING CHANGELOG README
+%doc AUTHORS COPYING README
%package -n cobbler-web
@@ -479,7 +482,7 @@
%files -n cobbler-web
%defattr(-,root,root,-)
-%doc AUTHORS COPYING CHANGELOG README
+%doc AUTHORS COPYING README
%config(noreplace) /etc/%{apachedir}/conf.d/cobbler_web.conf
%defattr(-,%{apache_user},%{apache_group},-)
/usr/share/cobbler/web
@@ -489,4 +492,20 @@
%dir /usr/share/cobbler
%endif
+%if 0%{?suse_version}
+%package -n cobbler-tests
+
+Summary: Unit tests for Cobbler
+Group: Applications/System
+Requires: cobbler
+
+%description -n cobbler-tests
+
+Unit test files from the Cobbler project
+
+%files -n cobbler-tests
+%defattr(-,root,root,-)
+/usr/share/cobbler/tests
+%endif #suse_version
+
%changelog
++++++ catch_cheetah_exception.patch ++++++
--- /var/tmp/diff_new_pack.v2uC2B/_old 2015-02-06 22:37:48.000000000 +0100
+++ /var/tmp/diff_new_pack.v2uC2B/_new 2015-02-06 22:37:48.000000000 +0100
@@ -2,14 +2,15 @@
===================================================================
--- 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
+@@ -24,6 +24,7 @@
+ # available at this point.
import os
import urllib
+import xmlrpclib
import cgi
- from cobbler.services import CobblerSvc
+ def application(environ, start_response):
+
@@ -76,21 +77,25 @@ def application(environ, start_response)
# Execute corresponding operation on the CobblerSvc object:
++++++ cobbler-2.4.2-reprovision-rhel-on-suse-bnc883487.patch ++++++
Index: cobbler-2.6.6/koan/app.py
===================================================================
--- cobbler-2.6.6.orig/koan/app.py
+++ cobbler-2.6.6/koan/app.py
@@ -942,7 +942,7 @@ class Koan:
(make, version) = utils.os_release()
- if (make == "centos" and version < 7) or (make == "redhat" and version < 7) or (make == "fedora" and version < 10):
+ if (make == "centos" and version < 7) or (make == "redhat" and version < 7) or (make == "fedora" and version < 10) or (make == "suse"):
# embed the initrd in the kickstart file because of libdhcp and/or pump
# needing the help due to some DHCP timeout potential in some certain
@@ -1044,7 +1044,7 @@ class Koan:
kickstart = self.safe_load(profile_data,'kickstart')
- if (make == "centos" and version < 7) or (make == "redhat" and version < 7) or (make == "fedora" and version < 10):
+ if (make == "centos" and version < 7) or (make == "redhat" and version < 7) or (make == "fedora" and version < 10) or (make == "suse"):
# embed the initrd in the kickstart file because of libdhcp and/or pump
# needing the help due to some DHCP timeout potential in some certain
++++++ cobbler-2.4.2.tar.gz -> cobbler-2.6.6.tar.gz ++++++
++++ 34222 lines of diff (skipped)
++++++ cobbler_web_config.diff ++++++
--- /var/tmp/diff_new_pack.v2uC2B/_old 2015-02-06 22:37:49.000000000 +0100
+++ /var/tmp/diff_new_pack.v2uC2B/_new 2015-02-06 22:37:49.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- config/cobbler_web.conf.orig
+++ config/cobbler_web.conf
-@@ -14,6 +14,20 @@ WSGIDaemonProcess cobbler_web display-na
+@@ -35,6 +35,20 @@ WSGIDaemonProcess cobbler_web display-na
WSGIProcessGroup cobbler_web
WSGIPassAuthorization On
++++++ disable_not_relevant_checks_bnc_828453.patch ++++++
--- /var/tmp/diff_new_pack.v2uC2B/_old 2015-02-06 22:37:49.000000000 +0100
+++ /var/tmp/diff_new_pack.v2uC2B/_new 2015-02-06 22:37:49.000000000 +0100
@@ -1,8 +1,8 @@
-Index: cobbler-2.4.0/cobbler/action_check.py
+Index: cobbler-2.6.6/cobbler/action_check.py
===================================================================
---- cobbler-2.4.0.orig/cobbler/action_check.py
-+++ cobbler-2.4.0/cobbler/action_check.py
-@@ -99,7 +99,7 @@ class BootCheck:
+--- cobbler-2.6.6.orig/cobbler/action_check.py
++++ cobbler-2.6.6/cobbler/action_check.py
+@@ -100,7 +100,7 @@ class BootCheck:
return status
def check_for_ksvalidator(self, status):
@@ -11,7 +11,7 @@
return
if not os.path.exists("/usr/bin/ksvalidator"):
-@@ -108,6 +108,9 @@ class BootCheck:
+@@ -109,6 +109,9 @@ class BootCheck:
return True
def check_for_cman(self, status):
@@ -21,7 +21,7 @@
# not doing rpm -q here to be cross-distro friendly
if not os.path.exists("/sbin/fence_ilo") and not os.path.exists("/usr/sbin/fence_ilo"):
status.append("fencing tools were not found, and are required to use the (optional) power management features. install cman or fence-agents to use them")
-@@ -163,6 +166,9 @@ class BootCheck:
+@@ -180,6 +183,9 @@ class BootCheck:
status.append(_("yum-utils need to be at least version 1.1.17 for reposync -l, current version is %s") % yum_utils_ver )
def check_debmirror(self,status):
@@ -31,7 +31,7 @@
if not os.path.exists("/usr/bin/debmirror"):
status.append(_("debmirror package is not installed, it will be required to manage debian deployments and repositories"))
if os.path.exists("/etc/debmirror.conf"):
-@@ -201,6 +207,9 @@ class BootCheck:
+@@ -218,6 +224,9 @@ class BootCheck:
status.append(_("SELinux is enabled. Please review the following wiki page for details on ensuring cobbler works correctly in your SELinux environment:\n https://github.com/cobbler/cobbler/wiki/Selinux"))
def check_for_default_password(self,status):
++++++ do_not_use_grubby_compat_when_grub2_is_in_use.diff ++++++
--- /var/tmp/diff_new_pack.v2uC2B/_old 2015-02-06 22:37:49.000000000 +0100
+++ /var/tmp/diff_new_pack.v2uC2B/_new 2015-02-06 22:37:49.000000000 +0100
@@ -1,8 +1,8 @@
-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:
+Index: cobbler-2.6.6/koan/app.py
+===================================================================
+--- cobbler-2.6.6.orig/koan/app.py
++++ cobbler-2.6.6/koan/app.py
+@@ -1029,9 +1029,12 @@ class Koan:
raise InfoException, "grub2 is not installed"
use_grub2 = True
elif (make == "suse"):
@@ -18,7 +18,7 @@
else:
if not os.path.exists("/sbin/grubby"):
raise InfoException, "grubby is not installed"
-@@ -1175,10 +1178,13 @@ class Koan:
+@@ -1179,10 +1182,13 @@ class Koan:
# Set paths for Ubuntu/Debian
# TODO: Add support for other distros when they ship grub2
++++++ fix-broken-tests.diff ++++++
diff --git a/tests/distro_test.py b/tests/distro_test.py
deleted file mode 100644
index f763f66..0000000
--- a/tests/distro_test.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""
-new_distro.py defines a set of methods designed for testing Cobbler's
-distros.
-
-Copyright 2009, Red Hat, Inc and Others
-Steve Salevan