February 2010 - openSUSE Commits - openSUSE Mailing Lists

commit jakarta-commons-lang for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package jakarta-commons-lang for openSUSE:Factory checked in at Fri Feb 5 14:36:11 CET 2010. -------- --- jakarta-commons-lang/jakarta-commons-lang.changes 2008-07-29 09:11:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/jakarta-commons-lang/jakarta-commons-lang.changes 2010-01-27 09:39:27.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 27 08:39:19 UTC 2010 - mvyskocil(a)suse.cz + +- merged with jakarta-commons-lang-2.1-7.jpp5.src.rpm + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- commons-lang-2.3-jpp-depmap.xml commons-lang-2.3.pom commons-lang-2.3-src.tar.bz2 pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl pom-maven2jpp-newdepmap.xsl New: ---- commons-lang-2.4-src.tar.gz jakarta-commons-lang-build.patch jakarta-commons-lang-component-info.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-lang.spec ++++++ --- /var/tmp/diff_new_pack.e254ky/_old 2010-02-05 14:34:32.000000000 +0100 +++ /var/tmp/diff_new_pack.e254ky/_new 2010-02-05 14:34:32.000000000 +0100 @@ -1,7 +1,9 @@ # -# spec file for package jakarta-commons-lang (Version 2.3) +# spec file for package jakarta-commons-lang (Version 2.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2000-2009, JPackage Project +# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,172 +17,99 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define with_maven 0 +%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} +%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} +%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} +%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} +%define repodir %{_javadir}/repository.jboss.com/apache-lang/%{version}-brew +%define repodirlib %{repodir}/lib +%define repodirres %{repodir}/resources +%define repodirsrc %{repodir}/src %define base_name lang %define short_name commons-%{base_name} %define section free -Name: jakarta-commons-lang -Version: 2.3 -Release: 37 +Name: jakarta-%{short_name} +Version: 2.4 +Release: 1 Summary: Jakarta Commons Lang Package -License: The Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java -Url: http://jakarta.apache.org/commons/lang.html -Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{vers… -Source1: pom-maven2jpp-depcat.xsl -Source2: pom-maven2jpp-newdepmap.xsl -Source3: pom-maven2jpp-mapdeps.xsl -Source4: %{short_name}-%{version}-jpp-depmap.xml -Source5: %{short_name}-%{version}.pom -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -BuildRequires: jpackage-utils >= 1.7.2 +Url: http://jakarta.apache.org/commons/lang +Source0: http://archive.apache.org/dist/jakarta/commons/lang/source/commons-lang-2.4… +Source1: jakarta-commons-lang-component-info.xml +Patch0: jakarta-commons-lang-build.patch +Requires(post): jpackage-utils +Requires(postun): jpackage-utils +Requires: commons-parent >= 9 BuildRequires: ant BuildRequires: ant-junit -BuildRequires: perl +BuildRequires: java-javadoc +BuildRequires: jpackage-utils BuildRequires: java-devel -BuildRequires: unzip -BuildRequires: saxon -BuildRequires: saxon-scripts -%if %{with_maven} -BuildRequires: maven >= 1.1 -BuildRequires: maven-plugin-changelog -BuildRequires: maven-plugin-changes -BuildRequires: maven-plugin-xdoc -%endif -PreReq: jpackage-utils >= 1.7.2 -Requires(post): jpackage-utils >= 1.7.2 -Requires(postun): jpackage-utils >= 1.7.2 +BuildArch: noarch +Provides: %{short_name} = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The standard Java libraries fail to provide enough methods for manipulation of its core classes. The Commons Lang Component provides -these extra methods. The Commons Lang Component provides a host of -helper utilities for the java.lang API, notably string manipulation -methods, basic numerical methods, object reflection, creation and -serialization, and system properties. Additionally it contains an -inheritable enum type, an exception structure that supports multiple -types of nested exceptions, and a series of utilities dedicated to -helping with building methods, such as hashCode, toString and equals. - +these extra methods. +The Commons Lang Component provides a host of helper utilities for the +java.lang API, notably String manipulation methods, basic numerical +methods, object reflection, creation and serialization, and System +properties. Additionally it contains an inheritable enum type, an +exception structure that supports multiple types of nested-Exceptions +and a series of utilities dedicated to help with building methods, such +as hashCode, toString and equals. %package javadoc -License: The Apache Software License -PreReq: coreutils -Summary: Javadoc for jakarta-commons-lang -Group: Development/Libraries/Java - -%description javadoc -The standard Java libraries fail to provide enough methods for -manipulation of its core classes. The Commons Lang Component provides -these extra methods. The Commons Lang Component provides a host of -helper utilities for the java.lang API, notably String manipulation -methods, basic numerical methods, object reflection, creation and -serialization, and System properties. Additionally it contains an -inheritable enum type, an exception structure that supports multiple -types of nested-Exceptions and a series of utlities dedicated to help -with building methods, such as hashCode, toString and equals. - -This package contains the javadoc documentation for the Jakarta Commons -Lang Package. - - - -%if %{with_maven} - -%package manual - -Summary: Documents for %{name} +License: ASL 2.0 +Summary: Javadoc for %{name} Group: Development/Documentation +Requires: java-javadoc -%description manual -The standard Java libraries fail to provide enough methods for -manipulation of its core classes. The Commons Lang Component provides -these extra methods. The Commons Lang Component provides a host of -helper utilities for the java.lang API, notably String manipulation -methods, basic numerical methods, object reflection, creation and -serialization, and System properties. Additionally it contains an -inheritable enum type, an exception structure that supports multiple -types of nested-Exceptions and a series of utlities dedicated to help -with building methods, such as hashCode, toString and equals. - -This package contains the documentation for the Jakarta Commons -Lang Package. -%endif +%description javadoc +Javadoc for %{name}. %prep %setup -q -n %{short_name}-%{version}-src -%{__perl} -pi -e 's/\r//g' *.txt -if [ ! -f %{SOURCE4} ]; then -export DEPCAT=$(pwd)/%{short_name}-%{version}-depcat.new.xml -echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT -echo '<depset>' >> $DEPCAT -for p in $(find . -name project.xml); do - pushd $(dirname $p) - /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT - popd -done -echo >> $DEPCAT -echo '</depset>' >> $DEPCAT -/usr/bin/saxon $DEPCAT %{SOURCE2} > %{short_name}-%{version}-depmap.new.xml -fi +%patch0 -p1 -b .p0 +%{__perl} -pi \ + -e 's/\r$//g;' \ + PROPOSAL.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt %build -%if %{with_maven} -for p in $(find . -name project.xml); do - pushd $(dirname $p) - cp project.xml project.xml.orig - /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4} - popd -done -maven \ - -Dmaven.javadoc.source=1.4 \ - -Dmaven.repo.remote=file:/usr/share/maven/repository \ - -Dmaven.home.local=$(pwd)/.maven \ - jar javadoc xdoc:transform -%else - ant \ - -Djunit.jar=$(find-jar junit) \ +export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit` +export CLASSPATH= +%{ant} \ + -Dcompile.source=1.4 \ + -Djunit.jar=$(build-classpath junit) \ -Dfinal.name=%{short_name} \ -Djdk.javadoc=%{_javadocdir}/java \ - jar javadoc -%endif + test dist %install # jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -%if %{with_maven} -cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -%else -cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -%endif -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -%add_to_maven_depmap %{base_name} %{base_name} %{version} JPP %{name} +%{__mkdir_p} %{buildroot}%{_javadir} +%{__cp} -p %{short_name}/%{short_name}/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # pom -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -m 644 %{SOURCE5} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom +%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms +%{__cp} -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom +%add_to_maven_depmap commons-lang commons-lang %{version} JPP %{name} # javadoc -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} -## manual -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -p STATUS.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -p *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%if %{with_maven} -rm -rf target/docs/apidocs -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site -cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site -%endif +%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} +%{__cp} -pr %{short_name}/%{short_name}/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ +%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} +%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{short_name}-%{version} +%{__ln_s} %{short_name}-%{version} %{buildroot}%{_javadocdir}/%{short_name} %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %post %update_maven_depmap @@ -190,22 +119,19 @@ %files %defattr(0644,root,root,0755) -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/STATUS.html -%doc %{_docdir}/%{name}-%{version}/*.txt -%{_javadir}/* -%{_datadir}/maven2 -%{_mavendepmapfragdir} +%doc PROPOSAL.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{name}.jar +%{_javadir}/%{short_name}-%{version}.jar +%{_javadir}/%{short_name}.jar +%{_datadir}/maven2/poms/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} %files javadoc %defattr(0644,root,root,0755) -%doc %{_javadocdir}/%{name}-%{version} -%doc %{_javadocdir}/%{name} -%if %{with_maven} - -%files manual -%defattr(0644,root,root,0755) -%doc %{_docdir}/%{name}-%{version}/site -%endif +%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} +%{_javadocdir}/%{short_name}-%{version} +%{_javadocdir}/%{short_name} %changelog ++++++ jakarta-commons-lang-build.patch ++++++ --- commons-lang-2.4-src/build.xml.p0 2008-01-15 18:56:47.000000000 -0500 +++ commons-lang-2.4-src/build.xml 2009-03-18 14:57:26.425150740 -0400 @@ -62,7 +62,7 @@ </copy> </target> <target name="compile" depends="static" description="Compile shareable components"> - <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}"> + <javac encoding="8859_1" srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}"> <classpath refid="compile.classpath"/> </javac> <copy todir="${build.home}/classes" filtering="on"> @@ -70,7 +70,7 @@ </copy> </target> <target name="compile.tests" depends="compile" description="Compile unit test cases"> - <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}"> + <javac encoding="8859_1" srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" source="${compile.source}" optimize="${compile.optimize}"> <classpath refid="test.classpath"/> </javac> <copy todir="${build.home}/tests" filtering="on"> @@ -89,7 +89,7 @@ <tstamp> <format property="current.year" pattern="yyyy"/> </tstamp> - <javadoc sourcepath="${source.home}" destdir="${dist.home}/docs/api" overview="${source.home}/org/apache/commons/lang/overview.html" packagenames="org.apache.commons.*" excludepackagenames="${javadoc.excludepackagenames}" author="true" version="true" doctitle="<h1>${component.title}</h1>" windowtitle="${component.title} (Version ${component.version})" bottom="Copyright &copy; 2001-${current.year} - Apache Software Foundation" use="true" link="${jdk.javadoc}" source="${compile.source}"> + <javadoc encoding="8859_1" sourcepath="${source.home}" destdir="${dist.home}/docs/api" overview="${source.home}/org/apache/commons/lang/overview.html" packagenames="org.apache.commons.*" excludepackagenames="${javadoc.excludepackagenames}" author="true" version="true" doctitle="<h1>${component.title}</h1>" windowtitle="${component.title} (Version ${component.version})" bottom="Copyright &copy; 2001-${current.year} - Apache Software Foundation" use="true" link="${jdk.javadoc}" source="${compile.source}"> <classpath refid="compile.classpath"/> </javadoc> </target> @@ -121,7 +121,7 @@ <delete file="${final.name}.tar"/> <fixcrlf srcdir="${final.name}" eol="crlf" includes="**/*.txt"/> <zip destfile="${final.name}.zip" basedir="${final.name}"/> - <delete dir="${final.name}"/> +  </target> <target name="jar" depends="compile" description="Create jar"> <mkdir dir="${dist.home}"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libvirt for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at Fri Feb 5 14:34:21 CET 2010. -------- --- libvirt/libvirt.changes 2010-01-07 02:07:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2010-02-04 21:17:18.000000000 +0100 @@ -1,0 +2,30 @@ +Thu Feb 4 12:36:48 MST 2010 - jfehlig(a)novell.com + +- Updated to version 0.7.6 + - Implement support for multi IQN + - Implement CPU topology support for QEMU driver + - Use QEmu new device adressing when possible + - Implement SCSI controller hotplug/unplug for QEMU + - lots of improvements and bug fixes + +------------------------------------------------------------------- +Wed Jan 27 17:48:18 MST 2010 - jfehlig(a)novell.com + +- Support new XEN_SYSCTL_INTERFACE_VERSION 7 in libvirt + bnc#574124 + xen-sysctl-v7.patch +- Add upstream patches as prelude to fixing various device + attach/detach issues + devflag-0[1-9].patch +- Fix attaching/detaching disk device from inactive Xen guest + bnc#500586 and bnc#573748 + +------------------------------------------------------------------- +Tue Jan 12 12:36:15 MST 2010 - jfehlig(a)novell.com + +- Fix migration with Xen4.0 + bnc#569598 + Add xen-migration-params.patch + Remove migrate-params.patch + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- detach-disk.patch libvirt-0.7.5.tar.bz2 migrate-params.patch node-dev-free.patch xen-shr-pages.patch New: ---- devflag-01.patch devflag-02.patch devflag-03.patch devflag-04.patch devflag-05.patch devflag-06.patch devflag-07.patch devflag-08.patch devflag-09.patch libvirt-0.7.6.tar.bz2 xen-name-for-devid.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.j8vEsu/_old 2010-02-05 14:31:18.000000000 +0100 +++ /var/tmp/diff_new_pack.j8vEsu/_new 2010-02-05 14:31:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libvirt (Version 0.7.5) +# spec file for package libvirt (Version 0.7.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -111,7 +111,7 @@ License: LGPLv2.1+ Group: Development/Libraries/C and C++ AutoReqProv: yes -Version: 0.7.5 +Version: 0.7.6 Release: 1 Summary: A C toolkit to interract with the virtualization capabilities of Linux # The client side, i.e. shared libs and virsh are in a subpackage @@ -123,7 +123,6 @@ Requires: virt-utils Recommends: logrotate Requires: dnsmasq -Requires: PolicyKit >= 0.6 Requires: open-iscsi Requires: nfs-client %if %{with_hal} @@ -137,14 +136,20 @@ Source0: %{name}-%{version}.tar.bz2 Source1: libvirtd.init # Upstream patches -Patch0: detach-disk.patch -Patch1: xen-shr-pages.patch -Patch2: node-dev-free.patch +Patch0: devflag-01.patch +Patch1: devflag-02.patch +Patch2: devflag-03.patch +Patch3: devflag-04.patch +Patch4: devflag-05.patch +Patch5: devflag-06.patch +Patch6: devflag-07.patch +Patch7: devflag-08.patch +Patch8: devflag-09.patch +Patch9: xen-name-for-devid.patch # Need to go upstream Patch100: socat.patch Patch101: clone.patch -Patch102: migrate-params.patch -Patch103: xen-pv-cdrom.patch +Patch102: xen-pv-cdrom.patch # Our patches Patch200: libvirtd-defaults.patch Patch201: suse-network.patch @@ -255,10 +260,16 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %patch100 -p1 %patch101 %patch102 -p1 -%patch103 -p1 %patch200 -p1 %patch201 -p1 %patch202 -p1 ++++++ clone.patch ++++++ --- /var/tmp/diff_new_pack.j8vEsu/_old 2010-02-05 14:31:18.000000000 +0100 +++ /var/tmp/diff_new_pack.j8vEsu/_new 2010-02-05 14:31:18.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -813,6 +813,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -814,6 +814,9 @@ int lxcContainerStart(virDomainDefPtr de lxc_child_argv_t args = { def, nveths, veths, control, ttyPath }; /* allocate a stack for the container */ @@ -12,7 +12,7 @@ if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(NULL); return -1; -@@ -827,7 +830,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -828,7 +831,11 @@ int lxcContainerStart(virDomainDefPtr de if (def->nets != NULL) flags |= CLONE_NEWNET; @@ -24,7 +24,7 @@ VIR_FREE(stack); DEBUG("clone() returned, %d", pid); -@@ -853,6 +860,7 @@ int lxcContainerAvailable(int features) +@@ -854,6 +861,7 @@ int lxcContainerAvailable(int features) char *childStack; char *stack; int childStatus; @@ -32,7 +32,7 @@ if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -860,14 +868,21 @@ int lxcContainerAvailable(int features) +@@ -861,14 +869,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ devflag-01.patch ++++++ commit d8ec244c6513b7c44956a547e56c228a4c38fbbe Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 13 18:24:51 2010 -0700 doc: restrict virDomain{Attach,Detach}Device to active domains virDomain{Attach,Detach}Device is now only permitted on active domains. Explicitly state this restriction in the API documentation. V2: Only change doc, dropping the hunk that forced the restriction in libvirt frontend. Index: libvirt-0.7.6/src/libvirt.c =================================================================== --- libvirt-0.7.6.orig/src/libvirt.c +++ libvirt-0.7.6/src/libvirt.c @@ -5121,7 +5121,8 @@ error: * @domain: pointer to domain object * @xml: pointer to XML description of one device * - * Create a virtual device attachment to backend. + * Create a virtual device attachment to backend. This function, + * having hotplug semantics, is only allowed on an active domain. * * Returns 0 in case of success, -1 in case of failure. */ @@ -5164,7 +5165,8 @@ error: * @domain: pointer to domain object * @xml: pointer to XML description of one device * - * Destroy a virtual device attachment to backend. + * Destroy a virtual device attachment to backend. This function, + * having hot-unplug semantics, is only allowed on an active domain. * * Returns 0 in case of success, -1 in case of failure. */ ++++++ devflag-02.patch ++++++ commit 7269ec07ba4f298adab64ea66ac528ef66cf9ba0 Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 13 18:29:16 2010 -0700 Public API Definition of public API for virDomain{Attach,Detach}DeviceFlags. diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index f192fb1..99a5c45 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -845,9 +845,22 @@ int virDomainGetVcpus (virDomainPtr domain, */ #define VIR_GET_CPUMAP(cpumaps,maplen,vcpu) &(cpumaps[(vcpu)*(maplen)]) + +typedef enum { + + VIR_DOMAIN_DEVICE_MODIFY_CURRENT = 0, /* Modify device allocation based on current domain state */ + VIR_DOMAIN_DEVICE_MODIFY_LIVE = (1 << 0), /* Modify live device allocation */ + VIR_DOMAIN_DEVICE_MODIFY_CONFIG = (1 << 1), /* Modify persisted device allocation */ +} virDomainDeviceModifyFlags; + int virDomainAttachDevice(virDomainPtr domain, const char *xml); int virDomainDetachDevice(virDomainPtr domain, const char *xml); +int virDomainAttachDeviceFlags(virDomainPtr domain, + const char *xml, unsigned int flags); +int virDomainDetachDeviceFlags(virDomainPtr domain, + const char *xml, unsigned int flags); + /* * NUMA support */ diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 0521158..e190d83 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -349,4 +349,10 @@ LIBVIRT_0.7.5 { virDomainMemoryStats; } LIBVIRT_0.7.3; +LIBVIRT_0.7.6 { + global: + virDomainAttachDeviceFlags; + virDomainDetachDeviceFlags; +} LIBVIRT_0.7.5; + # .... define new API here using predicted next version number .... ++++++ devflag-03.patch ++++++ commit 5ebd48c5f4e424e0db663bf5930935b1c04d4998 Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 13 18:31:14 2010 -0700 Internal API Definition of internal API for virDomain{Attach,Detach}DeviceFlags. diff --git a/src/driver.h b/src/driver.h index c7e4fbf..08fe816 100644 --- a/src/driver.h +++ b/src/driver.h @@ -192,9 +192,17 @@ typedef int (*virDrvDomainAttachDevice) (virDomainPtr domain, const char *xml); typedef int + (*virDrvDomainAttachDeviceFlags) (virDomainPtr domain, + const char *xml, + unsigned int flags); +typedef int (*virDrvDomainDetachDevice) (virDomainPtr domain, const char *xml); typedef int + (*virDrvDomainDetachDeviceFlags) (virDomainPtr domain, + const char *xml, + unsigned int flags); +typedef int (*virDrvDomainGetAutostart) (virDomainPtr domain, int *autostart); typedef int @@ -419,7 +427,9 @@ struct _virDriver { virDrvDomainDefineXML domainDefineXML; virDrvDomainUndefine domainUndefine; virDrvDomainAttachDevice domainAttachDevice; + virDrvDomainAttachDeviceFlags domainAttachDeviceFlags; virDrvDomainDetachDevice domainDetachDevice; + virDrvDomainDetachDeviceFlags domainDetachDeviceFlags; virDrvDomainGetAutostart domainGetAutostart; virDrvDomainSetAutostart domainSetAutostart; virDrvDomainGetSchedulerType domainGetSchedulerType; ++++++ devflag-04.patch ++++++ commit 487b2434403d520027957ed623354b398984af31 Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 13 18:34:23 2010 -0700 Public API Implementation Implementation of public API for virDomain{Attach,Detach}DeviceFlags. V2: Don't break remote compatibility with older libvirtd Index: libvirt-0.7.6/src/libvirt.c =================================================================== --- libvirt-0.7.6.orig/src/libvirt.c +++ libvirt-0.7.6/src/libvirt.c @@ -5146,14 +5146,69 @@ virDomainAttachDevice(virDomainPtr domai conn = domain->conn; if (conn->driver->domainAttachDevice) { + int ret; + ret = conn->driver->domainAttachDevice (domain, xml); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return -1; +} + +/** + * virDomainAttachDeviceFlags: + * @domain: pointer to domain object + * @xml: pointer to XML description of one device + * @flags: an OR'ed set of virDomainDeviceModifyFlags + * + * Attach a virtual device to a domain, using the flags parameter + * to control how the device is attached. VIR_DOMAIN_DEVICE_MODIFY_CURRENT + * specifies that the device allocation is made based on current domain + * state. VIR_DOMAIN_DEVICE_MODIFY_LIVE specifies that the device shall be + * allocated to the active domain instance only and is not added to the + * persisted domain configuration. VIR_DOMAIN_DEVICE_MODIFY_CONFIG + * specifies that the device shall be allocated to the persisted domain + * configuration only. Note that the target hypervisor must return an + * error if unable to satisfy flags. E.g. the hypervisor driver will + * return failure if LIVE is specified but it only supports modifying the + * persisted device allocation. + * + * Returns 0 in case of success, -1 in case of failure. + */ +int +virDomainAttachDeviceFlags(virDomainPtr domain, + const char *xml, unsigned int flags) +{ + virConnectPtr conn; + DEBUG("domain=%p, xml=%s, flags=%d", domain, xml, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + conn = domain->conn; + + if (conn->driver->domainAttachDeviceFlags) { int ret; - ret = conn->driver->domainAttachDevice (domain, xml); + ret = conn->driver->domainAttachDeviceFlags(domain, xml, flags); if (ret < 0) goto error; return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); error: virDispatchError(domain->conn); @@ -5192,12 +5247,67 @@ virDomainDetachDevice(virDomainPtr domai if (conn->driver->domainDetachDevice) { int ret; ret = conn->driver->domainDetachDevice (domain, xml); + if (ret < 0) + goto error; + return ret; + } + + virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(domain->conn); + return -1; +} + +/** + * virDomainDetachDeviceFlags: + * @domain: pointer to domain object + * @xml: pointer to XML description of one device + * @flags: an OR'ed set of virDomainDeviceModifyFlags + * + * Detach a virtual device from a domain, using the flags parameter + * to control how the device is detached. VIR_DOMAIN_DEVICE_MODIFY_CURRENT + * specifies that the device allocation is removed based on current domain + * state. VIR_DOMAIN_DEVICE_MODIFY_LIVE specifies that the device shall be + * deallocated from the active domain instance only and is not from the + * persisted domain configuration. VIR_DOMAIN_DEVICE_MODIFY_CONFIG + * specifies that the device shall be deallocated from the persisted domain + * configuration only. Note that the target hypervisor must return an + * error if unable to satisfy flags. E.g. the hypervisor driver will + * return failure if LIVE is specified but it only supports removing the + * persisted device allocation. + * + * Returns 0 in case of success, -1 in case of failure. + */ +int +virDomainDetachDeviceFlags(virDomainPtr domain, + const char *xml, unsigned int flags) +{ + virConnectPtr conn; + DEBUG("domain=%p, xml=%s, flags=%d", domain, xml, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN(domain)) { + virLibDomainError(NULL, VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); + return (-1); + } + if (domain->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(domain, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + conn = domain->conn; + + if (conn->driver->domainDetachDeviceFlags) { + int ret; + ret = conn->driver->domainDetachDeviceFlags(domain, xml, flags); if (ret < 0) goto error; return ret; } - virLibConnError (conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); + virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__); error: virDispatchError(domain->conn); ++++++ devflag-05.patch ++++++ commit 5ef6d92292f5c9dd27c7db2bf56f8f24b13c681b Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 13 18:39:35 2010 -0700 Wire protocol format Definition of wire protocol format for virDomain{Attach,Detach}DeviceFlags. diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index bed3940..98953a9 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -708,11 +708,23 @@ struct remote_domain_attach_device_args { remote_nonnull_string xml; }; +struct remote_domain_attach_device_flags_args { + remote_nonnull_domain dom; + remote_nonnull_string xml; + unsigned int flags; +}; + struct remote_domain_detach_device_args { remote_nonnull_domain dom; remote_nonnull_string xml; }; +struct remote_domain_detach_device_flags_args { + remote_nonnull_domain dom; + remote_nonnull_string xml; + unsigned int flags; +}; + struct remote_domain_get_autostart_args { remote_nonnull_domain dom; }; @@ -1641,7 +1653,10 @@ enum remote_procedure { REMOTE_PROC_INTERFACE_IS_ACTIVE = 156, REMOTE_PROC_GET_LIB_VERSION = 157, REMOTE_PROC_CPU_COMPARE = 158, - REMOTE_PROC_DOMAIN_MEMORY_STATS = 159 + REMOTE_PROC_DOMAIN_MEMORY_STATS = 159, + REMOTE_PROC_DOMAIN_ATTACH_DEVICE_FLAGS = 160, + + REMOTE_PROC_DOMAIN_DETACH_DEVICE_FLAGS = 161 /* * Notice how the entries are grouped in sets of 10 ? ++++++ devflag-06.patch ++++++ commit 80bfb087ae4d92b271eadaee6e08b5ea2d1b68a6 Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 13 18:41:13 2010 -0700 Remote driver Implementation of Domain{Attach,Detach}DeviceFlags in remote driver. diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index d6f5fce..eb16f62 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3057,6 +3057,32 @@ done: } static int +remoteDomainAttachDeviceFlags (virDomainPtr domain, const char *xml, + unsigned int flags) +{ + int rv = -1; + remote_domain_attach_device_flags_args args; + struct private_data *priv = domain->conn->privateData; + + remoteDriverLock(priv); + + make_nonnull_domain (&args.dom, domain); + args.xml = (char *) xml; + args.flags = flags; + + if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_ATTACH_DEVICE_FLAGS, + (xdrproc_t) xdr_remote_domain_attach_device_flags_args, (char *) &args, + (xdrproc_t) xdr_void, (char *) NULL) == -1) + goto done; + + rv = 0; + +done: + remoteDriverUnlock(priv); + return rv; +} + +static int remoteDomainDetachDevice (virDomainPtr domain, const char *xml) { int rv = -1; @@ -3081,6 +3107,32 @@ done: } static int +remoteDomainDetachDeviceFlags (virDomainPtr domain, const char *xml, + unsigned int flags) +{ + int rv = -1; + remote_domain_detach_device_flags_args args; + struct private_data *priv = domain->conn->privateData; + + remoteDriverLock(priv); + + make_nonnull_domain (&args.dom, domain); + args.xml = (char *) xml; + args.flags = flags; + + if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_DETACH_DEVICE_FLAGS, + (xdrproc_t) xdr_remote_domain_detach_device_flags_args, (char *) &args, + (xdrproc_t) xdr_void, (char *) NULL) == -1) + goto done; + + rv = 0; + +done: + remoteDriverUnlock(priv); + return rv; +} + +static int remoteDomainGetAutostart (virDomainPtr domain, int *autostart) { int rv = -1; @@ -8894,7 +8946,9 @@ static virDriver remote_driver = { remoteDomainDefineXML, /* domainDefineXML */ remoteDomainUndefine, /* domainUndefine */ remoteDomainAttachDevice, /* domainAttachDevice */ + remoteDomainAttachDeviceFlags, /* domainAttachDeviceFlags */ remoteDomainDetachDevice, /* domainDetachDevice */ + remoteDomainDetachDeviceFlags, /* domainDetachDeviceFlags */ remoteDomainGetAutostart, /* domainGetAutostart */ remoteDomainSetAutostart, /* domainSetAutostart */ remoteDomainGetSchedulerType, /* domainGetSchedulerType */ ++++++ devflag-07.patch ++++++ commit 5b724a365e67d1cc2649ded76dea03836a067921 Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 13 18:42:28 2010 -0700 Server side dispatcher Server side dispatcher for Domain{Attach,Detach}DeviceFlags. diff --git a/daemon/remote.c b/daemon/remote.c index 299f971..bf156e4 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -890,6 +890,32 @@ remoteDispatchDomainAttachDevice (struct qemud_server *server ATTRIBUTE_UNUSED, } static int +remoteDispatchDomainAttachDeviceFlags (struct qemud_server *server ATTRIBUTE_UNUSED, + struct qemud_client *client ATTRIBUTE_UNUSED, + virConnectPtr conn, + remote_message_header *hdr ATTRIBUTE_UNUSED, + remote_error *rerr, + remote_domain_attach_device_flags_args *args, + void *ret ATTRIBUTE_UNUSED) +{ + virDomainPtr dom; + + dom = get_nonnull_domain (conn, args->dom); + if (dom == NULL) { + remoteDispatchConnError(rerr, conn); + return -1; + } + + if (virDomainAttachDeviceFlags (dom, args->xml, args->flags) == -1) { + virDomainFree(dom); + remoteDispatchConnError(rerr, conn); + return -1; + } + virDomainFree(dom); + return 0; +} + +static int remoteDispatchDomainCreate (struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, @@ -1015,6 +1041,33 @@ remoteDispatchDomainDetachDevice (struct qemud_server *server ATTRIBUTE_UNUSED, } static int +remoteDispatchDomainDetachDeviceFlags (struct qemud_server *server ATTRIBUTE_UNUSED, + struct qemud_client *client ATTRIBUTE_UNUSED, + virConnectPtr conn, + remote_message_header *hdr ATTRIBUTE_UNUSED, + remote_error *rerr, + remote_domain_detach_device_flags_args *args, + void *ret ATTRIBUTE_UNUSED) +{ + virDomainPtr dom; + + dom = get_nonnull_domain (conn, args->dom); + if (dom == NULL) { + remoteDispatchConnError(rerr, conn); + return -1; + } + + if (virDomainDetachDeviceFlags (dom, args->xml, args->flags) == -1) { + virDomainFree(dom); + remoteDispatchConnError(rerr, conn); + return -1; + } + + virDomainFree(dom); + return 0; +} + +static int remoteDispatchDomainDumpXml (struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_client *client ATTRIBUTE_UNUSED, virConnectPtr conn, ++++++ devflag-08.patch ++++++ ++++ 609 lines (skipped) ++++++ devflag-09.patch ++++++ commit 3a9b2b900c5dac18c9c48c40ec2dbeaa7c306a0e Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 13 18:54:58 2010 -0700 Modify virsh commands Change all virsh commands that invoke virDomain{Attach,Detach}Device() to use virDomain{Attach,Detach}DeviceFlags() instead. Add a "--persistent" flag to these virsh commands, allowing user to specify that the domain persisted config be modified as well. V2: Only invoke virDomain{Attach,Detach}DeviceFlags() if "--persistent" flag is specified. Otherwise invoke virDomain{Attach,Detach}Device() to retain current behavior. Index: libvirt-0.7.6/tools/virsh.c =================================================================== --- libvirt-0.7.6.orig/tools/virsh.c +++ libvirt-0.7.6/tools/virsh.c @@ -6285,6 +6285,7 @@ static const vshCmdInfo info_attach_devi static const vshCmdOptDef opts_attach_device[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("XML file")}, + {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist device attachment")}, {NULL, 0, 0, NULL} }; @@ -6296,6 +6297,7 @@ cmdAttachDevice(vshControl *ctl, const v char *buffer; int ret = TRUE; int found; + unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -6315,7 +6317,14 @@ cmdAttachDevice(vshControl *ctl, const v return FALSE; } - ret = virDomainAttachDevice(dom, buffer); + if (vshCommandOptBool(cmd, "persistent")) { + flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; + if (virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; + ret = virDomainAttachDeviceFlags(dom, buffer, flags); + } else { + ret = virDomainAttachDevice(dom, buffer); + } VIR_FREE(buffer); if (ret < 0) { @@ -6343,6 +6352,7 @@ static const vshCmdInfo info_detach_devi static const vshCmdOptDef opts_detach_device[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("XML file")}, + {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist device detachment")}, {NULL, 0, 0, NULL} }; @@ -6354,6 +6364,7 @@ cmdDetachDevice(vshControl *ctl, const v char *buffer; int ret = TRUE; int found; + unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; @@ -6373,7 +6384,14 @@ cmdDetachDevice(vshControl *ctl, const v return FALSE; } - ret = virDomainDetachDevice(dom, buffer); + if (vshCommandOptBool(cmd, "persistent")) { + flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; + if (virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; + ret = virDomainDetachDeviceFlags(dom, buffer, flags); + } else { + ret = virDomainDetachDevice(dom, buffer); + } VIR_FREE(buffer); if (ret < 0) { @@ -6405,6 +6423,7 @@ static const vshCmdOptDef opts_attach_in {"target", VSH_OT_DATA, 0, gettext_noop("target network name")}, {"mac", VSH_OT_DATA, 0, gettext_noop("MAC address")}, {"script", VSH_OT_DATA, 0, gettext_noop("script used to bridge network interface")}, + {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist interface attachment")}, {NULL, 0, 0, NULL} }; @@ -6415,6 +6434,7 @@ cmdAttachInterface(vshControl *ctl, cons char *mac, *target, *script, *type, *source; int typ, ret = FALSE; char *buf = NULL, *tmp = NULL; + unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; @@ -6489,13 +6509,22 @@ cmdAttachInterface(vshControl *ctl, cons if (!buf) goto cleanup; strcat(buf, " </interface>\n"); - if (virDomainAttachDevice(dom, buf)) { - goto cleanup; + if (vshCommandOptBool(cmd, "persistent")) { + flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; + if (virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; + ret = virDomainAttachDeviceFlags(dom, buf, flags); } else { - vshPrint(ctl, "%s", _("Interface attached successfully\n")); + ret = virDomainAttachDevice(dom, buf); } - ret = TRUE; + if (ret != 0) { + vshError(ctl, _("Failed to attach interface")); + ret = FALSE; + } else { + vshPrint(ctl, "%s", _("Interface attached successfully\n")); + ret = TRUE; + } cleanup: if (dom) @@ -6518,6 +6547,7 @@ static const vshCmdOptDef opts_detach_in {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"type", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network interface type")}, {"mac", VSH_OT_STRING, 0, gettext_noop("MAC address")}, + {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist interface detachment")}, {NULL, 0, 0, NULL} }; @@ -6534,6 +6564,7 @@ cmdDetachInterface(vshControl *ctl, cons char *doc, *mac =NULL, *type; char buf[64]; int i = 0, diff_mac, ret = FALSE; + unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; @@ -6605,10 +6636,21 @@ cmdDetachInterface(vshControl *ctl, cons goto cleanup; } - ret = virDomainDetachDevice(dom, (char *)xmlBufferContent(xml_buf)); - if (ret != 0) + if (vshCommandOptBool(cmd, "persistent")) { + flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; + if (virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; + ret = virDomainDetachDeviceFlags(dom, + (char *)xmlBufferContent(xml_buf), + flags); + } else { + ret = virDomainDetachDevice(dom, (char *)xmlBufferContent(xml_buf)); + } + + if (ret != 0) { + vshError(ctl, _("Failed to detach interface")); ret = FALSE; - else { + } else { vshPrint(ctl, "%s", _("Interface detached successfully\n")); ret = TRUE; } @@ -6642,6 +6684,7 @@ static const vshCmdOptDef opts_attach_di {"subdriver", VSH_OT_STRING, 0, gettext_noop("subdriver of disk device")}, {"type", VSH_OT_STRING, 0, gettext_noop("target device type")}, {"mode", VSH_OT_STRING, 0, gettext_noop("mode of device reading and writing")}, + {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist disk attachment")}, {NULL, 0, 0, NULL} }; @@ -6652,6 +6695,7 @@ cmdAttachDisk(vshControl *ctl, const vsh char *source, *target, *driver, *subdriver, *type, *mode; int isFile = 0, ret = FALSE; char *buf = NULL, *tmp = NULL; + unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; @@ -6767,12 +6811,22 @@ cmdAttachDisk(vshControl *ctl, const vsh if (!buf) goto cleanup; strcat(buf, " </disk>\n"); - if (virDomainAttachDevice(dom, buf)) - goto cleanup; - else - vshPrint(ctl, "%s", _("Disk attached successfully\n")); + if (vshCommandOptBool(cmd, "persistent")) { + flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; + if (virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; + ret = virDomainAttachDeviceFlags(dom, buf, flags); + } else { + ret = virDomainAttachDevice(dom, buf); + } - ret = TRUE; + if (ret != 0) { + vshError(ctl, _("Failed to attach disk")); + ret = FALSE; + } else { + vshPrint(ctl, "%s", _("Disk attached successfully\n")); + ret = TRUE; + } cleanup: if (dom) @@ -6794,6 +6848,7 @@ static const vshCmdInfo info_detach_disk static const vshCmdOptDef opts_detach_disk[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("domain name, id or uuid")}, {"target", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("target of disk device")}, + {"persistent", VSH_OT_BOOL, 0, gettext_noop("persist disk detachment")}, {NULL, 0, 0, NULL} }; @@ -6809,6 +6864,7 @@ cmdDetachDisk(vshControl *ctl, const vsh virDomainPtr dom = NULL; char *doc, *target; int i = 0, diff_tgt, ret = FALSE; + unsigned int flags; if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) goto cleanup; @@ -6874,10 +6930,21 @@ cmdDetachDisk(vshControl *ctl, const vsh goto cleanup; } - ret = virDomainDetachDevice(dom, (char *)xmlBufferContent(xml_buf)); - if (ret != 0) + if (vshCommandOptBool(cmd, "persistent")) { + flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; + if (virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; + ret = virDomainDetachDeviceFlags(dom, + (char *)xmlBufferContent(xml_buf), + flags); + } else { + ret = virDomainDetachDevice(dom, (char *)xmlBufferContent(xml_buf)); + } + + if (ret != 0) { + vshError(ctl, _("Failed to detach disk")); ret = FALSE; - else { + } else { vshPrint(ctl, "%s", _("Disk detached successfully\n")); ret = TRUE; } ++++++ libvirt-0.7.5.tar.bz2 -> libvirt-0.7.6.tar.bz2 ++++++ ++++ 849133 lines of diff (skipped) ++++++ snapshots.patch ++++++ --- /var/tmp/diff_new_pack.j8vEsu/_old 2010-02-05 14:31:26.000000000 +0100 +++ /var/tmp/diff_new_pack.j8vEsu/_new 2010-02-05 14:31:26.000000000 +0100 @@ -1,7 +1,7 @@ -Index: libvirt-0.7.5/include/libvirt/libvirt.h.in +Index: libvirt-0.7.6/include/libvirt/libvirt.h.in =================================================================== ---- libvirt-0.7.5.orig/include/libvirt/libvirt.h.in -+++ libvirt-0.7.5/include/libvirt/libvirt.h.in +--- libvirt-0.7.6.orig/include/libvirt/libvirt.h.in ++++ libvirt-0.7.6/include/libvirt/libvirt.h.in @@ -621,6 +621,21 @@ int virDomainRestore const char *from); @@ -24,11 +24,11 @@ * Domain core dump */ int virDomainCoreDump (virDomainPtr domain, -Index: libvirt-0.7.5/src/libvirt.c +Index: libvirt-0.7.6/src/libvirt.c =================================================================== ---- libvirt-0.7.5.orig/src/libvirt.c -+++ libvirt-0.7.5/src/libvirt.c -@@ -2339,6 +2339,166 @@ error: +--- libvirt-0.7.6.orig/src/libvirt.c ++++ libvirt-0.7.6/src/libvirt.c +@@ -2379,6 +2379,166 @@ error: } /** @@ -195,10 +195,10 @@ * virDomainCoreDump: * @domain: a domain object * @to: path for the core file -Index: libvirt-0.7.5/src/driver.h +Index: libvirt-0.7.6/src/driver.h =================================================================== ---- libvirt-0.7.5.orig/src/driver.h -+++ libvirt-0.7.5/src/driver.h +--- libvirt-0.7.6.orig/src/driver.h ++++ libvirt-0.7.6/src/driver.h @@ -136,6 +136,21 @@ typedef int (*virDrvDomainRestore) (virConnectPtr conn, const char *from); @@ -221,7 +221,7 @@ (*virDrvDomainCoreDump) (virDomainPtr domain, const char *to, int flags); -@@ -448,6 +463,11 @@ struct _virDriver { +@@ -458,6 +473,11 @@ struct _virDriver { virDrvDomainIsActive domainIsActive; virDrvDomainIsPersistent domainIsPersistent; virDrvCPUCompare cpuCompare; @@ -233,10 +233,10 @@ }; typedef int -Index: libvirt-0.7.5/src/xen/xen_driver.c +Index: libvirt-0.7.6/src/xen/xen_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/xen/xen_driver.c -+++ libvirt-0.7.5/src/xen/xen_driver.c +--- libvirt-0.7.6.orig/src/xen/xen_driver.c ++++ libvirt-0.7.6/src/xen/xen_driver.c @@ -1052,6 +1052,81 @@ xenUnifiedDomainRestore (virConnectPtr c } @@ -319,7 +319,7 @@ xenUnifiedDomainCoreDump (virDomainPtr dom, const char *to, int flags) { GET_PRIVATE(dom->conn); -@@ -1862,6 +1937,11 @@ static virDriver xenUnifiedDriver = { +@@ -1904,6 +1979,11 @@ static virDriver xenUnifiedDriver = { xenUnifiedDomainIsActive, xenUnifiedDomainisPersistent, NULL, /* cpuCompare */ @@ -331,10 +331,10 @@ }; /** -Index: libvirt-0.7.5/src/xen/xen_driver.h +Index: libvirt-0.7.6/src/xen/xen_driver.h =================================================================== ---- libvirt-0.7.5.orig/src/xen/xen_driver.h -+++ libvirt-0.7.5/src/xen/xen_driver.h +--- libvirt-0.7.6.orig/src/xen/xen_driver.h ++++ libvirt-0.7.6/src/xen/xen_driver.h @@ -100,6 +100,11 @@ struct xenUnifiedDriver { virDrvDomainGetSchedulerType domainGetSchedulerType; virDrvDomainGetSchedulerParameters domainGetSchedulerParameters; @@ -347,10 +347,10 @@ }; typedef struct xenXMConfCache *xenXMConfCachePtr; -Index: libvirt-0.7.5/src/xen/xend_internal.c +Index: libvirt-0.7.6/src/xen/xend_internal.c =================================================================== ---- libvirt-0.7.5.orig/src/xen/xend_internal.c -+++ libvirt-0.7.5/src/xen/xend_internal.c +--- libvirt-0.7.6.orig/src/xen/xend_internal.c ++++ libvirt-0.7.6/src/xen/xend_internal.c @@ -53,6 +53,12 @@ #ifndef PROXY @@ -364,7 +364,7 @@ /* * The number of Xen scheduler parameters */ -@@ -3282,6 +3288,87 @@ xenDaemonDomainRestore(virConnectPtr con +@@ -3284,6 +3290,87 @@ xenDaemonDomainRestore(virConnectPtr con } return xend_op(conn, "", "op", "restore", "file", filename, NULL); } @@ -452,7 +452,7 @@ #endif /* !PROXY */ /** -@@ -5165,6 +5252,11 @@ struct xenUnifiedDriver xenDaemonDriver +@@ -5235,6 +5322,11 @@ struct xenUnifiedDriver xenDaemonDriver xenDaemonGetSchedulerType, /* domainGetSchedulerType */ xenDaemonGetSchedulerParameters, /* domainGetSchedulerParameters */ xenDaemonSetSchedulerParameters, /* domainSetSchedulerParameters */ @@ -464,10 +464,10 @@ }; /************************************************************************ -Index: libvirt-0.7.5/src/xen/proxy_internal.c +Index: libvirt-0.7.6/src/xen/proxy_internal.c =================================================================== ---- libvirt-0.7.5.orig/src/xen/proxy_internal.c -+++ libvirt-0.7.5/src/xen/proxy_internal.c +--- libvirt-0.7.6.orig/src/xen/proxy_internal.c ++++ libvirt-0.7.6/src/xen/proxy_internal.c @@ -83,6 +83,11 @@ struct xenUnifiedDriver xenProxyDriver = NULL, /* domainGetSchedulerType */ NULL, /* domainGetSchedulerParameters */ @@ -480,10 +480,10 @@ }; -Index: libvirt-0.7.5/src/xen/xen_hypervisor.c +Index: libvirt-0.7.6/src/xen/xen_hypervisor.c =================================================================== ---- libvirt-0.7.5.orig/src/xen/xen_hypervisor.c -+++ libvirt-0.7.5/src/xen/xen_hypervisor.c +--- libvirt-0.7.6.orig/src/xen/xen_hypervisor.c ++++ libvirt-0.7.6/src/xen/xen_hypervisor.c @@ -800,6 +800,11 @@ struct xenUnifiedDriver xenHypervisorDri xenHypervisorGetSchedulerType, /* domainGetSchedulerType */ xenHypervisorGetSchedulerParameters, /* domainGetSchedulerParameters */ @@ -496,11 +496,11 @@ }; #endif /* !PROXY */ -Index: libvirt-0.7.5/src/xen/xm_internal.c +Index: libvirt-0.7.6/src/xen/xm_internal.c =================================================================== ---- libvirt-0.7.5.orig/src/xen/xm_internal.c -+++ libvirt-0.7.5/src/xen/xm_internal.c -@@ -116,6 +116,11 @@ struct xenUnifiedDriver xenXMDriver = { +--- libvirt-0.7.6.orig/src/xen/xm_internal.c ++++ libvirt-0.7.6/src/xen/xm_internal.c +@@ -118,6 +118,11 @@ struct xenUnifiedDriver xenXMDriver = { NULL, /* domainGetSchedulerType */ NULL, /* domainGetSchedulerParameters */ NULL, /* domainSetSchedulerParameters */ @@ -512,10 +512,10 @@ }; #define xenXMError(conn, code, fmt...) \ -Index: libvirt-0.7.5/src/xen/xs_internal.c +Index: libvirt-0.7.6/src/xen/xs_internal.c =================================================================== ---- libvirt-0.7.5.orig/src/xen/xs_internal.c -+++ libvirt-0.7.5/src/xen/xs_internal.c +--- libvirt-0.7.6.orig/src/xen/xs_internal.c ++++ libvirt-0.7.6/src/xen/xs_internal.c @@ -83,6 +83,11 @@ struct xenUnifiedDriver xenStoreDriver = NULL, /* domainGetSchedulerType */ NULL, /* domainGetSchedulerParameters */ @@ -528,11 +528,11 @@ }; #endif /* ! PROXY */ -Index: libvirt-0.7.5/tools/virsh.c +Index: libvirt-0.7.6/tools/virsh.c =================================================================== ---- libvirt-0.7.5.orig/tools/virsh.c -+++ libvirt-0.7.5/tools/virsh.c -@@ -1233,6 +1233,188 @@ cmdSave(vshControl *ctl, const vshCmd *c +--- libvirt-0.7.6.orig/tools/virsh.c ++++ libvirt-0.7.6/tools/virsh.c +@@ -1237,6 +1237,188 @@ cmdSave(vshControl *ctl, const vshCmd *c } /* @@ -721,7 +721,7 @@ * "schedinfo" command */ static const vshCmdInfo info_schedinfo[] = { -@@ -7431,6 +7613,12 @@ static const vshCmdDef commands[] = { +@@ -7502,6 +7684,12 @@ static const vshCmdDef commands[] = { {"undefine", cmdUndefine, opts_undefine, info_undefine}, {"uri", cmdURI, NULL, info_uri}, @@ -734,11 +734,11 @@ {"vol-create", cmdVolCreate, opts_vol_create, info_vol_create}, {"vol-create-from", cmdVolCreateFrom, opts_vol_create_from, info_vol_create_from}, {"vol-create-as", cmdVolCreateAs, opts_vol_create_as, info_vol_create_as}, -Index: libvirt-0.7.5/src/lxc/lxc_driver.c +Index: libvirt-0.7.6/src/lxc/lxc_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/lxc/lxc_driver.c -+++ libvirt-0.7.5/src/lxc/lxc_driver.c -@@ -2456,6 +2456,11 @@ static virDriver lxcDriver = { +--- libvirt-0.7.6.orig/src/lxc/lxc_driver.c ++++ libvirt-0.7.6/src/lxc/lxc_driver.c +@@ -2458,6 +2458,11 @@ static virDriver lxcDriver = { lxcDomainIsActive, lxcDomainIsPersistent, NULL, /* cpuCompare */ @@ -750,11 +750,11 @@ }; static virStateDriver lxcStateDriver = { -Index: libvirt-0.7.5/src/openvz/openvz_driver.c +Index: libvirt-0.7.6/src/openvz/openvz_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/openvz/openvz_driver.c -+++ libvirt-0.7.5/src/openvz/openvz_driver.c -@@ -1535,6 +1535,11 @@ static virDriver openvzDriver = { +--- libvirt-0.7.6.orig/src/openvz/openvz_driver.c ++++ libvirt-0.7.6/src/openvz/openvz_driver.c +@@ -1537,6 +1537,11 @@ static virDriver openvzDriver = { openvzDomainIsActive, openvzDomainIsPersistent, NULL, /* cpuCompare */ @@ -766,11 +766,11 @@ }; int openvzRegister(void) { -Index: libvirt-0.7.5/src/qemu/qemu_driver.c +Index: libvirt-0.7.6/src/qemu/qemu_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/qemu/qemu_driver.c -+++ libvirt-0.7.5/src/qemu/qemu_driver.c -@@ -7990,6 +7990,11 @@ static virDriver qemuDriver = { +--- libvirt-0.7.6.orig/src/qemu/qemu_driver.c ++++ libvirt-0.7.6/src/qemu/qemu_driver.c +@@ -8632,6 +8632,11 @@ static virDriver qemuDriver = { qemuDomainIsActive, qemuDomainIsPersistent, qemuCPUCompare, /* cpuCompare */ @@ -782,11 +782,11 @@ }; -Index: libvirt-0.7.5/src/esx/esx_driver.c +Index: libvirt-0.7.6/src/esx/esx_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/esx/esx_driver.c -+++ libvirt-0.7.5/src/esx/esx_driver.c -@@ -3455,6 +3455,11 @@ static virDriver esxDriver = { +--- libvirt-0.7.6.orig/src/esx/esx_driver.c ++++ libvirt-0.7.6/src/esx/esx_driver.c +@@ -3403,6 +3403,11 @@ static virDriver esxDriver = { esxDomainIsActive, /* domainIsActive */ esxDomainIsPersistent, /* domainIsPersistent */ NULL, /* cpuCompare */ @@ -798,11 +798,11 @@ }; -Index: libvirt-0.7.5/src/test/test_driver.c +Index: libvirt-0.7.6/src/test/test_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/test/test_driver.c -+++ libvirt-0.7.5/src/test/test_driver.c -@@ -5238,6 +5238,11 @@ static virDriver testDriver = { +--- libvirt-0.7.6.orig/src/test/test_driver.c ++++ libvirt-0.7.6/src/test/test_driver.c +@@ -5240,6 +5240,11 @@ static virDriver testDriver = { testDomainIsActive, /* domainIsActive */ testDomainIsPersistent, /* domainIsPersistent */ NULL, /* cpuCompare */ @@ -814,11 +814,11 @@ }; static virNetworkDriver testNetworkDriver = { -Index: libvirt-0.7.5/src/uml/uml_driver.c +Index: libvirt-0.7.6/src/uml/uml_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/uml/uml_driver.c -+++ libvirt-0.7.5/src/uml/uml_driver.c -@@ -1924,6 +1924,11 @@ static virDriver umlDriver = { +--- libvirt-0.7.6.orig/src/uml/uml_driver.c ++++ libvirt-0.7.6/src/uml/uml_driver.c +@@ -1926,6 +1926,11 @@ static virDriver umlDriver = { umlDomainIsActive, umlDomainIsPersistent, NULL, /* cpuCompare */ @@ -830,11 +830,11 @@ }; -Index: libvirt-0.7.5/src/vbox/vbox_tmpl.c +Index: libvirt-0.7.6/src/vbox/vbox_tmpl.c =================================================================== ---- libvirt-0.7.5.orig/src/vbox/vbox_tmpl.c -+++ libvirt-0.7.5/src/vbox/vbox_tmpl.c -@@ -7051,6 +7051,11 @@ virDriver NAME(Driver) = { +--- libvirt-0.7.6.orig/src/vbox/vbox_tmpl.c ++++ libvirt-0.7.6/src/vbox/vbox_tmpl.c +@@ -7059,6 +7059,11 @@ virDriver NAME(Driver) = { vboxDomainIsActive, vboxDomainIsPersistent, NULL, /* cpuCompare */ @@ -846,11 +846,11 @@ }; virNetworkDriver NAME(NetworkDriver) = { -Index: libvirt-0.7.5/src/opennebula/one_driver.c +Index: libvirt-0.7.6/src/opennebula/one_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/opennebula/one_driver.c -+++ libvirt-0.7.5/src/opennebula/one_driver.c -@@ -783,6 +783,11 @@ static virDriver oneDriver = { +--- libvirt-0.7.6.orig/src/opennebula/one_driver.c ++++ libvirt-0.7.6/src/opennebula/one_driver.c +@@ -785,6 +785,11 @@ static virDriver oneDriver = { NULL, /* domainIsActive */ NULL, /* domainIsPersistent */ NULL, /* cpuCompare */ @@ -862,11 +862,11 @@ }; static virStateDriver oneStateDriver = { -Index: libvirt-0.7.5/src/phyp/phyp_driver.c +Index: libvirt-0.7.6/src/phyp/phyp_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/phyp/phyp_driver.c -+++ libvirt-0.7.5/src/phyp/phyp_driver.c -@@ -1651,6 +1651,11 @@ virDriver phypDriver = { +--- libvirt-0.7.6.orig/src/phyp/phyp_driver.c ++++ libvirt-0.7.6/src/phyp/phyp_driver.c +@@ -1653,6 +1653,11 @@ virDriver phypDriver = { NULL, /* domainIsActive */ NULL, /* domainIsPersistent */ NULL, /* cpuCompare */ @@ -878,11 +878,11 @@ }; int -Index: libvirt-0.7.5/src/remote/remote_driver.c +Index: libvirt-0.7.6/src/remote/remote_driver.c =================================================================== ---- libvirt-0.7.5.orig/src/remote/remote_driver.c -+++ libvirt-0.7.5/src/remote/remote_driver.c -@@ -8940,6 +8940,11 @@ static virDriver remote_driver = { +--- libvirt-0.7.6.orig/src/remote/remote_driver.c ++++ libvirt-0.7.6/src/remote/remote_driver.c +@@ -8994,6 +8994,11 @@ static virDriver remote_driver = { remoteDomainIsActive, /* domainIsActive */ remoteDomainIsPersistent, /* domainIsPersistent */ remoteCPUCompare, /* cpuCompare */ @@ -894,10 +894,10 @@ }; static virNetworkDriver network_driver = { -Index: libvirt-0.7.5/docs/libvirt-api.xml +Index: libvirt-0.7.6/docs/libvirt-api.xml =================================================================== ---- libvirt-0.7.5.orig/docs/libvirt-api.xml -+++ libvirt-0.7.5/docs/libvirt-api.xml +--- libvirt-0.7.6.orig/docs/libvirt-api.xml ++++ libvirt-0.7.6/docs/libvirt-api.xml @@ -293,6 +293,11 @@ <exports symbol='virDomainSetVcpus' type='function'/> <exports symbol='virDomainShutdown' type='function'/> @@ -947,10 +947,10 @@ <function name='virDomainUndefine' file='libvirt' module='libvirt'> <info><![CDATA[Undefine a domain but does not stop it if it is running]]></info> <return type='int' info='0 in case of success, -1 in case of error'/> -Index: libvirt-0.7.5/src/libvirt_public.syms +Index: libvirt-0.7.6/src/libvirt_public.syms =================================================================== ---- libvirt-0.7.5.orig/src/libvirt_public.syms -+++ libvirt-0.7.5/src/libvirt_public.syms +--- libvirt-0.7.6.orig/src/libvirt_public.syms ++++ libvirt-0.7.6/src/libvirt_public.syms @@ -215,6 +215,11 @@ LIBVIRT_0.4.2 { LIBVIRT_0.4.5 { global: @@ -963,11 +963,11 @@ } LIBVIRT_0.4.2; LIBVIRT_0.5.0 { -Index: libvirt-0.7.5/python/generator.py +Index: libvirt-0.7.6/python/generator.py =================================================================== ---- libvirt-0.7.5.orig/python/generator.py -+++ libvirt-0.7.5/python/generator.py -@@ -288,6 +288,7 @@ skip_impl = ( +--- libvirt-0.7.6.orig/python/generator.py ++++ libvirt-0.7.6/python/generator.py +@@ -289,6 +289,7 @@ skip_impl = ( 'virDomainSetSchedulerParameters', 'virDomainGetVcpus', 'virDomainPinVcpu', @@ -975,11 +975,11 @@ 'virSecretGetValue', 'virSecretSetValue', 'virSecretGetUUID', -Index: libvirt-0.7.5/python/libvirt-override.c +Index: libvirt-0.7.6/python/libvirt-override.c =================================================================== ---- libvirt-0.7.5.orig/python/libvirt-override.c -+++ libvirt-0.7.5/python/libvirt-override.c -@@ -1516,6 +1516,34 @@ libvirt_virStoragePoolGetInfo(PyObject * +--- libvirt-0.7.6.orig/python/libvirt-override.c ++++ libvirt-0.7.6/python/libvirt-override.c +@@ -1542,6 +1542,34 @@ libvirt_virStoragePoolGetInfo(PyObject * return(py_retval); } @@ -1014,7 +1014,7 @@ static PyObject * libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { -@@ -2690,6 +2718,7 @@ static PyMethodDef libvirtMethods[] = { +@@ -2717,6 +2745,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virStoragePoolGetAutostart", libvirt_virStoragePoolGetAutostart, METH_VARARGS, NULL}, {(char *) "virStoragePoolListVolumes", libvirt_virStoragePoolListVolumes, METH_VARARGS, NULL}, {(char *) "virStoragePoolGetInfo", libvirt_virStoragePoolGetInfo, METH_VARARGS, NULL}, @@ -1022,11 +1022,11 @@ {(char *) "virStorageVolGetInfo", libvirt_virStorageVolGetInfo, METH_VARARGS, NULL}, {(char *) "virStoragePoolGetUUID", libvirt_virStoragePoolGetUUID, METH_VARARGS, NULL}, {(char *) "virStoragePoolGetUUIDString", libvirt_virStoragePoolGetUUIDString, METH_VARARGS, NULL}, -Index: libvirt-0.7.5/python/libvirt-override-api.xml +Index: libvirt-0.7.6/python/libvirt-override-api.xml =================================================================== ---- libvirt-0.7.5.orig/python/libvirt-override-api.xml -+++ libvirt-0.7.5/python/libvirt-override-api.xml -@@ -145,6 +145,11 @@ +--- libvirt-0.7.6.orig/python/libvirt-override-api.xml ++++ libvirt-0.7.6/python/libvirt-override-api.xml +@@ -150,6 +150,11 @@ <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> <arg name='params' type='virSchedParameterPtr' info='pointer to scheduler parameter objects'/> </function> @@ -1038,10 +1038,10 @@ <function name='virConnectListStoragePools' file='python'> <info>list the storage pools, stores the pointers to the names in @names</info> <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> -Index: libvirt-0.7.5/src/xen/xen_inotify.c +Index: libvirt-0.7.6/src/xen/xen_inotify.c =================================================================== ---- libvirt-0.7.5.orig/src/xen/xen_inotify.c -+++ libvirt-0.7.5/src/xen/xen_inotify.c +--- libvirt-0.7.6.orig/src/xen/xen_inotify.c ++++ libvirt-0.7.6/src/xen/xen_inotify.c @@ -86,6 +86,11 @@ struct xenUnifiedDriver xenInotifyDriver NULL, /* domainGetSchedulerType */ NULL, /* domainGetSchedulerParameters */ ++++++ xen-name-for-devid.patch ++++++ commit 7906a668fa8d5c21cc729db8a13b08e3dd1d241f Author: Jim Fehlig <jfehlig(a)novell.com> Date: Wed Jan 27 16:11:41 2010 -0700 Do not search xenstore for disk device IDs Disk devices can be referenced by name in Xen, e.g. when modifying their configuration or remvoving them. As such, don't search xenstore for a device ID corresponding to the disk device. Instead, search the disks contained in the domain definition and use the disk's target name if found. This approach allows removing a disk when domain is inactive. We obviously can't search xenstore when the domain is inactive. Index: libvirt-0.7.6/src/xen/xend_internal.c =================================================================== --- libvirt-0.7.6.orig/src/xen/xend_internal.c +++ libvirt-0.7.6/src/xen/xend_internal.c @@ -93,6 +93,7 @@ xenDaemonFormatSxprOnePCI(virConnectPtr static int virDomainXMLDevID(virDomainPtr domain, + virDomainDefPtr domDef, virDomainDeviceDefPtr dev, char *class, char *ref, @@ -4215,7 +4216,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); - if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref))) { + if (virDomainXMLDevID(domain, def, dev, class, ref, sizeof(ref))) { /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); @@ -4310,7 +4311,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - if (virDomainXMLDevID(domain, dev, class, ref, sizeof(ref))) + if (virDomainXMLDevID(domain, def, dev, class, ref, sizeof(ref))) goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { @@ -6052,6 +6053,7 @@ error: */ static int virDomainXMLDevID(virDomainPtr domain, + virDomainDefPtr domDef, virDomainDeviceDefPtr dev, char *class, char *ref, @@ -6060,27 +6062,33 @@ virDomainXMLDevID(virDomainPtr domain, xenUnifiedPrivatePtr priv = domain->conn->privateData; char *xref; char *tmp; + unsigned int i; + virDomainDiskDefPtr disk; if (dev->type == VIR_DOMAIN_DEVICE_DISK) { + if (dev->data.disk->dst == NULL) + return -1; if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); else strcpy(class, "vbd"); - if (dev->data.disk->dst == NULL) - return -1; - xenUnifiedLock(priv); - xref = xenStoreDomainGetDiskID(domain->conn, domain->id, - dev->data.disk->dst); - xenUnifiedUnlock(priv); - if (xref == NULL) - return -1; - - tmp = virStrcpy(ref, xref, ref_len); - VIR_FREE(xref); - if (tmp == NULL) - return -1; + /* For disks, the device name can be used directly. + * If disk device exists in domain definintion, + * copy it to ref and return success. + */ + for (i = 0; i < domDef->ndisks; i++) { + disk = domDef->disks[i]; + if (STREQ(dev->data.disk->dst, disk->dst)) { + tmp = virStrcpy(ref, disk->dst, ref_len); + if (tmp == NULL) + return -1; + else + return 0; + } + } + return -1; } else if (dev->type == VIR_DOMAIN_DEVICE_NET) { char mac[30]; virDomainNetDefPtr def = dev->data.net; ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.j8vEsu/_old 2010-02-05 14:31:26.000000000 +0100 +++ /var/tmp/diff_new_pack.j8vEsu/_new 2010-02-05 14:31:26.000000000 +0100 @@ -1,8 +1,8 @@ -Index: libvirt-0.7.5/src/xen/xend_internal.c +Index: libvirt-0.7.6/src/xen/xend_internal.c =================================================================== ---- libvirt-0.7.5.orig/src/xen/xend_internal.c -+++ libvirt-0.7.5/src/xen/xend_internal.c -@@ -5409,7 +5409,10 @@ xenDaemonFormatSxprDisk(virConnectPtr co +--- libvirt-0.7.6.orig/src/xen/xend_internal.c ++++ libvirt-0.7.6/src/xen/xend_internal.c +@@ -5479,7 +5479,10 @@ xenDaemonFormatSxprDisk(virConnectPtr co } else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { virBufferVSprintf(buf, "(dev '%s:cdrom')", def->dst); } else { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 syslog-ng for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package syslog-ng for openSUSE:Factory checked in at Fri Feb 5 14:30:59 CET 2010. -------- --- syslog-ng/syslog-ng.changes 2009-02-04 04:15:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.changes 2010-01-18 17:01:17.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Jan 18 16:41:20 CET 2010 - mt(a)suse.de + +- Fixed to inform user instead to fail when the removed summary() + suse extension option were used in old config (bnc#519653). + +------------------------------------------------------------------- +Fri Jan 15 15:31:16 CET 2010 - mt(a)suse.de + +- Applied POLLERR handling fixes for logreader/logwriter causing + 100% CPU usage e.g. when a UDP destination is down (bnc#541802). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- syslog-ng-2.0.9-summary-is-removed.diff syslog-ng-HP-UX-100-CPU-spinning.diff syslog-ng-logwriter-100-CPU-usage.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslog-ng.spec ++++++ --- /var/tmp/diff_new_pack.mPjHlI/_old 2010-02-05 14:29:15.000000000 +0100 +++ /var/tmp/diff_new_pack.mPjHlI/_new 2010-02-05 14:29:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package syslog-ng (Version 2.0.9) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -21,8 +21,8 @@ Name: syslog-ng %define eventlog_version 0.2.7 Version: 2.0.9 -Release: 28 -License: GPL v2 only +Release: 29 +License: GPLv2 Group: System/Daemons Summary: The new-generation syslog-daemon Url: http://www.balabit.com/products/syslog_ng/ @@ -48,6 +48,9 @@ Patch17: syslog-ng-no-perm-change.dif Patch18: syslog-ng-libnet-dynamic.dif Patch20: syslog-ng-chroot_CVE-2008-5110.dif +Patch21: syslog-ng-HP-UX-100-CPU-spinning.diff +Patch22: syslog-ng-logwriter-100-CPU-usage.diff +Patch23: syslog-ng-2.0.9-summary-is-removed.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison flex gcc-c++ glib2-devel pkgconfig BuildRequires: klogd libnet python tcpd-devel @@ -93,6 +96,9 @@ %patch17 -p0 %patch18 -p0 %patch20 -p0 +%patch21 -p1 +%patch22 -p1 +%patch23 -p0 cp -a $RPM_SOURCE_DIR/syslog-ng.README README.SuSE cp -a $RPM_SOURCE_DIR/syslog-ng.rc-script . cp -a $RPM_SOURCE_DIR/syslog-ng.conf.default . ++++++ syslog-ng-2.0.9-summary-is-removed.diff ++++++ --- src/cfg-grammar.y +++ src/cfg-grammar.y 2010/01/15 15:57:03 @@ -62,7 +62,7 @@ gint last_addr_family = AF_INET; %token KW_USER KW_DOOR KW_SUN_STREAMS KW_PROGRAM /* option items */ -%token KW_FSYNC KW_MARK_FREQ KW_STATS_FREQ KW_FLUSH_LINES KW_FLUSH_TIMEOUT KW_LOG_MSG_SIZE KW_FILE_TEMPLATE KW_PROTO_TEMPLATE +%token KW_FSYNC KW_MARK_FREQ KW_STATS_FREQ KW_SUMMARY_FREQ KW_FLUSH_LINES KW_FLUSH_TIMEOUT KW_LOG_MSG_SIZE KW_FILE_TEMPLATE KW_PROTO_TEMPLATE %token KW_CHAIN_HOSTNAMES KW_NORMALIZE_HOSTNAMES KW_KEEP_HOSTNAME KW_CHECK_HOSTNAME KW_BAD_HOSTNAME %token KW_KEEP_TIMESTAMP @@ -734,6 +734,7 @@ options_items options_item : KW_MARK_FREQ '(' NUMBER ')' { configuration->mark_freq = $3; } | KW_STATS_FREQ '(' NUMBER ')' { configuration->stats_freq = $3; } + | KW_SUMMARY_FREQ '(' NUMBER ')' { msg_notice("The summary option has been removed, please remove from config", evt_tag_int("summary", $3), NULL); } | KW_FLUSH_LINES '(' NUMBER ')' { configuration->flush_lines = $3; } | KW_FLUSH_TIMEOUT '(' NUMBER ')' { configuration->flush_timeout = $3; } | KW_CHAIN_HOSTNAMES '(' yesno ')' { configuration->chain_hostnames = $3; } @@ -907,4 +908,4 @@ yyparser_reset(void) last_reader_options = NULL; last_writer_options = NULL; last_template = NULL; -} \ Kein Zeilenumbruch am Dateiende. +} --- src/cfg-lex.l +++ src/cfg-lex.l 2010/01/15 15:43:31 @@ -76,6 +76,7 @@ static struct keyword keywords[] = { { "mark", KW_MARK_FREQ }, /* obsolete */ { "stats_freq", KW_STATS_FREQ }, { "stats", KW_STATS_FREQ }, /* obsolete */ + { "summary", KW_SUMMARY_FREQ }, /* obsolete */ { "flush_lines", KW_FLUSH_LINES }, { "flush_timeout", KW_FLUSH_TIMEOUT }, { "sync_freq", KW_FLUSH_LINES }, /* obsolete */ ++++++ syslog-ng-HP-UX-100-CPU-spinning.diff ++++++ >From c40a607eb5e4b4c83a2a29c20dd64644174f30a7 Mon Sep 17 00:00:00 2001 From: Balazs Scheidler <bazsi(a)balabit.hu> Date: Thu, 6 Nov 2008 11:53:32 +0100 Subject: [PATCH 1/2] fixed 100% CPU spinning on HP-UX upon a connection break As I see the problem seems to be caused by the fact that HP-UX returns POLLERR only without the other bits (e.g. POLLHUP) syslog-ng would handle this gracefully if either the other bits would be set, or there'd be some pending messages to send, in which case a normal write() error would occur. --- src/logwriter.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/logwriter.c b/src/logwriter.c index bb82b43..7a5fcf7 100644 --- a/src/logwriter.c +++ b/src/logwriter.c @@ -139,6 +139,13 @@ log_writer_fd_dispatch(GSource *source, log_writer_broken(self->writer, NC_CLOSE); return FALSE; } + else if (self->pollfd.revents & (G_IO_ERR)) + { + msg_error("POLLERR occurred while idle", + evt_tag_int("fd", self->fd->fd), + NULL); + log_writer_broken(self->writer, NC_WRITE_ERROR); + } else if (self->writer->queue->length || self->writer->partial) { if (!log_writer_flush_log(self->writer, self->fd)) -- 1.6.4.2 ++++++ syslog-ng-logwriter-100-CPU-usage.diff ++++++ >From ab0b9b75a2f69e9e66fe5727fe6c5a4ca4acac99 Mon Sep 17 00:00:00 2001 From: Balazs Scheidler <bazsi(a)balabit.hu> Date: Mon, 5 Oct 2009 12:33:07 +0200 Subject: [PATCH 2/2] [logwriter] fixed a 100% CPU usage if a udp destination is down Sometimes when a UDP destination is down we get POLLERR from poll. This was not always propagated to the dispatch handler by GLib if pollfd.events was 0. This patch makes sure that at least G_IO_ERR is present in the "events" field in logreader/logwriter. Reported-By: Sandor Geller --- src/logreader.c | 4 ++-- src/logwriter.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/logreader.c b/src/logreader.c index 9ca53a0..58ee2aa 100644 --- a/src/logreader.c +++ b/src/logreader.c @@ -62,7 +62,7 @@ log_reader_fd_prepare(GSource *source, #endif self->pollfd.revents = 0; - self->pollfd.events = 0; + self->pollfd.events = G_IO_ERR; /* never indicate readability if flow control prevents us from sending messages */ @@ -83,7 +83,7 @@ log_reader_fd_prepare(GSource *source, return FALSE; } - self->pollfd.events = G_IO_IN; + self->pollfd.events |= G_IO_IN; return FALSE; } diff --git a/src/logwriter.c b/src/logwriter.c index 7a5fcf7..79e1a0a 100644 --- a/src/logwriter.c +++ b/src/logwriter.c @@ -50,12 +50,14 @@ log_writer_fd_prepare(GSource *source, LogWriterWatch *self = (LogWriterWatch *) source; gint num_elements = self->writer->queue->length / 2; + self->pollfd.events = G_IO_ERR; + self->pollfd.revents = 0; if (self->writer->partial || (self->writer->options->flush_lines == 0 && num_elements != 0) || (self->writer->options->flush_lines > 0 && num_elements >= self->writer->options->flush_lines)) { /* we need to flush our buffers */ - self->pollfd.events = self->fd->cond; + self->pollfd.events |= self->fd->cond; } else if (num_elements) { @@ -96,13 +98,10 @@ log_writer_fd_prepare(GSource *source, } return FALSE; } - else - self->pollfd.events = 0; if (self->writer->flags & LW_DETECT_EOF) self->pollfd.events |= G_IO_HUP | G_IO_IN; self->flush_waiting_for_timeout = FALSE; - self->pollfd.revents = 0; return FALSE; } -- 1.6.4.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 tomcat6 for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package tomcat6 for openSUSE:Factory checked in at Fri Feb 5 14:29:05 CET 2010. -------- --- tomcat6/tomcat6.changes 2009-09-30 10:06:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/tomcat6/tomcat6.changes 2010-02-03 15:47:08.000000000 +0100 @@ -1,0 +2,27 @@ +Wed Feb 3 12:39:44 UTC 2010 - mvyskocil(a)suse.cz + +- Update to 6.0.24 (bugfix release). This obsoletes patch + * tomcat6-bug47316.patch +- Merged with tomcat6-6.0.18-10.jpp6.src.rpm + * return the jpackage.org license header in spec + * polish in spec (use more macros) + * add logrotate support + * add patch to document webapps in %%{_sysconfdir}/%%{name}/tomcat-users.xml + * move %%{_bindir}/d%%{name} to %%{_sbindir}/%%{name} and provide symlink to + %%{_sbindir}/d%%{name} + * add digest and tool-wrapper scripts + * explicitly unset CLASSPATH + * explicitly set OPT_JAR_LIST to include ant/ant-trax + * build and install sample webapp + * use copy instead of move to fix short-circuit install build + * version jsp and servlet Provides with their spec versions + * make initscript LSB-complaint + * add el subpackage + +------------------------------------------------------------------- +Tue Jan 5 14:20:08 UTC 2010 - mvyskocil(a)suse.cz + +- fixed bnc#565901 - missing catalina.sh + * added catalina.sh (link from dtomcat6) to improve upstream compatibility + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- apache-tomcat-6.0.20-src.tar.bz2 tomcat6-bug47316.patch New: ---- apache-tomcat-6.0.24-src.tar.bz2 tomcat6-6.0-digest.script tomcat6-6.0.logrotate tomcat6-6.0.starter tomcat6-6.0-tomcat-users-webapp.patch tomcat6-6.0-tool-wrapper.script tomcat6-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.35zUE2/_old 2010-02-05 14:28:03.000000000 +0100 +++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libtcnative-1-0 (Version 1.3.3) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,7 +19,7 @@ %define section free %define tomcat_major_version 6 %define tomcat_minor_version 0 -%define tomcat_macro_version 20 +%define tomcat_macro_version 24 %define tomcat_version %{tomcat_major_version}.%{tomcat_minor_version}.%{tomcat_macro_version} %define packdname apache-tomcat-%{tomcat_version}-src %define libname libtcnative-1 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 2 +Release: 3 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: Apache Software License .. ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.35zUE2/_old 2010-02-05 14:28:03.000000000 +0100 +++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:03.000000000 +0100 @@ -1,7 +1,9 @@ # -# spec file for package tomcat6 (Version 6.0.20) +# spec file for package tomcat6 (Version 6.0.24) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2000-2009, JPackage Project +# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +22,10 @@ %define jspspec 2.1 %define major_version 6 %define minor_version 0 -%define macro_version 20 +%define micro_version 24 %define packdname apache-tomcat-%{version}-src %define servletspec 2.5 +%define elspec 1.0 %define tcuid 91 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %define appdir /srv/%{name}/webapps @@ -31,12 +34,14 @@ %define homedir %{_datadir}/%{name} %define libdir %{_javadir}/%{name} %define logdir %{_localstatedir}/log/%{name} -%define tempdir %{_localstatedir}/cache/%{name}/temp -%define workdir %{_localstatedir}/cache/%{name} +%define cachedir %{_localstatedir}/cache/%{name} +%define tempdir %{cachedir}/temp +%define workdir %{cachedir}/work +%define _initrddir %{_sysconfdir}/init.d Name: tomcat6 -Version: %{major_version}.%{minor_version}.%{macro_version} -Release: 2 +Version: %{major_version}.%{minor_version}.%{micro_version} +Release: 1 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: Apache Software License .. @@ -47,9 +52,15 @@ # sysconfig removal - bnc#471639 #Source3: %{name}-%{major_version}.%{minor_version}.sysconfig Source4: %{name}-%{major_version}.%{minor_version}.wrapper +Source5: %{name}-%{major_version}.%{minor_version}.logrotate +Source6: %{name}-%{major_version}.%{minor_version}-digest.script +Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script +Source8: %{name}-%{major_version}.%{minor_version}.starter +Source1000: tomcat6-rpmlintrc +#PATCH-FIX-UPSTREAM: from jpackage.org package Patch0: %{name}-%{major_version}.%{minor_version}.bootstrap-MANIFEST.MF.patch -#PATCH-FIX-UPSTREAM: bao#47316, bnc#542634 -Patch1: tomcat6-bug47316.patch +#PATCH-FIX-UPSTREAM: from jpackage.org package +Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant @@ -58,7 +69,7 @@ BuildRequires: findutils BuildRequires: jakarta-commons-collections BuildRequires: jakarta-commons-daemon -BuildRequires: java-devel >= 1.5.0 +BuildRequires: java-devel >= 1.6.0 BuildRequires: jpackage-utils >= 1.7.0 BuildRequires: junit BuildRequires: sed @@ -97,7 +108,7 @@ Requires: %{name} = %{version}-%{release} %description admin-webapps -The host-manager and manager web applications for Apache Tomcat +The host-manager and manager web applications for Apache Tomcat. @@ -108,8 +119,20 @@ Requires: %{name} = %{version}-%{release} %description docs-webapp -The docs web application for Apache Tomcat +The docs web application for Apache Tomcat. +%package el-1_0-api +License: Apache Software License .. +Summary: Expression Language v1.0 API +Group: Development/Libraries/Java +Provides: %{name}-el-%{elspec}-api = %{version}-%{release} +Provides: el_1_0_api = %{version}-%{release} +Provides: el_api = 1.0 +Requires(preun):%{_sbindir}/update-alternatives +Requires(post): %{_sbindir}/update-alternatives + +%description el-1_0-api +Expression Language 1.0. %package javadoc @@ -118,7 +141,7 @@ Summary: Javadoc generated documentation for Apache Tomcat %description javadoc -Javadoc generated documentation for Apache Tomcat +Javadoc generated documentation for Apache Tomcat. @@ -126,6 +149,8 @@ License: Apache Software License .. Group: Productivity/Networking/Web/Servers Summary: Apache Tomcat JSP API implementation classes +Provides: jsp = %{jspspec} +Provides: jsp21 Provides: %{name}-jsp-2.1-api Requires: %{name}-servlet-2_5-api = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives @@ -142,11 +167,12 @@ Summary: Libraries needed to run the Tomcat Web container Requires: %{name}-jsp-2_1-api = %{version}-%{release} Requires: %{name}-servlet-2_5-api = %{version}-%{release} +Requires: %{name}-el-%{elspec}-api = %{version}-%{release} Requires(post): ecj >= 3.2.2 Requires(post): jakarta-commons-collections-tomcat5 Requires(post): jakarta-commons-dbcp-tomcat5 Requires(post): jakarta-commons-pool-tomcat5 -Requires(preun): %{__rm} +Requires(preun):%{__rm} %description lib Libraries needed to run the Tomcat Web container @@ -158,6 +184,9 @@ Group: Productivity/Networking/Web/Servers Summary: Apache Tomcat Servlet API implementation classes Provides: %{name}-servlet-2.5-api +Provides: servlet = %{servletspec} +Provides: servlet6 +Provides: servlet25 Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives @@ -179,13 +208,17 @@ %prep -%{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version} %setup -q -c -T -a 0 +# remove pre-built binaries and windows files +find . -type f $ -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ + -name "*.jar" -o -name "*.war" -o -name "*.zip" $ | xargs -t %{__rm} %patch0 -p1 -%patch1 -b .bug47316 +%patch1 -p0 %build -pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} +export CLASSPATH= +export OPT_JAR_LIST="ant/ant-trax" +pushd %{packdname} # remove pre-built binaries and windows files find . $ -name "*.bat" -o -name "*.class" -o -name "*.gz" -o \ -name "*.jar" -o -name "*.zip" $ | xargs -t %{__rm} -f @@ -198,7 +231,7 @@ export ANT_OPTS=-Xmx500M %endif # who needs a build.properties file anyway - ant -Dbase.path="${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}" \ + %{ant} -Dbase.path="." \ -Dbuild.compiler="modern" \ -Dcommons-collections.jar="$(build-classpath commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \ @@ -208,12 +241,11 @@ -Dtomcat-dbcp.jar="HACK" \ -Dtomcat-native.tar.gz="HACK" \ -Dversion="%{version}" \ - -Dversion.build="%{macro_version}" \ - -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 + -Dversion.build="%{micro_version}" # javadoc generation - ant -f dist.xml dist-prepare - ant -f dist.xml dist-source - ant -f dist.xml dist-javadoc + %{ant} -f dist.xml dist-prepare + %{ant} -f dist.xml dist-source + %{ant} -f dist.xml dist-javadoc # remove some jars that we'll replace with symlinks later %{__rm} output/build/bin/commons-daemon.jar \ output/build/lib/ecj.jar @@ -222,34 +254,44 @@ output/build/bin/tomcat-native.tar.gz \ output/build/lib/HACK popd +pushd %{packdname}/output/dist/src/webapps/docs/appdev/sample/src +%{__mkdir_p} ../web/WEB-INF/classes +%{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java +pushd ../web +%{jar} cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war * +popd +popd %install # build initial path structure %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sbindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_initrddir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name} -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d %if ! %defined suse_version %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig %endif %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{appdir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{bindir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{confdir}/Catalina/localhost %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{libdir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{logdir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{homedir} %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{tempdir} -%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{workdir} +%{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{cachedir} # move things into place -pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/output/build - %{__mv} bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} - %{__mv} conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} - %{__mv} lib/*.jar ${RPM_BUILD_ROOT}%{libdir} - %{__mv} webapps/* ${RPM_BUILD_ROOT}%{appdir} +pushd %{packdname}/output/build + %{__cp} -a bin/*.{jar,xml} ${RPM_BUILD_ROOT}%{bindir} + %{__cp} -a conf/*.{policy,properties,xml} ${RPM_BUILD_ROOT}%{confdir} + %{__cp} -a lib/*.jar ${RPM_BUILD_ROOT}%{libdir} + %{__cp} -a webapps/* ${RPM_BUILD_ROOT}%{appdir} popd # javadoc -pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/output/dist/webapps - %{__mv} docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} +pushd %{packdname}/output/dist/webapps + %{__cp} -a docs/api/* ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} popd %{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" %{SOURCE1} \ @@ -264,18 +306,34 @@ > ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name} %endif %{__install} -m 0644 %{SOURCE2} \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name} + ${RPM_BUILD_ROOT}%{_initrddir}/%{name} %{__install} -m 0644 %{SOURCE4} \ - ${RPM_BUILD_ROOT}%{_bindir}/d%{name} -# create jsp and servlet API symlinks + ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} +#%{__ln_s} %{name} ${RPM_BUILD_ROOT}%{_sbindir}/d%{name} +%{__install} -m 0644 %{SOURCE8} \ + ${RPM_BUILD_ROOT}%{_sbindir}/%{name} +%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ + > ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} +%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ + -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE6} \ + > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-digest +%{__sed} -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ + -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ + -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ + > ${RPM_BUILD_ROOT}%{_bindir}/%{name}-tool-wrapper pushd ${RPM_BUILD_ROOT}%{_javadir} + # create jsp and servlet and el API symlinks %{__mv} %{name}/jsp-api.jar %{name}-jsp-%{jspspec}-api-%{version}.jar - %{__mv} %{name}/servlet-api.jar \ - %{name}-servlet-%{servletspec}-api-%{version}.jar - %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar \ - %{name}-jsp-%{jspspec}-api.jar - %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar \ - %{name}-servlet-%{servletspec}-api.jar + %{__mv} %{name}/servlet-api.jar %{name}-servlet-%{servletspec}-api-%{version}.jar + %{__mv} %{name}/el-api.jar %{name}-el-%{elspec}-api-%{version}.jar + /bin/touch el_1_0_api.jar + /bin/touch el_api.jar + /bin/touch jsp.jar + /bin/touch servlet.jar + %{__ln_s} %{name}-jsp-%{jspspec}-api-%{version}.jar %{name}-jsp-%{jspspec}-api.jar + %{__ln_s} %{name}-servlet-%{servletspec}-api-%{version}.jar %{name}-servlet-%{servletspec}-api.jar + %{__ln_s} %{name}-el-%{elspec}-api-%{version}.jar %{name}-el-%{elspec}-api.jar popd pushd ${RPM_BUILD_ROOT}%{libdir} # fix up jars to include version number @@ -284,9 +342,10 @@ %{__mv} ${j}.jar ${j}-%{version}.jar %{__ln_s} ${j}-%{version}.jar ${j}.jar done - # symlink JSP and servlet API jars + # symlink JSP and servlet and el API jars %{__ln_s} ../%{name}-jsp-%{jspspec}-api-%{version}.jar . %{__ln_s} ../%{name}-servlet-%{servletspec}-api-%{version}.jar . + %{__ln_s} ../%{name}-el-%{elspec}-api-%{version}.jar . popd pushd ${RPM_BUILD_ROOT}%{bindir} # fix up jars to include version number @@ -303,18 +362,27 @@ %{__ln_s} %{libdir} lib %{__ln_s} %{logdir} logs %{__ln_s} %{tempdir} temp - %{__ln_s} %{workdir} work + %{__ln_s} %{cachedir} work popd +# install sample webapp +%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/sample +pushd ${RPM_BUILD_ROOT}%{appdir}/sample +%{jar} xf ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war +popd +%{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war +%{_bindir}/build-jar-repository -p ${RPM_BUILD_ROOT}%{libdir} commons-collections-tomcat5 \ + commons-dbcp-tomcat5 commons-pool-tomcat5 ecj +%if %defined suse_version # bnc#424675 -install -d -m 0755 ${RPM_BUILD_ROOT}%{workdir}/Catalina -%{__ln_s} %{workdir}/Catalina ${RPM_BUILD_ROOT}/%{confdir}/Catalina +install -d -m 0755 ${RPM_BUILD_ROOT}%{cachedir}/Catalina +%{__ln_s} %{cachedir}/Catalina ${RPM_BUILD_ROOT}/%{confdir}/Catalina # bnc#418664 install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/ echo "tomcat6/catalina-ant" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/ant.d/catalina-ant -%if %defined suse_version %fdupes $RPM_BUILD_ROOT /srv/%{name} install -d -m 755 $RPM_BUILD_ROOT/%{_sbindir} -ln -sf %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name} +ln -sf %{_initrddir}/%{name} $RPM_BUILD_ROOT/%{_sbindir}/rc%{name} +ln -sf %{_sbindir}/d%{name} %{buildroot}/%{_bindir}/catalina.sh %endif %clean @@ -361,6 +429,16 @@ /sbin/chkconfig --add %{name} %endif +%post el-1_0-api +%{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 +%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar 10000 + +%preun el-1_0-api +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove el_api %{_javadir}/%{name}-el-%{elspec}-api.jar + %{_sbindir}/update-alternatives --remove el_1_0_api %{_javadir}/%{name}-el-%{elspec}-api.jar +fi + %post jsp-2_1-api %{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp \ %{_javadir}/%{name}-jsp-%{jspspec}-api.jar 20100 @@ -381,18 +459,18 @@ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 20500 %post webapps -build-jar-repository %{appdir}/examples/WEB-INF/lib \ +%{_bindir}/build-jar-repository -p %{appdir}/examples/WEB-INF/lib \ taglibs-core.jar taglibs-standard.jar 2>&1 %preun -# clean tempdir and workdir on removal or upgrade -## % {__rm} -fr %{workdir}/* # %{tempdir}/* +# clean tempdir and cachedir on removal or upgrade +## % {__rm} -rf %{workdir}/* %{tempdir}/* %if %defined suse_version %stop_on_removal %{name} %else if [ "$1" = "0" ]; then - [ -f /var/lock/subsys/%{name} ] && %{_sysconfdir}/init.d/%{name} stop - [ -f %{_sysconfdir}/init.d/%{name} ] && /sbin/chkconfig --del %{name} + %{_initrddir}/%{name} stop >/dev/null 2>&1 + /sbin/chkconfig --del %{name} fi %endif @@ -426,29 +504,42 @@ %files %defattr(0644,root,root,0755) %doc %{packdname}/{LICENSE,NOTICE,RELEASE*} -%attr(755,root,root) %{_bindir}/d%{name} -%attr(0770,root,tomcat) %dir %{_localstatedir}/log/%{name} -%attr(755,root,root) %{_sysconfdir}/init.d/%{name} +%attr(0755,root,root) %{_bindir}/%{name}-digest +%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper +%attr(0755,root,root) %{_sbindir}/d%{name} +%attr(0755,root,root) %{_sbindir}/%{name} +%attr(0775,root,tomcat) %dir %{logdir} +%attr(0755,root,root) %{_initrddir}/%{name} +%if %{defined suse_version} +#bnc#565901 +%attr(0755,root,root) %{_bindir}/catalina.sh +%endif +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %if ! %defined suse_version %config(noreplace) %{_sysconfdir}/sysconfig/%{name} %endif %attr(0775,root,tomcat) %dir %{appdir} %dir %{confdir} +%dir %{confdir}/Catalina +#%attr(0775,root,tomcat) %dir %{confdir}/Catalina/localhost %config(noreplace) %{confdir}/%{name}.conf %config(noreplace) %{confdir}/*.policy %config(noreplace) %{confdir}/*.properties %config(noreplace) %{confdir}/context.xml %config(noreplace) %{confdir}/server.xml -%attr(660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml +%attr(0660,root,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml %config(noreplace) %{confdir}/web.xml +%attr(0775,root,tomcat) %dir %{cachedir} %attr(0775,root,tomcat) %dir %{tempdir} -%attr(0775,root,tomcat) %dir %{workdir} +%attr(0775,root,tomcat) %dir %{cachedir} %{homedir} +%if %{defined suse_version} %dir /srv/%{name} %{_sbindir}/rc%{name} #bnc#424675 -%attr(0775,root,tomcat) %dir %{workdir}/Catalina +%attr(0775,root,tomcat) %dir %{cachedir}/Catalina %{confdir}/Catalina +%endif %files admin-webapps %defattr(0644,root,root,0755) @@ -459,13 +550,22 @@ %defattr(0644,root,root,0755) %{appdir}/docs +%files el-1_0-api +%defattr(0644,root,root,0755) +%{_javadir}/%{name}-el-%{elspec}-api-%{version}.jar +%{_javadir}/%{name}-el-%{elspec}-api.jar +%ghost %{_javadir}/el_1_0_api.jar +%ghost %{_javadir}/el_api.jar + %files javadoc %defattr(0644,root,root,0755) %{_javadocdir}/%{name} %files jsp-2_1-api %defattr(0644,root,root,0755) -%{_javadir}/%{name}-jsp*.jar +%{_javadir}/%{name}-jsp-%{jspspec}-api-%{version}.jar +%{_javadir}/%{name}-jsp-%{jspspec}-api.jar +%ghost %{_javadir}/jsp.jar %files lib %defattr(0644,root,root,0755) @@ -475,12 +575,15 @@ %files servlet-2_5-api %defattr(0644,root,root,0755) -%{_javadir}/%{name}-servlet*.jar +%{_javadir}/%{name}-servlet-%{servletspec}-api-%{version}.jar +%{_javadir}/%{name}-servlet-%{servletspec}-api.jar +%ghost %{_javadir}/servlet.jar %files webapps %defattr(0644,root,root,0755) #bnc#520532 %config(noreplace) %{appdir}/ROOT %{appdir}/examples +%{appdir}/sample %changelog ++++++ apache-tomcat-6.0.20-src.tar.bz2 -> apache-tomcat-6.0.24-src.tar.bz2 ++++++ ++++ 45733 lines of diff (skipped) ++++++ tomcat6-6.0.bootstrap-MANIFEST.MF.patch ++++++ --- /var/tmp/diff_new_pack.35zUE2/_old 2010-02-05 14:28:05.000000000 +0100 +++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:05.000000000 +0100 @@ -1,10 +1,12 @@ -Index: tomcat6-6.0.20/apache-tomcat-6.0.20-src/res/bootstrap.jar.manifest +Index: tomcat6-6.0.24/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest =================================================================== ---- tomcat6-6.0.20.orig/apache-tomcat-6.0.20-src/res/bootstrap.jar.manifest 2009-05-14 01:15:30.000000000 +0200 -+++ tomcat6-6.0.20/apache-tomcat-6.0.20-src/res/bootstrap.jar.manifest 2009-06-03 10:37:07.529671107 +0200 +--- tomcat6-6.0.24.orig/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest 2010-01-19 14:43:41.000000000 +0100 ++++ tomcat6-6.0.24/apache-tomcat-6.0.24-src/res/META-INF/bootstrap.jar.manifest 2010-02-02 15:24:19.683835389 +0100 @@ -1,5 +1,4 @@ Manifest-Version: 1.0 Main-Class: org.apache.catalina.startup.Bootstrap --Class-Path: commons-daemon.jar tomcat-juli.jar tomcat-coyote.jar +-Class-Path: commons-daemon.jar tomcat-juli.jar Specification-Title: Catalina - Specification-Version: 6.0 +-Specification-Version: 6.0 +\ No newline at end of file ++Specification-Version: 6.0 ++++++ tomcat6-6.0-digest.script ++++++ #!/bin/sh # # tomcat6-digest script # JPackage Project <http://www.jpackage.org/> # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions else echo "Can't find functions library, aborting" exit 1 fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" fi if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi set_javacmd # CLASSPATH munging if [ -n "$JSSE_HOME" ]; then CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" fi CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" export CLASSPATH # Configuration MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_OPTIONS="" BASE_JARS="commons-daemon tomcat6/catalina servlet" # Set parameters set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run -server org.apache.catalina.realm.RealmBase "$@" ++++++ tomcat6-6.0.init ++++++ --- /var/tmp/diff_new_pack.35zUE2/_old 2010-02-05 14:28:05.000000000 +0100 +++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:05.000000000 +0100 @@ -15,7 +15,7 @@ # System startup script for the Tomcat servlet container # ### BEGIN INIT INFO -# Provides: tomcat +# Provides: tomcat6 # Required-Start: $network $syslog $remote_fs # Should-Start: $named $syslog $time # Required-Stop: $network $syslog @@ -29,6 +29,14 @@ # set a minimalist PATH PATH="/bin:/sbin" +# Source LSB function library. +if [ -r /lib/lsb/init-functions ]; then + . /lib/lsb/init-functions +else + exit 1 +fi +DISTRIB_ID=`lsb_release -i -s 2>/dev/null` + NAME="$(basename $0)" unset ISBOOT if [ "${NAME:0:1}" = "S" -o "${NAME:0:1}" = "K" ]; then @@ -65,16 +73,18 @@ CONNECTOR_PORT="${CONNECTOR_PORT:-8080}" # Path to the tomcat launch script -TOMCAT_SCRIPT="/usr/bin/dtomcat6" +TOMCAT_SCRIPT="/usr/sbin/dtomcat6" # Tomcat program name -TOMCAT_PROG="$NAME" +TOMCAT_PROG="${NAME}" # Define the tomcat username TOMCAT_USER="${TOMCAT_USER:-tomcat}" # Define the tomcat log file -TOMCAT_LOG="${TOMCAT_LOG:-/var/log/tomcat6/catalina.out}" +TOMCAT_LOG="${TOMCAT_LOG:-/var/log/${NAME}/catalina.out}" +# Define the tomcat pid file +export CATALINA_PID="/var/run/${NAME}.pid" RETVAL="0" @@ -183,7 +193,7 @@ # /etc/sysconfig/${NAME} # )" # fi - TOMCAT_SCRIPT="$options $TOMCAT_SCRIPT" + TOMCAT_SCRIPT="$options ${TOMCAT_SCRIPT}" } # See how we were called. @@ -217,11 +227,12 @@ -e "s/8009/${randomPort2}/g" -e "s/8443/${randomPort3}/g" \ ${CATALINA_HOME}/conf/server.xml fi + parseOptions if [ "$SECURITY_MANAGER" = "true" ]; then - $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT start-security" \ + $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start-security" \ >> $TOMCAT_LOG 2>&1 else - $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT start" >> $TOMCAT_LOG 2>&1 + $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} start" >> $TOMCAT_LOG 2>&1 fi RETVAL="$?" if [ "$RETVAL" -eq 0 ]; then @@ -269,7 +280,8 @@ function stop() { echo -n "Shutting down Tomcat ($CATALINA_BASE)" if [ -f "/var/lock/subsys/${NAME}" ]; then - $SU - $TOMCAT_USER -c "$TOMCAT_SCRIPT stop" >> $TOMCAT_LOG 2>&1 + parseOptions + $SU - $TOMCAT_USER -c "${TOMCAT_SCRIPT} stop" >> $TOMCAT_LOG 2>&1 RETVAL="$?" if [ "$RETVAL" -eq "0" ]; then count="0" @@ -278,14 +290,14 @@ until [ "$(ps --pid $kpid | grep -c $kpid)" -eq "0" ] || \ [ "$count" -gt "$SHUTDOWN_WAIT" ]; do if [ "$SHUTDOWN_VERBOSE" = "true" ]; then - echo -n -e "\nwaiting for processes $kpid to exit" + echo "waiting for processes $kpid to exit" fi sleep 1 let count="${count}+1" done if [ "$count" -gt "$SHUTDOWN_WAIT" ]; then if [ "$SHUTDOWN_VERBOSE" = "true" ]; then - echo -n -e "\nkilling processes which didn't stop" + echo "killing processes which didn't stop after $SHUTDOWN_WAIT seconds" echo -n -e "after " echo -n "$SHUTDOWN_WAIT seconds" fi @@ -319,11 +331,9 @@ # See how we were called. case "$1" in start) - parseOptions start ;; stop) - parseOptions stop ;; try-restart) @@ -336,7 +346,6 @@ rc_status ;; restart) - parseOptions stop sleep 2 start ++++++ tomcat6-6.0.logrotate ++++++ @@@TCLOG@@@/catalina.out { copytruncate weekly rotate 52 compress missingok create 0644 tomcat tomcat } ++++++ tomcat6-6.0.starter ++++++ #!/bin/sh # # Wrapper script for Tomcat 6.0, to be sure it will allways # be run with correct user profile (tomcat by default) # # derived from stuff in tomcat5.init # # Gomez Henri <hgomez(a)slib.fr> # Keith Irwin <keith_irwin(a)non.hp.com> # Nicolas Mailhot <nicolas.mailhot(a)one2team.com> # # version 1.01 - Fix webapps dir permissions # # Get Tomcat config TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" [ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}" export CATALINA_BASE export CATALINA_HOME # Path to the tomcat launch script TOMCAT_SCRIPT=/usr/sbin/dtomcat6 # Tomcat name :) TOMCAT_PROG=tomcat6 # if TOMCAT_USER is not set, use tomcat if [ -z "$TOMCAT_USER" ]; then TOMCAT_USER="tomcat" fi RETVAL=0 su $TOMCAT_USER -c "$TOMCAT_SCRIPT $@" RETVAL=$? exit $RETVAL ++++++ tomcat6-6.0-tomcat-users-webapp.patch ++++++ Index: apache-tomcat-6.0.24-src/conf/tomcat-users.xml =================================================================== --- apache-tomcat-6.0.24-src/conf/tomcat-users.xml.orig 2010-01-19 14:43:39.000000000 +0100 +++ apache-tomcat-6.0.24-src/conf/tomcat-users.xml 2010-02-03 11:36:56.881833728 +0100 @@ -23,4 +23,9 @@ <user username="both" password="tomcat" roles="tomcat,role1"/> <user username="role1" password="tomcat" roles="role1"/> --> + + + + + </tomcat-users> ++++++ tomcat6-6.0-tool-wrapper.script ++++++ #!/bin/sh # # tomcat6-digest script # JPackage Project <http://www.jpackage.org/> # Source functions library if [ -f /usr/share/java-utils/java-functions ] ; then . /usr/share/java-utils/java-functions else echo "Can't find functions library, aborting" exit 1 fi # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" fi if [ -r "$TOMCAT_CFG" ]; then . $TOMCAT_CFG fi set_javacmd # CLASSPATH munging if [ -n "$JSSE_HOME" ]; then CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" fi CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar" CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/tomcat-juli.jar" export CLASSPATH # Configuration MAIN_CLASS="org.apache.catalina.startup.Tool" BASE_OPTIONS="" BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\"" BASE_JARS="commons-daemon tomcat6/catalina servlet" # Set parameters set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ tomcat6-6.0.wrapper ++++++ --- /var/tmp/diff_new_pack.35zUE2/_old 2010-02-05 14:28:05.000000000 +0100 +++ /var/tmp/diff_new_pack.35zUE2/_new 2010-02-05 14:28:05.000000000 +0100 @@ -1,5 +1,12 @@ #!/bin/bash +if [ -r /usr/share/java-utils/java-functions ]; then + . /usr/share/java-utils/java-functions +else + echo "Can't read Java functions library, aborting" + exit 1 +fi + # Get the tomcat config (use this for environment specific settings) if [ -z "${TOMCAT_CFG}" ]; then TOMCAT_CFG="/etc/tomcat6/tomcat6.conf" @@ -9,6 +16,8 @@ . $TOMCAT_CFG fi +set_javacmd + # CLASSPATH munging if [ -n "$JSSE_HOME" ]; then CLASSPATH="${CLASSPATH}:$(build-classpath jcert jnet jsse 2>/dev/null)" @@ -18,7 +27,7 @@ CLASSPATH="${CLASSPATH}:$(build-classpath commons-daemon 2>/dev/null)" if [ "$1" = "start" ]; then - ${JAVA_HOME}/bin/java $JAVA_OPTS $CATALINA_OPTS \ + ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ @@ -32,7 +41,7 @@ echo $! > $CATALINA_PID fi elif [ "$1" = "start-security" ]; then - ${JAVA_HOME}/bin/java $JAVA_OPTS $CATALINA_OPTS \ + ${JAVACMD} $JAVA_OPTS $CATALINA_OPTS \ -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ @@ -48,7 +57,7 @@ echo $! > $CATALINA_PID fi elif [ "$1" = "stop" ]; then - ${JAVA_HOME}/bin/java $JAVA_OPTS \ + ${JAVACMD} $JAVA_OPTS \ -classpath "$CLASSPATH" \ -Dcatalina.base="$CATALINA_BASE" \ -Dcatalina.home="$CATALINA_HOME" \ @@ -57,10 +66,9 @@ org.apache.catalina.startup.Bootstrap stop \ >> ${CATALINA_BASE}/logs/catalina.out 2>&1 elif [ "$1" = "version" ]; then - ${JAVA_HOME}/bin/java -classpath ${CATALINA_HOME}/lib/catalina.jar \ + ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ org.apache.catalina.util.ServerInfo else echo "Usage: $0 {start|start-security|stop|version}" exit 1 fi - ++++++ tomcat6-rpmlintrc ++++++ # this is OK - fix of bnc#520532 addFilter(".*non-etc-or-var-file-marked-as-conffile /srv/tomcat6/webapps/ROOT.*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-nfs-client for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package yast2-nfs-client for openSUSE:Factory checked in at Fri Feb 5 14:27:38 CET 2010. -------- --- yast2-nfs-client/yast2-nfs-client.changes 2010-01-19 10:27:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes 2010-02-04 15:04:29.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Feb 4 14:52:27 CET 2010 - kmachalkova(a)suse.cz + +- New structure of <nfs> section of AY profiles to allow setting up + global vars (bnc#457981) +- Some style fixes - use ButtonBoxes, use OK-Cancel dialog + (bnc#571958) +- 2.19.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-nfs-client-2.19.0.tar.bz2 New: ---- yast2-nfs-client-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.ow7W6C/_old 2010-02-05 14:26:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ow7W6C/_new 2010-02-05 14:26:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-nfs-client (Version 2.19.0) +# spec file for package yast2-nfs-client (Version 2.19.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-nfs-client -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nfs-client-2.19.0.tar.bz2 +Source0: yast2-nfs-client-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -46,7 +46,7 @@ file system access. It allows access to files on remote machines. %prep -%setup -n yast2-nfs-client-2.19.0 +%setup -n yast2-nfs-client-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-nfs-client-2.19.0.tar.bz2 -> yast2-nfs-client-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/nfs_auto.ycp new/yast2-nfs-client-2.19.1/src/nfs_auto.ycp --- old/yast2-nfs-client-2.19.0/src/nfs_auto.ycp 2009-07-21 16:37:57.000000000 +0200 +++ new/yast2-nfs-client-2.19.1/src/nfs_auto.ycp 2010-02-04 15:04:09.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner(a)suse.cz> * - * $Id: nfs_auto.ycp 20632 2005-01-03 12:54:47Z mvidner $ + * $Id: nfs_auto.ycp 60697 2010-02-04 14:04:09Z kmachalkova $ * * This is a client for autoinstallation. It takes its arguments, * goes through the configuration and return the setting. @@ -37,13 +37,15 @@ any ret = nil; string func = ""; -list<map> param = []; +map <string, any> param = $[]; /* Check arguments */ if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { func = (string) WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = ( map <string, any> ) WFM::Args(1); if(size(WFM::Args()) > 1 && is(WFM::Args(1), list)) - param = (list<map>) WFM::Args(1); + y2warning("Old-style configuration detected (got list, expected map). <nfs> section needs to be converted to match up-to-date schema"); } y2debug("func=%1", func); y2debug("param=%1", param); @@ -58,8 +60,8 @@ } /* Reset configuration */ else if (func == "Reset") { - Nfs::Import([]); - ret = []; + Nfs::Import($[]); + ret = $[]; } /* Change configuration (run AutoSequence) */ else if (func == "Change") { @@ -80,7 +82,7 @@ } /* Return actual state */ else if (func == "Export") { - ret = (list) Nfs::Export(); + ret = (map) Nfs::Export(); } else if (func == "Read") { ret = (boolean) Nfs::Read(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/nfs.desktop new/yast2-nfs-client-2.19.1/src/nfs.desktop --- old/yast2-nfs-client-2.19.0/src/nfs.desktop 2010-01-14 12:30:13.000000000 +0100 +++ new/yast2-nfs-client-2.19.1/src/nfs.desktop 2010-02-03 20:50:08.000000000 +0100 @@ -15,7 +15,7 @@ X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource= -X-SuSE-YaST-AutoInstDataType=list +X-SuSE-YaST-AutoInstDataType=map X-SuSE-YaST-AutoInstClonable=true X-SuSE-YaST-AutoInstRequires=lan X-SuSE-YaST-AutoInstSchema=nfs.rnc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/nfs.rnc new/yast2-nfs-client-2.19.1/src/nfs.rnc --- old/yast2-nfs-client-2.19.0/src/nfs.rnc 2009-07-21 16:37:57.000000000 +0200 +++ new/yast2-nfs-client-2.19.1/src/nfs.rnc 2010-02-04 14:17:01.000000000 +0100 @@ -1,10 +1,14 @@ nfs = element nfs { - LIST, - element nfs_entry { - element server_path { text } - & element mount_point { text } - & element vfstype {text}? - & element nfs_options { text } - }* + element enable_nfs4 { BOOLEAN }? & + element idmapd_domain { text }? & + element nfs_entries { + LIST, + element nfs_entry { + element server_path { text } + & element mount_point { text } + & element vfstype {text}? + & element nfs_options { text } + }* + } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/Nfs.ycp new/yast2-nfs-client-2.19.1/src/Nfs.ycp --- old/yast2-nfs-client-2.19.0/src/Nfs.ycp 2009-07-21 16:37:57.000000000 +0200 +++ new/yast2-nfs-client-2.19.1/src/Nfs.ycp 2010-02-03 20:52:32.000000000 +0100 @@ -13,7 +13,7 @@ * Dan Vesely <dan(a)suse.cz> * Martin Vidner <mvidner(a)suse.cz> * - * $Id: Nfs.ycp 56674 2009-04-07 15:57:46Z kmachalkova $ + * $Id: Nfs.ycp 60683 2010-02-03 18:19:18Z kmachalkova $ */ { @@ -80,13 +80,33 @@ // list of created directories list<string> created_dirs = []; + boolean ReadNfs4 () { + return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); + } + + string ReadIdmapd() { + return (string) SCR::Read(.etc.idmapd_conf, "Domain"); + } + /** * Set module data * @param settings module settings * @return void */ - global define void Set(list<map> settings) ``{ - nfs_entries = maplist(map entry, settings, ``{ + global define void Set(map <string, any> settings) ``{ + if ( haskey(settings, "enable_nfs4") ) { + nfs4_enabled = settings["enable_nfs4"]:false; + } + else + nfs4_enabled = ReadNfs4(); + + if ( haskey(settings, "idmapd_domain") ) { + idmapd_domain = settings["idmapd_domain"]:"localdomain"; + } + else + idmapd_domain = ReadIdmapd(); + + nfs_entries = maplist(map entry, settings["nfs_entries"]:[], ``{ return($[ "spec":entry["server_path"]:"", "file":entry["mount_point"]:"", @@ -104,10 +124,10 @@ * @param settings a map with a single key: nfs_entries * @return success */ - global define boolean Import (list<map> settings) ``{ + global define boolean Import (map <string, any> settings) ``{ boolean missing = false; - settings = maplist(map s,settings,``{ + settings["nfs_entries"] = maplist(map s,settings["nfs_entries"]:[],``{ foreach (string k, ["server_path", "mount_point", "nfs_options"], ``{ if (! haskey (s, k)) { @@ -140,7 +160,12 @@ * Dump the NFS settings to a map, for autoinstallation use. * @return a list of nfs entries. */ - global define list Export () ``{ + global define map Export () ``{ + map <string, any> settings = $[]; + + settings["enable_nfs4"] = nfs4_enabled; + settings["idmapd_domain"] = idmapd_domain; + list entries = maplist(map entry, nfs_entries, ``{ return($[ "server_path":entry["spec"]:"", @@ -149,7 +174,8 @@ "nfs_options":entry["mntops"]:"" ]); }); - return entries; + settings["nfs_entries"]= entries; + return settings; } /* ------------------------------------------------------------ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/ui.ycp new/yast2-nfs-client-2.19.1/src/ui.ycp --- old/yast2-nfs-client-2.19.0/src/ui.ycp 2010-01-18 17:25:45.000000000 +0100 +++ new/yast2-nfs-client-2.19.1/src/ui.ycp 2010-02-04 13:16:14.000000000 +0100 @@ -13,7 +13,7 @@ * Dan Vesely <dan(a)suse.cz> * Martin Vidner <mvidner(a)suse.cz> * - * $Id: ui.ycp 56676 2009-04-08 08:41:20Z kmachalkova $ + * $Id: ui.ycp 60690 2010-02-04 12:16:13Z kmachalkova $ * * Network NFS client dialogs * @@ -73,7 +73,7 @@ `SelectionBox (`id (`items), title, items), `VSpacing(10) ), - `HBox ( + `ButtonBox ( `PushButton (`id (`ok), `opt (`default, `key_F10), Label::OKButton ()), `PushButton (`id (`cancel), `opt (`key_F9), @@ -258,7 +258,7 @@ `VSpacing(0.2), `TextEntry(`id(`optionsent), _("O&ptions"), options), `VSpacing(0.2), - `HBox( + `ButtonBox( `PushButton(`id(`ok), `opt(`default, `key_F10), Label::OKButton()), `PushButton(`id(`cancel), `opt (`key_F9), Label::CancelButton()), `PushButton(`id(`help), `opt (`key_F1), Label::HelpButton())), @@ -679,12 +679,12 @@ nfs_entries = Nfs::nfs_entries; // dialog heading - Wizard::SetContentsButtons(_("NFS Client Configuration"), + Wizard::SetContents(_("NFS Client Configuration"), MainDialogLayout(), help_text1, - Label::BackButton (), - Label::OKButton ()); - Wizard::HideBackButton(); - Wizard::SetAbortButton(`abort, Label::CancelButton()); + false, + true); + //Wizard::HideBackButton(); + //Wizard::SetAbortButton(`abort, Label::CancelButton()); InitFstabEntries(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/src/wizards.ycp new/yast2-nfs-client-2.19.1/src/wizards.ycp --- old/yast2-nfs-client-2.19.0/src/wizards.ycp 2009-07-21 16:37:57.000000000 +0200 +++ new/yast2-nfs-client-2.19.1/src/wizards.ycp 2010-02-04 13:16:14.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Wizards definitions * Authors: Martin Vidner <mvidner(a)suse.cz> * - * $Id: wizards.ycp 24875 2005-08-12 11:59:21Z mvidner $ + * $Id: wizards.ycp 60690 2010-02-04 12:16:13Z kmachalkova $ */ { @@ -54,7 +54,7 @@ ] ]; - Wizard::CreateDialog (); + Wizard::OpenOKDialog (); Wizard::SetDesktopIcon ("nfs"); any ret = Sequencer::Run (aliases, sequence); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-client-2.19.0/VERSION new/yast2-nfs-client-2.19.1/VERSION --- old/yast2-nfs-client-2.19.0/VERSION 2010-01-18 18:07:36.000000000 +0100 +++ new/yast2-nfs-client-2.19.1/VERSION 2010-02-04 14:58:06.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 skelcd-control-openSUSE for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at Fri Feb 5 14:26:35 CET 2010. -------- --- skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2010-01-21 15:30:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/skelcd-control-openSUSE/skelcd-control-openSUSE.changes 2010-02-02 11:10:46.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 2 11:03:04 CET 2010 - locilka(a)suse.cz + +- Added LXDE desktop (FATE #307729). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.rzy8ma/_old 2010-02-05 14:25:02.000000000 +0100 +++ /var/tmp/diff_new_pack.rzy8ma/_new 2010-02-05 14:25:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-control-openSUSE (Version 2010.1.21) +# spec file for package skelcd-control-openSUSE (Version 2010.2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ License: YaST Group: Metapackages AutoReqProv: off -Version: 2010.1.21 +Version: 2010.2.2 Release: 1 Summary: SuSE Linux Professional Control file BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ control.xml ++++++ --- skelcd-control-openSUSE/control.xml 2010-01-21 15:30:49.000000000 +0100 +++ /mounts/work_src_done/STABLE/skelcd-control-openSUSE/control.xml 2010-02-02 11:10:45.000000000 +0100 @@ -287,6 +287,19 @@ <icon>pattern-xfce</icon> </one_supported_desktop> +  + <one_supported_desktop> + <name>lxde</name> + <desktop>startlxde</desktop> + <label_id>desktop_lxde</label_id> + <logon>lxdm</logon> + <cursor>DMZ</cursor> + <packages>lxde-common</packages> + <order config:type="integer">5</order> + <patterns>lxde x11 base</patterns> + <icon>pattern-lxde</icon> + </one_supported_desktop> + <one_supported_desktop> <name>min_x</name> <desktop>twm</desktop> @@ -395,6 +408,7 @@ <desktop_gnome><label>GNOME Desktop</label></desktop_gnome> <desktop_kde><label>KDE Desktop</label></desktop_kde> <desktop_xfce><label>XFCE Desktop</label></desktop_xfce> + <desktop_lxde><label>LXDE Desktop</label></desktop_lxde> <desktop_min_x><label>Minimal X Window</label></desktop_min_x> <desktop_textmode><label>Minimal Server Selection (Text Mode)</label></desktop_textmode> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 wxGTK for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package wxGTK for openSUSE:Factory checked in at Fri Feb 5 14:24:52 CET 2010. -------- --- wxGTK/wxGTK.changes 2009-09-25 17:54:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/wxGTK/wxGTK.changes 2010-01-28 17:18:27.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 28 17:17:47 CET 2010 - sbrabec(a)suse.cz + +- Enabled media libraries (bnc#565039). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wxGTK.spec ++++++ --- /var/tmp/diff_new_pack.ImsIwd/_old 2010-02-05 14:24:24.000000000 +0100 +++ /var/tmp/diff_new_pack.ImsIwd/_new 2010-02-05 14:24:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package wxGTK (Version 2.8.10.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -21,12 +21,13 @@ Name: wxGTK BuildRequires: SDL-devel cppunit-devel esound-devel gcc-c++ gnome-vfs2-devel gtk2-devel libexpat-devel +BuildRequires: gconf2-devel gstreamer-0_10-devel gstreamer-0_10-plugins-base-devel BuildRequires: libgnomeprintui-devel libmspack-devel libtiff-devel python-devel python-xml -License: GPL v2 or later +License: GPLv2+ Group: System/Libraries AutoReqProv: on Version: 2.8.10.1 -Release: 4 +Release: 5 %define wx_version %(echo %{version} | sed 's/\.[0-9][0-9]*\.[0-9][0-9]*$//') Summary: C++ Framework for Cross-Platform Development %if 0 @@ -73,7 +74,7 @@ Robert Roebling <robert(a)roebling.de> %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Everything needed for development with wxGTK Group: Development/Libraries/GNOME Provides: wxgtk:/usr/bin/wx-config @@ -92,7 +93,7 @@ Robert Roebling <robert(a)roebling.de> %package gl -License: GPL v2 or later +License: GPLv2+ Summary: OpenGl add-on for wxGTK Group: Development/Libraries/GNOME Requires: wxGTK @@ -108,7 +109,7 @@ Robert Roebling <robert(a)roebling.de> %package compat -License: GPL v2 or later +License: GPLv2+ Summary: Non-Unicode wxWidgets Compatibility Package Group: System/Libraries Requires: wxGTK @@ -130,7 +131,7 @@ Robert Roebling <robert(a)roebling.de> %package -n python-wxGTK -License: GPL v2 or later +License: GPLv2+ Group: Development/Libraries/Python Requires: wxGTK Provides: wxPython @@ -182,6 +183,7 @@ --with-libmspack \ --with-sdl \ --enable-sound \ + --enable-mediactrl \ --with-gnomeprint \ --with-gnomevfs \ --enable-iff \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-bootloader for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at Fri Feb 5 14:21:49 CET 2010. -------- --- yast2-bootloader/yast2-bootloader.changes 2010-01-12 13:35:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2010-02-04 11:32:39.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Jan 28 16:08:30 CET 2010 - juhliarik(a)suse.cz + +- added commnets for using options in /etc/sysconfig/bootloader + (bnc#511319) +- 2.19.1 + +------------------------------------------------------------------- +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-bootloader-2.19.0.tar.bz2 New: ---- yast2-bootloader-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.m6wXZH/_old 2010-02-05 14:21:22.000000000 +0100 +++ /var/tmp/diff_new_pack.m6wXZH/_new 2010-02-05 14:21:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.19.0) +# spec file for package yast2-bootloader (Version 2.19.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-bootloader -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.19.0.tar.bz2 +Source0: yast2-bootloader-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -61,7 +61,7 @@ This package contains the YaST2 component for bootloader configuration. %prep -%setup -n yast2-bootloader-2.19.0 +%setup -n yast2-bootloader-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-bootloader-2.19.0.tar.bz2 -> yast2-bootloader-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.default new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.default --- old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.default 2009-02-17 13:41:52.000000000 +0100 +++ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.default 2010-01-28 15:10:12.000000000 +0100 @@ -11,7 +11,6 @@ LOADER_TYPE="" - ## Path: System/Bootloader ## Description: Bootloader configuration ## Type: string @@ -22,3 +21,5 @@ # # LOADER_LOCATION="" + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.default~ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.default~ --- old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.default~ 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.default~ 2010-01-28 15:10:12.000000000 +0100 @@ -0,0 +1,24 @@ +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# Type of bootloader in use. +# For making the change effect run bootloader configuration tool +# and configure newly selected bootloader +# +# +LOADER_TYPE="" + + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# Location of boot loader. +# For making the change effect run bootloader configuration tool +# +# +LOADER_LOCATION="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.i386 new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.i386 --- old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.i386 2009-02-17 13:41:52.000000000 +0100 +++ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.i386 2010-02-02 16:53:46.000000000 +0100 @@ -21,4 +21,3 @@ # # LOADER_LOCATION="" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.i386~ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.i386~ --- old/yast2-bootloader-2.19.0/agents/sysconfig.bootloader.i386~ 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.19.1/agents/sysconfig.bootloader.i386~ 2010-02-02 16:53:46.000000000 +0100 @@ -0,0 +1,107 @@ +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: list(grub,lilo,none) +## Default: grub +# +# Type of bootloader in use. +# For making the change effect run bootloader configuration tool +# and configure newly selected bootloader +# +# +LOADER_TYPE="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: list(floppy,mbr,root,boot,custom,none) +## Default: mbr +# +# Location of boot loader. +# For making the change effect run bootloader configuration tool +# +# +LOADER_LOCATION="" + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: "splash=silent quiet showotps" +# +# Arguments for kernel which is used like default boot section. +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +# +DEFAULT_APPEND="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# VGA option for kernel which is used like default boot section. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +# +# * DEFAULT_VGA="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: "showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe" +# +# Argumets for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +# +# * FAILSAFE_APPEND="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# VGA option for kernel which is used like failsafe boot section. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +# +# * FAILSAFE_VGA="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: "splash=silent quiet showotps" +## Example: "resume=/dev/sda2 splash=silent quiet showotps" +# +# Argumets for XEN kernel in Dom0. +# If the options is commented perl-Bootloader uses his default arguments +# for XEN kernel. +# Note: "resume" is swap partition +# +# * XEN_KERNEL_APPEND="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# Arguments for XEN hypervisor +# Usually it is empty or includes arguments like crashkernel for kdump etc. +# +# * XEN_APPEND="" + + +## Path: System/Bootloader +## Description: Bootloader configuration +## Type: string +## Default: none +# +# VGA option for XEN kernel. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +# +# * XEN_VGA="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/src/routines/misc.ycp new/yast2-bootloader-2.19.1/src/routines/misc.ycp --- old/yast2-bootloader-2.19.0/src/routines/misc.ycp 2009-10-13 15:49:10.000000000 +0200 +++ new/yast2-bootloader-2.19.1/src/routines/misc.ycp 2010-02-03 18:40:24.000000000 +0100 @@ -38,6 +38,7 @@ import "Installation"; import "FileUtils"; import "String"; + import "FileUtils"; // bootloader attributes handling functions @@ -1337,6 +1338,65 @@ return ret; } +/** bnc#511319 Add information about /etc/sysconfig/bootloader to configuration file. + * Write option with value and comment to + * sysconfig file + * + * @param boolean true if called from client inst_bootloader + * @param path to config file (.sysconfig.bootloader) + * @param path option (.DEFAULT_APPEND) + * @param string value of otion + * @param string comment of option + * @return true on success + */ + +define boolean WriteOptionToSysconfig(boolean inst, path file_path, path option, string value, string comment) +{ + boolean ret = false; + + if ((!inst) &&(!FileUtils::Exists("/etc/sysconfig/bootloader"))) + { + y2milestone("Skip writting configuration to /etc/sysconfig/bootloader -> file missing"); + return ret; + } + path file_path_option = add (file_path, option); + boolean comment_exist = SCR::Read(add(file_path_option, .comment)) == nil; + + // write value of option + ret = SCR::Write(file_path_option, value); + + // write comment of option if it is necessary + if (!comment_exist ) + { + ret = ret && SCR::Write(add(file_path_option, .comment), comment); + } + SCR::Write(file_path, nil); + return ret; +} + +/** bnc#511319 Add information about /etc/sysconfig/bootloader to configuration file. + * Create /etc/sysconfig/bootloader it is configuration + * file for bootloader + * + * @param boolean true if it is called from client inst_bootlaoder + * @return boolean true on success + */ + +define boolean CreateBLSysconfigFile(boolean inst) +{ + if (inst) + { + if (!FileUtils::CheckAndCreatePath(Installation::destdir +"/etc/sysconfig")) + { + WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); + WFM::Execute(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); + } + //string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; + return true; + } + return true; +} + /** FATE #302245 save kernel args etc to /etc/sysconfig/bootloader * Function write/update info in /etc/sysconfig/bootloader * @param booloean true if it called from inst_bootloader.ycp @@ -1439,35 +1499,229 @@ if (inst_bootloader) { - WFM::Execute(.local.mkdir, Installation::destdir + "/etc/sysconfig"); - WFM::Execute(.local.bash, sformat ("touch %1/etc/sysconfig/bootloader", Installation::destdir)); + sys_agent = add(.target, sys_agent); string target_sysconfig_path = Installation::destdir + "/etc/sysconfig/bootloader"; - SCR::RegisterAgent (.target.sysconfig.bootloader, `ag_ini( + SCR::RegisterAgent (sys_agent, `ag_ini( `SysConfigFile(target_sysconfig_path))); - sys_agent = add(.target, sys_agent); - } + CreateBLSysconfigFile(inst_bootloader); - SCR::Write (add(sys_agent,.LOADER_TYPE), lt); - SCR::Write (add(sys_agent,.DEFAULT_APPEND), default_append); - SCR::Write (add(sys_agent,.DEFAULT_VGA), default_vga); - SCR::Write (add(sys_agent,.FAILSAFE_APPEND), failsafe_append); - SCR::Write (add(sys_agent,.FAILSAFE_VGA), failsafe_vga); - SCR::Write (add(sys_agent,.XEN_KERNEL_APPEND), xen_kernel_append); - SCR::Write (add(sys_agent,.XEN_APPEND), xen_append); - SCR::Write (add(sys_agent,.XEN_VGA), xen_vga); - if (addon_name != "") - SCR::Write (add(sys_agent,.RT_NAME), addon_name); + string comment = ""; + comment= "\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tlist(grub,lilo,none) +## Default:\tgrub +# +# Type of bootloader in use. +# For making the change effect run bootloader configuration tool +# and configure newly selected bootloader +# +#\n"; + if (!Arch::i386() && !Arch::x86_64()) + { + comment= "\n ## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Type of bootloader in use. +# For making the change effect run bootloader configuration tool +# and configure newly selected bootloader +# +#\n"; + } + + WriteOptionToSysconfig(inst_bootloader, sys_agent, .LOADER_TYPE, lt, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"splash=silent quiet showotps\" +# +# Arguments for kernel which is used like default boot section. +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; - if (addon_vga != "") - SCR::Write (add(sys_agent,.RT_VGA), addon_vga); + if (!Arch::i386() && !Arch::x86_64()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Arguments for kernel which is used like default boot section. +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; + + } + WriteOptionToSysconfig(inst_bootloader, sys_agent, .DEFAULT_APPEND, default_append, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# VGA option for kernel which is used like default boot section. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +#\n"; + + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .DEFAULT_VGA, default_vga, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"showopts apm=off noresume nosmp maxcpus=0 edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe\" +# +# Arguments for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; - if (addon_append != "") - SCR::Write (add(sys_agent,.RT_APPEND), addon_append); + if (Arch::x86_64()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"showopts apm=off noresume edd=off powersaved=off nohz=off highres=off processor.max_cstate=1 nomodeset x11failsafe\" +# +# Arguments for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; - SCR::Write (sys_agent, nil); + } + if (Arch::ia64()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"nohalt noresume powersaved=off x11failsafe\" +# +# Arguments for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; + + } + + if (Arch::s390()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Arguments for kernel which is used like failsafe boot section +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; + + } + + WriteOptionToSysconfig(inst_bootloader, sys_agent, .FAILSAFE_APPEND, failsafe_append, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# VGA option for kernel which is used like failsafe boot section. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +#\n"; + + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .FAILSAFE_VGA, failsafe_vga, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"splash=silent quiet showotps\" +# +# Arguments for XEN kernel in Dom0. +# If the options is commented perl-Bootloader uses his default arguments +# for XEN kernel. +#\n"; + + if (Arch::ia64 ()) + { + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\t\"splash=silent quiet\" +# +# Arguments for XEN kernel in Dom0. +# If the options is commented perl-Bootloader uses his default arguments +# for XEN kernel. +#\n"; + + } + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .XEN_KERNEL_APPEND, xen_kernel_append, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Arguments for XEN hypervisor +# Usually it is empty or includes arguments like crashkernel for kdump etc. +#\n"; + + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .XEN_APPEND, xen_append, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# VGA option for XEN kernel. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +#\n"; + if (Arch::i386 () || Arch::x86_64 () || Arch::ia64 ()) + WriteOptionToSysconfig(inst_bootloader, sys_agent, .XEN_VGA, xen_vga, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Title of RealTime kernel in bootloader configuration file. +#\n"; + if (addon_name != "") + WriteOptionToSysconfig(inst_bootloader, sys_agent, .RT_NAME, addon_name, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# VGA option for RealTime kernel. +# If the options is commented or empty perl-Bootloader doesn't use it. +# Empty option could be cause of broken size of fonts etc. +#\n"; + if (addon_vga != "") + WriteOptionToSysconfig(inst_bootloader, sys_agent, .RT_VGA, addon_vga, comment); + + comment="\n## Path:\tSystem/Bootloader +## Description:\tBootloader configuration +## Type:\tstring +## Default:\tnone +# +# Arguments for RealTime kernel. +# If the options is commented perl-Bootloader uses his default arguments +# for kernel. +#\n"; + if (addon_append != "") + WriteOptionToSysconfig(inst_bootloader, sys_agent, .RT_APPEND, addon_append, comment); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-2.19.0/VERSION new/yast2-bootloader-2.19.1/VERSION --- old/yast2-bootloader-2.19.0/VERSION 2010-01-12 13:10:19.000000000 +0100 +++ new/yast2-bootloader-2.19.1/VERSION 2010-01-28 16:09:31.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-security for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package yast2-security for openSUSE:Factory checked in at Fri Feb 5 14:21:09 CET 2010. -------- --- yast2-security/yast2-security.changes 2009-12-21 15:12:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-security/yast2-security.changes 2010-02-05 12:40:23.000000000 +0100 @@ -1,0 +2,13 @@ +Fri Feb 5 11:45:27 CET 2010 - jsuchome(a)suse.cz + +- DISPLAYMANAGER_SHUTDOWN is not for GDM (bnc#570656) +- 2.19.1 + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-security-2.19.0.tar.bz2 New: ---- yast2-security-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-security.spec ++++++ --- /var/tmp/diff_new_pack.NxxZcN/_old 2010-02-05 14:20:23.000000000 +0100 +++ /var/tmp/diff_new_pack.NxxZcN/_new 2010-02-05 14:20:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-security (Version 2.19.0) +# spec file for package yast2-security (Version 2.19.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,10 +19,10 @@ Name: yast2-security -Version: 2.19.0 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-security-2.19.0.tar.bz2 +Source0: yast2-security-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -42,7 +42,7 @@ The YaST2 component for security settings configuration. %prep -%setup -n yast2-security-2.19.0 +%setup -n yast2-security-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-security-2.19.0.tar.bz2 -> yast2-security-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-security-2.19.0/configure new/yast2-security-2.19.1/configure --- old/yast2-security-2.19.0/configure 2009-12-21 15:11:39.000000000 +0100 +++ new/yast2-security-2.19.1/configure 2010-02-05 11:46:35.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-security 2.19.0. +# Generated by GNU Autoconf 2.63 for yast2-security 2.19.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-security' PACKAGE_TARNAME='yast2-security' -PACKAGE_VERSION='2.19.0' -PACKAGE_STRING='yast2-security 2.19.0' +PACKAGE_VERSION='2.19.1' +PACKAGE_STRING='yast2-security 2.19.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,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-security 2.19.0 to adapt to many kinds of systems. +\`configure' configures yast2-security 2.19.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-security 2.19.0:";; + short | recursive ) echo "Configuration of yast2-security 2.19.1:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-security configure 2.19.0 +yast2-security configure 2.19.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,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-security $as_me 2.19.0, which was +It was created by yast2-security $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2419,7 +2419,7 @@ # Define the identity of the package. PACKAGE='yast2-security' - VERSION='2.19.0' + VERSION='2.19.1' cat >>confdefs.h <<_ACEOF @@ -2541,7 +2541,7 @@ -VERSION="2.19.0" +VERSION="2.19.1" RPMNAME="yast2-security" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" @@ -3483,7 +3483,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-security $as_me 2.19.0, which was +This file was extended by yast2-security $as_me 2.19.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3533,7 +3533,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-security config.status 2.19.0 +yast2-security config.status 2.19.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-security-2.19.0/configure.in new/yast2-security-2.19.1/configure.in --- old/yast2-security-2.19.0/configure.in 2009-12-21 15:11:35.000000000 +0100 +++ new/yast2-security-2.19.1/configure.in 2010-02-05 11:46:30.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-security, 2.19.0, http://bugs.opensuse.org/, yast2-security) +AC_INIT(yast2-security, 2.19.1, http://bugs.opensuse.org/, yast2-security) 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.19.0" +VERSION="2.19.1" RPMNAME="yast2-security" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-security-2.19.0/src/helps.ycp new/yast2-security-2.19.1/src/helps.ycp --- old/yast2-security-2.19.0/src/helps.ycp 2009-12-21 15:09:12.000000000 +0100 +++ new/yast2-security-2.19.1/src/helps.ycp 2010-01-21 10:46:19.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Helps definition * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: helps.ycp 57402 2009-06-02 20:40:08Z jsuchome $ + * $Id: helps.ycp 60161 2009-12-21 14:12:00Z jsuchome $ * * This file contains all helps for the security module screens. * They are in one huge map called HELPS. @@ -51,7 +51,7 @@ /* Boot dialog help 3/3 */ _("<p><b>Shutdown Behaviour of Login Manager</b>: -Set who is allowed to shut down the machine from KDM or GDM.</p> +Set who is allowed to shut down the machine from KDM.</p> "), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-security-2.19.0/src/security.desktop new/yast2-security-2.19.1/src/security.desktop --- old/yast2-security-2.19.0/src/security.desktop 2009-09-03 14:41:37.000000000 +0200 +++ new/yast2-security-2.19.1/src/security.desktop 2010-01-15 09:17:33.000000000 +0100 @@ -20,9 +20,8 @@ X-SuSE-YaST-Keywords=security,system settings Icon=yast-security -Exec=/sbin/yast2 security +Exec=xdg-su -c "/sbin/yast2 security" Name=Local Security GenericName=Configure local security settings -X-KDE-SubstituteUID=true StartupNotify=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-security-2.19.0/src/widgets.ycp new/yast2-security-2.19.1/src/widgets.ycp --- old/yast2-security-2.19.0/src/widgets.ycp 2009-06-02 22:40:39.000000000 +0200 +++ new/yast2-security-2.19.1/src/widgets.ycp 2010-01-21 10:46:04.000000000 +0100 @@ -138,7 +138,7 @@ "DISPLAYMANAGER_SHUTDOWN" : $[ "Widget" : "ComboBox", /* ComboBox label */ - "Label" : _("&Shutdown Behaviour of Login Manager:"), + "Label" : _("&Shutdown Behaviour of KDM Login Manager:"), "Options" : [ /* ComboBox value */ ["root",_("Only root")], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-security-2.19.0/VERSION new/yast2-security-2.19.1/VERSION --- old/yast2-security-2.19.0/VERSION 2009-12-21 15:11:22.000000000 +0100 +++ new/yast2-security-2.19.1/VERSION 2010-02-05 11:46:20.000000000 +0100 @@ -1 +1 @@ -2.19.0 +2.19.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sensors for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '10

