September 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-firewall
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package yast2-firewall checked in at Mon Sep 1 02:39:33 CEST 2008. -------- --- yast2-firewall/yast2-firewall.changes 2008-07-15 19:10:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-firewall/yast2-firewall.changes 2008-08-28 14:08:29.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Aug 28 14:06:47 CEST 2008 - locilka(a)suse.cz + +- Pup-up dialogs adapted to new ButtonBox widget (FATE #303446). +- TextEntry -> InputField. +- Adapted RPM dependencies. +- 2.17.2 + +------------------------------------------------------------------- +Wed Jul 16 18:50:14 CEST 2008 - locilka(a)suse.cz + +- No more built-in YaST Firewall services... + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.17.1.tar.bz2 New: ---- yast2-firewall-2.17.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.W20958/_old 2008-09-01 02:39:23.000000000 +0200 +++ /var/tmp/diff_new_pack.W20958/_new 2008-09-01 02:39:23.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-firewall (Version 2.17.1) +# spec file for package yast2-firewall (Version 2.17.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# 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. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,17 +19,19 @@ Name: yast2-firewall -Version: 2.17.1 +Version: 2.17.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firewall-2.17.1.tar.bz2 +Source0: yast2-firewall-2.17.2.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2 >= 2.16.47 # SuSEFirewall::SetInstallPackagesIfMissing, bnc #388773 Requires: yast2 >= 2.17.6 +# ButtonBox widget +Conflicts: yast2-ycp-ui-bindings < 2.17.3 Provides: yast2-config-firewall Obsoletes: yast2-config-firewall Provides: yast2-trans-firewall @@ -42,7 +51,7 @@ Lukas Ocilka <locilka(a)suse.de> %prep -%setup -n yast2-firewall-2.17.1 +%setup -n yast2-firewall-2.17.2 %build %{prefix}/bin/y2tool y2autoconf @@ -76,6 +85,13 @@ %doc %{prefix}/share/doc/packages/yast2-firewall %changelog +* Thu Aug 28 2008 locilka(a)suse.cz +- Pup-up dialogs adapted to new ButtonBox widget (FATE #303446). +- TextEntry -> InputField. +- Adapted RPM dependencies. +- 2.17.2 +* Wed Jul 16 2008 locilka(a)suse.cz +- No more built-in YaST Firewall services... * Tue Jul 15 2008 locilka(a)suse.cz - SuSEFirewallUI and SuSEFirewallCMDLine YCP modules marked as internal. ++++++ yast2-firewall-2.17.1.tar.bz2 -> yast2-firewall-2.17.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/configure new/yast2-firewall-2.17.2/configure --- old/yast2-firewall-2.17.1/configure 2008-04-09 16:45:18.000000000 +0200 +++ new/yast2-firewall-2.17.2/configure 2008-08-28 14:08:58.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-firewall 2.16.1. +# Generated by GNU Autoconf 2.61 for yast2-firewall 2.17.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firewall' PACKAGE_TARNAME='yast2-firewall' -PACKAGE_VERSION='2.16.1' -PACKAGE_STRING='yast2-firewall 2.16.1' +PACKAGE_VERSION='2.17.2' +PACKAGE_STRING='yast2-firewall 2.17.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-firewall 2.16.1 to adapt to many kinds of systems. +\`configure' configures yast2-firewall 2.17.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firewall 2.16.1:";; + short | recursive ) echo "Configuration of yast2-firewall 2.17.2:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firewall configure 2.16.1 +yast2-firewall configure 2.17.2 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firewall $as_me 2.16.1, which was +It was created by yast2-firewall $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-firewall' - VERSION='2.16.1' + VERSION='2.17.2' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.16.1" +VERSION="2.17.2" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-firewall $as_me 2.16.1, which was +This file was extended by yast2-firewall $as_me 2.17.2, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-firewall config.status 2.16.1 +yast2-firewall config.status 2.17.2 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/configure.in new/yast2-firewall-2.17.2/configure.in --- old/yast2-firewall-2.17.1/configure.in 2008-04-09 16:45:12.000000000 +0200 +++ new/yast2-firewall-2.17.2/configure.in 2008-08-28 14:08:56.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-firewall dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firewall, 2.16.1, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.17.2, http://bugs.opensuse.org/, yast2-firewall) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.1" +VERSION="2.17.2" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/src/subdialogs.ycp new/yast2-firewall-2.17.2/src/subdialogs.ycp --- old/yast2-firewall-2.17.1/src/subdialogs.ycp 2008-04-09 15:39:34.000000000 +0200 +++ new/yast2-firewall-2.17.2/src/subdialogs.ycp 2008-08-28 14:08:46.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration screens * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: subdialogs.ycp 46289 2008-04-09 13:38:13Z locilka $ + * $Id: subdialogs.ycp 50445 2008-08-28 12:08:46Z locilka $ * * Configuration dialogs divided into smaller logic groups. * Both Expert and Simple. @@ -103,9 +103,9 @@ ) ), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()), + `PushButton (`id("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); @@ -121,43 +121,22 @@ foreach (string zone_id, map <string, string> zone_attributes, zones_additons, { user_defined_zones = add(user_defined_zones, - `TextEntry(`id("zone_additions_" + zone_id), zone_attributes["name"]:"", zone_attributes["items"]:"") + `InputField (`id("zone_additions_" + zone_id), `opt (`hstretch), zone_attributes["name"]:"", zone_attributes["items"]:"") ); }); - term network_manager = `Empty(); - //if (NetworkService::IsManaged()) { - // network_manager = `VBox ( - // `Left ( - // `Label ( - // sformat( - // // TRANSLATORS: an informative text in a popup dialog, more newlines are allowed - // // %1 is the 'any' string (by default) - // // %2 is the name of the EXT zone (by default) - // _("You are currently using NetworkManager. -//You need to have a string '%1' in the zone '%2' -//to get a working configuration."), - // SuSEFirewall::special_all_interface_string, SuSEFirewall::GetZoneFullName(SuSEFirewall::special_all_interface_zone) - // ) - // ) - // ), - // `VSpacing(1) - // ); - //} - term dialog = `Frame ( // TRANSLATORS: frame label _("Additional Interface Settings for Zones"), `VBox ( `HStretch(), `VSpacing(1), - network_manager, user_defined_zones, `VSpacing(1), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()), + `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); @@ -307,17 +286,17 @@ // TRANSLATORS: label, %1 is a zone name like "External Zone" `Left ( `Label(sformat(_("Settings for Zone: %1"), zone_name)) ), // TRANSLATORS: text entry - `TextEntry(`id("additional_tcp"), _("&TCP Ports")), + `InputField (`id("additional_tcp"), `opt (`hstretch), _("&TCP Ports")), // TRANSLATORS: text entry - `TextEntry(`id("additional_udp"), _("&UDP Ports")), + `InputField (`id("additional_udp"), `opt (`hstretch), _("&UDP Ports")), // TRANSLATORS: text entry - `TextEntry(`id("additional_rpc"), _("&RPC Ports")), + `InputField (`id("additional_rpc"), `opt (`hstretch), _("&RPC Ports")), // TRANSLATORS: text entry - `TextEntry(`id("additional_ip"), _("&IP Protocols")), + `InputField (`id("additional_ip"), `opt (`hstretch), _("&IP Protocols")), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton(`id("ok"), `opt(`okButton, `key_F10, `default), Label::OKButton()), + `PushButton(`id("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) )) @@ -452,7 +431,7 @@ `item( `id("0/0"), "0/0") ]), // TRANSLATORS: text entry - `TextEntry (`id("add_requested_ip"), _("Re&quested IP")) + `InputField (`id("add_requested_ip"), `opt (`hstretch), _("Re&quested IP")) ), `VBox ( // TRANSLATORS: select box @@ -461,7 +440,7 @@ `item( `id("udp"), "UDP") ]), // TRANSLATORS: text entry - `TextEntry (`id("add_requested_port"), _("R&equested Port")) + `InputField (`id("add_requested_port"), `opt (`hstretch), _("R&equested Port")) ) ), `VSpacing(1), @@ -469,14 +448,14 @@ `Left( `Label(_("Redirection:")) ), `HBox ( // TRANSLATORS: text entry - `TextEntry (`id("add_redirectto_ip"), _("Re&direct to Masqueraded IP")), + `InputField (`id("add_redirectto_ip"), `opt (`hstretch), _("Re&direct to Masqueraded IP")), // TRANSLATORS: text entry - `TextEntry (`id("add_redirectto_port"), _("&Redirect to Port")) + `InputField (`id("add_redirectto_port"), `opt (`hstretch), _("&Redirect to Port")) ), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::AddButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::AddButton()), + `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); @@ -880,9 +859,9 @@ ) ), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::OKButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::OKButton()), + `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); @@ -942,22 +921,22 @@ `Frame ( _("Add New Allowing Rule"), `VBox ( - `TextEntry(`id("add_source_network"), _("Source &Network")), + `InputField (`id("add_source_network"), `opt (`hstretch), _("Source &Network")), `Left (`ComboBox (`id("add_protocol"), _("&Protocol"), [ `item( `id("tcp"), SuSEFirewall::GetProtocolTranslatedName("tcp")), `item( `id("udp"), SuSEFirewall::GetProtocolTranslatedName("udp")), `item( `id("_rpc_"), SuSEFirewall::GetProtocolTranslatedName("_rpc_")), ])), - `TextEntry (`id("add_destination_port"), _("&Destination Port (Optional)")), - `TextEntry (`id("add_source_port"), _("&Source Port (Optional)")) + `InputField (`id("add_destination_port"), `opt (`hstretch), _("&Destination Port (Optional)")), + `InputField (`id("add_source_port"), `opt (`hstretch), _("&Source Port (Optional)")) ) ), `VSpacing(1), - `HBox ( - `PushButton(`id("ok"), Label::AddButton()), - `PushButton(`id("cancel"), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id ("ok"), `opt (`okButton, `default, `key_F10), Label::AddButton()), + `PushButton (`id ("cancel"), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/src/SuSEFirewallCMDLine.ycp new/yast2-firewall-2.17.2/src/SuSEFirewallCMDLine.ycp --- old/yast2-firewall-2.17.1/src/SuSEFirewallCMDLine.ycp 2008-07-15 19:10:32.000000000 +0200 +++ new/yast2-firewall-2.17.2/src/SuSEFirewallCMDLine.ycp 2008-08-28 11:05:51.000000000 +0200 @@ -7,7 +7,7 @@ * Authors: Lukas Ocilka <locilka(a)suse.cz> * Internal * - * $Id: SuSEFirewallCMDLine.ycp 49130 2008-07-15 17:10:31Z locilka $ + * $Id: SuSEFirewallCMDLine.ycp 50387 2008-08-26 17:12:46Z kmachalkova $ */ { @@ -1025,7 +1025,7 @@ "example" : [ "services show detailed", "services set protect=yes zone=INT", - "services add service=dhcp-server zone=EXT", + "services add service=service:dhcp-server zone=EXT", "services remove ipprotocol=esp tcpport=12,13,ipp zone=DMZ", ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/src/uifunctions.ycp new/yast2-firewall-2.17.2/src/uifunctions.ycp --- old/yast2-firewall-2.17.1/src/uifunctions.ycp 2008-04-14 12:00:37.000000000 +0200 +++ new/yast2-firewall-2.17.2/src/uifunctions.ycp 2008-08-28 14:08:46.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs handling functions * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: uifunctions.ycp 46290 2008-04-09 13:40:57Z locilka $ + * $Id: uifunctions.ycp 50445 2008-08-28 12:08:46Z locilka $ * * Configuration dialogs handling. * Both Expert and Simple. @@ -1083,8 +1083,16 @@ void InitIPsecSupport (string key) { SetFirewallIcon(); - boolean supported = SuSEFirewall::IsServiceSupportedInZone("ipsec", "EXT"); - UI::ChangeWidget(`id("ispsec_support"), `Value, supported); + // FIXME: check whether such service exists + boolean supported = SuSEFirewall::IsServiceSupportedInZone("service:ipsec", "EXT"); + + if (supported == nil) { + y2error ("No such service 'service:ipsec'"); + UI::ChangeWidget(`id("ispsec_support"), `Enabled, false); + } else { + UI::ChangeWidget(`id("ispsec_support"), `Enabled, true); + UI::ChangeWidget(`id("ispsec_support"), `Value, supported); + } } symbol HandleIPsecSupport (string key, map event) { @@ -1504,10 +1512,9 @@ `HWeight (1, `InputField (`id (`port), `opt (`disabled), _("Po&rt"), "")) )), `VSpacing (1), - `HBox ( - `PushButton (`id (`ok), Label::AddButton()), - `VSpacing (1), - `PushButton (`id (`cancel), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton, `default, `key_F10), Label::AddButton()), + `PushButton (`id (`cancel), `opt (`cancelButton, `key_F9), Label::CancelButton()) ) ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-firewall-2.17.1/VERSION new/yast2-firewall-2.17.2/VERSION --- old/yast2-firewall-2.17.1/VERSION 2008-07-15 18:40:22.000000000 +0200 +++ new/yast2-firewall-2.17.2/VERSION 2008-08-28 14:08:37.000000000 +0200 @@ -1 +1 @@ -2.17.1 +2.17.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xen
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package xen checked in at Mon Sep 1 02:39:10 CEST 2008. -------- --- arch/i386/xen/xen.changes 2008-08-18 17:18:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2008-08-30 05:23:39.000000000 +0200 @@ -1,0 +2,40 @@ +Fri Aug 29 06:39:21 MDT 2008 - plc(a)novell.com + +- Added 'tap' to the type of devices for HalDaemon.py to + scan for change of xenstore attribute media-present. + +------------------------------------------------------------------- +Wed Aug 27 12:21:19 MDT 2008 - jfehlig(a)novell.com + +- Don't create pv vif device if emulated network device is + explicitly specified in guest config. + +------------------------------------------------------------------- +Fri Aug 22 08:37:49 MDT 2008 - carnold(a)novell.com + +- Updated to xen-unstable changeset 18358 Xen 3.3.0 FCS. + +------------------------------------------------------------------- +Wed Aug 20 13:59:45 MDT 2008 - carnold(a)novell.com + +- Updated to xen-unstable changeset 18353 RC7. + +------------------------------------------------------------------- +Wed Aug 20 15:08:19 CEST 2008 - kwolf(a)suse.de + +- Implementation of xm snapshot-delete + snapshot-ioemu-delete.patch, snapshot-xend.patch +- Add snapshot options to qemu-img-xen + qemu-img-snapshot.patch + +------------------------------------------------------------------- +Tue Aug 19 10:27:05 MDT 2008 - carnold(a)novell.com + +- Enable kboot and kexec patches. + +------------------------------------------------------------------- +Mon Aug 18 11:13:55 MDT 2008 - carnold(a)novell.com + +- Updated to xen-unstable changeset 18335 RC5. + +------------------------------------------------------------------- Old: ---- xen-generate-foreign-headers.diff xen-xmexample-nbd.diff New: ---- qemu-img-snapshot.patch snapshot-ioemu-delete.patch xend-vif-fix.patch xen-xmexample-vti.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:36.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:36.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 3.3.0_18314_02) +# spec file for package xen (Version 3.3.0_18358_02) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,12 +21,12 @@ Name: xen %define xvers 3.3 %define xvermaj 3 -%define changeset 18314 +%define changeset 18358 %define xen_build_dir xen-3.3.0-testing %if %sles_version %define with_kmp 1 %else -%define with_kmp 0 +%define with_kmp 1 %endif BuildRequires: LibVNCServer-devel SDL-devel automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel transfig %if %suse_version >= 1030 @@ -40,8 +40,8 @@ %if %{?with_kmp}0 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif -Version: 3.3.0_18314_02 -Release: 3 +Version: 3.3.0_18358_02 +Release: 1 License: GPL v2 only Group: System/Kernel AutoReqProv: on @@ -76,7 +76,7 @@ Patch106: xen-changeset.diff Patch107: xen-paths.diff Patch108: xen-xmexample.diff -Patch109: xen-xmexample-nbd.diff +Patch109: xen-xmexample-vti.diff Patch110: xen-fixme-doc.diff Patch111: xen-domUloader.diff Patch112: xen-no-dummy-nfs-ip.diff @@ -92,15 +92,14 @@ Patch125: xen-hvm-default-pae.diff Patch126: xm-test-cleanup.diff Patch127: cross-build-fix.diff -Patch130: xen-generate-foreign-headers.diff -Patch131: tools-xc_kexec.diff -Patch132: tools-kboot.diff -Patch133: libxen_permissive.patch -Patch134: xenapi-console-protocol.patch -Patch135: xen-disable-qemu-monitor.diff -Patch136: supported_module.diff -Patch137: qemu-security-etch1.diff -Patch138: rpmlint.diff +Patch130: tools-xc_kexec.diff +Patch131: tools-kboot.diff +Patch132: libxen_permissive.patch +Patch133: xenapi-console-protocol.patch +Patch134: xen-disable-qemu-monitor.diff +Patch135: supported_module.diff +Patch136: qemu-security-etch1.diff +Patch137: rpmlint.diff Patch140: cdrom-removable.patch Patch150: bridge-opensuse.patch Patch151: bridge-vlan.diff @@ -111,16 +110,19 @@ Patch156: blktap.patch Patch157: xen-api-auth.patch Patch158: xen-qemu-iscsi-fix.patch +Patch159: xend-vif-fix.patch # Patches for snapshot support -Patch169: ioemu-blktap-fix-open.patch -Patch170: snapshot-ioemu-save.patch -Patch171: snapshot-ioemu-restore.patch -Patch172: snapshot-xend.patch -Patch173: ioemu-qcow2-multiblock-aio.patch -Patch174: ioemu-blktap-image-format.patch -Patch175: build-tapdisk-ioemu.patch -Patch176: blktapctrl-default-to-ioemu.patch -Patch177: ioemu-blktap-barriers.patch +Patch170: qemu-img-snapshot.patch +Patch171: ioemu-blktap-fix-open.patch +Patch172: snapshot-ioemu-save.patch +Patch173: snapshot-ioemu-restore.patch +Patch174: snapshot-ioemu-delete.patch +Patch175: snapshot-xend.patch +Patch180: ioemu-qcow2-multiblock-aio.patch +Patch181: ioemu-blktap-image-format.patch +Patch182: build-tapdisk-ioemu.patch +Patch183: blktapctrl-default-to-ioemu.patch +Patch184: ioemu-blktap-barriers.patch # Jim's domain lock patch Patch190: xend-domain-lock.patch # Patches from Jan @@ -381,6 +383,7 @@ License: GPL v2 or later Group: System/Kernel Summary: Xen para-virtual device drivers for fully virtualized guests +Conflicts: xen %description KMP Xen para-virtual device drivers for fully virtualized guests @@ -474,7 +477,7 @@ %patch106 -p1 %patch107 -p1 %patch108 -p1 -#%patch109 -p1 Not Needed +%patch109 -p1 %patch110 -p1 %patch111 -p1 %patch112 -p1 @@ -489,16 +492,15 @@ %patch124 -p1 %patch125 -p1 %patch126 -p1 -#%patch127 -p1 Not needed anymore? -#%patch130 -p1 xen/include/public/foreign/ directory no longer exists -#%patch131 -p1 -#%patch132 -p1 +#%patch127 -p1 +%patch130 -p1 +%patch131 -p1 +%patch132 -p1 %patch133 -p1 %patch134 -p1 %patch135 -p1 %patch136 -p1 %patch137 -p1 -%patch138 -p1 %patch140 -p1 %patch150 -p1 %patch151 -p1 @@ -509,15 +511,18 @@ %patch156 -p1 %patch157 -p1 %patch158 -p1 -%patch169 -p1 +%patch159 -p1 %patch170 -p1 %patch171 -p1 %patch172 -p1 %patch173 -p1 %patch174 -p1 %patch175 -p1 -%patch176 -p1 -%patch177 -p1 +%patch180 -p1 +%patch181 -p1 +%patch182 -p1 +%patch183 -p1 +%patch184 -p1 %patch190 -p1 %patch240 -p1 %patch241 -p1 @@ -545,13 +550,17 @@ make tools docs %if %{?with_kmp}0 # pv driver modules +export XL=/usr/src/linux +export XEN=/usr/src/linux/include/xen mkdir -p obj for flavor in %flavors_to_build; do rm -rf obj/$flavor cp -r unmodified_drivers/linux-2.6 obj/$flavor - obj/$flavor/mkbuildtree + cd obj/$flavor + ./mkbuildtree make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \ - M=$PWD/obj/$flavor + M=$PWD + cd ../.. done %endif @@ -669,6 +678,7 @@ #%find_lang xen-vm # po files are misnamed upstream # Clean up unpackaged files rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xen/qemu/ +rm -f $RPM_BUILD_ROOT/%{_datadir}/doc/qemu/qemu-* rm -rf $RPM_BUILD_ROOT/%{_defaultdocdir}/xen/ps rm -rf $RPM_BUILD_ROOT/usr/share/xen/man/man1/qemu/qemu* rm -f $RPM_BUILD_ROOT/usr/share/xen/qemu/openbios-sparc32 @@ -677,6 +687,7 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info rm -rf $RPM_BUILD_ROOT/html rm -rf $RPM_BUILD_ROOT/usr/share/doc/xen/README.* +rm -f $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm.debug %files %defattr(-,root,root) @@ -791,9 +802,9 @@ %{_libdir}/xen/bin/qemu-dm %ifarch x86_64 /usr/lib/xen/bin/qemu-dm -#/usr/lib64/xen/bin/xc_kexec +/usr/lib64/xen/bin/xc_kexec %else -#/usr/lib/xen/bin/xc_kexec +/usr/lib/xen/bin/xc_kexec %endif /usr/lib/xen/boot/hvmloader %pysite/xen/* ++++++ 32on64-extra-mem.patch ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:36.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:36.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xen-3.3.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py +++ xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -2251,7 +2251,7 @@ class XendDomainInfo: +@@ -2255,7 +2255,7 @@ class XendDomainInfo: vtd_mem = ((vtd_mem + 1023) / 1024) * 1024 # Make sure there's enough RAM available for the domain ++++++ cdrom-removable.patch ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:37.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:37.000000000 +0200 @@ -1,8 +1,8 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py 2008-08-12 07:36:39.000000000 -0600 -@@ -0,0 +1,238 @@ ++++ xen-3.3.0-testing/tools/python/xen/xend/server/HalDaemon.py 2008-08-29 06:25:55.000000000 -0600 +@@ -0,0 +1,243 @@ +#!/usr/bin/env python +# -*- mode: python; -*- +#============================================================================ @@ -42,6 +42,8 @@ +from xen.xend import XendLogging +from xen.xend.XendLogging import log + ++DEVICE_TYPES = ['vbd', 'tap'] ++ +class HalDaemon: + """The Hald block device watcher for XEN + """ @@ -52,6 +54,7 @@ + """Default level of information to be logged.""" + loglevel_default = 'INFO' + ++ + def __init__(self): + + XendLogging.init(self.logfile_default, self.loglevel_default) @@ -59,7 +62,7 @@ + + self.udi_dict = {} + self.debug = 0 -+ self.dbpath = "/local/domain/0/backend/vbd" ++ self.dbpath = "/local/domain/0/backend" + self.bus = dbus.SystemBus() + self.hal_manager_obj = self.bus.get_object('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager') + self.hal_manager = dbus.Interface( self.hal_manager_obj, 'org.freedesktop.Hal.Manager') @@ -100,7 +103,7 @@ + device_names = self.hal_manager.GetAllDevices() + i = 0; + for name in device_names: -+ #log.debug("device name, device=%s",name) ++ #log.debug("device name, device=%s",name) + dev_obj = self.bus.get_object ('org.freedesktop.Hal', name) + dev = dbus.Interface (dev_obj, 'org.freedesktop.Hal.Device') + dev_properties = dev_obj.GetAllProperties(dbus_interface="org.freedesktop.Hal.Device") @@ -182,43 +185,45 @@ + # Set or clear xenstore media-present depending on the action argument + # for every vbd that has this block device + def change_xenstore(self,action, device, major, minor): -+ domains = xstransact.List(self.dbpath) -+ log.debug('domains: %s', domains) -+ for domain in domains: # for each domain -+ devices = xstransact.List( self.dbpath + '/' + domain) -+ log.debug('devices: %s',devices) -+ for device in devices: # for each vbd device -+ str = device.split('/') -+ vbd_type = None; -+ vbd_physical_device = None -+ vbd_media = None -+ vbd_device_path = self.dbpath + '/' + domain + '/' + device -+ listing = xstransact.List(vbd_device_path) -+ for entry in listing: # for each entry -+ item = self.dbpath + '/' + entry -+ value = xstransact.Read( vbd_device_path + '/' + entry) -+ log.debug('%s=%s',item,value) -+ if item.find('media-present') != -1: -+ vbd_media = item; -+ vbd_media_path = item -+ if item.find('physical-device') != -1: -+ vbd_physical_device = value; -+ if item.find('type') != -1: -+ vbd_type = value; -+ if vbd_type is not None and vbd_physical_device is not None and vbd_media is not None : -+ inode = vbd_physical_device.split(':') -+ imajor = parse_hex(inode[0]) -+ iminor = parse_hex(inode[1]) -+ log.debug("action:%s major:%s- minor:%s- imajor:%s- iminor:%s- inode: %s", -+ action,major,minor, imajor, iminor, inode) -+ if int(imajor) == int(major) and int(iminor) == int(minor): -+ if action == "add": -+ xs_dict = {'media': "1"} -+ xstransact.Write(vbd_device_path, 'media-present', "1" ) -+ log.debug("wrote xenstore media-present 1 path:%s",vbd_media_path) -+ else: -+ xstransact.Write(vbd_device_path, 'media-present', "0" ) -+ log.debug("wrote xenstore media 0 path:%s",vbd_media_path) ++ for type in DEVICE_TYPES: ++ path = self.dbpath + '/' + type ++ domains = xstransact.List(path) ++ log.debug('domains: %s', domains) ++ for domain in domains: # for each domain ++ devices = xstransact.List( path + '/' + domain) ++ log.debug('devices: %s',devices) ++ for device in devices: # for each vbd device ++ str = device.split('/') ++ vbd_type = None; ++ vbd_physical_device = None ++ vbd_media = None ++ vbd_device_path = path + '/' + domain + '/' + device ++ listing = xstransact.List(vbd_device_path) ++ for entry in listing: # for each entry ++ item = path + '/' + entry ++ value = xstransact.Read( vbd_device_path + '/' + entry) ++ log.debug('%s=%s',item,value) ++ if item.find('media-present') != -1: ++ vbd_media = item; ++ vbd_media_path = item ++ if item.find('physical-device') != -1: ++ vbd_physical_device = value; ++ if item.find('type') != -1: ++ vbd_type = value; ++ if vbd_type is not None and vbd_physical_device is not None and vbd_media is not None : ++ inode = vbd_physical_device.split(':') ++ imajor = parse_hex(inode[0]) ++ iminor = parse_hex(inode[1]) ++ log.debug("action:%s major:%s- minor:%s- imajor:%s- iminor:%s- inode: %s", ++ action,major,minor, imajor, iminor, inode) ++ if int(imajor) == int(major) and int(iminor) == int(minor): ++ if action == "add": ++ xs_dict = {'media': "1"} ++ xstransact.Write(vbd_device_path, 'media-present', "1" ) ++ log.debug("wrote xenstore media-present 1 path:%s",vbd_media_path) ++ else: ++ xstransact.Write(vbd_device_path, 'media-present', "0" ) ++ log.debug("wrote xenstore media 0 path:%s",vbd_media_path) + +def mylog( fmt, *args): + f = open('/tmp/haldaemon.log', 'a') @@ -244,7 +249,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/server/Hald.py =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ xen-3.3.0-testing/tools/python/xen/xend/server/Hald.py 2008-08-12 07:36:39.000000000 -0600 ++++ xen-3.3.0-testing/tools/python/xen/xend/server/Hald.py 2008-08-29 06:11:48.000000000 -0600 @@ -0,0 +1,125 @@ +#============================================================================ +# This library is free software; you can redistribute it and/or @@ -373,8 +378,8 @@ + watcher.shutdown() Index: xen-3.3.0-testing/tools/python/xen/xend/server/SrvServer.py =================================================================== ---- xen-3.3.0-testing.orig/tools/python/xen/xend/server/SrvServer.py 2008-08-11 12:44:35.000000000 -0600 -+++ xen-3.3.0-testing/tools/python/xen/xend/server/SrvServer.py 2008-08-12 07:36:39.000000000 -0600 +--- xen-3.3.0-testing.orig/tools/python/xen/xend/server/SrvServer.py 2008-08-22 08:34:00.000000000 -0600 ++++ xen-3.3.0-testing/tools/python/xen/xend/server/SrvServer.py 2008-08-29 06:11:48.000000000 -0600 @@ -56,6 +56,7 @@ from SrvRoot import SrvRoot @@ -394,8 +399,8 @@ root = SrvDir() Index: xen-3.3.0-testing/tools/ioemu-remote/xenstore.c =================================================================== ---- xen-3.3.0-testing.orig/tools/ioemu-remote/xenstore.c 2008-08-11 12:36:15.000000000 -0600 -+++ xen-3.3.0-testing/tools/ioemu-remote/xenstore.c 2008-08-12 07:48:22.000000000 -0600 +--- xen-3.3.0-testing.orig/tools/ioemu-remote/xenstore.c 2008-08-22 08:35:31.000000000 -0600 ++++ xen-3.3.0-testing/tools/ioemu-remote/xenstore.c 2008-08-29 06:11:48.000000000 -0600 @@ -297,6 +297,16 @@ bdrv_set_type_hint(bs, BDRV_TYPE_CDROM); if (pasprintf(&buf, "%s/params", bpath) != -1) ++++++ cross-build-fix.diff ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:37.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:37.000000000 +0200 @@ -33,9 +33,9 @@ =================================================================== --- xen-3.3.0-testing.orig/tools/Makefile +++ xen-3.3.0-testing/tools/Makefile -@@ -23,7 +23,7 @@ SUBDIRS-y += blktap - SUBDIRS-y += libfsimage +@@ -24,7 +24,7 @@ SUBDIRS-y += libfsimage SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen + SUBDIRS-y += fs-back -ifeq (ioemu,$(CONFIG_QEMU)) +ifeq ($(XEN_COMPILE_ARCH)$(CONFIG_IOEMU),$(XEN_TARGET_ARCH)y) ++++++ pv-driver-build.patch ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:37.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:37.000000000 +0200 @@ -11,31 +11,3 @@ # Need to be quite careful here: we don't want the files we link in to # risk overriding the native Linux ones (in particular, system.h must -Index: xen-3.3.0-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h -=================================================================== ---- xen-3.3.0-testing.orig/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h -+++ xen-3.3.0-testing/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h -@@ -151,7 +151,7 @@ typedef irqreturn_t (*irq_handler_t)(int - #endif - #endif - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) && CONFIG_SLE_VERSION < 10 - #define setup_xen_features xen_setup_features - #endif - -Index: xen-3.3.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c -=================================================================== ---- xen-3.3.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c -+++ xen-3.3.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c -@@ -119,7 +119,9 @@ void *kzalloc(size_t size, int flags) - EXPORT_SYMBOL(kzalloc); - #endif - --#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) -+#if defined(CONFIG_SUSE_KERNEL) \ -+ ? LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) \ -+ : LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18) - /* Simplified asprintf. */ - char *kasprintf(gfp_t gfp, const char *fmt, ...) - { ++++++ qemu-img-snapshot.patch ++++++ Index: xen-3.3.0-testing/tools/ioemu-remote/qemu-img.c =================================================================== --- xen-3.3.0-testing.orig/tools/ioemu-remote/qemu-img.c +++ xen-3.3.0-testing/tools/ioemu-remote/qemu-img.c @@ -57,6 +57,7 @@ static void help(void) " commit [-f fmt] filename\n" " convert [-c] [-e] [-6] [-f fmt] [-O output_fmt] filename [filename2 [...]] output_filename\n" " info [-f fmt] filename\n" + " snapshot [-l|-a snapshot|-d snapshot] filename\n" "\n" "Command parameters:\n" " 'filename' is a disk image filename\n" @@ -694,6 +695,91 @@ static int img_info(int argc, char **arg return 0; } +#define SNAPSHOT_LIST 1 +#define SNAPSHOT_APPLY 2 +#define SNAPSHOT_DELETE 3 + +static void img_snapshot(int argc, char **argv) +{ + BlockDriverState *bs; + char *filename, *snapshot_name = NULL; + char c; + int ret; + int action = 0; + + /* Parse commandline parameters */ + for(;;) { + c = getopt(argc, argv, "la:d:h"); + if (c == -1) + break; + switch(c) { + case 'h': + help(); + return; + case 'l': + if (action) { + help(); + return; + } + action = SNAPSHOT_LIST; + break; + case 'a': + if (action) { + help(); + return; + } + action = SNAPSHOT_APPLY; + snapshot_name = optarg; + break; + case 'd': + if (action) { + help(); + return; + } + action = SNAPSHOT_DELETE; + snapshot_name = optarg; + break; + } + } + + if (optind >= argc) + help(); + filename = argv[optind++]; + + /* Open the image */ + bs = bdrv_new(""); + if (!bs) + error("Not enough memory"); + + if (bdrv_open2(bs, filename, 0, NULL) < 0) { + error("Could not open '%s'", filename); + } + + /* Perform the requested action */ + switch(action) { + case SNAPSHOT_LIST: + dump_snapshots(bs); + break; + + case SNAPSHOT_APPLY: + ret = bdrv_snapshot_goto(bs, snapshot_name); + if (ret) + error("Could not apply snapshot '%s': %d (%s)", + snapshot_name, strerror(ret), ret); + break; + + case SNAPSHOT_DELETE: + ret = bdrv_snapshot_delete(bs, snapshot_name); + if (ret) + error("Could not delete snapshot '%s': %d (%s)", + snapshot_name, strerror(ret), ret); + break; + } + + /* Cleanup */ + bdrv_delete(bs); +} + int main(int argc, char **argv) { const char *cmd; @@ -711,6 +797,8 @@ int main(int argc, char **argv) img_convert(argc, argv); } else if (!strcmp(cmd, "info")) { img_info(argc, argv); + } else if (!strcmp(cmd, "snapshot")) { + img_snapshot(argc, argv); } else { help(); } ++++++ rpmlint.diff ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:37.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:37.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xen-3.3.0-testing.orig/tools/examples/Makefile +++ xen-3.3.0-testing/tools/examples/Makefile -@@ -71,7 +71,7 @@ install-initd: +@@ -70,7 +70,7 @@ install-initd: [ -d $(DESTDIR)/var/adm/fillup-templates ] || $(INSTALL_DIR) $(DESTDIR)/var/adm/fillup-templates/ $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d ++++++ snapshot-ioemu-delete.patch ++++++ Index: xen-3.3.0-testing/tools/ioemu-remote/xenstore.c =================================================================== --- xen-3.3.0-testing.orig/tools/ioemu-remote/xenstore.c +++ xen-3.3.0-testing/tools/ioemu-remote/xenstore.c @@ -652,6 +652,19 @@ static void xenstore_process_dm_command_ } snapshot_name = xs_read(xsh, XBT_NULL, path, &len); + } else if (!strncmp(command, "snapshot-delete", len)) { + + if (pasprintf(&path, + "/local/domain/0/device-model/%u/parameter", domid) == -1) { + fprintf(logfile, "out of memory reading dm command parameter\n"); + goto out; + } + par = xs_read(xsh, XBT_NULL, path, &len); + if (!par) + goto out; + // TODO Error handling + do_delvm(par); + xenstore_record_dm_state("snapshot-deleted"); } else if (!strncmp(command, "continue", len)) { fprintf(logfile, "dm-command: continue after state save\n"); xen_pause_requested = 0; ++++++ snapshot-xend.patch ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:38.000000000 +0200 @@ -295,7 +295,15 @@ =================================================================== --- xen-3.3.0-testing.orig/tools/python/xen/xend/XendDomain.py +++ xen-3.3.0-testing/tools/python/xen/xend/XendDomain.py -@@ -1396,6 +1396,148 @@ class XendDomain: +@@ -52,6 +52,7 @@ from xen.xend.xenstore.xstransact import + from xen.xend.xenstore.xswatch import xswatch + from xen.util import mkdir + from xen.xend import uuid ++from xen.xend import sxp + + xc = xen.lowlevel.xc.xc() + xoptions = XendOptions.instance() +@@ -1396,6 +1397,164 @@ class XendDomain: raise XendError("can't write guest state file %s: %s" % (dst, ex[1])) @@ -324,6 +332,10 @@ + POWER_STATE_NAMES[DOM_STATE_RUNNING], + POWER_STATE_NAMES[dominfo._stateGet()]) + ++ if not os.path.exists(self._managed_config_path(dominfo.get_uuid())): ++ raise XendError("Domain is not managed by Xend lifecycle " + ++ "support.") ++ + snap_path = os.path.join(xoptions.get_xend_domains_path(), + dominfo.get_uuid(), "snapshots") + mkdir.parents(snap_path, stat.S_IRWXU) @@ -421,25 +433,37 @@ + @rtype: None + @raise XendInvalidDomain: Domain is not valid + """ -+ try: -+ dominfo = self.domain_lookup_nr(domid) -+ if not dominfo: -+ raise XendInvalidDomain(str(domid)) ++ dominfo = self.domain_lookup_nr(domid) ++ if not dominfo: ++ raise XendInvalidDomain(str(domid)) ++ ++ snap_file = os.path.join(xoptions.get_xend_domains_path(), ++ dominfo.get_uuid(), "snapshots", name) ++ ++ if not os.access(snap_file, os.F_OK): ++ raise XendError("Snapshot %s does not exist for domain %s" % ++ (name, str(domid))) ++ ++ # Need to "remove" snapshot from qcow2 image file. ++ # For running domains, this is left to ioemu. For stopped domains ++ # we must invoke qemu-img for all devices ourselves ++ if dominfo._stateGet() != DOM_STATE_HALTED: ++ dominfo.image.signalDeviceModel("snapshot-delete", ++ "snapshot-deleted", name) ++ else: ++ for dev_type, dev_info in dominfo.info.all_devices_sxpr(): ++ if dev_type != 'tap': ++ continue ++ ++ # Fetch the filename and strip off tap:xyz: ++ image_file = sxp.child_value(dev_info, 'uname') ++ image_file = image_file.split(':')[2] + -+ snap_file = os.path.join(xoptions.get_xend_domains_path(), -+ dominfo.get_uuid(), "snapshots", name) -+ -+ if not os.access(snap_file, os.F_OK): -+ raise XendError("Snapshot %s does not exist for domain %s" % -+ (name, str(domid))) ++ os.system("qemu-img-xen snapshot -d %s %s" % ++ (name, image_file)); + -+ # Warning! -+ # Need to "remove" snapshot from qcow2 image file. How -+ # should we do this? -+ os.unlink(snap_file) + -+ except: -+ return ++ os.unlink(snap_file) + def domain_pincpu(self, domid, vcpu, cpumap): """Set which cpus vcpu can use ++++++ tools-xc_kexec.diff ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:38.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:38.000000000 +0200 @@ -67,7 +67,7 @@ +OBJS := $(XEN_TARGET_ARCH)/entry.o +OBJS += main.o console.o vsprintf.o string.o ctype.o + -+CFLAGS += -g -I$(XEN_ROOT)/tools/libxc -I$(XEN_TARGET_ARCH) ++CFLAGS += -g -I$(XEN_ROOT)/tools/libxc -I$(XEN_TARGET_ARCH) -I$(XEN_INCLUDE) + +ifeq ($(XEN_TARGET_ARCH),x86_32) +HLP_LDFLAGS := -melf_i386 @@ -132,12 +132,12 @@ + + cons = intf->out_cons; + prod = intf->out_prod; -+ mb(); ++ xen_mb(); + + while ((sent < len) && ((prod - cons) < sizeof(intf->out))) + intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++]; + -+ wmb(); ++ xen_wmb(); + intf->out_prod = prod; + + if (0 != notify_remote_via_evtchn(console_evtchn)) @@ -456,7 +456,7 @@ + return; + + memset(xenstore_page, 0, PAGE_SIZE); -+ wmb(); ++ xen_wmb(); + printk("xs: debug fixup [zero page] done\r\n"); +} +#endif @@ -541,7 +541,7 @@ +static void fillup_memory_p2m(void) +{ + struct xen_memory_reservation reservation = { -+ .address_bits = 0, ++ .mem_flags = 0, + .extent_order = 0, + .nr_extents = 1, + .domid = DOMID_SELF, @@ -696,7 +696,7 @@ + else + map_page_32(page, mfn, flags); + xen_tlb_flush(); -+ wmb(); ++ xen_wmb(); +} + +static void map_virt_base(void) @@ -706,7 +706,7 @@ + else + map_virt_base_32(); + xen_tlb_flush(); -+ wmb(); ++ xen_wmb(); +} + +static void fixup_pagetables_32(void) @@ -822,7 +822,7 @@ + pte[pte_off] = (mfn << PAGE_SHIFT) | flags; + + xen_tlb_flush(); -+ wmb(); ++ xen_wmb(); +} + +static void map_virt_base(void) @@ -857,7 +857,7 @@ + pgd_low++; + } + xen_tlb_flush(); -+ wmb(); ++ xen_wmb(); +} + +static void fixup_pagetables(void) ++++++ xen-3.3.0-testing-src.tar.bz2 ++++++ arch/i386/xen/xen-3.3.0-testing-src.tar.bz2 /mounts/work_src_done/STABLE/xen/xen-3.3.0-testing-src.tar.bz2 differ: byte 11, line 1 ++++++ xen-config.diff ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:39.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:39.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- xen-3.3.0-testing.orig/Config.mk +++ xen-3.3.0-testing/Config.mk -@@ -84,20 +84,20 @@ QEMU_REMOTE=http://xenbits.xensource.com +@@ -85,20 +85,20 @@ QEMU_REMOTE=http://xenbits.xensource.com # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. ++++++ xend-domain-lock.patch ++++++ --- /var/tmp/diff_new_pack.B18046/_old 2008-09-01 02:38:39.000000000 +0200 +++ /var/tmp/diff_new_pack.B18046/_new 2008-09-01 02:38:39.000000000 +0200 @@ -264,7 +264,7 @@ =================================================================== --- xen-3.3.0-testing.orig/tools/python/xen/xend/XendDomain.py +++ xen-3.3.0-testing/tools/python/xen/xend/XendDomain.py -@@ -1294,6 +1294,7 @@ class XendDomain: +@@ -1295,6 +1295,7 @@ class XendDomain: POWER_STATE_NAMES[DOM_STATE_RUNNING], POWER_STATE_NAMES[dominfo._stateGet()]) @@ -318,7 +318,7 @@ =================================================================== --- xen-3.3.0-testing.orig/tools/examples/Makefile +++ xen-3.3.0-testing/tools/examples/Makefile -@@ -36,6 +36,7 @@ XEN_SCRIPTS += vtpm vtpm-delete +@@ -35,6 +35,7 @@ XEN_SCRIPTS += vtpm vtpm-delete XEN_SCRIPTS += xen-hotplug-cleanup XEN_SCRIPTS += external-device-migrate XEN_SCRIPTS += vscsi ++++++ xend-vif-fix.patch ++++++ Index: xen-3.3.0-testing/tools/python/xen/xend/server/netif.py =================================================================== --- xen-3.3.0-testing.orig/tools/python/xen/xend/server/netif.py +++ xen-3.3.0-testing/tools/python/xen/xend/server/netif.py @@ -101,6 +101,13 @@ class NetifController(DevController): def __init__(self, vm): DevController.__init__(self, vm) + def createDevice(self, config): + typ = config.get('type', '') + if typ == 'ioemu': + return 0 + + DevController.createDevice(self, config) + def getDeviceDetails(self, config): """@see DevController.getDeviceDetails""" ++++++ xen-xmexample-vti.diff ++++++ Index: xen-3.3.0-testing/tools/examples/Makefile =================================================================== --- xen-3.3.0-testing.orig/tools/examples/Makefile +++ xen-3.3.0-testing/tools/examples/Makefile @@ -20,7 +20,6 @@ XEN_CONFIGS += xmexample.hvm-stubdom XEN_CONFIGS += xmexample.hvm-dm XEN_CONFIGS += xmexample.pv-grub XEN_CONFIGS += xmexample.nbd -XEN_CONFIGS += xmexample.vti XEN_CONFIGS += xend-pci-quirks.sxp XEN_CONFIGS += xend-pci-permissive.sxp ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vm-install
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package vm-install checked in at Mon Sep 1 02:38:52 CEST 2008. -------- --- arch/i386/vm-install/vm-install.changes 2008-08-15 22:36:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2008-08-30 05:42:28.561619000 +0200 @@ -1,0 +2,20 @@ +Tue Aug 26 11:45:31 MDT 2008 - carnold(a)novell.com + +- Added option to set on_poweroff, on_reboot and on_crash. + +------------------------------------------------------------------- +Wed Aug 20 13:45:31 MDT 2008 - carnold(a)novell.com + +- Use to qcow2 images and use qemu-img-xen to create them. + +------------------------------------------------------------------- +Mon Aug 19 08:24:28 MDT 2008 - carnold(a)novell.com + +- bnc#418207 - vm-install missing dependency, libvirt-python +- bnc#414899 - vm-install erroneously reports installation error + when using qcow +- bnc#417494 - python's file chooser dialog changes with + every release, hence this fix. +- Allow virt-viewer to be used as the vm viewer. + +------------------------------------------------------------------- Old: ---- vm-install-0.3.5.tar.bz2 New: ---- vm-install-0.3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.l17153/_old 2008-09-01 02:38:26.000000000 +0200 +++ /var/tmp/diff_new_pack.l17153/_new 2008-09-01 02:38:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package vm-install (Version 0.3.5) +# spec file for package vm-install (Version 0.3.7) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,12 +26,12 @@ License: GPL v2 or later Group: System/Emulators/PC AutoReqProv: yes -Version: 0.3.5 +Version: 0.3.7 Release: 1 Summary: Tool to Define a Virtual Machine and Install Its Operating System -Source0: %{name}-0.3.5.tar.bz2 +Source0: %{name}-0.3.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: xen-tools python-urlgrabber libxml2-python +Requires: xen-tools python-urlgrabber libxml2-python libvirt-python %define pysite %(python -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib()") %description @@ -85,6 +85,17 @@ %{_datadir}/applications/YaST2/vm-install.desktop %changelog +* Tue Aug 26 2008 carnold(a)novell.com +- Added option to set on_poweroff, on_reboot and on_crash. +* Wed Aug 20 2008 carnold(a)novell.com +- Use to qcow2 images and use qemu-img-xen to create them. +* Tue Aug 19 2008 carnold(a)novell.com +- bnc#418207 - vm-install missing dependency, libvirt-python +- bnc#414899 - vm-install erroneously reports installation error + when using qcow +- bnc#417494 - python's file chooser dialog changes with + every release, hence this fix. +- Allow virt-viewer to be used as the vm viewer. * Mon Aug 04 2008 carnold(a)novell.com - Added Wei Kong's PXE boot feature for PV guests. * Thu Jul 31 2008 carnold(a)novell.com ++++++ vm-install-0.3.5.tar.bz2 -> vm-install-0.3.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/glade/vm-install.glade new/vm-install-0.3.7/glade/vm-install.glade --- old/vm-install-0.3.5/glade/vm-install.glade 2008-08-07 03:57:49.000000000 +0200 +++ new/vm-install-0.3.7/glade/vm-install.glade 2008-08-30 05:41:30.000000000 +0200 @@ -3951,7 +3951,7 @@ </child> <child> - <widget class="GtkAlignment" id="alignment257"> + <widget class="GtkAlignment" id="alignment269"> <property name="visible">True</property> <property name="xalign">0.5</property> <property name="yalign">0.5</property> @@ -3963,7 +3963,7 @@ <property name="right_padding">0</property> <child> - <widget class="GtkVBox" id="vbox29"> + <widget class="GtkVBox" id="vbox93"> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">0</property> @@ -3994,125 +3994,310 @@ </child> <child> - <widget class="GtkAlignment" id="alignment268"> + <widget class="GtkTable" id="table129"> <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">0</property> + <property name="column_spacing">10</property> <child> - <widget class="GtkTable" id="table129"> + <widget class="GtkRadioButton" id="fv-src-pxe"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">PXE-boot</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">False</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_media_toggled" last_modification_time="Thu, 17 Jan 2008 21:34:29 GMT"/> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkHBox" id="hbox91"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> <property name="homogeneous">False</property> - <property name="row_spacing">0</property> - <property name="column_spacing">10</property> + <property name="spacing">10</property> <child> - <widget class="GtkRadioButton" id="fv-src-disk"> + <widget class="GtkComboBox" id="fv-src-disk-box"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">virtual-disk</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_fv_src_disk_toggled" last_modification_time="Thu, 17 Jan 2008 21:31:52 GMT"/> + <signal name="changed" handler="on_cd_path_changed" last_modification_time="Thu, 17 Jan 2008 21:29:21 GMT"/> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> </packing> </child> <child> - <widget class="GtkRadioButton" id="fv-src-pxe"> + <widget class="GtkButton" id="fv-src-disk-add"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="label" translatable="yes">PXE-boot</property> - <property name="use_underline">True</property> + <property name="label">gtk-add</property> + <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">fv-src-disk</property> - <signal name="toggled" handler="on_media_toggled" last_modification_time="Thu, 17 Jan 2008 21:34:29 GMT"/> + <signal name="clicked" handler="on_fv_src_disk_add_clicked" last_modification_time="Thu, 17 Jan 2008 21:26:42 GMT"/> </widget> <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> </packing> </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options">fill</property> + </packing> + </child> - <child> - <widget class="GtkHBox" id="hbox91"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">10</property> + <child> + <widget class="GtkRadioButton" id="fv-src-disk"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">virtual-disk</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <property name="active">True</property> + <property name="inconsistent">False</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_fv_src_disk_toggled" last_modification_time="Thu, 17 Jan 2008 21:31:52 GMT"/> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> - <child> - <widget class="GtkComboBox" id="fv-src-disk-box"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="add_tearoffs">False</property> - <property name="focus_on_click">True</property> - <signal name="changed" handler="on_cd_path_changed" last_modification_time="Thu, 17 Jan 2008 21:29:21 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="label549"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> - <child> - <widget class="GtkButton" id="fv-src-disk-add"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-add</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_fv_src_disk_add_clicked" last_modification_time="Thu, 17 Jan 2008 21:26:42 GMT"/> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options">fill</property> - </packing> - </child> + <child> + <widget class="GtkLabel" id="fv_exit_args_help"> + <property name="visible">True</property> + <property name="label" translatable="yes">fv_exit_args_help</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">10</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="table132"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">2</property> + <property name="column_spacing">10</property> + + <child> + <widget class="GtkLabel" id="fv_on_poweroff_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">fv_on_poweroff_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="fv_on_reboot_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">fv_on_reboot_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="fv_on_crash_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">fv_on_crash_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="fv-poweroff-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="fv-reboot-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="fv-crash-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> </child> </widget> <packing> <property name="padding">0</property> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> </packing> </child> @@ -4693,6 +4878,231 @@ <property name="fill">True</property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label537"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="pv_exit_args_help"> + <property name="visible">True</property> + <property name="label" translatable="yes">pv_exit_args_help</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">10</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="table130"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">2</property> + <property name="column_spacing">10</property> + + <child> + <widget class="GtkLabel" id="pv_on_poweroff_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">pv_on_poweroff_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="pv_on_reboot_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">pv_on_reboot_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="pv_on_crash_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">pv_on_crash_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="pv-reboot-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="pv-crash-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="pv-poweroff-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options">fill</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="label559"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> </child> </widget> @@ -4899,6 +5309,206 @@ <property name="fill">True</property> </packing> </child> + + <child> + <widget class="GtkLabel" id="label554"> + <property name="visible">True</property> + <property name="label" translatable="yes"></property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="r_exit_args_help"> + <property name="visible">True</property> + <property name="label" translatable="yes">r_exit_args_help</property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">True</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">10</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> + <widget class="GtkTable" id="table133"> + <property name="visible">True</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="homogeneous">False</property> + <property name="row_spacing">2</property> + <property name="column_spacing">10</property> + + <child> + <widget class="GtkLabel" id="r_on_poweroff_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">r_on_poweroff_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="r_on_reboot_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">r_on_reboot_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkLabel" id="r_on_crash_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">r_on_crash_label</property> + <property name="use_underline">False</property> + <property name="use_markup">False</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">1</property> + <property name="yalign">0.5</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="r-poweroff-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">0</property> + <property name="bottom_attach">1</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="r-reboot-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + + <child> + <widget class="GtkComboBox" id="r-crash-combo"> + <property name="visible">True</property> + <property name="items" translatable="yes"></property> + <property name="add_tearoffs">False</property> + <property name="focus_on_click">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">fill</property> + <property name="y_options">fill</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> </widget> </child> </widget> @@ -6991,7 +7601,7 @@ npiv phy tap:aio -tap:qcow +tap:qcow2 tap:vmdk</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/Makefile new/vm-install-0.3.7/Makefile --- old/vm-install-0.3.5/Makefile 2008-08-07 03:57:49.000000000 +0200 +++ new/vm-install-0.3.7/Makefile 2008-08-30 05:41:30.000000000 +0200 @@ -1,5 +1,5 @@ PACKAGE = vm-install -VER = 0.3.5 +VER = 0.3.7 default: @echo "Run 'make install DESTDIR=$destdir' to install." diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/setup.py new/vm-install-0.3.7/setup.py --- old/vm-install-0.3.5/setup.py 2008-08-07 03:57:49.000000000 +0200 +++ new/vm-install-0.3.7/setup.py 2008-08-30 05:41:30.000000000 +0200 @@ -1,7 +1,7 @@ from distutils.core import setup setup(name='vminstall', - version='0.3.5', + version='0.3.7', description='Define a virtual machine and install its operating system', author='Charles Coffing', author_email='ccoffing(a)novell.com', diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/src/vmdisks/disks.py new/vm-install-0.3.7/src/vmdisks/disks.py --- old/vm-install-0.3.5/src/vmdisks/disks.py 2008-08-14 22:44:34.000000000 +0200 +++ new/vm-install-0.3.7/src/vmdisks/disks.py 2008-08-30 05:41:29.000000000 +0200 @@ -80,7 +80,12 @@ def create_qcow(filename, bytes, arg={}, progress=lambda f:None): log.debug("Creating qcow file '%s', %d bytes." % (filename, bytes)) mb = str(bytes / 1024 / 1024) - vminstall.util.run(['/usr/sbin/qcow-create', mb, filename]) + if os.path.exists('/usr/bin/qemu-img-xen'): + mb = mb + 'M' + fmt = '-fqcow2' + vminstall.util.run(['/usr/bin/qemu-img-xen', 'create', fmt, filename, mb]) + else: + vminstall.util.run(['/usr/sbin/qcow-create', mb, filename]) def devid_to_devstr(devid): return 'xvd' + (chr((devid-51712)/16 + ord('a'))) @@ -188,29 +193,41 @@ def is_local(self): return True -class TapQcowDriver(FileDriver): +class TapQcow2Driver(FileDriver): def create(self, path, blocks, args={}, progress=lambda f:None): dpath = os.path.dirname(path) if not os.path.exists(dpath): os.makedirs(dpath) create_qcow(path, blocks * 512, args, progress=progress) def vsize(self, path): - # FIXME: how to query this? + if os.path.exists(path): + try: + fd = os.open(path, os.O_RDONLY) + buf = os.read(fd, 32) + except: + return None + os.close(fd) + if len(buf) == 32: + data = struct.unpack('>IIQIIQ', buf) + blocks = data[-1] / 512 + return blocks return None def is_local(self): return True + DRIVERS = { - 'file': LoopDriver('file'), - 'iscsi': Driver('iscsi'), - 'nbd': Driver('nbd'), - 'npiv': Driver('npiv'), - 'phy': PhyDriver('phy'), - 'tap:aio': TapAioDriver('tap:aio'), - 'tap:qcow': TapQcowDriver('tap:qcow'), - 'tap:vmdk': TapVmdkDriver('tap:vmdk'), + 'file': LoopDriver('file'), + 'iscsi': Driver('iscsi'), + 'nbd': Driver('nbd'), + 'npiv': Driver('npiv'), + 'phy': PhyDriver('phy'), + 'tap:aio': TapAioDriver('tap:aio'), + 'tap:qcow2': TapQcow2Driver('tap:qcow2'), + 'tap:vmdk': TapVmdkDriver('tap:vmdk'), } default_proto = 'file' +disk_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:aio:", "tap:qcow2:", "tap:vmdk:"] def parse_string(disk, extended=False, blocks=None): """Parses a text representation of a disk, and returns such a disk object. @@ -654,7 +671,6 @@ elif device_name == "": device_name = os.getcwd() else: - disk_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:aio:", "tap:qcow:", "tap:vmdk:"] index=0 pathname = device_name while index < len(disk_protocols): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/src/vminstall/console.py new/vm-install-0.3.7/src/vminstall/console.py --- old/vm-install-0.3.5/src/vminstall/console.py 2008-08-07 03:57:49.000000000 +0200 +++ new/vm-install-0.3.7/src/vminstall/console.py 2008-08-30 05:41:29.000000000 +0200 @@ -114,6 +114,8 @@ child's PID if (success and not detach), else None. Note that failure cannot be determined if detach is True. """ + #default_viewer = 'virt-viewer' + default_viewer = 'vncviewer' domid = get_domid_from_uuid(guest.uuid) vncport = get_vnc_port_from_domid(domid, timeout=10.0) if vncport == None: @@ -124,16 +126,19 @@ def find_viewer(): try: for path in os.environ['PATH'].split(':'): - viewer = os.path.join(path, 'vncviewer') + viewer = os.path.join(path, default_viewer) if os.path.exists(viewer): - log.info("Found vncviewer: %s" % (viewer,)) + log.info("Found %s: %s" % (default_viewer, viewer)) return viewer except: pass return None def exec_viewer(viewer): try: - os.execv(viewer, ['vncviewer', '::%d' % vncport, ]) + if default_viewer == 'virt-viewer': + os.execv(viewer, [default_viewer, '%d' % domid, ]) + else: + os.execv(viewer, [default_viewer, '::%d' % vncport, ]) except: os._exit(1) viewer = find_viewer() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/src/vminstall/gtk/chooser.py new/vm-install-0.3.7/src/vminstall/gtk/chooser.py --- old/vm-install-0.3.5/src/vminstall/gtk/chooser.py 2008-08-07 03:57:49.000000000 +0200 +++ new/vm-install-0.3.7/src/vminstall/gtk/chooser.py 2008-08-30 05:41:29.000000000 +0200 @@ -1,4 +1,5 @@ import gtk +from vmdisks.disks import disk_protocols def chooser(dialog_name, topwin, mode=gtk.FILE_CHOOSER_ACTION_OPEN, file=None, folder=None, type=None): @@ -6,7 +7,6 @@ (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_ACCEPT)) if file: - disk_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:aio:", "tap:qcow:", "tap:vmdk:"] index=0 filename = file while index < len(disk_protocols): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/src/vminstall/gtk/disk_widgets.py new/vm-install-0.3.7/src/vminstall/gtk/disk_widgets.py --- old/vm-install-0.3.5/src/vminstall/gtk/disk_widgets.py 2008-08-15 21:59:59.000000000 +0200 +++ new/vm-install-0.3.7/src/vminstall/gtk/disk_widgets.py 2008-08-30 05:41:29.000000000 +0200 @@ -15,6 +15,7 @@ import vmdisks from tree_view import * from chooser import * +from vmdisks.disks import disk_protocols class DisksView(PyTreeView): def __init__(self, disks, renumber=True): @@ -398,7 +399,7 @@ (file, folder) = chooser(vminstall.msg.locate_disk, self.disk_edit_widget.get_toplevel(), file=file, mode=mode, folder=self.disk_folder) - if folder not in file: + if file and folder not in file: file = folder + "/" + file if file != None: self.disk_folder = folder @@ -416,7 +417,6 @@ self.glade.get_widget('disk-location').get_child().set_text(file) def parse_protocol(self): - disk_protocols = ["file:", "iscsi:", "nbd:", "npiv:", "phy:", "tap:aio:", "tap:qcow:", "tap:vmdk:"] diskwidget = self.glade.get_widget('disk-location') disktext = diskwidget.get_active_text() text = None diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/src/vminstall/gtk/interface.py new/vm-install-0.3.7/src/vminstall/gtk/interface.py --- old/vm-install-0.3.5/src/vminstall/gtk/interface.py 2008-08-13 19:28:16.000000000 +0200 +++ new/vm-install-0.3.7/src/vminstall/gtk/interface.py 2008-08-30 05:41:29.000000000 +0200 @@ -244,6 +244,15 @@ set_text('hardware-processors-title', text=vminstall.msg.processors, modifier=bold_prompt, markup=True) set_text('i_extra_args_help', text=vminstall.msg.extra_args_help) set_text('i_extra_args_label', text=vminstall.msg.extra_args_prompt, modifier=prompt) + set_text('pv_exit_args_help', text=vminstall.msg.exit_args_help) + set_text('pv_on_poweroff_label', text=vminstall.msg.on_poweroff, modifier=prompt) + set_text('pv_on_reboot_label', text=vminstall.msg.on_reboot, modifier=prompt) + set_text('pv_on_crash_label', text=vminstall.msg.on_crash, modifier=prompt) + set_text('pv_exit_args_help', text=vminstall.msg.exit_args_help) + set_text('fv_exit_args_help', text=vminstall.msg.exit_args_help) + set_text('fv_on_poweroff_label', text=vminstall.msg.on_poweroff, modifier=prompt) + set_text('fv_on_reboot_label', text=vminstall.msg.on_reboot, modifier=prompt) + set_text('fv_on_crash_label', text=vminstall.msg.on_crash, modifier=prompt) set_text('install_help') set_text('intro_help1') set_text('intro_help2', markup=True) @@ -271,6 +280,10 @@ set_text('pv_install_help', text=vminstall.msg.install_media_help) set_text('r_extra_args_help', text=vminstall.msg.extra_args_help) set_text('r_extra_args_label', text=vminstall.msg.extra_args_prompt, modifier=prompt) + set_text('r_exit_args_help', text=vminstall.msg.exit_args_help) + set_text('r_on_poweroff_label', text=vminstall.msg.on_poweroff, modifier=prompt) + set_text('r_on_reboot_label', text=vminstall.msg.on_reboot, modifier=prompt) + set_text('r_on_crash_label', text=vminstall.msg.on_crash, modifier=prompt) set_text('summary_help', markup=True) set_text('vcpus_prompt', modifier=prompt) @@ -621,6 +634,21 @@ self.window.get_widget('fv-src-pxe').set_active(True) else: self.window.get_widget('fv-src-disk').set_active(True) + on_exit_normal = on_exit[:] + on_exit_normal.pop() + on_exit_normal.pop() + combo = self.window.get_widget('fv-poweroff-combo') + set_combo_from_list(combo, on_exit_normal) + index = on_exit_normal.index(self.defaults.on_poweroff) + combo.set_active(index) + combo = self.window.get_widget('fv-reboot-combo') + set_combo_from_list(combo, on_exit_normal) + index = on_exit_normal.index(self.defaults.on_reboot) + combo.set_active(index) + combo = self.window.get_widget('fv-crash-combo') + set_combo_from_list(combo, on_exit) + index = on_exit.index(self.defaults.on_crash) + combo.set_active(index) elif page_number == self.pages['pv_install']: combo = self.window.get_widget('pv-src-disk-box') self.src_disks = filter(lambda disk: disk.exists(), self.defaults.disks) @@ -663,11 +691,41 @@ for l in ('os_settings_help', 'os-settings-hbox'): self.window.get_widget(l).set_sensitive(sens) self.window.get_widget('i-extra-args').set_text(self.defaults.extra_args) + on_exit_normal = on_exit[:] + on_exit_normal.pop() + on_exit_normal.pop() + combo = self.window.get_widget('pv-poweroff-combo') + set_combo_from_list(combo, on_exit_normal) + index = on_exit_normal.index(self.defaults.on_poweroff) + combo.set_active(index) + combo = self.window.get_widget('pv-reboot-combo') + set_combo_from_list(combo, on_exit_normal) + index = on_exit_normal.index(self.defaults.on_reboot) + combo.set_active(index) + combo = self.window.get_widget('pv-crash-combo') + set_combo_from_list(combo, on_exit) + index = on_exit.index(self.defaults.on_crash) + combo.set_active(index) elif page_number == self.pages['pv_runtime']: w = self.window.get_widget('r-extra-args') w.connect('activate', self.apply) w.set_text(self.defaults.extra_args) w.grab_focus() + on_exit_normal = on_exit[:] + on_exit_normal.pop() + on_exit_normal.pop() + combo = self.window.get_widget('r-poweroff-combo') + set_combo_from_list(combo, on_exit_normal) + index = on_exit_normal.index(self.defaults.on_poweroff) + combo.set_active(index) + combo = self.window.get_widget('r-reboot-combo') + set_combo_from_list(combo, on_exit_normal) + index = on_exit_normal.index(self.defaults.on_reboot) + combo.set_active(index) + combo = self.window.get_widget('r-crash-combo') + set_combo_from_list(combo, on_exit) + index = on_exit.index(self.defaults.on_crash) + combo.set_active(index) ## ## Buttons @@ -1190,6 +1248,12 @@ self.options.pxe_boot = 0 else: self.options.pxe_boot = 1 + combo = self.window.get_widget('fv-poweroff-combo') + self.options.on_poweroff = combo.get_active_text() + combo = self.window.get_widget('fv-reboot-combo') + self.options.on_reboot = combo.get_active_text() + combo = self.window.get_widget('fv-crash-combo') + self.options.on_crash = combo.get_active_text() elif page_num == self.pages['pv_install']: if self.window.get_widget('pv-src-disk').get_active(): i = self.window.get_widget('pv-src-disk-box').get_active() @@ -1222,8 +1286,20 @@ self.options.source = src self.options.os_settings = self.window.get_widget('os-settings').get_text() self.options.extra_args = self.window.get_widget('i-extra-args').get_text() + combo = self.window.get_widget('pv-poweroff-combo') + self.options.on_poweroff = combo.get_active_text() + combo = self.window.get_widget('pv-reboot-combo') + self.options.on_reboot = combo.get_active_text() + combo = self.window.get_widget('pv-crash-combo') + self.options.on_crash = combo.get_active_text() elif page_num == self.pages['pv_runtime']: self.options.extra_args = self.window.get_widget('r-extra-args').get_text() + combo = self.window.get_widget('r-poweroff-combo') + self.options.on_poweroff = combo.get_active_text() + combo = self.window.get_widget('r-reboot-combo') + self.options.on_reboot = combo.get_active_text() + combo = self.window.get_widget('r-crash-combo') + self.options.on_crash = combo.get_active_text() return True diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/src/vminstall/msg.py new/vm-install-0.3.7/src/vminstall/msg.py --- old/vm-install-0.3.5/src/vminstall/msg.py 2008-08-07 03:57:49.000000000 +0200 +++ new/vm-install-0.3.7/src/vminstall/msg.py 2008-08-30 05:41:29.000000000 +0200 @@ -192,6 +192,7 @@ os_type_help = _("Please specify the type of operating system that will run within the virtual machine. This defines many defaults, and helps decide how to start paravirtualized operating systems.") os_settings_help = _("Some operating systems support automating the installation by specifying a URL or file(s). Select a directory to include multiple files.") extra_args_help = _("Some operating systems accept additional arguments, used to customize the installation or boot process.") +exit_args_help = _("Select the behavior when the operating system exits with power off, reboot or crash. Settings take effect after installation is complete.") #STEVE #install_media_help = _("Please indicate where the installation media is available for the operating system that you would like to install.") install_media_help = _("Specify the bootable virtual disk (often labeled as Disk 1) or the network installation source URL. Each CD, DVD, or ISO image required for installation must be added as a virtual disk.") @@ -254,6 +255,9 @@ installation_source_prompt = _("Installation Source") automated_installation_prompt = _("Automated Installation") operating_system_prompt = _("Operating System") +on_poweroff = _("Power Off") +on_reboot = _("Reboot") +on_crash = _("Crash") # Descriptive names of automated install methods kickstart_desc = _("Kickstart file or URL") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.3.5/src/vminstall/options.py new/vm-install-0.3.7/src/vminstall/options.py --- old/vm-install-0.3.5/src/vminstall/options.py 2008-08-07 03:57:49.000000000 +0200 +++ new/vm-install-0.3.7/src/vminstall/options.py 2008-08-30 05:41:29.000000000 +0200 @@ -24,6 +24,8 @@ import xend import keytable +on_exit = ["destroy", "restart", "preserve", "rename-restart", "coredump-destroy", "coredump-restart"] + class Options(dict): def __init__(self): default_keys = ( @@ -170,7 +172,7 @@ check_type(value, (list,)) nics = value elif item == 'on_crash' or item == 'on_poweroff' or item == 'on_reboot': - if value not in ('restart', 'destroy', 'preserve', 'rename-restart'): + if value not in on_exit: bad() elif item == 'os_settings': check_type(value, (str,)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telnet
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package telnet checked in at Mon Sep 1 02:38:23 CEST 2008. -------- --- telnet/telnet.changes 2008-04-09 12:03:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/telnet/telnet.changes 2008-08-30 20:16:03.999735000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 30 20:13:23 CEST 2008 - cthiel(a)suse.de + +- fix build with latests ncurses + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telnet.spec ++++++ --- /var/tmp/diff_new_pack.c15980/_old 2008-09-01 02:38:12.000000000 +0200 +++ /var/tmp/diff_new_pack.c15980/_new 2008-09-01 02:38:12.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package telnet (Version 1.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# 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. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ Provides: nkitb:/usr/bin/telnet AutoReqProv: on Version: 1.2 -Release: 108 +Release: 134 Summary: A client program for the telnet remote login protocol BuildRequires: ncurses-devel Requires: netcfg @@ -61,7 +68,9 @@ %patch2 %build -CFLAGS="$RPM_OPT_FLAGS -fpie" LDFLAGS="-pie" ./configure +export CFLAGS="$RPM_OPT_FLAGS -fpie $(ncurses5-config --cflags)" +export LDFLAGS="-pie $(ncurses5-config --libs)" +./configure make %install @@ -97,6 +106,8 @@ %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-server %changelog +* Sat Aug 30 2008 cthiel(a)suse.de +- fix build with latests ncurses * Wed Apr 09 2008 jsrain(a)suse.cz - fixed description for ports information for SuSEfirewall (bnc #373969) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit squaroid
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package squaroid checked in at Mon Sep 1 02:38:16 CEST 2008. -------- --- squaroid/squaroid.changes 2007-06-07 09:48:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/squaroid/squaroid.changes 2008-08-30 20:22:24.600543000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 30 20:19:48 CEST 2008 - cthiel(a)suse.de + +- fix build with latests ncurses + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ squaroid.spec ++++++ --- /var/tmp/diff_new_pack.t15150/_old 2008-09-01 02:37:56.000000000 +0200 +++ /var/tmp/diff_new_pack.t15150/_new 2008-09-01 02:37:56.000000000 +0200 @@ -1,25 +1,33 @@ # # spec file for package squaroid (Version 0.60.3) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# 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. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: squaroid BuildRequires: gtk-devel imlib-devel ncurses-devel update-desktop-files %define gfx_version 0.2 %define sfx_version 0.1 -License: GNU General Public License (GPL) +License: GPL v2 or later Group: Amusements/Games/Strategy/Other Summary: A Strategy Game Version: 0.60.3 -Release: 940 -URL: http://www.squaroid.org/ +Release: 1055 +Url: http://www.squaroid.org/ Source: squaroid-%{version}.tar.bz2 Source1: squaroid-gfx-%{gfx_version}.tar.bz2 Source2: squaroid-sfx-%{sfx_version}.tar.bz2 @@ -67,7 +75,8 @@ %build autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure \ +export LDFLAGS="$LDFLAGS $(ncurses5-config --libs)" +CFLAGS="$RPM_OPT_FLAGS -Wall $(ncurses5-config --cflags)" ./configure \ --enable-force_sound \ --prefix=%{_prefix} \ --datadir=%{_datadir} @@ -78,12 +87,12 @@ #build squaroid-sfx cd squaroid-sfx-%{sfx_version} autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --datadir=%{_datadir} +CFLAGS="$RPM_OPT_FLAGS $(ncurses5-config --cflags)" ./configure --prefix=%{_prefix} --datadir=%{_datadir} make #build squaroid-gfx cd ../squaroid-gfx-%{gfx_version} autoreconf --force --install -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --datadir=%{_datadir} +CFLAGS="$RPM_OPT_FLAGS $(ncurses5-config --cflags)" ./configure --prefix=%{_prefix} --datadir=%{_datadir} make cd .. %suse_update_desktop_file -i squaroid Game StrategyGame @@ -115,48 +124,50 @@ /usr/share/applications/* %changelog -* Thu Jun 07 2007 - pgajdos(a)suse.cz +* Sat Aug 30 2008 cthiel(a)suse.de +- fix build with latests ncurses +* Thu Jun 07 2007 pgajdos(a)suse.cz - add --datadir option to configure -* Thu Mar 29 2007 - rguenther(a)suse.de +* Thu Mar 29 2007 rguenther(a)suse.de - add ncurses-devel BuildRequires -* Tue Jan 30 2007 - anicka(a)suse.cz +* Tue Jan 30 2007 anicka(a)suse.cz - build all files with RPM_OPT_FLAGS - fix implicit definitions - fix overflow in sqirc.c -* Fri Jul 07 2006 - anicka(a)suse.cz +* Fri Jul 07 2006 anicka(a)suse.cz - fix missing return statement in libqdwav [#187246] -* Fri Mar 24 2006 - anicka(a)suse.cz +* Fri Mar 24 2006 anicka(a)suse.cz - fix undefined operation [#160440] -* Fri Mar 24 2006 - ro(a)suse.de +* Fri Mar 24 2006 ro(a)suse.de - rename struct user to sq_user -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Oct 12 2005 - anicka(a)suse.cz +* Wed Oct 12 2005 anicka(a)suse.cz - fix aliasing -* Fri May 13 2005 - mcihar(a)suse.cz +* Fri May 13 2005 mcihar(a)suse.cz - fix buffer overflows -* Wed Apr 13 2005 - mcihar(a)suse.cz +* Wed Apr 13 2005 mcihar(a)suse.cz - fix for gcc 4 -* Sat Jan 10 2004 - adrian(a)suse.de +* Sat Jan 10 2004 adrian(a)suse.de - build as user -* Fri Aug 15 2003 - adrian(a)suse.de +* Fri Aug 15 2003 adrian(a)suse.de - add desktop file -* Wed May 14 2003 - ro(a)suse.de +* Wed May 14 2003 ro(a)suse.de - run autoreconf -* Wed Nov 13 2002 - mcihar(a)suse.cz +* Wed Nov 13 2002 mcihar(a)suse.cz - fixed multiline string literals -* Mon Aug 05 2002 - mcihar(a)suse.de +* Mon Aug 05 2002 mcihar(a)suse.de - removed dependencies on squaroid-sfx and squaroid-gfx packages -* Thu Jul 18 2002 - mcihar(a)suse.cz +* Thu Jul 18 2002 mcihar(a)suse.cz - fix building on machines without /dev/dsp -* Tue Jun 11 2002 - prehak(a)suse.cz +* Tue Jun 11 2002 prehak(a)suse.cz - merged with squaroid-sfx and squaroid-gfx packages [#16416] -* Mon Aug 13 2001 - cihlar(a)suse.cz +* Mon Aug 13 2001 cihlar(a)suse.cz - disable sound on s390 -* Tue Jun 12 2001 - cihlar(a)suse.cz +* Tue Jun 12 2001 cihlar(a)suse.cz - added libtoolize --force and aclocal to fix to compile -* Tue May 22 2001 - cihlar(a)suse.cz +* Tue May 22 2001 cihlar(a)suse.cz - fixed cast warnings on ia64 -* Fri Dec 01 2000 - cihlar(a)suse.cz +* Fri Dec 01 2000 cihlar(a)suse.cz - package created ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pacemaker
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package pacemaker checked in at Mon Sep 1 02:37:46 CEST 2008. -------- --- pacemaker/pacemaker.changes 2008-08-20 17:12:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/pacemaker/pacemaker.changes 2008-08-30 12:42:25.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Aug 30 12:38:56 CEST 2008 - abeekhof(a)suse.de + +- Update source tarball to revision: 902885c90d96 +- Fixes build ordering ssue that prevented compilation of lib/common + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pacemaker.spec ++++++ --- /var/tmp/diff_new_pack.i12567/_old 2008-09-01 02:37:33.000000000 +0200 +++ /var/tmp/diff_new_pack.i12567/_new 2008-09-01 02:37:33.000000000 +0200 @@ -34,7 +34,7 @@ Name: pacemaker Summary: The Pacemaker scalable High-Availability cluster resource manager Version: 0.7.1 -Release: 1 +Release: 2 License: GPL v2 or later; LGPL v2.1 or later Url: http://www.clusterlabs.org Group: Productivity/Clustering/HA @@ -277,6 +277,9 @@ %{_libdir}/*.so %changelog +* Sat Aug 30 2008 abeekhof(a)suse.de +- Update source tarball to revision: 902885c90d96 +- Fixes build ordering ssue that prevented compilation of lib/common * Wed Aug 20 2008 abeekhof(a)suse.de - Update source tarball to revision: f567855328b7 (0.7.1) + Added features needed to support libdlm and ocfs2-tools ++++++ pacemaker.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/.hg_archival.txt new/pacemaker/.hg_archival.txt --- old/pacemaker/.hg_archival.txt 2008-08-20 15:59:55.000000000 +0200 +++ new/pacemaker/.hg_archival.txt 2008-08-30 12:33:29.000000000 +0200 @@ -1,2 +1,2 @@ repo: 8448b17e67437947c48c639c6faa4371c4a14b3b -node: f567855328b71387b19a2ab9a1647d2e3763baa2 +node: 902885c90d96c01eecbcfaab94d9421db5be8510 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pacemaker/lib/common/Makefile.am new/pacemaker/lib/common/Makefile.am --- old/pacemaker/lib/common/Makefile.am 2008-08-20 15:59:55.000000000 +0200 +++ new/pacemaker/lib/common/Makefile.am 2008-08-30 12:33:29.000000000 +0200 @@ -34,8 +34,10 @@ if BUILD_HEARTBEAT_SUPPORT libcrmcluster_la_SOURCES += heartbeat.c endif + libcrmcluster_la_LDFLAGS = -version-info 1:0:0 -libcrmcluster_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la $(CLUSTERLIBS) +libcrmcluster_la_LIBADD = $(CLUSTERLIBS) $(top_builddir)/lib/common/libcrmcommon.la +libcrmcluster_la_DEPENDENCIES = $(top_builddir)/lib/common/libcrmcommon.la # Must use non-fatal CFLAGS because glib insists on pretending things are const # when they're not and thus we need the crm_element_value_const() hack @@ -47,8 +49,7 @@ CFLAGS = $(NON_FATAL_CFLAGS) -fPIC -libcrmcommon_la_SOURCES = ipc.c utils.c xml.c ctrl.c iso8601.c \ - iso8601_fields.c remote.c +libcrmcommon_la_SOURCES = ipc.c utils.c xml.c ctrl.c iso8601.c iso8601_fields.c remote.c libcrmcommon_la_LDFLAGS = -version-info 2:0:0 $(GNUTLSLIBS) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lirc
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package lirc checked in at Mon Sep 1 02:37:40 CEST 2008. -------- --- lirc/lirc-kernel.changes 2008-05-06 22:35:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/lirc/lirc-kernel.changes 2008-09-01 02:20:51.465071000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 1 02:20:04 CEST 2008 - ro(a)suse.de + +- pick some fixes from cvs to compile with 2.6.26 +- hack to build with 2.6.27 + +------------------------------------------------------------------- New: ---- lirc-kernel-2.6.26-fixes.patch lirc-kernel-2.6.27-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lirc-kernel.spec ++++++ --- /var/tmp/diff_new_pack.zg9930/_old 2008-09-01 02:37:14.000000000 +0200 +++ /var/tmp/diff_new_pack.zg9930/_new 2008-09-01 02:37:14.000000000 +0200 @@ -25,13 +25,17 @@ Group: System/Kernel Summary: LIRC kernel modules Version: 0.8.3 -Release: 4 +Release: 5 Source0: lirc-%{version}.tar.bz2 Source1: Makefile.module Source2: Makefile.modsub Patch: lirc-0.8.1-kernel_SLAB_ATOMIC.diff # http://brakemeier.de/electronics/vdr/lirc-imon.html Patch1: lirc-0.8.3pre1-imon-pad2keys.patch +# picked from CVS +Patch2: lirc-kernel-2.6.26-fixes.patch +# hack to build +Patch3: lirc-kernel-2.6.27-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %suse_kernel_module_package -n lirc kdump um debug @@ -87,6 +91,8 @@ popd #%patch -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 autoreconf -f -i ./configure --with-driver=all cp -a drivers source @@ -116,6 +122,9 @@ done %changelog +* Mon Sep 01 2008 ro(a)suse.de +- pick some fixes from cvs to compile with 2.6.26 +- hack to build with 2.6.27 * Mon May 05 2008 lnussel(a)suse.de - new version 0.8.3 * added support for Samsung USB IR Receiver (Robert Schedel) ++++++ lirc.spec ++++++ --- /var/tmp/diff_new_pack.zg9930/_old 2008-09-01 02:37:14.000000000 +0200 +++ /var/tmp/diff_new_pack.zg9930/_new 2008-09-01 02:37:14.000000000 +0200 @@ -42,7 +42,7 @@ Group: Hardware/Other AutoReqProv: on Version: 0.8.3 -Release: 28 +Release: 34 PreReq: %fillup_prereq %insserv_prereq Summary: Tools for Infrared Receivers Source0: lirc-0.8.3.tar.bz2 ++++++ lirc-kernel-2.6.26-fixes.patch ++++++ --- lirc/drivers/lirc_dev/lirc_dev.c 2008/01/13 10:45:02 1.56 +++ lirc/drivers/lirc_dev/lirc_dev.c 2008/08/12 20:50:39 1.59 @@ -49,7 +49,11 @@ #include <linux/uaccess.h> #include <linux/errno.h> #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) #include <asm/semaphore.h> +#else +#include <linux/semaphore.h> +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include <linux/wrapper.h> #endif @@ -145,7 +149,8 @@ #ifdef LIRC_HAVE_DEVFS_26 devfs_remove(DEV_LIRC "/%u", ir->p.minor); #endif - class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); + lirc_device_destroy(lirc_class, + MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); if (ir->buf != ir->p.rbuf) { lirc_buffer_free(ir->buf); @@ -400,9 +405,9 @@ S_IFCHR|S_IRUSR|S_IWUSR, DEV_LIRC "/%u", ir->p.minor); #endif - (void) lirc_class_device_create(lirc_class, NULL, - MKDEV(IRCTL_DEV_MAJOR, ir->p.minor), - ir->p.dev, "lirc%u", ir->p.minor); + (void) lirc_device_create(lirc_class, ir->p.dev, + MKDEV(IRCTL_DEV_MAJOR, ir->p.minor), + "lirc%u", ir->p.minor); if (p->sample_rate || p->get_queue) { /* try to fire up polling thread */ @@ -441,7 +446,8 @@ return minor; out_sysfs: - class_device_destroy(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); + lirc_device_destroy(lirc_class, + MKDEV(IRCTL_DEV_MAJOR, ir->p.minor)); #ifdef LIRC_HAVE_DEVFS_24 devfs_unregister(ir->devfs_handle); #endif --- lirc/drivers/kcompat.h 2008/01/13 10:26:28 5.34 +++ lirc/drivers/kcompat.h 2008/05/14 16:37:49 5.36 @@ -36,10 +36,10 @@ class_simple_destroy(cls); } -#define lirc_class_device_create(cs, parent, dev, device, fmt, args...) \ - class_simple_device_add(cs, dev, device, fmt, ## args) +#define lirc_device_create(cs, parent, dev, fmt, args...) \ + class_simple_device_add(cs, dev, parent, fmt, ## args) -static inline void class_device_destroy(lirc_class_t *cls, dev_t devt) +static inline void lirc_device_destroy(lirc_class_t *cls, dev_t devt) { class_simple_device_remove(devt); } @@ -48,20 +48,40 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) -#define lirc_class_device_create(cs, parent, dev, device, fmt, args...) \ - class_device_create(cs, dev, device, fmt, ## args) +#define lirc_device_create(cs, parent, dev, fmt, args...) \ + class_device_create(cs, dev, parent, fmt, ## args) #else /* >= 2.6.15 */ -#define lirc_class_device_create class_device_create +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + +#define lirc_device_create(cs, parent, dev, fmt, args...) \ + class_device_create(cs, NULL, dev, parent, fmt, ## args) + +#else /* >= 2.6.26 */ + +#define lirc_device_create device_create + +#endif /* >= 2.6.26 */ + #define LIRC_DEVFS_PREFIX -#endif +#endif /* >= 2.6.15 */ typedef struct class lirc_class_t; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + +#define lirc_device_destroy class_device_destroy + +#else + +#define lirc_device_destroy device_destroy + #endif +#endif /* >= 2.6.13 */ + #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) #define LIRC_HAVE_DEVFS #define LIRC_HAVE_DEVFS_24 @@ -133,8 +153,8 @@ #ifndef LIRC_HAVE_SYSFS #define class_destroy(x) do { } while (0) #define class_create(x, y) NULL -#define class_device_destroy(x, y) do { } while (0) -#define lirc_class_device_create(x, y, z, xx, yy, zz) 0 +#define lirc_class_destroy(x, y) do { } while (0) +#define lirc_class_create(x, y, z, xx, yy, zz) 0 #define IS_ERR(x) 0 typedef struct class_simple { --- lirc/drivers/lirc_i2c/lirc_i2c.c 2008/08/31 23:45:56 1.1 +++ lirc/drivers/lirc_i2c/lirc_i2c.c 2008/08/31 23:46:36 @@ -54,7 +54,11 @@ #include <linux/i2c.h> #include <linux/i2c-algo-bit.h> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) #include <asm/semaphore.h> +#else +#include <linux/semaphore.h> +#endif #include "drivers/kcompat.h" #include "drivers/lirc_dev/lirc_dev.h" ++++++ lirc-kernel-2.6.27-fixes.patch ++++++ --- lirc-0.8.3/drivers/kcompat.h 2008/09/01 00:02:20 1.5 +++ lirc-0.8.3/drivers/kcompat.h 2008/09/01 00:15:39 @@ -60,7 +60,8 @@ #else /* >= 2.6.26 */ -#define lirc_device_create device_create +#define lirc_device_create(cs, parent, dev, fmt, args...) \ + device_create_drvdata(cs, parent, dev, NULL, fmt, ## args) #endif /* >= 2.6.26 */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mkvtoolnix
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package mkvtoolnix checked in at Mon Sep 1 02:37:22 CEST 2008. -------- --- mkvtoolnix/mkvtoolnix.changes 2008-03-06 22:59:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkvtoolnix/mkvtoolnix.changes 2008-08-31 00:28:07.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 31 00:12:05 CEST 2008 - seife(a)suse.de + +- add libexpat-devel to buildrequires +- add %debug_package for buildservice build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkvtoolnix.spec ++++++ --- /var/tmp/diff_new_pack.n10081/_old 2008-09-01 02:37:15.000000000 +0200 +++ /var/tmp/diff_new_pack.n10081/_new 2008-09-01 02:37:15.000000000 +0200 @@ -2,19 +2,26 @@ # spec file for package mkvtoolnix (Version 2.2.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# 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. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: mkvtoolnix -BuildRequires: flac-devel gcc-c++ libmatroska-devel libvorbis-devel lzo-devel pcre-devel wxGTK-devel +BuildRequires: flac-devel gcc-c++ libexpat-devel libmatroska-devel libvorbis-devel lzo-devel pcre-devel wxGTK-devel Url: http://www.bunkus.org/videotools/mkvtoolnix/ Version: 2.2.0 -Release: 3 +Release: 74 Summary: Tools to Create, Alter, and Inspect Matroska Files License: GPL v2 or later Group: Productivity/Multimedia/Other @@ -35,6 +42,11 @@ -------- Moritz Bunkus <moritz(a)bunkus.org> +%if 0%{?opensuse_bs} +%if 0%{?suse_version} +%endif +%endif + %prep %setup @@ -74,7 +86,10 @@ #%doc README.SUSE AUTHORS ChangeLog COPYING README %changelog -* Thu Mar 06 2008 seife(a)suse.de +* Sun Aug 31 2008 seife(a)suse.de +- add libexpat-devel to buildrequires +- add %%debug_package for buildservice build +* Fri Mar 07 2008 seife(a)suse.de - fix buildservice build (missing pcre-devel buildrequires) * Wed Mar 05 2008 seife(a)suse.de - update to v2.2.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit liferea
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package liferea checked in at Mon Sep 1 02:37:06 CEST 2008. -------- --- GNOME/liferea/liferea.changes 2008-08-29 19:34:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/liferea/liferea.changes 2008-08-31 15:48:13.002083000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 31 15:33:05 CEST 2008 - cthiel(a)suse.de + +- switch to xulrunner 190, thanks to Wolfgang Rosenauer! + +------------------------------------------------------------------- New: ---- liferea-1.4.18-xulrunner-1.9.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liferea.spec ++++++ --- /var/tmp/diff_new_pack.Pj8526/_old 2008-09-01 02:36:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Pj8526/_new 2008-09-01 02:36:56.000000000 +0200 @@ -19,16 +19,17 @@ Name: liferea -%define xulrunner_version 181 -BuildRequires: NetworkManager-devel dbus-1-devel fdupes gcc-c++ gconf2-devel gnutls-devel gtk2-devel hicolor-icon-theme intltool libglade2-devel libgtkhtml-devel libnotify-devel libstdc++-devel libxslt-devel lua-devel mozilla-xulrunner181-devel sqlite-devel update-desktop-files +%define xulrunner_version 190 +BuildRequires: NetworkManager-devel dbus-1-devel fdupes gcc-c++ gconf2-devel gnutls-devel gtk2-devel hicolor-icon-theme intltool libglade2-devel libnotify-devel libstdc++-devel libxslt-devel lua-devel sqlite-devel update-desktop-files # FIXME: for libgtkhtml-devel: checking for 64bit platform... yes -> disabling GtkHTML2 License: GPL v2 or later Group: Productivity/Other Version: 1.4.18 -Release: 1 +Release: 3 Summary: Linux Feed Reader Source: %{name}-%{version}.tar.bz2 Patch: %{name}-opensuse-feeds.patch +Patch1: %{name}-1.4.18-xulrunner-1.9.patch Url: http://liferea.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: dbus-1 >= 0.30 @@ -36,13 +37,8 @@ BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel Requires: mozilla-xulrunner%{xulrunner_version} %else -%if %suse_version > 1000 && %suse_version <= 1010 BuildRequires: gecko-sdk Requires: mozilla-xulrunner -%else -BuildRequires: gecko-sdk -Requires: mozilla -%endif %endif Requires: hicolor-icon-theme Requires: %{name}-lang = %{version} @@ -70,6 +66,7 @@ %setup -q rm src/liferea %patch +%patch1 %build autoreconf -f -i @@ -82,6 +79,7 @@ export CPPFLAGS="$RPM_OPT_FLAGS -fPIC" %configure \ --disable-gtkhtml2 \ + --disable-gecko \ --disable-schemas-install make %{?jobs:-j %jobs} @@ -120,6 +118,8 @@ %files lang -f %{name}.lang %changelog +* Sun Aug 31 2008 cthiel(a)suse.de +- switch to xulrunner 190, thanks to Wolfgang Rosenauer! * Fri Aug 29 2008 cthiel(a)suse.de - update to version 1.4.18 * Fixes SF #1800030: Fix date format problem in non UTF-8 locale for date ++++++ liferea-1.4.18-xulrunner-1.9.patch ++++++ --- configure.ac +++ configure.ac @@ -163,35 +163,35 @@ dnl ********* dnl XulRunner dnl ********* if test "x$enable_xulrunner" = "xyes" ; then AC_MSG_CHECKING([for XulRunner 1.9+ support]) - PKG_CHECK_MODULES(XULRUNNER, libxul-embedding, XULRUNNER_PROVIDER=libxul-embedding, XULRUNNER_PROVIDER=) + PKG_CHECK_MODULES(XULRUNNER, [libxul-embedding-unstable nspr], XULRUNNER_PROVIDER=libxul-embedding-unstable, XULRUNNER_PROVIDER=) if test "x$XULRUNNER_PROVIDER" = "x" ; then AC_MSG_CHECKING([for XulRunner 1.8 support]) PKG_CHECK_MODULES(XULRUNNER, xulrunner-gtkmozembed, XULRUNNER_PROVIDER=xulrunner-gtkmozembed, XULRUNNER_PROVIDER=) fi if test "x$XULRUNNER_PROVIDER" = "x" ; then enable_xulrunner=no else enable_xulrunner=yes XULRUNNER_HOME="`$PKG_CONFIG --variable=libdir $XULRUNNER_PROVIDER`" AC_SUBST([XULRUNNER_HOME]) AC_SUBST(XULRUNNER_CFLAGS) AC_SUBST(XULRUNNER_LIBS) - if test "x$XULRUNNER_HOME" = "x" ; then - AC_MSG_RESULT([Fatal: XulRunner enabled, but XULRUNNER_HOME is empty!]) + if test "x`echo $XULRUNNER_CFLAGS | grep -e '-DXPCOM_GLUE'`" = "x" && test "x$XULRUNNER_HOME" = "x" ; then + AC_MSG_RESULT([Fatal: XulRunner enabled without XPCOM_GLUE, but XULRUNNER_HOME is empty!]) exit 1 fi MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' | cut -c 3-` dnl the Mozilla XPCOM access means C++ AC_PROG_CXX fi --- src/mozilla/xulrunner.c +++ src/mozilla/xulrunner.c @@ -25,20 +25,22 @@ #include <gtkmozembed.h> #include "ui/ui_htmlview.h" #include "mozembed.h" #include "plugin.h" static void xulrunner_init(void) { +#ifndef XPCOM_GLUE /* gtk_moz_embed_set_comp_path() must not be called without a component path for XulRunner. Passing NULL will crash Liferea. */ gtk_moz_embed_set_comp_path(XULRUNNER_HOME); +#endif mozembed_init(); } static struct htmlviewPlugin xulrunnerInfo = { .api_version = HTMLVIEW_PLUGIN_API_VERSION, .name = "XulRunner", .priority = 11, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ipsec-tools
by root＠Hilbert.suse.de 01 Sep '08

01 Sep '08

Hello community, here is the log from the commit of package ipsec-tools checked in at Mon Sep 1 02:36:58 CEST 2008. -------- --- ipsec-tools/ipsec-tools.changes 2007-11-07 19:46:20.000000000 +0100 +++ /mounts/work_src_done/STABLE/ipsec-tools/ipsec-tools.changes 2008-08-30 03:29:13.365804000 +0200 @@ -1,0 +2,19 @@ +Thu Aug 14 19:30:51 CEST 2008 - jbohac(a)suse.cz + +- Upgrade to 0.7.1 + o Fixes a memory leak when invalid proposal received + o Some fixes in DPD + o do not set default gss id if xauth is used + o fixed hybrid enabled builds + o fixed compilation on FreeBSD8 + o cleanup in network port value manipulation + o gets ports from SADB_X_EXT_NAT_T_[SD]PORT if present in purge_ipsec_spi() + o Generates a log if cert validation has been disabled by configuration + o better handling for pfkey socket read errors + o Fixes in yacc / bison stuff + o new plog() macro (reduced CPU usage when logging is disabled) + o Try to works better with huge SPD/SAD + o Corrected modecfg option syntax + o Many other various fixes... + +------------------------------------------------------------------- Old: ---- ipsec-tools-0.7.tar.bz2 New: ---- ipsec-tools-0.7.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ipsec-tools.spec ++++++ --- /var/tmp/diff_new_pack.hB8009/_old 2008-09-01 02:36:42.000000000 +0200 +++ /var/tmp/diff_new_pack.hB8009/_new 2008-09-01 02:36:42.000000000 +0200 @@ -1,18 +1,26 @@ # -# spec file for package ipsec-tools (Version 0.7) +# spec file for package ipsec-tools (Version 0.7.1) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# 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. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: ipsec-tools BuildRequires: bison flex kernel-source krb5-devel openssl-devel pam pam-devel readline-devel -Version: 0.7 +Version: 0.7.1 Release: 1 License: BSD 3-Clause Group: Productivity/Networking/Security @@ -138,19 +146,36 @@ /var/run/racoon %ghost /var/run/racoon/racoon.sock %{_mandir}/man*/* + %changelog -* Wed Nov 07 2007 - jbohac(a)suse.cz +* Thu Aug 14 2008 jbohac(a)suse.cz +- Upgrade to 0.7.1 + o Fixes a memory leak when invalid proposal received + o Some fixes in DPD + o do not set default gss id if xauth is used + o fixed hybrid enabled builds + o fixed compilation on FreeBSD8 + o cleanup in network port value manipulation + o gets ports from SADB_X_EXT_NAT_T_[SD]PORT if present in purge_ipsec_spi() + o Generates a log if cert validation has been disabled by configuration + o better handling for pfkey socket read errors + o Fixes in yacc / bison stuff + o new plog() macro (reduced CPU usage when logging is disabled) + o Try to works better with huge SPD/SAD + o Corrected modecfg option syntax + o Many other various fixes... +* Wed Nov 07 2007 jbohac(a)suse.cz - Upgrade to 0.7 -* Thu Apr 12 2007 - jbohac(a)jikos.cz +* Thu Apr 12 2007 jbohac(a)jikos.cz - Fix a DoS in isakmp_info_recv (CVE-2007-1841, 260791) -* Thu Mar 29 2007 - aj(a)suse.de +* Thu Mar 29 2007 aj(a)suse.de - Add flex and bison to BuildRequires. -* Thu May 04 2006 - jbohac(a)suse.cz +* Fri May 05 2006 jbohac(a)suse.cz - fixed a segfault in GSSAPI initialization (#172196) - the /var/run/racoon directory was missing from the package which prevented racoon from starting (#170552) - fixed - fixed unexpanded macros in racoon.conf (#170552) -* Tue Mar 21 2006 - jbohac(a)suse.cz +* Tue Mar 21 2006 jbohac(a)suse.cz - upgrade to 0.6.5 (bugfix release) - Fixed zombie PH1 handler when isakmp_send() fails in isakmp_ph1resend() @@ -160,119 +185,119 @@ avoid breaking backward compatibility. - Fixed / cleaned up signal handling. - added --with-libpam and --enable-adminport (#159647) -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Tue Dec 13 2005 - jbohac(a)suse.cz +* Tue Dec 13 2005 jbohac(a)suse.cz - fixed build -* Tue Dec 13 2005 - jbohac(a)suse.cz +* Tue Dec 13 2005 jbohac(a)suse.cz - upgrade to 0.6.4 - added krb5 support ( --enable-gssapi) - added statistics logging support ( --enable-stats) -* Wed Nov 23 2005 - jbohac(a)suse.cz +* Wed Nov 23 2005 jbohac(a)suse.cz - upgrade to 0.6.3 - fixes #134834 and an openssl incompatibility issue -* Tue Nov 08 2005 - jbohac(a)suse.cz +* Tue Nov 08 2005 jbohac(a)suse.cz - fixed build for s390 -* Thu Oct 20 2005 - jbohac(a)suse.cz +* Thu Oct 20 2005 jbohac(a)suse.cz - upgraded to version 0.6.2 - enabled NAT-T - fixed build with current openssl -* Wed Aug 31 2005 - jbohac(a)suse.cz +* Wed Aug 31 2005 jbohac(a)suse.cz - fixed permissions for /etc/racoon/psk.txt (bug #114383) -* Tue Aug 23 2005 - jbohac(a)suse.cz +* Tue Aug 23 2005 jbohac(a)suse.cz - upgrade to version 0.6.1 -* Wed Aug 03 2005 - jbohac(a)suse.cz +* Wed Aug 03 2005 jbohac(a)suse.cz - fixed build on beta (disabled -Werror again) -* Tue Aug 02 2005 - cthiel(a)suse.de +* Tue Aug 02 2005 cthiel(a)suse.de - fixed build -* Tue Aug 02 2005 - jbohac(a)suse.cz +* Tue Aug 02 2005 jbohac(a)suse.cz - upgrade to version 0.6 -* Thu May 05 2005 - jbohac(a)suse.cz +* Thu May 05 2005 jbohac(a)suse.cz - upgrade to version 0.5.2 - disabled -Werror, because bison-generated code would not compile -* Wed Apr 13 2005 - jbohac(a)suse.cz +* Wed Apr 13 2005 jbohac(a)suse.cz - upgrade to version 0.5.1 - fixed compilation warning/errors regarding char/int signedness -* Wed Apr 13 2005 - jbohac(a)suse.cz +* Wed Apr 13 2005 jbohac(a)suse.cz - upgrade to version 0.5.1 - fixed compilation warning/errors regarding char/int signedness -* Wed Mar 16 2005 - jbohac(a)suse.cz +* Wed Mar 16 2005 jbohac(a)suse.cz The patch in the previous release was not applied correctly; fixed. -* Tue Mar 15 2005 - jbohac(a)suse.cz +* Tue Mar 15 2005 jbohac(a)suse.cz - security fix - insecure header parsing (Bug ID: 64726) -* Sat Feb 19 2005 - lmuelle(a)suse.de +* Sat Feb 19 2005 lmuelle(a)suse.de - Update to version 0.5. -* Wed Jan 05 2005 - jbohac(a)suse.cz +* Wed Jan 05 2005 jbohac(a)suse.cz - update to ipsec-tools-0.5-rc1 -* Thu Nov 18 2004 - mludvig(a)suse.cz +* Thu Nov 18 2004 mludvig(a)suse.cz - Update to version 0.4 -* Tue Sep 14 2004 - ro(a)suse.de +* Tue Sep 14 2004 ro(a)suse.de - undef __P first to make it build -* Tue Aug 10 2004 - mludvig(a)suse.cz +* Tue Aug 10 2004 mludvig(a)suse.cz - Update to 0.4rc1 -* Tue Jun 15 2004 - mludvig(a)suse.cz +* Tue Jun 15 2004 mludvig(a)suse.cz - Update to 0.3.3 to fix a X.509 cert verification security bug. (http://marc.theaimsgroup.com/?l=bugtraq&m=108726102304507&w=2) -* Mon May 17 2004 - mludvig(a)suse.cz +* Mon May 17 2004 mludvig(a)suse.cz - Fixed comment in racoon.conf (#40576) -* Wed Apr 21 2004 - mludvig(a)suse.cz +* Wed Apr 21 2004 mludvig(a)suse.cz - Update to 0.3.1 to fix CAN-2004-0403 -* Thu Apr 15 2004 - mludvig(a)suse.cz +* Thu Apr 15 2004 mludvig(a)suse.cz - Update to final 0.3. We had all patches in the package anyway... -* Thu Apr 08 2004 - mludvig(a)suse.cz +* Thu Apr 08 2004 mludvig(a)suse.cz - Fixed setkey to support multiline commands in interactive mode. - Added 'exit' command to setkey. The two changes fix TAHI/ipsec tests. - Emit messages about Keep-Alive packets with DEBUG severity instead of INFO. With INFO it only polutes syslog every 20s. -* Mon Apr 05 2004 - mludvig(a)suse.cz +* Mon Apr 05 2004 mludvig(a)suse.cz - Fixed X.509 security bug (#38373) -* Thu Apr 01 2004 - mludvig(a)suse.cz +* Thu Apr 01 2004 mludvig(a)suse.cz - Report received SADB_X_NAT_T_NEW_MAPPING message. - Avoid segfault with unknown PF_KEY messages. - Move encmode update out of the loop. NAT-T now works even with more than one proposal. -* Tue Mar 30 2004 - mludvig(a)suse.cz +* Tue Mar 30 2004 mludvig(a)suse.cz - Rewritten the testsuite to avoid failures on 32b platforms. -* Fri Mar 26 2004 - mludvig(a)suse.cz +* Fri Mar 26 2004 mludvig(a)suse.cz - Handle input lines one by one in interactive mode (preventing premature exit on syntax error). -* Thu Mar 25 2004 - mludvig(a)suse.cz +* Thu Mar 25 2004 mludvig(a)suse.cz - Update to 0.3rc4: - Fixed adding "null" encryption via 'setkey'. - Fixed segfault when using AES in Phase1 with OpenSSL>=0.9.7 - Fixed NAT-T in aggresive mode. - Fixed testsuite and added testsuite run into make check. -* Tue Mar 23 2004 - mludvig(a)suse.cz +* Tue Mar 23 2004 mludvig(a)suse.cz - Fix segfault with AES. - Enable testsuite. -* Mon Mar 22 2004 - mludvig(a)suse.cz +* Mon Mar 22 2004 mludvig(a)suse.cz - Fix "null" encryption setup in setkey. -* Fri Mar 19 2004 - mludvig(a)suse.cz +* Fri Mar 19 2004 mludvig(a)suse.cz - Fix duplicate ipsec service (#36575) - Update to 0.3rc3 -* Thu Mar 11 2004 - mludvig(a)suse.cz +* Thu Mar 11 2004 mludvig(a)suse.cz - Update to 0.3rc2 -* Mon Mar 08 2004 - mludvig(a)suse.cz +* Mon Mar 08 2004 mludvig(a)suse.cz - Add sysconfig and init.d files. -* Fri Mar 05 2004 - mludvig(a)suse.cz +* Fri Mar 05 2004 mludvig(a)suse.cz - Include samples config files in the RPM. -* Thu Mar 04 2004 - mludvig(a)suse.cz +* Thu Mar 04 2004 mludvig(a)suse.cz - update to 0.3rc1 -* Tue Feb 03 2004 - mludvig(a)suse.cz +* Tue Feb 03 2004 mludvig(a)suse.cz - Update to 0.2.4 -* Mon Jan 26 2004 - ro(a)suse.de +* Tue Jan 27 2004 ro(a)suse.de - updated neededforbuild "kernel-source-26" -> "kernel-source" -* Thu Jan 15 2004 - mludvig(a)suse.cz +* Thu Jan 15 2004 mludvig(a)suse.cz - update to ipsec-tools-0.2.3 -* Sat Jan 10 2004 - adrian(a)suse.de +* Sun Jan 11 2004 adrian(a)suse.de - remove obsolete %%run_ldconfig -* Tue Dec 23 2003 - mludvig(a)suse.cz +* Tue Dec 23 2003 mludvig(a)suse.cz - Recognize IPSEC_DIR_FWD when dumping SPD. -* Fri Dec 19 2003 - mludvig(a)suse.cz +* Fri Dec 19 2003 mludvig(a)suse.cz - Added many fixes gathered from the mailing list. - Added support for specifying SA lifebytes. -* Wed Dec 17 2003 - garloff(a)suse.de +* Wed Dec 17 2003 garloff(a)suse.de - Package ipsec-tools 0.2.2. ++++++ ipsec-tools-0.7.tar.bz2 -> ipsec-tools-0.7.1.tar.bz2 ++++++ ++++ 42517 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0