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 "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cobbler/cobbler.changes 2012-02-21 12:16:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cobbler.new/cobbler.changes 2012-03-30 14:19:01.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 27 10:50:05 UTC 2012 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.000000000 +0200 @@ -1,6 +1,8 @@ ---- config/cobbler_web.conf -+++ config/cobbler_web.conf 2011/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.000000000 +0200 +++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.000000000 +0200 @@ -1,5 +1,7 @@ ---- config/cobblerd -+++ config/cobblerd 2012/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.000000000 +0200 +++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.000000000 +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.000000000 +0200 +++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.000000000 +0200 @@ -1,6 +1,8 @@ ---- setup.py -+++ setup.py 2011/04/04 10:13:41 -@@ -124,12 +124,15 @@ +Index: setup.py +=================================================================== +--- setup.py.orig ++++ setup.py +@@ -124,12 +124,15 @@ if __name__ == "__main__": if os.path.exists("/etc/SuSE-release"): webconfig = "/etc/apache2/conf.d" @@ -16,7 +18,7 @@ webroot = "/var/www/" webcontent = webroot + "cobbler_webui_content/" -@@ -169,7 +172,7 @@ +@@ -169,7 +172,7 @@ if __name__ == "__main__": ("/usr/sbin", ["scripts/tftpd.py"]), ("%s" % webconfig, ["config/cobbler.conf"]), ++++++ suse_config.diff ++++++ --- /var/tmp/diff_new_pack.LZ56Xh/_old 2012-03-30 14:19:05.000000000 +0200 +++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.000000000 +0200 @@ -1,5 +1,7 @@ ---- config/cobbler.conf -+++ config/cobbler.conf 2011/10/07 14:38:24 +Index: config/cobbler.conf +=================================================================== +--- config/cobbler.conf.orig ++++ config/cobbler.conf @@ -1,15 +1,15 @@ # This configuration file allows cobbler data # to be accessed over HTTP. @@ -23,7 +25,7 @@ Options Indexes FollowSymLinks Order allow,deny Allow from all -@@ -26,7 +26,7 @@ +@@ -26,7 +26,7 @@ BrowserMatch "MSIE" AuthDigestEnableQuer # and is visited at http://.../cobbler_web not this URL. # this is only a pointer to the new page. @@ -32,9 +34,11 @@ Options Indexes FollowSymLinks Order allow,deny Allow from all ---- config/settings -+++ config/settings 2011/10/07 14:38:24 -@@ -342,7 +342,7 @@ +Index: config/settings +=================================================================== +--- config/settings.orig ++++ config/settings +@@ -346,7 +346,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. ++++++ users_patch.diff ++++++ --- /var/tmp/diff_new_pack.LZ56Xh/_old 2012-03-30 14:19:05.000000000 +0200 +++ /var/tmp/diff_new_pack.LZ56Xh/_new 2012-03-30 14:19:05.000000000 +0200 @@ -1,6 +1,8 @@ ---- cobbler/action_reposync.py -+++ cobbler/action_reposync.py 2011/04/04 09:26:39 -@@ -560,7 +560,12 @@ +Index: cobbler/action_reposync.py +=================================================================== +--- cobbler/action_reposync.py.orig ++++ cobbler/action_reposync.py +@@ -560,7 +560,12 @@ class RepoSync: a safeguard. """ # all_path = os.path.join(repo_path, "*") @@ -14,9 +16,11 @@ utils.subprocess_call(self.logger, cmd1) cmd2 = "chmod -R 755 %s" % repo_path ---- cobbler/cobblerd.py -+++ cobbler/cobblerd.py 2011/04/04 09:28:26 -@@ -67,6 +67,8 @@ +Index: cobbler/cobblerd.py +=================================================================== +--- cobbler/cobblerd.py.orig ++++ cobbler/cobblerd.py +@@ -67,6 +67,8 @@ def regen_ss_file(): http_user = "apache" if utils.check_dist() in [ "debian", "ubuntu" ]: http_user = "www-data" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
