July 2008 - openSUSE Commits - openSUSE Mailing Lists

commit identity-abstraction
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package identity-abstraction checked in at Fri Aug 1 01:52:30 CEST 2008. -------- --- identity-abstraction/identity-abstraction.changes 2007-06-29 16:24:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/identity-abstraction/identity-abstraction.changes 2008-08-01 01:35:20.501419000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 1 01:35:01 CEST 2008 - ro(a)suse.de + +- use generic names for java in requires and buildrequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ identity-abstraction.spec ++++++ --- /var/tmp/diff_new_pack.bZ2403/_old 2008-08-01 01:52:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bZ2403/_new 2008-08-01 01:52:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package identity-abstraction (Version 0.1.620) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -9,21 +9,21 @@ # + Name: identity-abstraction %define prefix /usr #change xerces-j2 to xerces-j2 for suse autobuild Requires: jre >= 1.5.0 log4j xerces-j2 xml-commons-apis xalan-j2 -BuildRequires: ant ant-nodeps java-sdk-1.5.0 log4j update-alternatives xalan-j2 xerces-j2 xml-commons-apis +BuildRequires: ant ant-nodeps java-sdk >= 1.5.0 log4j update-alternatives xalan-j2 xerces-j2 xml-commons-apis Version: 0.1.620 -Release: 1 +Release: 186 Summary: A Java open source implementation of an identity-abstraction sdk -URL: http://www.bandit-project.org -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other License(s), see package LICENSE and NOTICES files. +Url: http://www.bandit-project.org +License: LGPL v2.1 or later Group: Development/Libraries/Java Source: identity-abstraction-0.1.620-devel.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArchitectures: noarch - +BuildArch: noarch %description The Bandit Identity Abstraction assists applications in constructing, @@ -40,12 +40,10 @@ %prep echo "running prep - $RPM_BUILD_ROOT" rm -rf $RPM_BUILD_ROOT - %setup -n %{name}-0.1 #%setup -q echo "running setup" - %build echo >>build.properties echo RPM_BUILD_ROOT=$RPM_BUILD_ROOT >>build.properties @@ -71,7 +69,6 @@ #ln -sf ../commons/bin/log4j.jar $RPM_BUILD_ROOT/usr/share/java/identity-abstraction/log4j.jar #ln -sf identity-abstraction-0.1.620 $RPM_BUILD_ROOT/usr/share/java/identity-abstraction/identity-abstraction - %clean echo "running clean" rm -rf $RPM_BUILD_ROOT @@ -81,47 +78,47 @@ %dir //usr/share/java/identity-abstraction //usr/share/java/identity-abstraction/*.jar - - %changelog -* Thu Jun 28 2007 - dbuss(a)novell.com +* Fri Aug 01 2008 ro(a)suse.de +- use generic names for java in requires and buildrequires +* Fri Jun 29 2007 dbuss(a)novell.com - Fixed defect 288368, ldap vs ldaps on the custom trust store socket factory -* Thu Apr 05 2007 - dbuss(a)novell.com +* Fri Apr 06 2007 dbuss(a)novell.com - tweak for svn changes -* Wed Feb 28 2007 - dbuss(a)novell.com +* Wed Feb 28 2007 dbuss(a)novell.com - updated build fileds to copy not move shared jar -* Fri Jan 26 2007 - dbuss(a)novell.com +* Sat Jan 27 2007 dbuss(a)novell.com - new sunxacml -* Mon Jan 22 2007 - dbuss(a)novell.com +* Mon Jan 22 2007 dbuss(a)novell.com - Changed java to jre on requires line -* Thu Jan 11 2007 - dbuss(a)novell.com +* Fri Jan 12 2007 dbuss(a)novell.com - remove build.properties from devl tar -* Tue Jan 09 2007 - dbuss(a)novell.com +* Tue Jan 09 2007 dbuss(a)novell.com - remove symbolic links -* Fri Jan 05 2007 - dbuss(a)novell.com +* Sat Jan 06 2007 dbuss(a)novell.com - more tweaks so util will build from source not from included jar -* Mon Dec 11 2006 - dbuss(a)novell.com +* Mon Dec 11 2006 dbuss(a)novell.com - moved to jaxen 1.1-12, added more error tracking -* Fri Dec 08 2006 - mfassbinder(a)novell.com +* Sat Dec 09 2006 mfassbinder(a)novell.com - changed java_sdk_1.5.0 to java-sdk-1.5.0 -* Fri Dec 08 2006 - dbuss(a)novell.com +* Sat Dec 09 2006 dbuss(a)novell.com - changed build depend to java_1.5.0 -* Tue Oct 17 2006 - ro(a)suse.de +* Tue Oct 17 2006 ro(a)suse.de - use java2-devel-packages in BuildRequires -* Mon Oct 16 2006 - schwab(a)suse.de +* Mon Oct 16 2006 schwab(a)suse.de - Use java-1_5_0-bea on ia64 and java-1_5_0-ibm on IBM architectures. -* Tue Oct 10 2006 - dbuss(a)novell.com +* Wed Oct 11 2006 dbuss(a)novell.com - performance enhancements -* Fri Sep 29 2006 - ro(a)suse.de +* Fri Sep 29 2006 ro(a)suse.de - allow java 1.5 (source uses 1.5 features) -* Mon Aug 21 2006 - ro(a)suse.de +* Mon Aug 21 2006 ro(a)suse.de - added link targets to buildrequires -* Mon Aug 14 2006 - dbuss(a)novell.com +* Mon Aug 14 2006 dbuss(a)novell.com - added symbolic links to package for casa -* Tue Jul 25 2006 - dbuss(a)novell.com +* Tue Jul 25 2006 dbuss(a)novell.com - More spec file changes -* Fri Jul 14 2006 - dbuss(a)novell.com +* Fri Jul 14 2006 dbuss(a)novell.com - spec file changes -* Tue Jun 20 2006 - dbuss(a)novell.com +* Tue Jun 20 2006 dbuss(a)novell.com - Initial submission ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 package-lists-openSUSE
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package package-lists-openSUSE checked in at Fri Aug 1 01:22:21 CEST 2008. -------- --- AUTO/all/package-lists-openSUSE/package-lists-openSUSE.changes 2008-06-23 15:17:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/package-lists-openSUSE/package-lists-openSUSE.changes 2008-07-31 13:43:33.016915000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 31 13:43:40 CEST 2008 - coolo(a)suse.de + +- only take the package lists interesting to others (avoiding silly + warnings about unused lists) + +------------------------------------------------------------------- New: ---- package-lists-openSUSE-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-lists-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.x30484/_old 2008-08-01 01:22:04.000000000 +0200 +++ /var/tmp/diff_new_pack.x30484/_new 2008-08-01 01:22:04.000000000 +0200 @@ -17,11 +17,12 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.0 -Release: 76 +Release: 113 BuildRoot: %{_tmppath}/%{name}-%{version}-build # ~coolo/Export/Paketlisten/filelists.tar.bz2 Source: filelists.tar.bz2 Source1: list-requires +Source2: package-lists-openSUSE-rpmlintrc %define __find_requires perl %{S:1} %define _use_internal_dependency_generator 0 @@ -83,24 +84,35 @@ for i in *.%{_target_cpu}.list; do install -m 644 $i $RPM_BUILD_ROOT/usr/share/suse/packages done - -%files -%defattr(-,root,root) -/usr/share/suse +ls -1 $RPM_BUILD_ROOT/usr/share/suse/packages/*.list | \ +grep -v gnome_cd | grep -v kde_cd | grep -v -- -default | +xargs rm -v %files GNOME-cd %defattr(-,root,root) +%dir /usr/share/suse +%dir /usr/share/suse/packages /usr/share/suse/packages/gnome_cd.*.list +%exclude /usr/share/suse/packages/*-default*.list %files KDE-cd %defattr(-,root,root) +%dir /usr/share/suse +%dir /usr/share/suse/packages /usr/share/suse/packages/kde_cd.*.list +%exclude /usr/share/suse/packages/*-default*.list %files images %defattr(-,root,root) +%dir /usr/share/suse +%dir /usr/share/suse/packages /usr/share/suse/packages/*-default*.list +%exclude /usr/share/suse/packages/kde4_*list %changelog +* Thu Jul 31 2008 coolo(a)suse.de +- only take the package lists interesting to others (avoiding silly + warnings about unused lists) * Mon Jun 23 2008 coolo(a)suse.de - does not require .buildenv * Tue Jun 10 2008 coolo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 jakarta-commons-dbcp
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package jakarta-commons-dbcp checked in at Fri Aug 1 01:21:40 CEST 2008. -------- --- jakarta-commons-dbcp/jakarta-commons-dbcp.changes 2008-07-29 09:10:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/jakarta-commons-dbcp/jakarta-commons-dbcp.changes 2008-07-31 13:11:41.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 31 13:10:45 CEST 2008 - mvyskocil(a)suse.cz + +- do not add a java6 compatibility for javac 1.5.0 (fixed build on ia64) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-dbcp.spec ++++++ --- /var/tmp/diff_new_pack.q27967/_old 2008-08-01 01:21:30.000000000 +0200 +++ /var/tmp/diff_new_pack.q27967/_new 2008-08-01 01:21:30.000000000 +0200 @@ -18,7 +18,7 @@ Name: jakarta-commons-dbcp Version: 1.2.2 -Release: 52 +Release: 54 Summary: Jakarta Commons DataBase Pooling Package License: The Apache Software License Group: Development/Libraries/Java @@ -147,7 +147,10 @@ bzip2 -dc %{SOURCE5} | tar xf - cp %{SOURCE6} . %patch0 -b .sav +# patch only for javac 1.6.0 +if [[ "$(javac -version 2>&1 | grep '1\.6\.0')" != "" ]]; then %patch1 -b .sav1 +fi if [ ! -f %{SOURCE4} ]; then export DEPCAT=$(pwd)/%{base_name}-%{version}-depcat.new.xml echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT @@ -275,6 +278,8 @@ %endif %changelog +* Thu Jul 31 2008 mvyskocil(a)suse.cz +- do not add a java6 compatibility for javac 1.5.0 (fixed build on ia64) * Tue Jul 29 2008 anosek(a)suse.cz - made the symlink jakarta-commons-dbcp -> jakarta-commons-dbcp-1.2.2 part of the javadoc package ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-DBD-CSV
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package perl-DBD-CSV checked in at Fri Aug 1 01:20:01 CEST 2008. -------- --- perl-DBD-CSV/perl-DBD-CSV.changes 2006-01-25 21:39:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-DBD-CSV/perl-DBD-CSV.changes 2008-07-31 22:32:30.749041000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 31 22:30:16 CEST 2008 - cthiel(a)suse.de + +- fix build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-DBD-CSV.spec ++++++ --- /var/tmp/diff_new_pack.M24283/_old 2008-08-01 01:19:55.000000000 +0200 +++ /var/tmp/diff_new_pack.M24283/_new 2008-08-01 01:19:55.000000000 +0200 @@ -1,28 +1,29 @@ # # spec file for package perl-DBD-CSV (Version 0.22) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # -# Please submit bugfixes or comments via http://www.suse.de/feedback/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: perl-DBD-CSV BuildRequires: perl-DBI perl-SQL-Statement perl-Text-CSV_XS Summary: The DBD::CSV module is yet another driver for the DBI Version: 0.22 -Release: 3 -License: GPL +Release: 119 +License: GPL v2 or later Group: Development/Libraries/Perl Source0: DBD-CSV-%{version}.tar.bz2 -URL: http://www.cpan.org +Url: http://search.cpan.org/~jzucker/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: perl-DBI perl-SQL-Statement perl-Text-CSV_XS Requires: perl = %{perl_version} -Autoreqprov: on +AutoReqProv: on Obsoletes: perl_csv Provides: perl_csv @@ -38,18 +39,21 @@ Authors: -------- Jochen Wiedmann<joe(a)ispsoft.de> + Jeff Zucker <jeff(a)vpservices.com> %prep %setup -q -n DBD-CSV-%{version} %build +find . -type f -exec chmod a-x '{}' \; CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL make rm -vf t/40bindparam* + +%check make test %install -rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install_vendor %perl_process_packlist @@ -65,40 +69,42 @@ %{_mandir}/man3/* /var/adm/perl-modules/%{name} -%changelog -n perl-DBD-CSV -* Wed Jan 25 2006 - mls(a)suse.de +%changelog +* Fri Aug 01 2008 cthiel(a)suse.de +- fix build +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Sep 28 2005 - dmueller(a)suse.de +* Thu Sep 29 2005 dmueller(a)suse.de - add norootforbuild -* Fri Jul 29 2005 - cthiel(a)suse.de +* Fri Jul 29 2005 cthiel(a)suse.de - update to version 0.22 -* Mon Aug 09 2004 - ro(a)suse.de +* Mon Aug 09 2004 ro(a)suse.de - update to 0.21 - t/40bindparam.t does still fail (but update is needed because of the fileconflict with perl-DBI) -* Fri Aug 22 2003 - mjancar(a)suse.cz +* Fri Aug 22 2003 mjancar(a)suse.cz - require the perl version we build with -* Fri Jul 18 2003 - nashif(a)suse.de +* Fri Jul 18 2003 nashif(a)suse.de - fixed file list -* Tue Jul 01 2003 - ro(a)suse.de +* Tue Jul 01 2003 ro(a)suse.de - use perl_process_packlist macro -* Fri Jun 13 2003 - nashif(a)suse.de +* Fri Jun 13 2003 nashif(a)suse.de - Fixed file list -* Tue Dec 03 2002 - ro(a)suse.de +* Tue Dec 03 2002 ro(a)suse.de - repack tar archive with uids < 65536 -* Mon Jul 08 2002 - nashif(a)suse.de +* Mon Jul 08 2002 nashif(a)suse.de - Update to version 0.2002 -* Tue Dec 11 2001 - nashif(a)suse.de +* Tue Dec 11 2001 nashif(a)suse.de - Update to version 0.1029 -* Thu Oct 11 2001 - nashif(a)suse.de +* Thu Oct 11 2001 nashif(a)suse.de - Update to version 0.1027 - Fix bug#11747 -* Fri Feb 23 2001 - nashif(a)suse.de +* Fri Feb 23 2001 nashif(a)suse.de - Update to version 0.1025 -* Wed Dec 13 2000 - nashif(a)suse.de +* Wed Dec 13 2000 nashif(a)suse.de - Changed Requires to new long package names -* Wed Nov 08 2000 - nashif(a)suse.de +* Wed Nov 08 2000 nashif(a)suse.de - Changed to long package name - Changed neededforbuild -* Tue Sep 26 2000 - nashif(a)suse.de +* Tue Sep 26 2000 nashif(a)suse.de - Initial Release (Version 0.1022) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-packagekit
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package gnome-packagekit checked in at Fri Aug 1 01:19:47 CEST 2008. -------- --- GNOME/gnome-packagekit/gnome-packagekit.changes 2008-07-29 18:30:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-packagekit/gnome-packagekit.changes 2008-07-31 22:29:22.180693000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 31 22:26:54 CEST 2008 - cthiel(a)suse.de + +- really remove restart-gpk-update-icon.sh + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-packagekit.spec ++++++ --- /var/tmp/diff_new_pack.Y23735/_old 2008-08-01 01:19:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Y23735/_new 2008-08-01 01:19:40.000000000 +0200 @@ -13,7 +13,7 @@ Name: gnome-packagekit Url: http://packagekit.org/ Version: 0.2.3 -Release: 1 +Release: 2 License: GPL v2 or later Source: %{name}-%{version}.tar.bz2 #the .po files from https://forgesvn1.novell.com/viewsvn/suse-i18n/trunk/lcn/ @@ -57,7 +57,6 @@ for filename in `ls *.po`; do echo "$filename"; done > LINGUAS sed -i s/\.po// LINGUAS cd .. -cp -f %{S:2} . %build autoreconf -f -i @@ -78,8 +77,6 @@ %suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/gnome/autostart/gpk-update-icon.desktop %suse_update_desktop_file gpk-install-file mkdir $RPM_BUILD_ROOT/usr/sbin -cp -f restart-gpk-update-icon.sh $RPM_BUILD_ROOT/usr/sbin/ -chmod 755 $RPM_BUILD_ROOT/usr/sbin/restart-gpk-update-icon.sh %clean rm -rf "$RPM_BUILD_ROOT" @@ -99,11 +96,12 @@ %{_datadir}/applications/gpk-*.desktop %{_datadir}/icons/hicolor/* %{_sysconfdir}/gconf/schemas/gnome-packagekit.schemas -%{_sbindir}/restart-gpk-update-icon.sh %files lang -f %{name}.lang %changelog +* Fri Aug 01 2008 cthiel(a)suse.de +- really remove restart-gpk-update-icon.sh * Tue Jul 29 2008 jpr(a)suse.de - Remove %%post action and script, it is not needed for factory * Fri Jul 18 2008 sreeves(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 java-1_6_0-openjdk
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package java-1_6_0-openjdk checked in at Thu Jul 31 21:32:18 CEST 2008. -------- --- java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-07-29 00:07:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_6_0-openjdk/java-1_6_0-openjdk.changes 2008-07-31 02:14:58.714853000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 30 15:40:12 CEST 2008 - ro(a)suse.de + +- extend provides list jre1.4.x jre1.5.x jre1.6.x + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_6_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.ua4111/_old 2008-07-31 21:31:59.000000000 +0200 +++ /var/tmp/diff_new_pack.ua4111/_new 2008-07-31 21:31:59.000000000 +0200 @@ -21,7 +21,7 @@ %define icedteaver 1.2 %define openjdkver b09 Version: %{icedteaver}_%{openjdkver} -Release: 15 +Release: 17 Summary: Java runtime environment based on OpenJDK 6 and IcedTea 6 Group: Development/Libraries/Java License: GPL v2 only; - with the OpenJDK Assembly Exception and the GNU Classpath Exception @@ -114,7 +114,7 @@ Provides: jce = %{version} Provides: jdbc-stdext = 3.0, jdbc-stdext = %{version}, java-sasl = %{version} # Required at least by fop -Provides: jre1.3.x +Provides: jre1.3.x jre1.4.x jre1.5.x jre1.6.x %description This Java 6 compatible Java Runtime Environment is based on OpenJDK 6 @@ -749,6 +749,8 @@ %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Wed Jul 30 2008 ro(a)suse.de +- extend provides list jre1.4.x jre1.5.x jre1.6.x * Tue Jul 29 2008 ro(a)suse.de - fix build on i386 again (from gcc bug#36917) * Tue Jul 22 2008 coolo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 efibootmgr
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package efibootmgr checked in at Thu Jul 31 21:30:19 CEST 2008. -------- --- arch/ia64/efibootmgr/efibootmgr.changes 2007-02-09 14:47:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/efibootmgr/efibootmgr.changes 2008-07-31 02:49:15.903177000 +0200 @@ -2 +2 @@ -Fri Feb 9 14:46:53 CET 2007 - rw(a)suse.de +Thu Jul 31 09:48:27 CEST 2008 - rw(a)suse.de @@ -4 +4,6 @@ -- Fix compilation for STABLE (again). +- Update to efibootmgr 0.5.4. [FATE#301882] + +------------------------------------------------------------------- +Fri Jan 18 13:09:14 CET 2008 - rw(a)suse.de + +- Return non-zero exit code on errors. [#307965, FATE#302608] @@ -15 +20 @@ -- Converted neededforbuild to BuildRequires. +- converted neededforbuild to BuildRequires Old: ---- efibootmgr-0.5.3.diff efibootmgr-0.5.3.tar.gz New: ---- efibootmgr-0.5.4.diff efibootmgr-0.5.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ efibootmgr.spec ++++++ --- /var/tmp/diff_new_pack.cTB526/_old 2008-07-31 21:30:10.000000000 +0200 +++ /var/tmp/diff_new_pack.cTB526/_new 2008-07-31 21:30:10.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package efibootmgr (Version 0.5.3) +# spec file for package efibootmgr (Version 0.5.4) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -9,17 +9,18 @@ # + Name: efibootmgr -BuildRequires: pciutils-devel -URL: http://linux.dell.com/efibootmgr/ Summary: EFI Boot Manager -Version: 0.5.3 -Release: 2 +Version: 0.5.4 +Release: 1 Group: System/Boot -License: GNU General Public License (GPL) +License: GPL v2 or later +Url: http://linux.dell.com/efibootmgr/ Source: http://linux.dell.com/efibootmgr/efibootmgr-%{version}.tar.gz -Patch: %{name}-%{version}.diff +Patch0: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pciutils-devel %description The EFI Boot Manager allows the user to edit the Intel Extensible @@ -34,16 +35,16 @@ Matt Domsch <Matt_Domsch(a)dell.com> %prep -%setup -%patch -p1 +%setup -q +%patch0 -p1 chmod +x tools/install.pl %build -CFLAGS=$RPM_OPT_FLAGS make +make %{?_smp_mflags} EXTRA_CFLAGS="$RPM_OPT_FLAGS" %install -install -d $RPM_BUILD_ROOT/usr/sbin -make install BINDIR=$RPM_BUILD_ROOT/usr/sbin +install -d $RPM_BUILD_ROOT%{_sbindir} +make install BINDIR=$RPM_BUILD_ROOT%{_sbindir} install -d $RPM_BUILD_ROOT%{_mandir}/man8 install -m 644 src/man/man8/efibootmgr.8 $RPM_BUILD_ROOT%{_mandir}/man8 @@ -53,44 +54,46 @@ %files %defattr(-, root, root) %doc README -/usr/sbin/efibootmgr +%{_sbindir}/efibootmgr %{_mandir}/man8/*.gz -%changelog -n efibootmgr -* Fri Feb 09 2007 - rw(a)suse.de -- Fix compilation for STABLE (again). -* Wed Dec 20 2006 - rw(a)suse.de +%changelog +* Thu Jul 31 2008 rw(a)suse.de +- Update to efibootmgr 0.5.4. [FATE#301882] +* Fri Jan 18 2008 rw(a)suse.de +- Return non-zero exit code on errors. [#307965, FATE#302608] +* Wed Dec 20 2006 rw(a)suse.de - Use '&' instead of '&&' to mask bits. [#219735] - Fix compilation for STABLE. -* Wed Jan 25 2006 - mls(a)suse.de -- Converted neededforbuild to BuildRequires. -* Wed Nov 09 2005 - schwab(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de +- converted neededforbuild to BuildRequires +* Thu Nov 10 2005 schwab(a)suse.de - Update to efibootmgr 0.5.3. -* Mon Sep 19 2005 - schwab(a)suse.de +* Mon Sep 19 2005 schwab(a)suse.de - Update to efibootmgr 0.5.2.2. -* Wed Aug 10 2005 - schwab(a)suse.de +* Wed Aug 10 2005 schwab(a)suse.de - Update to efibootmgr 0.5.2 [#102441]. -* Tue May 10 2005 - schwab(a)suse.de +* Tue May 10 2005 schwab(a)suse.de - Fix parsing of bus info for network boot entry [#82882]. -* Wed Mar 09 2005 - schwab(a)suse.de +* Wed Mar 09 2005 schwab(a)suse.de - Update to efibootmgr 0.5.1. -* Fri Aug 27 2004 - schwab(a)suse.de +* Fri Aug 27 2004 schwab(a)suse.de - Update to efibootmgr 0.5.0. -* Thu Jun 10 2004 - schwab(a)suse.de +* Thu Jun 10 2004 schwab(a)suse.de - Update to efibootmgr 0.5.0-test4. -* Mon May 03 2004 - schwab(a)suse.de +* Mon May 03 2004 schwab(a)suse.de - Update to efibootmgr 0.5.0-test3. -* Fri Sep 05 2003 - schwab(a)suse.de +* Sat Sep 06 2003 schwab(a)suse.de - Update to efibootmgr 0.4.2. -* Wed Oct 23 2002 - schwab(a)suse.de +* Wed Oct 23 2002 schwab(a)suse.de - Update to efibootmgr 0.4.1. -* Sun May 05 2002 - schwab(a)suse.de +* Sun May 05 2002 schwab(a)suse.de - Update to efibootmgr 0.4.0. -* Fri Aug 10 2001 - schwab(a)suse.de +* Fri Aug 10 2001 schwab(a)suse.de - Update to efibootmgr 0.3.4. -* Wed May 23 2001 - schwab(a)suse.de +* Wed May 23 2001 schwab(a)suse.de - Update to efibootmgr 0.3.2. -* Tue May 22 2001 - schwab(a)suse.de +* Tue May 22 2001 schwab(a)suse.de - Fix uninitialized variable. -* Sat May 19 2001 - schwab(a)suse.de +* Sat May 19 2001 schwab(a)suse.de - Initial version 0.3.1. ++++++ efibootmgr-0.5.3.diff -> efibootmgr-0.5.4.diff ++++++ --- arch/ia64/efibootmgr/efibootmgr-0.5.3.diff 2007-02-09 14:49:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/efibootmgr/efibootmgr-0.5.4.diff 2008-07-31 02:39:06.524230000 +0200 @@ -1,19 +1,6 @@ -diff -ur efibootmgr-0.5.3/src/efibootmgr/module.mk efibootmgr-0.5.3-4/src/efibootmgr/module.mk ---- efibootmgr-0.5.3/src/efibootmgr/module.mk 2004-06-09 23:45:42.000000000 +0200 -+++ efibootmgr-0.5.3-4/src/efibootmgr/module.mk 2006-12-20 00:00:01.000000000 +0100 -@@ -11,7 +11,7 @@ - efibootmgr_LIBDIR := src/lib - efibootmgr_FULLLIB := \ - $(patsubst %,$(efibootmgr_LIBDIR)/%,$(efibootmgr_LIBS)) --LIBS = -lpci -+LIBS = -lpci -lz - - ALLDEPS += $(efibootmgr_FULLTARGET) - CLEANLIST += $(efibootmgr_FULLTARGET) -diff -ur efibootmgr-0.5.3/src/lib/disk.c efibootmgr-0.5.3-4/src/lib/disk.c ---- efibootmgr-0.5.3/src/lib/disk.c 2005-08-10 07:25:48.000000000 +0200 -+++ efibootmgr-0.5.3-4/src/lib/disk.c 2006-12-19 23:51:38.000000000 +0100 -@@ -55,7 +55,7 @@ +--- a/src/lib/disk.c ++++ b/src/lib/disk.c +@@ -55,7 +55,7 @@ disk_info_from_fd(int fd, return 1; } major = buf.st_dev >> 8; @@ -22,14 +9,3 @@ /* IDE disks can have up to 64 partitions, or 6 bits worth, * and have one bit for the disk number. -diff -ur efibootmgr-0.5.3/src/lib/efi.c efibootmgr-0.5.3-4/src/lib/efi.c ---- efibootmgr-0.5.3/src/lib/efi.c 2005-08-10 17:58:13.000000000 +0200 -+++ efibootmgr-0.5.3-4/src/lib/efi.c 2006-12-19 23:52:21.000000000 +0100 -@@ -35,6 +35,7 @@ - #include <linux/sockios.h> - #include <net/if.h> - #include <pci/pci.h> -+#include <linux/types.h> - #include <linux/ethtool.h> - #include "efi.h" - #include "efichar.h" ++++++ efibootmgr-0.5.3.tar.gz -> efibootmgr-0.5.4.tar.gz ++++++ ++++ 2579 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 elilo
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package elilo checked in at Thu Jul 31 21:25:55 CEST 2008. -------- --- arch/i386/elilo/elilo.changes 2008-02-28 17:49:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/elilo/elilo.changes 2008-07-31 02:16:59.401536000 +0200 @@ -1,0 +2,11 @@ +Wed Jul 31 10:22:56 CEST 2008 - rw(a)suse.de + +- elilo.efi + * Update to final elilo-3.8 for uEFI support. (fate#301882) +- elilo.pl + * Preserve time-stamps but not permissions. (bnc#394331) + * Unconditionally strip deprecated 'read-only' from 'elilo.conf'. + * Support '$LIBEXECDIR' to please uEFI/x86_64 and + relocate efi-binaries from 'elilo' to 'efi'. (fate#301882) + +------------------------------------------------------------------- @@ -4 +15,2 @@ -- no strip for elilo.efi during install (unknown binary format) +- elilo.spec + * No strip for elilo.efi during install (unknown binary format). @@ -9 +21,2 @@ -- Revert last change. +- elilo.spec + * Revert last change. @@ -14 +27,9 @@ -- added gnu-efi-devel to buildreq +- elilo.spec + * Added gnu-efi-devel to buildreq. + +------------------------------------------------------------------- +Wed May 9 14:29:40 CEST 2007 - rw(a)suse.de + +- elilo.efi + * Reduce non-"command line" strings back to 512. (#256676) + * Fix another buffer overrun. (#256676) @@ -19 +40,2 @@ -- Disable stack protector. +- elilo.spec + * Disable stack protector. @@ -25,2 +47 @@ - * increase command line size to 2048 (as in >= 2.6.20-rc6-mm1) - (#242702) + * Increase command line size to 2048. (#242702) @@ -31 +52,2 @@ -- Fix spelling. +- elilo.efi + * Fix spelling. @@ -38 +60 @@ - (Fixed vmcode_name initialization in textmenu chooser) + (Fixed vmcode_name initialization in textmenu chooser) @@ -61 +83 @@ -- /sbin/elilo +- elilo.pl @@ -69 +91 @@ -- /sbin/elilo +- elilo.pl @@ -75 +97 @@ -- /sbin/elilo +- elilo.pl @@ -81 +103 @@ -- /sbin/elilo +- elilo.pl @@ -105 +127 @@ -- /sbin/elilo +- elilo.pl @@ -113 +135 @@ -- /sbin/elilo +- elilo.pl Old: ---- elilo-3.6-asm.diff elilo-3.6-MAC.diff elilo-3.6-spelling.diff elilo-3.6.src.tgz New: ---- elilo-3.8.tar.gz elilo-asm.diff elilo-avoid-tab.diff elilo-fix-possible-overflow.diff elilo-MAC.diff elilo-spelling.diff rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elilo.spec ++++++ --- /var/tmp/diff_new_pack.t26089/_old 2008-07-31 21:25:28.000000000 +0200 +++ /var/tmp/diff_new_pack.t26089/_new 2008-07-31 21:25:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package elilo (Version 3.6) +# spec file for package elilo (Version 3.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,22 +12,25 @@ Name: elilo -Url: http://elilo.sourceforge.net/ Summary: EFI Linux Loader -Version: 3.6 -Release: 142 +Version: 3.8 +Release: 3 Group: System/Boot AutoReqProv: on PreReq: /usr/bin/perl License: GPL v2 or later -Source: http://mesh.dl.sourceforge.net/sourceforge/elilo/elilo-3.6.src.tgz +Url: http://elilo.sourceforge.net/ +Source: http://dl.sourceforge.net/elilo/elilo-3.8.tar.gz Source1: elilo.pl -Patch0: elilo-%{version}-asm.diff -Patch1: elilo-%{version}-MAC.diff -Patch2: elilo-%{version}-spelling.diff +Source2: rpmlintrc +Patch0: elilo-asm.diff +Patch1: elilo-MAC.diff +Patch2: elilo-spelling.diff Patch3: elilo-longer-commandline.diff +Patch4: elilo-fix-possible-overflow.diff +Patch5: elilo-avoid-tab.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gnu-efi +BuildRequires: gnu-efi >= 3.0e %description The EFI Linux boot loader. @@ -47,7 +50,11 @@ %patch1 -p1 %patch2 %patch3 -p1 -perl -pe 's/\@EDITION\@/%{version}-%{release}/' < %{SOURCE1} > elilo.pl && +%patch4 -p1 +%patch5 -p1 +perl -pe 's{\@EDITION\@}{%{version}-%{release}}; + s{\@LIBEXECDIR\@}{%{_libexecdir}}' < %{SOURCE1} > elilo.pl && +perl -pi -e 's{/usr/lib}{%{_libexecdir}}' Make.defaults chmod 555 elilo.pl && touch -r %{SOURCE1} elilo.pl ! fgrep '%%{version}-%%{release}' elilo.pl @@ -58,11 +65,13 @@ touch -r elilo.pl elilo.8 %install -install -d $RPM_BUILD_ROOT/usr/lib/elilo $RPM_BUILD_ROOT/sbin -install -m 444 elilo.efi $RPM_BUILD_ROOT/usr/lib/elilo +install -d $RPM_BUILD_ROOT%{_libexecdir}/efi $RPM_BUILD_ROOT/sbin +install -m 444 elilo.efi $RPM_BUILD_ROOT%{_libexecdir}/efi install tools/eliloalt $RPM_BUILD_ROOT/sbin install -p -m 555 elilo.pl $RPM_BUILD_ROOT/sbin/elilo -#install -D -p elilo.8 $RPM_BUILD_ROOT/usr/share/man/man8/elilo.8 +%if 0 +install -D -p elilo.8 $RPM_BUILD_ROOT/usr/share/man/man8/elilo.8 +%endif %clean rm -fr $RPM_BUILD_ROOT @@ -74,26 +83,44 @@ %files %defattr(-, root, root) %doc README README.* TODO docs/*.txt -/usr/lib/elilo +%{_libexecdir}/efi /sbin/elilo /sbin/eliloalt -#/usr/share/man/man8/* +%if 0 +/usr/share/man/man8/* +%endif %changelog +* Thu Jul 31 2008 rw(a)suse.de +- elilo.efi + * Update to final elilo-3.8 for uEFI support. (fate#301882) +- elilo.pl + * Preserve time-stamps but not permissions. (bnc#394331) + * Unconditionally strip deprecated 'read-only' from 'elilo.conf'. + * Support '$LIBEXECDIR' to please uEFI/x86_64 and + relocate efi-binaries from 'elilo' to 'efi'. (fate#301882) * Thu Feb 28 2008 ro(a)suse.de -- no strip for elilo.efi during install (unknown binary format) +- elilo.spec + * No strip for elilo.efi during install (unknown binary format). * Sun May 27 2007 schwab(a)suse.de -- Revert last change. +- elilo.spec + * Revert last change. * Sun May 27 2007 ro(a)suse.de -- added gnu-efi-devel to buildreq +- elilo.spec + * Added gnu-efi-devel to buildreq. +* Wed May 09 2007 rw(a)suse.de +- elilo.efi + * Reduce non-"command line" strings back to 512. (#256676) + * Fix another buffer overrun. (#256676) * Fri Feb 23 2007 schwab(a)suse.de -- Disable stack protector. +- elilo.spec + * Disable stack protector. * Tue Feb 06 2007 bwalle(a)suse.de - elilo.efi - * increase command line size to 2048 (as in >= 2.6.20-rc6-mm1) - (#242702) + * Increase command line size to 2048. (#242702) * Fri Nov 10 2006 schwab(a)suse.de -- Fix spelling. +- elilo.efi + * Fix spelling. * Thu Feb 02 2006 rw(a)suse.de - elilo.efi * Update to final 3.6 @@ -108,18 +135,18 @@ - elilo.efi * Fix vmcode_name initialization in textmenu chooser. (#140519) * Fri Dec 09 2005 rw(a)suse.de -- /sbin/elilo +- elilo.pl * Fix formatting of man-page. * Wed Dec 07 2005 rw(a)suse.de - elilo.efi * Update to 3.5-pre2. -- /sbin/elilo +- elilo.pl * Make "best effort" instead of giving up early. * Sat Aug 13 2005 schwab(a)suse.de -- /sbin/elilo +- elilo.pl * Check that the default label is defined. * Fri Aug 05 2005 schwab(a)suse.de -- /sbin/elilo +- elilo.pl * Barf on duplicate labels. * Wed Apr 13 2005 schwab(a)suse.de - elilo.efi @@ -131,12 +158,12 @@ - elilo.efi * Fix simple-chooser (#45493) * Thu May 27 2004 rw(a)suse.de -- /sbin/elilo +- elilo.pl * Make all image-objects (kernel/initrd) *optional* by default (#41315) * Mon Feb 23 2004 rw(a)suse.de - elilo.efi * Use '$RPM_OPT_FLAGS' with '-fno-strict-aliasing' appended. -- /sbin/elilo +- elilo.pl * Take care of FPSWA. * Try to avoid copying the same files more than once. * Mon Nov 24 2003 rw(a)suse.de ++++++ elilo-3.6-asm.diff -> elilo-asm.diff ++++++ ++++++ elilo-avoid-tab.diff ++++++ diff -urp elilo-3.8/config.c elilo-3.8-tab/config.c --- elilo-3.8/config.c 2008-07-29 23:22:07.637647427 +0200 +++ elilo-3.8-tab/config.c 2008-07-31 01:24:31.346046245 +0200 @@ -897,10 +897,10 @@ print_label_list(VOID) { boot_image_t *img, *dfl = global_config.default_image; - if (dfl) Print(L"\t%s\n", dfl->label); + if (dfl) Print(L" %s\n", dfl->label); for (img = image_list; img; img = img->next) { - if (img != dfl) Print(L"\t%s\n", img->label); + if (img != dfl) Print(L" %s\n", img->label); } } ++++++ elilo-fix-possible-overflow.diff ++++++ From: Bernhard Walle <bwalle(a)suse.de> Subject: [PATCH] Fix possible array length overflow References: 256676 Found by dan.yeisley(a)unisys.com. Signed-off-by: Bernhard Walle <bwalle(a)suse.de> --- choosers/simple.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/choosers/simple.c +++ b/choosers/simple.c @@ -283,8 +283,10 @@ restart: } if (elilo_opt.prompt) { - ret = select_kernel(buffer, sizeof(buffer)); + ret = select_kernel(buffer, CMDLINE_MAXLEN); if (ret == -1) return -1; + + /* this function takes really the number of bytes ... */ argc = argify(buffer,sizeof(buffer), argv); index = 0; } ++++++ elilo-longer-commandline.diff ++++++ --- /var/tmp/diff_new_pack.t26089/_old 2008-07-31 21:25:28.000000000 +0200 +++ /var/tmp/diff_new_pack.t26089/_new 2008-07-31 21:25:28.000000000 +0200 @@ -3,25 +3,85 @@ Increase command line size to 2048 chars. --- - elilo.c | 2 +- - elilo.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + choosers/simple.c | 10 +++++----- + choosers/textmenu.c | 6 +++--- + config.c | 6 +++--- + elilo.c | 2 +- + elilo.h | 3 ++- + 5 files changed, 14 insertions(+), 13 deletions(-) -Index: b/elilo.h -=================================================================== ---- a/elilo.h -+++ b/elilo.h -@@ -57,7 +57,7 @@ - #define ELILO_DEFAULT_TIMEOUT ELILO_TIMEOUT_INFINITY - #define ELILO_TIMEOUT_INFINITY (~0UL) +--- a/choosers/simple.c ++++ b/choosers/simple.c +@@ -36,8 +36,8 @@ static VOID + display_label_info(CHAR16 *name) + { + CHAR16 *desc; +- CHAR16 initrd_name[CMDLINE_MAXLEN]; +- CHAR16 vmcode_name[CMDLINE_MAXLEN]; ++ CHAR16 initrd_name[PATHNAME_MAXLEN]; ++ CHAR16 vmcode_name[PATHNAME_MAXLEN]; + CHAR16 options_tmp[CMDLINE_MAXLEN]; + CHAR16 options[CMDLINE_MAXLEN]; + CHAR16 kname[FILENAME_MAXLEN]; +@@ -248,10 +248,10 @@ simple_choose(CHAR16 **argv, INTN argc, + # define BOOT_IMG_STR L"BOOT_IMAGE=" + CHAR16 buffer[CMDLINE_MAXLEN]; + CHAR16 alt_buffer[CMDLINE_MAXLEN]; +- CHAR16 initrd_name[CMDLINE_MAXLEN]; +- CHAR16 vmcode_name[CMDLINE_MAXLEN]; ++ CHAR16 initrd_name[PATHNAME_MAXLEN]; ++ CHAR16 vmcode_name[PATHNAME_MAXLEN]; + CHAR16 args[CMDLINE_MAXLEN]; +- CHAR16 devname[CMDLINE_MAXLEN]; ++ CHAR16 devname[PATHNAME_MAXLEN]; + CHAR16 dpath[FILENAME_MAXLEN]; + CHAR16 *slash_pos, *colon_pos, *backslash_pos; + UINTN len; +--- a/choosers/textmenu.c ++++ b/choosers/textmenu.c +@@ -362,10 +362,10 @@ textmenu_choose(CHAR16 **argv, INTN argc + { + # define BOOT_IMG_STR L"BOOT_IMAGE=" + CHAR16 label[CMDLINE_MAXLEN]; +- CHAR16 initrd_name[CMDLINE_MAXLEN]; +- CHAR16 vmcode_name[CMDLINE_MAXLEN]; ++ CHAR16 initrd_name[PATHNAME_MAXLEN]; ++ CHAR16 vmcode_name[PATHNAME_MAXLEN]; + CHAR16 args[CMDLINE_MAXLEN]; +- CHAR16 devname[CMDLINE_MAXLEN]; ++ CHAR16 devname[PATHNAME_MAXLEN]; + CHAR16 dpath[FILENAME_MAXLEN]; + CHAR16 *slash_pos, *colon_pos, *backslash_pos; + UINTN len; +--- a/config.c ++++ b/config.c +@@ -51,7 +51,7 @@ + */ + #define ELILO_DEFAULT_CONFIG L"elilo.conf" --#define CMDLINE_MAXLEN 512 /* needed by ia32 */ -+#define CMDLINE_MAXLEN 2048 /* needed by ia32 */ - #define FILENAME_MAXLEN 256 - #define MAX_ARGS 256 - /* Just pick an arbitrary number that's high enough for now :o) */ -Index: b/elilo.c -=================================================================== +-#define MAX_STRING CMDLINE_MAXLEN ++#define MAX_STRING 512 + #define CONFIG_BUFSIZE 512 /* input buffer size */ + + /* +@@ -66,7 +66,7 @@ typedef struct boot_image { + struct boot_image *next; + CHAR16 label[MAX_STRING]; + CHAR16 kname[FILENAME_MAXLEN]; +- CHAR16 options[MAX_STRING]; ++ CHAR16 options[CMDLINE_MAXLEN]; + CHAR16 initrd[FILENAME_MAXLEN]; + CHAR16 vmcode[FILENAME_MAXLEN]; + CHAR16 root[FILENAME_MAXLEN]; +@@ -95,7 +95,7 @@ typedef struct { + CHAR16 root[FILENAME_MAXLEN]; /* globally defined root fs */ + CHAR16 initrd[FILENAME_MAXLEN];/* globally defined initrd */ + CHAR16 vmcode[FILENAME_MAXLEN];/* globally defined boot-time module */ +- CHAR16 options[MAX_STRING]; ++ CHAR16 options[CMDLINE_MAXLEN]; + CHAR16 default_image_name[MAX_STRING]; + CHAR16 message_file[MAX_MESSAGES][FILENAME_MAXLEN]; + CHAR16 chooser[FILENAME_MAXLEN];/* which image chooser to use */ --- a/elilo.c +++ b/elilo.c @@ -87,7 +87,7 @@ do_kernel_load(CHAR16 *kname, kdesc_t *k @@ -33,3 +93,16 @@ /* * Do the vm image switch here +--- a/elilo.h ++++ b/elilo.h +@@ -57,7 +57,8 @@ + #define ELILO_DEFAULT_TIMEOUT ELILO_TIMEOUT_INFINITY + #define ELILO_TIMEOUT_INFINITY (~0UL) + +-#define CMDLINE_MAXLEN 512 /* needed by ia32 */ ++#define CMDLINE_MAXLEN 2048 ++#define PATHNAME_MAXLEN 512 + #define FILENAME_MAXLEN 256 + #define MAX_ARGS 256 + /* Just pick an arbitrary number that's high enough for now :o) */ + ++++++ elilo-MAC.diff ++++++ diff -purN elilo-3.5-pre2/glue_netfs.c elilo-3.5-MAC/glue_netfs.c --- elilo-3.5-pre2/glue_netfs.c 2004-02-20 23:30:37.000000000 +0100 +++ elilo-3.5-MAC/glue_netfs.c 2005-12-07 15:19:45.655191368 +0100 @@ -61,6 +61,18 @@ static CHAR16 netfs_default_path[FILENAM static CHAR16 *hexa=L"0123456789ABCDEF"; static VOID +convert_mac2hex(UINT8 *hw_addr,INTN l, CHAR16 *str) +{ + UINTN i; + for (i=0 ; i < l; i++) { + str[3*i] = hexa[(hw_addr[i] & 0xf0)>>4]; + str[3*i+1] = hexa[hw_addr[i] & 0x0f]; + str[3*i+2] = ':'; + } + str[3*l-1]='\0'; +} + +static VOID convert_ip2hex(UINT8 *ip, INTN l, CHAR16 *str) { UINTN i; @@ -197,6 +209,12 @@ netfs_setdefaults(VOID *intf, config_fil StrnCpy(config[6].fname, str, maxlen-1); StrnCpy(config[6].fname+2, CONFIG_EXTENSION, 6); + + /* use the MAC address as a possible file name as well */ + convert_mac2hex(info.hw_addr,6,str); + StrnCpy(config[7].fname, str, maxlen-1); + StrnCpy(config[7].fname+17, CONFIG_EXTENSION, 6); + #else StrnCpy(config[0].fname, NETFS_DEFAULT_CONFIG, maxlen-1); config[0].fname[maxlen-1] = CHAR_NULL; ++++++ elilo.pl ++++++ --- arch/i386/elilo/elilo.pl 2005-12-09 12:46:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/elilo/elilo.pl 2008-07-30 11:36:51.887804000 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# $Id: elilo.pl,v 0.12 2005/12/09 11:46:06 rw Exp $ +# $Id: elilo.pl,v 0.14 2008/07/30 09:36:48 rw Exp $ use strict; my $C = $0; $C =~ s%^.*/%%; @@ -8,7 +8,8 @@ my $Edition = q(@EDITION@); my $MPold = "$dbg/boot"; my $MPnew = "$dbg/boot/efi"; -my $Dlib = "$dbg/usr/lib/elilo"; +my $Dlibold = "$dbg@LIBEXECDIR@/elilo"; +my $Dlib = "$dbg@LIBEXECDIR@/efi"; my $Fconf = "elilo.conf"; my $Sconf = "$dbg/etc/" . $Fconf; @@ -35,7 +36,7 @@ $[ = 0; sub Version() { - my $v = q($Revision: 0.12 $ ); + my $v = q($Revision: 0.14 $ ); $v =~ s/^\$ Rev.*:\ ([0-9.]+)\ \$\ /$1/x; $v .= " (part of elilo-$Edition)" if ( $Edition ne "\@EDITION\@" ); print "$C version $v\n"; @@ -131,6 +132,8 @@ } elsif (m%^\s*default\s*=\s*(\S+)%) { $default_label = $1; $default_loc = $#Out + 1; + } elsif (m%^\s*read-only\s*$%) { + $_ = "#read-only # Deprecated! (May be forced by appending 'ro')\n"; } push @Out, $_; } @@ -194,26 +197,33 @@ my( $f, $o, $s, $d) = @_; my @C = ( "install", $o, $s, $d); + if ( $o eq "-p" ) { + @C = ( "cp", "--preserve=timestamps", $s, $d); + } System( $f, @C); } sub InstallFPSWA($) { my ( $d) = @_; + my $Dfpswa = $Dlib; + $d .= "/efi/Intel Firmware"; - return 0 unless ( -r "$Dlib/fpswa.efi" ); + $Dfpswa = $Dlibold unless ( -r "$Dfpswa/fpswa.efi" ); + + return 0 unless ( -r "$Dfpswa/fpswa.efi" ); my $head = "## fpswa: Floating Point Software Assist\n"; if ( -d $d && -r "$d/fpswa.efi" ) { # check, if we need to update and failing that do nothing?! - my $c = "$Dlib/fpswa-cmp-version"; + my $c = "$Dfpswa/fpswa-cmp-version"; if ( -x $c ) { - my $chk = `$c "$d/fpswa.efi" "$Dlib/fpswa.efi"`; + my $chk = `$c "$d/fpswa.efi" "$Dfpswa/fpswa.efi"`; if ( $chk =~ /older/ ) { Info( 1, $head . "## Update '$d/fpswa.efi'.\n"); Info( 2, "## $chk"); - Install( 0, "-p", "$Dlib/fpswa.efi", $d); + Install( 0, "-p", "$Dfpswa/fpswa.efi", $d); } else { Info( 1, $head . "## Do NOT update '$d/fpswa.efi'.\n"); @@ -222,7 +232,7 @@ } } else { use File::Compare; - if ( compare( "$d/fpswa.efi", "$Dlib/fpswa.efi") == 0 ) { + if ( compare( "$d/fpswa.efi", "$Dfpswa/fpswa.efi") == 0 ) { Info( 2, $head . "## Already installed.\n"); } else { @@ -234,7 +244,7 @@ } else { Info( 1, $head . "## Install 'fpswa.efi' to '$d'.\n"); System( 0, "mkdir", $d) unless ( -d $d ); - Install( 0, "-p", "$Dlib/fpswa.efi", $d); + Install( 0, "-p", "$Dfpswa/fpswa.efi", $d); } } ++++++ elilo-spelling.diff ++++++ --- config.c +++ config.c @@ -580,7 +580,7 @@ */ tok = get_token(numstr, MAX_STRING); if (tok != TOK_EQUAL) { - config_error(L"Option %s expects an equal signal + value", p->name); + config_error(L"Option %s expects an equal sign + value", p->name); return -1; } @@ -673,7 +673,7 @@ */ tok = get_token(str, maxlen); if (tok != TOK_EQUAL) { - config_error(L"Option %s expects an equal signal + %s", p->name, msg); + config_error(L"Option %s expects an equal sign + %s", p->name, msg); return -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 gnu-efi
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package gnu-efi checked in at Thu Jul 31 21:25:18 CEST 2008. -------- --- arch/i386/gnu-efi/gnu-efi.changes 2007-05-27 18:37:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnu-efi/gnu-efi.changes 2008-07-31 00:49:06.235953000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 29 22:41:17 CEST 2008 - rw(a)suse.de + +- Update to gnu-efi 3.0e for uEFI/x86_64. (fate#301882) + +------------------------------------------------------------------- @@ -5 +10 @@ -- added rpmlintrc instead +- Add rpmlintrc instead. @@ -10 +15 @@ -- split off devel package +- Split off devel package. Old: ---- gnu-efi-3.0c.tar.gz New: ---- gnu-efi-3.0e.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnu-efi.spec ++++++ --- /var/tmp/diff_new_pack.p25452/_old 2008-07-31 21:25:10.000000000 +0200 +++ /var/tmp/diff_new_pack.p25452/_new 2008-07-31 21:25:10.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package gnu-efi (Version 3.0c) +# spec file for package gnu-efi (Version 3.0e) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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. # @@ -10,17 +10,19 @@ # norootforbuild + Name: gnu-efi -BuildRequires: kernel-source Summary: Library for EFI Applications -Version: 3.0c -Release: 54 +Version: 3.0e +Release: 1 Group: Development/Libraries/Other -Autoreqprov: on -License: BSD License and BSD-like, GNU General Public License (GPL) -Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/gnu-efi-%{version}.tar.gz +AutoReqProv: on +License: BSD 3-Clause; GPL v2 or later +Url: http://sourceforge.net/projects/gnu-efi +Source: http://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0e.tar.gz Source1: rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: kernel-source %description Library for EFI applications. @@ -34,11 +36,11 @@ Stephane Eranian <eranian(a)hpl.hp.com> %prep -%setup -q +%setup -q -n gnu-efi-3.0 %build -CFLAGS="-fpic -fshort-wchar -fno-strict-aliasing -funsigned-char -fno-stack-protector" -make LINUX_HEADERS=/usr/src/linux CFLAGS="$RPM_OPT_FLAGS $CFLAGS" +#CFLAGS="-fpic -fshort-wchar -fno-strict-aliasing -funsigned-char -fno-stack-protector" +make LINUX_HEADERS=/usr/src/linux %install make install INSTALLROOT=$RPM_BUILD_ROOT%{_prefix} @@ -65,83 +67,85 @@ %endif %changelog -* Sun May 27 2007 - schwab(a)suse.de +* Wed Jul 30 2008 rw(a)suse.de +- Update to gnu-efi 3.0e for uEFI/x86_64. (fate#301882) +* Sun May 27 2007 schwab(a)suse.de - Remove completely pointless devel package. -- added rpmlintrc instead -* Sat May 26 2007 - ro(a)suse.de -- split off devel package -* Fri Feb 23 2007 - schwab(a)suse.de +- Add rpmlintrc instead. +* Sun May 27 2007 ro(a)suse.de +- Split off devel package. +* Fri Feb 23 2007 schwab(a)suse.de - Disable stack protector. -* Fri Jun 23 2006 - rw(a)suse.de +* Fri Jun 23 2006 rw(a)suse.de - Update to gnu-efi 3.0c to fix building on IA-32. -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - Convert neededforbuild to BuildRequires -* Fri Dec 09 2005 - rw(a)suse.de +* Fri Dec 09 2005 rw(a)suse.de - Allow building on IA-32. -* Tue Nov 29 2005 - rw(a)suse.de +* Tue Nov 29 2005 rw(a)suse.de - Update to gnu-efi 3.0b-041222. -* Tue Aug 03 2004 - schwab(a)suse.de +* Tue Aug 03 2004 schwab(a)suse.de - Discard unwind sections. -* Sat Apr 17 2004 - schwab(a)suse.de +* Sat Apr 17 2004 schwab(a)suse.de - Pacify autobuild. -* Fri Sep 26 2003 - schwab(a)suse.de +* Fri Sep 26 2003 schwab(a)suse.de - Fix linker script to include all data sections. -* Fri Jul 25 2003 - schwab(a)suse.de +* Fri Jul 25 2003 schwab(a)suse.de - Revert last change, was actually a binutils bug. -* Tue Apr 08 2003 - schwab(a)suse.de +* Tue Apr 08 2003 schwab(a)suse.de - Fix @gprel reference in crt object. -* Tue Feb 26 2002 - schwab(a)suse.de +* Tue Feb 26 2002 schwab(a)suse.de - Update to gnu-efi 3.0a. -* Sat Nov 24 2001 - schwab(a)suse.de +* Sat Nov 24 2001 schwab(a)suse.de - Add .rodata.* to linker script. -* Wed Jul 18 2001 - schwab(a)suse.de +* Wed Jul 18 2001 schwab(a)suse.de - Update to gnu-efi 3.0. - Split off elilo. -* Tue May 22 2001 - schwab(a)suse.de +* Tue May 22 2001 schwab(a)suse.de - Update to gnu-efi 2.5. -* Fri May 11 2001 - schwab(a)suse.de +* Fri May 11 2001 schwab(a)suse.de - Add initrd fix. - Reduce timeout. -* Thu Apr 26 2001 - schwab(a)suse.de +* Thu Apr 26 2001 schwab(a)suse.de - neededforbuild lx_ia64 -> kernel-source. -* Fri Apr 06 2001 - schwab(a)suse.de +* Fri Apr 06 2001 schwab(a)suse.de - Update to gnu-efi 2.0. - Package renamed to gnu-efi. -* Tue Mar 13 2001 - schwab(a)suse.de +* Tue Mar 13 2001 schwab(a)suse.de - Install some documentation. - Add unwind patch from David Mosberger. -* Wed Feb 14 2001 - schwab(a)suse.de +* Wed Feb 14 2001 schwab(a)suse.de - Add lx_ia64 to neededforbuild. - Get kernel headers from /usr/src/linux. -* Sun Nov 26 2000 - schwab(a)suse.de +* Mon Nov 27 2000 schwab(a)suse.de - Preserve .sdata section. -* Mon Nov 06 2000 - schwab(a)suse.de +* Tue Nov 07 2000 schwab(a)suse.de - Update to gnu-efi 1.1. - Add `initrd=initrd' to sample eli.cfg. -* Fri Oct 13 2000 - schwab(a)suse.de +* Fri Oct 13 2000 schwab(a)suse.de - Update to gnu-efi 1.0. -* Mon Sep 11 2000 - schwab(a)suse.de +* Mon Sep 11 2000 schwab(a)suse.de - Mark startup.nsh as %%config(noreplace). -* Thu Aug 17 2000 - schwab(a)suse.de +* Thu Aug 17 2000 schwab(a)suse.de - Fix initrd support. -* Tue Aug 08 2000 - schwab(a)suse.de +* Tue Aug 08 2000 schwab(a)suse.de - Update to gnu-efi 0.9. - Install lilo.efi in /boot. -* Mon Jul 17 2000 - schwab(a)suse.de +* Mon Jul 17 2000 schwab(a)suse.de - Add argv bug fix. -* Fri Jun 30 2000 - schwab(a)suse.de +* Fri Jun 30 2000 schwab(a)suse.de - Update to 0.4.0. - Fix uninitialized variable. -* Fri Jun 16 2000 - @suse.de +* Fri Jun 16 2000 @suse.de - Update from CVS. -* Mon Jun 05 2000 - schwab(a)suse.de +* Mon Jun 05 2000 schwab(a)suse.de - Add initrd support. -* Wed May 31 2000 - schwab(a)suse.de +* Wed May 31 2000 schwab(a)suse.de - Fix allocation bug. -* Wed May 17 2000 - schwab(a)suse.de +* Wed May 17 2000 schwab(a)suse.de - Add eli.cfg and startup.nsh to package. -* Mon May 15 2000 - schwab(a)suse.de +* Mon May 15 2000 schwab(a)suse.de - Fix bug in AML parser. - Udate to gnu-efi 0.8. -* Tue Mar 07 2000 - schwab(a)suse.de +* Tue Mar 07 2000 schwab(a)suse.de - Package created. ++++++ rpmlintrc ++++++ --- arch/i386/gnu-efi/rpmlintrc 2007-05-27 00:55:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnu-efi/rpmlintrc 2008-07-31 01:02:17.691009000 +0200 @@ -1 +1,3 @@ addFilter(".*devel-file-in-non-devel-package.*") +addFilter(".*static-library-without-debuginfo.*") +addFilter(".*source-or-patch-not-bzipped.*") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-update
by root＠Hilbert.suse.de 31 Jul '08

31 Jul '08

Hello community, here is the log from the commit of package yast2-update checked in at Thu Jul 31 21:24:20 CEST 2008. -------- --- yast2-update/yast2-update.changes 2008-07-24 12:54:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2008-07-30 07:24:28.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 30 07:19:56 CEST 2008 - coolo(a)suse.de + +- fix file list of package + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.P21127/_old 2008-07-31 21:24:03.000000000 +0200 +++ /var/tmp/diff_new_pack.P21127/_new 2008-07-31 21:24:03.000000000 +0200 @@ -13,7 +13,7 @@ Name: yast2-update Version: 2.17.0 -Release: 1 +Release: 5 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -116,10 +116,14 @@ %files FACTORY %defattr(-,root,root) %{prefix}/share/applications/YaST2/update.desktop +%dir /usr/share/YaST2/control /usr/share/YaST2/control/update.xml /usr/share/YaST2/clients/update.ycp /usr/share/YaST2/clients/run_update.ycp + %changelog +* Wed Jul 30 2008 coolo(a)suse.de +- fix file list of package * Thu Jul 24 2008 locilka(a)suse.cz - Making possible to upgrade running system using YaST Update even if it changes a release (the original/current installation ++++++ yast2-update-2.17.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.0/configure.in new/yast2-update-2.17.0/configure.in --- old/yast2-update-2.17.0/configure.in 2008-07-24 12:56:50.000000000 +0200 +++ new/yast2-update-2.17.0/configure.in 2008-07-30 07:24:39.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-update dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-update, 2.17.0, http://bugs.opensuse.org/, yast2-update) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.0/kernel-update-tool.pot new/yast2-update-2.17.0/kernel-update-tool.pot --- old/yast2-update-2.17.0/kernel-update-tool.pot 2008-04-29 13:09:07.000000000 +0200 +++ new/yast2-update-2.17.0/kernel-update-tool.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-29 13:09+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/clients/kernel-update.ycp:189 -msgid "Warning" -msgstr "" - -#: src/clients/kernel-update.ycp:190 -msgid "Abort the kernel upgrade?" -msgstr "" - -#: src/clients/kernel-update.ycp:247 -msgid "Alternate Download Location" -msgstr "" - -#: src/clients/kernel-update.ycp:510 -msgid "Kernel Update Status Log" -msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.17.0/update.pot new/yast2-update-2.17.0/update.pot --- old/yast2-update-2.17.0/update.pot 2008-04-29 13:09:07.000000000 +0200 +++ new/yast2-update-2.17.0/update.pot 1970-01-01 01:00:00.000000000 +0100 @@ -1,715 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-04-29 13:09+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL(a)li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:46 -msgid "Create Backup of Modified Files" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:51 -msgid "Create Backup of /etc/sysconfig Directory" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:56 -msgid "Do Not Create Backups" -msgstr "" - -#. Proposal for backup during update -#: src/clients/backup_proposal.ycp:61 -msgid "Remove Backups from Previous Updates" -msgstr "" - -#. this is a heading -#: src/clients/backup_proposal.ycp:92 -msgid "Backup" -msgstr "" - -#. this is a menu entry -#: src/clients/backup_proposal.ycp:94 -msgid "&Backup" -msgstr "" - -#. error popup, user did not enter a valid directory specification -#: src/clients/inst_backup.ycp:40 -msgid "Invalid backup path." -msgstr "" - -#. there is not enough space for the backup during update -#. inform the user about this (MB==megabytes) -#: src/clients/inst_backup.ycp:80 -#, ycp-format -msgid "Minimum disk space of %1 MB required." -msgstr "" - -#. screen title for software selection -#: src/clients/inst_backup.ycp:92 -msgid "Backup System Before Update" -msgstr "" - -#. checkbox label if user wants to backup modified files -#: src/clients/inst_backup.ycp:102 -msgid "Create &Backup of Modified Files" -msgstr "" - -#. checkbox label if user wants to backup /etc/sysconfig -#: src/clients/inst_backup.ycp:105 -msgid "Create a &Complete Backup of /etc/sysconfig" -msgstr "" - -#. checkbox label if user wants remove old backup stuff -#: src/clients/inst_backup.ycp:109 -msgid "Remove &Old Backups from the Backup Directory" -msgstr "" - -#. help text for backup dialog during update 1/7 -#: src/clients/inst_backup.ycp:114 -msgid "" -"To avoid any loss of information during update,\n" -"it is possible to create a backup prior to updating.\n" -msgstr "" - -#. help text for backup dialog during update 2/7 -#: src/clients/inst_backup.ycp:119 -msgid "" -"Warning: This will not be a complete\n" -"backup. Only modified files will be saved.\n" -msgstr "" - -#. help text for backup dialog during update 3/7 -#: src/clients/inst_backup.ycp:124 -msgid "Select the desired options.\n" -msgstr "" - -#. help text for backup dialog during update 4/7 -#: src/clients/inst_backup.ycp:128 -msgid "" -"Create a Backup of Modified Files:\n" -"Stores those modified files that are replaced during update.\n" -msgstr "" - -#. help text for backup dialog during update 5/7 -#: src/clients/inst_backup.ycp:133 -msgid "" -"Create a Complete Backup of\n" -"/etc/sysconfig: This covers all configuration files that are part of the\n" -"sysconfig mechanism, even those that are not replaced.\n" -msgstr "" - -#. help text for backup dialog during update 6/7 -#: src/clients/inst_backup.ycp:139 -msgid "" -"Remove Old Backups from the Backup\n" -"Directory: If your current system already is the result of an earlier\n" -"update, there may be old configuration file backups. Select this option to\n" -"remove them.\n" -msgstr "" - -#. help text for backup dialog during update 7/7 -#: src/clients/inst_backup.ycp:146 -#, ycp-format -msgid "All backups are placed in %1." -msgstr "" - -#. screen title for update options -#. this is a heading -#: src/clients/inst_update.ycp:26 src/clients/update_proposal.ycp:609 -msgid "Update Options" -msgstr "" - -#: src/clients/inst_update.ycp:38 -msgid "Select Patterns" -msgstr "" - -#. Display warning message -#: src/clients/inst_update.ycp:65 -msgid "" -"You have already chosen software from \"Detailed selection\".\n" -"You will lose that selection if you change the basic selection." -msgstr "" - -#. Build and show dialog -#. Table item (unknown system [neither openSUSE 11.1 nor SLES 14 nor ...]) -#. Table item (unknown architecture) -#. Table item (unknown file system) -#. label - name of sustem to update -#. label for an unknown installed system -#: src/clients/inst_update.ycp:72 src/clients/inst_update.ycp:73 -#: src/include/rootpart.ycp:67 src/include/rootpart.ycp:73 -#: src/include/rootpart.ycp:90 src/modules/RootPart.ycp:123 -#: src/modules/RootPart.ycp:1428 -msgid "Unknown" -msgstr "" - -#. label showing to which version we are updating -#. TRANSLATORS: proposal summary item, %1 is a product name -#: src/clients/inst_update.ycp:78 src/clients/update_proposal.ycp:521 -#, ycp-format -msgid "Update to %1" -msgstr "" - -#. label showing from which version to which version we are updating -#: src/clients/inst_update.ycp:81 -#, ycp-format -msgid "Update from %1 to %2" -msgstr "" - -#. frame title for update selection -#: src/clients/inst_update.ycp:89 -msgid "Update Mode" -msgstr "" - -#. radio button label for update including new packages -#: src/clients/inst_update.ycp:96 -msgid "" -"&Update with Installation of New Software and Features\n" -"Based on the Selection:\n" -msgstr "" - -#. radio button label for update of already installed packages only -#: src/clients/inst_update.ycp:107 -msgid "Only U&pdate Installed Packages" -msgstr "" - -#. check box label -#. translator: add a & shortcut -#: src/clients/inst_update.ycp:117 -msgid "&Delete Unmaintained Packages" -msgstr "" - -#. help text for dialog "update options" 1/4 -#: src/clients/inst_update.ycp:125 -msgid "" -"The update option differs between two modes. In\n" -"either case, it is recommended to make a backup of your personal data.\n" -msgstr "" - -#. help text for dialog "update options" 2/4, %1 is a product name -#: src/clients/inst_update.ycp:130 -#, ycp-format -msgid "" -"With New Software: This default setting\n" -"updates the existing software and installs all new features and benefits of\n" -"the new <tt>%1</tt> version. The selection is based on the former predefined\n" -"software selection.\n" -msgstr "" - -#. help text for dialog "update options" 3/4 -#: src/clients/inst_update.ycp:137 -msgid "" -"Only Installed Packages: This selection\n" -"only updates the packages already installed on your system. Note:\n" -"New software in the predefined software selection, such as new YaST modules, is\n" -"not available after the update. You might miss advertised features.\n" -msgstr "" - -#. help text for dialog "update options" 4/4 -#: src/clients/inst_update.ycp:144 -msgid "" -"After the update, some software might not\n" -"function anymore. Activate Delete Unmaintained Packages to delete those\n" -"packages during the update.\n" -msgstr "" - -#. yes/no question -#: src/clients/inst_update.ycp:225 -msgid "" -"Do you really want\n" -"to reset your detailed selection?" -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:69 -#, ycp-format -msgid "Packages to Update: %1" -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:72 -#, ycp-format -msgid "New Packages to Install: %1" -msgstr "" - -#. proposal for packages during update, %1 is count of packages -#: src/clients/packages_proposal.ycp:75 -#, ycp-format -msgid "Packages to Remove: %1" -msgstr "" - -#. part of summary, %1 is size of packages (in MB or GB) -#: src/clients/packages_proposal.ycp:78 -#, ycp-format -msgid "Total Size of Packages to Update: %1" -msgstr "" - -#. warning text -#: src/clients/packages_proposal.ycp:86 -msgid "Cannot solve all conflicts. Manual intervention is required." -msgstr "" - -#. this is a heading -#: src/clients/packages_proposal.ycp:133 -msgid "Packages" -msgstr "" - -#. this is a menu entry -#: src/clients/packages_proposal.ycp:135 -msgid "&Packages" -msgstr "" - -#. Proposal for system to update -#: src/clients/rootpart_proposal.ycp:51 -msgid "No root partition found" -msgstr "" - -#. Proposal for system to update -#: src/clients/rootpart_proposal.ycp:86 -#, ycp-format -msgid "%1 on root partition %2" -msgstr "" - -#. inform user in the proposal about the failed mount -#. error report -#: src/clients/rootpart_proposal.ycp:95 src/include/rootpart.ycp:323 -msgid "Failed to mount target system" -msgstr "" - -#. this is a heading -#: src/clients/rootpart_proposal.ycp:139 -msgid "Selected for Update" -msgstr "" - -#. this is a menu entry -#: src/clients/rootpart_proposal.ycp:141 -msgid "&Selected for Update" -msgstr "" - -#: src/clients/run_update.ycp:36 -msgid "&Update" -msgstr "" - -#. TRANSLATORS: error message - the module does not provide command line interface -#: src/clients/update.ycp:25 -msgid "There is no user interface available for this module." -msgstr "" - -#. part of error popup message -#. error message in proposal -#: src/clients/update_proposal.ycp:113 src/clients/update_proposal.ycp:429 -msgid "Cannot read the current RPM Database." -msgstr "" - -#. part of error popup message, %1 stands for newline-separated list of files -#: src/clients/update_proposal.ycp:115 -#, ycp-format -msgid "None of these files exist:%1" -msgstr "" - -#. continue-cancel popup -#: src/clients/update_proposal.ycp:351 -msgid "" -"The installed product is not compatible with the product\n" -"on the installation media. If you try to update using the\n" -"current installation media, the system may not start or\n" -"some applications may not run properly." -msgstr "" - -#. error message in proposal -#: src/clients/update_proposal.ycp:444 -msgid "The installed product is not compatible with the product on the installation media." -msgstr "" - -#. Can't find any software data, probably a installation media error -#. error message -#: src/clients/update_proposal.ycp:455 -msgid "Cannot read package data from installation media. Media error?" -msgstr "" - -#. TRANSLATORS: unknown product (label) -#. TRANSLATORS: unknown product name -#: src/clients/update_proposal.ycp:461 src/clients/update_proposal.ycp:469 -#: src/clients/update_proposal.ycp:498 src/clients/update_proposal.ycp:500 -msgid "Unknown product" -msgstr "" - -#. TRANSLATORS: proposal error, %1 is the version of installed system -#. %2 is the version being installed -#: src/clients/update_proposal.ycp:481 -#, ycp-format -msgid "" -"Updating system to another version (%1 -> %2) is not supported on the running system. \n" -"Please, boot from the installation media and use a normal upgrade\n" -"or disable software repositories of products with different versions." -msgstr "" - -#. TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names -#: src/clients/update_proposal.ycp:496 -#, ycp-format -msgid "Warning: Updating from '%1' to '%2', products do not exactly match." -msgstr "" - -#. Proposal for removing packages which are not maintained any more -#: src/clients/update_proposal.ycp:527 -msgid "Delete unmaintained packages" -msgstr "" - -#. Proposal for backup during update -#: src/clients/update_proposal.ycp:532 -msgid "Only update installed packages" -msgstr "" - -#. proposal string -#: src/clients/update_proposal.ycp:540 -msgid "Update based on patterns" -msgstr "" - -#. Proposal for selection during update, %1 stands for selection name -#: src/clients/update_proposal.ycp:556 -#, ycp-format -msgid "Update based on selection \"%1\"" -msgstr "" - -#. TRANSLATORS: proposal dialog help -#: src/clients/update_proposal.ycp:565 -msgid "" -"<big>Update Options</big>\n" -"Here you can choose how your system is going to be updated.\n" -"Choose whether only installed packages should be updated or also new ones should be installed\n" -"(the default selection), and whether unmaintained packages should be deleted." -msgstr "" - -#. this is a menu entry -#: src/clients/update_proposal.ycp:611 -msgid "&Update Options" -msgstr "" - -#: src/config/update.glade:15 src/config/update.glade:38 -msgid "Update Settings" -msgstr "" - -#: src/config/update.glade:30 -msgid "Update" -msgstr "" - -#: src/config/update.glade:44 src/config/update.glade:48 -msgid "Perform Update" -msgstr "" - -#: src/config/update.glade:59 -msgid "Clean Up" -msgstr "" - -#: src/config/update.glade:63 -msgid "Update System Configuration" -msgstr "" - -#: src/config/update.glade:71 -msgid "Update Configuration" -msgstr "" - -#. Table item (unknown system) -#: src/include/rootpart.ycp:60 -msgid "Unknown Linux" -msgstr "" - -#. Table item (unknown system) -#: src/include/rootpart.ycp:63 -msgid "Unknown or Non-Linux" -msgstr "" - -#: src/include/rootpart.ycp:83 -#, ycp-format -msgid "%1 (%2)" -msgstr "" - -#. label for selection of root partition (for boot) -#: src/include/rootpart.ycp:138 -msgid "Partition or System to Boot:" -msgstr "" - -#. help text for root partition dialog (for boot) -#: src/include/rootpart.ycp:141 -msgid "" -"\n" -"Select the partition or system to boot.\n" -"\n" -msgstr "" - -#. label for selection of root partition (for update) -#: src/include/rootpart.ycp:149 -msgid "Partition or System to Update:" -msgstr "" - -#. help text for root partition dialog (for update) -#: src/include/rootpart.ycp:152 -msgid "" -"\n" -"Select the partition or system to update.\n" -"\n" -msgstr "" - -#. headline for dialog "Select for update" -#: src/include/rootpart.ycp:160 -msgid "Select for Update" -msgstr "" - -#. help text for root partition dialog (general part) -#: src/include/rootpart.ycp:165 -msgid "" -"\n" -"Show All Partitions expands the list to a\n" -"general overview of your system's partitions.\n" -"\n" -msgstr "" - -#. table header -#: src/include/rootpart.ycp:182 -msgid "System" -msgstr "" - -#. table header item -#: src/include/rootpart.ycp:184 -msgid "Partition" -msgstr "" - -#. table header item -#: src/include/rootpart.ycp:186 -msgid "Architecture" -msgstr "" - -#. table header item -#: src/include/rootpart.ycp:188 -msgid "File System" -msgstr "" - -#. table header item -#: src/include/rootpart.ycp:190 -msgid "Label" -msgstr "" - -#. check box -#: src/include/rootpart.ycp:197 -msgid "&Show All Partitions" -msgstr "" - -#. pushbutton to (rightaway) boot the system selected above -#: src/include/rootpart.ycp:222 -msgid "&Boot" -msgstr "" - -#. continue-cancel popup -#: src/include/rootpart.ycp:297 -msgid "" -"No installed system that can be upgraded with this product was found\n" -"on the selected partition." -msgstr "" - -#. continue-cancel popup -#: src/include/rootpart.ycp:304 -msgid "" -"The architecture of the system installed in the selected partition\n" -"is different than the one of this product." -msgstr "" - -#. * -#. * Link to SDB article concerning renaming of devices. -#. -#: src/modules/RootPart.ycp:94 -#, ycp-format -msgid "" -"See the SDB article at %1 for details\n" -"about how to solve this problem." -msgstr "" - -#. label - name of sustem to update -#: src/modules/RootPart.ycp:114 -msgid "Unknown Linux System" -msgstr "" - -#. label - name of sustem to update -#: src/modules/RootPart.ycp:119 -msgid "Non-Linux System" -msgstr "" - -#. error report, %1 is device (eg. /dev/hda1) -#: src/modules/RootPart.ycp:206 -#, ycp-format -msgid "" -"Cannot unmount partition %1.\n" -"\n" -"It is currently in use. If the partition stays mounted,\n" -"the data may be lost. Unmount the partition manually\n" -"or restart your computer.\n" -msgstr "" - -#. label, %1 is partition -#: src/modules/RootPart.ycp:271 -#, ycp-format -msgid "Checking partition %1" -msgstr "" - -#: src/modules/RootPart.ycp:311 -msgid "Show &Details" -msgstr "" - -#: src/modules/RootPart.ycp:398 -#, ycp-format -msgid "Checking file system on %1..." -msgstr "" - -#. popup headline -#: src/modules/RootPart.ycp:422 -msgid "File System Check Failed" -msgstr "" - -#. popup question (continue/cancel dialog) -#. %1 is a device name such as /dev/hda5 -#: src/modules/RootPart.ycp:426 -#, ycp-format -msgid "" -"The file system check of device %1 has failed.\n" -"\n" -"Would you like to continue in the mounting the device?" -msgstr "" - -#. button -#: src/modules/RootPart.ycp:432 -msgid "&Skip Mounting" -msgstr "" - -#. yes-no popup -#: src/modules/RootPart.ycp:835 -msgid "Incorrect password. Try again?" -msgstr "" - -#. TRANSLATORS: a popup headline -#: src/modules/RootPart.ycp:922 -msgid "Warning" -msgstr "" - -#: src/modules/RootPart.ycp:927 -#, ycp-format -msgid "" -"Your /boot partition is too small (%1 MB).\n" -"We recommend a size not less than %2 MB. It might happen, that the\n" -"new Kernel does not fit, so it would be safer to either enlarge that partition\n" -"or not to use the /boot partition at all.\n" -"\n" -"Would you like to continue updating the current system?" -msgstr "" - -#. label in a popup, %1 is device (eg. /dev/hda1), %2 is output of the 'mount' command -#: src/modules/RootPart.ycp:999 -#, ycp-format -msgid "" -"The partition %1 could not be mounted.\n" -"\n" -"%2\n" -"\n" -"If you are sure that the partition is not necessary for the\n" -"update (it is not any system partition), click Continue.\n" -"To check or fix the mount options, click Specify Mount Options.\n" -"To abort update, click Cancel." -msgstr "" - -#. push button -#: src/modules/RootPart.ycp:1013 -msgid "&Specify Mount Options" -msgstr "" - -#. popup heading -#: src/modules/RootPart.ycp:1032 -msgid "Mount Options" -msgstr "" - -#. text entry label -#: src/modules/RootPart.ycp:1035 -msgid "&Mount Point" -msgstr "" - -#. tex entry label -#: src/modules/RootPart.ycp:1038 -msgid "&Device" -msgstr "" - -#. text entry label -#: src/modules/RootPart.ycp:1041 -msgid "" -"&File System\n" -"(empty for autodetection)" -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:1119 -#, ycp-format -msgid "The /var partition %1 could not be mounted.\n" -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:1170 -msgid "Unable to mount /var partition with this disk configuration.\n" -msgstr "" - -#. popup message, %1 will be replace with the name of the logfile -#: src/modules/RootPart.ycp:1195 -#, ycp-format -msgid "" -"Partitions could not be mounted.\n" -"\n" -"Check the log file %1." -msgstr "" - -#. error message -#: src/modules/RootPart.ycp:1225 -msgid "No fstab found." -msgstr "" - -#. message part 1 -#: src/modules/RootPart.ycp:1245 -msgid "The root partition in /etc/fstab has an invalid root device.\n" -msgstr "" - -#. message part 2 -#: src/modules/RootPart.ycp:1247 -#, ycp-format -msgid "It is currently mounted as %1 but listed as %2.\n" -msgstr "" - -#. intermediate popup while mounting partitions -#: src/modules/RootPart.ycp:1539 -msgid "Mounting partitions. One moment please..." -msgstr "" - -#: src/modules/RootPart.ycp:1553 -msgid "xxx" -msgstr "" - -#: src/modules/RootPart.ycp:1554 -msgid "Evaluating root partition. One moment please..." -msgstr "" - -#. TRANSLATORS: "Update to: $product_name" -#: src/modules/Update.ycp:277 -msgid "Unknown Product" -msgstr "" - -#. TRANSLATORS: check-box, it might happen that we need to downgrade some packages during update -#: src/modules/Update.ycp:687 -msgid "Allow Package Downgrade" -msgstr "" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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