05 Feb '10

Hello community, here is the log from the commit of package sensors for openSUSE:Factory checked in at Fri Feb 5 14:20:14 CET 2010. -------- --- sensors/sensors.changes 2009-12-19 12:18:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/sensors/sensors.changes 2010-02-04 12:52:45.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Feb 4 12:46:28 CET 2010 - jdelvare(a)suse.de + +- Update to lm_sensors 3.1.2 + * Support for future kernels and HID devices in libsensors + * Cleanups to sensord + * New chips known by sensors-detect, as usual + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lm_sensors-3.1.1.tar.bz2 lm_sensors-3.1.1.tar.bz2.sig lm_sensors-r5757-LPC47M233-not-supported.patch lm_sensors-r5760-rename-modprobe-conf.patch lm_sensors-r5770-fancontrol-update.patch New: ---- lm_sensors-3.1.2.tar.bz2 lm_sensors-3.1.2.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sensors.spec ++++++ --- /var/tmp/diff_new_pack.0yCFfw/_old 2010-02-05 14:19:54.000000000 +0100 +++ /var/tmp/diff_new_pack.0yCFfw/_new 2010-02-05 14:19:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sensors (Version 3.1.1) +# spec file for package sensors (Version 3.1.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: sensors BuildRequires: bison flex rrdtool-devel Url: http://www.lm-sensors.org/ -Version: 3.1.1 -Release: 5 +Version: 3.1.2 +Release: 1 Summary: Hardware health monitoring for Linux License: GPLv2+ Group: System/Monitoring @@ -35,10 +35,7 @@ Patch2: lm_sensors-3.0.0-sensord-separate.patch Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch -Patch5: lm_sensors-r5757-LPC47M233-not-supported.patch -Patch6: lm_sensors-r5760-rename-modprobe-conf.patch -Patch7: lm_sensors-r5770-fancontrol-update.patch -Patch8: lm_sensors-3.1.1-no-ipmisensors-driver.patch +Patch5: lm_sensors-3.1.1-no-ipmisensors-driver.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: s390 s390x @@ -141,9 +138,6 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ++++++ lm_sensors-3.0.0-sysconfig_metadata.patch ++++++ --- /var/tmp/diff_new_pack.0yCFfw/_old 2010-02-05 14:19:54.000000000 +0100 +++ /var/tmp/diff_new_pack.0yCFfw/_new 2010-02-05 14:19:54.000000000 +0100 @@ -1,6 +1,6 @@ --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect +++ lm_sensors-3.1.1/prog/detect/sensors-detect -@@ -5460,6 +5460,12 @@ sub write_config +@@ -5709,6 +5709,12 @@ sub write_config or die "Sorry, can't create /etc/sysconfig/lm_sensors ($!)"; print SYSCONFIG "# Generated by sensors-detect on " . scalar localtime() . "\n"; print SYSCONFIG <<'EOT'; ++++++ lm_sensors-3.0.3-hint-at-kernel-extra-package.patch ++++++ --- /var/tmp/diff_new_pack.0yCFfw/_old 2010-02-05 14:19:54.000000000 +0100 +++ /var/tmp/diff_new_pack.0yCFfw/_new 2010-02-05 14:19:54.000000000 +0100 @@ -8,7 +8,7 @@ --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect +++ lm_sensors-3.1.1/prog/detect/sensors-detect -@@ -2052,12 +2052,15 @@ sub initialize_conf +@@ -2129,12 +2129,15 @@ sub initialize_conf # [2] -> SUBLEVEL # [3] -> EXTRAVERSION # @@ -25,7 +25,7 @@ chomp($kernel_arch = `uname -m`); # We only support kernels >= 2.6.5 -@@ -5402,7 +5405,11 @@ sub generate_modprobes +@@ -5651,7 +5654,11 @@ sub generate_modprobes # isn't supported if ((($? >> 8) == 0) && ! $modulefound) { print "Warning: the required module $driver is not currently installed\n". ++++++ lm_sensors-3.1.1-build.patch ++++++ --- /var/tmp/diff_new_pack.0yCFfw/_old 2010-02-05 14:19:54.000000000 +0100 +++ /var/tmp/diff_new_pack.0yCFfw/_new 2010-02-05 14:19:54.000000000 +0100 @@ -1,6 +1,6 @@ --- lm_sensors-3.1.1.orig/Makefile +++ lm_sensors-3.1.1/Makefile -@@ -140,7 +140,7 @@ ifeq ($(DEBUG),1) +@@ -141,7 +141,7 @@ ifeq ($(DEBUG),1) ALL_CPPFLAGS += -DDEBUG ALL_CFLAGS += -O -g else ++++++ lm_sensors-3.1.1-no-ipmisensors-driver.patch ++++++ --- /var/tmp/diff_new_pack.0yCFfw/_old 2010-02-05 14:19:54.000000000 +0100 +++ /var/tmp/diff_new_pack.0yCFfw/_new 2010-02-05 14:19:54.000000000 +0100 @@ -7,7 +7,7 @@ --- lm_sensors-3.1.1.orig/prog/detect/sensors-detect +++ lm_sensors-3.1.1/prog/detect/sensors-detect -@@ -1121,12 +1121,12 @@ use vars qw(@i2c_adapter_names); +@@ -1166,12 +1166,12 @@ use vars qw(@i2c_adapter_names); @ipmi_ifs = ( { name => "IPMI BMC KCS", @@ -22,7 +22,7 @@ isa_addrs => [0x0ca8], isa_detect => sub { ipmi_detect(@_); }, } -@@ -5127,13 +5127,13 @@ sub ipmi_from_smbios +@@ -5334,13 +5334,13 @@ sub ipmi_from_smbios $if->{type})); } print "Success!\n". ++++++ lm_sensors-3.1.1.tar.bz2 -> lm_sensors-3.1.2.tar.bz2 ++++++ ++++ 2285 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