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.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2013-04-12
20:23:27.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.J6kNlr/_new 2013-04-12 20:25:15.000000000 +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
/sbin/chkconfig --add cobblerd
@@ -209,14 +212,25 @@
#/usr/bin/cobbler reserialize
/sbin/service cobblerd condrestart
fi
+%if 0%{?suse_version} >= 1230
+%service_add_post cobblerd.service
+%endif
%if 0%{?suse_version}
%preun
+%if 0%{?suse_version} >= 1230
+%service_del_preun cobblerd.service
+%else
%stop_on_removal cobblerd
+%endif
%postun
+%if 0%{?suse_version} >= 1230
+%service_del_postun cobblerd.service
+%else
%restart_on_update cobblerd
+%endif
%else
@@ -322,6 +336,10 @@
%config(noreplace) /etc/cobbler/iso/buildiso.template
%config(noreplace) /etc/cobbler/cobblerd.service
+# new in 2.2.3
+%config(noreplace) /etc/cobbler/distro_signatures.json
+%config(noreplace) /etc/cobbler/import_rsync_whitelist
+
%{_sbindir}/tftpd.py
@@ -346,6 +364,7 @@
%defattr(755,root,root)
%dir /var/lib/cobbler
+%config(noreplace) /var/lib/cobbler/distro_signatures.json
%dir /var/lib/cobbler/config/
%dir /var/lib/cobbler/config/distros.d/
%dir /var/lib/cobbler/config/profiles.d/
@@ -388,6 +407,9 @@
%dir /var/lib/cobbler/triggers/install/pre
%dir /var/lib/cobbler/triggers/install/post
%dir /var/lib/cobbler/snippets/
+%dir /var/lib/cobbler/kickstarts/
+%config(noreplace) /var/lib/cobbler/kickstarts/esxi4-ks.cfg
+%config(noreplace) /var/lib/cobbler/kickstarts/esxi5-ks.cfg
%defattr(664,root,root)
%config(noreplace) /etc/cobbler/settings
@@ -400,8 +422,13 @@
%defattr(-,root,root)
%if 0%{?suse_version} >= 1110
-%{python_sitelib}/cobbler-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/cobbler-*-py%{py_ver}.egg-info
%endif
+
+%dir /usr/share/augeas
+%dir /usr/share/augeas/lenses
+/usr/share/augeas/lenses/cobblersettings.aug
+
%doc AUTHORS CHANGELOG README COPYING
%package -n koan
@@ -439,6 +466,7 @@
#%{python_sitelib}/koan*.egg-info
#%endif
%{_bindir}/koan
+%{_bindir}/ovz-install
%{_bindir}/cobbler-register
%dir %{python_sitelib}/koan
%{python_sitelib}/koan/*.py*
@@ -482,7 +510,7 @@
%dir /usr/share/cobbler/web
/usr/share/cobbler/web/*
%if 0%{?suse_version} >= 1010
-%config(noreplace) /etc/apache2/vhosts.d/cobbler_web.conf
+%config(noreplace) /etc/apache2/conf.d/cobbler_web.conf
%else
%config(noreplace) /etc/httpd/conf.d/cobbler_web.conf
%endif
++++++ cobbler-2.2.2.tar.bz2 -> cobbler-2.2.3.tar.bz2 ++++++
++++ 34953 lines of diff (skipped)
++++++ cobbler_web_config.diff ++++++
--- /var/tmp/diff_new_pack.J6kNlr/_old 2013-04-12 20:25:15.000000000 +0200
+++ /var/tmp/diff_new_pack.J6kNlr/_new 2013-04-12 20:25:15.000000000 +0200
@@ -2,9 +2,9 @@
===================================================================
--- 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
+@@ -7,4 +7,18 @@
+ RewriteCond %{REQUEST_URI} ^/cobbler_web
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+<Directory "/usr/share/cobbler/web/">
+ Options Indexes MultiViews
@@ -21,5 +21,4 @@
+</Directory>
+
WSGIScriptAlias /cobbler_web /usr/share/cobbler/web/cobbler.wsgi
-
- </VirtualHost>
+
++++++ suse_config.diff ++++++
--- /var/tmp/diff_new_pack.J6kNlr/_old 2013-04-12 20:25:15.000000000 +0200
+++ /var/tmp/diff_new_pack.J6kNlr/_new 2013-04-12 20:25:15.000000000 +0200
@@ -38,7 +38,7 @@
===================================================================
--- config/settings.orig
+++ config/settings
-@@ -346,7 +346,7 @@ virt_auto_boot: 1
+@@ -401,7 +401,7 @@ virt_auto_boot: 1
# cobbler's web directory. Don't change this setting -- see the
# Wiki on "relocating your cobbler install" if your /var partition
# is not large enough.
++++++ suse_newver.patch ++++++
--- config/distro_signatures.json
+++ config/distro_signatures.json
@@ -263,6 +263,38 @@
"kernel_options_post":"",
"boot_files":[]
},
+ "opensuse12.3": {
+ "signatures":["suse"],
+ "version_file":"openSUSE-release-12.3-(.*).rpm",
+ "version_file_regex":null,
+ "kernel_arch":"kernel-(.*)\\.rpm",
+ "kernel_arch_regex":null,
+ "supported_arches":["i386","i586","x86_64"],
+ "supported_repo_breeds":["yum"],
+ "kernel_file":"(linux|vmlinuz(.*))",
+ "initrd_file":"initrd(.*)",
+ "isolinux_ok":false,
+ "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
+ "kernel_options":"",
+ "kernel_options_post":"",
+ "boot_files":[]
+ },
+ "opensuse13.1": {
+ "signatures":["suse"],
+ "version_file":"openSUSE-release-13.1-(.*).rpm",
+ "version_file_regex":null,
+ "kernel_arch":"kernel-(.*)\\.rpm",
+ "kernel_arch_regex":null,
+ "supported_arches":["i386","i586","x86_64"],
+ "supported_repo_breeds":["yum"],
+ "kernel_file":"(linux|vmlinuz(.*))",
+ "initrd_file":"initrd(.*)",
+ "isolinux_ok":false,
+ "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
+ "kernel_options":"",
+ "kernel_options_post":"",
+ "boot_files":[]
+ },
"sles11": {
"signatures":["suse"],
"version_file":"sles-release-11-(.*).rpm",
@@ -298,6 +330,22 @@
"sles11sp2": {
"signatures":["suse"],
"version_file":"sles-release-11.2-(.*).rpm",
+ "version_file_regex":null,
+ "kernel_arch":"kernel-(.*)\\.rpm",
+ "kernel_arch_regex":null,
+ "supported_arches":["i386","i586","x86_64","ppc64"],
+ "supported_repo_breeds":["yum"],
+ "kernel_file":"linux[64.gz]?",
+ "initrd_file":"initrd[64]?",
+ "isolinux_ok":false,
+ "default_kickstart":"/var/lib/cobbler/kickstarts/sample_autoyast.xml",
+ "kernel_options":"",
+ "kernel_options_post":"",
+ "boot_files":[]
+ },
+ "sles11sp3": {
+ "signatures":["suse"],
+ "version_file":"sles-release-11.3-(.*).rpm",
"version_file_regex":null,
"kernel_arch":"kernel-(.*)\\.rpm",
"kernel_arch_regex":null,
--- newtests/cli/imports/test_suse/suse_import_test.py
+++ newtests/cli/imports/test_suse/suse_import_test.py
@@ -18,9 +18,16 @@
{"name":"opensuse12.1-x86_64", "desc":"OpenSuSE 12.1 x86_64",
"path":"/vagrant/distros/opensuse12.1_x86_64"},
{"name":"opensuse12.2-i386", "desc":"OpenSuSE 12.2 i586",
"path":"/vagrant/distros/opensuse12.2_i586"},
{"name":"opensuse12.2-x86_64", "desc":"OpenSuSE 12.2 x86_64",
"path":"/vagrant/distros/opensuse12.2_x86_64"},
+ {"name":"opensuse12.3-i386", "desc":"OpenSuSE 12.3 i586",
"path":"/vagrant/distros/opensuse12.3_i586"},
+ {"name":"opensuse12.3-x86_64", "desc":"OpenSuSE 12.3 x86_64",
"path":"/vagrant/distros/opensuse12.3_x86_64"},
+ {"name":"opensuse13.1-i386", "desc":"OpenSuSE 13.1 i586",
"path":"/vagrant/distros/opensuse13.1_i586"},
+ {"name":"opensuse13.1-x86_64", "desc":"OpenSuSE 13.1 x86_64",
"path":"/vagrant/distros/opensuse13.1_x86_64"},
{"name":"sles11_sp2-i386", "desc":"SLES 11 SP2 i586",
"path":"/vagrant/distros/sles11_sp2_i586"},
{"name":"sles11_sp2-x86_64", "desc":"SLES 11 SP2 x86_64",
"path":"/vagrant/distros/sles11_sp2_x86_64"},
{"name":"sles11_sp2-ppc64", "desc":"SLES 11 SP2 ppc64",
"path":"/vagrant/distros/sles11_sp2_ppc64"},
+ {"name":"sles11_sp3-i386", "desc":"SLES 11 SP3 i586",
"path":"/vagrant/distros/sles11_sp3_i586"},
+ {"name":"sles11_sp3-x86_64", "desc":"SLES 11 SP3 x86_64",
"path":"/vagrant/distros/sles11_sp3_x86_64"},
+ {"name":"sles11_sp3-ppc64", "desc":"SLES 11 SP3 ppc64",
"path":"/vagrant/distros/sles11_sp3_ppc64"},
]
for i in range(0,len(distros)):
++++++ users_patch.diff ++++++
--- /var/tmp/diff_new_pack.J6kNlr/_old 2013-04-12 20:25:15.000000000 +0200
+++ /var/tmp/diff_new_pack.J6kNlr/_new 2013-04-12 20:25:15.000000000 +0200
@@ -20,7 +20,7 @@
===================================================================
--- cobbler/cobblerd.py.orig
+++ cobbler/cobblerd.py
-@@ -67,6 +67,8 @@ def regen_ss_file():
+@@ -64,6 +64,8 @@
http_user = "apache"
if utils.check_dist() in [ "debian", "ubuntu" ]:
http_user = "www-data"
@@ -28,4 +28,5 @@
+ http_user = "wwwrun"
utils.os_system("chown %s /var/lib/cobbler/web.ss"%http_user )
else:
- fd = open(ssfile,"w+")
+ fd = os.open(ssfile,os.O_CREAT|os.O_RDWR,0600)
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
