August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit mysql-connector-java
by root＠Hilbert.suse.de 07 Aug '08

07 Aug '08

Hello community, here is the log from the commit of package mysql-connector-java checked in at Thu Aug 7 11:59:21 CEST 2008. -------- --- mysql-connector-java/mysql-connector-java.changes 2008-07-17 07:54:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/mysql-connector-java/mysql-connector-java.changes 2008-08-07 10:33:05.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Aug 7 09:46:22 CEST 2008 - mvyskocil(a)suse.cz + +- update to the 5.0.8 (improved spec from jpackage.org) + - fix of [bnc#99151] +- added two new subpackages (javadoc and manual) +- removed the dependency on jboss4 +- add a support for build with java6 and java5 together (ia64 build fix) +- use source="1.5" and target="1.5" + +------------------------------------------------------------------- Old: ---- mysql-connector-java-3.1.12.tar.gz mysql-connector-java-java14compat.patch patch-build.xml New: ---- mysql-connector-java-5.0.8-java6-compatibility.patch mysql-connector-java-5.0.8.tar.bz2 mysql-connector-java-build_xml.patch mysql-connector-java-target-javadoc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mysql-connector-java.spec ++++++ --- /var/tmp/diff_new_pack.a22261/_old 2008-08-07 11:59:13.000000000 +0200 +++ /var/tmp/diff_new_pack.a22261/_new 2008-08-07 11:59:13.000000000 +0200 @@ -1,41 +1,53 @@ # -# spec file for package mysql-connector-java (Version 3.1.12) +# spec file for package mysql-connector-java (Version 5.0.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild # icecream 0 - -Name: mysql-connector-java +%define section free %define builddir build-mysql-jdbc %define distdir dist-mysql-jdbc +%define with_jboss4 0 + +Name: mysql-connector-java Summary: Official JDBC Driver for MySQL -BuildRequires: ant java2-devel-packages jta junit log4j-mini -Version: 3.1.12 -Release: 265 +Version: 5.0.8 +Release: 1 License: GPL v2 or later Group: Development/Libraries/Java -Source0: %{name}-%{version}.tar.gz -Patch0: patch-build.xml -Patch1: %{name}-java14compat.patch +Source0: %{name}-%{version}.tar.bz2 +Patch0: %{name}-build_xml.patch +Patch1: %{name}-target-javadoc.patch +Patch2: %{name}-%{version}-java6-compatibility.patch Url: http://www.mysql.com/downloads/api-jdbc-stable.html BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Requires: jta >= 1.0.1-0.a.1 +BuildRequires: ant +BuildRequires: ant-contrib +BuildRequires: java-devel +BuildRequires: jakarta-commons-logging +%if %{with_jboss4} +BuildRequires: jboss4-common +BuildRequires: jboss4-connector +%endif +BuildRequires: jpackage-utils +BuildRequires: junit +BuildRequires: log4j-mini Requires: log4j -#BuildRequires: ant >= 1.6.0 -#BuildRequires: ant-contrib -#BuildRequires: java-devel >= 1.4.0 -#BuildRequires: jpackage-utils >= 1.6 -#BuildRequires: jta >= 1.0.1-0.a.1 -#BuildRequires: junit -#BuildRequires: log4j Provides: mm.mysql Obsoletes: mm.mysql @@ -50,32 +62,120 @@ +%package javadoc +License: GPL v2 or later +Summary: Official JDBC Driver for MySQL +Group: Development/Libraries/Java +Requires(post): /bin/ln +Requires(post): /bin/rm +Requires(postun): /bin/rm + +%description javadoc +MySQL Connector/J is a native Java driver that converts JDBC (Java +Database Connectivity) calls into the network protocol used by the +MySQL database. It lets developers working with the Java programming +language easily build programs and applets that interact with MySQL and +connect all corporate data, even in a heterogeneous environment. MySQL +Connector/J is a Type IV JDBC driver and has a complete JDBC feature +set that supports the capabilities of MySQL. + + + +%package manual +License: GPL v2 or later +Summary: Official JDBC Driver for MySQL +Group: Development/Libraries/Java +Requires(post): /bin/ln +Requires(post): /bin/rm +Requires(postun): /bin/rm + +%description manual +MySQL Connector/J is a native Java driver that converts JDBC (Java +Database Connectivity) calls into the network protocol used by the +MySQL database. It lets developers working with the Java programming +language easily build programs and applets that interact with MySQL and +connect all corporate data, even in a heterogeneous environment. MySQL +Connector/J is a Type IV JDBC driver and has a complete JDBC feature +set that supports the capabilities of MySQL. + + + %prep %setup -q -n %{name}-%{version} -%patch0 -%patch1 +%patch0 -b .sav0 +%patch1 -b .sav1 +# patch only for javac 1.6.0 +if [[ "$(javac -version 2>&1 | grep '1\.6\.0')" != "" ]]; then +%patch2 -b .sav2 +fi # remove all binary libs -find . $ -name "*.jar" -o -name "*.class" $ | xargs -t rm -f +find . $ -name "*.jar" -o -name "*.class" $ | xargs -t %{__rm} -f +%if ! %{with_jboss4} +rm -r src/com/mysql/jdbc/integration/jboss/ +rm -r src/testsuite/regression/DataSourceRegressionTest.java +%endif +# duplicate-waste +rm docs/README.txt README +# wrong end of line necoding +sed -i -e 's/.$//' README.txt EXCEPTIONS-CONNECTOR-J %build -export CLASSPATH=$(build-classpath ant-contrib jdbc-stdext jta junit log4j) -ant -DbuildDir=%{builddir} -DdistDir=%{distdir} +# jboss jars needed for test suite +export CLASSPATH="$(build-classpath ant-contrib \ + jakarta-commons-logging \ +%if %{with_jboss4} + jboss4/jboss-common-jdbc-wrapper \ +%endif + jdbc-stdext jta \ + junit log4j xml-commons-jaxp-1.3-apis)" +ant -Dant.build.javac.source=1.5 \ + -Dant.build.javac.target=1.5 \ + -DbuildDir="%{builddir}" \ + -DdistDir="%{distdir}" \ + dist javadoc %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadir} +%{__install} -m 644 %{builddir}/%{name}-%{version}/%{name}-%{version}-bin.jar \ + ${RPM_BUILD_ROOT}%{_javadir}/%{name}-%{version}.jar +( + cd ${RPM_BUILD_ROOT}%{_javadir} && \ + for jar in *-%{version}*.jar; do + %{__ln_s} -f ${jar} `echo $jar | %{__sed} "s|-%{version}||g"` + done +) +%{__rm} -rf ${RPM_BUILD_DIR}%{name}-%{version}/docs/release-test-output +# javadoc +%{__install} -d -m 755 ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} +%{__cp} -pr build-mysql-jdbc/javadoc/* \ + ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}-%{version} +%{__ln_s} %{name}-%{version} ${RPM_BUILD_ROOT}%{_javadocdir}/%{name} %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %files %defattr(0644,root,root,0755) -%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README README.txt docs +%doc CHANGES COPYING EXCEPTIONS-CONNECTOR-J README.txt %attr(0644,root,root) %{_javadir}/*.jar +%files manual +%defattr(0644,root,root,0755) +%doc docs + +%files javadoc +%defattr(0644,root,root,0755) +%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name}-%{version} + %changelog +* Thu Aug 07 2008 mvyskocil(a)suse.cz +- update to the 5.0.8 (improved spec from jpackage.org) + - fix of [bnc#99151] +- added two new subpackages (javadoc and manual) +- removed the dependency on jboss4 +- add a support for build with java6 and java5 together (ia64 build fix) +- use source="1.5" and target="1.5" * Thu Jul 17 2008 coolo(a)suse.de - trying to avoid another build cycle * Wed Sep 27 2006 skh(a)suse.de ++++++ mysql-connector-java-5.0.8-java6-compatibility.patch ++++++ ++++ 1659 lines (skipped) ++++++ mysql-connector-java-build_xml.patch ++++++ --- build.xml +++ build.xml @@ -60,10 +60,6 @@ </path> <path id="project.build.classpath"> - <fileset dir="${buildDir}/${fullProdName}/lib-nodist"> - <include name="**/*.jar"/> - </fileset> - <fileset dir="${buildDir}/${fullProdName}/lib"> <include name="**/*.jar"/> </fileset> @@ -652,7 +648,9 @@ debug="${debug.enable}" excludes="testsuite/**, com/mysql/jdbc/integration/**, - com/mysql/jdbc/log/Log4JLogger.java"> + com/mysql/jdbc/log/Log4JLogger.java" + source="1.5" + target="1.5"> <classpath refid="project.build.classpath" /> </javac> </target> @@ -694,7 +692,9 @@ destdir="${buildDir}/${fullProdName}" deprecation="off" debug="${debug.enable}" - includes="com/mysql/jdbc/integration/c3p0/**"> + includes="com/mysql/jdbc/integration/c3p0/**" + source="1.5" + target="1.5" > <classpath refid="project.build.classpath" /> </javac> </target> @@ -706,7 +706,9 @@ destdir="${buildDir}/${fullProdName}" deprecation="off" debug="${debug.enable}" - includes="com/mysql/jdbc/integration/jboss/**"> + includes="com/mysql/jdbc/integration/jboss/**" + source="1.5" + target="1.5" > <classpath refid="project.build.classpath" /> </javac> </target> @@ -718,7 +720,9 @@ destdir="${buildDir}/${fullProdName}" deprecation="off" debug="${debug.enable}" - includes="com/mysql/jdbc/log/Log4JLogger.java"> + includes="com/mysql/jdbc/log/Log4JLogger.java" + source="1.5" + target="1.5" > <classpath refid="project.build.classpath" /> </javac> </target> @@ -732,7 +736,9 @@ deprecation="off" debug="${debug.enable}" includes="testsuite/**" - excludes="testsuite/requiresNonRedists/**"> + excludes="testsuite/requiresNonRedists/**" + target="1.5" + source="1.5" > <classpath refid="project.build.classpath"/> </javac> </target> ++++++ mysql-connector-java-target-javadoc.patch ++++++ --- build.xml +++ build.xml @@ -361,7 +361,7 @@ </if> </target> - <target name="dist" depends="init, compile"> + <target name="dist" depends="init, compile, javadoc"> <delete file="${buildDir}/${fullProdName}-bin.jar" /> <delete file="${distDir}/${fullProdName}.jar" /> @@ -1175,4 +1175,22 @@ </sequential> </for> </target> + <target name="javadoc" + description="Creates the API documentation"> + <mkdir dir="${buildDir}/javadoc"/> + <javadoc packagenames="com.mysql.jdbc.*,org.gjt.mm.mysql.*" + sourcepath="${sourceDir}" + destdir="${buildDir}/javadoc" + author="true" + version="true" + use="true" + splitindex="true" + noindex="false" + windowtitle="MySQL Connector/J v${version}" + doctitle="MySQL Connector/J v${version} API Specification" + header="MySQL Connector/J size='-1'>${version}"> + <classpath refid="project.build.classpath" /> + </javadoc> + </target> + </project> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdebindings4
by root＠Hilbert.suse.de 07 Aug '08

07 Aug '08

Hello community, here is the log from the commit of package kdebindings4 checked in at Thu Aug 7 10:22:35 CEST 2008. -------- --- KDE/kdebindings4/kdebindings4.changes 2008-08-01 17:10:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes 2008-08-07 09:54:48.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 7 09:54:18 CEST 2008 - dmueller(a)suse.de + +- fix debug package requires + +------------------------------------------------------------------- python-kde4.changes: same change ruby-kde4.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings4.spec ++++++ --- /var/tmp/diff_new_pack.M28621/_old 2008-08-07 10:21:50.000000000 +0200 +++ /var/tmp/diff_new_pack.M28621/_new 2008-08-07 10:21:50.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kdebindings4 (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -24,15 +31,17 @@ Group: Development/Libraries/KDE Summary: Bindings for KDE 4.x libraries Version: 4.1.0 -Release: 3 +Release: 4 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define is_python 0 %define is_ruby 0 %define is_base 1 -%define debug_package_requires libsmoke2 = %{version} %kde4_runtime_requires +%if %is_base +%define debug_package_requires libsmoke2 = %{version}-%{release} +%endif %if %is_python %requires_eq python-qt4 %requires_eq python-sip @@ -87,6 +96,7 @@ %endif %if %is_ruby rm -rf java python + sed -i -r -e 's,add_subdirectory$ examples$,,' ruby/korundum/CMakeLists.txt %endif %cmake_kde4 -d build -- -DENABLE_SMOKEKDEVPLATFORM=OFF %make_jobs @@ -216,6 +226,8 @@ %endif %changelog +* Thu Aug 07 2008 dmueller(a)suse.de +- fix debug package requires * Fri Aug 01 2008 ro(a)suse.de - fix requires for debuginfo package * Tue Jul 29 2008 dmueller(a)suse.de ++++++ python-kde4.spec ++++++ --- /var/tmp/diff_new_pack.M28621/_old 2008-08-07 10:21:50.000000000 +0200 +++ /var/tmp/diff_new_pack.M28621/_new 2008-08-07 10:21:50.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package python-kde4 (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -24,15 +31,17 @@ Group: Development/Libraries/KDE Summary: Python Bindings for KDE 4.x Platform Version: 4.1.0 -Release: 6 +Release: 7 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define is_python 1 %define is_ruby 0 %define is_base 0 -%define debug_package_requires libsmoke2 = %{version} %kde4_runtime_requires +%if %is_base +%define debug_package_requires libsmoke2 = %{version}-%{release} +%endif %if %is_python %requires_eq python-qt4 %requires_eq python-sip @@ -87,6 +96,7 @@ %endif %if %is_ruby rm -rf java python + sed -i -r -e 's,add_subdirectory$ examples$,,' ruby/korundum/CMakeLists.txt %endif %cmake_kde4 -d build -- -DENABLE_SMOKEKDEVPLATFORM=OFF %make_jobs @@ -216,6 +226,8 @@ %endif %changelog +* Thu Aug 07 2008 dmueller(a)suse.de +- fix debug package requires * Fri Aug 01 2008 ro(a)suse.de - fix requires for debuginfo package * Tue Jul 29 2008 dmueller(a)suse.de ++++++ ruby-kde4.spec ++++++ --- /var/tmp/diff_new_pack.M28621/_old 2008-08-07 10:21:50.000000000 +0200 +++ /var/tmp/diff_new_pack.M28621/_new 2008-08-07 10:21:50.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package ruby-kde4 (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -24,15 +31,17 @@ Group: Development/Libraries/KDE Summary: Ruby bindings for KDE 4 Version: 4.1.0 -Release: 3 +Release: 4 Source0: kdebindings-%version.tar.bz2 Patch0: 4_1_BRANCH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define is_python 0 %define is_ruby 1 %define is_base 0 -%define debug_package_requires libsmoke2 = %{version} %kde4_runtime_requires +%if %is_base +%define debug_package_requires libsmoke2 = %{version}-%{release} +%endif %if %is_python %requires_eq python-qt4 %requires_eq python-sip @@ -87,6 +96,7 @@ %endif %if %is_ruby rm -rf java python + sed -i -r -e 's,add_subdirectory$ examples$,,' ruby/korundum/CMakeLists.txt %endif %cmake_kde4 -d build -- -DENABLE_SMOKEKDEVPLATFORM=OFF %make_jobs @@ -216,6 +226,8 @@ %endif %changelog +* Thu Aug 07 2008 dmueller(a)suse.de +- fix debug package requires * Fri Aug 01 2008 ro(a)suse.de - fix requires for debuginfo package * Tue Jul 29 2008 dmueller(a)suse.de ++++++ kdebindings4.spec.in ++++++ --- KDE/kdebindings4/kdebindings4.spec.in 2008-08-01 17:09:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.spec.in 2008-08-07 09:54:49.000000000 +0200 @@ -29,8 +29,10 @@ %define is_python 0 %define is_ruby 0 %define is_base 0 -%define debug_package_requires libsmoke2 = %{version} %kde4_runtime_requires +%if %is_base +%define debug_package_requires libsmoke2 = %{version}-%{release} +%endif %if %is_python %requires_eq python-qt4 %requires_eq python-sip @@ -71,6 +73,7 @@ %endif %if %is_ruby rm -rf java python + sed -i -r -e 's,add_subdirectory$ examples$,,' ruby/korundum/CMakeLists.txt %endif %cmake_kde4 -d build -- -DENABLE_SMOKEKDEVPLATFORM=OFF %make_jobs ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libxslt
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package libxslt checked in at Thu Aug 7 01:42:51 CEST 2008. -------- --- libxslt/libxslt.changes 2008-05-19 12:18:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxslt/libxslt.changes 2008-07-18 16:13:08.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jul 18 16:09:54 CEST 2008 - prusnak(a)suse.cz + +- updated to 1.1.24: + * documentation: man page fix + * bug fixes: pattern bug fix, key initialization problems, + exclusion of unknown namespaced element on top of stylesheets + python generator syntactic cleanup +- dropped obsoleted CVE-2008-1767.patch (included in update) +- fixed overflow in RC4 code (rc4-overflow.patch) [bnc#410256] + +------------------------------------------------------------------- Old: ---- libxslt-1.1.23-CVE-2008-1767.patch libxslt-1.1.23-linkflags.patch libxslt-1.1.23-no-net-autobuild.patch libxslt-1.1.23.tar.bz2 New: ---- libxslt-1.1.24-linkflags.patch libxslt-1.1.24-no-net-autobuild.patch libxslt-1.1.24-rc4-overflow.patch libxslt-1.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxslt-python.spec ++++++ --- /var/tmp/diff_new_pack.tN4311/_old 2008-08-07 01:42:38.000000000 +0200 +++ /var/tmp/diff_new_pack.tN4311/_new 2008-08-07 01:42:38.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package libxslt-python (Version 1.1.23) +# spec file for package libxslt-python (Version 1.1.24) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,8 +21,8 @@ Name: libxslt-python BuildRequires: libxml2-python libxslt-devel python-devel Summary: Python Bindings for libxslt -Version: 1.1.23 -Release: 14 +Version: 1.1.24 +Release: 1 License: X11/MIT Group: Development/Libraries/Python Source: libxslt-%{version}.tar.bz2 ++++++ libxslt.spec ++++++ --- /var/tmp/diff_new_pack.tN4311/_old 2008-08-07 01:42:38.000000000 +0200 +++ /var/tmp/diff_new_pack.tN4311/_new 2008-08-07 01:42:38.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package libxslt (Version 1.1.23) +# spec file for package libxslt (Version 1.1.24) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,13 +21,13 @@ Name: libxslt BuildRequires: libgcrypt libgcrypt-devel libgpg-error libgpg-error-devel libxml2-devel Summary: XSL Transformation Library -Version: 1.1.23 -Release: 12 +Version: 1.1.24 +Release: 1 License: X11/MIT Group: System/Libraries Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-no-net-autobuild.patch -Patch1: %{name}-%{version}-CVE-2008-1767.patch +Patch1: %{name}-%{version}-rc4-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libxml2 >= 2.6.27 Url: http://xmlsoft.org/XSLT/ @@ -108,6 +115,14 @@ %doc doc/*.html doc/html doc/tutorial doc/*.gif %changelog +* Fri Jul 18 2008 prusnak(a)suse.cz +- updated to 1.1.24: + * documentation: man page fix + * bug fixes: pattern bug fix, key initialization problems, + exclusion of unknown namespaced element on top of stylesheets + python generator syntactic cleanup +- dropped obsoleted CVE-2008-1767.patch (included in update) +- fixed overflow in RC4 code (rc4-overflow.patch) [bnc#410256] * Mon May 19 2008 prusnak(a)suse.cz - fixed CVE-2008-1767 (CVE-2008-1767.patch) [bnc#391920] * Fri Apr 11 2008 prusnak(a)suse.cz ++++++ libxslt-1.1.23-linkflags.patch -> libxslt-1.1.24-linkflags.patch ++++++ ++++++ libxslt-1.1.23-no-net-autobuild.patch -> libxslt-1.1.24-no-net-autobuild.patch ++++++ ++++++ libxslt-1.1.24-rc4-overflow.patch ++++++ Index: libexslt/crypto.c =================================================================== --- libexslt/crypto.c (revision 1479) +++ libexslt/crypto.c (working copy) @@ -595,11 +595,13 @@ exsltCryptoRc4EncryptFunction (xmlXPathP int str_len = 0, bin_len = 0, hex_len = 0; xmlChar *key = NULL, *str = NULL, *padkey = NULL; xmlChar *bin = NULL, *hex = NULL; + xsltTransformContextPtr tctxt = NULL; - if ((nargs < 1) || (nargs > 3)) { + if (nargs != 2) { xmlXPathSetArityError (ctxt); return; } + tctxt = xsltXPathGetTransformContext(ctxt); str = xmlXPathPopString (ctxt); str_len = xmlUTF8Strlen (str); @@ -611,7 +613,7 @@ exsltCryptoRc4EncryptFunction (xmlXPathP } key = xmlXPathPopString (ctxt); - key_len = xmlUTF8Strlen (str); + key_len = xmlUTF8Strlen (key); if (key_len == 0) { xmlXPathReturnEmptyString (ctxt); @@ -620,15 +622,33 @@ exsltCryptoRc4EncryptFunction (xmlXPathP return; } - padkey = xmlMallocAtomic (RC4_KEY_LENGTH); + padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1); + if (padkey == NULL) { + xsltTransformError(tctxt, NULL, tctxt->inst, + "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n"); + tctxt->state = XSLT_STATE_STOPPED; + xmlXPathReturnEmptyString (ctxt); + goto done; + } + memset(padkey, 0, RC4_KEY_LENGTH + 1); + key_size = xmlUTF8Strsize (key, key_len); + if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) { + xsltTransformError(tctxt, NULL, tctxt->inst, + "exsltCryptoRc4EncryptFunction: key size too long or key broken\n"); + tctxt->state = XSLT_STATE_STOPPED; + xmlXPathReturnEmptyString (ctxt); + goto done; + } memcpy (padkey, key, key_size); - memset (padkey + key_size, '\0', sizeof (padkey)); /* encrypt it */ bin_len = str_len; bin = xmlStrdup (str); if (bin == NULL) { + xsltTransformError(tctxt, NULL, tctxt->inst, + "exsltCryptoRc4EncryptFunction: Failed to allocate string\n"); + tctxt->state = XSLT_STATE_STOPPED; xmlXPathReturnEmptyString (ctxt); goto done; } @@ -638,6 +658,9 @@ exsltCryptoRc4EncryptFunction (xmlXPathP hex_len = str_len * 2 + 1; hex = xmlMallocAtomic (hex_len); if (hex == NULL) { + xsltTransformError(tctxt, NULL, tctxt->inst, + "exsltCryptoRc4EncryptFunction: Failed to allocate result\n"); + tctxt->state = XSLT_STATE_STOPPED; xmlXPathReturnEmptyString (ctxt); goto done; } @@ -670,11 +693,13 @@ exsltCryptoRc4DecryptFunction (xmlXPathP int str_len = 0, bin_len = 0, ret_len = 0; xmlChar *key = NULL, *str = NULL, *padkey = NULL, *bin = NULL, *ret = NULL; + xsltTransformContextPtr tctxt = NULL; - if ((nargs < 1) || (nargs > 3)) { + if (nargs != 2) { xmlXPathSetArityError (ctxt); return; } + tctxt = xsltXPathGetTransformContext(ctxt); str = xmlXPathPopString (ctxt); str_len = xmlUTF8Strlen (str); @@ -686,7 +711,7 @@ exsltCryptoRc4DecryptFunction (xmlXPathP } key = xmlXPathPopString (ctxt); - key_len = xmlUTF8Strlen (str); + key_len = xmlUTF8Strlen (key); if (key_len == 0) { xmlXPathReturnEmptyString (ctxt); @@ -695,22 +720,51 @@ exsltCryptoRc4DecryptFunction (xmlXPathP return; } - padkey = xmlMallocAtomic (RC4_KEY_LENGTH); + padkey = xmlMallocAtomic (RC4_KEY_LENGTH + 1); + if (padkey == NULL) { + xsltTransformError(tctxt, NULL, tctxt->inst, + "exsltCryptoRc4EncryptFunction: Failed to allocate padkey\n"); + tctxt->state = XSLT_STATE_STOPPED; + xmlXPathReturnEmptyString (ctxt); + goto done; + } + memset(padkey, 0, RC4_KEY_LENGTH + 1); key_size = xmlUTF8Strsize (key, key_len); + if ((key_size > RC4_KEY_LENGTH) || (key_size < 0)) { + xsltTransformError(tctxt, NULL, tctxt->inst, + "exsltCryptoRc4EncryptFunction: key size too long or key broken\n"); + tctxt->state = XSLT_STATE_STOPPED; + xmlXPathReturnEmptyString (ctxt); + goto done; + } memcpy (padkey, key, key_size); - memset (padkey + key_size, '\0', sizeof (padkey)); /* decode hex to binary */ bin_len = str_len; bin = xmlMallocAtomic (bin_len); + if (bin == NULL) { + xsltTransformError(tctxt, NULL, tctxt->inst, + "exsltCryptoRc4EncryptFunction: Failed to allocate string\n"); + tctxt->state = XSLT_STATE_STOPPED; + xmlXPathReturnEmptyString (ctxt); + goto done; + } ret_len = exsltCryptoHex2Bin (str, str_len, bin, bin_len); /* decrypt the binary blob */ ret = xmlMallocAtomic (ret_len); + if (ret == NULL) { + xsltTransformError(tctxt, NULL, tctxt->inst, + "exsltCryptoRc4EncryptFunction: Failed to allocate result\n"); + tctxt->state = XSLT_STATE_STOPPED; + xmlXPathReturnEmptyString (ctxt); + goto done; + } PLATFORM_RC4_DECRYPT (ctxt, padkey, bin, ret_len, ret, ret_len); xmlXPathReturnString (ctxt, ret); +done: if (key != NULL) xmlFree (key); if (str != NULL) ++++++ libxslt-1.1.23.tar.bz2 -> libxslt-1.1.24.tar.bz2 ++++++ ++++ 36863 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

commit yast2-theme
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-theme checked in at Thu Aug 7 01:40:28 CEST 2008. -------- --- yast2-theme/yast2-theme.changes 2008-06-04 13:22:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-theme/yast2-theme.changes 2008-08-06 17:03:26.234582000 +0200 @@ -1,0 +2,11 @@ +Wed Aug 06 16:56:21 CEST 2008 - aschnell(a)suse.de + +- icons for new expert partitioner +- 2.17.1 + +------------------------------------------------------------------- +Fri Jul 11 13:13:36 CEST 2008 - locilka(a)suse.cz + +- Added msg_question.png to all 32x32. + +------------------------------------------------------------------- Old: ---- yast2-theme-2.16.38.tar.bz2 New: ---- yast2-theme-2.17.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-theme.spec ++++++ --- /var/tmp/diff_new_pack.i30293/_old 2008-08-07 01:40:18.000000000 +0200 +++ /var/tmp/diff_new_pack.i30293/_new 2008-08-07 01:40:18.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-theme (Version 2.16.38) +# spec file for package yast2-theme (Version 2.17.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-theme -Version: 2.16.38 +Version: 2.17.1 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-theme-2.16.38.tar.bz2 +Source0: yast2-theme-2.17.1.tar.bz2 Prefix: /usr BuildRequires: fdupes hicolor-icon-theme pkg-config update-desktop-files yast2 yast2-devtools BuildArch: noarch @@ -35,7 +42,7 @@ %package openSUSE License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.38 +Version: 2.17.1 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -50,7 +57,7 @@ %package openSUSE-Crystal License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.38 +Version: 2.17.1 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -59,7 +66,7 @@ %package openSUSE-Oxygen License: GPL v2 or later Summary: YaST2 - Theme (openSUSE) -Version: 2.16.38 +Version: 2.17.1 Release: 1 Group: System/YaST Provides: yast2_theme = %{version} @@ -94,7 +101,7 @@ Ken Wimer <wimer(a)suse.de> %prep -%setup -n yast2-theme-2.16.38 +%setup -n yast2-theme-2.17.1 %build %{prefix}/bin/y2tool y2autoconf @@ -187,6 +194,11 @@ %dir /usr/share/YaST2/theme /usr/share/YaST2/theme/openSUSE-Oxygen %changelog +* Wed Aug 06 2008 aschnell(a)suse.de +- icons for new expert partitioner +- 2.17.1 +* Fri Jul 11 2008 locilka(a)suse.cz +- Added msg_question.png to all 32x32. * Wed Jun 04 2008 sh(a)suse.de - Added Martin Schlander's new Oxygen icons (bnc #397020): - yast-casa ++++++ yast2-theme-2.16.38.tar.bz2 -> yast2-theme-2.17.1.tar.bz2 ++++++ ++++ 10354 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-theme-2.16.38/configure.in new/yast2-theme-2.17.1/configure.in --- old/yast2-theme-2.16.38/configure.in 2008-05-30 12:01:15.000000000 +0200 +++ new/yast2-theme-2.17.1/configure.in 2008-08-06 16:57:16.000000000 +0200 @@ -1,8 +1,8 @@ dnl configure.in for yast2-theme dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-theme, 2.16.35, http://bugs.opensuse.org/, yast2-theme) +AC_INIT(yast2-theme, 2.17.1, http://bugs.opensuse.org/, yast2-theme) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.35" +VERSION="2.17.1" RPMNAME="yast2-theme" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-theme-2.16.38/missing new/yast2-theme-2.17.1/missing --- old/yast2-theme-2.16.38/missing 2008-05-30 12:01:21.000000000 +0200 +++ new/yast2-theme-2.17.1/missing 2008-08-06 16:57:22.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/pattern-gnome.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/pattern-gnome.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-casa.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-casa.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-device-mapper.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-device-mapper.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-encrypted.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-encrypted.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-ipsec.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-ipsec.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-provider.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-provider.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-raid.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-raid.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-report.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-report.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-restore.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-restore.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-tftp-server.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-tftp-server.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-unused-device.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-unused-device.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/22x22/apps/yast-you_server.png and new/yast2-theme-2.17.1/openSUSE/icons/22x22/apps/yast-you_server.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/msg_question.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/msg_question.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-casa.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-casa.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-device-mapper.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-device-mapper.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-encrypted.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-encrypted.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-ipsec.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-ipsec.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-provider.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-provider.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-raid.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-raid.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-repair.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-repair.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-report.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-report.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-restore.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-restore.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-scripts.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-scripts.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-squid.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-squid.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-unused-device.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-unused-device.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/32x32/apps/yast-you_server.png and new/yast2-theme-2.17.1/openSUSE/icons/32x32/apps/yast-you_server.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-casa.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-casa.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-device-mapper.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-device-mapper.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-encrypted.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-encrypted.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-ipsec.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-ipsec.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-provider.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-provider.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-raid.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-raid.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-repair.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-repair.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-report.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-report.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-restore.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-restore.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-squid.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-squid.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-unused-device.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-unused-device.png differ Files old/yast2-theme-2.16.38/openSUSE/icons/48x48/apps/yast-you_server.png and new/yast2-theme-2.17.1/openSUSE/icons/48x48/apps/yast-you_server.png differ Files old/yast2-theme-2.16.38/openSUSE-Crystal/icons/32x32/apps/msg_question.png and new/yast2-theme-2.17.1/openSUSE-Crystal/icons/32x32/apps/msg_question.png differ Files old/yast2-theme-2.16.38/openSUSE-Oxygen/icons/32x32/apps/msg_question.png and new/yast2-theme-2.17.1/openSUSE-Oxygen/icons/32x32/apps/msg_question.png differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-theme-2.16.38/VERSION new/yast2-theme-2.17.1/VERSION --- old/yast2-theme-2.16.38/VERSION 2008-06-04 13:13:40.000000000 +0200 +++ new/yast2-theme-2.17.1/VERSION 2008-06-20 17:54:34.000000000 +0200 @@ -1 +1 @@ -2.16.38 +2.17.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-nfs-client
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-nfs-client checked in at Thu Aug 7 01:40:18 CEST 2008. -------- --- yast2-nfs-client/yast2-nfs-client.changes 2008-05-16 21:55:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes 2008-08-06 21:23:08.506434000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 6 15:25:16 CEST 2008 - kmachalkova(a)suse.cz + +- Create correct fstab entries when importing data from AY profile + (regression from FaTE #302031 - now we need to store also fstype + info - nfs vs. nfsv4) (bnc#395850) +- 2.17.0 + +------------------------------------------------------------------- Old: ---- yast2-nfs-client-2.16.1.tar.bz2 New: ---- yast2-nfs-client-2.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-nfs-client.spec ++++++ --- /var/tmp/diff_new_pack.N29292/_old 2008-08-07 01:40:12.000000000 +0200 +++ /var/tmp/diff_new_pack.N29292/_new 2008-08-07 01:40:12.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-nfs-client (Version 2.16.1) +# spec file for package yast2-nfs-client (Version 2.17.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-nfs-client -Version: 2.16.1 -Release: 19 +Version: 2.17.0 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-nfs-client-2.16.1.tar.bz2 +Source0: yast2-nfs-client-2.17.0.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite #Hostname::CurrentDomain @@ -44,7 +51,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-nfs-client-2.16.1 +%setup -n yast2-nfs-client-2.17.0 %build %{prefix}/bin/y2tool y2autoconf @@ -87,6 +94,11 @@ %doc %{prefix}/share/doc/packages/yast2-nfs-client /usr/share/YaST2/schema/autoyast/rnc/nfs.rnc %changelog +* Wed Aug 06 2008 kmachalkova(a)suse.cz +- Create correct fstab entries when importing data from AY profile + (regression from FaTE #302031 - now we need to store also fstype + info - nfs vs. nfsv4) (bnc#395850) +- 2.17.0 * Fri May 16 2008 jsrain(a)suse.cz - added categories Settings and System into desktop file (bnc #382778) ++++++ yast2-nfs-client-2.16.1.tar.bz2 -> yast2-nfs-client-2.17.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/configure new/yast2-nfs-client-2.17.0/configure --- old/yast2-nfs-client-2.16.1/configure 2008-05-16 22:26:53.000000000 +0200 +++ new/yast2-nfs-client-2.17.0/configure 2008-04-14 19:16:20.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-nfs-client 2.16.1. +# Generated by GNU Autoconf 2.61 for yast2-nfs-client 2.16.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-nfs-client' PACKAGE_TARNAME='yast2-nfs-client' -PACKAGE_VERSION='2.16.1' -PACKAGE_STRING='yast2-nfs-client 2.16.1' +PACKAGE_VERSION='2.16.0' +PACKAGE_STRING='yast2-nfs-client 2.16.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1199,7 +1199,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-nfs-client 2.16.1 to adapt to many kinds of systems. +\`configure' configures yast2-nfs-client 2.16.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1270,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-nfs-client 2.16.1:";; + short | recursive ) echo "Configuration of yast2-nfs-client 2.16.0:";; esac cat <<\_ACEOF @@ -1348,7 +1348,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-nfs-client configure 2.16.1 +yast2-nfs-client configure 2.16.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1362,7 +1362,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-nfs-client $as_me 2.16.1, which was +It was created by yast2-nfs-client $as_me 2.16.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2183,7 +2183,7 @@ # Define the identity of the package. PACKAGE='yast2-nfs-client' - VERSION='2.16.1' + VERSION='2.16.0' cat >>confdefs.h <<_ACEOF @@ -2411,7 +2411,7 @@ -VERSION="2.16.1" +VERSION="2.16.0" RPMNAME="yast2-nfs-client" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -3399,7 +3399,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-nfs-client $as_me 2.16.1, which was +This file was extended by yast2-nfs-client $as_me 2.16.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3442,7 +3442,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-nfs-client config.status 2.16.1 +yast2-nfs-client config.status 2.16.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/configure.in new/yast2-nfs-client-2.17.0/configure.in --- old/yast2-nfs-client-2.16.1/configure.in 2008-05-16 22:26:50.000000000 +0200 +++ new/yast2-nfs-client-2.17.0/configure.in 2008-04-14 19:16:15.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-nfs-client, 2.16.1, http://bugs.opensuse.org/, yast2-nfs-client) +AC_INIT(yast2-nfs-client, 2.16.0, http://bugs.opensuse.org/, yast2-nfs-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.1" +VERSION="2.16.0" RPMNAME="yast2-nfs-client" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/src/nfs.rnc new/yast2-nfs-client-2.17.0/src/nfs.rnc --- old/yast2-nfs-client-2.16.1/src/nfs.rnc 2005-09-23 16:09:30.000000000 +0200 +++ new/yast2-nfs-client-2.17.0/src/nfs.rnc 2008-08-06 15:17:38.000000000 +0200 @@ -4,6 +4,7 @@ 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.16.1/src/Nfs.ycp new/yast2-nfs-client-2.17.0/src/Nfs.ycp --- old/yast2-nfs-client-2.16.1/src/Nfs.ycp 2008-04-15 10:45:19.000000000 +0200 +++ new/yast2-nfs-client-2.17.0/src/Nfs.ycp 2008-08-06 15:36:16.000000000 +0200 @@ -13,7 +13,7 @@ * Dan Vesely <dan(a)suse.cz> * Martin Vidner <mvidner(a)suse.cz> * - * $Id: Nfs.ycp 46643 2008-04-15 08:45:19Z kmachalkova $ + * $Id: Nfs.ycp 49768 2008-08-06 13:06:54Z kmachalkova $ */ { @@ -82,6 +82,7 @@ return($[ "spec":entry["server_path"]:"", "file":entry["mount_point"]:"", + "vfstype":entry["vfstype"]:"", "mntops":entry["nfs_options"]:"" ]); }); @@ -106,12 +107,23 @@ missing = true; } }); + + //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts + //thus we need to keep info on nfs version (v3 vs. v4) + //But older AY profiles might not contain this element + //so let's assume nfsv3 in that case (#395850) + if ( !haskey(s, "vfstype") ) + { + s["vfstype"] = "nfs"; + } + }); if (missing) { return false; } + Set(settings); return true; } @@ -125,6 +137,7 @@ return($[ "server_path":entry["spec"]:"", "mount_point":entry["file"]:"", + "vfstype" :entry["vfstype"]:"", "nfs_options":entry["mntops"]:"" ]); }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/src/ui.ycp new/yast2-nfs-client-2.17.0/src/ui.ycp --- old/yast2-nfs-client-2.16.1/src/ui.ycp 2008-04-15 10:45:19.000000000 +0200 +++ new/yast2-nfs-client-2.17.0/src/ui.ycp 2008-08-06 15:50:15.000000000 +0200 @@ -13,7 +13,7 @@ * Dan Vesely <dan(a)suse.cz> * Martin Vidner <mvidner(a)suse.cz> * - * $Id: ui.ycp 46643 2008-04-15 08:45:19Z kmachalkova $ + * $Id: ui.ycp 49770 2008-08-06 13:20:53Z kmachalkova $ * * Network NFS client dialogs * @@ -218,7 +218,8 @@ `HSpacing(1), `VBox( `VSpacing(0.2), - TextAndButton ( + `HBox( + TextAndButton ( `ComboBox( `id(`serverent),`opt(`editable), // text entry label @@ -228,7 +229,7 @@ // appears in help text too `PushButton (`id (`choose), _("Choo&se")) ), - `HBox( + `HSpacing(0.5), TextAndButton ( `TextEntry(`id(`pathent), // textentry label @@ -238,8 +239,9 @@ // make it short // appears in help text too `PushButton (`id (`pathent_list), _("&Select")) - ), - `HSpacing(0.5), + ) + ), + `Left( TextAndButton ( `TextEntry(`id(`mountent), // textentry label @@ -252,7 +254,7 @@ ), // textentry label `VSpacing(0.2), - `CheckBox(`id(`nfs4), "NFS&v4 Share", nfs4), + `Left( `CheckBox(`id(`nfs4), "NFS&v4 Share", nfs4)), `TextEntry(`id(`optionsent), _("O&ptions"), options), `VSpacing(0.2), `HBox( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/VERSION new/yast2-nfs-client-2.17.0/VERSION --- old/yast2-nfs-client-2.16.1/VERSION 2008-04-15 10:57:36.000000000 +0200 +++ new/yast2-nfs-client-2.17.0/VERSION 2008-08-06 21:50:40.000000000 +0200 @@ -1 +1 @@ -2.16.1 +2.17.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-network checked in at Thu Aug 7 01:40:08 CEST 2008. -------- --- yast2-network/yast2-network.changes 2008-08-04 15:59:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2008-08-06 13:01:57.474106000 +0200 @@ -1,0 +2,19 @@ +Wed Aug 6 13:00:12 CEST 2008 - mzugec(a)suse.cz + +- increase default idle time-out for modem connection (fate#303429) +- 2.17.17 + +------------------------------------------------------------------- +Wed Aug 6 09:18:00 CEST 2008 - mzugec(a)suse.cz + +- installation via wireless (bnc#223570) +- possibility to add bond device into bridge and device with /32 + prefixlen (bnc#405343) +- 2.17.16 + +------------------------------------------------------------------- +Tue Aug 5 10:28:41 CEST 2008 - mzugec(a)suse.cz + +- improved help text (bnc#376063) + +------------------------------------------------------------------- Old: ---- yast2-network-2.17.15.tar.bz2 New: ---- yast2-network-2.17.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.H24471/_old 2008-08-07 01:40:03.000000000 +0200 +++ /var/tmp/diff_new_pack.H24471/_new 2008-08-07 01:40:03.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-network (Version 2.17.15) +# spec file for package yast2-network (Version 2.17.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-network -Version: 2.17.15 +Version: 2.17.17 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.17.15.tar.bz2 +Source0: yast2-network-2.17.17.tar.bz2 Prefix: /usr # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm @@ -78,7 +78,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-network-2.17.15 +%setup -n yast2-network-2.17.17 %build %{prefix}/bin/y2tool y2autoconf @@ -142,6 +142,16 @@ %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Wed Aug 06 2008 mzugec(a)suse.cz +- increase default idle time-out for modem connection (fate#303429) +- 2.17.17 +* Wed Aug 06 2008 mzugec(a)suse.cz +- installation via wireless (bnc#223570) +- possibility to add bond device into bridge and device with /32 + prefixlen (bnc#405343) +- 2.17.16 +* Tue Aug 05 2008 mzugec(a)suse.cz +- improved help text (bnc#376063) * Mon Aug 04 2008 mzugec(a)suse.cz - for ssh/vnc installation don't reload/restart network because possibility of IP change (bnc#347482) ++++++ yast2-network-2.17.15.tar.bz2 -> yast2-network-2.17.17.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.15/configure new/yast2-network-2.17.17/configure --- old/yast2-network-2.17.15/configure 2008-08-04 15:55:11.000000000 +0200 +++ new/yast2-network-2.17.17/configure 2008-08-06 12:56:15.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-network 2.17.14. +# Generated by GNU Autoconf 2.61 for yast2-network 2.17.16. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.17.14' -PACKAGE_STRING='yast2-network 2.17.14' +PACKAGE_VERSION='2.17.16' +PACKAGE_STRING='yast2-network 2.17.16' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-network 2.17.14 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.17.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.17.14:";; + short | recursive ) echo "Configuration of yast2-network 2.17.16:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.17.14 +yast2-network configure 2.17.16 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-network $as_me 2.17.14, which was +It was created by yast2-network $as_me 2.17.16, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.17.14' + VERSION='2.17.16' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.14" +VERSION="2.17.16" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.17.14, which was +This file was extended by yast2-network $as_me 2.17.16, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.17.14 +yast2-network config.status 2.17.16 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.15/configure.in new/yast2-network-2.17.17/configure.in --- old/yast2-network-2.17.15/configure.in 2008-08-04 15:55:05.000000000 +0200 +++ new/yast2-network-2.17.17/configure.in 2008-08-06 12:56:09.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.17.14, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.17.16, http://bugs.opensuse.org/, yast2-network) 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.17.14" +VERSION="2.17.16" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.15/src/clients/save_network.ycp new/yast2-network-2.17.17/src/clients/save_network.ycp --- old/yast2-network-2.17.15/src/clients/save_network.ycp 2008-07-15 15:47:46.000000000 +0200 +++ new/yast2-network-2.17.17/src/clients/save_network.ycp 2008-08-06 09:10:24.000000000 +0200 @@ -100,11 +100,11 @@ ReadInstallInfItem(install_inf, "QETH_LAYER2_SUPPORT", "Layer2"); ReadInstallInfItem(install_inf, "LLADDR", "OSAHWAddr"); - ReadInstallInfItem(install_inf, "WlanESSID", "WESSID"); - ReadInstallInfItem(install_inf, "WlanAuth", "WAuth"); - ReadInstallInfItem(install_inf, "WlanKey", "WKey"); - ReadInstallInfItem(install_inf, "WlanKeyType", "WkeyType"); - ReadInstallInfItem(install_inf, "WlanKeyLen", "WkeyLen"); + ReadInstallInfItem(install_inf, "WESSID", "WlanESSID"); + ReadInstallInfItem(install_inf, "WAuth", "WlanAuth"); + ReadInstallInfItem(install_inf, "WKey", "WlanKey"); + ReadInstallInfItem(install_inf, "WkeyType", "WlanKeyType"); + ReadInstallInfItem(install_inf, "WkeyLen", "WlanKeyLen"); /* Split network device */ @@ -210,27 +210,43 @@ SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); } - // wlan devices - if (size(InstallInf["WESSID"]:"")>0 || size(InstallInf["WAuth"]:"")>0 || - size(InstallInf["WKey"]:"")>0 || size(InstallInf["WKeyType"]:"")>0 || - size(InstallInf["WKeyLen"]:"")>0) + // wireless devices (bnc#223570) + if ( size(InstallInf["WESSID"]:"")>0 ) { network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); - if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) - network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, +// network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); + switch(InstallInf["WAuth"]:""){ + case "" : // "" means wpa-psk + case "psk" : + network_configuration = sformat("%1WIRELESS_WPA_PSK='%2'\n", network_configuration, InstallInf["WKey"]:""); + network_configuration = sformat("%1WIRELESS_AUTH_MODE='psk'\n", network_configuration); + break; + case "open" : + network_configuration = sformat("%1WIRELESS_AUTH_MODE='no-encryption'\n", network_configuration); + break; + case "wep_open" : + case "wep_restricted" : + string type=""; + if (InstallInf["WkeyType"]:""=="password") type="h:"; + else if (InstallInf["WkeyType"]:""=="ascii") type="s:"; + network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, (InstallInf["WAuth"]:""=="wep-open") ? "open" : "sharedkey"); + network_configuration = sformat("%1WIRELESS_DEFAULT_KEY='0'\n", network_configuration); + network_configuration = sformat("%1WIRELESS_KEY_0='%2%3'\n", network_configuration, type, InstallInf["WKey"]:""); + network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); + if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) + network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); + break; + } } // if available, write MTU - if (size(InstallInf["mtu"]:"")>0) + if (size(InstallInf["mtu"]:"")>0) network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); // for queth devices (s390) - if (size(InstallInf["LLADDR"]:"")>0) + if (size(InstallInf["LLADDR"]:"")>0) network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["LLADDR"]:""); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.15/src/lan/bridge.ycp new/yast2-network-2.17.17/src/lan/bridge.ycp --- old/yast2-network-2.17.15/src/lan/bridge.ycp 2008-07-25 11:31:41.000000000 +0200 +++ new/yast2-network-2.17.17/src/lan/bridge.ycp 2008-08-06 09:09:20.000000000 +0200 @@ -56,7 +56,10 @@ string device = t[0, 0]:""; if (contains(sel, device) && hasAnyValue(device)) { if (contains(confs, device)){ - if (contains(["tun", "tap"], NetworkInterfaces::GetType(device))) continue; + // allow to add bonding device into bridge and also device with mask /32(bnc#405343) + if (contains(["tun", "tap", "bond"], NetworkInterfaces::GetType(device))) continue; + if (((string)configurations[NetworkInterfaces::GetType(device), device, "PREFIXLEN"]:"" != "32") + || ((string)configurations[NetworkInterfaces::GetType(device), device, "NETMASK"]:"" != "255.255.255.255")) if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0") { if(!confirmed) { valid = Popup::ContinueCancel(_("At least one selected device is already configured. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.15/src/lan/help.ycp new/yast2-network-2.17.17/src/lan/help.ycp --- old/yast2-network-2.17.15/src/lan/help.ycp 2008-04-21 12:32:10.000000000 +0200 +++ new/yast2-network-2.17.17/src/lan/help.ycp 2008-08-05 10:28:13.000000000 +0200 @@ -169,7 +169,7 @@ /* Address dialog help 6/8 */ "netmask": _("For Static Address Setup enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and -the network mask (usually <tt>255.255.255.0</tt>). Optionally, you can enter +the network mask (usually <tt>255.255.255.0</tt> or just lenght of prefix <tt>/24</tt>). For special case - unconfigured interface use <tt>0.0.0.0</tt> and <tt>/32</tt>.Optionally, you can enter a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>. ") + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.15/src/provider/connection.ycp new/yast2-network-2.17.17/src/provider/connection.ycp --- old/yast2-network-2.17.15/src/provider/connection.ycp 2008-04-21 12:32:11.000000000 +0200 +++ new/yast2-network-2.17.17/src/provider/connection.ycp 2008-08-06 13:01:11.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Connection configuration dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: connection.ycp 46855 2008-04-18 13:48:54Z jsrain $ + * $Id: connection.ycp 49757 2008-08-06 11:01:11Z mzugec $ */ { @@ -48,7 +48,7 @@ string DNS1 = Provider::Current["DNS1"]:""; string DNS2 = Provider::Current["DNS2"]:""; - string idletime = Provider::Current["IDLETIME"]:"300"; + string idletime = Provider::Current["IDLETIME"]:"900"; string device = nil; string dtype = nil; @@ -168,7 +168,8 @@ seconds = add(seconds, idletime); seconds = maplist(string e, (list<string>) seconds, { - return `item(`id(sformat("%1", e)), sformat("%1", e), e == idletime); + // translators: min - shortcut to "minutes" (fate#303429) + return `item(`id(sformat("%1", e)), sformat("%1 (%2 %3)", e, tofloat(e)/60, _("min")), e == idletime); }); /* Checkbox label */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.17.15/VERSION new/yast2-network-2.17.17/VERSION --- old/yast2-network-2.17.15/VERSION 2008-08-04 15:56:24.000000000 +0200 +++ new/yast2-network-2.17.17/VERSION 2008-08-06 13:00:10.000000000 +0200 @@ -1 +1 @@ -2.17.15 +2.17.17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-ncurses-pkg
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-ncurses-pkg checked in at Thu Aug 7 01:40:02 CEST 2008. -------- --- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-07-25 10:54:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-08-06 22:08:51.432127000 +0200 @@ -1,0 +2,9 @@ +Wed Aug 6 21:42:43 CEST 2008 - kmachalkova(a)suse.cz + +- Show "Start repository manager" menu only when requested by + `opt(`repoMgr) flag i.e. not in installation phase (bnc#381956) +- Added filtering packages by status (bnc#384085) +- Internal changes (YOU help, pkg selector modes) +- 2.17.6 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-pkg-2.17.5.tar.bz2 New: ---- yast2-ncurses-pkg-2.17.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.q23878/_old 2008-08-07 01:39:56.000000000 +0200 +++ /var/tmp/diff_new_pack.q23878/_new 2008-08-07 01:39:56.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-ncurses-pkg (Version 2.17.5) +# spec file for package yast2-ncurses-pkg (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-ncurses-pkg -Version: 2.17.5 +Version: 2.17.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-pkg-2.17.5.tar.bz2 +Source0: yast2-ncurses-pkg-2.17.6.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel @@ -38,7 +45,7 @@ %prep -%setup -n yast2-ncurses-pkg-2.17.5 +%setup -n yast2-ncurses-pkg-2.17.6 %build %{prefix}/bin/y2tool y2autoconf @@ -67,8 +74,13 @@ %{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so.* %{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so %doc %{prefix}/share/doc/packages/yast2-ncurses-pkg - %changelog +* Wed Aug 06 2008 kmachalkova(a)suse.cz +- Show "Start repository manager" menu only when requested by + `opt(`repoMgr) flag i.e. not in installation phase (bnc#381956) +- Added filtering packages by status (bnc#384085) +- Internal changes (YOU help, pkg selector modes) +- 2.17.6 * Wed Jul 23 2008 kmachalkova(a)suse.cz - Added pkg search modes (contains, regexp etc.) selection (uses zypp::PoolQuery) ++++++ yast2-ncurses-pkg-2.17.5.tar.bz2 -> yast2-ncurses-pkg-2.17.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/Makefile.am new/yast2-ncurses-pkg-2.17.6/src/Makefile.am --- old/yast2-ncurses-pkg-2.17.5/src/Makefile.am 2008-04-28 17:34:47.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/Makefile.am 2008-08-06 21:42:31.000000000 +0200 @@ -39,6 +39,7 @@ NCPkgFilterPattern.h \ NCPkgFilterLocale.h \ NCPkgFilterRPMGroups.h \ + NCPkgFilterInstSummary.h \ NCPkgStrings.h \ NCZypp.h @@ -68,6 +69,7 @@ NCPkgFilterPattern.cc \ NCPkgFilterLocale.cc \ NCPkgFilterRPMGroups.cc \ + NCPkgFilterInstSummary.cc \ NCPkgStrings.cc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/Makefile.in new/yast2-ncurses-pkg-2.17.6/src/Makefile.in --- old/yast2-ncurses-pkg-2.17.5/src/Makefile.in 2008-04-28 17:46:08.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/Makefile.in 2008-08-06 21:48:30.000000000 +0200 @@ -68,7 +68,8 @@ NCPkgPatchSearch.lo NCPkgPopupDiskspace.lo NCPkgPopupDescr.lo \ NCPkgPopupTable.lo NCPkgFilterRepo.lo NCPkgFilterSearch.lo \ NCPkgSearchSettings.lo NCPkgFilterPattern.lo \ - NCPkgFilterLocale.lo NCPkgFilterRPMGroups.lo NCPkgStrings.lo + NCPkgFilterLocale.lo NCPkgFilterRPMGroups.lo \ + NCPkgFilterInstSummary.lo NCPkgStrings.lo libpy2ncurses_pkg_la_OBJECTS = $(am_libpy2ncurses_pkg_la_OBJECTS) libpy2ncurses_pkg_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ @@ -272,6 +273,7 @@ NCPkgFilterPattern.h \ NCPkgFilterLocale.h \ NCPkgFilterRPMGroups.h \ + NCPkgFilterInstSummary.h \ NCPkgStrings.h \ NCZypp.h @@ -301,6 +303,7 @@ NCPkgFilterPattern.cc \ NCPkgFilterLocale.cc \ NCPkgFilterRPMGroups.cc \ + NCPkgFilterInstSummary.cc \ NCPkgStrings.cc INCLUDES = -I$(includedir) -I$(includedir)/yui -I$(includedir)/ncurses ${ZYPP_CFLAGS} @@ -376,6 +379,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPackageSelector.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPackageSelectorPluginImpl.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPackageSelectorStart.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPkgFilterInstSummary.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPkgFilterLocale.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPkgFilterMain.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCPkgFilterPattern.Plo@am__quote@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelector.cc --- old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.cc 2008-07-23 16:55:22.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelector.cc 2008-08-06 21:42:31.000000000 +0200 @@ -77,25 +77,20 @@ // // Constructor // -NCPackageSelector::NCPackageSelector( YNCursesUI * ui, YWidget * wRoot, long modeFlags ) - : y2ui( ui ) - , filterPopup( 0 ) +NCPackageSelector::NCPackageSelector( long modeFlags ) + : filterPopup( 0 ) , depsPopup( 0 ) , patternPopup( 0 ) , languagePopup( 0 ) , repoPopup( 0 ) , diskspacePopup( 0 ) , searchPopup( 0 ) - , youMode( false ) - , updateMode( false ) - , testMode ( false ) , autoCheck( true ) , pkgList ( 0 ) , depsMenu( 0 ) , viewMenu( 0 ) , extrasMenu( 0 ) , helpMenu( 0 ) - , youHelpButton( 0 ) , filterMain( 0 ) , actionMenu( 0 ) , filterMenu( 0 ) @@ -112,16 +107,7 @@ , visibleInfo( 0 ) { - if ( modeFlags & YPkg_OnlineUpdateMode ) - youMode = true; - - if ( modeFlags & YPkg_UpdateMode ) - updateMode = true; - - // read test source information - if (modeFlags & YPkg_TestMode ) - testMode = true; - + setFlags( modeFlags ); saveState (); diskspacePopup = new NCPkgDiskspace( testMode ); @@ -139,6 +125,18 @@ // NCPackageSelectorPlugin::runPkgSelection } +void NCPackageSelector::setFlags( long modeFlags ) +{ + youMode = ( modeFlags & YPkg_OnlineUpdateMode ) ? true : false ; + + updateMode = ( modeFlags & YPkg_UpdateMode ) ? true : false ; + + repoMgrEnabled = (modeFlags & YPkg_RepoMgr) ? true : false; + + testMode = (modeFlags & YPkg_TestMode ) ? true : false ; + +} + bool NCPackageSelector::checkNow( bool *ok ) { bool ret = false; @@ -233,8 +231,6 @@ retVal = OkButtonHandler( event ); else if ( event.widget == cancelButton ) retVal = CancelHandler( event ); - else if ( event.widget == youHelpButton ) - retVal = YouHelpHandler( event ); else if ( event.widget == filterPopup ) { retVal = filterPopup->handleEvent(); @@ -882,10 +878,11 @@ } case Summary: { - placeholder = new NCEmpty( replPoint ); - placeholder->setSize( oldSize.Sze.W, oldSize.Sze.H ); - placeholder->Redraw(); + inst_summary = new NCPkgFilterInstSummary( replPoint, _("&Packages with Status"), this ); + inst_summary->setSize( oldSize.Sze.W, oldSize.Sze.H ); + inst_summary->Redraw(); pkgList->fillSummaryList(NCPkgTable::L_Changes); + break; } default: yuiError() << "zatim nic" << endl; @@ -977,39 +974,6 @@ /////////////////////////////////////////////////////////////////// // -// YOUHelpHandler -// -// Show the Online Update Help -// -bool NCPackageSelector::YouHelpHandler( const NCursesEvent& event ) -{ - NCPkgTable * packageList = PackageList(); - string text = ""; - - text += NCPkgStrings::YouHelp1(); - text += NCPkgStrings::YouHelp2(); - text += NCPkgStrings::YouHelp3(); - - // open the popup with the help text - NCPopupInfo * youHelp = new NCPopupInfo( wpos( (NCurses::lines()*8)/100, (NCurses::cols())*18/100 ), - NCPkgStrings::YouHelp(), - text - ); - youHelp->setPreferredSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); - youHelp->showInfoPopup( ); - - YDialog::deleteTopmostDialog(); - - if ( packageList ) - { - packageList->setKeyboardFocus(); - } - - return true; -} - -/////////////////////////////////////////////////////////////////// -// // CancelHandler // // Cancel button handler. @@ -1567,9 +1531,7 @@ YLayoutBox * bottom_bar = YUI::widgetFactory()->createHBox( vSplit ); YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - youHelpButton = new NCPushButton ( ll, _("&Help")); - YUI_CHECK_NEW( youHelpButton ); - youHelpButton->setFunctionKey( 1 ); + helpMenu = new NCPkgMenuHelp (ll, _("&Help"), this); YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar ); YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( r ); @@ -1667,7 +1629,7 @@ //Bottom button bar YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - helpMenu = new NCPkgMenuHelp (ll, _("&Help")); + helpMenu = new NCPkgMenuHelp (ll, _("&Help"), this); YUI_CHECK_NEW( helpMenu ); //right-alignment for OK-Cancel diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelector.h --- old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.h 2008-07-23 16:55:22.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelector.h 2008-08-06 21:42:31.000000000 +0200 @@ -39,6 +39,7 @@ #include "NCPkgFilterRPMGroups.h" #include "NCPkgFilterSearch.h" +#include "NCPkgFilterInstSummary.h" #include "NCPkgTable.h" #include "NCEmpty.h" #include "NCPkgMenuFilter.h" @@ -57,6 +58,7 @@ class NCPkgDiskspace; class NCPkgFilterRPMGroups; class NCPkgFilterSearch; +class NCPkgFilterInstSummary; class NCPkgPopupFile; class NCPkgMenuExtras; class NCPkgMenuDeps; @@ -100,8 +102,6 @@ tHandlerMap eventHandlerMap; // event handler map - YNCursesUI * y2ui; // the UI - NCPkgFilterRPMGroups * filterPopup; // the rpm group tags popup NCPkgPopupDeps * depsPopup; // the package dependeny popup @@ -113,10 +113,12 @@ NCPkgDiskspace * diskspacePopup; // the popup showing the disk usage NCPkgFilterSearch * searchPopup; // the package search popup + NCPkgFilterInstSummary *inst_summary; bool youMode; // YOU bool updateMode; // Update bool testMode; // testing + bool repoMgrEnabled; bool autoCheck; YRpmGroupsTree * _rpmGroupsTree; // rpm groups of the found packages @@ -128,7 +130,6 @@ NCPkgMenuView *viewMenu; NCPkgMenuExtras *extrasMenu; NCPkgMenuHelp *helpMenu; - NCPushButton *youHelpButton; NCPkgFilterMain *filterMain; NCPkgMenuAction *actionMenu; NCPkgMenuFilter *filterMenu; @@ -148,7 +149,6 @@ YReplacePoint * replacePoint; // replace point for info text YReplacePoint * replPoint; YReplacePoint * replPoint2; //tohle pak urcite prejmenuj, Bublino - NCEmpty *placeholder; NCPkgTable * versionsList; // list of available package versions // information about patches @@ -182,13 +182,15 @@ * @param ui The NCurses UI * @param opt The widget options */ - NCPackageSelector( YNCursesUI * ui, YWidget * wRoot, long modeFlags ); + NCPackageSelector( long modeFlags ); /** * Destructor */ virtual ~NCPackageSelector(); + void setFlags( long modeFlags); + /** * Create layout for the PackageSelector * @param parent Parent is PackageSelectorStart @@ -267,6 +269,10 @@ bool isYouMode() { return youMode; } + bool isUpdateMode() { return updateMode; } + + bool isRepoMgrEnabled() { return repoMgrEnabled; } + bool isAutoCheck() { return autoCheck; } void AutoCheck( bool check) { autoCheck = check; } @@ -327,13 +333,6 @@ */ bool CancelHandler ( const NCursesEvent& event ); - /** - * Handler function for the "Help" button in YOU - * @param event The Ncurses event - * @return bool - */ - bool YouHelpHandler( const NCursesEvent& event ); - /** * Handles hyperlinks in package description * @param link The link diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelectorStart.cc new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelectorStart.cc --- old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelectorStart.cc 2008-06-11 13:00:04.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelectorStart.cc 2008-08-06 21:42:31.000000000 +0200 @@ -43,42 +43,31 @@ long modeFlags, YUIDimension dimension ) : NCLayoutBox( parent, dimension ) - , widgetRoot( 0 ) , packager( 0 ) - , youMode ( false ) - , updateMode ( false ) { - YNCursesUI * ui = YNCursesUI::ui(); - // set the textdomain setTextdomain( "ncurses-pkg" ); - // get the mode (the mode is also available in PackageSelector via modeFlags) - if ( modeFlags & YPkg_OnlineUpdateMode ) - youMode = true; - - if ( modeFlags & YPkg_UpdateMode ) - updateMode = true; - // NEW NEW - packager = new NCPackageSelector( ui, widgetRoot, modeFlags ); + packager = new NCPackageSelector( modeFlags ); NCPkgTable::NCPkgTableType type; - if ( youMode ) - type = NCPkgTable::T_Patches; - else if ( updateMode ) - type = NCPkgTable::T_Update; - else - type = NCPkgTable::T_Packages; - if ( packager ) { - yuiMilestone() << "YouMode: " << (youMode?"true":"false") << endl; - if ( !youMode ) - packager->createPkgLayout( this, type ); - else + if ( packager->isYouMode() ) + { packager->createYouLayout( this ); + type = NCPkgTable::T_Patches; + } + else + { + if ( packager->isUpdateMode() ) + type = NCPkgTable::T_Update; + else + type = NCPkgTable::T_Packages; + packager->createPkgLayout( this, type ); + } } yuiDebug() << endl; @@ -136,7 +125,7 @@ // fill package list with packages belonging to default RPM group packager->fillDefaultList(); - if ( youMode ) + if ( packager->isYouMode() ) { // show download size packager->showDownloadSize(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelectorStart.h new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelectorStart.h --- old/yast2-ncurses-pkg-2.17.5/src/NCPackageSelectorStart.h 2008-06-11 13:00:04.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPackageSelectorStart.h 2008-08-06 21:42:31.000000000 +0200 @@ -44,13 +44,8 @@ NCPackageSelectorStart ( const NCPackageSelectorStart & ); private: - - YWidget * widgetRoot; // root of the widget tree of the package selection dialog NCPackageSelector *packager; // packager object contains the data and handles events - - bool youMode; - bool updateMode; protected: @@ -97,12 +92,6 @@ * @return bool */ bool handleEvent( const NCursesEvent& event ); - - /** - * Returns the root of the widget tree. - */ - YWidget * root( ) const { return widgetRoot; }; - }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterInstSummary.cc new/yast2-ncurses-pkg-2.17.6/src/NCPkgFilterInstSummary.cc --- old/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterInstSummary.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPkgFilterInstSummary.cc 2008-08-06 21:42:31.000000000 +0200 @@ -0,0 +1,158 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgFilterInstSummary.cc + + Author: Hedgehog Painter <kmachalkova(a)suse.cz> + +/-*/ + +#include "NCPkgFilterInstSummary.h" + +/* + Textdomain "ncurses-pkg" +*/ + +NCPkgFilterInstSummary::NCPkgFilterInstSummary ( YWidget *parent, string label, NCPackageSelector *pkger) + : NCMultiSelectionBox ( parent, label) + , pkg( pkger ) +{ + //setNotify(true); + createLayout(); +} + +NCPkgFilterInstSummary::~NCPkgFilterInstSummary() +{ + +} + +void NCPkgFilterInstSummary::createLayout() +{ + del = new YItem ( _( "Delete" ), true); + items.push_back (del); + inst = new YItem ( _( "Install" ), true); + items.push_back (inst); + update = new YItem ( _( "Update" ), true); + items.push_back (update); + taboo = new YItem ( _( "Taboo" ), true); + items.push_back (taboo); + protect = new YItem ( _( "Protected" ), true); + items.push_back (protect); + keep = new YItem ( _( "Keep" )); + items.push_back (keep); + dontinstall = new YItem ( _( "Do not install" )); + items.push_back (dontinstall); + + addItems( items ); +} + +bool NCPkgFilterInstSummary::check( ZyppObj opkg, ZyppSel slb ) +{ + if (!slb) + return false; + + bool show = false; + + switch ( slb->status() ) + { + //group these two together, due to lack of space + case S_Del: + case S_AutoDel: show = del->selected(); break; + case S_Install: + case S_AutoInstall: show = inst->selected(); break; + case S_KeepInstalled: show = keep->selected(); break; + case S_NoInst: show = dontinstall->selected(); break; + case S_Protected: show = protect->selected(); break; + case S_Taboo: show = taboo->selected(); break; + case S_Update: + case S_AutoUpdate: show = update->selected(); break; + } + + if ( show ) + { + ZyppPkg pkg = tryCastToZyppPkg (opkg); + + if ( !pkg ) + return false; + } + + return show; +} + +bool NCPkgFilterInstSummary::showInstSummaryPackages() +{ + + NCPkgTable * packageList = pkg->PackageList(); + + if ( !packageList ) + { + yuiError() << "No valid NCPkgTable widget" << endl; + return false; + } + + // clear the package table + packageList->itemsCleared (); + + + for_( listIt, zyppPkgBegin(), zyppPkgEnd() ) + { + ZyppSel selectable = *listIt; + ZyppObj obj = selectable->candidateObj(); + + if (!obj) + { + // If there is neither an installed nor a candidate package, check + // any other instance. + ( selectable->installedObj() ) ? (obj = selectable->installedObj()) + : ( obj = selectable->theObj() ); + } + + if( check( obj, selectable ) ) + { + ZyppPkg pkg = tryCastToZyppPkg (obj); + packageList->createListEntry( pkg, selectable); + } + + } + + // show the package list + packageList->setCurrentItem( 0 ); + packageList->drawList(); + packageList->showInformation(); + + yuiMilestone() << "Fill package list" << endl; + + return true; + +} + +NCursesEvent NCPkgFilterInstSummary::wHandleInput( wint_t ch ) +{ + NCursesEvent ret = NCursesEvent::none; + + //treat this like any other MultiSelBox input ... + NCMultiSelectionBox::wHandleInput( ch ) ; + switch ( ch ) + { + //special case for toggling item status + case KEY_SPACE: + case KEY_RETURN: { + showInstSummaryPackages(); + } + } + + //... but do not return to the main loop + ret = NCursesEvent::handled; + + return ret; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterInstSummary.h new/yast2-ncurses-pkg-2.17.6/src/NCPkgFilterInstSummary.h --- old/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterInstSummary.h 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPkgFilterInstSummary.h 2008-08-06 21:42:31.000000000 +0200 @@ -0,0 +1,60 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgFilterMain.h + + Author: Hedgehog Painter <kmachalkova(a)suse.cz> + +/-*/ + +#ifndef NCPkgFilterInstSummary_h +#define NCPkgFilterInstSummary_h + +#include <string> + +#include "NCurses.h" +#include "NCi18n.h" +#include "NCPackageSelector.h" +#include "NCPkgTable.h" +#include "NCMultiSelectionBox.h" +#include "NCZypp.h" + +class NCPkgFilterInstSummary : public NCMultiSelectionBox { + + NCPkgFilterInstSummary & operator=( const NCPkgFilterInstSummary & ); + NCPkgFilterInstSummary ( const NCPkgFilterInstSummary & ); + + bool check (ZyppObj opkg, ZyppSel slb); + NCPackageSelector *pkg; + +public: + + YItemCollection items; + YItem *del; + YItem *inst; + YItem *update; + YItem *taboo; + YItem *protect; + YItem *keep; + YItem *dontinstall; + + + NCPkgFilterInstSummary (YWidget *parent, string label, NCPackageSelector *pkg); + virtual ~NCPkgFilterInstSummary(); + + void createLayout(); + bool showInstSummaryPackages(); + NCursesEvent wHandleInput( wint_t ch ); + +}; + +#endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPkgMenuExtras.cc new/yast2-ncurses-pkg-2.17.6/src/NCPkgMenuExtras.cc --- old/yast2-ncurses-pkg-2.17.5/src/NCPkgMenuExtras.cc 2008-06-25 14:04:52.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPkgMenuExtras.cc 2008-08-06 21:42:31.000000000 +0200 @@ -59,8 +59,11 @@ diskSpace = new YMenuItem( _("&Show Available Disk Space") ); items.push_back( diskSpace ); - repoManager = new YMenuItem( _("S&tart Repository Manager")); - items.push_back( repoManager ); + if ( !pkg->isRepoMgrEnabled() ) + { + repoManager = new YMenuItem( _("S&tart Repository Manager")); + items.push_back( repoManager ); + } addItems( items ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPkgMenuHelp.cc new/yast2-ncurses-pkg-2.17.6/src/NCPkgMenuHelp.cc --- old/yast2-ncurses-pkg-2.17.5/src/NCPkgMenuHelp.cc 2008-06-11 13:00:04.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPkgMenuHelp.cc 2008-08-06 21:42:31.000000000 +0200 @@ -20,14 +20,16 @@ #include "NCPkgMenuHelp.h" #include "NCPkgStrings.h" +#include "NCPackageSelector.h" /* Textdomain "ncurses-pkg" */ -NCPkgMenuHelp::NCPkgMenuHelp (YWidget *parent, string label) +NCPkgMenuHelp::NCPkgMenuHelp (YWidget *parent, string label, NCPackageSelector *pkger) : NCMenuButton( parent, label) + , pkg( pkger) { createLayout(); setFunctionKey( 1 ); @@ -40,17 +42,24 @@ void NCPkgMenuHelp::createLayout() { - generalHelp = new YMenuItem( _("&General Help") ); - items.push_back( generalHelp ); + if ( !pkg->isYouMode()) + { + generalHelp = new YMenuItem( _("&General Help") ); + items.push_back( generalHelp ); - statusHelp = new YMenuItem( _("&Package Status and Symbols") ); - items.push_back( statusHelp ); + statusHelp = new YMenuItem( _("&Package Status and Symbols") ); + items.push_back( statusHelp ); - filterHelp = new YMenuItem( _("&How To Use the Filters") ); - items.push_back( filterHelp ); + filterHelp = new YMenuItem( _("&How To Use the Filters") ); + items.push_back( filterHelp ); - menuHelp = new YMenuItem( _("&Useful Functions in Menu") ); - items.push_back( menuHelp ); + menuHelp = new YMenuItem( _("&Useful Functions in Menu") ); + items.push_back( menuHelp ); + } + else { + patchHelp = new YMenuItem( _("&Patch Status and Patch Installation")); + items.push_back ( patchHelp ); + } addItems( items); } @@ -100,6 +109,13 @@ text += NCPkgStrings::HelpOnFilters4(); text += NCPkgStrings::HelpOnFilters5(); } + else if ( event.selection == patchHelp ) + { + headline = NCPkgStrings::YouHelp(); + text += NCPkgStrings::YouHelp1(); + text += NCPkgStrings::YouHelp2(); + text += NCPkgStrings::YouHelp3(); + } else yuiError() << "zatim nic" << endl; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPkgMenuHelp.h new/yast2-ncurses-pkg-2.17.6/src/NCPkgMenuHelp.h --- old/yast2-ncurses-pkg-2.17.5/src/NCPkgMenuHelp.h 2008-03-27 17:47:50.000000000 +0100 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPkgMenuHelp.h 2008-08-06 21:42:31.000000000 +0200 @@ -26,12 +26,15 @@ #include "NCPopupInfo.h" #include "NCZypp.h" +class NCPackageSelector; + class NCPkgMenuHelp : public NCMenuButton { NCPkgMenuHelp & operator=( const NCPkgMenuHelp & ); NCPkgMenuHelp ( const NCPkgMenuHelp & ); public: + NCPackageSelector *pkg; YItemCollection items; @@ -39,8 +42,9 @@ YMenuItem *statusHelp; YMenuItem *filterHelp; YMenuItem *menuHelp; + YMenuItem *patchHelp; - NCPkgMenuHelp (YWidget *parent, string label); + NCPkgMenuHelp (YWidget *parent, string label, NCPackageSelector *pkger); virtual ~NCPkgMenuHelp(); void createLayout(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/src/NCPkgStrings.cc new/yast2-ncurses-pkg-2.17.6/src/NCPkgStrings.cc --- old/yast2-ncurses-pkg-2.17.5/src/NCPkgStrings.cc 2008-06-25 14:04:52.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/src/NCPkgStrings.cc 2008-08-06 21:42:31.000000000 +0200 @@ -564,7 +564,7 @@ const string NCPkgStrings::YouHelp() { // the headline of the help popup - static const string value = _( "Online Update Help" ); + static const string value = _( "Patch Status and Patch Installation" ); return value; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-pkg-2.17.5/VERSION new/yast2-ncurses-pkg-2.17.6/VERSION --- old/yast2-ncurses-pkg-2.17.5/VERSION 2008-07-23 16:55:22.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.6/VERSION 2008-08-06 21:48:26.000000000 +0200 @@ -1 +1 @@ -2.17.5 +2.17.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-dns-server
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-dns-server checked in at Thu Aug 7 01:39:53 CEST 2008. -------- --- yast2-dns-server/yast2-dns-server.changes 2008-08-05 10:53:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-dns-server/yast2-dns-server.changes 2008-08-06 15:56:00.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 6 15:54:32 CEST 2008 - locilka(a)suse.cz + +- DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback + when hostname --fqdn returns empty string (bnc #403468). +- 2.17.5 + +------------------------------------------------------------------- Old: ---- yast2-dns-server-2.17.4.tar.bz2 New: ---- yast2-dns-server-2.17.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-dns-server.spec ++++++ --- /var/tmp/diff_new_pack.O22722/_old 2008-08-07 01:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.O22722/_new 2008-08-07 01:39:42.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-dns-server (Version 2.17.4) +# spec file for package yast2-dns-server (Version 2.17.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-dns-server -Version: 2.17.4 +Version: 2.17.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-dns-server-2.17.4.tar.bz2 +Source0: yast2-dns-server-2.17.5.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-testsuite # requires DnsServerAPI::GetReverseIPforIPv6 @@ -56,7 +56,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-dns-server-2.17.4 +%setup -n yast2-dns-server-2.17.5 %build %{prefix}/bin/y2tool y2autoconf @@ -99,6 +99,10 @@ /usr/share/YaST2/schema/autoyast/rnc/dns-server.rnc %doc %{prefix}/share/doc/packages/yast2-dns-server %changelog +* Wed Aug 06 2008 locilka(a)suse.cz +- DNS zones need a FQDN hostname, using /etc/HOSTNAME as a fallback + when hostname --fqdn returns empty string (bnc #403468). +- 2.17.5 * Tue Aug 05 2008 locilka(a)suse.cz - Adjusted to the newest LDAP SCR agent (patch written by jsuchome) (FATE #303596). ++++++ yast2-dns-server-2.17.4.tar.bz2 -> yast2-dns-server-2.17.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.4/configure new/yast2-dns-server-2.17.5/configure --- old/yast2-dns-server-2.17.4/configure 2008-07-23 15:38:20.000000000 +0200 +++ new/yast2-dns-server-2.17.5/configure 2008-08-06 16:16:15.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-dns-server 2.17.3. +# Generated by GNU Autoconf 2.61 for yast2-dns-server 2.17.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-dns-server' PACKAGE_TARNAME='yast2-dns-server' -PACKAGE_VERSION='2.17.3' -PACKAGE_STRING='yast2-dns-server 2.17.3' +PACKAGE_VERSION='2.17.5' +PACKAGE_STRING='yast2-dns-server 2.17.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-dns-server 2.17.3 to adapt to many kinds of systems. +\`configure' configures yast2-dns-server 2.17.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-dns-server 2.17.3:";; + short | recursive ) echo "Configuration of yast2-dns-server 2.17.5:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-dns-server configure 2.17.3 +yast2-dns-server configure 2.17.5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-dns-server $as_me 2.17.3, which was +It was created by yast2-dns-server $as_me 2.17.5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-dns-server' - VERSION='2.17.3' + VERSION='2.17.5' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.3" +VERSION="2.17.5" RPMNAME="yast2-dns-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-dns-server $as_me 2.17.3, which was +This file was extended by yast2-dns-server $as_me 2.17.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-dns-server config.status 2.17.3 +yast2-dns-server config.status 2.17.5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.4/configure.in new/yast2-dns-server-2.17.5/configure.in --- old/yast2-dns-server-2.17.4/configure.in 2008-07-23 15:38:17.000000000 +0200 +++ new/yast2-dns-server-2.17.5/configure.in 2008-08-06 16:16:11.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-dns-server dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-dns-server, 2.17.3, http://bugs.opensuse.org/, yast2-dns-server) +AC_INIT(yast2-dns-server, 2.17.5, http://bugs.opensuse.org/, yast2-dns-server) 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.17.3" +VERSION="2.17.5" RPMNAME="yast2-dns-server" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.4/src/DnsZones.pm new/yast2-dns-server-2.17.5/src/DnsZones.pm --- old/yast2-dns-server-2.17.4/src/DnsZones.pm 2008-08-05 10:54:02.000000000 +0200 +++ new/yast2-dns-server-2.17.5/src/DnsZones.pm 2008-08-06 16:14:27.000000000 +0200 @@ -5,7 +5,7 @@ # Authors: Jiri Srain <jsrain(a)suse.cz> # Lukas Ocilka <locilka(a)suse.cz> # -# $Id: DnsZones.pm 49676 2008-08-05 08:54:01Z locilka $ +# $Id: DnsZones.pm 49781 2008-08-06 14:14:27Z locilka $ # # Contains routines for handling zone files (both directly and using nsupdate) @@ -24,6 +24,7 @@ YaST::YCP::Import ("Hostname"); YaST::YCP::Import ("String"); +YaST::YCP::Import ("Mode"); #use io_routines; #use check_routines; @@ -58,13 +59,25 @@ my $self = shift; my $out = SCR->Execute (".target.bash_output", "/bin/hostname --fqdn"); - if ($out->{"exit"} ne 0) - { - return "@"; + + if (Mode->test()) { + return ""; + } + + # standard return + if ($out->{"exit"} eq "0") { + my $stdout = $out->{"stdout"}; + my ($ret, $rest) = split ("\n", $stdout, 2); + + return $ret; + # fallback + } else { + my $hostname = SCR->Read (".target.string", "/etc/HOSTNAME"); + my ($ret, $rest) = split ("\n", $hostname, 2); + y2warning ("Using fallback hostname: ".$ret); + + return $ret; } - my $stdout = $out->{"stdout"}; - my ($ret, $rest) = split ("\n", $stdout, 2); - return $ret; } BEGIN { $TYPEINFO{AbsoluteZoneFileName} = ["function", "string", "string" ]; } @@ -129,7 +142,11 @@ sub GetDefaultSOA { my $self = shift; - my $fqdn = $self->GetFQDN (); + my $fqdn = $self->GetFQDN(); + if ($fqdn eq "") { + $fqdn = "linux.site"; + } + $fqdn = "$fqdn."; my $adm_mail = "root.$fqdn"; my %soa = ( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-dns-server-2.17.4/VERSION new/yast2-dns-server-2.17.5/VERSION --- old/yast2-dns-server-2.17.4/VERSION 2008-08-05 10:53:52.000000000 +0200 +++ new/yast2-dns-server-2.17.5/VERSION 2008-08-06 16:05:07.000000000 +0200 @@ -1 +1 @@ -2.17.4 +2.17.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-ldap
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-ldap checked in at Thu Aug 7 01:39:48 CEST 2008. -------- --- yast2-ldap/yast2-ldap.changes 2008-07-21 15:40:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ldap/yast2-ldap.changes 2008-08-06 11:53:32.258738000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 6 11:36:43 CEST 2008 - jsuchome(a)suse.cz + +- adapted LdapServerAccess to new API of yast2-ldap-server (rhafer) +- 2.17.2 + +------------------------------------------------------------------- Old: ---- yast2-ldap-2.17.1.tar.bz2 New: ---- yast2-ldap-2.17.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap.spec ++++++ --- /var/tmp/diff_new_pack.z22760/_old 2008-08-07 01:39:43.000000000 +0200 +++ /var/tmp/diff_new_pack.z22760/_new 2008-08-07 01:39:43.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-ldap (Version 2.17.1) +# spec file for package yast2-ldap (Version 2.17.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-ldap -Version: 2.17.1 +Version: 2.17.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-2.17.1.tar.bz2 +Source0: yast2-ldap-2.17.2.tar.bz2 Prefix: /usr BuildRequires: doxygen gcc-c++ libldapcpp-devel libxcrypt-devel yast2 yast2-core-devel yast2-devtools Summary: YaST2 - LDAP Agent @@ -35,7 +42,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-ldap-2.17.1 +%setup -n yast2-ldap-2.17.2 %build %{prefix}/bin/y2tool y2autoconf @@ -67,6 +74,9 @@ %{_libdir}/YaST2/plugin/libpy2ag_ldap.la %doc %{prefix}/share/doc/packages/yast2-ldap %changelog +* Wed Aug 06 2008 jsuchome(a)suse.cz +- adapted LdapServerAccess to new API of yast2-ldap-server (rhafer) +- 2.17.2 * Fri Jul 18 2008 jsuchome(a)suse.cz - do not lowercase LDAP object names (fate#303596) - 2.17.1 ++++++ yast2-ldap-2.17.1.tar.bz2 -> yast2-ldap-2.17.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-2.17.1/src/LdapAgent.cc new/yast2-ldap-2.17.2/src/LdapAgent.cc --- old/yast2-ldap-2.17.1/src/LdapAgent.cc 2008-07-21 13:00:37.000000000 +0200 +++ new/yast2-ldap-2.17.2/src/LdapAgent.cc 2008-07-21 15:39:17.000000000 +0200 @@ -4,7 +4,7 @@ * * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: LdapAgent.cc 45056 2008-02-27 09:02:04Z jsuchome $ + * $Id: LdapAgent.cc 49286 2008-07-21 13:41:12Z jsuchome $ */ #include "LdapAgent.h" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-2.17.1/src/LdapAgent.h new/yast2-ldap-2.17.2/src/LdapAgent.h --- old/yast2-ldap-2.17.1/src/LdapAgent.h 2008-07-17 16:24:43.000000000 +0200 +++ new/yast2-ldap-2.17.2/src/LdapAgent.h 2008-07-21 15:39:17.000000000 +0200 @@ -4,7 +4,7 @@ * * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: LdapAgent.h 48495 2008-06-24 09:16:09Z jsuchome $ + * $Id: LdapAgent.h 49286 2008-07-21 13:41:12Z jsuchome $ */ #ifndef _LdapAgent_h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-2.17.1/src/LdapServerAccess.pm new/yast2-ldap-2.17.2/src/LdapServerAccess.pm --- old/yast2-ldap-2.17.1/src/LdapServerAccess.pm 2005-09-08 10:35:00.000000000 +0200 +++ new/yast2-ldap-2.17.2/src/LdapServerAccess.pm 2008-08-06 11:36:16.000000000 +0200 @@ -4,7 +4,7 @@ # Package: Low-level LDAP configuration (agent, etc.) # Summary: Access to some routines of yast2-ldap-server module # -# $Id: LdapServerAccess.pm 18444 2004-08-09 13:44:23Z jsuchome $ +# $Id: LdapServerAccess.pm 49751 2008-08-06 09:38:29Z jsuchome $ # # Module provides access to LDAP server schemas. The work with schemas # is done using functions from yast2-ldap-server module. This module @@ -70,8 +70,14 @@ } require YaPI::LdapServer; + if ( ! YaPI::LdapServer->Init() ) + { + y2error ("Initialzing LDAP Server YaPI failed"); + return undef; + } + my $schema_added = 0; - my $schemas_ref = YaPI::LdapServer->ReadSchemaIncludeList (); + my $schemas_ref = YaPI::LdapServer->ReadSchemaList (); if (! defined ($schemas_ref) || ref ($schemas_ref) ne "ARRAY") { y2error ("Retrieving current LDAP schemas failed"); @@ -79,27 +85,23 @@ } my @schemas = @{$schemas_ref}; foreach my $schema (@new_schemas) { - my @current_schema = grep /$schema/, @schemas; + $schema =~ /^.*\/(.*)\.(schema|ldif)$/; + my $schema_base = $1; + y2milestone("Schemabase: $schema_base"); + my @current_schema = grep /$schema_base/, @schemas; if (0 == scalar (@current_schema)) { y2milestone ("Including schema $schema"); - push @schemas, $schema; - $schema_added = 1; + if (! YaPI::LdapServer->AddSchema( $schema) ) { + return undef; + } } else { y2milestone ("Schema $schema is already included"); } } - if ($schema_added) { - if (! YaPI::LdapServer->WriteSchemaIncludeList (\@schemas)) { - return undef; - } - if ($restart) { - YaPI::LdapServer->SwitchService (1); - } - } - return Boolean ($schema_added); + return Boolean(1); } # Add new index to ldap server database @@ -131,7 +133,7 @@ } my $attr = $new_index->{"attr"}; - my $param = $new_index->{"param"}; + my @param = split(/,/, $new_index->{"param"}); if (! $self->InstallLdapServer ()) { y2error ("Cannot install $package_name, not checking LDAP schemas"); @@ -139,32 +141,67 @@ } require YaPI::LdapServer; + if ( ! YaPI::LdapServer->Init() ) + { + y2error ("Initialzing LDAP Server YaPI failed"); + return undef; + } my $indices = YaPI::LdapServer->ReadIndex ($suffix); - if (defined $indices && ref ($indices) eq "ARRAY") { - - foreach my $index (@$indices) { - my $attrs = $index->{"attr"} || ""; - my $params = $index->{"param"} || ""; + my $index_mod = { "name" => $attr }; + if (defined $indices && ref ($indices) eq "HASH") { - my @current_attrs = grep /^$attr$/, split (/,/, $attrs); - my @current_params = grep /^$param$/, split (/,/, $param); - - if (scalar (@current_attrs) >0 && scalar (@current_params) > 0) { + if ( defined $indices->{$attr} ) + { + + if ( ( grep /^eq$/, @param ) || ( $indices->{$attr}->{'eq'} ) ) + { + $index_mod->{'eq'} = 1; + } + if ( ( grep /^sub$/, @param ) || ( $indices->{$attr}->{'sub'} ) ) + { + $index_mod->{'pres'} = 1; + } + if ( ( grep /^pres$/, @param ) || ( $indices->{$attr}->{'pres'} ) ) + { + $index_mod->{'pres'} = 1; + } + if ( ( $index_mod->{'pres'} == $indices->{$attr}->{'pres'} ) && + ( $index_mod->{'sub'} == $indices->{$attr}->{'sub'} ) && + ( $index_mod->{'eq'} == $indices->{$attr}->{'eq'} ) ) + { y2milestone ("index for $attr already present"); - $present = 1; - } - } + $present = 1; + } + } + else + { + if ( grep /^eq$/, @param ) + { + $index_mod->{'eq'} = 1; + } + if ( grep /^sub$/, @param ) + { + $index_mod->{'pres'} = 1; + } + if ( grep /^pres$/, @param ) + { + $index_mod->{'pres'} = 1; + } + $present = 0; + } + if (! $present) { y2milestone ("$attr index missing, adding"); - if (!YaPI::LdapServer->AddIndex ($suffix, $new_index)) { + if (!YaPI::LdapServer->EditIndex ($suffix, $index_mod)) { return undef; } if ($restart) { - YaPI::LdapServer->SwitchService(1); + # No restart needed anymore + # YaPI::LdapServer->SwitchService(1); } } - return Boolean (!$present); + return Boolean(1); } return undef; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ldap-2.17.1/VERSION new/yast2-ldap-2.17.2/VERSION --- old/yast2-ldap-2.17.1/VERSION 2008-07-18 12:03:18.000000000 +0200 +++ new/yast2-ldap-2.17.2/VERSION 2008-08-06 11:37:08.000000000 +0200 @@ -1 +1 @@ -2.17.1 +2.17.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader
by root＠Hilbert.suse.de 06 Aug '08

06 Aug '08

Hello community, here is the log from the commit of package yast2-bootloader checked in at Thu Aug 7 01:39:32 CEST 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-08-05 12:45:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2008-08-06 16:19:59.000000000 +0200 @@ -1,0 +2,15 @@ +Wed Aug 6 15:42:28 CEST 2008 - juhliarik(a)suse.cz + +- added better detection of NFS boot device (bnc #408912) +- added better detection of EVMS - do not install bootloader + (fate #305007) +- 2.17.11 + +------------------------------------------------------------------- +Wed Aug 6 12:55:17 CEST 2008 - juhliarik(a)suse.cz + +- added support for acoustic signals (fate #303481) +- added checkbox for enabling remapping in chainloader section +- 2.17.10 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.17.9.tar.bz2 New: ---- yast2-bootloader-2.17.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.p18600/_old 2008-08-07 01:37:16.000000000 +0200 +++ /var/tmp/diff_new_pack.p18600/_new 2008-08-07 01:37:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.17.9) +# spec file for package yast2-bootloader (Version 2.17.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-bootloader -Version: 2.17.9 +Version: 2.17.11 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.17.9.tar.bz2 +Source0: yast2-bootloader-2.17.11.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -61,7 +61,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.17.9 +%setup -n yast2-bootloader-2.17.11 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,15 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Wed Aug 06 2008 juhliarik(a)suse.cz +- added better detection of NFS boot device (bnc #408912) +- added better detection of EVMS - do not install bootloader + (fate #305007) +- 2.17.11 +* Wed Aug 06 2008 juhliarik(a)suse.cz +- added support for acoustic signals (fate #303481) +- added checkbox for enabling remapping in chainloader section +- 2.17.10 * Tue Aug 05 2008 juhliarik(a)suse.cz - added/enabled support for ordering disks in device.map for GRUB (fate ##303964) ++++++ yast2-bootloader-2.17.9.tar.bz2 -> yast2-bootloader-2.17.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/clients/bootloader_proposal.ycp new/yast2-bootloader-2.17.11/src/clients/bootloader_proposal.ycp --- old/yast2-bootloader-2.17.9/src/clients/bootloader_proposal.ycp 2008-08-01 17:20:31.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/clients/bootloader_proposal.ycp 2008-08-06 16:05:59.000000000 +0200 @@ -1,7 +1,7 @@ /** * Module: bootloader_proposal.ycp * - * $Id: bootloader_proposal.ycp 49588 2008-08-01 15:20:30Z juhliarik $ + * $Id: bootloader_proposal.ycp 49778 2008-08-06 14:05:58Z juhliarik $ * * Author: Klaus Kaempf <kkaempf(a)suse.de> * @@ -124,22 +124,16 @@ //F#300779 - Install diskless client (NFS-root) //kokso: bootloader will not be installed - - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - - if (dev["disk"]:"" == "/dev/nfs") + string device = BootCommon::getBootDisk(); + if (device == "/dev/nfs") { - + y2milestone("bootlader_proposal::MakeProposal -> Boot partition is nfs type, bootloader will not be installed."); - y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:""); + y2milestone("Type of BootPartitionDevice: %1", device); return ret; } - y2milestone("Type of BootPartitionDevice: %1", dev["disk"]:""); + y2milestone("Type of BootPartitionDevice: %1", device); //F#300779 - end diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/config/bootloader.rnc new/yast2-bootloader-2.17.11/src/config/bootloader.rnc --- old/yast2-bootloader-2.17.9/src/config/bootloader.rnc 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/config/bootloader.rnc 2008-08-06 14:08:57.000000000 +0200 @@ -90,6 +90,9 @@ element xen {text}? & element xen_append {text}? & element noverifyroot { "true" | "false" }? & + element makeactive { "true" | "false" }? & + element remap { "true" | "false" }? & + element configfile {text}? & element image {text}? } kernel_parameters = element kernel_parameters { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/generic/section_edit_widgets.ycp new/yast2-bootloader-2.17.11/src/generic/section_edit_widgets.ycp --- old/yast2-bootloader-2.17.9/src/generic/section_edit_widgets.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/generic/section_edit_widgets.ycp 2008-08-06 12:52:38.000000000 +0200 @@ -12,7 +12,7 @@ * Authors: * Joachim Plack <jplack(a)suse.de> * - * $Id: section_edit_widgets.ycp 35202 2007-01-10 14:24:41Z jplack $ + * $Id: section_edit_widgets.ycp 49756 2008-08-06 10:52:37Z juhliarik $ * */ @@ -45,7 +45,8 @@ // extract edit dialog discription for a specific type of section map<string,any> SE_Options (string type) { map<string,any> se_options = nil; - + // HACK: add checkbox for mapping chainloader section to the first disk in order + BootCommon::section_options["other_remap"]="bool:Remap section to the first disk in device map:false"; se_options = mapmap( string key, any value, filter( string key, any value, BootCommon::section_options, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/generic/wizards.ycp new/yast2-bootloader-2.17.11/src/generic/wizards.ycp --- old/yast2-bootloader-2.17.9/src/generic/wizards.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/generic/wizards.ycp 2008-08-06 12:52:38.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Joachim Plack <jplack(a)suse.de> * - * $Id: wizards.ycp 35127 2007-01-05 17:49:18Z jplack $ + * $Id: wizards.ycp 49756 2008-08-06 10:52:37Z juhliarik $ * */ @@ -89,7 +89,7 @@ "contents" : contents, "caption" : _("Boot Loader Settings: Section Management"), "back_button" : Label::BackButton (), - "abort_button" : Label::AbortButton (), + "abort_button" : Label::CancelButton (), "next_button" : Label::OKButton (), "fallback_functions" : section_handlers, ]); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/grub/helps.ycp new/yast2-bootloader-2.17.11/src/grub/helps.ycp --- old/yast2-bootloader-2.17.9/src/grub/helps.ycp 2008-08-05 10:23:31.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/grub/helps.ycp 2008-08-06 10:49:01.000000000 +0200 @@ -122,6 +122,8 @@ _("Partition of Menu File"), "menu_configfile" : _("Menu Description File"), + "other_remap" : + _("Map Section to the First Disk from Device Map Windows usually need to be on the first disk."), ]; @@ -157,6 +159,7 @@ "other_noverifyroot" : _("Do not verify Filesystem before Booting"), "other_makeactive" : _("Activate this Partition when selected for Boot"), "other_blockoffset" : _("Block Offset for Chainloading"), + "other_remap" : _("Map Section to the First Disk in Device Map"), "type_xen" : _("Xen Section"), "xen_xen" : _("Hypervisor"), "xen_xen_append" : _("Additional Xen Hypervisor Parameters"), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/modules/BootGRUB.ycp new/yast2-bootloader-2.17.11/src/modules/BootGRUB.ycp --- old/yast2-bootloader-2.17.9/src/modules/BootGRUB.ycp 2008-08-05 12:04:46.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/modules/BootGRUB.ycp 2008-08-06 12:52:38.000000000 +0200 @@ -15,7 +15,7 @@ * Olaf Dabrunz <od(a)suse.de> * Philipp Thomas <pth(a)suse.de> * - * $Id: BootGRUB.ycp 49686 2008-08-05 10:04:46Z juhliarik $ + * $Id: BootGRUB.ycp 49756 2008-08-06 10:52:37Z juhliarik $ * */ @@ -609,6 +609,10 @@ // if that points to a section that does not exist anymore BootCommon::FixGlobals (); } + + // check if windows is on second disk and add remap if it is necessary + // FATE #301994: Correct device mapping in case windows is installed on the second HD + BootCommon::sections = checkWindowsSection(BootCommon::sections); y2milestone ("Proposed sections: %1", BootCommon::sections); y2milestone ("Proposed globals: %1", BootCommon::globals); @@ -625,10 +629,6 @@ */ global boolean Save (boolean clean, boolean init, boolean flush) { - // check if windows is on second disk and add remap if it is necessary - // FATE #301994: Correct device mapping in case windows is installed on the second HD - BootCommon::sections = checkWindowsSection(BootCommon::sections); - // reduce device map to 8 devices // FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 ReduceDeviceMapTo8(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/modules/Bootloader.ycp new/yast2-bootloader-2.17.11/src/modules/Bootloader.ycp --- old/yast2-bootloader-2.17.9/src/modules/Bootloader.ycp 2008-08-01 17:20:31.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/modules/Bootloader.ycp 2008-08-06 15:42:22.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: Bootloader.ycp 49588 2008-08-01 15:20:30Z juhliarik $ + * $Id: Bootloader.ycp 49775 2008-08-06 13:42:22Z juhliarik $ * */ @@ -293,12 +293,8 @@ // F#300779 - Install diskless client (NFS-root) // kokso: additional warning that root partition is nfs type -> bootloader will not be installed - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if (dev["disk"]:"" == "/dev/nfs") + string device = BootCommon::getBootDisk(); + if (device == "/dev/nfs") { ret = add (ret, _("The boot partition is of type NFS. Bootloader cannot be installed.")); @@ -537,13 +533,9 @@ //F#300779 - Install diskless client (NFS-root) //kokso: bootloader will not be installed + string device = BootCommon::getBootDisk(); - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if (dev["disk"]:"" == "/dev/nfs") + if (device == "/dev/nfs") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); return ret; @@ -679,13 +671,9 @@ // F#300779 - Install diskless client (NFS-root) // kokso: bootloader will not be installed + string device = BootCommon::getBootDisk(); - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if (dev["disk"]:"" == "/dev/nfs") + if (device == "/dev/nfs") { y2milestone("Bootloader::Write() -> Boot partition is nfs type, bootloader will not be installed."); return ret; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/modules/GfxMenu.ycp new/yast2-bootloader-2.17.11/src/modules/GfxMenu.ycp --- old/yast2-bootloader-2.17.9/src/modules/GfxMenu.ycp 2008-07-21 16:04:51.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/modules/GfxMenu.ycp 2008-08-06 12:52:38.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: GfxMenu.ycp 45547 2008-03-18 10:05:37Z jsrain $ + * $Id: GfxMenu.ycp 49756 2008-08-06 10:52:37Z juhliarik $ * */ @@ -284,6 +284,21 @@ return ret; } + + +/** FATE #303481: Acoustic signal for bootloader when booting from installation medium + * Function enables acoustic signals for bootloader + * + */ + +define void enableAcousticSignal() +{ + y2milestone("Enable acoustic signals for boot menu"); + string command = "gfxboot --change-config boot::beep=1"; + map ret = (map)SCR::Execute (.target.bash_output, command); + y2milestone ("Result of command: %1 result: %2",command, ret); +} + /** * Update graphical bootloader to contain translations for section labels in * the currently selected installation language (set in @@ -294,6 +309,10 @@ */ global define boolean UpdateGfxMenuContents (string loader) { y2milestone ("Updating GFX boot menu"); + + // FATE #303481 enable acoustic signals for bootloader + enableAcousticSignal(); + // if the boot menu does not exist, return without updating it if (SCR::Read (.target.size, "/boot/message") == -1) return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/routines/dialogs.ycp new/yast2-bootloader-2.17.11/src/routines/dialogs.ycp --- old/yast2-bootloader-2.17.9/src/routines/dialogs.ycp 2008-08-05 11:55:46.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/routines/dialogs.ycp 2008-08-06 15:42:22.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: dialogs.ycp 48673 2008-06-27 16:57:57Z juhliarik $ + * $Id: dialogs.ycp 49775 2008-08-06 13:42:22Z juhliarik $ * */ @@ -27,8 +27,6 @@ import "Wizard"; import "Bootloader"; import "Stage"; -//F#300779 - Install diskless client (NFS-root) -import "Storage"; include "bootloader/routines/popups.ycp"; include "bootloader/routines/section_widgets.ycp"; @@ -91,13 +89,9 @@ //F#300779 - Install diskless client (NFS-root) //kokso: additional warning that root partition is nfs type -> bootloader will not be installed + string device = BootCommon::getBootDisk(); - map dev = $[]; - if ((BootCommon::BootPartitionDevice != "") && (BootCommon::BootPartitionDevice != nil)) - dev = Storage::GetDiskPartition(BootCommon::BootPartitionDevice); - else - dev = Storage::GetDiskPartition(BootCommon::RootPartitionDevice); - if ((dev["disk"]:"" == "/dev/nfs") && (Mode::installation())) + if ((device == "/dev/nfs") && (Mode::installation())) { Popup::Message(_("The boot partition is of type NFS. Bootloader cannot be installed.")); y2milestone("dialogs::MainDialog() -> Boot partition is nfs type, bootloader will not be installed."); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/src/routines/misc.ycp new/yast2-bootloader-2.17.11/src/routines/misc.ycp --- old/yast2-bootloader-2.17.9/src/routines/misc.ycp 2008-08-01 17:20:31.000000000 +0200 +++ new/yast2-bootloader-2.17.11/src/routines/misc.ycp 2008-08-06 15:42:22.000000000 +0200 @@ -12,7 +12,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: misc.ycp 49588 2008-08-01 15:20:30Z juhliarik $ + * $Id: misc.ycp 49775 2008-08-06 13:42:22Z juhliarik $ * * WARNING: * To be included to BootCommon.ycp only, requires function @@ -41,6 +41,7 @@ global map<string, integer> Md2Partitions (string md_device); global void DetectDisks (); + global string getBootPartition(); /** * return printable name of bootloader @@ -1558,7 +1559,7 @@ } // EVMS // FIXME: type detection by name deprecated - else if (search (BootPartitionDevice, "/dev/evms/") == 0) + else if (search (getBootPartition(), "/dev/evms/") == 0) { y2milestone ("Cannot install bootloader on EVMS"); return false; @@ -1701,13 +1702,14 @@ } -/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 - * Function select boot device - disk - * - * @return string name of boot device - disk +/** + * Function return boot device it means + * return boot partition or root partition if boot partition deosn't exist + * function return "" if boot partition or root partition is not defined (autoyast) + * @return string name of boot device (partition) */ -global string getBootDisk() +global string getBootPartition() { string boot_device = ""; if (BootCommon::BootPartitionDevice != "") @@ -1715,6 +1717,19 @@ else if (BootCommon::RootPartitionDevice != "") boot_device = BootCommon::RootPartitionDevice; + return boot_device; +} + +/** FATE #303548 - Grub: limit device.map to devices detected by BIOS Int 13 + * Function select boot device - disk + * + * @return string name of boot device - disk + */ + +global string getBootDisk() +{ + string boot_device = getBootPartition(); + if (boot_device == "") { y2milestone("BootPartitionDevice and RootPartitionDevice are empty"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.17.9/VERSION new/yast2-bootloader-2.17.11/VERSION --- old/yast2-bootloader-2.17.9/VERSION 2008-08-05 12:05:56.000000000 +0200 +++ new/yast2-bootloader-2.17.11/VERSION 2008-08-06 16:01:59.000000000 +0200 @@ -1 +1 @@ -2.17.9 +2.17.11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0