December 2008 - openSUSE Commits - openSUSE Mailing Lists

commit sysconfig for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at Fri Dec 19 15:18:53 CET 2008. -------- --- sysconfig/sysconfig.changes 2008-12-11 18:20:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2008-12-19 13:55:18.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 19 13:51:41 CET 2008 - mt(a)suse.de + +- Fixed ifup-dhcp status to match BOOTPROTO settings (bnc#460093). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- sysconfig-ifup-dhcp-status-codes.bnc460093.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.DM7759/_old 2008-12-19 15:15:44.000000000 +0100 +++ /var/tmp/diff_new_pack.DM7759/_new 2008-12-19 15:15:44.000000000 +0100 @@ -20,7 +20,7 @@ Name: sysconfig Version: 0.71.12 -Release: 1 +Release: 2 Summary: The sysconfig scheme Group: System/Base License: GPL v2 or later @@ -30,6 +30,7 @@ BuildRequires: sysfsutils BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %name-%version.tar.bz2 +Patch0: sysconfig-ifup-dhcp-status-codes.bnc460093.diff %description This package provides the SuSE system configuration scheme. @@ -50,6 +51,7 @@ %prep %setup -n sysconfig-%{version} +%patch0 -p0 %build autoreconf --force --install @@ -249,6 +251,8 @@ %{stop_on_removal network} %changelog +* Fri Dec 19 2008 mt(a)suse.de +- Fixed ifup-dhcp status to match BOOTPROTO settings (bnc#460093). * Thu Dec 11 2008 mt(a)suse.de - version 0.71.12 - Fixed ifup-dhcp to disable dhcp6 client when ipv6 support is ++++++ sysconfig-ifup-dhcp-status-codes.bnc460093.diff ++++++ Index: scripts/ifup-dhcp =================================================================== --- scripts/ifup-dhcp (Revision 1815) +++ scripts/ifup-dhcp (Arbeitskopie) @@ -744,21 +744,42 @@ message "`printf " %-9s DHCP6 continues in background" $INTERFACE`" fi fi - debug "DHCP4: STARTED=$DHCP4_STARTED STATUS=$DHCP4_STATUS" - debug "DHCP6: STARTED=$DHCP6_STARTED STATUS=$DHCP6_STATUS" + debug "DHCP4(required=$explicit_dhcp4) STARTED=$DHCP4_STARTED STATUS=$DHCP4_STATUS" + debug "DHCP6(required=$explicit_dhcp6) STARTED=$DHCP6_STARTED STATUS=$DHCP6_STATUS" + [ -z "$DHCP4_STATUS" ] && DHCP4_STATUS=$R_ERROR + [ -z "$DHCP6_STATUS" ] && DHCP6_STATUS=$R_ERROR - if [ "$DHCP4_STATUS" = $R_SUCCESS -a $DHCP6_STATUS = $R_SUCCESS ] ; then - exit $R_SUCCESS - elif [ "$DHCP4_STATUS" = $R_NOTRUNNING -o $DHCP6_STATUS = $R_NOTRUNNING ] ; then - exit $R_NOTRUNNING - elif [ "$DHCP4_STATUS" = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then - exit $R_DHCP_BG - elif [ "$DHCP4_STATUS" != $R_NOTCONFIGURED ] ; then + case "${explicit_dhcp4}_${explicit_dhcp6}" in + (yes_yes) # BOOTPROTO=dhcp4+dhcp6 (need both to report success) + if [ $DHCP4_STATUS = $R_SUCCESS -a $DHCP6_STATUS = $R_SUCCESS ] ; then + exit $R_SUCCESS + elif [ $DHCP4_STATUS = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then + exit $R_DHCP_BG + elif [ $DHCP4_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP4_STATUS + elif [ $DHCP6_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP6_STATUS + fi + ;; + (no_no) # BOOTPROTO=dhcp (one is sufficient) + if [ $DHCP4_STATUS = $R_SUCCESS -o $DHCP6_STATUS = $R_SUCCESS ] ; then + exit $R_SUCCESS + elif [ $DHCP4_STATUS = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then + exit $R_DHCP_BG + elif [ $DHCP4_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP4_STATUS + elif [ $DHCP6_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP6_STATUS + fi + ;; + (yes_no) # BOOTPROTO=dhcp4 exit $DHCP4_STATUS - elif [ "$DHCP6_STATUS" != $R_NOTCONFIGURED ] ; then + ;; + (no_yes) # BOOTPROTO=dhcp6 exit $DHCP6_STATUS - fi - exit 0 + ;; + esac + exit $R_ERROR ;; stop) @@ -1040,17 +1061,40 @@ ;; esac done - if [ "$DHCP4_STATUS" = $R_SUCCESS -a $DHCP6_STATUS = $R_SUCCESS ] ; then - exit $R_SUCCESS - elif [ "$DHCP4_STATUS" = $R_NOTRUNNING -o $DHCP6_STATUS = $R_NOTRUNNING ] ; then - exit $R_NOTRUNNING - elif [ "$DHCP4_STATUS" = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then - exit $R_DHCP_BG - elif [ "$DHCP4_STATUS" != $R_NOTCONFIGURED ] ; then + + debug "DHCP4(required=$explicit_dhcp4) STATUS=$DHCP4_STATUS" + debug "DHCP6(required=$explicit_dhcp6) STATUS=$DHCP6_STATUS" + + case "${explicit_dhcp4}_${explicit_dhcp6}" in + (yes_yes) # BOOTPROTO=dhcp4+dhcp6 (need both to report success) + if [ $DHCP4_STATUS = $R_SUCCESS -a $DHCP6_STATUS = $R_SUCCESS ] ; then + exit $R_SUCCESS + elif [ $DHCP4_STATUS = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then + exit $R_DHCP_BG + elif [ $DHCP4_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP4_STATUS + elif [ $DHCP6_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP6_STATUS + fi + ;; + (no_no) # BOOTPROTO=dhcp (one is sufficient) + if [ $DHCP4_STATUS = $R_SUCCESS -o $DHCP6_STATUS = $R_SUCCESS ] ; then + exit $R_SUCCESS + elif [ $DHCP4_STATUS = $R_DHCP_BG -o $DHCP6_STATUS = $R_DHCP_BG ] ; then + exit $R_DHCP_BG + elif [ $DHCP4_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP4_STATUS + elif [ $DHCP6_STATUS != $R_NOTCONFIGURED ] ; then + exit $DHCP6_STATUS + fi + ;; + (yes_no) # BOOTPROTO=dhcp4 exit $DHCP4_STATUS - elif [ "$DHCP6_STATUS" != $R_NOTCONFIGURED ] ; then + ;; + (no_yes) # BOOTPROTO=dhcp6 exit $DHCP6_STATUS - fi - exit $R_NOTCONFIGURED + ;; + esac + exit $R_ERROR ;; esac ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 systemtap for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at Fri Dec 19 15:18:42 CET 2008. -------- --- systemtap/systemtap.changes 2008-12-16 13:51:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/systemtap/systemtap.changes 2008-12-18 17:00:03.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Dec 18 16:59:23 CET 2008 - tiwai(a)suse.de + +- Fix stap failures with signal tapsets (bnc#459387) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- systemtap-use-send_signal.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.dK8802/_old 2008-12-19 15:16:00.000000000 +0100 +++ /var/tmp/diff_new_pack.dK8802/_new 2008-12-19 15:16:00.000000000 +0100 @@ -25,7 +25,7 @@ %define package_version 20080906 License: GPL v2 or later Version: 0.7.1 -Release: 28 +Release: 29 Summary: Instrumentation System Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ @@ -40,6 +40,7 @@ Patch6: systemtap-netcat-fix1.diff Patch7: systemtap-netcat-fix2.diff Patch8: systemtap-2.6.28-fixes.diff +Patch9: systemtap-use-send_signal.diff Requires: libebl1 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +69,7 @@ %patch6 -p1 %patch7 -p1 %patch8 +%patch9 -p1 %build autoreconf -fi @@ -96,6 +98,8 @@ %dir %attr(0755,root,root) /var/cache/systemtap %changelog +* Thu Dec 18 2008 tiwai(a)suse.de +- Fix stap failures with signal tapsets (bnc#459387) * Tue Dec 16 2008 tiwai(a)suse.de - Fix dependency on libebl1 (bnc#448331, #445783) - Fix stap for 2.6.28 kernels ++++++ systemtap-use-send_signal.diff ++++++ From: Srikar Dronamraju <srikar(a)linux.vnet.ibm.com> Date: Mon, 24 Nov 2008 07:50:49 +0000 (+0530) Subject: Fix for 7030: use send_signal instead of generic_send_sig_info and specific_send_sig_info X-Git-Url: http://sources.redhat.com/git/gitweb.cgi?p=systemtap.git;a=commitdiff_plain… Fix for 7030: use send_signal instead of generic_send_sig_info and specific_send_sig_info (Prasad's Patch for fixing signal tapset) --- diff --git a/tapset/signal.stp b/tapset/signal.stp index 66de767..7f932e7 100644 --- a/tapset/signal.stp +++ b/tapset/signal.stp @@ -49,6 +49,7 @@ probe signal.send = _signal.send.* si_code="SI_USER or SI_TIMER or SI_ASYNCIO" } +%( kernel_v <= "2.6.25" %? probe _signal.send.part1 = kernel.function("__group_send_sig_info") { name = "__group_send_sig_info" @@ -59,7 +60,6 @@ probe _signal.send.part1 = kernel.function("__group_send_sig_info") send2queue = 0 } -%( kernel_v <= "2.6.25" %? probe _signal.send.part2 = kernel.function("send_group_sigqueue") { name = "send_group_sigqueue" @@ -69,6 +69,38 @@ probe _signal.send.part2 = kernel.function("send_group_sigqueue") shared = 1 send2queue = 1 } + +probe _signal.send.part4 = kernel.function("specific_send_sig_info") +{ + name = "specific_send_sig_info" + sig = $sig + task = $t + sinfo = $info + shared = 0 + send2queue = 0 +} +%) + +%( kernel_v > "2.6.25" %? +probe _signal.send.part1 = kernel.function("send_signal") +{ + name = "__group_send_sig_info" + sig = $sig + task = $t + sinfo = $info + shared = 1 + send2queue = 0 +} + +probe _signal.send.part4 = kernel.function("send_signal") +{ + name = "specific_send_sig_info" + sig = $sig + task = $t + sinfo = $info + shared = 0 + send2queue = 0 +} %) probe _signal.send.part3 = kernel.function("send_sigqueue") @@ -86,16 +118,6 @@ probe _signal.send.part3 = kernel.function("send_sigqueue") send2queue = 1 } -probe _signal.send.part4 = kernel.function("specific_send_sig_info") -{ - name = "specific_send_sig_info" - sig = $sig - task = $t - sinfo = $info - shared = 0 - send2queue = 0 -} - /* probe signal.send.return */ probe signal.send.return = _signal.send.*.return ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 subversion for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at Fri Dec 19 15:15:51 CET 2008. -------- --- subversion/subversion.changes 2008-12-16 13:48:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/subversion/subversion.changes 2008-12-19 14:37:51.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Dec 19 14:36:32 CET 2008 - olh(a)suse.de + +- default java version changed without notice, use java-openjdk + first if available (bnc#457493) +- configure option --enable-swig-bindings changed to --with-swig + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.db6860/_old 2008-12-19 15:15:25.000000000 +0100 +++ /var/tmp/diff_new_pack.db6860/_new 2008-12-19 15:15:25.000000000 +0100 @@ -30,7 +30,7 @@ %endif BuildRequires: sqlite-devel Version: 1.5.2 -Release: 12 +Release: 13 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -179,6 +179,7 @@ %build with_jdk=none for i in \ +/usr/%{_lib}/jvm/java-openjdk \ /usr/%{_lib}/jvm/java-1.4.2-gcj \ /usr/%{_lib}/BEAJava2-1.4.2 \ /usr/%{_lib}/SunJava2-1.4.2 \ @@ -261,7 +262,7 @@ --with-zlib=%{_prefix} \ $with_jdk \ --with-jikes=no \ - --enable-swig-bindings \ + --with-swig \ --disable-mod-activation \ --disable-static %if 0%{?suse_version} == 910 @@ -440,6 +441,10 @@ %{apache_libexecdir}/mod_authz_svn.* %changelog +* Fri Dec 19 2008 olh(a)suse.de +- default java version changed without notice, use java-openjdk + first if available (bnc#457493) +- configure option --enable-swig-bindings changed to --with-swig * Tue Dec 16 2008 olh(a)suse.de - add .hg dir to excludepath in svngrep * Mon Nov 10 2008 olh(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 sax2 for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package sax2 for openSUSE:Factory checked in at Fri Dec 19 15:14:35 CET 2008. -------- --- sax2/sax2.changes 2008-12-08 16:56:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-12-19 14:18:54.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Dec 19 14:18:30 CET 2008 - sndirsch(a)suse.de + +- xapi.gtx: added missig XKB keys (bnc #450851) + +------------------------------------------------------------------- +Fri Dec 19 13:26:27 CET 2008 - sndirsch(a)suse.de + +- xapi.gtx: double quotes needs to be quoted, otherwise string in + .pot file is truncated (bnc #447492) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- sax2-s390.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.oG1558/_old 2008-12-19 15:13:59.000000000 +0100 +++ /var/tmp/diff_new_pack.oG1558/_new 2008-12-19 15:13:59.000000000 +0100 @@ -50,13 +50,12 @@ PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 545 +Release: 546 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 Source1: sax2.desktop Source2: sax2-rpmlintrc -Patch: sax2-s390.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -232,7 +231,6 @@ %prep %setup -n sax -%patch %build test -e /.buildenv && . /.buildenv @@ -532,6 +530,11 @@ %endif %changelog +* Fri Dec 19 2008 sndirsch(a)suse.de +- xapi.gtx: added missig XKB keys (bnc #450851) +* Fri Dec 19 2008 sndirsch(a)suse.de +- xapi.gtx: double quotes needs to be quoted, otherwise string in + .pot file is truncated (bnc #447492) * Mon Dec 08 2008 mhopf(a)suse.de - fix build on s390, sax2-tools only. * Thu Dec 04 2008 ms(a)suse.de ++++++ sax2.tar.bz2 ++++++ ++++ 6052 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 python for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at Fri Dec 19 15:13:47 CET 2008. -------- --- python/python-base.changes 2008-10-20 17:16:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python-base.changes 2008-12-15 18:56:28.796492000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 15 17:10:17 CET 2008 - matejcik(a)suse.cz + +- removed bsddb directory from python-base, reenabled in python + +------------------------------------------------------------------- --- python/python.changes 2008-10-13 14:30:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/python/python.changes 2008-12-15 17:14:07.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 15 17:10:17 CET 2008 - matejcik(a)suse.cz + +- reenabled bsddb module, so that dependent packages can build + ( bnc#441088 ) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.d31299/_old 2008-12-19 15:13:15.000000000 +0100 +++ /var/tmp/diff_new_pack.d31299/_new 2008-12-19 15:13:15.000000000 +0100 @@ -28,7 +28,7 @@ AutoReqProv: on Summary: Python Interpreter base package Version: 2.6.0 -Release: 2 +Release: 3 #%define tarname Python-%{version} %define tarname Python-2.6 Source0: %{tarname}.tar.bz2 @@ -221,7 +221,7 @@ #rm -r $RPM_BUILD_ROOT%{_includedir}/python #rm -r $RPM_BUILD_ROOT%{_includedir}/python%{python_version} #rm $RPM_BUILD_ROOT%{_libdir}/libpython%{python_version}.so -rm -r $CLEANUP_DIR/{curses,idlelib,lib-tk,sqlite3} +rm -r $CLEANUP_DIR/{curses,bsddb,idlelib,lib-tk,sqlite3} rm $CLEANUP_DIR/ssl.py* # does not work without _ssl.so anyway %if %suse_version >= 1030 @@ -290,7 +290,6 @@ %{_libdir}/python%{python_version}/config/Setup %{_libdir}/python%{python_version}/config/Makefile %{_libdir}/python%{python_version}/*.* -%{_libdir}/python%{python_version}/bsddb %{_libdir}/python%{python_version}/compiler %{_libdir}/python%{python_version}/ctypes %{_libdir}/python%{python_version}/distutils @@ -377,6 +376,8 @@ %{_bindir}/python2 %changelog +* Mon Dec 15 2008 matejcik(a)suse.cz +- removed bsddb directory from python-base, reenabled in python * Mon Oct 20 2008 matejcik(a)suse.cz - added libpython and python-base to baselibs.conf (bnc#432677) - disabled test_smtplib for ia64 so that the package actually @@ -395,7 +396,7 @@ - update to 2.6rc2 - included patch for https proxy support that resolves bnc#214983 (in a proper way) and bnc#298378 -* Thu Sep 18 2008 matejcik(a)suse.cz +* Wed Sep 17 2008 matejcik(a)suse.cz - included /etc/rpm/macros.python to fix the split-caused breakage * Tue Sep 16 2008 matejcik(a)suse.cz - applied bug-no-proxy patch from python#3879, which should improve ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.d31299/_old 2008-12-19 15:13:15.000000000 +0100 +++ /var/tmp/diff_new_pack.d31299/_new 2008-12-19 15:13:15.000000000 +0100 @@ -24,7 +24,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.6 -Release: 2 +Release: 3 %define pyver 2.6 BuildArch: noarch %define tarname Python-%{pyver} ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.d31299/_old 2008-12-19 15:13:15.000000000 +0100 +++ /var/tmp/diff_new_pack.d31299/_new 2008-12-19 15:13:15.000000000 +0100 @@ -30,7 +30,7 @@ Obsoletes: python-nothreads python21 python-elementtree python-sqlite Summary: Python Interpreter Version: 2.6.0 -Release: 2 +Release: 3 Requires: python-base = %{version} #%define tarname Python-%{version} %define tarname Python-2.6 @@ -263,7 +263,6 @@ rm $RPM_BUILD_ROOT%{_bindir}/python-config rm -r $RPM_BUILD_ROOT%{_includedir}/python rm -r $RPM_BUILD_ROOT%{_includedir}/python%{python_version} -rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/bsddb rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/compiler rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/config rm -r $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/ctypes @@ -283,7 +282,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/site-packages/README rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bisect.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bytesio.so -rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_bsddb.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_csv.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_collections.so rm $RPM_BUILD_ROOT%{_libdir}/python%{python_version}/lib-dynload/_ctypes.so @@ -428,14 +426,19 @@ %config /etc/profile.d/python.* %dir %{_libdir}/python%{python_version} %{_libdir}/python%{python_version}/ssl.py* +%{_libdir}/python%{python_version}/bsddb %{_libdir}/python%{python_version}/sqlite3 %dir %{_libdir}/python%{python_version}/lib-dynload +%{_libdir}/python%{python_version}/lib-dynload/_bsddb.so %{_libdir}/python%{python_version}/lib-dynload/_hashlib.so %{_libdir}/python%{python_version}/lib-dynload/_sqlite3.so %{_libdir}/python%{python_version}/lib-dynload/_ssl.so %{_libdir}/python%{python_version}/lib-dynload/readline.so %changelog +* Mon Dec 15 2008 matejcik(a)suse.cz +- reenabled bsddb module, so that dependent packages can build + ( bnc#441088 ) * Thu Oct 09 2008 matejcik(a)suse.cz - update to 2.6 (version name is 2.6.0 to prevent upgrade problems) - don't run the whole test suite, only run tests for @@ -739,7 +742,7 @@ was executed with -i parameter. * Tue Jul 29 2003 ro(a)suse.de - added tk-devel to neededforbuild -* Fri Jun 27 2003 mcihar(a)suse.cz +* Thu Jun 26 2003 mcihar(a)suse.cz - updated to cvs snapshot, mostly because of finally correct DESTDIR support, to avoid buildroot leftovers * Tue Jun 24 2003 mcihar(a)suse.cz @@ -845,7 +848,7 @@ - Add provides for correct update * Thu Sep 05 2002 ro(a)suse.de - remove l2h from neededforbuild (apparently no longer used) -* Thu Aug 15 2002 ro(a)suse.de +* Wed Aug 14 2002 ro(a)suse.de - no fpectl.so on alpha * Tue Aug 13 2002 uli(a)suse.de - rediffed lib64 patch @@ -857,7 +860,7 @@ - clean part added to spec * Sun Jul 28 2002 kukuk(a)suse.de - removed termcap and tetex from neededforbuild (not used) -* Sat Jul 27 2002 adrian(a)suse.de +* Fri Jul 26 2002 adrian(a)suse.de - fix neededforbuild * Tue Jun 11 2002 meissner(a)suse.de - add ppc64 to list of 64bit archs that don't compile 3 of the plugins. @@ -876,7 +879,7 @@ have to reside in */lib64 * Wed May 15 2002 coolo(a)suse.de - fixing file list for s390x -* Wed May 15 2002 ro(a)suse.de +* Tue May 14 2002 ro(a)suse.de - use libdir - try to get this working with lib64 * Mon May 06 2002 schwab(a)suse.de @@ -961,7 +964,7 @@ - Use libtk8.3.so and libtcl8.3.so * Thu May 04 2000 kukuk(a)suse.de - Fix filelist for new doc dir -* Tue Mar 14 2000 ro(a)suse.de +* Mon Mar 13 2000 ro(a)suse.de - fixed filelist for alpha * Wed Mar 01 2000 werner(a)suse.de - Fix config.guess selection @@ -993,10 +996,10 @@ to have better base-package compatibility to andrich.net. * Thu Mar 18 1999 ro(a)suse.de - don't set POSIXLY_CORRECT for second patch -* Tue Jan 19 1999 ro(a)suse.de +* Mon Jan 18 1999 ro(a)suse.de - added automake to neededforbuild - alpha-fix: don't mix up dec-osf with linux-alpha -* Wed Dec 02 1998 mt(a)suse.de +* Tue Dec 01 1998 mt(a)suse.de - removed TkInter into a separate package - pyth_tk - to make it possible to replace it with a PIL based TkInter (Python Imaging Lib) and better package dependecies (not each app needs TkInter) @@ -1019,7 +1022,7 @@ - python modules - file permissions changed (-x) * Sat Jul 11 1998 bs(a)suse.de - fixed neededforbuild -* Thu Jul 09 1998 mt(a)suse.de +* Wed Jul 08 1998 mt(a)suse.de - new revision 1.5.1 - docu in a separate package (pyth_doc) - Tkinter uses tk8.0/tcl8.0 now ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mozilla-xulrunner181 for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package mozilla-xulrunner181 for openSUSE:Factory checked in at Fri Dec 19 15:13:00 CET 2008. -------- --- mozilla-xulrunner181/mozilla-xulrunner181.changes 2008-11-06 10:20:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner181/mozilla-xulrunner181.changes 2008-12-18 16:04:41.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Dec 18 10:04:33 EST 2008 - hfiguiere(a)suse.de + +- Review and approve changes. + +------------------------------------------------------------------- +Mon Dec 15 16:05:23 CET 2008 - wr(a)rosenauer.org + +- Security update to version 1.8.1.19 (bnc#455804, bnc#457913) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- l10n-1.8.1.17.tar.bz2 mozilla-shared-nss-db.patch xulrunner-source-1.8.1.17.tar.bz2 New: ---- l10n-1.8.1.19.tar.bz2 mozilla-xulrunner181-rpmlintrc xulrunner-source-1.8.1.19.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner181.spec ++++++ --- /var/tmp/diff_new_pack.i28258/_old 2008-12-19 15:12:40.000000000 +0100 +++ /var/tmp/diff_new_pack.i28258/_new 2008-12-19 15:12:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner181 (Version 1.8.1.17) +# spec file for package mozilla-xulrunner181 (Version 1.8.1.19) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: mozilla-xulrunner181 -BuildRequires: gcc-c++ java2-devel-packages libgnomeui-devel libidl-devel mozilla-nss-devel nss-shared-helper-devel update-desktop-files zip +BuildRequires: gcc-c++ java-devel libgnomeui-devel libidl-devel update-desktop-files zip %if %suse_version > 1020 BuildRequires: fdupes %endif License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Version: 1.8.1.17 -Release: 2 +Version: 1.8.1.19 +Release: 1 Summary: Mozilla Runtime Environment 1.8.1.x Url: http://www.mozilla.org/ Group: Productivity/Other @@ -36,16 +36,23 @@ Obsoletes: mozilla-xulrunner180 %endif %if %suse_version == 1020 +%define ga_version 1.8.1b2 Provides: mozilla-xulrunner181 = 1.8.0.99 %endif %if %suse_version == 1030 -Provides: mozilla-xulrunner181 = 1.8.1.4 +%define ga_version 1.8.1.4 +%endif +%if %suse_version == 1100 +%define ga_version 1.8.1.13 +%endif +%if %suse_version >= 1030 && 0%{?ga_version:1} +Provides: mozilla-xulrunner181 = %{ga_version} %endif Source: xulrunner-source-%{version}.tar.bz2 Source1: l10n-%{version}.tar.bz2 +Source2: %{name}-rpmlintrc Patch1: abuild.patch Patch2: nss-opt.patch -### Patch3: visibility.patch Patch3: mozilla-gcc4.3-fixes.patch Patch4: idldir.patch Patch5: mozilla-path_len.patch @@ -54,41 +61,27 @@ Patch8: nsIPermission.patch Patch9: rpath.patch Patch10: system-proxies.patch -Patch11: mozilla-shared-nss-db.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: libstdc++ expat pango xorg-x11-libs fontconfig freetype2 -PreReq: gtk2 atk glib2 update-alternatives +PreReq: gtk2 atk glib2 update-alternatives coreutils ### build configuration ### -%define has_system_cairo 0 -%define has_system_nspr 0 -%define has_system_nss 0 -%define pango 0 -%if %suse_version > 930 || %is_plus %define has_system_cairo 1 %define has_system_nspr 1 -%endif -%if %is_plus || %suse_version >= 930 +%define has_system_nss 0 %define pango 1 -%endif -%if %suse_version > 1010 || %is_plus +%if %suse_version > 1010 || 0%{?opensuse_bs} # NSS version on 10.1 is too old %define has_system_nss 1 %endif -%define releasedate 2008092200 +%define releasedate 2008121300 %define apiversion 1.8.1 -%define uaweight 181170 -%if %suse_version == 1020 -%define ga_version 1.8.1b2 -%endif -%if %suse_version == 1030 -%define ga_version 1.8.1.4 -%endif +%define uaweight 181190 ### configuration end ### %define my_provides %{_tmppath}/my-provides %define my_requires %{_tmppath}/my-requires %if %has_system_nspr BuildRequires: mozilla-nspr-devel -PreReq: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) +PreReq: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`) %endif %if %has_system_nss BuildRequires: mozilla-nss-devel @@ -112,17 +105,14 @@ Group: Development/Libraries/Other %if %suse_version > 1010 Obsoletes: gecko-sdk -Provides: gecko-sdk # For upgrade from 10.2 betas: Obsoletes: mozilla-xulrunner180-devel -Provides: mozilla-xulrunner180-devel %endif %if %has_system_nspr -Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) +Requires: mozilla-nspr-devel >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel`) %endif %if %has_system_nss -PreReq: mozilla-nss-devel -Requires: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel) +Requires: mozilla-nss-devel >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss-devel`) %endif PreReq: %{name} = %{version} @@ -171,15 +161,16 @@ %patch8 %patch9 %patch10 -%patch11 -p1 %build +%ifarch %x86 +%if %suse_version <= 1010 +export JAVA_HOME=/usr/lib/jvm/java-1.4.2-sun +%endif +%endif export MOZ_BUILD_DATE=%{releasedate} export LD_LIBRARY_PATH=$RPM_BUILD_DIR/mozilla/dist/bin -export CFLAGS="$RPM_OPT_FLAGS -g -Os -fno-strict-aliasing" -%if %suse_version > 1000 -export CFLAGS="$CFLAGS -fstack-protector" -%endif +export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" %ifarch ppc64 export CFLAGS="$CFLAGS -mminimal-toc" %endif @@ -265,6 +256,11 @@ %endif # XPI example cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version}/ +# remove some executable permissions +find $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version} \ + -type f -perm -111 -exec chmod a-x {} \; +find $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version}/ \ + -name "*.js" -o -name "*.xpm" | xargs chmod a-x # ghosts touch $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version}/global.reginfo # install additional locales @@ -299,11 +295,11 @@ chmod 755 %{my_requires} %define __find_requires %{my_requires} %endif +# fdupes %if %suse_version > 1020 -%fdupes -s $RPM_BUILD_ROOT +%fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version}/ +%fdupes $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version}/ %endif -# remove some spurious executable bits -# find $RPM_BUILD_ROOT/%{_includedir}/xulrunner-%{version} | grep '\.h$' | xargs chmod -x %clean rm -rf $RPM_BUILD_ROOT @@ -407,8 +403,11 @@ %files l10n -f %{_tmppath}/translations.list %defattr(-,root,root) - %changelog +* Thu Dec 18 2008 hfiguiere(a)suse.de +- Review and approve changes. +* Mon Dec 15 2008 wr(a)rosenauer.org +- Security update to version 1.8.1.19 (bnc#455804, bnc#457913) * Wed Nov 05 2008 hpj(a)novell.com - Add mozilla-shared-nss-db.patch, which migrates the old NSS DB to the new, shared format and location. @@ -469,10 +468,10 @@ from 10.2 beta/rc versions (#223891) * Wed Nov 22 2006 sbrabec(a)suse.cz - Obsolete old xulrunner (#216100). -* Thu Sep 07 2006 stark(a)suse.de +* Fri Sep 08 2006 stark(a)suse.de - update to snapshot 1.8.1-20060907 * upstreamed file-saver.patch -* Mon Aug 28 2006 stark(a)suse.de +* Tue Aug 29 2006 stark(a)suse.de - fixed system-proxies.patch to build again * Sun Aug 27 2006 stark(a)suse.de - update to snapshot 1.8.1-20060826 ++++++ abuild.patch ++++++ --- /var/tmp/diff_new_pack.i28258/_old 2008-12-19 15:12:40.000000000 +0100 +++ /var/tmp/diff_new_pack.i28258/_new 2008-12-19 15:12:40.000000000 +0100 @@ -22,15 +22,8 @@ nsFrame.cpp: 3536 ### -### autobuild -ERROR: Program returns random data in a function. Please fix. -Problematic file(s) and their linenumbers: - ns4xPlugin.cpp: 2247 -### -Index: gfx/src/gtk/nsFontMetricsUtils.cpp -=================================================================== ---- gfx/src/gtk/nsFontMetricsUtils.cpp.orig -+++ gfx/src/gtk/nsFontMetricsUtils.cpp +--- gfx/src/gtk/nsFontMetricsUtils.cpp.old 2005-03-24 07:27:33.000000000 +0100 ++++ gfx/src/gtk/nsFontMetricsUtils.cpp 2005-03-24 07:28:26.000000000 +0100 @@ -75,6 +75,7 @@ NS_FontMetricsGetHints(void) #ifdef MOZ_ENABLE_COREXFONTS return nsFontMetricsGTK::GetHints(); @@ -46,12 +39,18 @@ + return 1; } - #if defined(MOZ_ENABLE_XFT) && defined(MOZ_ENABLE_COREXFONTS) + #ifdef MOZ_ENABLE_XFT Index: intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp =================================================================== ---- intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp.orig -+++ intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp -@@ -842,6 +842,7 @@ PRInt16 JamoSrchReplace (const JamoNormM +RCS file: /cvsroot/mozilla/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp,v +retrieving revision 1.10 +diff -u -p -6 -r1.10 nsUnicodeToJamoTTF.cpp +--- intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp 19 Feb 2005 07:27:54 -0000 1.10 ++++ intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp 7 Jun 2005 07:21:10 -0000 +@@ -842,12 +842,13 @@ PRInt16 JamoSrchReplace (const JamoNormM + // we don't need a separate range check here because the one in + // for-loop is sufficient. + for (PRInt32 i = start; i <= end - clusterLen; i++) { const JamoNormMap *match; JamoNormMap key; @@ -59,11 +58,20 @@ // cluster array is made up of PRUint8's to save memory // and we have to subtract aOffset from the input before looking it up. + key.seq[0] = aIn[i] - aOffset; + key.seq[1] = aIn[i + 1] - aOffset; + key.seq[2] = clusterLen == 3 ? (aIn[i + 2] - aOffset) : 0; Index: layout/generic/nsObjectFrame.cpp =================================================================== ---- layout/generic/nsObjectFrame.cpp.orig -+++ layout/generic/nsObjectFrame.cpp -@@ -1848,6 +1848,7 @@ nsObjectFrame::Paint(nsPresContext* +RCS file: /cvsroot/mozilla/layout/generic/nsObjectFrame.cpp,v +retrieving revision 1.505 +diff -u -p -6 -r1.505 nsObjectFrame.cpp +--- layout/generic/nsObjectFrame.cpp 6 May 2005 03:14:31 -0000 1.505 ++++ layout/generic/nsObjectFrame.cpp 7 Jun 2005 07:23:27 -0000 +@@ -1850,12 +1850,13 @@ nsObjectFrame::Paint(nsPresContext* + // now we need to setup the correct location for printing + nsresult rv; + nsPluginWindow window; nsPoint origin; float t2p; window.window = nsnull; @@ -71,11 +79,20 @@ // prepare embedded mode printing struct nsPluginPrint npprint; + npprint.mode = nsPluginMode_Embedded; + + // we need to find out if we are windowless or not Index: docshell/base/nsWebShell.cpp =================================================================== ---- docshell/base/nsWebShell.cpp.orig -+++ docshell/base/nsWebShell.cpp -@@ -565,6 +565,7 @@ nsWebShell::OnLinkClickSync(nsIContent * +RCS file: /cvsroot/mozilla/docshell/base/nsWebShell.cpp,v +retrieving revision 1.656.2.1 +diff -u -p -6 -r1.656.2.1 nsWebShell.cpp +--- docshell/base/nsWebShell.cpp 16 Sep 2005 19:11:52 -0000 1.656.2.1 ++++ docshell/base/nsWebShell.cpp 22 Sep 2005 06:30:30 -0000 +@@ -556,12 +556,13 @@ nsWebShell::OnLinkClickSync(nsIContent * + // XXX TODO Should be similar to the HTML IMG ALT attribute handling + // in NS 4.x + default: NS_ABORT_IF_FALSE(0,"unexpected link verb"); return NS_ERROR_UNEXPECTED; } @@ -83,11 +100,20 @@ } NS_IMETHODIMP + nsWebShell::OnOverLink(nsIContent* aContent, + nsIURI* aURI, + const PRUnichar* aTargetSpec) Index: layout/generic/nsFrame.cpp =================================================================== ---- layout/generic/nsFrame.cpp.orig -+++ layout/generic/nsFrame.cpp -@@ -3576,7 +3576,7 @@ nsFrame::PeekOffsetParagraph(nsPresConte +RCS file: /cvsroot/mozilla/layout/generic/nsFrame.cpp,v +retrieving revision 3.574.2.4 +diff -u -p -6 -r3.574.2.4 nsFrame.cpp +--- layout/generic/nsFrame.cpp 20 Sep 2005 06:32:09 -0000 3.574.2.4 ++++ layout/generic/nsFrame.cpp 22 Sep 2005 06:31:42 -0000 +@@ -3528,13 +3528,13 @@ nsresult + nsFrame::PeekOffsetParagraph(nsPresContext* aPresContext, + nsPeekOffsetStruct *aPos) + { #ifdef DEBUG_paragraph printf("Selecting paragraph\n"); #endif @@ -96,16 +122,6 @@ nsCOMPtr<nsILineIterator> iter (getter_AddRefs(GetBlockFrameAndLineIter(this, &blockFrame))); if (!blockFrame || !iter) return NS_ERROR_UNEXPECTED; -Index: modules/plugin/base/src/ns4xPlugin.cpp -=================================================================== ---- modules/plugin/base/src/ns4xPlugin.cpp.orig -+++ modules/plugin/base/src/ns4xPlugin.cpp -@@ -2244,6 +2244,8 @@ _setvalue(NPP npp, NPPVariable variable, - default: - return NPERR_NO_ERROR; - } -+ /* To keep gcc happy. */ -+ return NPERR_NO_ERROR; - } - //////////////////////////////////////////////////////////////////////// + PRInt32 thisLine; + nsresult result = iter->FindLineContaining(this, &thisLine); ++++++ l10n-1.8.1.17.tar.bz2 -> l10n-1.8.1.19.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/l10n/fr/toolkit/chrome/global/textcontext.dtd new/l10n/fr/toolkit/chrome/global/textcontext.dtd --- old/l10n/fr/toolkit/chrome/global/textcontext.dtd 2006-04-26 21:57:53.000000000 +0200 +++ new/l10n/fr/toolkit/chrome/global/textcontext.dtd 2008-11-07 11:13:35.000000000 +0100 @@ -10,7 +10,7 @@ <!ENTITY selectAllCmd.accesskey "t"> <!ENTITY deleteCmd.label "Supprimer"> <!ENTITY deleteCmd.accesskey "s"> -<!ENTITY spellAddToDictionary.label "Ajouter un dictionnaire"> +<!ENTITY spellAddToDictionary.label "Ajouter au dictionnaire"> <!ENTITY spellAddToDictionary.accesskey "A"> <!ENTITY spellEnable.label "Vérifier l'orthographe de ce champ"> <!ENTITY spellEnable.accesskey "V"> ++++++ mozilla-xulrunner181-rpmlintrc ++++++ addFilter("no-jar-manifest") ++++++ xulrunner-source-1.8.1.17.tar.bz2 -> xulrunner-source-1.8.1.19.tar.bz2 ++++++ mozilla-xulrunner181/xulrunner-source-1.8.1.17.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner181/xulrunner-source-1.8.1.19.tar.bz2 differ: byte 11, line 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 libzypp-bindings for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package libzypp-bindings for openSUSE:Factory checked in at Fri Dec 19 15:12:52 CET 2008. -------- --- libzypp-bindings/libzypp-bindings.changes 2008-11-11 15:25:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzypp-bindings/libzypp-bindings.changes 2008-12-18 22:54:44.908259000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 17 14:11:42 CET 2008 - ma(a)suse.de + +- Compile with -fPIC +- revision 11945 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-bindings.spec ++++++ --- /var/tmp/diff_new_pack.w28147/_old 2008-12-19 15:12:37.000000000 +0100 +++ /var/tmp/diff_new_pack.w28147/_new 2008-12-19 15:12:37.000000000 +0100 @@ -20,7 +20,7 @@ Name: libzypp-bindings Version: 0.4.8 -Release: 1 +Release: 2 License: GPL v2 or later Summary: Bindings for libzypp Group: Development/Sources @@ -137,6 +137,9 @@ %{perl_vendorarch}/zypp.so %changelog +* Wed Dec 17 2008 ma(a)suse.de +- Compile with -fPIC +- revision 11945 * Tue Nov 11 2008 ma(a)suse.de - Ignore Pathname operator<. - revision 11649 ++++++ libzypp-bindings-0.4.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-bindings-0.4.8/CMakeLists.txt new/libzypp-bindings-0.4.8/CMakeLists.txt --- old/libzypp-bindings-0.4.8/CMakeLists.txt 2008-11-11 15:24:51.000000000 +0100 +++ new/libzypp-bindings-0.4.8/CMakeLists.txt 2008-12-18 22:30:56.000000000 +0100 @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 2.6) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fno-strict-aliasing") # # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libzypp for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at Fri Dec 19 15:12:19 CET 2008. -------- --- libzypp/libzypp.changes 2008-12-10 16:36:04.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2008-12-18 22:54:25.267580000 +0100 @@ -1,0 +2,29 @@ +Thu Dec 18 22:26:18 CET 2008 - ma(a)suse.de + +- Fixed lost user request to abort during commit. (bnc #388810, bnc #450273) +- revision 11954 +- version 5.25.0 (23) + +------------------------------------------------------------------- +Thu Dec 18 13:02:27 CET 2008 - ma(a)suse.de + +- Add Package::filelist, faster and less memory consuming + implementation of Package::filenames (now deprecated). +- revision 11949 + +------------------------------------------------------------------- +Thu Dec 11 21:39:50 CET 2008 - ma(a)suse.de + +- Add str::hexencode and str::hexdecode to encode special characters + in a string as %XX. +- Hexdecode modalias strings in rpm dependencies because rpm does not + allow comma, blank and other special chars. (bnc #456695) +- revision 11927 + +------------------------------------------------------------------- +Thu Dec 11 17:13:06 CET 2008 - ma(a)suse.de + +- Catch and report media errors when proving packages. (bnc #457652) +- revision 11926 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-5.24.7.tar.bz2 New: ---- libzypp-5.25.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.K24185/_old 2008-12-19 15:11:49.000000000 +0100 +++ /var/tmp/diff_new_pack.K24185/_new 2008-12-19 15:11:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libzypp (Version 5.24.7) +# spec file for package libzypp (Version 5.25.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Summary: Package, Patch, Pattern, and Product Management -Version: 5.24.7 +Version: 5.25.0 Release: 1 -Source: libzypp-5.24.7.tar.bz2 +Source: libzypp-5.25.0.tar.bz2 Source1: libzypp-rpmlintrc Prefix: /usr Provides: yast2-packagemanager @@ -76,7 +76,7 @@ %package devel License: GPL v2 or later -Requires: libzypp == 5.24.7 +Requires: libzypp == 5.25.0 Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel Requires: cmake libsatsolver-devel >= 0.13.0 @@ -235,6 +235,23 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog +* Thu Dec 18 2008 ma(a)suse.de +- Fixed lost user request to abort during commit. (bnc #388810, bnc #450273) +- revision 11954 +- version 5.25.0 (23) +* Thu Dec 18 2008 ma(a)suse.de +- Add Package::filelist, faster and less memory consuming + implementation of Package::filenames (now deprecated). +- revision 11949 +* Thu Dec 11 2008 ma(a)suse.de +- Add str::hexencode and str::hexdecode to encode special characters + in a string as %%XX. +- Hexdecode modalias strings in rpm dependencies because rpm does not + allow comma, blank and other special chars. (bnc #456695) +- revision 11927 +* Thu Dec 11 2008 ma(a)suse.de +- Catch and report media errors when proving packages. (bnc #457652) +- revision 11926 * Wed Dec 10 2008 ma(a)suse.de - Remove obsolete zypp.conf::productsdir and deprecate ZConfig::productsPath(). ++++++ libzypp-5.24.7.tar.bz2 -> libzypp-5.25.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/CMakeLists.txt new/libzypp-5.25.0/CMakeLists.txt --- old/libzypp-5.24.7/CMakeLists.txt 2008-12-10 16:11:11.000000000 +0100 +++ new/libzypp-5.25.0/CMakeLists.txt 2008-12-18 22:30:42.000000000 +0100 @@ -20,8 +20,8 @@ MATH( EXPR LIBZYPP_SO_FIRST "${LIBZYPP_CURRENT}-${LIBZYPP_AGE}" ) SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" ) -SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual -Wnon-virtual-dtor" ) -SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall" ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -Wall -Woverloaded-virtual -Wnon-virtual-dtor" ) +SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -g -Wall" ) set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/devel/devel.ma/CommitCb.cc new/libzypp-5.25.0/devel/devel.ma/CommitCb.cc --- old/libzypp-5.24.7/devel/devel.ma/CommitCb.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-5.25.0/devel/devel.ma/CommitCb.cc 2008-12-18 22:30:42.000000000 +0100 @@ -0,0 +1,164 @@ +#include "Tools.h" +#include <zypp/ResObjects.h> + +#include <zypp/sat/LookupAttr.h> +#include <zypp/PoolQuery.h> +#include <zypp/ZYppCallbacks.h> + +struct IRR : public zypp::callback::ReceiveReport<zypp::target::rpm::InstallResolvableReport> +{ + IRR() + { connect(); } +#if 0 + enum Action { + ABORT, // abort and return error + RETRY, // retry + IGNORE // ignore the failure + }; + + enum Error { + NO_ERROR, + NOT_FOUND, // the requested Url was not found + IO, // IO error + INVALID // th resolvable is invalid + }; + + // the level of RPM pushing + /** \deprecated We fortunately no longer do 3 attempts. */ + enum RpmLevel { + RPM, + RPM_NODEPS, + RPM_NODEPS_FORCE + }; +#endif + + virtual void reportbegin() + { SEC << endl; } + virtual void reportend() + { SEC << endl; } + + virtual void start(Resolvable::constPtr /*resolvable*/) + { INT << endl; } + + virtual bool progress(int /*value*/, Resolvable::constPtr /*resolvable*/) + { + static int i = 4; + if ( --i <= 0 ) + { + INT << "return abort" << endl; + return false; + } + return true; + } + + virtual Action problem(Resolvable::constPtr /*resolvable*/, Error /*error*/, const std::string &/*description*/, RpmLevel /*level*/) + { + INT << "return abort" << endl; + return ABORT; + } + + virtual void finish(Resolvable::constPtr /*resolvable*/, Error /*error*/, const std::string &/*reason*/, RpmLevel /*level*/) + { INT << endl; } +}; + +struct RRR : public zypp::callback::ReceiveReport<zypp::target::rpm::RemoveResolvableReport> +{ + RRR() + { connect(); } +#if 0 + enum Action { + ABORT, // abort and return error + RETRY, // retry + IGNORE // ignore the failure + }; + + enum Error { + NO_ERROR, + NOT_FOUND, // the requested Url was not found + IO, // IO error + INVALID // th resolvable is invalid + }; +#endif + + virtual void reportbegin() + { SEC << endl; } + virtual void reportend() + { SEC << endl; } + + virtual void start( Resolvable::constPtr /*resolvable*/ ) + { INT << endl; } + + virtual bool progress(int /*value*/, Resolvable::constPtr /*resolvable*/) + { INT << endl; return true; } + + virtual Action problem( Resolvable::constPtr /*resolvable*/ , Error /*error*/ , const std::string &/*description*/ ) + { INT << endl; return ABORT; } + + virtual void finish( Resolvable::constPtr /*resolvable*/ , Error /*error*/ , const std::string &/*reason*/ ) + { INT << endl; } +}; + +bool solve() +{ + static unsigned run = 0; + USR << "Solve " << run++ << endl; + bool rres = false; + { + zypp::base::LogControl::TmpLineWriter shutUp; + rres = getZYpp()->resolver()->resolvePool(); + } + if ( ! rres ) + { + ERR << "resolve " << rres << endl; + getZYpp()->resolver()->problems(); + return false; + } + return true; +} + +bool install() +{ + ZYppCommitPolicy pol; +//pol.dryRun(true); + pol.rpmInstFlags( pol.rpmInstFlags().setFlag( target::rpm::RPMINST_JUSTDB ) ); + SEC << "START commit..." << endl; + SEC << getZYpp()->commit( pol ) << endl; + return true; +} + +/****************************************************************** +** +** FUNCTION NAME : main +** FUNCTION TYPE : int +*/ +int main( int argc, char * argv[] ) +{ + INT << "===[START]==========================================" << endl; + IRR _irr; + RRR _rrr; + Pathname mroot( "/tmp/ToolScanRepos" ); + TestSetup test( mroot, Arch_i586 ); + test.loadTarget(); + test.loadRepos(); + + ResPool pool( test.pool() ); + ui::Selectable::Ptr sel; + + getSel<Package>( "rpm" )->setToInstall(); + vdumpPoolStats( USR << "Selected:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + + if ( solve() ) + { + vdumpPoolStats( USR << "Solved:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + + install(); + } + + INT << "===[END]============================================" << endl << endl; + return 0; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/devel/devel.ma/Test.cc new/libzypp-5.25.0/devel/devel.ma/Test.cc --- old/libzypp-5.24.7/devel/devel.ma/Test.cc 2008-12-10 16:11:11.000000000 +0100 +++ new/libzypp-5.25.0/devel/devel.ma/Test.cc 2008-12-18 22:30:42.000000000 +0100 @@ -2,23 +2,45 @@ #include <zypp/ResObjects.h> #include <zypp/sat/LookupAttr.h> +#include <zypp/PoolQuery.h> - static std::string pidAndAppname() +static std::string pidAndAppname() +{ + static std::string _val; + if ( _val.empty() ) { - static std::string _val; - if ( _val.empty() ) - { - pid_t mypid = getpid(); - Pathname p( "/proc/"+str::numstring(mypid)+"/exe" ); - Pathname myname( filesystem::readlink( p ) ); - - _val += str::numstring(mypid); - _val += ":"; - _val += myname.basename(); - } - return _val; + pid_t mypid = getpid(); + Pathname p( "/proc/"+str::numstring(mypid)+"/exe" ); + Pathname myname( filesystem::readlink( p ) ); + + _val += str::numstring(mypid); + _val += ":"; + _val += myname.basename(); + } + return _val; +} + +bool solve() +{ + static unsigned run = 0; + USR << "Solve " << run++ << endl; + bool rres = false; + { + zypp::base::LogControl::TmpLineWriter shutUp; + rres = getZYpp()->resolver()->resolvePool(); + } + if ( ! rres ) + { + ERR << "resolve " << rres << endl; + getZYpp()->resolver()->problems(); + return false; } + return true; +} + +typedef sat::ArrayAttr<std::string,std::string> FileList; + /****************************************************************** ** ** FUNCTION NAME : main @@ -28,37 +50,60 @@ { INT << "===[START]==========================================" << endl; - SEC << pidAndAppname() << endl; - - - INT << "===[END]============================================" << endl << endl; - return 0; - Pathname mroot( "/tmp/Bb" ); + Pathname mroot( "/tmp/ToolScanRepos" ); TestSetup test( mroot, Arch_x86_64 ); - test.loadRepo( "/Local/ROOT/cache/raw/11.1-update" ); - test.loadRepo( "/Local/ROOT/cache/raw/11.0-update" ); + test.loadRepo("/Local/ROOT/cache/solv/@System/solv"); - sat::Pool satpool( test.satpool() ); - for_( it, satpool.reposBegin(), satpool.reposEnd() ) + ResPool pool( test.pool() ); + { + Measure x("filelist"); + unsigned p = 0; + unsigned f = 0; + std::string a; + for_( it, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ) + { + ++p; + f += (*it)->asKind<Package>()->filelist().size(); + for_( i, (*it)->asKind<Package>()->filelist().begin(), (*it)->asKind<Package>()->filelist().end() ) + a = *i; + } + SEC << p << " : " << f << endl; + } { - MIL << *it << endl; - DBG << it->generatedTimestamp() << endl; - DBG << it->suggestedExpirationTimestamp() << endl; + Measure x("filenames"); + unsigned p = 0; + unsigned f = 0; + std::string a; + for_( it, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ) + { + ++p; + std::list<std::string> l( (*it)->asKind<Package>()->filenames() ); + f += l.size(); + for_( i, l.begin(), l.end() ) + a = *i; + } + SEC << p << " : " << f << endl; } INT << "===[END]============================================" << endl << endl; return 0; - sat::LookupRepoAttr q( sat::SolvAttr::repositoryAddedFileProvides ); - USR << q << endl; - USR << dump(q) << endl; - for_( it, q.begin(), q.end() ) - { - MIL << it << endl; - } + //ui::Selectable::Ptr getSel( const std::string & name_r ) + getSel<Package>( "gcompris" )->setToInstall(); + vdumpPoolStats( USR << "Transacting:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + + if ( solve() ) + { + vdumpPoolStats( USR << "Transacting:"<< endl, + make_filter_begin<resfilter::ByTransact>(pool), + make_filter_end<resfilter::ByTransact>(pool) ) << endl; + SEC << getSel<Package>( "librsvg" ) << endl; + } INT << "===[END]============================================" << endl << endl; return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/package/libzypp.changes new/libzypp-5.25.0/package/libzypp.changes --- old/libzypp-5.24.7/package/libzypp.changes 2008-12-10 16:11:11.000000000 +0100 +++ new/libzypp-5.25.0/package/libzypp.changes 2008-12-18 22:30:42.000000000 +0100 @@ -1,4 +1,33 @@ ------------------------------------------------------------------- +Thu Dec 18 22:26:18 CET 2008 - ma(a)suse.de + +- Fixed lost user request to abort during commit. (bnc #388810, bnc #450273) +- revision 11954 +- version 5.25.0 (23) + +------------------------------------------------------------------- +Thu Dec 18 13:02:27 CET 2008 - ma(a)suse.de + +- Add Package::filelist, faster and less memory consuming + implementation of Package::filenames (now deprecated). +- revision 11949 + +------------------------------------------------------------------- +Thu Dec 11 21:39:50 CET 2008 - ma(a)suse.de + +- Add str::hexencode and str::hexdecode to encode special characters + in a string as %XX. +- Hexdecode modalias strings in rpm dependencies because rpm does not + allow comma, blank and other special chars. (bnc #456695) +- revision 11927 + +------------------------------------------------------------------- +Thu Dec 11 17:13:06 CET 2008 - ma(a)suse.de + +- Catch and report media errors when proving packages. (bnc #457652) +- revision 11926 + +------------------------------------------------------------------- Wed Dec 10 16:09:08 CET 2008 - ma(a)suse.de - Remove obsolete zypp.conf::productsdir and deprecate diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/tests/zypp/base/String_test.cc new/libzypp-5.25.0/tests/zypp/base/String_test.cc --- old/libzypp-5.24.7/tests/zypp/base/String_test.cc 2008-12-10 16:11:14.000000000 +0100 +++ new/libzypp-5.25.0/tests/zypp/base/String_test.cc 2008-12-18 22:30:45.000000000 +0100 @@ -225,3 +225,28 @@ BOOST_CHECK( ! str::contains("abcXabcYabc", "xabcy") ); BOOST_CHECK( str::containsCI("abcXabcYabc", "xabcy") ); } + +BOOST_AUTO_TEST_CASE(hexencode_hexdecode) +{ + std::string o; + o.reserve( 256 ); + for ( unsigned i = 1; i < 256; ++i ) + o += i; + + std::string e( str::hexencode( o ) ); + // encoded contains nothing but [%a-zA-Z0-9] + for ( unsigned i = 0; i < 255; ++i ) + { + char ch = e[i]; + BOOST_CHECK( ch == '%' + || ( 'a' <= ch && ch <= 'z' ) + || ( 'A' <= ch && ch <= 'Z' ) + || ( '0' <= ch && ch <= '9' ) ); + } + + std::string d( str::hexdecode( e ) ); + BOOST_CHECK( o == d ); +// for ( unsigned i = 0; i < 255; ++i ) +// if ( o[i] != d[i] ) +// WAR << i << " " << unsigned(o[i]) << " != " << unsigned(d[i]) << endl; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/VERSION.cmake new/libzypp-5.25.0/VERSION.cmake --- old/libzypp-5.24.7/VERSION.cmake 2008-12-10 16:11:11.000000000 +0100 +++ new/libzypp-5.25.0/VERSION.cmake 2008-12-18 22:30:42.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") -SET(LIBZYPP_MINOR "24") -SET(LIBZYPP_PATCH "7") +SET(LIBZYPP_MINOR "25") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 5.24.7 (23) +# LAST RELEASED: 5.25.0 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/base/Exception.cc new/libzypp-5.25.0/zypp/base/Exception.cc --- old/libzypp-5.24.7/zypp/base/Exception.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/base/Exception.cc 2008-12-18 22:30:42.000000000 +0100 @@ -68,6 +68,20 @@ return _(str.str().c_str()); } + std::string Exception::asUserHistory() const + { + if ( historyEmpty() ) + return asUserString(); + + std::string ret( asUserString() ); + if ( ret.empty() ) + return historyAsString(); + + ret += '\n'; + ret += historyAsString(); + return ret; + } + void Exception::remember( const Exception & old_r ) { if ( &old_r != this ) // no self-remember diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/base/Exception.h new/libzypp-5.25.0/zypp/base/Exception.h --- old/libzypp-5.24.7/zypp/base/Exception.h 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/base/Exception.h 2008-12-18 22:30:42.000000000 +0100 @@ -181,7 +181,9 @@ /** Error message provided by \ref dumpOn as string. */ std::string asString() const; - /** Translated error message as string suitable for the user. */ + /** Translated error message as string suitable for the user. + * \see \ref asUserStringHistory + */ std::string asUserString() const; public: @@ -227,6 +229,8 @@ */ std::string historyAsString() const; + /** A single (multiline) string composed of \ref asUserString and \ref historyAsString. */ + std::string asUserHistory() const; //@} protected: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/base/String.cc new/libzypp-5.25.0/zypp/base/String.cc --- old/libzypp-5.24.7/zypp/base/String.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/base/String.cc 2008-12-18 22:30:42.000000000 +0100 @@ -83,6 +83,78 @@ ); } + /////////////////////////////////////////////////////////////////// + // Hexencode + /////////////////////////////////////////////////////////////////// + namespace { + /** What's not decoded. */ + inline bool heIsAlNum( char ch ) + { + return ( ( 'a' <= ch && ch <= 'z' ) + ||( 'A' <= ch && ch <= 'Z' ) + ||( '0' <= ch && ch <= '9' ) ); + } + /** Hex-digit to number or -1. */ + inline int heDecodeCh( char ch ) + { + if ( '0' <= ch && ch <= '9' ) + return( ch - '0' ); + if ( 'A' <= ch && ch <= 'Z' ) + return( ch - 'A' + 10 ); + if ( 'a' <= ch && ch <= 'z' ) + return( ch - 'A' + 10 ); + return -1; + } + } + + std::string hexencode( const C_Str & str_r ) + { + static const char *const hdig = "0123456789ABCDEF"; + std::string res; + res.reserve( str_r.size() ); + for ( const char * it = str_r.c_str(); *it; ++it ) + { + if ( heIsAlNum( *it ) ) + { + res += *it; + } + else + { + res += '%'; + res += hdig[(unsigned char)(*it)/16]; + res += hdig[(unsigned char)(*it)%16]; + } + } + return res; + } + + std::string hexdecode( const C_Str & str_r ) + { + std::string res; + res.reserve( str_r.size() ); + for_( it, str_r.c_str(), str_r.c_str()+str_r.size() ) + { + if ( *it == '%' ) + { + int d1 = heDecodeCh( *(it+1) ); + if ( d1 != -1 ) + { + int d2 = heDecodeCh( *(it+2) ); + if ( d2 != -1 ) + { + res += (d1<<4)|d2; + it += 2; + continue; + } + } + } + // verbatim if no %XX: + res += *it; + } + return res; + } + /////////////////////////////////////////////////////////////////// + /****************************************************************** ** ** FUNCTION NAME : toLower @@ -285,6 +357,7 @@ } + /****************************************************************** ** ** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/base/String.h new/libzypp-5.25.0/zypp/base/String.h --- old/libzypp-5.24.7/zypp/base/String.h 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/base/String.h 2008-12-18 22:30:42.000000000 +0100 @@ -584,6 +584,11 @@ * * For use when printing \a c separated values, and where * \ref joinEscaped() is too heavy. + * + * \todo use C_Str instead of std::string to prevent unnecessary + * promotion to string if used with "string". + * + * \todo shoud not be documented in doxy-group 'Join' */ std::string escape(const std::string & str_r, const char c = ' ' ); @@ -591,6 +596,20 @@ //@} /////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + /** \name Hexencode. + * Encode all characters other than [a-zA-Z0-9] as %XX. + * This includes the % character itself, which becomes %25. + */ + //@{ + /** Encode all characters other than [a-zA-Z0-9] as %XX. + * This includes the % character itself, which becomes %25. + */ + std::string hexencode( const C_Str & str_r ); + /** Decode hexencoded %XX sequences. */ + std::string hexdecode( const C_Str & str_r ); + //@} + /////////////////////////////////////////////////////////////////// /** \name Case conversion. */ //@{ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/media/MediaAria2c.cc new/libzypp-5.25.0/zypp/media/MediaAria2c.cc --- old/libzypp-5.24.7/zypp/media/MediaAria2c.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/media/MediaAria2c.cc 2008-12-18 22:30:42.000000000 +0100 @@ -48,9 +48,9 @@ using namespace std; using namespace zypp::base; -namespace zypp +namespace zypp { -namespace media +namespace media { Pathname MediaAria2c::_cookieFile = "/var/lib/YaST2/cookies"; @@ -70,7 +70,7 @@ }; ExternalProgram aria(argv, ExternalProgram::Stderr_To_Stdout); - + std::string ariaResponse( aria.receiveLine()); string::size_type pos = ariaResponse.find('/', 0 ); if( pos != string::npos ) @@ -138,7 +138,7 @@ true ) // does_download { MIL << "MediaAria2c::MediaAria2c(" << url_r << ", " << attach_point_hint_r << ")" << endl; - + if( !attachPoint().empty()) { PathInfo ainfo(attachPoint()); @@ -169,7 +169,7 @@ void MediaAria2c::attachTo (bool next) { // clear last arguments - _args.clear(); + _args.clear(); if ( next ) ZYPP_THROW(MediaNotSupportedException(_url)); @@ -187,7 +187,7 @@ setAttachPoint( mountpoint, true); } - disconnectFrom(); + disconnectFrom(); // Build the aria command. _args.push_back(_aria2cPath.asString()); @@ -195,12 +195,12 @@ _args.push_back("--summary-interval=1"); _args.push_back("--follow-metalink=mem"); _args.push_back( "--check-integrity=true"); - + // add the anonymous id. _args.push_back(str::form("--header=%s", anonymousIdHeader() )); _args.push_back(str::form("--header=%s", distributionFlavorHeader() )); // TODO add debug option - + // Transfer timeout { _xfer_timeout = TRANSFER_TIMEOUT; @@ -231,11 +231,11 @@ DBG << "Anonymous FTP identification: '" << id << "'" << endl; _userpwd = "anonymous:" + id; } - } - else + } + else { if ( _url.getScheme() == "ftp" ) - { + { _args.push_back(str::form("--ftp-user=%s", _url.getUsername().c_str() )); } else if ( _url.getScheme() == "http" || @@ -243,11 +243,11 @@ { _args.push_back(str::form("--http-user=%s", _url.getUsername().c_str() )); } - + if ( _url.getPassword().size() ) { if ( _url.getScheme() == "ftp" ) - { + { _args.push_back(str::form("--ftp-passwd=%s", _url.getPassword().c_str() )); } else if ( _url.getScheme() == "http" || @@ -260,7 +260,7 @@ // note, aria2c does not support setting the auth type with // (basic, digest yet) - + /*---------------------------------------------------------------* CURLOPT_PROXY: host[:port] @@ -343,7 +343,7 @@ if ( ! _proxyuserpwd.empty() ) { _args.push_back(str::form("--http-proxy-user=%s", _proxyuserpwd.c_str() )); - + string proxypassword( _url.getQueryParam( "proxypassword" ) ); if ( ! proxypassword.empty() ) { _args.push_back(str::form("--http-proxy-passwd=%s", proxypassword.c_str() )); @@ -358,7 +358,7 @@ // FIXME: need a derived class to propelly compare url's MediaSourceRef media( new MediaSource(_url.getScheme(), _url.asString())); setMediaSource(media); - + } bool @@ -407,7 +407,7 @@ void MediaAria2c::getFile( const Pathname & filename ) const { // Use absolute file name to prevent access of files outside of the - // hierarchy below the attach point. + // hierarchy below the attach point. getFileCopy(filename, localPath(filename).absolutename()); } @@ -415,28 +415,28 @@ { callback::SendReport<DownloadProgressReport> report; - Url fileurl(getFileUrl(_url, filename)); + Url fileurl(getFileUrl(_url, filename)); bool retry = false; ExternalProgram::Arguments args = _args; args.push_back(str::form("--dir=%s", target.dirname().c_str())); args.push_back(fileurl.asString()); - + do { try - { - report->start(_url, target.asString() ); - - ExternalProgram aria(args, ExternalProgram::Stderr_To_Stdout); - int nLine = 0; + { + report->start(_url, target.asString() ); + + ExternalProgram aria(args, ExternalProgram::Stderr_To_Stdout); + int nLine = 0; //Process response for(std::string ariaResponse( aria.receiveLine()); - ariaResponse.length(); + ariaResponse.length(); ariaResponse = aria.receiveLine()) - { + { //cout << ariaResponse; if (!ariaResponse.substr(0,31).compare("Exception: Authorization failed") ) @@ -448,11 +448,11 @@ if (!ariaResponse.substr(0,29).compare("Exception: Resource not found") ) { ZYPP_THROW(MediaFileNotFoundException(_url, filename)); - } + } if (!ariaResponse.substr(0,9).compare("[#2 SIZE:")) { - - if (!nLine) + + if (!nLine) { size_t left_bound = ariaResponse.find('(',0) + 1; size_t count = ariaResponse.find('%',left_bound) - left_bound; @@ -460,19 +460,19 @@ //progressData.toMax(); report->progress ( std::atoi(ariaResponse.substr(left_bound, count).c_str()), _url, -1, -1 ); nLine = 1; - } + } else { nLine = 0; - } - } + } + } } aria.close(); - + report->finish( _url , zypp::media::DownloadProgressReport::NO_ERROR, ""); retry = false; } - + // retry with proper authentication data catch (MediaUnauthorizedException & ex_r) { @@ -480,7 +480,7 @@ retry = true; else { - report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserString()); + report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserHistory()); ZYPP_RETHROW(ex_r); } @@ -489,7 +489,7 @@ catch (MediaException & excpt_r) { // FIXME: error number fix - report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserString()); + report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserHistory()); ZYPP_RETHROW(excpt_r); } } @@ -530,7 +530,7 @@ bool MediaAria2c::doGetDoesFileExist( const Pathname & filename ) const { - + DBG << filename.asString() << endl; return true; } @@ -584,7 +584,7 @@ getDirectoryYast( retlist, dirname, dots ); } -std::string MediaAria2c::getAria2cVersion() +std::string MediaAria2c::getAria2cVersion() { const char* argv[] = { @@ -605,7 +605,7 @@ Pathname MediaAria2c::whereisAria2c() { Pathname aria2cPathr(ARIA_DEFAULT_BINARY); - + const char* argv[] = { "whereis", @@ -615,23 +615,23 @@ }; ExternalProgram aria(argv, ExternalProgram::Stderr_To_Stdout); - + std::string ariaResponse( aria.receiveLine()); aria.close(); - + string::size_type pos = ariaResponse.find('/', 0 ); - if( pos != string::npos ) + if( pos != string::npos ) { aria2cPathr = ariaResponse; string::size_type pose = ariaResponse.find(' ', pos + 1 ); aria2cPathr = ariaResponse.substr( pos , pose - pos ); MIL << "We will use aria2c located here: " << ariaResponse.substr( pos , pose - pos) << endl; } - else + else { MIL << "We don't know were is ari2ac binary. We will use aria2c located here: " << aria2cPathr << endl; } - + return aria2cPathr; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/media/MediaCurl.cc new/libzypp-5.25.0/zypp/media/MediaCurl.cc --- old/libzypp-5.24.7/zypp/media/MediaCurl.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/media/MediaCurl.cc 2008-12-18 22:30:42.000000000 +0100 @@ -846,7 +846,7 @@ retry = true; else { - report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserString()); + report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserHistory()); ZYPP_RETHROW(ex_r); } } @@ -854,7 +854,7 @@ catch (MediaException & excpt_r) { // FIXME: error number fix - report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserString()); + report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserHistory()); ZYPP_RETHROW(excpt_r); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/Package.cc new/libzypp-5.25.0/zypp/Package.cc --- old/libzypp-5.24.7/zypp/Package.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/Package.cc 2008-12-18 22:30:42.000000000 +0100 @@ -122,15 +122,13 @@ return ret; } + Package::FileList Package::filelist() const + { return FileList( sat::SolvAttr::filelist, satSolvable() ); } + std::list<std::string> Package::filenames() const { - std::list<std::string> files; - sat::LookupAttr q( sat::SolvAttr::filelist, *this ); - for_( it, q.begin(), q.end() ) - { - files.push_back(it.asString()); - } - return files; + FileList f( filelist() ); + return std::list<std::string>( f.begin(), f.end() ); } CheckSum Package::checksum() const diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/Package.h new/libzypp-5.25.0/zypp/Package.h --- old/libzypp-5.24.7/zypp/Package.h 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/Package.h 2008-12-18 22:30:42.000000000 +0100 @@ -39,13 +39,14 @@ public: typedef sat::ArrayAttr<PackageKeyword,IdString> Keywords; + typedef sat::ArrayAttr<std::string,std::string> FileList; public: /** * Returns the level of supportability the vendor * gives to this package. - * + * * This is one value from \ref VendorSupportOption */ VendorSupportOption vendorSupport() const; @@ -77,8 +78,15 @@ ByteCount sourcesize() const; /** */ std::list<std::string> authors() const; - /** */ - std::list<std::string> filenames() const; + + /** Return the packages filelist (if available). + * The returned \ref FileList appears to be a container of + * \c std::string. In fact it is a query, so it does not + * consume much memory. + */ + FileList filelist() const; + /** \deprecated Use filelist, it's faster and saves memory. */ + std::list<std::string> filenames() const ZYPP_DEPRECATED; /** Name of the source rpm this package was built from. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/repo/PackageProvider.cc new/libzypp-5.25.0/zypp/repo/PackageProvider.cc --- old/libzypp-5.24.7/zypp/repo/PackageProvider.cc 2008-12-10 16:11:11.000000000 +0100 +++ new/libzypp-5.25.0/zypp/repo/PackageProvider.cc 2008-12-18 22:30:42.000000000 +0100 @@ -103,14 +103,44 @@ { ret = doProvidePackage(); } - catch ( const Exception & excpt ) + catch ( const UserRequestException & excpt ) { + // UserRequestException e.g. from failOnChecksumError was already reported. ERR << "Failed to provide Package " << _package << endl; if ( ! _retry ) { ZYPP_RETHROW( excpt ); } } + catch ( const Exception & excpt ) + { + ERR << "Failed to provide Package " << _package << endl; + if ( ! _retry ) + { + // Aything else gets reported + std::string package_str = _package->name() + "-" + _package->edition().asString(); + + // TranslatorExplanation %s = name of the package being processed. + std::string detail_str( str::form(_("Failed to provide Package %s. Do you want to retry retrieval?"), package_str.c_str() ) ); + detail_str += str::form( "\n\n%s", excpt.asUserHistory().c_str() ); + + switch ( report()->problem( _package, repo::DownloadResolvableReport::IO, detail_str.c_str() ) ) + { + case repo::DownloadResolvableReport::RETRY: + _retry = true; + break; + case repo::DownloadResolvableReport::IGNORE: + ZYPP_THROW(SkipRequestException("User requested skip of corrupted file")); + break; + case repo::DownloadResolvableReport::ABORT: + ZYPP_THROW(AbortRequestException("User requested to abort")); + break; + default: + ZYPP_RETHROW( excpt ); + break; + } + } + } } while ( _retry ); report()->finish( _package, repo::DownloadResolvableReport::NO_ERROR, std::string() ); @@ -184,7 +214,7 @@ } catch ( const Exception & excpt ) { - report()->problemDeltaDownload( excpt.asUserString() ); + report()->problemDeltaDownload( excpt.asUserHistory() ); return ManagedFile(); } report()->finishDeltaDownload(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/sat/detail/PoolImpl.cc new/libzypp-5.25.0/zypp/sat/detail/PoolImpl.cc --- old/libzypp-5.24.7/zypp/sat/detail/PoolImpl.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/sat/detail/PoolImpl.cc 2008-12-18 22:30:42.000000000 +0100 @@ -107,7 +107,11 @@ case NAMESPACE_MODALIAS: { - return target::Modalias::instance().query( IdString(rhs) ) ? RET_systemProperty : RET_unsupported; + // modalias strings in capability may be hexencoded because rpm does not allow + // ',', ' ' or other special chars. + return target::Modalias::instance().query( str::hexdecode( IdString(rhs).c_str() ) ) + ? RET_systemProperty + : RET_unsupported; } break; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/sat/LookupAttrTools.h new/libzypp-5.25.0/zypp/sat/LookupAttrTools.h --- old/libzypp-5.24.7/zypp/sat/LookupAttrTools.h 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/sat/LookupAttrTools.h 2008-12-18 22:30:42.000000000 +0100 @@ -172,7 +172,8 @@ {} public: - typedef sat::LookupAttr::transformIterator<_ResultT,_AttrT> iterator; + typedef LookupAttr::transformIterator<_ResultT,_AttrT> iterator; + typedef LookupAttr::size_type size_type; iterator begin() const { return iterator( _q.begin() ); } @@ -183,6 +184,14 @@ bool empty() const { return _q.empty(); } + size_type size() const + { + size_type count = 0; + for_( it, begin(), end() ) + ++count; + return count; + } + public: iterator find( const _ResultT & key_r ) const diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/target/rpm/RpmDb.cc new/libzypp-5.25.0/zypp/target/rpm/RpmDb.cc --- old/libzypp-5.24.7/zypp/target/rpm/RpmDb.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/target/rpm/RpmDb.cc 2008-12-18 22:30:42.000000000 +0100 @@ -828,7 +828,7 @@ } catch (RpmException & excpt_r) { - report->finish(root() + dbPath(), RebuildDBReport::FAILED, excpt_r.asUserString()); + report->finish(root() + dbPath(), RebuildDBReport::FAILED, excpt_r.asUserHistory()); ZYPP_RETHROW(excpt_r); } report->finish(root() + dbPath(), RebuildDBReport::NO_ERROR, ""); @@ -1238,7 +1238,7 @@ } catch (RpmException & excpt_r) { - report->finish(ScanDBReport::FAILED, excpt_r.asUserString ()); + report->finish(ScanDBReport::FAILED, excpt_r.asUserHistory ()); ZYPP_RETHROW(excpt_r); } #warning fixme diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/target/TargetCallbackReceiver.cc new/libzypp-5.25.0/zypp/target/TargetCallbackReceiver.cc --- old/libzypp-5.24.7/zypp/target/TargetCallbackReceiver.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/target/TargetCallbackReceiver.cc 2008-12-18 22:30:42.000000000 +0100 @@ -32,17 +32,17 @@ RpmInstallPackageReceiver::~RpmInstallPackageReceiver () { } - - void RpmInstallPackageReceiver::reportbegin() + + void RpmInstallPackageReceiver::reportbegin() { } - - void RpmInstallPackageReceiver::reportend() + + void RpmInstallPackageReceiver::reportend() { } /** Start the operation */ - void RpmInstallPackageReceiver::start( const Pathname & name ) + void RpmInstallPackageReceiver::start( const Pathname & name ) { _report->start( _resolvable ); _abort = false; @@ -57,26 +57,27 @@ _abort = ! _report->progress( percent, _resolvable ); return _abort; } - - rpm::RpmInstallReport::Action + + rpm::RpmInstallReport::Action RpmInstallPackageReceiver::problem( Exception & excpt_r ) { - rpm::InstallResolvableReport::Action user = + rpm::InstallResolvableReport::Action user = _report->problem( _resolvable , rpm::InstallResolvableReport::INVALID - , excpt_r.asUserString() + , excpt_r.asUserHistory() , _level ); - + switch (user) { - case rpm::InstallResolvableReport::RETRY: + case rpm::InstallResolvableReport::RETRY: return rpm::RpmInstallReport::RETRY; - case rpm::InstallResolvableReport::ABORT: + case rpm::InstallResolvableReport::ABORT: + _abort = true; return rpm::RpmInstallReport::ABORT; - case rpm::InstallResolvableReport::IGNORE: + case rpm::InstallResolvableReport::IGNORE: return rpm::RpmInstallReport::IGNORE; } - + return rpm::RpmInstallReport::problem( excpt_r ); } @@ -91,7 +92,7 @@ { _report->finish( _resolvable, rpm::InstallResolvableReport::INVALID, std::string(), _level ); } - + void RpmInstallPackageReceiver::tryLevel( target::rpm::InstallResolvableReport::RpmLevel level_r ) { _level = level_r; @@ -112,19 +113,20 @@ RpmRemovePackageReceiver::~RpmRemovePackageReceiver () { } - - void RpmRemovePackageReceiver::reportbegin() + + void RpmRemovePackageReceiver::reportbegin() { } - - void RpmRemovePackageReceiver::reportend() + + void RpmRemovePackageReceiver::reportend() { } /** Start the operation */ - void RpmRemovePackageReceiver::start( const std::string & name ) + void RpmRemovePackageReceiver::start( const std::string & name ) { _report->start( _resolvable ); + _abort = false; } /** @@ -136,25 +138,26 @@ _abort = ! _report->progress( percent, _resolvable ); return _abort; } - - rpm::RpmRemoveReport::Action + + rpm::RpmRemoveReport::Action RpmRemovePackageReceiver::problem( Exception & excpt_r ) { - rpm::RemoveResolvableReport::Action user = + rpm::RemoveResolvableReport::Action user = _report->problem( _resolvable , rpm::RemoveResolvableReport::INVALID - , excpt_r.asUserString() + , excpt_r.asUserHistory() ); - + switch (user) { - case rpm::RemoveResolvableReport::RETRY: + case rpm::RemoveResolvableReport::RETRY: return rpm::RpmRemoveReport::RETRY; - case rpm::RemoveResolvableReport::ABORT: + case rpm::RemoveResolvableReport::ABORT: + _abort = true; return rpm::RpmRemoveReport::ABORT; - case rpm::RemoveResolvableReport::IGNORE: + case rpm::RemoveResolvableReport::IGNORE: return rpm::RpmRemoveReport::IGNORE; } - + return rpm::RpmRemoveReport::problem( excpt_r ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libzypp-5.24.7/zypp/target/TargetImpl.cc new/libzypp-5.25.0/zypp/target/TargetImpl.cc --- old/libzypp-5.24.7/zypp/target/TargetImpl.cc 2008-12-10 16:11:12.000000000 +0100 +++ new/libzypp-5.25.0/zypp/target/TargetImpl.cc 2008-12-18 22:30:42.000000000 +0100 @@ -616,6 +616,11 @@ MIL << "Target loaded: " << system.solvablesSize() << " resolvables" << endl; } + /////////////////////////////////////////////////////////////////// + // + // COMMIT + // + /////////////////////////////////////////////////////////////////// ZYppCommitResult TargetImpl::commit( ResPool pool_r, const ZYppCommitPolicy & policy_rX ) { // ----------------------------------------------------------------- // @@ -702,7 +707,7 @@ /////////////////////////////////////////////////////////////////// // Remove/install packages. /////////////////////////////////////////////////////////////////// - commit (to_uninstall, policy_r, pool_r ); + commit ( to_uninstall, policy_r, pool_r ); if (policy_r.restrictToMedia() == 0) { // commit all @@ -765,6 +770,11 @@ } + /////////////////////////////////////////////////////////////////// + // + // COMMIT internal + // + /////////////////////////////////////////////////////////////////// TargetImpl::PoolItemList TargetImpl::commit( const TargetImpl::PoolItemList & items_r, const ZYppCommitPolicy & policy_r, @@ -794,6 +804,12 @@ { localfile = packageCache.get( it ); } + catch ( const AbortRequestException &e ) + { + WAR << "commit aborted by the user" << endl; + abort = true; + break; + } catch ( const SkipRequestException &e ) { ZYPP_CAUGHT( e ); @@ -812,8 +828,9 @@ #warning Exception handling // create a installation progress report proxy RpmInstallPackageReceiver progress( it->resolvable() ); - progress.connect(); - bool success = true; + progress.connect(); // disconnected on destruction. + + bool success = false; rpm::RpmInstFlags flags; // Why force and nodeps? // @@ -839,27 +856,34 @@ if ( progress.aborted() ) { WAR << "commit aborted by the user" << endl; - progress.disconnect(); - success = false; abort = true; break; } + else + { + success = true; + } } - catch (Exception & excpt_r) + catch ( Exception & excpt_r ) { ZYPP_CAUGHT(excpt_r); if ( policy_r.dryRun() ) { WAR << "dry run failed" << endl; - progress.disconnect(); break; } // else - WAR << "Install failed" << endl; + if ( progress.aborted() ) + { + WAR << "commit aborted by the user" << endl; + abort = true; + } + else + { + WAR << "Install failed" << endl; + } remaining.push_back( *it ); - progress.disconnect(); - success = false; - break; + break; // stop } if ( success && !policy_r.dryRun() ) @@ -868,14 +892,13 @@ // Remember to check this package for presence of patch scripts. successfullyInstalledPackages.push_back( it->satSolvable() ); } - progress.disconnect(); } else { - bool success = true; - RpmRemovePackageReceiver progress( it->resolvable() ); - progress.connect(); + progress.connect(); // disconnected on destruction. + + bool success = false; rpm::RpmInstFlags flags( rpm::RPMINST_NODEPS ); if (policy_r.dryRun()) flags |= rpm::RPMINST_TEST; try @@ -886,24 +909,30 @@ if ( progress.aborted() ) { WAR << "commit aborted by the user" << endl; - progress.disconnect(); - success = false; abort = true; break; } + else + { + success = true; + } } catch (Exception & excpt_r) { - WAR << "removal of " << p << " failed"; - success = false; ZYPP_CAUGHT( excpt_r ); + if ( progress.aborted() ) + { + WAR << "commit aborted by the user" << endl; + abort = true; + break; + } + // else + WAR << "removal of " << p << " failed"; } - if (success - && !policy_r.dryRun()) + if ( success && !policy_r.dryRun() ) { it->status().resetTransact( ResStatus::USER ); } - progress.disconnect(); } } else if ( ! policy_r.dryRun() ) // other resolvables (non-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 hal for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package hal for openSUSE:Factory checked in at Fri Dec 19 15:11:36 CET 2008. -------- --- hal/hal.changes 2008-12-05 15:41:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2008-12-18 17:29:32.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Dec 18 16:36:48 CET 2008 - dkukawka(a)suse.de + +- updated hal-info to 20081218 +- this update include fixes for: + - bnc#459342: add Nokia N810 to USB music players + - bnc#450489: add new config option to disable NVIDIA quirks + by don't install 21-video-quirk-nvidia.fdi, fixed + existing quirk for this machine to get only in + place if it's a ATI card + - some new keymapping and suspend quirks + +------------------------------------------------------------------- +Mon Dec 15 09:33:14 CET 2008 - dkukawka(a)suse.de + +- update HAL to latest git (b09774739efe4) of my tree and + hal-info to 20081215 +- this update include fixes for: + - bnc#458307: fix serial.port handling for USB serial devices + - bnc#458414: fix ACL handling for drm devices + - some more modems + +------------------------------------------------------------------- hal-doc.changes: same change calling whatdependson for head-i586 Old: ---- hal-info-20081205.tar.bz2 New: ---- hal-info-20081218.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.D21793/_old 2008-12-19 15:11:04.000000000 +0100 +++ /var/tmp/diff_new_pack.D21793/_new 2008-12-19 15:11:04.000000000 +0100 @@ -26,10 +26,10 @@ Summary: Daemon for Collecting Hardware Information %define dbus_version 0.61 %define dbus_release 1 -%define hal_info_version 20081205 +%define hal_info_version 20081218 %define libsmbios_version 2.0.2 Version: 0.5.12 -Release: 9 +Release: 10 Url: http://freedesktop.org/Software/hal License: Other uncritical OpenSource License Group: System/Daemons @@ -121,7 +121,7 @@ %if ! %build_doc %package -n hal-devel -License: Other uncritical OpenSource License; AFL +License: Other uncritical OpenSource License; AFL2.0 or GPLv2.0 Summary: Developer package for HAL Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}, dbus-1-glib-devel >= %{dbus_version}-%{dbus_release} %if 0%{?suse_version} > 1020 @@ -226,6 +226,7 @@ %configure \ --disable-recall \ --disable-video-default-quirks \ + --disable-video-nvidia-quirks \ %ifarch ppc ppc64 ia64 s390 s390 s390x --disable-killswitch-dell-bluetooth \ --disable-killswitch-dell-wlan \ @@ -365,6 +366,22 @@ %endif %changelog +* Thu Dec 18 2008 dkukawka(a)suse.de +- updated hal-info to 20081218 +- this update include fixes for: + - bnc#459342: add Nokia N810 to USB music players + - bnc#450489: add new config option to disable NVIDIA quirks + by don't install 21-video-quirk-nvidia.fdi, fixed + existing quirk for this machine to get only in + place if it's a ATI card + - some new keymapping and suspend quirks +* Mon Dec 15 2008 dkukawka(a)suse.de +- update HAL to latest git (b09774739efe4) of my tree and + hal-info to 20081215 +- this update include fixes for: + - bnc#458307: fix serial.port handling for USB serial devices + - bnc#458414: fix ACL handling for drm devices + - some more modems * Fri Dec 05 2008 dkukawka(a)suse.de - update HAL to latest git (9b564550ad6fba) of my tree and hal-info to 20081205 ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.D21793/_old 2008-12-19 15:11:04.000000000 +0100 +++ /var/tmp/diff_new_pack.D21793/_new 2008-12-19 15:11:04.000000000 +0100 @@ -26,12 +26,12 @@ Summary: Daemon for Collecting Hardware Information %define dbus_version 0.61 %define dbus_release 1 -%define hal_info_version 20081205 +%define hal_info_version 20081218 %define libsmbios_version 2.0.2 Version: 0.5.12 -Release: 9 +Release: 10 Url: http://freedesktop.org/Software/hal -License: GPL v2 or later; AFL +License: GPL v2 or later; AFL2.0 or GPLv2.0 Group: System/Daemons AutoReqProv: on Requires: pm-utils @@ -120,7 +120,7 @@ %if ! %build_doc %package -n hal-devel -License: Other uncritical OpenSource License; AFL +License: Other uncritical OpenSource License; AFL2.0 or GPLv2.0 Summary: Developer package for HAL Requires: %{name} = %{version}-%{release}, dbus-1-devel >= %{dbus_version}-%{dbus_release}, dbus-1-glib-devel >= %{dbus_version}-%{dbus_release} %if 0%{?suse_version} > 1020 @@ -225,6 +225,7 @@ %configure \ --disable-recall \ --disable-video-default-quirks \ + --disable-video-nvidia-quirks \ %ifarch ppc ppc64 ia64 s390 s390 s390x --disable-killswitch-dell-bluetooth \ --disable-killswitch-dell-wlan \ @@ -364,6 +365,22 @@ %endif %changelog +* Thu Dec 18 2008 dkukawka(a)suse.de +- updated hal-info to 20081218 +- this update include fixes for: + - bnc#459342: add Nokia N810 to USB music players + - bnc#450489: add new config option to disable NVIDIA quirks + by don't install 21-video-quirk-nvidia.fdi, fixed + existing quirk for this machine to get only in + place if it's a ATI card + - some new keymapping and suspend quirks +* Mon Dec 15 2008 dkukawka(a)suse.de +- update HAL to latest git (b09774739efe4) of my tree and + hal-info to 20081215 +- this update include fixes for: + - bnc#458307: fix serial.port handling for USB serial devices + - bnc#458414: fix ACL handling for drm devices + - some more modems * Fri Dec 05 2008 dkukawka(a)suse.de - update HAL to latest git (9b564550ad6fba) of my tree and hal-info to 20081205 ++++++ hal-0.5.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/ChangeLog new/hal-0.5.12/ChangeLog --- old/hal-0.5.12/ChangeLog 2008-12-05 15:31:00.000000000 +0100 +++ new/hal-0.5.12/ChangeLog 2008-12-15 09:35:06.000000000 +0100 @@ -1,3 +1,44 @@ +commit b09774739efe4215aa03e7812bca8a50be65e2c1 +Author: Danny Kukawka <danny.kukawka(a)web.de> +Date: Mon Dec 15 08:55:04 2008 +0100 + + fixed serial.port handling for USB serial devices + + Fixed serial.port handling for USB serial devices. Since USB devices + can have several ports and since the order of /dev/ttyUSB* depends on + the device order, it make no sense to base serial.port for USB devices + on the number in /dev/ttyUSB*. Here is the port number of the USB + device itself more important to detect/match devices. + + Changed the spec description and handling/detection of serial.port for + USB serial devices to use device/port_number info from sysfs. This + change + shouldn't affect existing matches in fdi files (as e.g. for modems) as + long as there wheren't more than one USB serial device in the + machine as + the entry was generated. I imply this for now with this change. + + This change allow us to match e.g. modems also if you put more + than one + modem with USB serial ports to a machine. For more see: + https://bugzilla.novell.com/show_bug.cgi?id=458307 + + doc/spec/hal-spec-properties.xml | 5 +++-- + hald/linux/device.c | 8 +++++++- + 2 files changed, 10 insertions(+), 3 deletions(-) + +commit a476876bd9f094f94583194d8d208bcb77cd5f49 +Author: Danny Kukawka <danny.kukawka(a)web.de> +Date: Thu Dec 11 20:11:56 2008 +0100 + + fix ACL handling for drm devices + + Fixed ACL handling for drm devices. Use linux.device_file instead + of input.device for access_control.file. + + fdi/policy/10osvendor/20-acl-management.fdi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit b0a2575f13ce9b18d07a2798e0d4c83cbb3059e5 Author: Danny Kukawka <danny.kukawka(a)web.de> Date: Fri Dec 5 15:19:57 2008 +0100 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/doc/spec/hal-spec-properties.xml new/hal-0.5.12/doc/spec/hal-spec-properties.xml --- old/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-11-28 13:53:57.000000000 +0100 +++ new/hal-0.5.12/doc/spec/hal-spec-properties.xml 2008-12-15 08:54:46.000000000 +0100 @@ -2883,8 +2883,9 @@ <entry>example: 0</entry> <entry>Yes</entry> <entry> - The port number of the device, based on the number in - <literal>serial.device</literal> + The port number of the device. For USB serial devices it's the port number of the + serial device itself. For other serial devices, where is no device port info + available, it's based on the number in <literal>serial.device</literal>. </entry> </row> <row> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi new/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi --- old/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2008-11-28 13:08:15.000000000 +0100 +++ new/hal-0.5.12/fdi/policy/10osvendor/20-acl-management.fdi 2008-12-11 20:11:51.000000000 +0100 @@ -197,7 +197,7 @@  <match key="info.capabilities" contains="drm"> <append key="info.capabilities" type="strlist">access_control</append> - <merge key="access_control.file" type="copy_property">input.device</merge> + <merge key="access_control.file" type="copy_property">linux.device_file</merge> <merge key="access_control.type" type="string">video</merge> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.12/hald/linux/device.c new/hal-0.5.12/hald/linux/device.c --- old/hal-0.5.12/hald/linux/device.c 2008-12-05 15:07:11.000000000 +0100 +++ new/hal-0.5.12/hald/linux/device.c 2008-12-15 08:51:46.000000000 +0100 @@ -3102,8 +3102,14 @@ hal_device_property_get_string (parent_dev, "info.product")); } else if (sscanf (last_elem, "ttyUSB%d", &portnum) == 1) { HalDevice *usbdev; + int port_number; - hal_device_property_set_int (d, "serial.port", portnum); + /* try to get the port number of the device and not of the whole USB subsystem */ + if (hal_util_get_int_from_file (sysfs_path, "device/port_number", &port_number, 10)) { + hal_device_property_set_int (d, "serial.port", port_number); + } else { + hal_device_property_set_int (d, "serial.port", portnum); + } hal_device_property_set_string (d, "serial.type", "usb"); usbdev = hal_device_store_find (hald_get_gdl (), ++++++ hal-info-20081205.tar.bz2 -> hal-info-20081218.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/ChangeLog new/hal-info-20081218/ChangeLog --- old/hal-info-20081205/ChangeLog 2008-12-05 15:41:26.000000000 +0100 +++ new/hal-info-20081218/ChangeLog 2008-12-18 17:06:16.000000000 +0100 @@ -1,3 +1,114 @@ +commit 102e7cc5b379143d219ba7fbd72752f85f08aeb3 +Author: Danny Kukawka <danny.kukawka(a)web.de> +Date: Thu Dec 18 17:03:55 2008 +0100 + + fix suspend quirk for HP Compaq 8510 + + Fixed suspend quirk for HP Compaq 8510. This machine is available + with ATI and NVIDIA graphic cards, changed quirk to get added only if + the machine use a ATI card. + + .../10freedesktop/20-video-quirk-pm-hp.fdi | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +commit 43dc4bbe5ff288bf690424beedc9a8b56b11f4cd +Author: Danny Kukawka <danny.kukawka(a)web.de> +Date: Thu Dec 18 16:29:36 2008 +0100 + + add new configure option --enable-video-nvidia-quirks + + Add new configure option --enable-video-nvidia-quirks to be able + to prevent get 21-video-quirk-nvidia.fdi installed which may cause + trouble on systems which don't support this quirks. + + configure.in | 9 ++++++++- + fdi/information/10freedesktop/Makefile.am | 7 +++++-- + 2 files changed, 13 insertions(+), 3 deletions(-) + +commit 58afb713937908da6a38c397df6c9a1e44727251 +Author: Daniel Gollub <dgollub(a)novell.com> +Date: Thu Dec 18 16:11:54 2008 +0100 + + add Nokia N810 to USB music players + + Added Nokia N810 to USB music players. + + .../10freedesktop/10-usb-music-players.fdi | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 6e9d1672772670e63f6c19020f3cb9a2614cc073 +Author: Danny Kukawka <danny.kukawka(a)web.de> +Date: Thu Dec 18 15:56:46 2008 +0100 + + add suspend quirk for IBM Thinkpad R52-18472GU + + Added suspend quirk for IBM Thinkpad R52-18472GU as reported by + Bart Rose <jbrose3(a)gmail.com>. + + .../10freedesktop/20-video-quirk-pm-ibm.fdi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d61ea8f51fd82f93b8808a955817b91dac023341 +Author: Julian Sikorski <belegdol(a)gmail.com> +Date: Tue Dec 16 08:52:23 2008 +0000 + + correct satellite a100 keymapping + + it seems that the mapping in 30-keymap-misc.fdi for toshiba satellite + a100 is incorrect. It maps the stop key (white rectangle) to stop, + which gets translated by X to Cancel, while the proper mapping + would be + stopcd, which gets properly mapped to XF86AudioStop. Trivial patch + attached. + + fdi/information/10freedesktop/30-keymap-misc.fdi | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 5aaaf7cdadfdad4d1aa661739c9f43deaade8124 +Author: Tomasz Dominikowski <dominikowski(a)gmail.com> +Date: Fri Dec 5 16:22:14 2008 -0800 + + add a bunch of Nokia mobile modems + + Add support for the following Nokia E-series and N-series as modems: + + E61i/E60/N93/N71/N77/N90/N91/N80/E62/N76/N73/N92/N72/E50/N75/N93i/E65/N78 + + This I believe is only missing N85 for complete N and E-series + support, but I couldn't find a phone or any information about the + product ID. Anyway, will attach the patch. Hopefully this goes + upstream as the other ones. + + Nokia Nseries and Eseries are all S60 Symbian phones, they all provide + the same modem functionality. The NNNN model numbering scheme would + also work as modems, but adding them should follow some testing, as + most of them are S40, not S60 phones. + + This was taken mostly from http://listing.driveragent.com/usb/0421 and + other websites (cross-referencing the findings to make sure this is + the real deal) and my own sources. + + fdi/information/10freedesktop/10-modem.fdi | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 1627a80ed511433d4ba4e0d70b3227b59d510cc0 +Author: Dan Williams <dcbw(a)redhat.com> +Date: Fri Dec 5 13:14:41 2008 -0500 + + modem: add ZTE MF626 + + fdi/information/10freedesktop/10-modem.fdi | 9 ++++++++- + 1 files changed, 8 insertions(+), 1 deletions(-) + +commit 8912ec2b5d0a221a74156c047b18a26b2d916e13 +Author: Dan Williams <dcbw(a)redhat.com> +Date: Fri Dec 5 13:09:02 2008 -0500 + + modem: add Sierra MC8790 + + fdi/information/10freedesktop/10-modem.fdi | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + commit 6c4e55ad8798c84ae96ca00bf3ef9a3752e0ee0f Author: Danny Kukawka <danny.kukawka(a)web.de> Date: Fri Dec 5 15:38:10 2008 +0100 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/configure new/hal-info-20081218/configure --- old/hal-info-20081205/configure 2008-12-05 15:32:44.000000000 +0100 +++ new/hal-info-20081218/configure 2008-12-18 17:06:01.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for hal-info 20081205. +# Generated by GNU Autoconf 2.61 for hal-info 20081218. # # Report bugs to <hal(a)lists.freedesktop.org>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='hal-info' PACKAGE_TARNAME='hal-info' -PACKAGE_VERSION='20081205' -PACKAGE_STRING='hal-info 20081205' +PACKAGE_VERSION='20081218' +PACKAGE_STRING='hal-info 20081218' PACKAGE_BUGREPORT='hal(a)lists.freedesktop.org' ac_subst_vars='SHELL @@ -659,6 +659,8 @@ BUILD_RECALL_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE +BUILD_VIDEO_NVIDIA_QUIRKS_TRUE +BUILD_VIDEO_NVIDIA_QUIRKS_FALSE BUILD_VIDEO_DEFAULT_QUIRKS_TRUE BUILD_VIDEO_DEFAULT_QUIRKS_FALSE BUILD_KEYMAPS_TRUE @@ -1191,7 +1193,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 hal-info 20081205 to adapt to many kinds of systems. +\`configure' configures hal-info 20081218 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1257,7 +1259,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hal-info 20081205:";; + short | recursive ) echo "Configuration of hal-info 20081218:";; esac cat <<\_ACEOF @@ -1268,7 +1270,8 @@ --enable-dependency-tracking do not reject slow dependency extractors --enable-recall include recall data --enable-video include video suspend data - --enable-video-default-quirks include video suspend data + --enable-video-nvidia-quirks include NVIDIA video suspend data + --enable-video-default-quirks include default video suspend data --enable-keymaps include key mapping data --enable-killswitch-dell-wlan Include support for Dell WLAN killswitch --enable-killswitch-dell-bluetooth Include support for Dell Bluetooth killswitch @@ -1352,7 +1355,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -hal-info configure 20081205 +hal-info configure 20081218 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1366,7 +1369,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hal-info $as_me 20081205, which was +It was created by hal-info $as_me 20081218, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2056,7 +2059,7 @@ # Define the identity of the package. PACKAGE=hal-info - VERSION=20081205 + VERSION=20081218 cat >>confdefs.h <<_ACEOF @@ -3469,6 +3472,22 @@ # Check whether --enable-video_default_quirks was given. if test "${enable_video_default_quirks+set}" = set; then + enableval=$enable_video_default_quirks; enable_video_nvidia_quirks=$enableval +else + enable_video_nvidia_quirks=yes +fi + + if test x$enable_video_nvidia_quirks == xyes; then + BUILD_VIDEO_NVIDIA_QUIRKS_TRUE= + BUILD_VIDEO_NVIDIA_QUIRKS_FALSE='#' +else + BUILD_VIDEO_NVIDIA_QUIRKS_TRUE='#' + BUILD_VIDEO_NVIDIA_QUIRKS_FALSE= +fi + + +# Check whether --enable-video_default_quirks was given. +if test "${enable_video_default_quirks+set}" = set; then enableval=$enable_video_default_quirks; enable_video_default_quirks=$enableval else enable_video_default_quirks=yes @@ -3737,6 +3756,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${BUILD_VIDEO_NVIDIA_QUIRKS_TRUE}" && test -z "${BUILD_VIDEO_NVIDIA_QUIRKS_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"BUILD_VIDEO_NVIDIA_QUIRKS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"BUILD_VIDEO_NVIDIA_QUIRKS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${BUILD_VIDEO_DEFAULT_QUIRKS_TRUE}" && test -z "${BUILD_VIDEO_DEFAULT_QUIRKS_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"BUILD_VIDEO_DEFAULT_QUIRKS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -4100,7 +4126,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hal-info $as_me 20081205, which was +This file was extended by hal-info $as_me 20081218, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4153,7 +4179,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -hal-info config.status 20081205 +hal-info config.status 20081218 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -4421,6 +4447,8 @@ BUILD_RECALL_FALSE!$BUILD_RECALL_FALSE$ac_delim BUILD_VIDEO_TRUE!$BUILD_VIDEO_TRUE$ac_delim BUILD_VIDEO_FALSE!$BUILD_VIDEO_FALSE$ac_delim +BUILD_VIDEO_NVIDIA_QUIRKS_TRUE!$BUILD_VIDEO_NVIDIA_QUIRKS_TRUE$ac_delim +BUILD_VIDEO_NVIDIA_QUIRKS_FALSE!$BUILD_VIDEO_NVIDIA_QUIRKS_FALSE$ac_delim BUILD_VIDEO_DEFAULT_QUIRKS_TRUE!$BUILD_VIDEO_DEFAULT_QUIRKS_TRUE$ac_delim BUILD_VIDEO_DEFAULT_QUIRKS_FALSE!$BUILD_VIDEO_DEFAULT_QUIRKS_FALSE$ac_delim BUILD_KEYMAPS_TRUE!$BUILD_KEYMAPS_TRUE$ac_delim @@ -4435,8 +4463,6 @@ BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE!$BUILD_KILLSWITCH_SONY_BLUETOOTH_FALSE$ac_delim BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE!$BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_TRUE$ac_delim BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE!$BUILD_KILLSWITCH_THINKPAD_BLUETOOTH_FALSE$ac_delim -BUILD_KILLSWITCH_IPW_WLAN_TRUE!$BUILD_KILLSWITCH_IPW_WLAN_TRUE$ac_delim -BUILD_KILLSWITCH_IPW_WLAN_FALSE!$BUILD_KILLSWITCH_IPW_WLAN_FALSE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -4478,13 +4504,15 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +BUILD_KILLSWITCH_IPW_WLAN_TRUE!$BUILD_KILLSWITCH_IPW_WLAN_TRUE$ac_delim +BUILD_KILLSWITCH_IPW_WLAN_FALSE!$BUILD_KILLSWITCH_IPW_WLAN_FALSE$ac_delim BUILD_KILLSWITCH_IWL_WLAN_TRUE!$BUILD_KILLSWITCH_IWL_WLAN_TRUE$ac_delim BUILD_KILLSWITCH_IWL_WLAN_FALSE!$BUILD_KILLSWITCH_IWL_WLAN_FALSE$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -5102,6 +5130,7 @@ hardware recall data: ${enable_recall} video suspend data: ${enable_video} video suspend default quirks: ${enable_video_default_quirks} + video suspend default NVIDIA quirks: ${enable_video_nvidia_quirks} killswitch support for Dell wlan: ${enable_killswitch_dell_wlan} killswitch support for Dell Bluetooth: ${enable_killswitch_dell_bluetooth} killswitch support for Dell wwan: ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/configure.in new/hal-info-20081218/configure.in --- old/hal-info-20081205/configure.in 2008-12-05 15:30:51.000000000 +0100 +++ new/hal-info-20081218/configure.in 2008-12-18 17:05:40.000000000 +0100 @@ -31,7 +31,13 @@ dnl --------------------------------------------------------------------------- dnl - Should we ship the video suspend data dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(video_default_quirks, [ --enable-video-default-quirks include video suspend data],enable_video_default_quirks=$enableval,enable_video_default_quirks=yes) +AC_ARG_ENABLE(video_default_quirks, [ --enable-video-nvidia-quirks include NVIDIA video suspend data],enable_video_nvidia_quirks=$enableval,enable_video_nvidia_quirks=yes) +AM_CONDITIONAL(BUILD_VIDEO_NVIDIA_QUIRKS, test x$enable_video_nvidia_quirks == xyes) + +dnl --------------------------------------------------------------------------- +dnl - Should we ship the video suspend data +dnl --------------------------------------------------------------------------- +AC_ARG_ENABLE(video_default_quirks, [ --enable-video-default-quirks include default video suspend data],enable_video_default_quirks=$enableval,enable_video_default_quirks=yes) AM_CONDITIONAL(BUILD_VIDEO_DEFAULT_QUIRKS, test x$enable_video_default_quirks == xyes) dnl --------------------------------------------------------------------------- @@ -113,6 +119,7 @@ hardware recall data: ${enable_recall} video suspend data: ${enable_video} video suspend default quirks: ${enable_video_default_quirks} + video suspend default NVIDIA quirks: ${enable_video_nvidia_quirks} killswitch support for Dell wlan: ${enable_killswitch_dell_wlan} killswitch support for Dell Bluetooth: ${enable_killswitch_dell_bluetooth} killswitch support for Dell wwan: ${enable_killswitch_dell_wwan} (requires hal >= 0.5.11) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/10-modem.fdi new/hal-info-20081218/fdi/information/10freedesktop/10-modem.fdi --- old/hal-info-20081205/fdi/information/10freedesktop/10-modem.fdi 2008-12-05 15:30:51.000000000 +0100 +++ new/hal-info-20081218/fdi/information/10freedesktop/10-modem.fdi 2008-12-18 17:05:40.000000000 +0100 @@ -40,8 +40,8 @@  <match key="@info.parent:usb.vendor_id" int="0x421"> -  - <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x71;0x72;0xb0"> +  + <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce;0x43a;0x44d;0x070;0x3a;0x71;0x72;0xb0;0x01;0x419;0x420;0x425;0x00e;0x432;0x42f;0x445;0x475;0x481;0x486;0x48e;0x4c4;0x4c9;0x4df;0x04e6;0x508;0x078"> <match key="@info.parent:usb.interface.class" int="0x02"> <match key="@info.parent:usb.interface.subclass" int="0x02"> <append key="modem.command_sets" type="strlist">GSM-07.07</append> @@ -194,8 +194,8 @@ </match> </match> </match> -  - <match key="@info.parent:usb.product_id" int_outof="0x6802;0x6804;0x6803;0x6812;0x6813;0x6820;0x6832;0x6833;0x6850;0x6851;0x6852;0x6853;0x6855;0x6856"> +  + <match key="@info.parent:usb.product_id" int_outof="0x6802;0x6804;0x6803;0x6812;0x6813;0x6820;0x6832;0x6833;0x683c;0x6850;0x6851;0x6852;0x6853;0x6855;0x6856"> <match key="@info.parent:usb.interface.number" int="0"> <match key="serial.port" int="0"> <append key="modem.command_sets" type="strlist">GSM-07.07</append> @@ -289,6 +289,13 @@ <append key="modem.command_sets" type="strlist">IS-707-A</append> </match> </match> +  + <match key="@info.parent:usb.product_id" int="0x2000"> + <match key="@info.parent:usb.interface.number" int="0"> + <append key="modem.command_sets" type="strlist">GSM-07.07</append> + <append key="modem.command_sets" type="strlist">GSM-07.05</append> + </match> + </match>  <match key="@info.parent:usb.product_id" int="0x0015"> <match key="@info.parent:usb.interface.number" int="3"> @@ -297,7 +304,7 @@ </match> </match>  - <match key="@info.parent:usb.product_id" int="0x002"> + <match key="@info.parent:usb.product_id" int="0x0002"> <match key="@info.parent:usb.interface.number" int="2"> <append key="modem.command_sets" type="strlist">GSM-07.07</append> <append key="modem.command_sets" type="strlist">GSM-07.05</append> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20081218/fdi/information/10freedesktop/10-usb-music-players.fdi --- old/hal-info-20081205/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-12-05 15:30:51.000000000 +0100 +++ new/hal-info-20081218/fdi/information/10freedesktop/10-usb-music-players.fdi 2008-12-18 17:05:40.000000000 +0100 @@ -75,8 +75,8 @@  <match key="@storage.originating_device:usb.vendor_id" int="0x421"> -  - <match key="@storage.originating_device:usb.product_id" int_outof="0x431;0x4c3"> +  + <match key="@storage.originating_device:usb.product_id" int_outof="0x431;0x4c3;0x96"> <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset> <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append> <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi new/hal-info-20081218/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi --- old/hal-info-20081205/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-12-05 15:30:51.000000000 +0100 +++ new/hal-info-20081218/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi 2008-12-18 17:05:40.000000000 +0100 @@ -68,9 +68,14 @@ </match> <match key="system.hardware.vendor" prefix="Hewlett-Packard"> - <match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV); 6715s;6820s; 8510w"> + <match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV); 6715s;6820s"> <merge key="power_management.quirk.s3_bios" type="bool">true</merge> </match> + <match key="system.hardware.product" contains=" 8510w"> + <match key="system.hardware.primary_video.vendor" int="0x1002"> + <merge key="power_management.quirk.s3_bios" type="bool">true</merge> + </match> + </match> <match key="system.hardware.product" contains="HP OmniBook XT1000"> <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi new/hal-info-20081218/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi --- old/hal-info-20081205/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-12-05 15:30:51.000000000 +0100 +++ new/hal-info-20081218/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi 2008-12-18 17:05:40.000000000 +0100 @@ -67,7 +67,7 @@ <merge key="power_management.quirk.s3_mode" type="bool">true</merge> </match>  - <match key="system.hardware.product" prefix_outof="1846;2886"> + <match key="system.hardware.product" prefix_outof="1846;1847;2886"> <merge key="power_management.quirk.vbe_post" type="bool">true</merge> <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> </match> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/30-keymap-misc.fdi new/hal-info-20081218/fdi/information/10freedesktop/30-keymap-misc.fdi --- old/hal-info-20081205/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-12-05 15:31:18.000000000 +0100 +++ new/hal-info-20081218/fdi/information/10freedesktop/30-keymap-misc.fdi 2008-12-18 17:05:40.000000000 +0100 @@ -136,7 +136,7 @@ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="TOSHIBA"> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="SATELLITE A100"> - <append key="input.keymap.data" type="strlist">e024:stop</append> + <append key="input.keymap.data" type="strlist">e024:stopcd</append> <append key="input.keymap.data" type="strlist">e032:www</append> </match> <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" string="Satellite A110"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/Makefile.am new/hal-info-20081218/fdi/information/10freedesktop/Makefile.am --- old/hal-info-20081205/fdi/information/10freedesktop/Makefile.am 2008-12-05 15:30:51.000000000 +0100 +++ new/hal-info-20081218/fdi/information/10freedesktop/Makefile.am 2008-12-18 17:05:40.000000000 +0100 @@ -65,8 +65,11 @@ 20-video-quirk-pm-misc.fdi \ 20-video-quirk-pm-samsung.fdi \ 20-video-quirk-pm-sony.fdi \ - 20-video-quirk-pm-toshiba.fdi \ - 21-video-quirk-nvidia.fdi + 20-video-quirk-pm-toshiba.fdi + +if BUILD_VIDEO_NVIDIA_QUIRKS +dist_fdi_DATA += 21-video-quirk-nvidia.fdi +endif if BUILD_VIDEO_DEFAULT_QUIRKS dist_fdi_DATA += 99-video-quirk-default.fdi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20081205/fdi/information/10freedesktop/Makefile.in new/hal-info-20081218/fdi/information/10freedesktop/Makefile.in --- old/hal-info-20081205/fdi/information/10freedesktop/Makefile.in 2008-12-05 15:32:42.000000000 +0100 +++ new/hal-info-20081218/fdi/information/10freedesktop/Makefile.in 2008-12-18 17:06:00.000000000 +0100 @@ -57,11 +57,11 @@ @BUILD_VIDEO_TRUE@ 20-video-quirk-pm-misc.fdi \ @BUILD_VIDEO_TRUE@ 20-video-quirk-pm-samsung.fdi \ @BUILD_VIDEO_TRUE@ 20-video-quirk-pm-sony.fdi \ -@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-toshiba.fdi \ -@BUILD_VIDEO_TRUE@ 21-video-quirk-nvidia.fdi +@BUILD_VIDEO_TRUE@ 20-video-quirk-pm-toshiba.fdi -@BUILD_VIDEO_DEFAULT_QUIRKS_TRUE@@BUILD_VIDEO_TRUE@am__append_10 = 99-video-quirk-default.fdi -@BUILD_KEYMAPS_TRUE@am__append_11 = \ +@BUILD_VIDEO_NVIDIA_QUIRKS_TRUE@@BUILD_VIDEO_TRUE@am__append_10 = 21-video-quirk-nvidia.fdi +@BUILD_VIDEO_DEFAULT_QUIRKS_TRUE@@BUILD_VIDEO_TRUE@am__append_11 = 99-video-quirk-default.fdi +@BUILD_KEYMAPS_TRUE@am__append_12 = \ @BUILD_KEYMAPS_TRUE@ 30-keymap-module-sony-laptop.fdi \ @BUILD_KEYMAPS_TRUE@ 30-keymap-module-thinkpad-acpi.fdi \ @BUILD_KEYMAPS_TRUE@ 30-keymap-misc.fdi \ @@ -211,7 +211,8 @@ 10-usb-obex.fdi $(am__append_1) $(am__append_2) \ $(am__append_3) $(am__append_4) $(am__append_5) \ $(am__append_6) $(am__append_7) $(am__append_8) \ - $(am__append_9) $(am__append_10) $(am__append_11) + $(am__append_9) $(am__append_10) $(am__append_11) \ + $(am__append_12) all: all-am .SUFFIXES: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 elfutils for openSUSE:Factory
by root＠Hilbert.suse.de 19 Dec '08

19 Dec '08

Hello community, here is the log from the commit of package elfutils for openSUSE:Factory checked in at Fri Dec 19 15:10:59 CET 2008. -------- --- elfutils/elfutils.changes 2008-11-25 13:13:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/elfutils/elfutils.changes 2008-12-16 13:50:16.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 16 13:48:38 CET 2008 - tiwai(a)suse.de + +- Fix dwfl_getmodules(), assert in systemtap (bnc#448331) +- Fix libebl1 dependency +- Fix crashes of elfutils binaries, backports from upstream + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- elfutils-0.137-dwfl_getmodules-fixes.diff elfutils-0.137-i386-rel-types.diff elfutils-0.137-main-bias-fix.diff elfutils-0.137-nm-crash-fix.diff elfutils-0.137-readelf-crash-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elfutils.spec ++++++ --- /var/tmp/diff_new_pack.h16670/_old 2008-12-19 15:08:37.000000000 +0100 +++ /var/tmp/diff_new_pack.h16670/_new 2008-12-19 15:08:37.000000000 +0100 @@ -21,10 +21,11 @@ Name: elfutils License: GPL v2 or later Version: 0.137 -Release: 3 +Release: 4 Summary: Higher-level library to access ELF Group: System/Libraries Url: http://elfutils.fedorahosted.org +Recommends: libebl1 Source: elfutils-%{version}-no-osl.tar.bz2 Patch: elfutils-portability.patch Patch1: elfutils-robustify.patch @@ -35,6 +36,11 @@ Patch10: test.diff Patch11: build.diff Patch20: elfutils-0.137-fixes.patch +Patch21: elfutils-0.137-dwfl_getmodules-fixes.diff +Patch22: elfutils-0.137-i386-rel-types.diff +Patch23: elfutils-0.137-readelf-crash-fix.diff +Patch24: elfutils-0.137-nm-crash-fix.diff +Patch25: elfutils-0.137-main-bias-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,6 +100,7 @@ Summary: A collection of utilities and DSOs to handle compiled objects Group: Development/Tools/Other License: GPL v2 or later +Requires: libdw1 = %{version}-%{release} Provides: libebl = %{version} Obsoletes: libebl < %{version} @@ -199,6 +206,11 @@ #%patch10 -p1 %patch11 -p1 %patch20 -p1 +%patch21 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 %build autoreconf -fi @@ -210,14 +222,10 @@ # remove unneeded files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%post -n libebl1 -p /sbin/ldconfig - %post -n libelf1 -p /sbin/ldconfig %post -n libdw1 -p /sbin/ldconfig -%postun -n libebl1 -p /sbin/ldconfig - %postun -n libelf1 -p /sbin/ldconfig %postun -n libdw1 -p /sbin/ldconfig @@ -283,6 +291,10 @@ %{_includedir}/elfutils/libdwfl.h %changelog +* Tue Dec 16 2008 tiwai(a)suse.de +- Fix dwfl_getmodules(), assert in systemtap (bnc#448331) +- Fix libebl1 dependency +- Fix crashes of elfutils binaries, backports from upstream * Tue Nov 25 2008 tiwai(a)suse.de - fix libdwfl regression with realloc DWFL->lookup_module in the fix patch (bnc#448331, likely bnc#445783) ++++++ elfutils-0.137-dwfl_getmodules-fixes.diff ++++++ From: Roland McGrath <roland(a)redhat.com> Date: Wed, 3 Dec 2008 03:41:58 +0000 (+0000) Subject: src/ X-Git-Url: http://git.fedorahosted.org/git/elfutils.git?p=elfutils.git;a=commitdiff_pl… src/ 2008-12-02 Roland McGrath <roland(a)redhat.com> * readelf.c (count_dwflmod, process_file): Don't presume encoding of nonzero OFFSET argument to dwfl_getmodules. --- diff --git a/backends/Makefile.am b/backends/Makefile.am index ebf6b09..5b55294 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -146,7 +146,7 @@ uninstall: uninstall-am done rmdir --ignore-fail-on-non-empty $(DESTDIR)$(libdir)/$(LIBEBL_SUBDIR) -noinst_HEADERS = libebl_CPU.h common-reloc.c linux-core-note.c +noinst_HEADERS = libebl_CPU.h common-reloc.c linux-core-note.c x86_corenote.c EXTRA_DIST = $(foreach m,$(modules),$($(m)_SRCS)) $(modules:=_reloc.def) CLEANFILES = *.gcno *.gcda \ diff --git a/backends/i386_corenote.c b/backends/i386_corenote.c index 02d8ec3..c371c4c 100644 --- a/backends/i386_corenote.c +++ b/backends/i386_corenote.c @@ -103,9 +103,8 @@ static const Ebl_Register_Location prxfpreg_regs[] = #define EXTRA_NOTES \ EXTRA_REGSET (NT_PRFPXREG, 512, prxfpreg_regs) \ case NT_386_TLS: \ - return tls_info (descsz, regs_offset, nregloc, reglocs, nitems, items); - -#define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ + return tls_info (descsz, regs_offset, nregloc, reglocs, nitems, items); \ + EXTRA_NOTES_IOPERM static const Ebl_Core_Item tls_items[] = { @@ -131,4 +130,5 @@ tls_info (GElf_Word descsz, GElf_Word *regs_offset, return 1; } +#include "x86_corenote.c" #include "linux-core-note.c" diff --git a/backends/x86_64_corenote.c b/backends/x86_64_corenote.c index c2bc72e..552ac88 100644 --- a/backends/x86_64_corenote.c +++ b/backends/x86_64_corenote.c @@ -1,5 +1,5 @@ /* x86-64 specific core note handling. - Copyright (C) 2005, 2007 Red Hat, Inc. + Copyright (C) 2005, 2007, 2008 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -103,4 +103,7 @@ static const Ebl_Register_Location fpregset_regs[] = }; #define FPREGSET_SIZE 512 +#define EXTRA_NOTES EXTRA_NOTES_IOPERM + +#include "x86_corenote.c" #include "linux-core-note.c" diff --git a/backends/x86_corenote.c b/backends/x86_corenote.c new file mode 100644 index 0000000..7d55067 --- /dev/null +++ b/backends/x86_corenote.c @@ -0,0 +1,47 @@ +/* x86-specific core note handling, pieces common to x86-64 and i386. + Copyright (C) 2005, 2008 Red Hat, Inc. + This file is part of Red Hat elfutils. + + Red Hat elfutils is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by the + Free Software Foundation; version 2 of the License. + + Red Hat elfutils is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with Red Hat elfutils; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. + + Red Hat elfutils is an included package of the Open Invention Network. + An included package of the Open Invention Network is a package for which + Open Invention Network licensees cross-license their patents. No patent + license is granted, either expressly or impliedly, by designation as an + included package. Should you wish to participate in the Open Invention + Network licensing program, please visit www.openinventionnetwork.com + <http://www.openinventionnetwork.com>. */ + +#define EXTRA_NOTES_IOPERM \ + case NT_386_IOPERM: \ + return ioperm_info (descsz, regs_offset, nregloc, reglocs, nitems, items); + +static int +ioperm_info (GElf_Word descsz, GElf_Word *regs_offset, + size_t *nregloc, const Ebl_Register_Location **reglocs, + size_t *nitems, const Ebl_Core_Item **items) +{ + static const Ebl_Core_Item ioperm_item = + { .type = ELF_T_WORD, .format = 'b', .name = "ioperm" }; + + if (descsz % 4 != 0) + return 0; + + *regs_offset = 0; + *nregloc = 0; + *reglocs = NULL; + *nitems = 1; + *items = &ioperm_item; + return 1; +} diff --git a/libdwfl/dwfl_getmodules.c b/libdwfl/dwfl_getmodules.c index f205b89..7c6ab97 100644 --- a/libdwfl/dwfl_getmodules.c +++ b/libdwfl/dwfl_getmodules.c @@ -59,49 +59,55 @@ dwfl_getmodules (Dwfl *dwfl, if (dwfl == NULL) return -1; + /* We iterate through the linked list when it's all we have. + But continuing from an offset is slow that way. So when + DWFL->lookup_module is populated, we can instead keep our + place by jumping directly into the array. Since the actions + of a callback could cause it to get populated, we must + choose the style of place-holder when we return an offset, + and we encode the choice in the low bits of that value. */ + Dwfl_Module *m = dwfl->modulelist; - if (unlikely (dwfl->lookup_module == NULL)) + if ((offset & 3) == 1) { + offset >>= 2; for (ptrdiff_t pos = 0; pos < offset; ++pos) if (m == NULL) return -1; else m = m->next; - while (m != NULL) - { - ++offset; - if ((*callback) (MODCB_ARGS (m), arg) != DWARF_CB_OK) - return offset; - m = m->next; - } } - else + else if (((offset & 3) == 2) && likely (dwfl->lookup_module != NULL)) { - if (offset > 0) - { - if ((size_t) offset - 1 == dwfl->lookup_elts) - return 0; + offset >>= 2; - if (unlikely ((size_t) offset - 1 > dwfl->lookup_elts)) - return -1; + if ((size_t) offset - 1 == dwfl->lookup_elts) + return 0; - m = dwfl->lookup_module[offset - 1]; - if (unlikely (m == NULL)) - return -1; - } + if (unlikely ((size_t) offset - 1 > dwfl->lookup_elts)) + return -1; - while (m != NULL) - { - int ok = (*callback) (MODCB_ARGS (m), arg); - m = m->next; - if (ok != DWARF_CB_OK) - return (m == NULL - ? (ptrdiff_t) dwfl->lookup_elts + 1 - : m->segment + 1); - } + m = dwfl->lookup_module[offset - 1]; + if (unlikely (m == NULL)) + return -1; + } + else if (offset != 0) + { + __libdwfl_seterrno (DWFL_E_BADSTROFF); + return -1; } + while (m != NULL) + { + int ok = (*callback) (MODCB_ARGS (m), arg); + ++offset; + m = m->next; + if (ok != DWARF_CB_OK) + return ((dwfl->lookup_module == NULL) ? ((offset << 2) | 1) + : (((m == NULL ? (ptrdiff_t) dwfl->lookup_elts + 1 + : m->segment + 1) << 2) | 2)); + } return 0; } INTDEF (dwfl_getmodules) diff --git a/libdwfl/dwfl_module_build_id.c b/libdwfl/dwfl_module_build_id.c index 903b79c..8725afb 100644 --- a/libdwfl/dwfl_module_build_id.c +++ b/libdwfl/dwfl_module_build_id.c @@ -1,5 +1,5 @@ /* Return build ID information for a module. - Copyright (C) 2007 Red Hat, Inc. + Copyright (C) 2007, 2008 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -88,7 +88,8 @@ check_notes (Dwfl_Module *mod, bool set, Elf_Data *data, GElf_Addr data_vaddr) "GNU", sizeof "GNU")) return found_build_id (mod, set, data->d_buf + desc_pos, nhdr.n_descsz, - data_vaddr == NO_VADDR ? 0 : data_vaddr + pos); + data_vaddr == NO_VADDR ? 0 + : data_vaddr + desc_pos); return 0; } diff --git a/libebl/eblcorenotetypename.c b/libebl/eblcorenotetypename.c index d01932f..9376cf5 100644 --- a/libebl/eblcorenotetypename.c +++ b/libebl/eblcorenotetypename.c @@ -56,7 +56,6 @@ #include <stdio.h> #include <libeblP.h> - const char * ebl_core_note_type_name (ebl, type, buf, len) Ebl *ebl; @@ -101,6 +100,7 @@ ebl_core_note_type_name (ebl, type, buf, len) KNOWNSTYPE (PPC_VMX); KNOWNSTYPE (PPC_SPE); KNOWNSTYPE (386_TLS); + KNOWNSTYPE (386_IOPERM); #undef KNOWNSTYPE default: diff --git a/libelf/elf.h b/libelf/elf.h index a413446..b4d3475 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -608,7 +608,9 @@ typedef struct #define NT_PRXFPREG 0x46e62b7f /* Contains copy of user_fxsr_struct */ #define NT_PPC_VMX 0x100 /* PowerPC Altivec/VMX registers */ #define NT_PPC_SPE 0x101 /* PowerPC SPE/EVR registers */ +#define NT_PPC_VSX 0x102 /* PowerPC VSX registers */ #define NT_386_TLS 0x200 /* i386 TLS slots (struct user_desc) */ +#define NT_386_IOPERM 0x201 /* x86 io permission bitmap (1=deny) */ /* Legal values for the note segment descriptor types for object files. */ @@ -1397,6 +1399,7 @@ typedef struct #define STO_MIPS_INTERNAL 0x1 #define STO_MIPS_HIDDEN 0x2 #define STO_MIPS_PROTECTED 0x3 +#define STO_MIPS_PLT 0x8 #define STO_MIPS_SC_ALIGN_UNUSED 0xff /* MIPS specific values for `st_info'. */ @@ -1543,8 +1546,10 @@ typedef struct #define R_MIPS_TLS_TPREL_HI16 49 /* TP-relative offset, high 16 bits */ #define R_MIPS_TLS_TPREL_LO16 50 /* TP-relative offset, low 16 bits */ #define R_MIPS_GLOB_DAT 51 +#define R_MIPS_COPY 126 +#define R_MIPS_JUMP_SLOT 127 /* Keep this the last entry. */ -#define R_MIPS_NUM 52 +#define R_MIPS_NUM 128 /* Legal values for p_type field of Elf32_Phdr. */ @@ -1610,7 +1615,13 @@ typedef struct #define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */ #define DT_MIPS_GP_VALUE 0x70000030 /* GP value for aux GOTs. */ #define DT_MIPS_AUX_DYNAMIC 0x70000031 /* Address of aux .dynamic. */ -#define DT_MIPS_NUM 0x32 +/* The address of .got.plt in an executable using the new non-PIC ABI. */ +#define DT_MIPS_PLTGOT 0x70000032 +/* The base of the PLT in an executable using the new non-PIC ABI if that + PLT is writable. For a non-writable PLT, this is omitted or has a zero + value. */ +#define DT_MIPS_RWPLT 0x70000034 +#define DT_MIPS_NUM 0x35 /* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */ diff --git a/libelf/elf_getarhdr.c b/libelf/elf_getarhdr.c index deeb56d..875b2a1 100644 --- a/libelf/elf_getarhdr.c +++ b/libelf/elf_getarhdr.c @@ -1,5 +1,5 @@ /* Read header of next archive member. - Copyright (C) 1998, 1999, 2000, 2002 Red Hat, Inc. + Copyright (C) 1998, 1999, 2000, 2002, 2008 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper <drepper(a)redhat.com>, 1998. @@ -63,6 +63,9 @@ Elf_Arhdr * elf_getarhdr (elf) Elf *elf; { + if (elf == NULL) + return NULL; + Elf *parent = elf->parent; /* Calling this function is not ok for any file type but archives. */ @@ -78,7 +81,6 @@ elf_getarhdr (elf) /* Something went wrong. Maybe there is no member left. */ return NULL; - /* We can be sure the parent is an archive. */ assert (parent->kind == ELF_K_AR); diff --git a/src/ChangeLog b/src/ChangeLog index 4ef23a2..fb17835 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-12-02 Roland McGrath <roland(a)redhat.com> + + * readelf.c (count_dwflmod, process_file): Don't presume encoding of + nonzero OFFSET argument to dwfl_getmodules. + 2008-08-07 Roland McGrath <roland(a)redhat.com> * addr2line.c (main): Pass string to handle_address. diff --git a/src/readelf.c b/src/readelf.c index 7b599ec..2797a84 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -459,8 +459,10 @@ count_dwflmod (Dwfl_Module *dwflmod __attribute__ ((unused)), Dwarf_Addr base __attribute__ ((unused)), void *arg) { - *(bool *) arg = false; - return DWARF_CB_ABORT; + if (*(bool *) arg) + return DWARF_CB_ABORT; + *(bool *) arg = true; + return DWARF_CB_OK; } struct process_dwflmod_args @@ -548,8 +550,11 @@ process_file (int fd, const char *fname, bool only_one) dwfl_report_end (dwfl, NULL, NULL); if (only_one) - /* Clear ONLY_ONE if we have multiple modules, from an archive. */ - dwfl_getmodules (dwfl, &count_dwflmod, &only_one, 1); + { + /* Clear ONLY_ONE if we have multiple modules, from an archive. */ + bool seen = false; + only_one = dwfl_getmodules (dwfl, &count_dwflmod, &seen, 0) == 0; + } /* Process the one or more modules gleaned from this file. */ struct process_dwflmod_args a = { .fd = fd, .only_one = only_one }; diff --git a/tests/ChangeLog b/tests/ChangeLog index 15e3818..b1471c1 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,15 @@ +2008-11-26 Roland McGrath <roland(a)redhat.com> + + * dwfl-bug-getmodules.c: New file. + * Makefile.am (noinst_PROGRAMS): Add it. + (dwfl_bug_getmodules_LDADD): New variable. + +2008-09-10 Roland McGrath <roland(a)redhat.com> + + * test-subr.sh (LC_ALL): Export it set to "C". + * run-dwfl-addr-sect.sh: Don't do it here. + * run-strings-test.sh: Likewise. + 2008-08-21 Denys Vlasenko <dvlasenk(a)redhat.com> * run-addrname-test.sh: Add a new case. diff --git a/tests/Makefile.am b/tests/Makefile.am index f57e432..b533521 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -59,7 +59,8 @@ noinst_PROGRAMS = arextract arsymtest newfile saridx scnnames sectiondump \ show-abbrev hash newscn ecp dwflmodtest \ find-prologues funcretval allregs rdwrmmap \ dwfl-bug-addr-overflow arls dwfl-bug-fd-leak \ - dwfl-addr-sect dwfl-bug-report early-offscn + dwfl-addr-sect dwfl-bug-report early-offscn \ + dwfl-bug-getmodules # get-ciefde asm_TESTS = asm-tst1 asm-tst2 asm-tst3 asm-tst4 asm-tst5 \ asm-tst6 asm-tst7 asm-tst8 asm-tst9 @@ -229,6 +230,7 @@ dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl arls_LDADD = $(libelf) $(libmudflap) dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl +dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl sha1_tst_LDADD = $(libeu) $(libmudflap) diff --git a/tests/dwfl-bug-getmodules.c b/tests/dwfl-bug-getmodules.c new file mode 100644 index 0000000..f7042c0 --- /dev/null +++ b/tests/dwfl-bug-getmodules.c @@ -0,0 +1,74 @@ +/* Test program for dwfl_getmodules bug. + Copyright (C) 2008 Red Hat, Inc. + This file is part of Red Hat elfutils. + + Red Hat elfutils is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by the + Free Software Foundation; version 2 of the License. + + Red Hat elfutils is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License along + with Red Hat elfutils; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA. + + Red Hat elfutils is an included package of the Open Invention Network. + An included package of the Open Invention Network is a package for which + Open Invention Network licensees cross-license their patents. No patent + license is granted, either expressly or impliedly, by designation as an + included package. Should you wish to participate in the Open Invention + Network licensing program, please visit www.openinventionnetwork.com + <http://www.openinventionnetwork.com>. */ + +#include <config.h> +#include ELFUTILS_HEADER(dwfl) + +#include <error.h> + +static const Dwfl_Callbacks callbacks = + { + .find_elf = dwfl_linux_proc_find_elf, + .find_debuginfo = dwfl_standard_find_debuginfo, + }; + +static int +iterate (Dwfl_Module *mod __attribute__ ((unused)), + void **userdata __attribute__ ((unused)), + const char *name __attribute__ ((unused)), + Dwarf_Addr base, void *arg) +{ + if (base != 0x2000) + return DWARF_CB_OK; + + if (dwfl_addrmodule (arg, 0x2100) == NULL) + error (1, 0, "dwfl_addrmodule: %s", dwfl_errmsg (-1)); + + return DWARF_CB_ABORT; +} + +int +main (void) +{ + Dwfl *dwfl = dwfl_begin (&callbacks); + + dwfl_report_module (dwfl, "m1", 0, 0x1000); + dwfl_report_module (dwfl, "m2", 0x2000, 0x3000); + dwfl_report_module (dwfl, "m3", 0x4000, 0x5000); + + dwfl_report_end (dwfl, NULL, NULL); + + ptrdiff_t offset = dwfl_getmodules (dwfl, &iterate, dwfl, 0); + if (offset <= 0) + error (1, 0, "dwfl_getmodules: %s", dwfl_errmsg (-1)); + + offset = dwfl_getmodules (dwfl, &iterate, NULL, offset); + if (offset != 0) + error (1, 0, "dwfl_getmodules (%d): %s", (int) offset, dwfl_errmsg (-1)); + + dwfl_end (dwfl); + + return 0; +} diff --git a/tests/run-dwfl-addr-sect.sh b/tests/run-dwfl-addr-sect.sh index 69280f5..98666f3 100755 --- a/tests/run-dwfl-addr-sect.sh +++ b/tests/run-dwfl-addr-sect.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007 Red Hat, Inc. +# Copyright (C) 2007, 2008 Red Hat, Inc. # This file is part of Red Hat elfutils. # # Red Hat elfutils is free software; you can redistribute it and/or modify @@ -27,7 +27,6 @@ testfiles testfile43 -export LC_ALL=C testrun_compare ./dwfl-addr-sect -e testfile43 0x64 0x8 0x98 <<\EOF address 0x64 => module "" section 4 + 0 address 0x8 => module "" section 1 + 0x8 diff --git a/tests/run-strings-test.sh b/tests/run-strings-test.sh index cfd9d23..a5dac63 100755 --- a/tests/run-strings-test.sh +++ b/tests/run-strings-test.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005, 2006 Red Hat, Inc. +# Copyright (C) 2005, 2006, 2008 Red Hat, Inc. # This file is part of Red Hat elfutils. # Written by Ulrich Drepper <drepper(a)redhat.com>, 2005. # @@ -29,9 +29,6 @@ files="testfile `seq 2 9 | while read n; do echo testfile$n; done`" testfiles $files -LC_ALL=C -export LC_ALL - testrun_compare ../src/strings -tx -f $files <<\EOF testfile: f4 /lib/ld-linux.so.2 testfile: 1c9 __gmon_start__ diff --git a/tests/test-subr.sh b/tests/test-subr.sh index 7fda05a..cb34b93 100644 --- a/tests/test-subr.sh +++ b/tests/test-subr.sh @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005, 2007 Red Hat, Inc. +# Copyright (C) 2005, 2007, 2008 Red Hat, Inc. # This file is part of Red Hat elfutils. # # Red Hat elfutils is free software; you can redistribute it and/or modify @@ -30,6 +30,9 @@ set -e +#LC_ALL=C +#export LC_ALL + remove_files= trap 'rm -f $remove_files' 0 ++++++ elfutils-0.137-i386-rel-types.diff ++++++ From: Ulrich Drepper <drepper(a)redhat.com> Date: Sat, 4 Oct 2008 20:39:55 +0000 (+0000) Subject: Fix some entries in i386_reloc.def. X-Git-Url: http://git.fedorahosted.org/git/elfutils.git?p=elfutils.git;a=commitdiff_pl… Fix some entries in i386_reloc.def. --- diff --git a/backends/i386_reloc.def b/backends/i386_reloc.def index d8116f3..bc1b835 100644 --- a/backends/i386_reloc.def +++ b/backends/i386_reloc.def @@ -61,3 +61,6 @@ RELOC_TYPE (TLS_LE_32, REL) RELOC_TYPE (TLS_DTPMOD32, EXEC|DYN) RELOC_TYPE (TLS_DTPOFF32, EXEC|DYN) RELOC_TYPE (TLS_TPOFF32, EXEC|DYN) +RELOC_TYPE (TLS_GOTDESC, REL) +RELOC_TYPE (TLS_DESC_CALL, REL) +RELOC_TYPE (TLS_DESC, EXEC) ++++++ elfutils-0.137-main-bias-fix.diff ++++++ >From 74825c4d9d21ff8ba0828d1790879965764ddb01 Mon Sep 17 00:00:00 2001 From: Roland McGrath <roland(a)redhat.com> Date: Mon, 15 Dec 2008 19:33:33 -0800 Subject: [PATCH] (dwfl_module_relocate_address): Apply main.bias, not debug.bias. --- diff --git a/libdwfl/derelocate.c b/libdwfl/derelocate.c index 402bc06..7f390c7 100644 --- a/libdwfl/derelocate.c +++ b/libdwfl/derelocate.c @@ -358,7 +358,7 @@ dwfl_module_relocate_address (Dwfl_Module *mod, Dwarf_Addr *addr) if (mod->e_type != ET_REL) { - *addr -= mod->debug.bias; + *addr -= mod->main.bias; return 0; } -- 1.6.0.5 ++++++ elfutils-0.137-nm-crash-fix.diff ++++++ >From 468fe4d81a3e92157f4c0446675487dc230b2ec6 Mon Sep 17 00:00:00 2001 From: Roland McGrath <roland(a)redhat.com> Date: Thu, 11 Dec 2008 21:00:12 -0800 Subject: [PATCH] Fix crashes on bad sh_name/st_name offsets. --- diff --git a/src/nm.c b/src/nm.c index 1bef49f..9fdf0cc 100644 --- a/src/nm.c +++ b/src/nm.c @@ -1,5 +1,5 @@ /* Print symbol information from ELF file in human-readable form. - Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc. + Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008 Red Hat, Inc. This file is part of Red Hat elfutils. Written by Ulrich Drepper <drepper(a)redhat.com>, 2000. @@ -703,6 +703,18 @@ get_local_names (Dwarf *dbg) } } +/* Do elf_strptr, but return a backup string and never NULL. */ +static const char * +sym_name (Elf *elf, GElf_Word strndx, GElf_Word st_name, char buf[], size_t n) +{ + const char *symstr = elf_strptr (elf, strndx, st_name); + if (symstr == NULL) + { + snprintf (buf, n, "[invalid st_name %#" PRIx32 "]", st_name); + symstr = buf; + } + return symstr; +} /* Show symbols in SysV format. */ static void @@ -736,9 +748,15 @@ show_symbols_sysv (Ebl *ebl, GElf_Word strndx, assert (elf_ndxscn (scn) == cnt++); - scnnames[elf_ndxscn (scn)] - = elf_strptr (ebl->elf, shstrndx, - gelf_getshdr (scn, &shdr_mem)->sh_name); + char *name = elf_strptr (ebl->elf, shstrndx, + gelf_getshdr (scn, &shdr_mem)->sh_name); + if (unlikely (name == NULL)) + { + name = alloca (sizeof "[invalid sh_name 0x12345678]"); + snprintf (name, sizeof name, "[invalid sh_name %#" PRIx32 "]", + gelf_getshdr (scn, &shdr_mem)->sh_name); + } + scnnames[elf_ndxscn (scn)] = name; } int digits = length_map[gelf_getclass (ebl->elf) - 1][radix]; @@ -772,8 +790,10 @@ show_symbols_sysv (Ebl *ebl, GElf_Word strndx, /* Iterate over all symbols. */ for (cnt = 0; cnt < nsyms; ++cnt) { - const char *symstr = elf_strptr (ebl->elf, strndx, - syms[cnt].sym.st_name); + char symstrbuf[50]; + const char *symstr = sym_name (ebl->elf, strndx, syms[cnt].sym.st_name, + symstrbuf, sizeof symstrbuf); + char symbindbuf[50]; char symtypebuf[50]; char secnamebuf[1024]; @@ -850,7 +870,9 @@ show_symbols_bsd (Elf *elf, GElf_Word strndx, /* Iterate over all symbols. */ for (size_t cnt = 0; cnt < nsyms; ++cnt) { - const char *symstr = elf_strptr (elf, strndx, syms[cnt].sym.st_name); + char symstrbuf[50]; + const char *symstr = sym_name (elf, strndx, syms[cnt].sym.st_name, + symstrbuf, sizeof symstrbuf); /* Printing entries with a zero-length name makes the output not very well parseable. Since these entries don't carry @@ -872,7 +894,7 @@ show_symbols_bsd (Elf *elf, GElf_Word strndx, ? (GELF_ST_BIND (syms[cnt].sym.st_info) == STB_WEAK ? "*" : " ") : "", - elf_strptr (elf, strndx, syms[cnt].sym.st_name)); + symstr); else printf (print_size ? sfmtstrs[radix] : fmtstrs[radix], digits, syms[cnt].sym.st_value, @@ -881,7 +903,7 @@ show_symbols_bsd (Elf *elf, GElf_Word strndx, ? (GELF_ST_BIND (syms[cnt].sym.st_info) == STB_WEAK ? "*" : " ") : "", - elf_strptr (elf, strndx, syms[cnt].sym.st_name), + symstr, digits, (uint64_t) syms[cnt].sym.st_size); } } @@ -907,7 +929,9 @@ show_symbols_posix (Elf *elf, GElf_Word strndx, const char *prefix, /* Iterate over all symbols. */ for (size_t cnt = 0; cnt < nsyms; ++cnt) { - const char *symstr = elf_strptr (elf, strndx, syms[cnt].sym.st_name); + char symstrbuf[50]; + const char *symstr = sym_name (elf, strndx, syms[cnt].sym.st_name, + symstrbuf, sizeof symstrbuf); /* Printing entries with a zero-length name makes the output not very well parseable. Since these entries don't carry @@ -1056,6 +1080,8 @@ show_symbols (Ebl *ebl, GElf_Ehdr *ehdr, Elf_Scn *scn, Elf_Scn *xndxscn, { const char *symstr = elf_strptr (ebl->elf, shdr->sh_link, sym->st_name); + if (symstr == NULL) + continue; longest_name = MAX ((size_t) longest_name, strlen (symstr)); -- 1.6.0.5 ++++++ elfutils-0.137-readelf-crash-fix.diff ++++++ >From b28a894209451b93ba830f56e40871e44e9c7c28 Mon Sep 17 00:00:00 2001 From: Roland McGrath <roland(a)redhat.com> Date: Thu, 11 Dec 2008 02:09:28 -0800 Subject: [PATCH] Fixes RHBZ#465878: eu-readelf crash on empty archive --- diff --git a/libdwfl/offline.c b/libdwfl/offline.c index ff7b793..b3a95dd 100644 --- a/libdwfl/offline.c +++ b/libdwfl/offline.c @@ -1,5 +1,5 @@ /* Recover relocatibility for addresses computed from debug information. - Copyright (C) 2005, 2006, 2007 Red Hat, Inc. + Copyright (C) 2005, 2006, 2007, 2008 Red Hat, Inc. This file is part of Red Hat elfutils. Red Hat elfutils is free software; you can redistribute it and/or modify @@ -259,16 +259,23 @@ process_archive (Dwfl *dwfl, const char *name, const char *file_name, int fd, { Dwfl_Module *mod = NULL; + Elf *member = elf_begin (fd, ELF_C_READ_MMAP_PRIVATE, archive); + if (unlikely (member == NULL)) /* Empty archive. */ + { + __libdwfl_seterrno (DWFL_E_BADELF); + return NULL; + } + while (process_archive_member (dwfl, name, file_name, predicate, - fd, elf_begin (fd, ELF_C_READ_MMAP_PRIVATE, - archive), &mod) != ELF_C_NULL) - ; + fd, member, &mod) != ELF_C_NULL) + member = elf_begin (fd, ELF_C_READ_MMAP_PRIVATE, archive); /* We can drop the archive Elf handle even if we're still using members in live modules. When the last module's elf_end on a member returns zero, that module will close FD. If no modules survived the predicate, we are all done with the file right here. */ - if (elf_end (archive) == 0) + if (mod != NULL /* If no modules, caller will clean up. */ + && elf_end (archive) == 0) close (fd); return mod; -- 1.6.0.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