October 2006 - openSUSE Commits - openSUSE Mailing Lists

commit shared-mime-info
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package shared-mime-info checked in at Mon Oct 30 18:02:20 CET 2006. -------- --- shared-mime-info/shared-mime-info.changes 2006-09-14 11:32:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/shared-mime-info/shared-mime-info.changes 2006-10-30 15:17:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 30 15:17:12 CET 2006 - sbrabec(a)suse.cz + +- Updated and fixed camera raw MIME types (freedesktop#8170). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shared-mime-info.spec ++++++ --- /var/tmp/diff_new_pack.S6MpPs/_old 2006-10-30 18:02:11.000000000 +0100 +++ /var/tmp/diff_new_pack.S6MpPs/_new 2006-10-30 18:02:11.000000000 +0100 @@ -13,10 +13,10 @@ Name: shared-mime-info BuildRequires: glib2-devel gnome-patch-translation intltool libxml2-devel perl-XML-Parser Version: 0.19 -Release: 2 +Release: 12 URL: http://freedesktop.org/wiki/Software/shared-mime-info Group: System/X11/Utilities -License: GPL +License: GNU General Public License (GPL) - all versions Summary: Shared MIME Database Source: %{name}-%{version}.tar.bz2 Source1: mime-info-to-mime @@ -79,6 +79,8 @@ /usr/%{_lib}/pkgconfig/*.pc %changelog -n shared-mime-info +* Mon Oct 30 2006 - sbrabec(a)suse.cz +- Updated and fixed camera raw MIME types (freedesktop#8170). * Thu Sep 14 2006 - sbrabec(a)suse.cz - Fixed camera raw MIME types (freedesktop#4117). * Fri Sep 08 2006 - sbrabec(a)suse.cz ++++++ shared-mime-info-raw.patch ++++++ --- /var/tmp/diff_new_pack.S6MpPs/_old 2006-10-30 18:02:11.000000000 +0100 +++ /var/tmp/diff_new_pack.S6MpPs/_new 2006-10-30 18:02:11.000000000 +0100 @@ -2,17 +2,180 @@ ================================================================================ --- freedesktop.org.xml.in +++ freedesktop.org.xml.in -@@ -2184,11 +2184,13 @@ - <glob pattern="*.mrw" /> - </mime-type> - <mime-type type="image/x-canon-crw"> +@@ -2179,34 +2179,165 @@ + <glob pattern="*.pict1"/> + <glob pattern="*.pict2"/> + </mime-type> +- <mime-type type="image/x-minolta-mrw"> +- <comment>Minolta raw image</comment> +- <glob pattern="*.mrw" /> +- </mime-type> ++ <mime-type type="application/x-ufraw"> ++ <sub-class-of type="text/xml"/> ++ <comment>UFRaw ID file</comment> ++ <acronym>UFRaw</acronym> ++ <expanded-acronym>Unidentified Flying Raw</expanded-acronym> ++ <glob pattern="*.ufraw"/> ++ </mime-type> ++ <mime-type type="image/x-dcraw"> ++ <comment>Digital raw image</comment> ++ <acronym>DCRaw</acronym> ++ <expanded-acronym>Digital camera Raw</expanded-acronym> ++ <glob pattern="*.bay" /> ++ <glob pattern="*.bmq" /> ++ <glob pattern="*.cs1" /> ++ <glob pattern="*.dc2" /> ++ <glob pattern="*.fff" /> ++ <glob pattern="*.k25" /> ++ <glob pattern="*.mos" /> ++ <glob pattern="*.rdc" /> ++ </mime-type> ++ <mime-type type="image/x-adobe-dng"> ++ <sub-class-of type="image/x-dcraw"/> + <sub-class-of type="image/tiff"/> ++ <comment>Adobe Digital Negative</comment> ++ <acronym>DNG</acronym> ++ <expanded-acronym>Digital Negative</expanded-acronym> ++ <glob pattern="*.dng"/> ++ </mime-type> ++  + <mime-type type="image/x-canon-crw"> ++ <sub-class-of type="image/x-dcraw"/> <comment>Canon raw image</comment> ++ <acronym>CRW</acronym> ++ <expanded-acronym>Canon RaW</expanded-acronym> ++  ++ <magic priority="60"> ++ <match value="II\x1a\x00\x00\x00HEAPCCDR" type="string" offset="0"/> ++ </magic> <glob pattern="*.crw"/> ++ </mime-type> ++ <mime-type type="image/x-canon-cr2"> ++ <sub-class-of type="image/x-dcraw"/> ++  ++ <sub-class-of type="image/tiff"/> ++ <comment>Canon raw image</comment> ++ <acronym>CR2</acronym> ++ <expanded-acronym>Canon Raw 2</expanded-acronym> <glob pattern="*.cr2"/> </mime-type> - <mime-type type="image/x-nikon-nef"> +- <mime-type type="image/x-nikon-nef"> +- <comment>Nikon raw image</comment> +- <glob pattern="*.nef"/> ++ <mime-type type="image/x-fuji-raf"> ++ <sub-class-of type="image/x-dcraw"/> ++ <comment>Fuji raw image</comment> ++ <acronym>RAF</acronym> ++ <expanded-acronym>RAw Format</expanded-acronym> ++ <glob pattern="*.raf"/> + </mime-type> + <mime-type type="image/x-kodak-dcr"> ++ <sub-class-of type="image/x-dcraw"/> ++ <sub-class-of type="image/tiff"/> + <comment>Kodak raw image</comment> ++ <acronym>DCR</acronym> ++ <expanded-acronym>Digital Camera Raw</expanded-acronym> + <glob pattern="*.dcr"/> + </mime-type> +- <mime-type type="image/x-kodak-kdc"> ++ <mime-type type="image/x-kodak-kdc"> ++ <sub-class-of type="image/x-dcraw"/> ++ <sub-class-of type="image/tiff"/> + <comment>Kodak raw image</comment> ++ <acronym>KDC</acronym> ++ <expanded-acronym>Kodak Digital Camera</expanded-acronym> + <glob pattern="*.kdc"/> + </mime-type> ++ <mime-type type="image/x-minolta-mrw"> ++ <sub-class-of type="image/x-dcraw"/> ++ <comment>Minolta raw image</comment> ++ <acronym>MRW</acronym> ++ <expanded-acronym>Minolta RaW</expanded-acronym> ++ <magic priority="50"> ++ <match value="\x00MRM" type="string" offset="0"/> ++ </magic> ++ <glob pattern="*.mrw"/> ++ </mime-type> ++ <mime-type type="image/x-nikon-nef"> ++ <sub-class-of type="image/x-dcraw"/> ++ <sub-class-of type="image/tiff"/> ++ <comment>Nikon raw image</comment> ++ <acronym>NEF</acronym> ++ <expanded-acronym>Nikon Electronic Format</expanded-acronym> ++ <glob pattern="*.nef"/> ++ </mime-type> + <mime-type type="image/x-olympus-orf"> ++ <sub-class-of type="image/x-dcraw"/> + <comment>Olympus raw image</comment> ++ <acronym>ORF</acronym> ++ <expanded-acronym>Olympus Raw Format</expanded-acronym> ++ <magic priority="50"> ++  ++ <match value="IIRO\x08\x00\x00\x00" type="string" offset="0"/> ++ </magic> + <glob pattern="*.orf"/> + </mime-type> +- <mime-type type="image/x-fuji-raf"> +- <comment>Fuji raw image</comment> +- <glob pattern="*.raf"/> ++ <mime-type type="image/x-panasonic-raw"> ++ <sub-class-of type="image/x-dcraw"/> ++ <comment>Panasonic raw image</comment> ++ <magic priority="50"> ++  ++ <match value="IIU\x00\x08\x00\x00\x00" type="string" offset="0"/> ++ </magic> ++ <glob pattern="*.raw"/> ++ </mime-type> ++ <mime-type type="image/x-pentax-pef"> ++ <sub-class-of type="image/x-dcraw"/> ++ <sub-class-of type="image/tiff"/> ++ <comment>Pentax raw image</comment> ++ <acronym>PEF</acronym> ++ <expanded-acronym>Pentax Electronic Format</expanded-acronym> ++ <glob pattern="*.pef"/> ++ </mime-type> ++ <mime-type type="image/x-sigma-x3f"> ++ <sub-class-of type="image/x-dcraw"/> ++ <comment>Sigma raw image</comment> ++ <acronym>X3F</acronym> ++ <expanded-acronym>X3 Foveon</expanded-acronym> ++ <magic priority="50"> ++  ++ <match value="FOVb" type="string" offset="0"> ++  ++ <match value="0x00FF00FF" type="little32" offset="4" mask="0xFF00FF00"/> ++ </match> ++ </magic> ++ <glob pattern="*.x3f"/> ++ </mime-type> ++ <mime-type type="image/x-sony-srf"> ++ <sub-class-of type="image/x-dcraw"/> ++ <sub-class-of type="image/tiff"/> ++ <acronym>SRF</acronym> ++ <expanded-acronym>Sony Raw Format</expanded-acronym> ++ <comment>Sony raw image</comment> ++ <glob pattern="*.srf"/> ++ </mime-type> ++ <mime-type type="image/x-sony-sr2"> ++ <sub-class-of type="image/x-dcraw"/> ++ <sub-class-of type="image/tiff"/> ++ <acronym>SR2</acronym> ++ <expanded-acronym>Sony Raw format 2</expanded-acronym> ++ <comment>Sony raw image</comment> ++ <glob pattern="*.sr2"/> ++ </mime-type> ++ <mime-type type="image/x-sony-arw"> ++ <sub-class-of type="image/x-dcraw"/> + <sub-class-of type="image/tiff"/> - <comment>Nikon raw image</comment> - <glob pattern="*.nef"/> ++ <acronym>ARW</acronym> ++ <expanded-acronym>Alpha Raw format</expanded-acronym> ++ <comment>Sony raw image</comment> ++ <glob pattern="*.arw"/> </mime-type> + <mime-type type="image/png"> + <_comment>PNG image</_comment> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package sax2 checked in at Mon Oct 30 18:02:05 CET 2006. -------- --- sax2/sax2.changes 2006-10-30 10:12:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2006-10-30 17:13:26.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 14:37:52 CET 2006 - ms(a)suse.de + +- added plausibility check for ddc bandwidth data (#210923) +- fixed uninitialized bandwidth data if &MsgDetect == 0 (#195630) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.JQXx0B/_old 2006-10-30 18:01:38.000000000 +0100 +++ /var/tmp/diff_new_pack.JQXx0B/_new 2006-10-30 18:01:38.000000000 +0100 @@ -45,7 +45,7 @@ %endif Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 46 +Release: 47 Group: System/X11/Utilities License: GNU General Public License (GPL) - all versions, Other License(s), see package Source: sax2.tar.bz2 @@ -67,7 +67,7 @@ %package -n sax2-tools Version: 8.1 -Release: 46 +Release: 47 Summary: X Window System tools for SaX2 Group: System/X11/Utilities Requires: coreutils @@ -96,7 +96,7 @@ %package -n sax2-ident Version: 8.1 -Release: 46 +Release: 47 Summary: SaX2 identity and profile information Group: System/X11/Utilities @@ -114,7 +114,7 @@ %package -n sax2-gui Version: 8.1 -Release: 46 +Release: 47 %if %{?suse_version:1}0 # SuSE Requires... Requires: netpbm sax2-tools qt3 fvwm2 sax2 @@ -136,7 +136,7 @@ %package -n sax2-libsax Version: 8.1 -Release: 46 +Release: 47 %if %{?suse_version:1}0 # SuSE Requires... Requires: sax2-tools qt3 fvwm2 sax2 @@ -162,7 +162,7 @@ %package -n sax2-libsax-devel Version: 8.1 -Release: 46 +Release: 47 Requires: sax2-libsax Summary: SaX management library header files for X Window System-configuration development Group: Development/Libraries/X11 @@ -179,7 +179,7 @@ %package -n sax2-libsax-perl Version: 8.1 -Release: 46 +Release: 47 Requires: sax2-libsax Summary: Language binding to use libsax with perl Group: Development/Libraries/X11 @@ -196,7 +196,7 @@ %package -n sax2-libsax-python Version: 8.1 -Release: 46 +Release: 47 Requires: sax2-libsax %if %{?suse_version:1}0 # SuSE Requires... @@ -481,6 +481,9 @@ %changelog -n sax2 * Mon Oct 30 2006 - ms(a)suse.de +- added plausibility check for ddc bandwidth data (#210923) +- fixed uninitialized bandwidth data if &MsgDetect == 0 (#195630) +* Mon Oct 30 2006 - ms(a)suse.de - fixed desktop file (#216040) * Fri Oct 27 2006 - ms(a)suse.de - sometimes it's not really an usb mouse (#208745) ++++++ sax2.tar.bz2 ++++++ sax2/sax2.tar.bz2 /mounts/work_src_done/STABLE/sax2/sax2.tar.bz2 differ: char 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 openSUSE-release
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package openSUSE-release checked in at Mon Oct 30 18:00:45 CET 2006. -------- --- openSUSE-release/openSUSE-release.changes 2006-10-27 17:28:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/openSUSE-release/openSUSE-release.changes 2006-10-30 13:56:45.000000000 +0100 @@ -2 +2 @@ -Fri Oct 27 17:28:40 CEST 2006 - aj(a)suse.de +Mon Oct 30 13:57:09 CET 2006 - cthiel(a)suse.de @@ -4 +4 @@ -- Beta 2. +- Beta1plus ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.0Gd4Ag/_old 2006-10-30 18:00:35.000000000 +0100 +++ /var/tmp/diff_new_pack.0Gd4Ag/_new 2006-10-30 18:00:35.000000000 +0100 @@ -14,7 +14,7 @@ License: GNU General Public License (GPL) - all versions Group: System/Fhs Version: 10.2 -Release: 21 +Release: 22 Provides: aaa_version distribution-release Provides: suse-release-oss = %{version}-%{release} Provides: suse-release = %{version}-%{release} @@ -27,7 +27,7 @@ Autoreqprov: on Summary: SuSE release version files BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define betaversion "Beta2" +%define betaversion "Beta1plus" %description This package contains the files: /etc/SuSE-release, /etc/issue, and @@ -57,8 +57,8 @@ %config(noreplace) /etc/issue.net %changelog -n openSUSE-release -* Fri Oct 27 2006 - aj(a)suse.de -- Beta 2. +* Mon Oct 30 2006 - cthiel(a)suse.de +- Beta1plus * Tue Oct 17 2006 - aj(a)suse.de - Beta1. - Provide/obsolete sles-release (#213058) and sled-release. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ocfs2-tools
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package ocfs2-tools checked in at Mon Oct 30 18:00:26 CET 2006. -------- --- ocfs2-tools/ocfs2-tools.changes 2006-10-28 22:48:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/ocfs2-tools/ocfs2-tools.changes 2006-10-30 17:47:39.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 17:43:47 CET 2006 - lmb(a)suse.de + +- Upgrade to version 1.2.2 to match in-kernel version. +- Split-off devel subpackage. + +------------------------------------------------------------------- Old: ---- ocfs2-tools-1.2.1.tar.bz2 New: ---- ocfs2-tools-1.2.2.diff ocfs2-tools-1.2.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.8PWoxx/_old 2006-10-30 18:00:18.000000000 +0100 +++ /var/tmp/diff_new_pack.8PWoxx/_new 2006-10-30 18:00:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ocfs2-tools (Version 1.2.1) +# spec file for package ocfs2-tools (Version 1.2.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,14 +13,15 @@ Name: ocfs2-tools BuildRequires: e2fsprogs-devel glib2-devel python-devel python-gtk-devel readline-devel update-desktop-files Summary: Oracle Cluster File System 2 Core Tools -Version: 1.2.1 -Release: 21 +Version: 1.2.2 +Release: 1 License: GNU General Public License (GPL) - all versions Group: System/Filesystems Source: ocfs2-tools-%{version}.tar.bz2 Patch0: ocfs2-tools-suse.diff Patch1: blkid.m4.diff Patch2: offsetof.diff +Patch3: ocfs2-tools-1.2.2.diff URL: http://oss.oracle.com/projects/ocfs2-tools/ Requires: coreutils, net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 PreReq: %insserv_prereq %fillup_prereq @@ -59,11 +60,29 @@ -------- Oracle Corporation +%package devel +Summary: Oracle Cluster File System 2 Development files +Group: System/Filesystems +Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel + +%description devel +OCFS is the Oracle Cluster File System. + +This package contains the header files and static libraries for +developing low-level OCFS2-aware applications. + + + +Authors: +-------- + Oracle Corporation + %prep %setup -n ocfs2-tools-%{version} %patch0 -p1 %patch1 -p1 %patch2 +%patch3 -p1 %{?suse_update_config:%{suse_update_config -f}} %build @@ -131,6 +150,7 @@ /usr/share/man/man8/mkfs.ocfs2.8* /usr/share/man/man8/tunefs.ocfs2.8* /usr/share/man/man8/mounted.ocfs2.8* +/usr/share/man/man8/mount.ocfs2.8* /usr/share/man/man8/o2cb_ctl.8* /usr/share/man/man8/ocfs2_hb_ctl.8* /usr/share/man/man8/ocfs2cdsl.8* @@ -144,7 +164,22 @@ /usr/sbin/ocfs2console /usr/share/man/man8/ocfs2console.8* +%files devel +%defattr(-,root,root) +%{_includedir}/o2cb +%{_includedir}/o2dlm +%{_includedir}/ocfs2 +%{_libdir}/libo2cb.a +%{_libdir}/libo2dlm.a +%{_libdir}/libocfs2.a +%{_libdir}/pkgconfig/o2cb.pc +%{_libdir}/pkgconfig/o2dlm.pc +%{_libdir}/pkgconfig/ocfs2.pc + %changelog -n ocfs2-tools +* Mon Oct 30 2006 - lmb(a)suse.de +- Upgrade to version 1.2.2 to match in-kernel version. +- Split-off devel subpackage. * Sat Oct 28 2006 - meissner(a)suse.de - use RPM_OPT_FLAGS * Sat Sep 30 2006 - aj(a)suse.de ++++++ ocfs2-tools-1.2.2.diff ++++++ diff -ur ocfs2-tools-1.2.2.orig/configure.in ocfs2-tools-1.2.2/configure.in --- ocfs2-tools-1.2.2.orig/configure.in 2006-10-19 19:10:53.000000000 +0200 +++ ocfs2-tools-1.2.2/configure.in 2006-10-21 01:02:31.000000000 +0200 @@ -88,14 +88,17 @@ AC_SUBST(COM_ERR_LIBS) ]) +saved_LDFLAGS="$LDFLAGS" +LDFLAGS="-lpthread" UUID_LIBS= -AC_CHECK_LIB(uuid, uuid_unparse, UUID_LIBS=-luuid) +AC_CHECK_LIB(uuid, uuid_unparse, UUID_LIBS="-luuid -lpthread") if test "x$UUID_LIBS" = "x"; then AC_MSG_ERROR([Unable to find uuid library]) fi AC_CHECK_HEADER(uuid/uuid.h, :, AC_MSG_ERROR([Unable to find uuid headers])) AC_SUBST(UUID_LIBS) +LDFLAGS="$saved_LDFLAGS" NCURSES_LIBS= AC_CHECK_LIB(ncurses, tgetstr, NCURSES_LIBS=-lncurses) ++++++ ocfs2-tools-1.2.1.tar.bz2 -> ocfs2-tools-1.2.2.tar.bz2 ++++++ ++++ 6235 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 lvm2
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package lvm2 checked in at Mon Oct 30 18:00:11 CET 2006. -------- --- lvm2/lvm2.changes 2006-09-20 13:28:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/lvm2/lvm2.changes 2006-10-30 14:34:15.000000000 +0100 @@ -1,0 +2,49 @@ +Mon Oct 30 12:19:07 CET 2006 - fehr(a)suse.de + +- update to new version 2.02.13 ti finally fix bug #178321 + Add couple of missing files to tools/Makefile CLEAN_TARGETS. + When adding snapshot leave cow LV mapped device active after zeroing. + Fix a clvmd debug message. + Add dev_flush() to set_lv(). + Add lvchange --resync. + Perform high-level free space check before each allocation attempt. + Don't allow a node to remove an LV that's exclusively active on anther node. + Cope if same PV is included more than once in cmdline PE range list. + Set PV size to current device size if it is found to be zero. + Add segment parameter to target_present functions. + +------------------------------------------------------------------- +Tue Oct 17 10:55:33 CEST 2006 - fehr(a)suse.de + +- update to new version 2.02.12 + Fix pvdisplay to use vg_read() for non-orphans. + Fall back to internal locking if external locking lib is missing or fails. + Retain activation state after changing LV minor number with --force. + Propagate clustered flag in vgsplit and require resizeable flag. + Add clvmd function to return the cluster name. not used by LVM yet. + Add cling allocation policy. + Change _check_contiguous() to use _for_each_pv(). + Extend _for_each_pv() to allow termination without error. + Abstract _is_contiguous(). + Remove duplicated pv arg from _check_contiguous(). + Accept regionsize with lvconvert. + Add report columns with underscore before field names ending 'size'. + Correct regionsize default on lvcreate man page (MB). + Fix clvmd bug that could cause it to die when a node with a long name crashed + Add device size to text metadata. + Fix format_text mda_setup pv->size and pv_setup pe_count calculations. + Fix _for_each_pv() for mirror with core log. + Add lvm_dump.sh script to create a tarball of debugging info from a system. + Capture error messages in clvmd and pass them back to the user. + Remove unused #defines from filter-md.c. + Make clvmd restart init script wait until clvmd has died before starting it. + Add -R to clvmd which tells running clvmds to reload their device cache. + Add LV column to reports listing kernel modules needed for activation. + Show available fields if report given invalid field. (e.g. lvs -o list) + Add timestamp functions with --disable-realtime configure option. + Add %VG, %LV and %FREE suffices to lvcreate/lvresize --extents arg. + Fix two potential NULL pointer derefs in error cases in vg_read(). + Separate --enable-cluster from locking lib options in lvmconf.sh. + Add a missing comma in lvcreate man page. + +------------------------------------------------------------------- Old: ---- LVM2.2.02.10.tar.bz2 New: ---- LVM2.2.02.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.MEq14f/_old 2006-10-30 17:59:57.000000000 +0100 +++ /var/tmp/diff_new_pack.MEq14f/_new 2006-10-30 17:59:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package lvm2 (Version 2.02.10) +# spec file for package lvm2 (Version 2.02.13) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ Name: lvm2 BuildRequires: device-mapper-devel -License: GPL, LGPL +License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Base Requires: device-mapper Provides: lvm @@ -20,7 +20,7 @@ PreReq: %fillup_prereq %insserv_prereq %endif Autoreqprov: on -Version: 2.02.10 +Version: 2.02.13 Release: 1 Summary: LVM2 Tools Source: LVM2.%{version}.tar.bz2 @@ -176,6 +176,49 @@ %{_mandir}/man8/vgsplit.8.gz %changelog -n lvm2 +* Mon Oct 30 2006 - fehr(a)suse.de +- update to new version 2.02.13 ti finally fix bug #178321 + Add couple of missing files to tools/Makefile CLEAN_TARGETS. + When adding snapshot leave cow LV mapped device active after zeroing. + Fix a clvmd debug message. + Add dev_flush() to set_lv(). + Add lvchange --resync. + Perform high-level free space check before each allocation attempt. + Don't allow a node to remove an LV that's exclusively active on anther node. + Cope if same PV is included more than once in cmdline PE range list. + Set PV size to current device size if it is found to be zero. + Add segment parameter to target_present functions. +* Tue Oct 17 2006 - fehr(a)suse.de +- update to new version 2.02.12 + Fix pvdisplay to use vg_read() for non-orphans. + Fall back to internal locking if external locking lib is missing or fails. + Retain activation state after changing LV minor number with --force. + Propagate clustered flag in vgsplit and require resizeable flag. + Add clvmd function to return the cluster name. not used by LVM yet. + Add cling allocation policy. + Change _check_contiguous() to use _for_each_pv(). + Extend _for_each_pv() to allow termination without error. + Abstract _is_contiguous(). + Remove duplicated pv arg from _check_contiguous(). + Accept regionsize with lvconvert. + Add report columns with underscore before field names ending 'size'. + Correct regionsize default on lvcreate man page (MB). + Fix clvmd bug that could cause it to die when a node with a long name crashed + Add device size to text metadata. + Fix format_text mda_setup pv->size and pv_setup pe_count calculations. + Fix _for_each_pv() for mirror with core log. + Add lvm_dump.sh script to create a tarball of debugging info from a system. + Capture error messages in clvmd and pass them back to the user. + Remove unused #defines from filter-md.c. + Make clvmd restart init script wait until clvmd has died before starting it. + Add -R to clvmd which tells running clvmds to reload their device cache. + Add LV column to reports listing kernel modules needed for activation. + Show available fields if report given invalid field. (e.g. lvs -o list) + Add timestamp functions with --disable-realtime configure option. + Add %%VG, %%LV and %%FREE suffices to lvcreate/lvresize --extents arg. + Fix two potential NULL pointer derefs in error cases in vg_read(). + Separate --enable-cluster from locking lib options in lvmconf.sh. + Add a missing comma in lvcreate man page. * Wed Sep 20 2006 - fehr(a)suse.de - update to new version 2.02.10 Fix lvconvert mirror change case detection logic. ++++++ LVM2.2.02.10.tar.bz2 -> LVM2.2.02.13.tar.bz2 ++++++ ++++ 3928 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 lilo
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package lilo checked in at Mon Oct 30 17:59:24 CET 2006. -------- --- arch/ppc/lilo/lilo.changes 2006-10-24 22:34:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2006-10-30 15:08:18.000000000 +0100 @@ -1,0 +2,42 @@ +Mon Oct 30 15:05:51 CET 2006 - olh(a)suse.de + +- let yaboot run 'output-device output' if no yaboot,do-not-open-screen + exists, or if yaboot,do-open-screen property exists in /chosen + +------------------------------------------------------------------- +Mon Oct 30 14:06:25 CET 2006 - olh(a)suse.de + +- option no_os_chooser does now only load and start yaboot + it will not open the screen with " screen" output + +------------------------------------------------------------------- +Mon Oct 30 13:44:40 CET 2006 - olh(a)suse.de + +- use cat instead of echo to generate the pmac os-chooser script + +------------------------------------------------------------------- +Mon Oct 30 13:27:39 CET 2006 - olh(a)suse.de + +- no subshell for string assignment for pmac os-chooser + +------------------------------------------------------------------- +Mon Oct 30 12:57:31 CET 2006 - olh(a)suse.de + +- change pmac os-chooser hint from linux to Linux + +------------------------------------------------------------------- +Mon Oct 30 11:38:17 CET 2006 - olh(a)suse.de + +- fix weird loop handling in running_on_pmac_new + +------------------------------------------------------------------- +Sun Oct 29 21:13:12 CET 2006 - olh(a)suse.de + +- setprop takes a const *buf + +------------------------------------------------------------------- +Fri Oct 27 13:11:13 CEST 2006 - olh(a)suse.de + +- move and resize the yaboot internal malloc area (215616) + +------------------------------------------------------------------- Old: ---- lilo-10.1.17.tar.bz2 yaboot-10.1.17-r836.tar.bz2 New: ---- lilo-10.1.18.tar.bz2 yaboot-10.1.18-r849.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.Hk0EDJ/_old 2006-10-30 17:59:13.000000000 +0100 +++ /var/tmp/diff_new_pack.Hk0EDJ/_new 2006-10-30 17:59:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package lilo (Version 10.1.17) +# spec file for package lilo (Version 10.1.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: lilo -%define yaboot_vers 10.1.17-r836 +%define yaboot_vers 10.1.18-r849 Group: System/Boot License: BSD License and BSD-like, Other License(s), see package Summary: The Linux Loader, a Boot Menu @@ -23,7 +23,7 @@ Requires: powerpc-utils Requires: binutils Requires: parted -Version: 10.1.17 +Version: 10.1.18 Release: 1 Source0: lilo-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 @@ -161,6 +161,24 @@ %doc %{_mandir}/*/* %changelog -n lilo +* Mon Oct 30 2006 - olh(a)suse.de +- let yaboot run 'output-device output' if no yaboot,do-not-open-screen + exists, or if yaboot,do-open-screen property exists in /chosen +* Mon Oct 30 2006 - olh(a)suse.de +- option no_os_chooser does now only load and start yaboot + it will not open the screen with " screen" output +* Mon Oct 30 2006 - olh(a)suse.de +- use cat instead of echo to generate the pmac os-chooser script +* Mon Oct 30 2006 - olh(a)suse.de +- no subshell for string assignment for pmac os-chooser +* Mon Oct 30 2006 - olh(a)suse.de +- change pmac os-chooser hint from linux to Linux +* Mon Oct 30 2006 - olh(a)suse.de +- fix weird loop handling in running_on_pmac_new +* Sun Oct 29 2006 - olh(a)suse.de +- setprop takes a const *buf +* Fri Oct 27 2006 - olh(a)suse.de +- move and resize the yaboot internal malloc area (215616) * Tue Oct 24 2006 - olh(a)suse.de - temporary reverse the meaning of the lilo.conf 'no_os_chooser' option to test the new output-device code ++++++ lilo-10.1.17.tar.bz2 -> lilo-10.1.18.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.17/bootheader/chrp/of1275_setprop.c new/lilo-10.1.18/bootheader/chrp/of1275_setprop.c --- old/lilo-10.1.17/bootheader/chrp/of1275_setprop.c 2006-02-07 15:38:07.000000000 +0100 +++ new/lilo-10.1.18/bootheader/chrp/of1275_setprop.c 2006-10-29 21:13:41.000000000 +0100 @@ -1,6 +1,6 @@ -/* $Id: of1275_setprop.c 590 2006-02-07 14:38:07Z jplack $ */ +/* $Id: of1275_setprop.c 840 2006-10-29 20:13:41Z olh $ */ #include <prom.h> -int of1275_setprop(phandle node, const char *name, void *buf, int buflen) +int of1275_setprop(phandle node, const char *name, const void *buf, int buflen) { return call_prom("setprop", 4, 1, node, name, buf, buflen); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.17/bootheader/include/prom.h new/lilo-10.1.18/bootheader/include/prom.h --- old/lilo-10.1.17/bootheader/include/prom.h 2006-10-24 22:13:22.000000000 +0200 +++ new/lilo-10.1.18/bootheader/include/prom.h 2006-10-29 21:13:41.000000000 +0100 @@ -1,6 +1,6 @@ #ifndef _PPC_BOOT_PROM_H_ #define _PPC_BOOT_PROM_H_ -/* $Id: prom.h 835 2006-10-24 20:13:22Z olh $ */ +/* $Id: prom.h 840 2006-10-29 20:13:41Z olh $ */ typedef unsigned int phandle; typedef unsigned int ihandle; @@ -48,7 +48,7 @@ extern int of1275_read(phandle node, void *buf, int buflen); extern void of1275_release(unsigned int virt, unsigned int size); extern int of1275_seek(ihandle node, unsigned int a, unsigned int b); -extern int of1275_setprop(phandle node, const char *name, void *buf, int buflen); +extern int of1275_setprop(phandle node, const char *name, const void *buf, int buflen); extern int of1275_write(phandle node, void *buf, int buflen); extern void find_type_devices(phandle *, const char *type, int); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.17/lilo-pmac.lib new/lilo-10.1.18/lilo-pmac.lib --- old/lilo-10.1.17/lilo-pmac.lib 2006-10-18 19:18:54.000000000 +0200 +++ new/lilo-10.1.18/lilo-pmac.lib 2006-10-30 15:08:18.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: lilo-pmac.lib 827 2006-10-18 17:18:54Z olh $ +# $Id: lilo-pmac.lib 848 2006-10-30 14:08:18Z olh $ # vim: syntax=sh # # library for PowerMac routings @@ -158,77 +158,91 @@ echo "BOOT_DEVICEPATH = $BOOT_DEVICEPATH" echo "OTHER_DEVICEPATH = $OTHER_DEVICEPATH" { - echo "<CHRP-BOOT>" - echo "<COMPATIBLE>" - echo "MacRISC MacRISC3 MacRISC4" - echo "</COMPATIBLE>" - echo "<DESCRIPTION>" - echo "Linux/PPC Yaboot bootloader" - echo "</DESCRIPTION>" - echo "<BOOT-SCRIPT>" - echo "\" screen\" output" - echo "dev screen" - echo "\" \"(0000000000aa00aa0000aaaaaa0000aa00aaaa5500aaaaaa)\" drop 0 7 set-colors" - echo "\" \"(5555555555ff55ff5555ffffff5555ff55ffffff55ffffff)\" drop 8 15 set-colors" - echo "device-end" - echo "f to foreground-color" - echo "0 to background-color" - - if [ "$CONFIG_PARSE_HASOTHER" = "true" ] ; then - unset LOOPBLAH - MY_MACOS_STRING=$( - for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do - if [ -n "${CONFIG_IMAGE_OTHER[$i]}" -a -z "$LOOPBLAH" ] ; then - LOOPBLAH=true - if [ "${CONFIG_IMAGE_LABEL[$i]}" = "macosx" ] ; then - echo "\" Booting Mac OS X ...\" cr \" boot $OTHER_DEVICEPATH,System\\Library\\CoreServices\\BootX\" eval" - else - echo "\" Booting MacOS ...\" cr \" boot $OTHER_DEVICEPATH,\\\\:tbxi\" eval" - fi + cat <<-EOF + <CHRP-BOOT> + <COMPATIBLE> + MacRISC MacRISC3 MacRISC4 + </COMPATIBLE> + <DESCRIPTION> + Linux/PPC Yaboot bootloader + </DESCRIPTION> + <BOOT-SCRIPT> + EOF + if [ "$OPTION_USE_OS_CHOOSER" = "yes" ] ; then + cat <<-EOF + dev /chosen 0 0 " yaboot,do-not-open-screen" property device-end + " screen" output + dev screen + " "(0000000000aa00aa0000aaaaaa0000aa00aaaa5500aaaaaa)" drop 0 7 set-colors + " "(5555555555ff55ff5555ffffff5555ff55ffffff55ffffff)" drop 8 15 set-colors + device-end + f to foreground-color + 0 to background-color + EOF + + if [ "$CONFIG_PARSE_HASOTHER" = "true" ] ; then + MY_MACOS_STRING= + for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do + if [ -n "${CONFIG_IMAGE_OTHER[$i]}" ] ; then + if [ "${CONFIG_IMAGE_LABEL[$i]}" = "macosx" ] ; then + MY_MACOS_STRING="\" Booting Mac OS X ...\" cr \" boot $OTHER_DEVICEPATH,System\\Library\\CoreServices\\BootX\" eval" + else + MY_MACOS_STRING="\" Booting MacOS ...\" cr \" boot $OTHER_DEVICEPATH,\\\\:tbxi\" eval" + fi + break + fi + done + MY_YABOOT_STRING="\" Booting Yaboot ...\" cr \" boot $BOOT_DEVICEPATH,\\\\yaboot\" eval " + if [ "$OPTION_DEFAULT" = "macos" -o "$OPTION_DEFAULT" = "macosx" ] ; then + # macos or macosx is the default + MY_STRING_WITH_SPACE_BAR=$MY_YABOOT_STRING + MY_STRING_WITHOUT_SPACE_BAR=$MY_MACOS_STRING + SPACE_BAR_HINT="Linux" + else + #yaboot is the default + MY_STRING_WITH_SPACE_BAR=$MY_MACOS_STRING + MY_STRING_WITHOUT_SPACE_BAR=$MY_YABOOT_STRING + SPACE_BAR_HINT="MacOS" + fi + # 1 is the timeout + cat <<-EOF + " "(0C)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(0d 0a)" fb8-write drop + " "(09) press space to boot $SPACE_BAR_HINT ... " fb8-write drop + get-msecs d# 3 3E8 * + + begin + key? if + key case + hex 20 of $MY_STRING_WITH_SPACE_BAR endof + endcase + then + dup get-msecs < + until + drop + $MY_STRING_WITHOUT_SPACE_BAR + echo + EOF + else + cat <<-EOF + " "(0d 0a)" fb8-write drop + " Booting Yaboot ..." cr " boot $BOOT_DEVICEPATH,\\\\yaboot" eval + EOF fi - done - ) - MY_YABOOT_STRING="\" Booting Yaboot ...\" cr \" boot $BOOT_DEVICEPATH,\\\\yaboot\" eval " - if [ "$OPTION_DEFAULT" = "macos" -o "$OPTION_DEFAULT" = "macosx" ] ; then - # macos or macosx is the default - MY_STRING_WITH_SPACE_BAR=$MY_YABOOT_STRING - MY_STRING_WITHOUT_SPACE_BAR=$MY_MACOS_STRING - SPACE_BAR_HINT="linux" - else - #yaboot is the default - MY_STRING_WITH_SPACE_BAR=$MY_MACOS_STRING - MY_STRING_WITHOUT_SPACE_BAR=$MY_YABOOT_STRING - SPACE_BAR_HINT="MacOS" - fi - # 1 is the timeout - echo "\" \"(0C)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(0d 0a)\" fb8-write drop" - echo "\" \"(09) press space to boot $SPACE_BAR_HINT ... \" fb8-write drop" - echo "get-msecs d# 3 3E8 * +" - echo "begin" - echo " key? if" - echo " key case" - echo -n " hex 20 of " - echo " $MY_STRING_WITH_SPACE_BAR endof" - echo " endcase" - echo " then" - echo " dup get-msecs <" - echo "until" - echo "drop" - echo $MY_STRING_WITHOUT_SPACE_BAR - echo else - echo "\" \"(0d 0a)\" fb8-write drop" - echo -e "\n\" Booting Yaboot ...\" cr \" boot $BOOT_DEVICEPATH,\\\\\\yaboot\" eval" + cat <<-EOF + dev /chosen 0 0 " yaboot,do-not-open-screen" property device-end + load $BOOT_DEVICEPATH,\\\\yaboot + go + EOF fi echo "</BOOT-SCRIPT>" cat /lib/lilo/pmac/os-badge-icon @@ -258,14 +272,9 @@ hattrib -t FNDR -c MACS Finder hattrib -t zsys -c MACS System hattrib -t TEXT -c "R*ch" yaboot.conf - if [ "$OPTION_NO_OS_CHOOSER" = "yes" ] ; then - hattrib -t tbxi -c chrp yaboot - hattrib -t TEXT -c "R*ch" os-chooser 2>/dev/null - else - hcopy $TEMP/os-chooser :os-chooser - hattrib -t BINA -c UNIX yaboot - hattrib -t tbxi -c chrp os-chooser - fi + hcopy $TEMP/os-chooser :os-chooser + hattrib -t BINA -c UNIX yaboot + hattrib -t tbxi -c chrp os-chooser for (( i=1; i<=CONFIG_IMAGE_COUNT; i++ )); do test -z "${CONFIG_IMAGE_OTHER[$i]}" || continue diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.17/lilo.new new/lilo-10.1.18/lilo.new --- old/lilo-10.1.17/lilo.new 2006-10-24 22:34:04.000000000 +0200 +++ new/lilo-10.1.18/lilo.new 2006-10-30 14:07:26.000000000 +0100 @@ -1,5 +1,5 @@ #! /bin/bash -# $Id: lilo.new 837 2006-10-24 20:34:04Z olh $ +# $Id: lilo.new 846 2006-10-30 13:07:26Z olh $ # # a simple lilo to store the boot loader and the kernel images # in bash2 ... Think different [tm] @@ -38,7 +38,7 @@ DEFAULT_BOOTFOLDER=suseboot TEMP="${TMPDIR:-/tmp}/ppc_lilo" MACHINE= -OPTION_NO_OS_CHOOSER=yes +OPTION_USE_OS_CHOOSER=yes _sysfs_mounted= _proc_mounted= @@ -66,7 +66,7 @@ function Usage() { cat <<EOHELP -lilo for PowerPC 10.1.17 +lilo for PowerPC 10.1.18 configures the Linux Loader on a few different PowerPC board types, based on the configuration file /etc/lilo.conf. This includes IBM RS/6000 and pSeries models, IBM legacy iSeries, @@ -463,7 +463,7 @@ get_arch=1 ;; --version|-v) - echo "lilo for PowerPC 10.1.17" + echo "lilo for PowerPC 10.1.18" exit 0 ;; --help) @@ -526,7 +526,7 @@ # OPTION_OTHER contains the MacOS partition # OPTION_BOOTFOLDER contains the MacOS folder with the bootstuff # OPTION_ACTIVATE is a flag whether or not the boot partition must be set active in OF - # OPTION_NO_OS_CHOOSER is a flag whether or not the bootfile will be a Forth script or yaboot itself + # OPTION_USE_OS_CHOOSER is a flag whether or not the Forth script used as bootfile will open the screen # OPTION_TIMEOUT contains the timeout variable in seconds # OPTION_DEFAULT contains the default label # OPTION_ROOT contains the global or local root= device @@ -593,7 +593,7 @@ ;; no_os_chooser) [ "$CONFIG_PARSE_HASIMAGE" ] && error 7 - OPTION_NO_OS_CHOOSER="no" + OPTION_USE_OS_CHOOSER="no" ;; force_fat) [ "$CONFIG_PARSE_HASIMAGE" ] && error 7 ++++++ yaboot-10.1.17-r836.tar.bz2 -> yaboot-10.1.18-r849.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/Changelog.SuSE new/yaboot-10.1.18-r849/Changelog.SuSE --- old/yaboot-10.1.17-r836/Changelog.SuSE 2006-10-24 22:57:24.000000000 +0200 +++ new/yaboot-10.1.18-r849/Changelog.SuSE 2006-10-30 16:57:10.000000000 +0100 @@ -1,4 +1,47 @@ ------------------------------------------------------------------------ +r849 | olh | 2006-10-30 15:53:10 +0000 (Mon, 30 Oct 2006) | 1 line +Changed paths: + M /trunk/yaboot/include/prom.h + M /trunk/yaboot/second/prom.c + +prom_set_chosen gets also a const buffer +------------------------------------------------------------------------ +r848 | olh | 2006-10-30 14:08:18 +0000 (Mon, 30 Oct 2006) | 3 lines +Changed paths: + M /trunk/lilo/lilo-pmac.lib + M /trunk/lilo.changes + M /trunk/yaboot/second/prom.c + ++- let yaboot run 'output-device output' if no yaboot,do-not-open-screen ++ exists, or if yaboot,do-open-screen property exists in /chosen + +------------------------------------------------------------------------ +r847 | olh | 2006-10-30 13:11:03 +0000 (Mon, 30 Oct 2006) | 1 line +Changed paths: + M /trunk/yaboot/second/prom.c + +open /chosen earlier in yaboot +------------------------------------------------------------------------ +r840 | olh | 2006-10-29 20:13:41 +0000 (Sun, 29 Oct 2006) | 2 lines +Changed paths: + M /trunk/lilo/bootheader/chrp/of1275_setprop.c + M /trunk/lilo/bootheader/include/prom.h + M /trunk/lilo.changes + M /trunk/yaboot/include/prom.h + M /trunk/yaboot/second/prom.c + ++- setprop takes a const *buf + +------------------------------------------------------------------------ +r839 | olh | 2006-10-27 11:12:28 +0000 (Fri, 27 Oct 2006) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/Makefile + M /trunk/yaboot/second/yaboot.c + ++- move and resize the yaboot internal malloc area (215616) + +------------------------------------------------------------------------ r836 | olh | 2006-10-24 20:22:02 +0000 (Tue, 24 Oct 2006) | 2 lines Changed paths: M /trunk/lilo.changes diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/Makefile new/yaboot-10.1.18-r849/Makefile --- old/yaboot-10.1.17-r836/Makefile 2006-10-24 22:57:24.000000000 +0200 +++ new/yaboot-10.1.18-r849/Makefile 2006-10-30 16:57:11.000000000 +0100 @@ -6,7 +6,7 @@ include Config -VERSION = 10.1.17-r836 +VERSION = 10.1.18-r849 # Debug mode (spam/verbose) DEBUG = 0 # make install vars @@ -16,13 +16,6 @@ # command used to get root (needed for tarball creation) GETROOT = fakeroot -# We use fixed addresses to avoid overlap when relocating -# and other trouble with initrd - -# Malloc block at 3Mb -> 4Mb -MALLOCADDR = 0x300000 -MALLOCSIZE = 0x100000 - # Set this to the prefix of your cross-compiler, if you have one. # Else leave it empty. # @@ -34,7 +27,6 @@ YBCFLAGS += -g YBCFLAGS += -mcpu=powerpc YBCFLAGS += -DVERSION=\"${VERSION}\" #" -YBCFLAGS += -DMALLOCADDR=$(MALLOCADDR) -DMALLOCSIZE=$(MALLOCSIZE) YBCFLAGS += -I ./include ifneq ($(DEBUG),0) YBCFLAGS += -DDEBUG=$(DEBUG) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/include/prom.h new/yaboot-10.1.18-r849/include/prom.h --- old/yaboot-10.1.17-r836/include/prom.h 2006-10-24 22:13:22.000000000 +0200 +++ new/yaboot-10.1.18-r849/include/prom.h 2006-10-30 16:53:10.000000000 +0100 @@ -94,7 +94,7 @@ prom_handle prom_findpackage(const char *path); int prom_getproplen(prom_handle dev, const char *name); int prom_getprop(prom_handle dev, const char *name, void *buf, int len); -int prom_setprop(prom_handle dev, const char *name, void *buf, int len); +int prom_setprop(prom_handle dev, const char *name, const void *buf, int len); enum device_type prom_get_devtype(const char *device); /* misc */ @@ -106,7 +106,7 @@ int prom_interpret(const char *forth); int prom_get_chosen(const char *name, void *mem, int len); -int prom_set_chosen(const char *name, void *mem, int len); +int prom_set_chosen(const char *name, const void *mem, int len); extern int prom_getms(void); extern void prom_pause(void); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/second/prom.c new/yaboot-10.1.18-r849/second/prom.c --- old/yaboot-10.1.17-r836/second/prom.c 2006-10-24 22:22:02.000000000 +0200 +++ new/yaboot-10.1.18-r849/second/prom.c 2006-10-30 16:53:10.000000000 +0100 @@ -155,7 +155,7 @@ return (int)call_prom("getprop", 4, 1, pack, name, mem, len); } -int prom_setprop(prom_handle pack, const char *name, void *mem, int len) +int prom_setprop(prom_handle pack, const char *name, const void *mem, int len) { return (int)call_prom("setprop", 4, 1, pack, name, mem, len); } @@ -201,7 +201,7 @@ return prom_getprop(prom_chosen, name, mem, len); } -int prom_set_chosen(const char *name, void *mem, int len) +int prom_set_chosen(const char *name, const void *mem, int len) { return prom_setprop(prom_chosen, name, mem, len); } @@ -244,37 +244,17 @@ } } -static int screen_connected(const char *path) +static int open_output_device(void) { - if (prom_getproplen(prom_finddevice(path), "iso6429-1983-colors") >= 0) - return 1; - return 0; -} - -static int find_screen(void) -{ - char screen_path[128]; - int len; + int ret; - len = prom_getprop(prom_finddevice("/aliases"), "screen", screen_path, sizeof(screen_path) - 1); - if (len > 5 && len < sizeof(screen_path)) { - screen_path[len] = '\0'; - len = strlen(screen_path); - if (screen_connected(screen_path)) - return 1; - if (screen_path[len - 2] == '@') { - if (screen_path[len - 3] == 'A') { - screen_path[len - 3] = 'B'; - screen_path[len - 1] = '1'; - return screen_connected(screen_path); - } else if (screen_path[len - 3] == 'B') { - screen_path[len - 3] = 'A'; - screen_path[len - 1] = '0'; - return screen_connected(screen_path); - } - } - } - return 0; + ret = prom_get_chosen("yaboot,do-open-screen", &ret, sizeof(ret)); + if (ret >= 0) + return 1; + ret = prom_get_chosen("yaboot,do-not-open-screen", &ret, sizeof(ret)); + if (ret >= 0) + return 0; + return 1; } void prom_init(prom_entry pp) @@ -284,6 +264,10 @@ prom = pp; + prom_chosen = prom_finddevice("/chosen"); + if (prom_chosen == (void *)-1) + prom_exit(); + /* this must be done before looking for stdout, for whatever reason */ len = prom_getprop(prom_finddevice("/"), "compatible", cmptbl, sizeof(cmptbl) - 1); if (len > 0 && len < sizeof(cmptbl)) { @@ -293,13 +277,10 @@ cmptbl[len] = ' '; } /* G5 with nvidia card crash when no monitor is connected */ - if (strstr(cmptbl, "MacRISC") && find_screen()) + if (strstr(cmptbl, "MacRISC") && open_output_device()) prom_interpret("output-device output"); } - prom_chosen = prom_finddevice("/chosen"); - if (prom_chosen == (void *)-1) - prom_exit(); prom_openprom = prom_finddevice("/openprom"); if (prom_openprom != (void *)-1) get_openprom_build_date(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.17-r836/second/yaboot.c new/yaboot-10.1.18-r849/second/yaboot.c --- old/yaboot-10.1.17-r836/second/yaboot.c 2006-09-22 23:05:49.000000000 +0200 +++ new/yaboot-10.1.18-r849/second/yaboot.c 2006-10-27 13:12:28.000000000 +0200 @@ -65,6 +65,8 @@ #define _ALIGN(addr,size) (((addr)+size-1)&(~(size-1))) #define MAX_HEADERS 32 +#define MALLOCADDR ((2 * 1024 * 1024) + (512 * 1024)) +#define MALLOCSIZE ((1 * 1024 * 1024) + (512 * 1024)) #define CLAIM_END (128 * 1024 * 1024) /* FIXME: look at /memory/available */ typedef struct { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdebase3
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package kdebase3 checked in at Mon Oct 30 17:59:03 CET 2006. -------- --- KDE/kdebase3/kdebase3.changes 2006-10-29 07:49:44.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-10-30 16:28:24.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Oct 30 16:28:05 CET 2006 - coolo(a)suse.de + +- don't install your own xdm-xp (#192400) + +------------------------------------------------------------------- +Mon Oct 30 11:05:35 CET 2006 - coolo(a)suse.de + +- update kdm patch to make it quilt ready +- update kickoff.diff for suspend (#215065) +- update 3.5 branch diff to fix + - "set as wallpaper" does not work (#215286) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.o9IGaj/_old 2006-10-30 17:58:31.000000000 +0100 +++ /var/tmp/diff_new_pack.o9IGaj/_new 2006-10-30 17:58:31.000000000 +0100 @@ -52,7 +52,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.5 -Release: 27 +Release: 28 %define kde_version 3.5.5 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -116,7 +116,7 @@ Patch72: kdm-all-users-nopass.diff Patch73: kdm-session-names.diff Patch74: kdm-sysconfig-values.diff -# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@583746 $BASE/branches/work/coolos_kdm +# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@599257 $BASE/branches/work/coolos_kdm | sed -e "s,^+++ ,+++ kdm/" Patch75: kdm-make_it_cool.diff Patch76: kdm-admin-mode.diff Patch77: kdm-suspend-hal.diff @@ -162,7 +162,7 @@ Patch157: kcmsamba_log.diff Patch160: khelpcenter-localindices.patch Patch161: applet-lock-logout.diff -# svn branches/KDE/3.5/kdebase/kicker@594132 branches/work/suse_kickoff/kicker +# svn diff $BASE/branches/KDE/3.5/kdebase/kicker@594132 $BASE/branches/work/suse_kickoff/kicker Patch162: kickoff.diff # svn diff branches/KDE/3.5/kdebase/kcontrol@599309 branches/work/suse_kickoff/kcontrol # 599309 @@ -222,6 +222,7 @@ Provides: kdebase3:/opt/kde3/bin/kdm Provides: kdebase:/opt/kde2/bin/kdm Provides: kdebase3-kdm-SLD:/opt/kde3/bin/kdm +Requires: xorg-x11 Group: System/GUI/KDE PreReq: %fillup_prereq /bin/grep @@ -367,7 +368,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 156 +Release: 157 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -420,9 +421,7 @@ %endif %patch98 # all the kdm changes -cd kdm %patch75 -cd .. %patch70 %patch71 %patch72 @@ -587,7 +586,6 @@ kde_post_install install -m 0644 %SOURCE12 $RPM_BUILD_ROOT/opt/kde3/share/fonts/ %if %suse_version > 1010 -install -D -m 0644 %SOURCE14 $RPM_BUILD_ROOT/etc/pam.d/xdm-np install -D -m 0644 %SOURCE21 $RPM_BUILD_ROOT/etc/pam.d/kcheckpass %else install -D -m 0644 %SOURCE914 $RPM_BUILD_ROOT/etc/pam.d/xdm-np @@ -1391,7 +1389,9 @@ /opt/kde3/%_lib/kde3/kgreet_classic.* /opt/kde3/share/apps/kdm %doc /opt/kde3/share/doc/kdm/README +%if %suse_version < 1020 %config /etc/pam.d/xdm-np +%endif %config /etc/pam.d/kcheckpass %dir /opt/kde3/share/config/kdm %config /opt/kde3/share/config/kdm/kdmrc @@ -1475,6 +1475,13 @@ %endif %changelog -n kdebase3 +* Mon Oct 30 2006 - coolo(a)suse.de +- don't install your own xdm-xp (#192400) +* Mon Oct 30 2006 - coolo(a)suse.de +- update kdm patch to make it quilt ready +- update kickoff.diff for suspend (#215065) +- update 3.5 branch diff to fix + - "set as wallpaper" does not work (#215286) * Sun Oct 29 2006 - aj(a)suse.de - Fix kdm-sysconfig-values.diff patch to fix build. * Fri Oct 27 2006 - dmueller(a)suse.de ++++++ 3_5_BRANCH.diff ++++++ ++++ 4422 lines (skipped) ++++ between KDE/kdebase3/3_5_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase3/3_5_BRANCH.diff ++++++ kdm-make_it_cool.diff ++++++ ++++ 2086 lines (skipped) ++++ between KDE/kdebase3/kdm-make_it_cool.diff ++++ and /mounts/work_src_done/STABLE/kdebase3/kdm-make_it_cool.diff ++++++ kickoff.diff ++++++ --- /var/tmp/diff_new_pack.o9IGaj/_old 2006-10-30 17:58:37.000000000 +0100 +++ /var/tmp/diff_new_pack.o9IGaj/_new 2006-10-30 17:58:37.000000000 +0100 @@ -2549,7 +2549,7 @@ +} --- kicker/ui/k_new_mnu.cpp +++ kicker/ui/k_new_mnu.cpp -@@ -0,0 +1,3877 @@ +@@ -0,0 +1,3990 @@ +/***************************************************************** + + Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. @@ -3107,11 +3107,11 @@ + + if (e->type() == QEvent::FocusIn && receiver && raiseWidget) { + m_searchResultsWidget->setFocusPolicy(QWidget::StrongFocus); -+ m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ? ++ m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ? + QWidget::StrongFocus : QWidget::NoFocus); + setTabOrder(raiseWidget, m_searchResultsWidget); -+ if (raiseWidget != m_stacker->visibleWidget() -+ && static_cast<QWidget*>(receiver)->focusPolicy() == QWidget::NoFocus ++ if (raiseWidget != m_stacker->visibleWidget() ++ && static_cast<QWidget*>(receiver)->focusPolicy() == QWidget::NoFocus + && m_stacker->id(raiseWidget) >= 0) { + + raiseStackWidget(raiseWidget); @@ -3487,7 +3487,7 @@ + tab_bottom_right.width(), + tab->height() - tab_top_right.height() - tab_bottom_right.height() - bottom_margin, + tab_right_center ); -+ ++ + // top right corner + p.drawPixmap( tab->width() - tab_bottom_right.width(), + bottom_margin, tab_top_right ); @@ -4088,35 +4088,40 @@ + i18n("Save current Session for next login"), + "kicker:/savesession", nId++, index++ ); + } -+ KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ), -+ i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ ); -+ switchuser->setHasChildren(true); ++ if (DM().isSwitchable() && kapp->authorize("switch_user")) ++ { ++ KMenuItem *switchuser = m_exitView->leftView()->insertItem( "switchuser", i18n( "Switch User" ), ++ i18n( "Manage parallel sessions" ), "kicker:/switchuser/", nId++, index++ ); ++ switchuser->setHasChildren(true); ++ } ++ ++ bool maysd = false; ++ if (ksmserver.readBoolEntry( "offerShutdown", true ) && DM().canShutdown()) ++ maysd = true; + -+ m_exitView->leftView()->insertSeparator( nId++, i18n("System"), index++ ); -+ m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ), ++ if ( maysd ) ++ { ++ m_exitView->leftView()->insertSeparator( nId++, i18n("System"), index++ ); ++ m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ), + i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ ); -+#ifdef KDELIBS_SUSE -+#warning FIXME ask HAL if suspend is supported at all -+ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to Disk" ), -+ i18n( "Pause without logging out" ), "kicker:/suspend_disk", nId++, index++ ); + -+ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to RAM" ), -+ i18n( "Pause without logging out" ), "kicker:/suspend_ram", nId++, index++ ); -+#if 0 -+ i18n("Suspend Computer"); -+ m_exitView->leftView()->insertItem( "player_pause", i18n( "Standby" ), -+ i18n( "Pause without logging out" ), "kicker:/standby", nId++, index++ ); -+#endif -+#endif -+ m_exitView->leftView()->insertItem( "reload", i18n( "Restart Computer" ), -+ i18n( "Restart and boot this system" ), -+// alternative: i18n("Restart and boot") -+ "kicker:/restart", nId++, index++ ); -+ -+ KMenuItem *restart = m_exitView->leftView()->insertItem( "reload", i18n( "Start Operating System" ), -+ i18n( "Restart and boot another operating system" ), -+ "kicker:/restart/", nId++, index++ ); -+ restart->setHasChildren(true); ++ m_exitView->leftView()->insertItem( "reload", i18n( "Restart Computer" ), ++ i18n( "Restart and boot this system" ), ++ "kicker:/restart", nId++, index++ ); ++ ++ insertSuspendOption(nId, index); ++ ++ int def, cur; ++ QStringList dummy_opts; ++ if ( DM().bootOptions( dummy_opts, def, cur ) ) ++ { ++ ++ KMenuItem *restart = m_exitView->leftView()->insertItem( "reload", i18n( "Start Operating System" ), ++ i18n( "Restart and boot another operating system" ), ++ "kicker:/restart/", nId++, index++ ); ++ restart->setHasChildren(true); ++ } ++ } + + index = 1; + @@ -4268,7 +4273,7 @@ + + addToHistory(); + -+ if ( !logout && !lock ) ++ if ( !logout && !lock ) + { + // first try if we have any search action + if (m_searchResultsWidget->currentItem()) @@ -4910,7 +4915,7 @@ + if (!bookmarkManager) + bookmarkManager = KBookmarkManager::userBookmarksManager(); + -+ if (!m_search_plugin) { ++ if (!m_search_plugin) { + m_search_plugin_interface = new QObject( this, "m_search_plugin_interface" ); + new MyKickoffSearchInterface( this, m_search_plugin_interface, "kickoffsearch interface" ); + KTrader::OfferList offers = KTrader::self()->query("KickoffSearch/Plugin"); @@ -5189,7 +5194,7 @@ + + kdDebug () << "Done inserting ... " << endl; + } -+ else if (m_overflowCategoryState==Filling && m_overflowCategory==item->category && ++ else if (m_overflowCategoryState==Filling && m_overflowCategory==item->category && + max_category_id [item->category] - base_category_id [item->category] < max_items(item->category) * 2) + m_overflowList.append(item); +} @@ -5300,6 +5305,12 @@ + +void KMenu::slotStartURL(const QString& u) +{ ++ if ( u == "kicker:/goup/" ) { ++ // only m_exitView is connected to this slot, not m_browserView ++ slotGoExitMainMenu(); ++ return; ++ } ++ + if ( u == "kicker:/restart/" || u=="kicker:/switchuser/") { + slotGoExitSubMenu(u); + return; @@ -5320,7 +5331,8 @@ +#else + DCOPRef mediamanager("ksmserver", "ksmserver"); + DCOPReply reply = mediamanager.call( "logoutTimed", (int)KApplication::ShutdownTypeNone, (int)KApplication::ShutdownModeDefault ); -+ if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"), i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo"))) ++ if (!reply.isValid() && KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to end the session?"), ++ i18n("Logout Confirmation"), KGuiItem(i18n("Logout"),"undo"))) + kapp->requestShutDown( KApplication::ShutdownConfirmNo, + KApplication::ShutdownTypeNone, + KApplication::ShutdownModeDefault ); @@ -5335,7 +5347,8 @@ + + kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,QString)", params); +#else -+ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"), i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit"))) ++ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to turn off the computer?"), ++ i18n("Shutdown Confirmation"), KGuiItem(i18n("Shutdown"),"exit"))) + kapp->requestShutDown( KApplication::ShutdownConfirmNo, + KApplication::ShutdownTypeHalt, + KApplication::ShutdownModeDefault ); @@ -5349,16 +5362,22 @@ + + kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,QString)", params); +#else -+ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"), i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload"))) ++ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to reset the computer and boot (another operating system)?"), ++ i18n("Restart Confirmation"), KGuiItem(i18n("Restart"),"reload"))) + kapp->requestShutDown( KApplication::ShutdownConfirmNo, + KApplication::ShutdownTypeReboot, + KApplication::ShutdownModeDefault ); +#endif + } +#ifdef KDELIBS_SUSE -+ else if ( u == "kicker:/suspend" ) { -+ if (KMessageBox::Continue==KMessageBox::warningContinueCancel(this, i18n("Do you really want to pause the computer without logging out?"), i18n("Suspend Confirmation"), KGuiItem(i18n("Suspend"),"player_pause"))) -+ KMessageBox::error( this, QString( "kicker:/suspend is not yet implemented " ) ); ++ else if ( u == "kicker:/suspend_disk" ) { ++ slotSuspend( 1 ); ++ } ++ else if ( u == "kicker:/suspend_ram" ) { ++ slotSuspend( 2 ); ++ } ++ else if ( u == "kicker:/standby" ) { ++ slotSuspend( 3 ); + } +#endif + else if ( u == "kicker:/savesession" ) { @@ -6426,6 +6445,100 @@ + return 5; +} + ++#define DBUS_HAL_INTERFACE "org.freedesktop.Hal" ++#define DBUS_HAL_SYSTEM_POWER_INTERFACE "org.freedesktop.Hal.Device.SystemPowerManagement" ++#define HAL_UDI_COMPUTER "/org/freedesktop/Hal/devices/computer" ++ ++#ifdef KDELIBS_SUSE ++#include <liblazy.h> ++#endif ++ ++void KMenu::insertSuspendOption( int &nId, int &index ) ++{ ++#ifdef KDELIBS_SUSE ++ int supported = -1; ++ bool suspend_ram, suspend_disk, standby; ++ ++ liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_suspend", &supported); ++ if (supported == 1) ++ suspend_ram = true; ++ else ++ suspend_ram = false; ++ liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_standby", &supported); ++ if (supported == 1) ++ standby = true; ++ else ++ standby = false; ++ liblazy_hal_get_property_bool(HAL_UDI_COMPUTER, "power_management.can_hibernate", &supported); ++ if (supported == 1) ++ suspend_disk = true; ++ else ++ suspend_disk = false; ++ ++ if (liblazy_polkit_is_user_allowed_by_uid(getuid(), "hal-power-hibernate", NULL) != 1) ++ suspend_disk = false; ++ if (liblazy_polkit_is_user_allowed_by_uid(getuid(), "hal-power-suspend", NULL) != 1) ++ suspend_ram = false; ++ if (liblazy_polkit_is_user_allowed_by_uid(getuid(), "hal-power-standby", NULL) != 1) ++ standby = false; ++ ++ if ( ! ( standby + suspend_ram + suspend_disk ) ) ++ return; ++ ++ i18n("Suspend Computer"); ++ ++ if ( suspend_disk ) ++ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to Disk" ), ++ i18n( "Pause without logging out" ), "kicker:/suspend_disk", nId++, index++ ); ++ ++ if ( suspend_ram ) ++ m_exitView->leftView()->insertItem( "player_pause", i18n( "Suspend to RAM" ), ++ i18n( "Pause without logging out" ), "kicker:/suspend_ram", nId++, index++ ); ++ ++ if ( standby ) ++ m_exitView->leftView()->insertItem( "player_pause", i18n( "Standby" ), ++ i18n( "Pause without logging out" ), "kicker:/standby", nId++, index++ ); ++#endif ++} ++ ++void KMenu::slotSuspend(int id) ++{ ++#ifdef KDELIBS_SUSE ++ int error = 0; ++ int wake = 0; ++ DBusMessage *reply; ++ ++ if (id == 1) { ++ error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE, ++ HAL_UDI_COMPUTER, ++ DBUS_HAL_SYSTEM_POWER_INTERFACE, ++ "Hibernate", ++ &reply, ++ DBUS_TYPE_INVALID); ++ } else if (id == 2) ++ error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE, ++ HAL_UDI_COMPUTER, ++ DBUS_HAL_SYSTEM_POWER_INTERFACE, ++ "Suspend", ++ &reply, ++ DBUS_TYPE_INT32, ++ &wake, ++ DBUS_TYPE_INVALID); ++ else if (id == 3) ++ error = liblazy_dbus_system_send_method_call(DBUS_HAL_INTERFACE, ++ HAL_UDI_COMPUTER, ++ DBUS_HAL_SYSTEM_POWER_INTERFACE, ++ "Standby", ++ &reply, ++ DBUS_TYPE_INVALID); ++ else ++ return; ++ if (error) ++#endif ++ KMessageBox::error(this, i18n("Suspend failed")); ++ ++} ++ +// vim:cindent:sw=4: --- kicker/ui/kmenuitembase.ui +++ kicker/ui/kmenuitembase.ui @@ -6759,7 +6872,7 @@ +#endif --- kicker/ui/k_new_mnu.h +++ kicker/ui/k_new_mnu.h -@@ -0,0 +1,341 @@ +@@ -0,0 +1,343 @@ +/***************************************************************** + + Copyright (c) 1996-2000 the kicker authors. See file AUTHORS. @@ -6892,7 +7005,7 @@ + void slotGoBack(); + void slotGoExitMainMenu(); + void slotGoExitSubMenu(const QString& url); -+ ++ + void paletteChanged(); + virtual void configChanged(); + void updateRecent(); @@ -6922,6 +7035,7 @@ + + void updateMedia(); + void slotFavDropped(QDropEvent * e, QListViewItem *after ); ++ void slotSuspend(int id); + +signals: + void clickedBrowserButton(); @@ -6941,6 +7055,7 @@ + void doNewSession(bool lock); + void createRecentMenuItems(); + void insertStaticItems(); ++ void insertSuspendOption( int &id, int &index ); + virtual void clearSubmenus(); + void raiseStackWidget( QWidget *view ); + @@ -9097,7 +9212,14 @@ +#endif --- kicker/ui/Makefile.am +++ kicker/ui/Makefile.am -@@ -7,32 +7,38 @@ +@@ -1,38 +1,44 @@ + INCLUDES = -I$(srcdir)/../core -I../core -I$(srcdir)/../buttons \ + -I../../libkicker -I$(srcdir)/../../libkicker \ +- -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(all_includes) ++ -I$(top_srcdir)/libkonq -I$(top_srcdir)/kdmlib $(DBUS_INCS) $(all_includes) + + noinst_LTLIBRARIES = libkicker_ui.la + libkicker_ui_la_SOURCES = addbutton_mnu.cpp appletitem.ui appletview.ui addapplet.cpp \ addapplet_mnu.cpp appletop_mnu.cpp \ browser_mnu.cpp client_mnu.cpp dirdrop_mnu.cpp \ @@ -9117,7 +9239,7 @@ -libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kdmlib/libdmctl.la +libkicker_ui_la_LIBADD = $(top_builddir)/libkonq/libkonq.la $(top_builddir)/kdmlib/libdmctl.la \ -+ $(LIB_KABC) ../interfaces/libkickoffsearch_interfaces.la ++ $(LIB_KABC) ../interfaces/libkickoffsearch_interfaces.la -llazy libkicker_ui_la_METASOURCES = AUTO @@ -10992,11 +11114,11 @@ +++ data/kmenu_side/Makefile.am @@ -1,6 +1,5 @@ -kicker_kmenuside_pics_data_DATA = kside.png kside_tile.png -- --kicker_kmenuside_pics_datadir = $(kde_datadir)/kicker/pics/ +kicker_kmenuside_pics_data_DATA = kside.png kside_tile.png +kicker_kmenuside_pics_datadir = $(kde_datadir)/kicker/pics +-kicker_kmenuside_pics_datadir = $(kde_datadir)/kicker/pics/ +- EXTRA_DIST = $(kicker_kmenuside_pics_data_DATA) --- data/Makefile.am ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package hal checked in at Mon Oct 30 17:58:35 CET 2006. -------- --- hal/hal.changes 2006-10-23 18:50:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/hal/hal.changes 2006-10-30 16:15:10.000000000 +0100 @@ -1,0 +2,28 @@ +Mon Oct 30 15:14:44 CET 2006 - dkukawka(a)suse.de + +- fixed bugs: + - b.n.c #210297: added --datadir to spec file + - b.n.c #214461: detect Ipod Nano2 correct + - unreported: HAL show storage devices again +- updated patches: + - hal-performance_pci.ids_v5.diff: adapted patch to current code, + fixed code in search func and speed up the search + - hal-add-tabletPC_support.diff: adapted to current code + - hal-panasonic-acpi-suse.diff: updates from seife(a)suse.de +- removed patches: + - hal-performance-properties*: they don't work anymore because + of code changes in HAL ... maybe adapt them later + - hal-do-not-close-shared-connection-thoenig-01.patch: removed + upstream gone patch +- renamed patches we need to port from hal-fix-* hal-toport-* + +------------------------------------------------------------------- +Sun Oct 29 11:07:05 CET 2006 - hmacht(a)suse.de + +- patch hal-add-pm-utils-support.diff: + do it so that upstream will accept it +- patch hal-fix-cpufreq-dbus-restart.patch: + fix the addon so that it properly survives D-Bus restarts +- Requires: pm-utils + +------------------------------------------------------------------- Old: ---- hal-0.5.8_git20060927.tar.bz2 hal-do-not-close-shared-connection-thoenig-01.patch hal-fix-mount_159475.diff hal-fix-mount_device_fstab_with_user_option_172870.diff hal-fix-storage-policy-fixed-drives.diff hal-performance-pci_ids_v2.patch hal-performance-properties1.diff hal-performance-properties2.diff hal-performance-properties_fix_compiler_warnings.diff New: ---- hal-0.5.8_git20061027.tar.bz2 hal-fix-cpufreq-dbus-restart.patch hal-performance_pci.ids_v5.diff hal-toport-mount_159475.diff hal-toport-mount_device_fstab_with_user_option_172870.diff hal-toport-storage-policy-fixed-drives.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.qk4ugh/_old 2006-10-30 17:57:59.000000000 +0100 +++ /var/tmp/diff_new_pack.qk4ugh/_new 2006-10-30 17:57:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hal (Version 0.5.8_git20060927) +# spec file for package hal (Version 0.5.8_git20061027) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,47 +16,44 @@ URL: http://freedesktop.org/Software/hal %define dbus_version 0.61 %define dbus_release 1 -License: Other License(s), see package, Other uncritical OpenSource License +License: Other uncritical OpenSource License, Other License(s), see package Group: System/Daemons -Version: 0.5.8_git20060927 -Release: 14 +Version: 0.5.8_git20061027 +Release: 1 Autoreqprov: on Summary: Daemon for Collecting Hardware Information # SUSE specific patches Patch0: %{name}-add-tabletPC_support.diff -Patch1: %{name}-performance-properties1.diff -Patch2: %{name}-performance-properties2.diff -Patch3: %{name}-performance-properties_fix_compiler_warnings.diff -Patch4: %{name}-fix-mount_options.diff -Patch5: %{name}-panasonic-acpi-suse.diff -Patch6: hal-pci.diff -Patch7: hal-configure.diff +Patch1: %{name}-fix-mount_options.diff +Patch2: %{name}-panasonic-acpi-suse.diff # only on SLED10 to avoid dbus update Patch50: hal-back_to_dbus_0.6.0.diff # # submitted (or planed to do in next time) upstream patches -Patch100: hal-performance-pci_ids_v2.patch +Patch100: hal-performance_pci.ids_v5.diff Patch101: hal-add-standby-support.diff Patch102: hal-fix-util_compute_time_remaining_warning_highTime.diff Patch103: hal-fix-power-privileges.diff -Patch104: hal-do-not-close-shared-connection-thoenig-01.patch +Patch104: hal-pci.diff Patch105: hal-add-pm-utils-support.diff +Patch106: hal-configure.diff +Patch107: hal-fix-cpufreq-dbus-restart.patch # # patches for testing: #Patch300: hal_debug.diff ## ## external patches from HAL List and backports patches we need to port or to check # unclear how to fix this atm -Patch400: %{name}-fix-mount_159475.diff +Patch400: %{name}-toport-mount_159475.diff # Kay Sievers is working on a integration in the hal mount binary -Patch401: %{name}-fix-mount_device_fstab_with_user_option_172870.diff -Patch402: hal-fix-storage-policy-fixed-drives.diff +Patch401: %{name}-toport-mount_device_fstab_with_user_option_172870.diff +Patch402: %{name}-toport-storage-policy-fixed-drives.diff # Sources: Source0: %{name}-%{version}.tar.bz2 Source1: rc.hal Source2: 90-hal.rules Prereq: /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs -Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit +Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, pm-utils Provides: hotplugctl Obsoletes: hotplugctl BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -136,20 +133,17 @@ %prep %setup -n %{name}-%{version} -q %patch0 -p1 -%patch100 +%patch100 -p1 %patch1 -p1 -#%patch2 -p1 -#%patch3 -%patch4 -p1 -%patch5 -p0 -%patch6 -%patch7 +%patch2 -p0 #%patch50 -p1 %patch101 %patch102 -p1 %patch103 -p1 -%patch104 -p1 +%patch104 %patch105 +%patch106 +%patch107 -p1 #%patch300 %build @@ -163,6 +157,7 @@ --libdir=%{_libdir} \ --libexecdir=%{_libexecdir}/hal \ --mandir=%{_mandir} \ + --datadir=%{_datadir} \ --with-init-scripts=suse \ --with-hwdata=/usr/share \ --enable-hotplug-map \ @@ -263,6 +258,28 @@ %{_bindir}/hal-device-manager %changelog -n hal +* Mon Oct 30 2006 - dkukawka(a)suse.de +- fixed bugs: + - b.n.c #210297: added --datadir to spec file + - b.n.c #214461: detect Ipod Nano2 correct + - unreported: HAL show storage devices again +- updated patches: + - hal-performance_pci.ids_v5.diff: adapted patch to current code, + fixed code in search func and speed up the search + - hal-add-tabletPC_support.diff: adapted to current code + - hal-panasonic-acpi-suse.diff: updates from seife(a)suse.de +- removed patches: + - hal-performance-properties*: they don't work anymore because + of code changes in HAL ... maybe adapt them later + - hal-do-not-close-shared-connection-thoenig-01.patch: removed + upstream gone patch +- renamed patches we need to port from hal-fix-* hal-toport-* +* Sun Oct 29 2006 - hmacht(a)suse.de +- patch hal-add-pm-utils-support.diff: + do it so that upstream will accept it +- patch hal-fix-cpufreq-dbus-restart.patch: + fix the addon so that it properly survives D-Bus restarts +- Requires: pm-utils * Mon Oct 23 2006 - hmacht(a)suse.de - patch hal-add-pm-utils-support.diff: call pm-utils first, then try powersave if not available ++++++ hal-0.5.8_git20060927.tar.bz2 -> hal-0.5.8_git20061027.tar.bz2 ++++++ ++++ 18422 lines of diff (skipped) ++++++ hal-add-tabletPC_support.diff ++++++ --- /var/tmp/diff_new_pack.qk4ugh/_old 2006-10-30 17:58:03.000000000 +0100 +++ /var/tmp/diff_new_pack.qk4ugh/_new 2006-10-30 17:58:03.000000000 +0100 @@ -56,43 +56,44 @@ check: for f in $(dist_fdi_DATA); do \ -diff --git a/hald/linux/physdev.c b/hald/linux/physdev.c -index c2ae795..fa5975b 100644 ---- a/hald/linux/physdev.c -+++ b/hald/linux/physdev.c -@@ -416,11 +416,31 @@ ide_compute_udi (HalDevice *d) +diff --git a/hald/linux/device.c b/hald/linux/device.c +index 9f1a86a..6ffe7c6 100644 +--- a/hald/linux/device.c ++++ b/hald/linux/device.c +@@ -1379,11 +1379,32 @@ ide_compute_udi (HalDevice *d) } /*--------------------------------------------------------------------------------------------------------------*/ +static void +pnp_set_serial_info (const gchar *sysfs_path, HalDevice *d) { + -+ hal_util_set_int_elem_from_file (d, "pnp.serial.irq", sysfs_path, "resources", "irq", 0, 10, TRUE); -+ ++ hal_util_set_int_elem_from_file (d, "pnp.serial.irq", sysfs_path, "resources", "irq", 0, 10, TRUE); ++ + if (hal_util_set_string_elem_from_file (d, "pnp.serial.port", sysfs_path, "resources", "io", 0, TRUE)) { + const char* port; + const char* _port; + _port = hal_device_property_get_string (d, "pnp.serial.port"); + if(_port == NULL) + return; -+ ++ + port = strtok((char*) _port, "-"); + if(port == NULL) + return; -+ ++ + hal_device_property_set_string (d, "pnp.serial.port", port); + } +} ++ static HalDevice * - pnp_add (const gchar *sysfs_path, HalDevice *parent) + pnp_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) { HalDevice *d; + HalDevice *computer; d = hal_device_new (); hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); -@@ -437,11 +457,29 @@ pnp_add (const gchar *sysfs_path, HalDev +@@ -1400,11 +1421,29 @@ pnp_add (const gchar *sysfs_path, const hal_util_set_string_from_file (d, "pnp.id", sysfs_path, "id"); if (hal_device_has_property (d, "pnp.id")) { gchar *pnp_description; @@ -103,19 +104,19 @@ hal_device_property_set_string (d, "info.product", pnp_description); } + pnp_id = hal_device_property_get_string (d, "pnp.id"); -+ if( !strncmp(pnp_id, "WACf00", 6) || !strcmp(pnp_id, "FUJ02e5") || ++ if( !strncmp(pnp_id, "WACf00", 6) || !strcmp(pnp_id, "FUJ02e5") || + !strcmp(pnp_id, "FUJ02e6") || !strcmp(pnp_id, "FPI2004")) { + /* a internal serial tablet --> this should be a tablet pc */ + hal_device_add_capability (d, "input"); + hal_device_add_capability (d, "input.tablet"); + hal_device_add_capability (d, "input.tablet.tabletPC"); + -+ if ((computer = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer")) != NULL || ++ if ((computer = hal_device_store_find (hald_get_gdl (), "/org/freedesktop/Hal/devices/computer")) != NULL || + (computer = hal_device_store_find (hald_get_tdl (), "/org/freedesktop/Hal/devices/computer")) != NULL) { + + hal_device_property_set_string (computer, "system.formfactor", "laptop"); + hal_device_property_set_string (computer, "system.formfactor.subtype", "tabletpc"); -+ /* collect info about serial port and irq etc. */ ++ /* collect info about serial port and irq etc. */ + pnp_set_serial_info (sysfs_path, d); + } + } ++++++ hal-fix-cpufreq-dbus-restart.patch ++++++ diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am diff --git a/hald/linux/addons/addon-cpufreq.c b/hald/linux/addons/addon-cpufreq.c index e07ff69..2dc271b 100644 --- a/hald/linux/addons/addon-cpufreq.c +++ b/hald/linux/addons/addon-cpufreq.c @@ -815,7 +815,7 @@ static gboolean dbus_is_privileged(DBusC gboolean out_is_allowed; gboolean out_is_temporary; LibPolKitResult res; - + connection_new = dbus_bus_get(DBUS_BUS_SYSTEM, error); if (dbus_error_is_set(error)) { dbus_raise_error(connection, message, CPUFREQ_ERROR_GENERAL, @@ -952,6 +952,19 @@ static gboolean dbus_get_argument(DBusCo return TRUE; } +static DBusHandlerResult dbus_filter_function_local(DBusConnection *connection, + DBusMessage *message, + void *user_data) +{ + if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, + "Disconnected")) { + HAL_DEBUG(("DBus daemon disconnected. Trying to reconnect...")); + dbus_connection_unref(connection); + g_timeout_add(5000, (GSourceFunc)dbus_init_local, NULL); + } + return DBUS_HANDLER_RESULT_HANDLED; +} + /** dbus filter function * * @raises UnknownMethod @@ -1043,13 +1056,6 @@ #endif dbus_send_reply_strlist(connection, message, governors); g_strfreev(governors); - } else if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL, - "Disconnected")) { - HAL_DEBUG(("DBus daemon disconnected. Trying to reconnect...")); - dbus_connection_close(connection); - dbus_connection_unref(connection); - g_timeout_add(5000, (GSourceFunc)dbus_init, NULL); - } else { return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } @@ -1071,6 +1077,26 @@ static gboolean is_supported(void) } /** returns FALSE on success because it's used as a callback */ +gboolean dbus_init_local(void) +{ + DBusConnection *dbus_connection; + DBusError dbus_error; + + dbus_error_init(&dbus_error); + + dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbus_error); + if (dbus_error_is_set(&dbus_error)) { + HAL_WARNING(("Cannot get D-Bus connection")); + return TRUE; + } + + dbus_connection_setup_with_g_main(dbus_connection, NULL); + dbus_connection_add_filter(dbus_connection, dbus_filter_function_local, + NULL, NULL); + dbus_connection_set_exit_on_disconnect(dbus_connection, 0); + return FALSE; +} + gboolean dbus_init(void) { DBusError dbus_error; @@ -1090,12 +1116,10 @@ gboolean dbus_init(void) goto Error; } - dbus_error_init (&dbus_error); if (!libhal_device_addon_is_ready (halctx, udi, &dbus_error)) { goto Error; } - if (!libhal_device_claim_interface(halctx, udi, "org.freedesktop.Hal.Device.CPUFreq", " <method name=\"SetCPUFreqGovernor\">\n" @@ -1137,11 +1161,11 @@ gboolean dbus_init(void) dbus_connection_setup_with_g_main(dbus_connection, NULL); dbus_connection_add_filter(dbus_connection, dbus_filter_function, NULL, NULL); dbus_connection_set_exit_on_disconnect(dbus_connection, 0); - return FALSE; + return TRUE; Error: dbus_error_free(&dbus_error); - return TRUE; + return FALSE; } /********************* DBus end *********************/ @@ -1179,7 +1203,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (dbus_init()) + if (!dbus_init() || dbus_init_local()) exit(EXIT_FAILURE); gmain = g_main_loop_new(NULL, FALSE); diff --git a/hald/linux/addons/addon-cpufreq.h b/hald/linux/addons/addon-cpufreq.h index d812219..f4141be 100644 --- a/hald/linux/addons/addon-cpufreq.h +++ b/hald/linux/addons/addon-cpufreq.h @@ -69,4 +69,6 @@ gboolean write_governor (char *new_gove gboolean dbus_init (void); +gboolean dbus_init_local (void); + #endif /* ADDON_CPUFREQ_H */ diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c ++++++ hal-panasonic-acpi-suse.diff ++++++ --- /var/tmp/diff_new_pack.qk4ugh/_old 2006-10-30 17:58:04.000000000 +0100 +++ /var/tmp/diff_new_pack.qk4ugh/_new 2006-10-30 17:58:04.000000000 +0100 @@ -1,6 +1,6 @@ --- hald/linux/acpi.c +++ hald/linux/acpi.c -@@ -1026,7 +1026,7 @@ +@@ -1037,7 +1037,7 @@ */ acpi_synthesize_display ("acpi/toshiba", "lcd", ACPI_TYPE_TOSHIBA_DISPLAY); acpi_synthesize_display ("acpi/asus", "brn", ACPI_TYPE_ASUS_DISPLAY); @@ -9,3 +9,26 @@ acpi_synthesize_display ("acpi/ibm", "brightness", ACPI_TYPE_IBM_DISPLAY); acpi_synthesize_display ("acpi/sony", "brightness", ACPI_TYPE_SONY_DISPLAY); /* omnibook does not live under acpi GNOME#331458 */ +--- tools/linux/hal-system-lcd-get-brightness-linux ++++ tools/linux/hal-system-lcd-get-brightness-linux +@@ -35,7 +35,8 @@ + elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then + # cat /proc/acpi/pcc/brightness + # 5 +- value="`cat $HAL_PROP_LINUX_ACPI_PATH`" ++ read value < $HAL_PROP_LINUX_ACPI_PATH ++ value=$[($value-51)/13] + elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then + # cat /proc/acpi/ibm/brightness + # level: 5 +--- tools/linux/hal-system-lcd-set-brightness-linux ++++ tools/linux/hal-system-lcd-set-brightness-linux +@@ -33,7 +33,7 @@ + elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then + # echo {0..15} > /proc/acpi/pcc/brightness + # http://readlist.com/lists/vger.kernel.org/linux-kernel/7/36405.html +- echo "$value" > $HAL_PROP_LINUX_ACPI_PATH ++ echo "$[($value*136)/10+51]" > $HAL_PROP_LINUX_ACPI_PATH + elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then + # echo "level {0..7}" > /proc/acpi/ibm/brightness + # http://ibm-acpi.sourceforge.net/README ++++++ hal-performance_pci.ids_v5.diff ++++++ diff --git a/hald/ids.c b/hald/ids.c index 223c8d4..5f253eb 100644 --- a/hald/ids.c +++ b/hald/ids.c @@ -28,14 +28,14 @@ # include <config.h> #endif #include <ctype.h> +#include <errno.h> +#include <fcntl.h> #include <stdint.h> #include <string.h> -#include <unistd.h> #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> -#include <fcntl.h> -#include <errno.h> +#include <unistd.h> #include <dbus/dbus.h> #include <dbus/dbus-glib.h> @@ -47,11 +47,17 @@ #include "ids.h" /** Pointer to where the pci.ids file is loaded */ static char *pci_ids = NULL; +/** Array of pointers to the beginning of the lines */ +static char **pci_ids_list = NULL; + /** Length of data store at at pci_ids */ -static size_t pci_ids_len; +static unsigned int pci_ids_len; -/** Iterator position into pci_ids */ -static size_t pci_ids_iter_pos; +/** number of lines in pci_ids_list */ +static unsigned int pci_ids_lines; + +/** Iterator position into pci_ids_list */ +static unsigned int pci_ids_iter_pos; /** Initialize the pci.ids line iterator to the beginning of the file */ static void @@ -74,22 +80,15 @@ static char * pci_ids_line_iter_get_line (unsigned int *line_len) { unsigned int i; - static char line[PCI_IDS_MAX_LINE_LEN]; - for (i = 0; - pci_ids_iter_pos < pci_ids_len && - i < PCI_IDS_MAX_LINE_LEN - 1 && - pci_ids[pci_ids_iter_pos] != '\n'; i++, pci_ids_iter_pos++) { - line[i] = pci_ids[pci_ids_iter_pos]; - } + i = strlen(pci_ids_list[pci_ids_iter_pos]); - line[i] = '\0'; if (line_len != NULL) *line_len = i; pci_ids_iter_pos++; - return line; + return pci_ids_list[pci_ids_iter_pos-1]; } /** See if there are more lines to process in pci.ids @@ -99,7 +98,7 @@ pci_ids_line_iter_get_line (unsigned int static dbus_bool_t pci_ids_line_iter_has_more () { - return pci_ids_iter_pos < pci_ids_len; + return pci_ids_iter_pos < pci_ids_lines; } @@ -133,21 +132,29 @@ ids_find_pci (int vendor_id, int product char rep_spi[8]; dbus_bool_t vendor_matched = FALSE; dbus_bool_t product_matched = FALSE; + dbus_bool_t subvendor_matched = FALSE; + dbus_bool_t subproduct_matched = FALSE; static char store_vn[PCI_IDS_MAX_LINE_LEN]; static char store_pn[PCI_IDS_MAX_LINE_LEN]; static char store_svn[PCI_IDS_MAX_LINE_LEN]; static char store_spn[PCI_IDS_MAX_LINE_LEN]; - snprintf (rep_vi, 8, "%04x", vendor_id); - snprintf (rep_pi, 8, "%04x", product_id); - snprintf (rep_svi, 8, "%04x", subsys_vendor_id); - snprintf (rep_spi, 8, "%04x", subsys_product_id); - *vendor_name = NULL; *product_name = NULL; *subsys_vendor_name = NULL; *subsys_product_name = NULL; + if (vendor_id == 0 && product_id == 0 && subsys_vendor_id == 0 && subsys_product_id == 0) { + HAL_DEBUG (("ids_find_pci: all id's == 0, nothing to search for. return.")); + goto out; + } + + snprintf (rep_vi, 8, "%04x", vendor_id); + snprintf (rep_pi, 8, "%04x", product_id); + snprintf (rep_svi, 8, "%04x", subsys_vendor_id); + snprintf (rep_spi, 8, "%04x", subsys_product_id); + + for (pci_ids_line_iter_init (); pci_ids_line_iter_has_more ();) { line = pci_ids_line_iter_get_line (&line_len); @@ -167,11 +174,12 @@ ids_find_pci (int vendor_id, int product num_tabs++; } + /* check if we already found all */ + if (vendor_matched && product_matched && subvendor_matched && subproduct_matched) + goto out; + switch (num_tabs) { case 0: - /* vendor names */ - vendor_matched = FALSE; - /* first check subsys_vendor_id, if haven't done * already */ if (*subsys_vendor_name == NULL @@ -179,6 +187,8 @@ ids_find_pci (int vendor_id, int product if ((*((dbus_uint32_t *) line)) == (*((dbus_uint32_t *) rep_svi))) { /* found it */ + subvendor_matched = TRUE; + for (i = 4; i < line_len; i++) { if (!isspace (line[i])) break; @@ -186,11 +196,14 @@ ids_find_pci (int vendor_id, int product strncpy (store_svn, line + i, PCI_IDS_MAX_LINE_LEN); *subsys_vendor_name = store_svn; + + if (vendor_matched && product_matched && subsys_product_id == 0) + goto out; } } /* check vendor_id */ - if (vendor_id != 0) { + if (vendor_id != 0 && !vendor_matched) { if (memcmp (line, rep_vi, 4) == 0) { /* found it */ vendor_matched = TRUE; @@ -202,20 +215,17 @@ ids_find_pci (int vendor_id, int product strncpy (store_vn, line + i, PCI_IDS_MAX_LINE_LEN); *vendor_name = store_vn; + + if (product_id == 0 && subsys_vendor_id == 0 && subsys_product_id == 0) + goto out; } } break; case 1: - product_matched = FALSE; - - /* product names */ - if (!vendor_matched) - continue; - - /* check product_id */ - if (product_id != 0) { + + if (product_id != 0 && vendor_matched && !product_matched) { if (memcmp (line + 1, rep_pi, 4) == 0) { /* found it */ @@ -228,6 +238,10 @@ ids_find_pci (int vendor_id, int product strncpy (store_pn, line + i, PCI_IDS_MAX_LINE_LEN); *product_name = store_pn; + + if ((subsys_vendor_id == 0 && subsys_product_id == 0) || + (subvendor_matched && subsys_product_id == 0)) + goto out; } } break; @@ -236,6 +250,8 @@ ids_find_pci (int vendor_id, int product /* subsystem_vendor subsystem_product */ if (!vendor_matched || !product_matched) continue; + if (vendor_matched && product_matched && subvendor_matched && subsys_product_id == 0) + goto out; /* check product_id */ if (subsys_vendor_id != 0 @@ -244,6 +260,8 @@ ids_find_pci (int vendor_id, int product && memcmp (line + 7, rep_spi, 4) == 0) { /* found it */ + subproduct_matched = TRUE; + for (i = 11; i < line_len; i++) { if (!isspace (line[i])) break; @@ -251,6 +269,8 @@ ids_find_pci (int vendor_id, int product strncpy (store_spn, line + i, PCI_IDS_MAX_LINE_LEN); *subsys_product_name = store_spn; + + goto out; } } @@ -261,8 +281,26 @@ ids_find_pci (int vendor_id, int product } } +out: + return; } +/** Free resources used by to store the PCI database + * + * @param #FALSE if the PCI database wasn't loaded + */ +static dbus_bool_t +pci_ids_free () +{ + if (pci_ids != NULL) { + free (pci_ids); + pci_ids = NULL; + free (pci_ids_list); + pci_ids_list = NULL; + return TRUE; + } + return FALSE; +} /** Load the PCI database used for mapping vendor, product, subsys_vendor * and subsys_product numbers into names. @@ -274,36 +312,91 @@ ids_find_pci (int vendor_id, int product static dbus_bool_t pci_ids_load (const char *path) { - int fd; - struct stat statbuf; - gboolean ret; + FILE *fp; + unsigned int num_read; + unsigned int line_count; + unsigned int i; + char *pci_ids_tmp; + char *pci_ids_tmp2; + char **pci_ids_list_tmp; + int start_of_line; + + fp = fopen (path, "r"); + if (fp == NULL) { + HAL_ERROR (("couldn't open PCI database at %s,", path)); + return FALSE; + } - ret = FALSE; + fseek (fp, 0, SEEK_END); + pci_ids_len = ftell (fp); + fseek (fp, 0, SEEK_SET); - if (stat (path, &statbuf) != 0) { - HAL_WARNING (("Couldn't stat pci.ids file '%s', errno=%d: %s", path, errno, strerror (errno))); - goto out; + pci_ids = malloc (pci_ids_len); + if (pci_ids == NULL) { + DIE (("Couldn't allocate %d bytes for PCI database file\n", + pci_ids_len)); } - pci_ids_len = statbuf.st_size; - fd = open (path, O_RDONLY); - if (fd < 0) { - HAL_WARNING (("Couldn't open pci.ids file '%s', errno=%d: %s", path, errno, strerror (errno))); - goto out; + num_read = fread (pci_ids, sizeof (char), pci_ids_len, fp); + if (pci_ids_len != num_read) { + HAL_ERROR (("Error loading PCI database file")); + pci_ids_free(); + fclose(fp); + return FALSE; } - pci_ids = mmap (NULL, pci_ids_len, PROT_READ, MAP_SHARED, fd, 0); - if (pci_ids == MAP_FAILED) { - HAL_WARNING (("Couldn't mmap pci.ids file '%s', errno=%d: %s", path, errno, strerror (errno))); - close (fd); - goto out; + fclose(fp); + + /* File loaded into mem. Build pointer list lines starting with # are skipped. */ + line_count = 0; + pci_ids_tmp = pci_ids; + start_of_line = TRUE; + do { + if (start_of_line && *pci_ids_tmp != '#') + line_count++; + + start_of_line = FALSE; + if (*pci_ids_tmp == '\n') + start_of_line = TRUE; + + pci_ids_tmp++; + } while (pci_ids_tmp < (pci_ids + pci_ids_len)); + + /* create list */ + pci_ids_list = (char **)malloc(sizeof(char *) * (line_count + 1)); + if (pci_ids_list == NULL) { + HAL_ERROR (("Error loading PCI database file")); + free (pci_ids); + pci_ids = NULL; + return FALSE; } - ret = TRUE; + memset(pci_ids_list, 0, sizeof(char *) * (line_count + 1)); + /* now the beginning of each string into the list */ + pci_ids_list_tmp = pci_ids_list; + pci_ids_tmp = pci_ids; + i = 0; + while (i < line_count) { + if (*pci_ids_tmp != '#') { + *pci_ids_list_tmp = pci_ids_tmp; + pci_ids_list_tmp++,i++; + } - close (fd); -out: - return ret; + pci_ids_tmp2 = pci_ids_tmp; + pci_ids_tmp = strchr(pci_ids_tmp,'\n'); + if (pci_ids_tmp != NULL) { + /* replace \n by \0 */ + if ((pci_ids_tmp - pci_ids_tmp2) < PCI_IDS_MAX_LINE_LEN) { + *pci_ids_tmp = '\0'; + } else { + *(pci_ids_tmp2 + PCI_IDS_MAX_LINE_LEN) = '\0'; + } + + pci_ids_tmp++; + } + } + pci_ids_lines = line_count; + return TRUE; } /*==========================================================================*/ ++++++ hal-toport-mount_159475.diff ++++++ --- fdi/policy/10osvendor/10-storage-policy.fdi 2006-03-27 18:56:34.000000000 +0200 +++ fdi/policy/10osvendor/10-storage-policy.fdi 2006-03-27 18:59:52.000000000 +0200 @@ -213,6 +213,16 @@ <match key="volume.partition.msdos_part_table_type" int="0x0e"> <merge key="volume.policy.should_mount" type="bool">true</merge> </match> +  +  + <match key="volume.partition.msdos_part_table_type" int="0x17"> + <merge key="volume.policy.should_mount" type="bool">false</merge> + <merge key="volume.ignore" type="bool">true</merge> + </match> + <match key="volume.partition.msdos_part_table_type" int="0xda"> + <merge key="volume.policy.should_mount" type="bool">false</merge> + <merge key="volume.ignore" type="bool">true</merge> + </match> </match> </match> </match> ++++++ hal-toport-mount_device_fstab_with_user_option_172870.diff ++++++ --- tools/hal-system-storage-mount 2006-05-19 13:22:55.000000000 +0200 +++ tools/hal-system-storage-mount 2006-05-19 13:30:28.000000000 +0200 @@ -35,36 +35,42 @@ exit 1 fi - check_fstab() { - awk -v dev="$1" \ + awk -v dev="$1" -v mp="$2"\ ' BEGIN { sub(/^\/dev\//,"", dev) - cmd = "/usr/bin/udevinfo -q symlink -n " dev - if (( cmd | getline) < 0 ) { - print "org.freedesktop.Hal.Device.Volume.PermissionDenied" >/dev/stderr - exit 1 - } - + ("/usr/bin/udevinfo -q symlink -n " dev " 2> /dev/null") | getline for(i=1; i <= NF; i++) { a["/dev/" $i] = 1 } a["/dev/" dev] = 1 } { - if ($1 in a) { + if ($1 in a) { + # "user" option is needed + n = split ($4, options, ",") + for (i = 1; i <= n; i++) { + if (options[i] == "user") { + # return specified mountpoint if below /media + mount = $2 + if (match(mount, "^/media/") > 0) { + sub(/^\/media\//,"", mount) + print mount + exit 0 + } + } + } + print "org.freedesktop.Hal.Device.Volume.PermissionDenied" >"/dev/stderr" - print $1 " found in /etc/fstab" >"/dev/stderr" + print "/etc/fstab configuration does not allow unprivileged operation" >"/dev/stderr" exit 1 } } ' /etc/fstab } -check_fstab "$HAL_PROP_BLOCK_DEVICE" || exit 1 - # read parameters # "MyDisk\n" # "fuse\n" @@ -78,6 +84,21 @@ read GIVEN_MOUNTOPTIONS GIVEN_MOUNTOPTIONS=${GIVEN_MOUNTOPTIONS//[^a-zA-Z0-9_=[:space:]]/_} +# deny to handle devices listed in fstab, unless the "user" option is given +# allow only use of specified mountpoint and fail for a different one +FSTAB_MOUNTPOINT=$(check_fstab "$HAL_PROP_BLOCK_DEVICE") || exit 1 +if [ -n "$FSTAB_MOUNTPOINT" ]; then + # fail if we got a request for a different mountpoint + if [ -n "$GIVEN_MOUNTPOINT" ] && [ "$GIVEN_MOUNTPOINT" != "$FSTAB_MOUNTPOINT" ]; then + echo "org.freedesktop.Hal.Device.Volume.PermissionDenied" >&2 + echo "/etc/fstab configuration does not allow this mountpoint" >&2 + exit 1; + fi + # use mountpoint from fstab + GIVEN_MOUNTPOINT="$FSTAB_MOUNTPOINT" +fi + +# if no mountpoint is given, use filesystem label, or drive_type, or "disk" if [ -z "$GIVEN_MOUNTPOINT" ]; then if [ -n "$HAL_PROP_VOLUME_LABEL" ]; then GIVEN_MOUNTPOINT="$HAL_PROP_VOLUME_LABEL" @@ -134,9 +155,13 @@ esac fi -# if no type is given, use default name +# if no type is given, use default type, or let the kernel find out if [ "$MOUNTTYPE" == "" ]; then - MOUNTTYPE=$HAL_PROP_VOLUME_FSTYPE + if [ "$HAL_PROP_VOLUME_FSTYPE" != "" ]; then + MOUNTTYPE=$HAL_PROP_VOLUME_FSTYPE + else + MOUNTTYPE="auto" + fi fi # retrieve white-list from device properties (see fdi/policy/osvendor/20-storage-methods.fdi) @@ -186,16 +211,23 @@ /usr/lib64/hal/scripts/hal-system-storage-cleanup-mountpoints fi -# append number to mountpoint if it already exists -if [ -e "$MOUNT_ROOT/$MOUNTPOINT" ]; then - NUM=1; +# append number to mountpoint if it is already in use +while read dev dir type options; do + if [ "$dir" = "$MOUNT_ROOT/$MOUNTPOINT" ]; then + MOUNTPOINT_BUSY=1 + break; + fi +done < /proc/mounts +if [ -n "$MOUNTPOINT_BUSY" ]; then + NUM=1 while [ -e "$MOUNT_ROOT/$MOUNTPOINT-$NUM" ]; do NUM=$(($NUM + 1)) done MOUNTPOINT="$MOUNTPOINT-$NUM" fi -# create directory and mark it for cleanup with an extended attribute +# possibly create mountpoint directory and mark it for +# later cleanup, if we did create it if [ ! -e "$MOUNT_ROOT/$MOUNTPOINT" ]; then MOUNTPOINT_CREATED=1 mkdir "$MOUNT_ROOT/$MOUNTPOINT" ++++++ hal-toport-storage-policy-fixed-drives.diff ++++++ --- fdi/policy/10osvendor/99-storage-policy-fixed-drives.fdi 1970-01-01 01:00:00.000000000 +0100 +++ fdi/policy/10osvendor/99-storage-policy-fixed-drives.fdi 2006-03-07 00:02:06.000000000 +0100 @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?>  + +<deviceinfo version="0.2"> +<device> + <match key="@block.storage_device:storage.hotpluggable" bool="false"> + <match key="@block.storage_device:storage.removable" bool="false"> + <merge key="volume.ignore" type="bool">true</merge> + </match> + </match> +</device> +</deviceinfo> --- fdi/policy/10osvendor/Makefile.am 2006-03-30 18:54:42.000000000 +0200 +++ fdi/policy/10osvendor/Makefile.am 2006-03-30 18:55:09.000000000 +0200 @@ -6,7 +6,8 @@ 10-power-mgmt-policy.fdi \ 10-laptop-panel-mgmt-policy.fdi \ 15-storage-luks.fdi \ - 20-storage-methods.fdi + 20-storage-methods.fdi \ + 99-storage-policy-fixed-drives.fdi if HAVE_SELINUX dist_fdi_DATA += 20-storage-add-selinux.fdi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 glibc
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package glibc checked in at Mon Oct 30 17:58:18 CET 2006. -------- --- glibc/glibc.changes 2006-10-18 18:47:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2006-10-30 14:22:22.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Oct 25 22:23:48 CEST 2006 - pbaudis(a)suse.cz + +- Change ld.so madvise() call to posix_fadvise() +- Fix mallopt(M_MXFAST,0) behaviour [#198760] +- Update the powerpc cpu-tuned environment to v0.04 [#215117] + +------------------------------------------------------------------- +Sun Oct 22 21:59:49 CEST 2006 - pbaudis(a)suse.cz + +- Update the powerpc cpu-tuned environment to v0.03 [#212549] +- Improve glibc powerpc optimization [#212548,#212580,#214282] + +------------------------------------------------------------------- New: ---- glibc-2.5-mallopt.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.U8VSGf/_old 2006-10-30 17:57:29.000000000 +0100 +++ /var/tmp/diff_new_pack.U8VSGf/_new 2006-10-30 17:57:29.000000000 +0100 @@ -18,7 +18,13 @@ %define enable_stackguard_randomization 0 %ifarch ppc ppc64 %define optimize_power 1 -%define powerpc_optimize_cpu_list power4 power5 +%define powerpc_optimize_cpu_power4 1 +%define powerpc_optimize_cpu_power5 1 +%if %suse_version > 1010 +%define powerpc_optimize_cpu_power6 1 +%else +%define powerpc_optimize_cpu_power6 0 +%endif %else %define optimize_power 0 %endif @@ -28,7 +34,7 @@ Obsoletes: ngpt ngpt-devel Autoreqprov: on Version: 2.5 -Release: 10 +Release: 16 %define snapshot_date 2006101200 URL: http://www.gnu.org/software/libc/libc.html PreReq: filesystem @@ -76,6 +82,7 @@ Patch32: crypt_blowfish-1.0.diff Patch33: glibc-2.4.90-bdirect.diff Patch34: glibc-2.5-ldconfig-old-cache.diff +Patch35: glibc-2.5-mallopt.diff %description The GNU C Library provides the most important standard libraries used @@ -239,6 +246,7 @@ %patch32 %patch33 %patch34 +%patch35 %patch5 find . -name configure | xargs touch @@ -258,6 +266,7 @@ # Default CFLAGS and Compiler # BuildFlags="$RPM_OPT_FLAGS -U_FORTIFY_SOURCE -fno-strict-aliasing" +BuildTuneFLags="" BuildCC="gcc" BuildCCplus="g++" add_ons=",libidn" @@ -283,7 +292,11 @@ %ifarch ppc ppc64 BuildFlags="$(echo $BuildFlags | sed 's#-mminimal-toc##')" %endif +%ifarch ppc +BuildTuneFLags="-mtune=G4" +%endif %ifarch ppc64 +BuildTuneFLags="-mtune=rs64" BuildCC="$BuildCC -m64" BuildCCplus="$BuildCCplus -m64" %endif @@ -324,14 +337,23 @@ # mkdir cc-nptl cd cc-nptl -configure_and_build_glibc "$BuildFlags" "$add_ons" +configure_and_build_glibc "$BuildFlags $BuildTuneFLags" "$add_ons" cd .. %if %{optimize_power} # # Build POWER optimized # -for pcpu in %{powerpc_optimize_cpu_list} -do +for pcpu in \ +%if %{powerpc_optimize_cpu_power4} +power4 \ +%endif +%if %{powerpc_optimize_cpu_power5} +power5 \ +%endif +%if %{powerpc_optimize_cpu_power6} +power6 \ +%endif +; do mkdir cc-$pcpu cd cc-$pcpu configure_and_build_glibc "$BuildFlags -mcpu=$pcpu" "$add_ons,powerpc-cpu" --with-cpu=$pcpu @@ -378,8 +400,17 @@ # Do not install in parallel, timezone Makefile will fail make install_root=$RPM_BUILD_ROOT install -C cc-nptl %if %{optimize_power} -for pcpu in %{powerpc_optimize_cpu_list} -do +for pcpu in \ +%if %{powerpc_optimize_cpu_power4} +power4 \ +%endif +%if %{powerpc_optimize_cpu_power5} +power5 \ +%endif +%if %{powerpc_optimize_cpu_power6} +power6 \ +%endif +; do make install_root=${RPM_BUILD_ROOT}/$pcpu install -C cc-$pcpu mkdir $RPM_BUILD_ROOT/%{_lib}/$pcpu for i in libc-%{version} libm-%{version} libpthread-%{version} libthread_db-1.0 librt-%{version} @@ -389,6 +420,7 @@ $RPM_BUILD_ROOT/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}/$pcpu/ rm -rf $RPM_BUILD_ROOT/$pcpu done +%if %{powerpc_optimize_cpu_power5} # power5+ is compatible with power5 (adds only a few floating point instructions) # doing a symlink doesnt work, ldconfig follows them and accepts only the first real dir if test -d $RPM_BUILD_ROOT/%{_lib}/power5 @@ -399,6 +431,7 @@ $RPM_BUILD_ROOT/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_lib}/power5+/ fi %endif +%endif %if %{build_locales} # Do not install locales in parallel! cd cc-nptl @@ -619,6 +652,7 @@ /%{_lib}/libutil-%{version}.so /%{_lib}/libutil.so.1 %if %{optimize_power} +%if %{powerpc_optimize_cpu_power4} %dir %attr(0755,root,root) /%{_lib}/power4 /%{_lib}/power4/libc-%{version}.so /%{_lib}/power4/libc.so.6* @@ -630,6 +664,8 @@ /%{_lib}/power4/librt.so.1 /%{_lib}/power4/libthread_db-1.0.so /%{_lib}/power4/libthread_db.so.1 +%endif +%if %{powerpc_optimize_cpu_power5} %dir %attr(0755,root,root) /%{_lib}/power5 /%{_lib}/power5/libc-%{version}.so /%{_lib}/power5/libc.so.6* @@ -653,6 +689,20 @@ /%{_lib}/power5+/libthread_db-1.0.so /%{_lib}/power5+/libthread_db.so.1 %endif +%if %{powerpc_optimize_cpu_power6} +%dir %attr(0755,root,root) /%{_lib}/power6 +/%{_lib}/power6/libc-%{version}.so +/%{_lib}/power6/libc.so.6* +/%{_lib}/power6/libm-%{version}.so +/%{_lib}/power6/libm.so.6* +/%{_lib}/power6/libpthread-%{version}.so +/%{_lib}/power6/libpthread.so.0 +/%{_lib}/power6/librt-%{version}.so +/%{_lib}/power6/librt.so.1 +/%{_lib}/power6/libthread_db-1.0.so +/%{_lib}/power6/libthread_db.so.1 +%endif +%endif /sbin/ldconfig /usr/bin/gencat /usr/bin/getconf @@ -798,6 +848,13 @@ %{_libdir}/libdl_p.a %changelog -n glibc +* Wed Oct 25 2006 - pbaudis(a)suse.cz +- Change ld.so madvise() call to posix_fadvise() +- Fix mallopt(M_MXFAST,0) behaviour [#198760] +- Update the powerpc cpu-tuned environment to v0.04 [#215117] +* Sun Oct 22 2006 - pbaudis(a)suse.cz +- Update the powerpc cpu-tuned environment to v0.03 [#212549] +- Improve glibc powerpc optimization [#212548,#212580,#214282] * Tue Oct 17 2006 - mls(a)suse.de - add ldconfig-old-cache patch to speed up ldconfig * Sat Oct 14 2006 - olh(a)suse.de ++++++ glibc-2.3.90-ld.so-madvise.diff ++++++ --- /var/tmp/diff_new_pack.U8VSGf/_old 2006-10-30 17:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.U8VSGf/_new 2006-10-30 17:57:30.000000000 +0100 @@ -1,18 +1,22 @@ ---- elf/dl-load.c -+++ elf/dl-load.c 2005/12/20 13:06:17 -@@ -1192,6 +1192,9 @@ +Index: elf/dl-load.c +=================================================================== +--- elf/dl-load.c.orig ++++ elf/dl-load.c +@@ -1219,6 +1219,9 @@ cannot allocate TLS data structures for goto call_lose_errno; } + if (GLRO(dl_madvise)) -+ __madvise ((void *) l->l_map_start, maplength, MADV_WILLNEED); ++ posix_fadvise (fd, c->mapoff, maplength, POSIX_FADV_WILLNEED); + l->l_map_end = l->l_map_start + maplength; l->l_addr = l->l_map_start - c->mapstart; ---- elf/dl-support.c -+++ elf/dl-support.c 2005/12/20 13:06:17 -@@ -41,6 +41,7 @@ +Index: elf/dl-support.c +=================================================================== +--- elf/dl-support.c.orig ++++ elf/dl-support.c +@@ -41,6 +41,7 @@ size_t _dl_platformlen; int _dl_debug_mask; int _dl_lazy; @@ -20,7 +24,7 @@ ElfW(Addr) _dl_use_load_bias = -2; int _dl_dynamic_weak; -@@ -240,6 +241,8 @@ +@@ -240,6 +241,8 @@ _dl_non_dynamic_init (void) _dl_lazy = *(getenv ("LD_BIND_NOW") ?: "") == '\0'; @@ -29,9 +33,11 @@ _dl_bind_not = *(getenv ("LD_BIND_NOT") ?: "") != '\0'; _dl_dynamic_weak = *(getenv ("LD_DYNAMIC_WEAK") ?: "") == '\0'; ---- elf/rtld.c -+++ elf/rtld.c 2005/12/20 13:09:05 -@@ -152,6 +152,7 @@ +Index: elf/rtld.c +=================================================================== +--- elf/rtld.c.orig ++++ elf/rtld.c +@@ -152,6 +152,7 @@ struct rtld_global_ro _rtld_global_ro at ._dl_lazy = 1, ._dl_fpu_control = _FPU_DEFAULT, ._dl_pointer_guard = 1, @@ -39,7 +45,7 @@ /* Function pointers. */ ._dl_debug_printf = _dl_debug_printf, -@@ -2552,6 +2553,14 @@ +@@ -2619,6 +2620,14 @@ process_envvars (enum mode *modep) break; case 9: @@ -54,19 +60,11 @@ /* Test whether we want to see the content of the auxiliary array passed up from the kernel. */ if (!INTUSE(__libc_enable_secure) ---- include/sys/mman.h -+++ include/sys/mman.h 2005/12/20 13:06:17 -@@ -8,6 +8,7 @@ - int __flags, int __fd, __off64_t __offset); - extern int __munmap (void *__addr, size_t __len); - extern int __mprotect (void *__addr, size_t __len, int __prot); -+extern int __madvise (void *__addr, size_t __len, int __advise); - - /* This one is Linux specific. */ - extern void *__mremap (void *__addr, size_t __old_len, ---- sysdeps/generic/ldsodefs.h -+++ sysdeps/generic/ldsodefs.h 2005/12/20 13:06:17 -@@ -610,6 +610,9 @@ +Index: sysdeps/generic/ldsodefs.h +=================================================================== +--- sysdeps/generic/ldsodefs.h.orig ++++ sysdeps/generic/ldsodefs.h +@@ -567,6 +567,9 @@ struct rtld_global_ro /* Do we do lazy relocations? */ EXTERN int _dl_lazy; @@ -76,14 +74,3 @@ /* Nonzero if runtime lookups should not update the .got/.plt. */ EXTERN int _dl_bind_not; ---- sysdeps/unix/sysv/linux/syscalls.list -+++ sysdeps/unix/sysv/linux/syscalls.list 2005/12/20 13:06:17 -@@ -34,7 +34,7 @@ - klogctl EXTRA syslog i:isi klogctl - lchown - lchown i:sii __lchown lchown - posix_madvise - madvise Vi:pii posix_madvise --madvise - madvise i:pii madvise -+madvise - madvise i:pii __madvise madvise - mincore - mincore i:anV mincore - mlock - mlock i:bn mlock - mlockall - mlockall i:i mlockall ++++++ glibc-2.5-mallopt.diff ++++++ Fix mallopt(M_MXFAST,0) as per bug 198760: From: drepper <drepper> Date: Fri, 13 Oct 2006 20:29:08 +0000 (+0000) Subject: (do_check_malloc_state): Only require for empty bins for large sizes X-Git-Url: http://repo.or.cz/w/glibc-cvs.git?a=commitdiff_plain;h=69b98c371d15f3adedb2… (do_check_malloc_state): Only require for empty bins for large sizes in main arena. --- diff --git a/malloc/malloc.c b/malloc/malloc.c index c385529..e4b693c 100644 --- malloc/malloc.c +++ malloc/malloc.c @@ -2741,8 +2741,19 @@ static void do_check_malloc_state(mstate for (i = 0; i < NFASTBINS; ++i) { p = av->fastbins[i]; + /* The following test can only be performed for the main arena. + While mallopt calls malloc_consolidate to get rid of all fast + bins (especially those larger than the new maximum) this does + only happen for the main arena. Trying to do this for any + other arena would mean those arenas have to be locked and + malloc_consolidate be called for them. This is excessive. And + even if this is acceptable to somebody it still cannot solve + the problem completely since if the arena is locked a + concurrent malloc call might create a new arena which then + could use the newly invalid fast bins. */ + /* all bins past max_fast are empty */ - if (i > max_fast_bin) + if (av == &main_arena && i > max_fast_bin) assert(p == 0); while (p != 0) { From: drepper <drepper> Date: Fri, 13 Oct 2006 20:52:01 +0000 (+0000) Subject: (malloc_consolidate): Don't use get_fast_max to determine highest fast bin X-Git-Url: http://repo.or.cz/w/glibc-cvs.git?a=commitdiff_plain;h=22fa53f334c93e74c213… (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. --- diff --git a/malloc/malloc.c b/malloc/malloc.c index e4b693c..38ceb1e 100644 --- malloc/malloc.c +++ malloc/malloc.c @@ -4692,7 +4692,15 @@ #endif reused anyway. */ +#if 0 + /* It is wrong to limit the fast bins to search using get_max_fast + because, except for the main arena, all the others might have + blocks in the high fast bins. It's not worth it anyway, just + search all bins all the time. */ maxfb = &(av->fastbins[fastbin_index(get_max_fast ())]); +#else + maxfb = &(av->fastbins[NFASTBINS]); +#endif fb = &(av->fastbins[0]); do { if ( (p = *fb) != 0) { From: drepper <drepper> Date: Wed, 18 Oct 2006 19:06:27 +0000 (+0000) Subject: (malloc_consolidate): Set maxfb to address of last fastbin rather than X-Git-Url: http://repo.or.cz/w/glibc-cvs.git?a=commitdiff_plain;h=9b855a172a6952d1d82f… (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. --- diff --git a/malloc/malloc.c b/malloc/malloc.c index 38ceb1e..4cbce04 100644 --- malloc/malloc.c +++ malloc/malloc.c @@ -4699,7 +4699,7 @@ #if 0 search all bins all the time. */ maxfb = &(av->fastbins[fastbin_index(get_max_fast ())]); #else - maxfb = &(av->fastbins[NFASTBINS]); + maxfb = &(av->fastbins[NFASTBINS - 1]); #endif fb = &(av->fastbins[0]); do { ++++++ powerpc-cpu.tar.gz ++++++ ++++ 5405 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-schema
by root＠suse.de 30 Oct '06

30 Oct '06

Hello community, here is the log from the commit of package yast2-schema checked in at Mon Oct 30 17:56:12 CET 2006. -------- --- yast2-schema/yast2-schema.changes 2006-02-23 16:43:05.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-schema/yast2-schema.changes 2006-10-30 09:53:36.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 30 09:53:03 CET 2006 - mvidner(a)suse.cz + +- Fixed too aggressive escaping which broke on files-with-dashes.rnc +- 2.13.3 + +------------------------------------------------------------------- Old: ---- yast2-schema-2.13.2.tar.bz2 New: ---- yast2-schema-2.13.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-schema.spec ++++++ --- /var/tmp/diff_new_pack.OmW5fn/_old 2006-10-30 17:54:44.000000000 +0100 +++ /var/tmp/diff_new_pack.OmW5fn/_new 2006-10-30 17:54:44.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-schema (Version 2.13.2) +# spec file for package yast2-schema (Version 2.13.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-schema URL: http://www.suse.com/ -Version: 2.13.2 +Version: 2.13.3 Release: 1 -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-schema-2.13.2.tar.bz2 +Source0: yast2-schema-2.13.3.tar.bz2 prefix: /usr BuildRequires: java2-devel-packages trang yast2-all-packages #!BuildIgnore: yast2-build-test yast2-online-update @@ -35,7 +35,7 @@ Martin Vidner <mvidner(a)suse.cz> %prep -%setup -n yast2-schema-2.13.2 +%setup -n yast2-schema-2.13.3 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,9 @@ %doc %{prefix}/share/doc/packages/yast2-schema %changelog -n yast2-schema +* Mon Oct 30 2006 - mvidner(a)suse.cz +- Fixed too aggressive escaping which broke on files-with-dashes.rnc +- 2.13.3 * Thu Feb 23 2006 - mvidner(a)suse.cz - converted neededforbuild to BuildRequires (mls) - broke a build cycle with yast2-online-update (ro) ++++++ yast2-schema-2.13.2.tar.bz2 -> yast2-schema-2.13.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/Makefile.am new/yast2-schema-2.13.3/Makefile.am --- old/yast2-schema-2.13.2/Makefile.am 2006-02-23 16:44:25.000000000 +0100 +++ new/yast2-schema-2.13.3/Makefile.am 2006-10-30 10:01:47.000000000 +0100 @@ -7,7 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -19,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -33,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -66,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH @@ -95,7 +95,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -116,7 +116,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -143,20 +143,20 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -199,10 +199,13 @@ false; \ fi +check-textdomain: + $(Y2TOOL) check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/Makefile.in new/yast2-schema-2.13.3/Makefile.in --- old/yast2-schema-2.13.2/Makefile.in 2006-02-23 16:44:40.000000000 +0100 +++ new/yast2-schema-2.13.3/Makefile.in 2006-10-30 10:01:58.000000000 +0100 @@ -135,6 +135,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ @@ -197,14 +198,14 @@ ystartupdir = @ystartupdir@ #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english @@ -215,7 +216,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec @@ -227,7 +228,7 @@ $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) $(am__append_1) @CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc @CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc -TAGVERSION = $(PREFIX)/bin/y2tool tagversion +TAGVERSION = $(Y2TOOL) tagversion # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # Contents of ./SUBDIRS @@ -704,7 +705,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in +@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status @CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$< dist-hook: @@ -724,7 +725,7 @@ done pot: - y2tool y2makepot -s $(srcdir) + $(Y2TOOL) y2makepot -s $(srcdir) install-pot: pot @POT_DST=`find -type d -name testsuite -prune , \ @@ -745,7 +746,7 @@ fi spellcheck: pot - y2tool pot-spellcheck + $(Y2TOOL) pot-spellcheck # all-local: $(if $(IS_DEVTOOLS),,$(POT_DST)) @@ -772,18 +773,18 @@ rm -f package/*.bak rm -f package/*.auto mv $(RPMNAME)-$(VERSION).tar.bz2 package/ - if ! test -x $(PREFIX)/bin/y2tool; then \ - echo "$(PREFIX)/bin/y2tool: not found."; \ + if ! test -x $(Y2TOOL); then \ + echo "$(Y2TOOL): not found."; \ echo "You have to install yast2-devtools to making a package"; \ false; \ fi here=`pwd`; \ cd $(srcdir) && for i in $(RPMNAME)*.spec.in; do \ newname="`echo "$$i" | sed "s/\.in$$//g"`"; \ - $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ + $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages package-local +package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -826,10 +827,13 @@ false; \ fi +check-textdomain: + $(Y2TOOL) check-textdomain $(srcdir) + stable: checkin-stable checkin-stable: package - $(PREFIX)/bin/y2tool checkin-stable + $(Y2TOOL) checkin-stable # For po/ modules checkpo: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/VERSION new/yast2-schema-2.13.3/VERSION --- old/yast2-schema-2.13.2/VERSION 2006-02-23 16:16:54.000000000 +0100 +++ new/yast2-schema-2.13.3/VERSION 2006-10-30 09:51:47.000000000 +0100 @@ -1 +1 @@ -2.13.2 +2.13.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/configure new/yast2-schema-2.13.3/configure --- old/yast2-schema-2.13.2/configure 2006-02-23 16:44:34.000000000 +0100 +++ new/yast2-schema-2.13.3/configure 2006-10-30 10:01:54.000000000 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-schema 2.13.2. +# Generated by GNU Autoconf 2.59 for yast2-schema 2.13.3. # -# Report bugs to <http://www.suse.de/feedback>. +# Report bugs to <http://bugs.opensuse.org/>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -269,13 +269,13 @@ # Identity of this package. PACKAGE_NAME='yast2-schema' PACKAGE_TARNAME='yast2-schema' -PACKAGE_VERSION='2.13.2' -PACKAGE_STRING='yast2-schema 2.13.2' -PACKAGE_BUGREPORT='http://www.suse.de/feedback' +PACKAGE_VERSION='2.13.3' +PACKAGE_STRING='yast2-schema 2.13.3' +PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" ac_default_prefix=/usr -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_F ALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP YCPC LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YCPDOC YCPMAKEDEP YCPC LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -728,7 +728,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-schema 2.13.2 to adapt to many kinds of systems. +\`configure' configures yast2-schema 2.13.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-schema 2.13.2:";; + short | recursive ) echo "Configuration of yast2-schema 2.13.3:";; esac cat <<\_ACEOF @@ -812,7 +812,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback>. +Report bugs to <http://bugs.opensuse.org/>. _ACEOF fi @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-schema configure 2.13.2 +yast2-schema configure 2.13.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-schema $as_me 2.13.2, which was +It was created by yast2-schema $as_me 2.13.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-schema' - VERSION='2.13.2' + VERSION='2.13.3' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.2" +VERSION="2.13.3" RPMNAME="yast2-schema" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -2107,6 +2107,8 @@ { (exit 1); exit 1; }; } fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` + devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -2282,6 +2284,33 @@ echo "$as_me: error: ycpc is not installed" >&2;} { (exit 1); exit 1; }; } fi +as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5 +echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : +else + + { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5 +echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;} + +fi + ac_config_files="$ac_config_files Makefile scripts/Makefile src/rnc/Makefile src/rng/Makefile src/Makefile doc/Makefile testsuite/Makefile" @@ -2693,7 +2722,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-schema $as_me 2.13.2, which was +This file was extended by yast2-schema $as_me 2.13.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2748,7 +2777,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-schema config.status 2.13.2 +yast2-schema config.status 2.13.3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -3001,6 +3030,7 @@ s,@LN_S@,$LN_S,;t t s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t s,@XGETTEXT@,$XGETTEXT,;t t +s,@Y2DEVTOOLS_PREFIX@,$Y2DEVTOOLS_PREFIX,;t t s,@CREATE_PKGCONFIG_TRUE@,$CREATE_PKGCONFIG_TRUE,;t t s,@CREATE_PKGCONFIG_FALSE@,$CREATE_PKGCONFIG_FALSE,;t t s,@CREATE_PKGCONFIG_NOARCH_TRUE@,$CREATE_PKGCONFIG_NOARCH_TRUE,;t t diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/configure.in new/yast2-schema-2.13.3/configure.in --- old/yast2-schema-2.13.2/configure.in 2006-02-23 16:44:24.000000000 +0100 +++ new/yast2-schema-2.13.3/configure.in 2006-10-30 10:01:47.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-schema dnl -dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-schema, 2.13.2, http://www.suse.de/feedback, yast2-schema) +AC_INIT(yast2-schema, 2.13.3, http://bugs.opensuse.org/, yast2-schema) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.2" +VERSION="2.13.3" RPMNAME="yast2-schema" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +144,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile scripts/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/doc/Makefile.in new/yast2-schema-2.13.3/doc/Makefile.in --- old/yast2-schema-2.13.2/doc/Makefile.in 2006-02-23 16:44:37.000000000 +0100 +++ new/yast2-schema-2.13.3/doc/Makefile.in 2006-10-30 10:01:56.000000000 +0100 @@ -104,6 +104,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/scripts/Makefile.in new/yast2-schema-2.13.3/scripts/Makefile.in --- old/yast2-schema-2.13.2/scripts/Makefile.in 2006-02-23 16:44:37.000000000 +0100 +++ new/yast2-schema-2.13.3/scripts/Makefile.in 2006-10-30 10:01:56.000000000 +0100 @@ -93,6 +93,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/scripts/collect.sh new/yast2-schema-2.13.3/scripts/collect.sh --- old/yast2-schema-2.13.2/scripts/collect.sh 2005-09-23 15:16:26.000000000 +0200 +++ new/yast2-schema-2.13.3/scripts/collect.sh 2006-10-30 09:51:15.000000000 +0100 @@ -31,7 +31,7 @@ unset X_SuSE_YaST_AutoInstPath unset X_SuSE_YaST_AutoInstOptional - eval $(grep "^X-SuSE-YaST" $desktop | sed -e 's/-/_/g' ) + eval $(grep "^X-SuSE-YaST" $desktop | sed -e 's/X-SuSE-YaST-/X_SuSE_YaST_/' ) if [ -z "$X_SuSE_YaST_AutoInstResource" ]; then resource=`basename $desktop .desktop` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/src/Makefile.in new/yast2-schema-2.13.3/src/Makefile.in --- old/yast2-schema-2.13.2/src/Makefile.in 2006-02-23 16:44:38.000000000 +0100 +++ new/yast2-schema-2.13.3/src/Makefile.in 2006-10-30 10:01:57.000000000 +0100 @@ -112,6 +112,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/src/rnc/Makefile.in new/yast2-schema-2.13.3/src/rnc/Makefile.in --- old/yast2-schema-2.13.2/src/rnc/Makefile.in 2006-02-23 16:44:38.000000000 +0100 +++ new/yast2-schema-2.13.3/src/rnc/Makefile.in 2006-10-30 10:01:57.000000000 +0100 @@ -105,6 +105,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/src/rng/Makefile.in new/yast2-schema-2.13.3/src/rng/Makefile.in --- old/yast2-schema-2.13.2/src/rng/Makefile.in 2006-02-23 16:44:39.000000000 +0100 +++ new/yast2-schema-2.13.3/src/rng/Makefile.in 2006-10-30 10:01:57.000000000 +0100 @@ -93,6 +93,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-schema-2.13.2/testsuite/Makefile.in new/yast2-schema-2.13.3/testsuite/Makefile.in --- old/yast2-schema-2.13.2/testsuite/Makefile.in 2006-02-23 16:44:39.000000000 +0100 +++ new/yast2-schema-2.13.3/testsuite/Makefile.in 2006-10-30 10:01:57.000000000 +0100 @@ -101,6 +101,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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