October 2012 - openSUSE Commits - openSUSE Mailing Lists

commit dbus-1 for openSUSE:11.4:Update
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package dbus-1 for openSUSE:11.4:Update checked in at 2012-10-31 16:00:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:11.4:Update/dbus-1 (Old) and /work/SRC/openSUSE:11.4:Update/.dbus-1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dbus-1", Maintainer is "THoenig(a)suse.com" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.CFW9Jr/_old 2012-10-31 16:00:55.000000000 +0100 +++ /var/tmp/diff_new_pack.CFW9Jr/_new 2012-10-31 16:00:55.000000000 +0100 @@ -1 +1 @@ -<link package='dbus-1.937' cicount='copy' /> +<link package='dbus-1.1001' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dbus-1.1001 for openSUSE:11.4:Update
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package dbus-1.1001 for openSUSE:11.4:Update checked in at 2012-10-31 16:00:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:11.4:Update/dbus-1.1001 (Old) and /work/SRC/openSUSE:11.4:Update/.dbus-1.1001.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dbus-1.1001", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-10-22 00:44:18.403455820 +0200 +++ /work/SRC/openSUSE:11.4:Update/.dbus-1.1001.new/dbus-1-x11.changes 2012-10-31 16:00:51.000000000 +0100 @@ -0,0 +1,1335 @@ +------------------------------------------------------------------- +Wed Oct 10 13:14:55 CEST 2012 - thoenig(a)suse.de + +- Replace patches for CVE-2012-3524 with upstream patches + (bnc#697105). + 23fe78ceefb6cefcd58a49c77d1154b68478c8d2 + 4b351918b9f70eaedbdb3ab39208bc1f131efae0 + 57ae3670508bbf4ec57049de47c9cae727a64802 + f68dbdc3e6f895012ce33939fb524accf31bcca5 + +------------------------------------------------------------------- +Wed Sep 19 17:31:18 CEST 2012 - thoenig(a)suse.de + +- Add patch for CVE-2012-3524 to fix getenv() vulnerability in + suids (bnc#697105) + +------------------------------------------------------------------- +Fri Jul 13 08:06:38 UTC 2012 - lnussel(a)suse.de + +- add patch: dbus-1.2.10-fd-limit-backport.patch + - Raise file descriptor limit to match configuration. The default + configuration has hardcoded 2048 complete connections, and 64 + incomplete. We need at least that number of file descriptors, + plus some for internal use. In the bus, attempt to call + setrlimit() before we drop privileges. Practically speaking + for this means the system bus gets it, the session bus doesn't. + Upstream: bugs.freedesktop.org/show_bug.cgi?id=33474 . Fixes + bnc#739743). + +------------------------------------------------------------------- +Fri Aug 5 15:45:34 CEST 2011 - thoenig(a)suse.de + +- add patch: dbus-1.4.1-byteorder.patch + - Byte-swap foreign-endian messages correctly, preventing a + long-standing local DoS if foreign-endian messages are relayed + through the dbus-daemon (bnc#699712) + + +------------------------------------------------------------------- +Sun Jan 2 12:54:14 UTC 2011 - javier(a)opensuse.org + +- Update to 1.4.1 + + Fix for CVE-2010-4352: sending messages with excessively-nested + variants can crash the bus. The existing restriction to 64-levels + of nesting previously only applied to the static type signature; + now it also applies to dynamic nesting using variants. Thanks to + Rémi Denis-Courmont for discoving this issue. + + Various bug fixes. + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-December/013861.html + +------------------------------------------------------------------- +Mon Nov 8 14:52:11 UTC 2010 - aj(a)suse.de + +- Fix package list, own /lib/systemd directories. + +------------------------------------------------------------------- +Tue Oct 12 14:35:53 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- ConsoleKit may not be installed on the system, so kill + the process at "stop" only if it is running + +------------------------------------------------------------------- +Fri Sep 24 18:21:46 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- add missimg BuildRequires on libcap-ng-devel so dbus can + drop capabilities when needed. + +------------------------------------------------------------------- +Mon Sep 6 18:41:50 CEST 2010 - kay.sievers(a)novell.com + +- version 1.4.0 + - make dbus-uuidgen atomic + - fix socket descriptor leak in _dbus_connect_tcp_socket_with_nonce + - unconditionally enable D-Bus on systemd boots + +------------------------------------------------------------------- +Sat Jul 24 10:15:42 CEST 2010 - kay.sievers(a)novell.com + +- update systemd service installation + +------------------------------------------------------------------- +Wed Jul 14 00:58:42 CEST 2010 - kay.sievers(a)novell.com + +- drop systemd-units + +------------------------------------------------------------------- +Sun Jul 11 00:39:51 CEST 2010 - kay.sievers(a)novell.com + +- update to 1.3.2 snapshot + - New standardized PropertiesChanged signal in the properties interface + - Support forking bus services, for compatibility +- install systemd service files + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Thu Mar 25 15:44:39 CET 2010 - vuntz(a)opensuse.org + +- Update to version 1.2.24: + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-March/012436.html + + Highlights: + - Fix a critical crasher bug in the syslog code + + [bus] While creating a syslog, correctly get pointer data from + DBusString + + [bus] Don't install a SIGTERM handler + + [64 bit printf] Update to use DBUS_PID_FORMAT, print (omitted) + + Move dispatching to destination to bus_dispatch_matches() + + Dispatch post-activation messages to anyone interested + + Build changes. +- Changes from version 1.2.22: + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-March/012395.html + + Highlights: + - Fix to avoid UI freezes in newer Evolution versions (and any + other program that makes synchronous DBus calls from a + non-main thread). + - Monitor service directories for changes + + When handling a watch, return if another thread is doing I/O + + Monitor service directories for changes + + Sync up UNICODE_VALID with glib, add documentation + + Support inotify on older kernels + + Handle OOM in reload watch + + Refactor _dbus_log_info, _dbus_log_security into + _dbus_log_system + + Add DBUS_SYSTEM_LOG_FATAL severity + + Add _dbus_credentials_to_string_append + + Add a prefix to our syslog messages + + Make SELinux initialization failure fatal + + Don't send an reply for driver messages if one isn't requested + + Fix double-free in error case. + + Other simple fixes, build fixes. + + Explicitly specify in the spec lower-case hex must be used + + Use AM_SILENT_RULES if available +- Changes from version 1.2.20: + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-February/012156.html + + Fix inotify shutdown + + Fix compilation in --disable-selinux case +- Changes from version 1.2.18: + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-February/012150.html + + Ignore exit code zero from activated services + + Switch to libcap-ng, avoid linking libdbus against libcap[-ng] + + Don't drop pending activations when reloading configuration + + Update messagebus.in init script to start earlier + + Clean up inotify watch handling + + Don't crash when reloading if we haven't loaded user database + yet + + fdo#23502 - corrected wrong verbose-output + + Correct timeout handling + + dbus-monitor: use unbuffered stdout instead of handling SIGINT + + fdo#25697 - Fix memory leak in policy reload + + fdo#23977 - dbus-launch --exit-with-session not killing + dbus-daemon on SIGINT + + Use monotonic clock for _dbus_get_current_time() if it's + available. + + Make array-printing code easier to follow + + Forbid zero serial numbers + + Include reason when reporting corrupt messages + + Add an accessor for the loader's corruption reason + + Print byte arrays as nicely-formatted hex. + + Print all-printable-ASCII byte arrays as strings + + Build fixes, including fdo#19432, fdo#22788, fdo#22805 + +------------------------------------------------------------------- +Mon Dec 14 20:43:34 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source +- package documentation as noarch + +------------------------------------------------------------------- +Wed Sep 2 16:46:50 CEST 2009 - mvidner(a)suse.cz + +- Implemented /etc/init.d/dbus reload (bnc#503074). + +------------------------------------------------------------------- +Thu Jul 23 15:50:57 CEST 2009 - kay.sievers(a)novell.com + +- fix %changelog + +------------------------------------------------------------------- +Fri Jul 17 17:50:00 CEST 2009 - meissner(a)suse.de + +- added dbus-1-devel to baselibs.conf + +------------------------------------------------------------------- +Fri Jul 17 17:18:57 CEST 2009 - kay.sievers(a)novell.com + +- fix --libexecdir to be the proper /lib/dbus-1/ directory + +------------------------------------------------------------------- +Wed Jul 15 12:41:36 CEST 2009 - kay.sievers(a)novell.com ++++ 1138 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:11.4:Update/.dbus-1.1001.new/dbus-1-x11.changes New Changes file: --- /dev/null 2012-10-22 00:44:18.403455820 +0200 +++ /work/SRC/openSUSE:11.4:Update/.dbus-1.1001.new/dbus-1.changes 2012-10-31 16:00:51.000000000 +0100 @@ -0,0 +1,1335 @@ +------------------------------------------------------------------- +Wed Oct 10 13:14:55 CEST 2012 - thoenig(a)suse.de + +- Replace patches for CVE-2012-3524 with upstream patches + (bnc#697105). + 23fe78ceefb6cefcd58a49c77d1154b68478c8d2 + 4b351918b9f70eaedbdb3ab39208bc1f131efae0 + 57ae3670508bbf4ec57049de47c9cae727a64802 + f68dbdc3e6f895012ce33939fb524accf31bcca5 + +------------------------------------------------------------------- +Wed Sep 19 17:31:06 CEST 2012 - thoenig(a)suse.de + +- Add patch for CVE-2012-3524 to fix getenv() vulnerability in + suids (bnc#697105) + +------------------------------------------------------------------- +Fri Jul 13 08:06:38 UTC 2012 - lnussel(a)suse.de + +- add patch: dbus-1.2.10-fd-limit-backport.patch + - Raise file descriptor limit to match configuration. The default + configuration has hardcoded 2048 complete connections, and 64 + incomplete. We need at least that number of file descriptors, + plus some for internal use. In the bus, attempt to call + setrlimit() before we drop privileges. Practically speaking + for this means the system bus gets it, the session bus doesn't. + Upstream: bugs.freedesktop.org/show_bug.cgi?id=33474 . Fixes + bnc#739743). + +------------------------------------------------------------------- +Fri Aug 5 15:45:34 CEST 2011 - thoenig(a)suse.de + +- add patch: dbus-1.4.1-byteorder.patch + - Byte-swap foreign-endian messages correctly, preventing a + long-standing local DoS if foreign-endian messages are relayed + through the dbus-daemon (bnc#699712) + + +------------------------------------------------------------------- +Sun Jan 2 12:54:14 UTC 2011 - javier(a)opensuse.org + +- Update to 1.4.1 + + Fix for CVE-2010-4352: sending messages with excessively-nested + variants can crash the bus. The existing restriction to 64-levels + of nesting previously only applied to the static type signature; + now it also applies to dynamic nesting using variants. Thanks to + Rémi Denis-Courmont for discoving this issue. + + Various bug fixes. + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-December/013861.html + +------------------------------------------------------------------- +Mon Nov 8 14:52:11 UTC 2010 - aj(a)suse.de + +- Fix package list, own /lib/systemd directories. + +------------------------------------------------------------------- +Tue Oct 12 14:35:53 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- ConsoleKit may not be installed on the system, so kill + the process at "stop" only if it is running + +------------------------------------------------------------------- +Fri Sep 24 18:21:46 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- add missimg BuildRequires on libcap-ng-devel so dbus can + drop capabilities when needed. + +------------------------------------------------------------------- +Mon Sep 6 18:41:50 CEST 2010 - kay.sievers(a)novell.com + +- version 1.4.0 + - make dbus-uuidgen atomic + - fix socket descriptor leak in _dbus_connect_tcp_socket_with_nonce + - unconditionally enable D-Bus on systemd boots + +------------------------------------------------------------------- +Sat Jul 24 10:15:42 CEST 2010 - kay.sievers(a)novell.com + +- update systemd service installation + +------------------------------------------------------------------- +Wed Jul 14 00:58:42 CEST 2010 - kay.sievers(a)novell.com + +- drop systemd-units + +------------------------------------------------------------------- +Sun Jul 11 00:39:51 CEST 2010 - kay.sievers(a)novell.com + +- update to 1.3.2 snapshot + - New standardized PropertiesChanged signal in the properties interface + - Support forking bus services, for compatibility +- install systemd service files + +------------------------------------------------------------------- +Mon Jun 28 06:38:35 UTC 2010 - jengelh(a)medozas.de + +- use %_smp_mflags + +------------------------------------------------------------------- +Thu Mar 25 15:44:39 CET 2010 - vuntz(a)opensuse.org + +- Update to version 1.2.24: + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-March/012436.html + + Highlights: + - Fix a critical crasher bug in the syslog code + + [bus] While creating a syslog, correctly get pointer data from + DBusString + + [bus] Don't install a SIGTERM handler + + [64 bit printf] Update to use DBUS_PID_FORMAT, print (omitted) + + Move dispatching to destination to bus_dispatch_matches() + + Dispatch post-activation messages to anyone interested + + Build changes. +- Changes from version 1.2.22: + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-March/012395.html + + Highlights: + - Fix to avoid UI freezes in newer Evolution versions (and any + other program that makes synchronous DBus calls from a + non-main thread). + - Monitor service directories for changes + + When handling a watch, return if another thread is doing I/O + + Monitor service directories for changes + + Sync up UNICODE_VALID with glib, add documentation + + Support inotify on older kernels + + Handle OOM in reload watch + + Refactor _dbus_log_info, _dbus_log_security into + _dbus_log_system + + Add DBUS_SYSTEM_LOG_FATAL severity + + Add _dbus_credentials_to_string_append + + Add a prefix to our syslog messages + + Make SELinux initialization failure fatal + + Don't send an reply for driver messages if one isn't requested + + Fix double-free in error case. + + Other simple fixes, build fixes. + + Explicitly specify in the spec lower-case hex must be used + + Use AM_SILENT_RULES if available +- Changes from version 1.2.20: + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-February/012156.html + + Fix inotify shutdown + + Fix compilation in --disable-selinux case +- Changes from version 1.2.18: + + For details, see + http://lists.freedesktop.org/archives/dbus/2010-February/012150.html + + Ignore exit code zero from activated services + + Switch to libcap-ng, avoid linking libdbus against libcap[-ng] + + Don't drop pending activations when reloading configuration + + Update messagebus.in init script to start earlier + + Clean up inotify watch handling + + Don't crash when reloading if we haven't loaded user database + yet + + fdo#23502 - corrected wrong verbose-output + + Correct timeout handling + + dbus-monitor: use unbuffered stdout instead of handling SIGINT + + fdo#25697 - Fix memory leak in policy reload + + fdo#23977 - dbus-launch --exit-with-session not killing + dbus-daemon on SIGINT + + Use monotonic clock for _dbus_get_current_time() if it's + available. + + Make array-printing code easier to follow + + Forbid zero serial numbers + + Include reason when reporting corrupt messages + + Add an accessor for the loader's corruption reason + + Print byte arrays as nicely-formatted hex. + + Print all-printable-ASCII byte arrays as strings + + Build fixes, including fdo#19432, fdo#22788, fdo#22805 + +------------------------------------------------------------------- +Mon Dec 14 20:43:34 CET 2009 - jengelh(a)medozas.de + +- add baselibs.conf as a source +- package documentation as noarch + +------------------------------------------------------------------- +Wed Sep 2 16:46:50 CEST 2009 - mvidner(a)suse.cz + +- Implemented /etc/init.d/dbus reload (bnc#503074). + +------------------------------------------------------------------- +Thu Jul 23 15:50:57 CEST 2009 - kay.sievers(a)novell.com + +- fix %changelog + +------------------------------------------------------------------- +Fri Jul 17 17:50:00 CEST 2009 - meissner(a)suse.de + +- added dbus-1-devel to baselibs.conf + +------------------------------------------------------------------- +Fri Jul 17 17:18:57 CEST 2009 - kay.sievers(a)novell.com + +- fix --libexecdir to be the proper /lib/dbus-1/ directory + +------------------------------------------------------------------- +Wed Jul 15 12:41:36 CEST 2009 - kay.sievers(a)novell.com ++++ 1138 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:11.4:Update/.dbus-1.1001.new/dbus-1.changes New: ---- baselibs.conf dbus-1-x11.changes dbus-1-x11.spec dbus-1-x11.spec.in dbus-1.2.10-fd-limit-backport.patch dbus-1.4.1-byteorder.patch dbus-1.4.1.tar.bz2 dbus-1.changes dbus-1.desktop dbus-1.spec dbus-cve-2012-3524-1.patch dbus-cve-2012-3524-2.patch dbus-cve-2012-3524-3.patch dbus-cve-2012-3524-4.patch dbus-log-deny.patch dbus_at_console.ck pre_checkin.sh rc.boot.dbus ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dbus-1-x11.spec ++++++ # # spec file for package dbus-1-x11 # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: dbus-1-x11 BuildRequires: xorg-x11-devel Url: http://dbus.freedesktop.org/ Summary: D-Bus Message Bus System License: GNU General Public License (GPL), Other License(s), see package Group: System/Daemons # COMMON1-BEGIN # COMMON1-BEGIN BuildRequires: audit-devel BuildRequires: doxygen BuildRequires: libexpat-devel BuildRequires: libzio BuildRequires: pkgconfig Version: 1.4.1 Release: 7.<RELEASE8> # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit %endif # Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop Source3: dbus_at_console.ck Source4: baselibs.conf Patch0: dbus-log-deny.patch Patch1: dbus-1.4.1-byteorder.patch Patch2: dbus-1.2.10-fd-limit-backport.patch Patch3: dbus-cve-2012-3524-1.patch Patch4: dbus-cve-2012-3524-2.patch Patch5: dbus-cve-2012-3524-3.patch Patch6: dbus-cve-2012-3524-4.patch %if 0%{?suse_version} > 1100 %bcond_without selinux %else %bcond_with selinux %endif %if %{with selinux} BuildRequires: libselinux-devel %endif BuildRequires: libcap-ng-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END # COMMON1-END %description D-Bus contains some tools that require Xlib to be installed, those are in this separate package so server systems need not install X. %prep # COMMON2-BEGIN # COMMON2-BEGIN %setup -n dbus-%{version} -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build autoreconf -fi export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC" export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %if 0%{?suse_version} > 1000 export CFLAGS="$CFLAGS -fstack-protector" export CXXFLAGS="$CXXFLAGS -fstack-protector" export V=1 %endif %configure \ --disable-static \ --with-pic \ --bindir=/bin \ --libexecdir=/lib/%{name} \ --libdir=/%{_lib} \ --with-init-scripts=suse \ --enable-inotify \ --enable-doxygen-docs \ %if %{with selinux} --enable-selinux \ %endif --enable-libaudit \ --with-console-auth-dir=/var/run/dbus/at_console/ \ --with-systemdsystemunitdir=/lib/systemd/system make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh %install # COMMON2-END # COMMON2-END tdir=$(mktemp -d) make DESTDIR=$tdir install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man1 mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir} mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1 rm -rf $tdir %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root) %{_bindir}/dbus-launch %{_mandir}/man1/dbus-launch.1* %changelog ++++++ dbus-1.spec ++++++ # # spec file for package dbus-1 # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: dbus-1 Url: http://dbus.freedesktop.org/ Summary: D-Bus Message Bus System License: Other uncritical OpenSource License Group: System/Daemons # COMMON1-BEGIN BuildRequires: audit-devel BuildRequires: doxygen BuildRequires: libexpat-devel BuildRequires: libzio BuildRequires: pkgconfig Version: 1.4.1 Release: 7.<RELEASE8> # bug437293 %ifarch ppc64 Obsoletes: dbus-1-64bit %endif # Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop Source3: dbus_at_console.ck Source4: baselibs.conf Patch0: dbus-log-deny.patch Patch1: dbus-1.4.1-byteorder.patch Patch2: dbus-1.2.10-fd-limit-backport.patch Patch3: dbus-cve-2012-3524-1.patch Patch4: dbus-cve-2012-3524-2.patch Patch5: dbus-cve-2012-3524-3.patch Patch6: dbus-cve-2012-3524-4.patch %if 0%{?suse_version} > 1100 %bcond_without selinux %else %bcond_with selinux %endif %if %{with selinux} BuildRequires: libselinux-devel %endif BuildRequires: libcap-ng-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs %package -n dbus-1-devel Summary: Developer package for D-Bus Group: Development/Libraries/Other Requires: %{name} = %{version} Requires: glibc-devel %package -n dbus-1-devel-doc Summary: Developer documentation package for D-Bus Group: Development/Libraries/Other Requires: %{name} = %{version} %if 0%{?suse_version} >= 1120 BuildArch: noarch %endif %description D-Bus is a message bus system, a simple way for applications to talk to one another. D-Bus supplies both a system daemon and a per-user-login-session daemon. Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). %description -n dbus-1-devel D-Bus is a message bus system, a simple way for applications to talk to one another. D-Bus supplies both a system daemon and a per-user-login-session daemon. Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). %description -n dbus-1-devel-doc D-Bus is a message bus system, a simple way for applications to talk to one another. D-BUS supplies both a system daemon and a per-user-login-session daemon. Also, the message bus is built on top of a general one-to-one message passing framework, which can be used by any two apps to communicate directly (without going through the message bus daemon). %prep # COMMON2-BEGIN %setup -n dbus-%{version} -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %build autoreconf -fi export CFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC" export CXXFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing" %if 0%{?suse_version} > 1000 export CFLAGS="$CFLAGS -fstack-protector" export CXXFLAGS="$CXXFLAGS -fstack-protector" export V=1 %endif %configure \ --disable-static \ --with-pic \ --bindir=/bin \ --libexecdir=/lib/%{name} \ --libdir=/%{_lib} \ --with-init-scripts=suse \ --enable-inotify \ --enable-doxygen-docs \ %if %{with selinux} --enable-selinux \ %endif --enable-libaudit \ --with-console-auth-dir=/var/run/dbus/at_console/ \ --with-systemdsystemunitdir=/lib/systemd/system make %{?_smp_mflags} doxygen -u && doxygen ./cleanup-man-pages.sh %install # COMMON2-END make DESTDIR=%{buildroot} install mkdir -p %{buildroot}/etc/init.d mkdir -p %{buildroot}/usr/sbin install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/init.d/dbus ln -sf %{_sysconfdir}/init.d/dbus %{buildroot}/%{_sbindir}/rcdbus install -d %{buildroot}/%{_localstatedir}/run/dbus mkdir -p %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/ install -m 0644 %SOURCE2 \ %{buildroot}/%{_datadir}/susehelp/meta/Development/Libraries/dbus-1.desktop mkdir -p %{buildroot}/%{_libdir}/pkgconfig mkdir -p %{buildroot}/%{_datadir}/dbus-1/system-services mkdir -p %{buildroot}/%{_datadir}/dbus-1/interfaces mkdir -p %{buildroot}/%{_libdir}/dbus-1.0/include/ mv -f %{buildroot}/%{_lib}/dbus-1.0/include/* %{buildroot}/%{_libdir}/dbus-1.0/include/ rm -f %{buildroot}/%{_lib}/*.la # devel stuff must not be in /lib %{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/lib%{name}.so) %{buildroot}%{_libdir}/lib%{name}.so %{__rm} -v %{buildroot}/%{_lib}/lib%{name}.so # fix up pkgconfig file sed -e 's@^$libdir=$.*@\1%{_libdir}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc # rm -f %{buildroot}/bin/dbus-launch rm -f %{buildroot}/%{_mandir}/man1/dbus-launch.1* chmod a-x AUTHORS COPYING HACKING NEWS README doc/*.txt doc/file-boilerplate.c doc/TODO # install -d %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/ConsoleKit/run-session.d mkdir -p %{buildroot}%{_localstatedir}/lib/dbus touch %{buildroot}/%{_localstatedir}/lib/dbus/machine-id %clean %{__rm} -rf %{buildroot} %pre /usr/sbin/groupadd -r messagebus 2> /dev/null || : /usr/sbin/useradd -r -o -s /bin/false -c "User for D-Bus" -d /var/run/dbus -g messagebus messagebus 2> /dev/null || : %if 0%{?suse_version:1} %preun %{stop_on_removal dbus} %post /bin/dbus-uuidgen --ensure %{insserv_force_if_yast dbus} /sbin/ldconfig %{run_permissions} %verifyscript %verify_permissions -e /lib/dbus-1/dbus-daemon-launch-helper %postun %{insserv_cleanup} /sbin/ldconfig %endif %files %defattr(-, root, root) %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system-services %dir %{_datadir}/dbus-1/interfaces %dir %{_localstatedir}/lib/dbus %dir /lib/dbus-1 %doc AUTHORS COPYING HACKING NEWS README %dir %{_sysconfdir}/dbus-1 %dir %{_sysconfdir}/dbus-1/session.d %dir %{_sysconfdir}/dbus-1/system.d %config(noreplace) %{_sysconfdir}/dbus-1/session.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.conf %{_sysconfdir}/init.d/dbus %{_sysconfdir}/ConsoleKit /bin/dbus-cleanup-sockets /bin/dbus-daemon /bin/dbus-monitor /bin/dbus-send /bin/dbus-uuidgen /%{_lib}/libdbus-1.so.* %{_mandir}/man1/dbus-cleanup-sockets.1.* %{_mandir}/man1/dbus-daemon.1.* %{_mandir}/man1/dbus-monitor.1.* %{_mandir}/man1/dbus-send.1.* %{_mandir}/man1/dbus-uuidgen.1.* %{_sbindir}/rcdbus # See doc/system-activation.txt in source tarball for the rationale # behind these permissions %attr(4750,root,messagebus) /lib/%{name}/dbus-daemon-launch-helper %verify(not mode) /lib/%{name}/dbus-daemon-launch-helper %ghost %{_localstatedir}/run/dbus %ghost %{_localstatedir}/lib/dbus/machine-id %dir /lib/systemd %dir /lib/systemd/system /lib/systemd/system/dbus.service /lib/systemd/system/dbus.socket %dir /lib/systemd/system/dbus.target.wants /lib/systemd/system/dbus.target.wants/dbus.socket %dir /lib/systemd/system/multi-user.target.wants /lib/systemd/system/multi-user.target.wants/dbus.service %dir /lib/systemd/system/sockets.target.wants /lib/systemd/system/sockets.target.wants/dbus.socket %files -n dbus-1-devel %defattr(-,root,root) %{_includedir}/* %{_libdir}/libdbus-1.so %dir %{_libdir}/dbus-1.0 %{_libdir}/dbus-1.0/include %{_libdir}/pkgconfig/dbus-1.pc %files -n dbus-1-devel-doc %defattr(-,root,root) %doc doc/api/html %doc doc/*.txt doc/file-boilerplate.c doc/TODO %{_datadir}/susehelp %changelog ++++++ baselibs.conf ++++++ dbus-1 dbus-1-devel ++++++ dbus-1-x11.spec.in ++++++ # # spec file for package dbus-1-x11 (Version 1.4.1) # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: dbus-1-x11 BuildRequires: xorg-x11-devel Url: http://dbus.freedesktop.org/ License: GNU General Public License (GPL), Other License(s), see package Group: System/Daemons Summary: D-Bus Message Bus System # COMMON1-BEGIN # COMMON1-END %description D-Bus contains some tools that require Xlib to be installed, those are in this separate package so server systems need not install X. %prep # COMMON2-BEGIN # COMMON2-END tdir=$(mktemp -d) make DESTDIR=$tdir install mkdir -p %{buildroot}/%{_bindir} mkdir -p %{buildroot}/%{_mandir}/man1 mv $tdir/bin/dbus-launch %{buildroot}/%{_bindir} mv $tdir/%{_mandir}/man1/dbus-launch.1* %{buildroot}/%{_mandir}/man1 rm -rf $tdir %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root) %{_bindir}/dbus-launch %{_mandir}/man1/dbus-launch.1* %changelog ++++++ dbus-1.2.10-fd-limit-backport.patch ++++++ Index: dbus-1.4.1/bus/bus.c =================================================================== --- dbus-1.4.1.orig/bus/bus.c +++ dbus-1.4.1/bus/bus.c @@ -636,6 +636,24 @@ oom: return FALSE; } +static void +raise_file_descriptor_limit (BusContext *context) +{ + + /* I just picked this out of thin air; we need some extra + * descriptors for things like any internal pipes we create, + * inotify, connections to SELinux, etc. + */ + unsigned int arbitrary_extra_fds = 32; + unsigned int limit; + + limit = context->limits.max_completed_connections + + context->limits.max_incomplete_connections + + arbitrary_extra_fds; + + _dbus_request_file_descriptor_limit (limit); +} + static dbus_bool_t process_config_postinit (BusContext *context, BusConfigParser *parser, @@ -644,6 +662,8 @@ process_config_postinit (BusContext DBusHashTable *service_context_table; DBusList *watched_dirs = NULL; + raise_file_descriptor_limit (context); + service_context_table = bus_config_parser_steal_service_context_table (parser); if (!bus_registry_set_service_context_table (context->registry, service_context_table)) Index: dbus-1.4.1/configure.in =================================================================== --- dbus-1.4.1.orig/configure.in +++ dbus-1.4.1/configure.in @@ -534,6 +534,8 @@ fi AC_CHECK_HEADERS(dirent.h) +AC_CHECK_HEADERS(sys/resource.h) + AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)]) AC_CHECK_HEADERS(errno.h) Index: dbus-1.4.1/dbus/dbus-sysdeps.h =================================================================== --- dbus-1.4.1.orig/dbus/dbus-sysdeps.h +++ dbus-1.4.1/dbus/dbus-sysdeps.h @@ -527,6 +527,8 @@ void _dbus_flush_caches (void); const char * _dbus_replace_install_prefix (const char *configure_time_path); +void _dbus_request_file_descriptor_limit (unsigned int limit); + /** @} */ DBUS_END_DECLS Index: dbus-1.4.1/dbus/dbus-sysdeps-util-unix.c =================================================================== --- dbus-1.4.1.orig/dbus/dbus-sysdeps-util-unix.c +++ dbus-1.4.1/dbus/dbus-sysdeps-util-unix.c @@ -42,6 +42,9 @@ #include <errno.h> #include <fcntl.h> #include <sys/stat.h> +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include <grp.h> #include <sys/socket.h> #include <dirent.h> @@ -369,6 +372,56 @@ _dbus_change_to_daemon_user (const char } #endif /* !HAVE_LIBAUDIT */ + +/** + * Attempt to ensure that the current process can open + * at least @limit file descriptors. + * + * If @limit is lower than the current, it will not be + * lowered. No error is returned if the request can + * not be satisfied. + * + * @limit Number of file descriptors + */ +void +_dbus_request_file_descriptor_limit (unsigned int limit) +{ +#ifdef HAVE_SETRLIMIT + struct rlimit lim; + struct rlimit target_lim; + unsigned int current_limit; + + /* No point to doing this practically speaking + * if we're not uid 0. We expect the system + * bus to use this before we change UID, and + * the session bus takes the Linux default + * of 1024 for both cur and max. + */ + if (getuid () != 0) + return; + + if (getrlimit (RLIMIT_NOFILE, &lim) < 0) + return; + + if (lim.rlim_cur >= limit) + return; + + /* Ignore "maximum limit", assume we have the "superuser" + * privileges. On Linux this is CAP_SYS_RESOURCE. + */ + target_lim.rlim_cur = target_lim.rlim_max = limit; + /* Also ignore errors; if we fail, we will at least work + * up to whatever limit we had, which seems better than + * just outright aborting. + * + * However, in the future we should probably log this so OS builders + * have a chance to notice any misconfiguration like dbus-daemon + * being started without CAP_SYS_RESOURCE. + */ + setrlimit (RLIMIT_NOFILE, &target_lim); +#endif +} + void _dbus_init_system_log (void) { ++++++ dbus-1.4.1-byteorder.patch ++++++ Index: dbus-1.4.1/dbus/dbus-marshal-header.c =================================================================== --- dbus-1.4.1.orig/dbus/dbus-marshal-header.c +++ dbus-1.4.1/dbus/dbus-marshal-header.c @@ -1468,14 +1468,20 @@ void _dbus_header_byteswap (DBusHeader *header, int new_order) { + unsigned char byte_order; + if (header->byte_order == new_order) return; + byte_order = _dbus_string_get_byte (&header->data, BYTE_ORDER_OFFSET); + _dbus_assert (header->byte_order == byte_order); + _dbus_marshal_byteswap (&_dbus_header_signature_str, 0, header->byte_order, new_order, &header->data, 0); + _dbus_string_set_byte (&header->data, BYTE_ORDER_OFFSET, new_order); header->byte_order = new_order; } ++++++ dbus-1.desktop ++++++ [Desktop Entry] Name=D-Bus API Documentation DocPath=/usr/share/doc/packages/dbus-1-devel/html/index.html X-DOC-SearchMethod=htdig ++++++ dbus-cve-2012-3524-1.patch ++++++ diff -urN a/configure.in b/configure.in --- a/configure.in 2012-10-10 14:58:28.730004766 +0200 +++ b/configure.in 2012-10-10 14:59:41.953329840 +0200 @@ -469,7 +469,7 @@ AC_SEARCH_LIBS(socket,[socket network]) AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) -AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull) +AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep setenv clearenv unsetenv socketpair getgrouplist fpathconf setrlimit poll setlocale localeconv strtoll strtoull __secure_getenv) #### Check for broken poll; taken from Glib's configure diff -urN a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c --- a/dbus/dbus-keyring.c 2012-10-10 14:58:28.716005104 +0200 +++ b/dbus/dbus-keyring.c 2012-10-10 14:59:41.953329840 +0200 @@ -717,6 +717,13 @@ DBusCredentials *our_credentials; _DBUS_ASSERT_ERROR_IS_CLEAR (error); + + if (_dbus_check_setuid ()) + { + dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED, + "Unable to create DBus keyring when setuid"); + return NULL; + } keyring = NULL; error_set = FALSE; diff -urN a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c --- a/dbus/dbus-sysdeps.c 2012-10-10 14:58:28.721004987 +0200 +++ b/dbus/dbus-sysdeps.c 2012-10-10 14:59:41.956329829 +0200 @@ -182,6 +182,11 @@ const char* _dbus_getenv (const char *varname) { + /* Don't respect any environment variables if the current process is + * setuid. This is the equivalent of glibc's __secure_getenv(). + */ + if (_dbus_check_setuid ()) + return NULL; return getenv (varname); } diff -urN a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h --- a/dbus/dbus-sysdeps.h 2012-10-10 14:58:28.716005104 +0200 +++ b/dbus/dbus-sysdeps.h 2012-10-10 14:59:41.957329848 +0200 @@ -83,6 +83,7 @@ void _dbus_abort (void) _DBUS_GNUC_NORETURN; +dbus_bool_t _dbus_check_setuid (void); const char* _dbus_getenv (const char *varname); dbus_bool_t _dbus_setenv (const char *varname, const char *value); diff -urN a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c --- a/dbus/dbus-sysdeps-unix.c 2012-10-10 14:58:28.726004853 +0200 +++ b/dbus/dbus-sysdeps-unix.c 2012-10-10 14:59:41.957329848 +0200 @@ -3251,6 +3251,13 @@ DBusString uuid; dbus_bool_t retval; + if (_dbus_check_setuid ()) + { + dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED, + "Unable to autolaunch when setuid"); + return FALSE; + } + _DBUS_ASSERT_ERROR_IS_CLEAR (error); retval = FALSE; @@ -3339,6 +3346,13 @@ _DBUS_ASSERT_ERROR_IS_CLEAR (error); + if (_dbus_check_setuid ()) + { + dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED, + "Unable to find launchd socket when setuid"); + return FALSE; + } + i = 0; argv[i] = "launchctl"; ++i; @@ -3379,6 +3393,13 @@ dbus_bool_t valid_socket; DBusString socket_path; + if (_dbus_check_setuid ()) + { + dbus_set_error_const (error, DBUS_ERROR_NOT_SUPPORTED, + "Unable to find launchd socket when setuid"); + return FALSE; + } + if (!_dbus_string_init (&socket_path)) { _DBUS_SET_OOM (error); @@ -3831,4 +3852,57 @@ return configure_time_path; } +/** + * **NOTE**: If you modify this function, please also consider making + * the corresponding change in GLib. See + * glib/gutils.c:g_check_setuid(). + * + * Returns TRUE if the current process was executed as setuid (or an + * equivalent __libc_enable_secure is available). See: + * http://osdir.com/ml/linux.lfs.hardened/2007-04/msg00032.html + */ +dbus_bool_t +_dbus_check_setuid (void) +{ + /* TODO: get __libc_enable_secure exported from glibc. + * See http://www.openwall.com/lists/owl-dev/2012/08/14/1 + */ +#if 0 && defined(HAVE_LIBC_ENABLE_SECURE) + { + /* See glibc/include/unistd.h */ + extern int __libc_enable_secure; + return __libc_enable_secure; + } +#elif defined(HAVE_ISSETUGID) + /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */ + return issetugid (); +#else + uid_t ruid, euid, suid; /* Real, effective and saved user ID's */ + gid_t rgid, egid, sgid; /* Real, effective and saved group ID's */ + + static dbus_bool_t check_setuid_initialised; + static dbus_bool_t is_setuid; + + if (_DBUS_UNLIKELY (!check_setuid_initialised)) + { +#ifdef HAVE_GETRESUID + if (getresuid (&ruid, &euid, &suid) != 0 || + getresgid (&rgid, &egid, &sgid) != 0) +#endif /* HAVE_GETRESUID */ + { + suid = ruid = getuid (); + sgid = rgid = getgid (); + euid = geteuid (); + egid = getegid (); + } + + check_setuid_initialised = TRUE; + is_setuid = (ruid != euid || ruid != suid || + rgid != egid || rgid != sgid); + + } + return is_setuid; +#endif +} + /* tests in dbus-sysdeps-util.c */ diff -urN a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c --- a/dbus/dbus-sysdeps-win.c 2012-10-10 14:58:28.721004987 +0200 +++ b/dbus/dbus-sysdeps-win.c 2012-10-10 14:59:41.959329902 +0200 @@ -3564,6 +3564,12 @@ return TRUE; } +dbus_bool_t +_dbus_check_setuid (void) +{ + return FALSE; +} + /** @} end of sysdeps-win */ /* tests in dbus-sysdeps-util.c */ ++++++ dbus-cve-2012-3524-2.patch ++++++ >From 4b351918b9f70eaedbdb3ab39208bc1f131efae0 Mon Sep 17 00:00:00 2001 From: Colin Walters <walters(a)verbum.org> Date: Fri, 28 Sep 2012 01:35:22 +0000 Subject: hardening: Ensure _dbus_check_setuid() is initialized threadsafe manner This is a highly theoretical concern, but we might as well. https://bugs.freedesktop.org/show_bug.cgi?id=52202 --- diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c index c9ec9e5..c60457b 100644 --- a/dbus/dbus-sysdeps-pthread.c +++ b/dbus/dbus-sysdeps-pthread.c @@ -359,6 +359,11 @@ check_monotonic_clock (void) dbus_bool_t _dbus_threads_init_platform_specific (void) { + /* These have static variables, and we need to handle both the case + * where dbus_threads_init() has been called and when it hasn't; + * so initialize them before any threads are allowed to enter. + */ check_monotonic_clock (); + (void) _dbus_check_setuid (); return dbus_threads_init (&pthread_functions); } -- cgit v0.9.0.2-2-gbebe ++++++ dbus-cve-2012-3524-3.patch ++++++ --- a/bus/activation-helper.c 2012-10-10 15:30:26.858788089 +0200 +++ b/bus/activation-helper.c 2012-10-10 15:38:40.708201466 +0200 @@ -140,18 +140,13 @@ return desktop_file; } -/* Cleares the environment, except for DBUS_VERBOSE and DBUS_STARTER_x */ +/* Clears the environment, except for DBUS_STARTER_x */ static dbus_bool_t clear_environment (DBusError *error) { const char *debug_env = NULL; const char *starter_env = NULL; -#ifdef DBUS_ENABLE_VERBOSE_MODE - /* are we debugging */ - debug_env = _dbus_getenv ("DBUS_VERBOSE"); -#endif - /* we save the starter */ starter_env = _dbus_getenv ("DBUS_STARTER_ADDRESS"); @@ -165,12 +160,6 @@ } #endif -#ifdef DBUS_ENABLE_VERBOSE_MODE - /* restore the debugging environment setting if set */ - if (debug_env) - _dbus_setenv ("DBUS_VERBOSE", debug_env); -#endif - /* restore the starter */ if (starter_env) _dbus_setenv ("DBUS_STARTER_ADDRESS", starter_env); ++++++ dbus-cve-2012-3524-4.patch ++++++ --- a/bus/activation-helper.c 2012-10-10 15:41:47.706771251 +0200 +++ b/bus/activation-helper.c 2012-10-10 15:43:52.196814743 +0200 @@ -140,16 +140,12 @@ return desktop_file; } -/* Clears the environment, except for DBUS_STARTER_x */ +/* Clears the environment, except for DBUS_STARTER_x, + * which we hardcode to the system bus. + */ static dbus_bool_t clear_environment (DBusError *error) { - const char *debug_env = NULL; - const char *starter_env = NULL; - - /* we save the starter */ - starter_env = _dbus_getenv ("DBUS_STARTER_ADDRESS"); - #ifndef ACTIVATION_LAUNCHER_TEST /* totally clear the environment */ if (!_dbus_clearenv ()) @@ -160,11 +156,8 @@ } #endif - /* restore the starter */ - if (starter_env) - _dbus_setenv ("DBUS_STARTER_ADDRESS", starter_env); - - /* set the type, which must be system if we got this far */ + /* Ensure the bus is set to system */ + _dbus_setenv ("DBUS_STARTER_ADDRESS", DBUS_SYSTEM_BUS_DEFAULT_ADDRESS); _dbus_setenv ("DBUS_STARTER_BUS_TYPE", "system"); return TRUE; ++++++ dbus-log-deny.patch ++++++ --- a/bus/system.conf.in +++ b/bus/system.conf.in @@ -48,7 +48,7 @@  <deny own="*"/> - <deny send_type="method_call"/> + <deny send_type="method_call" log="true"/>  ++++++ dbus_at_console.ck ++++++ #!/bin/bash # # use consolekit to support legacy at_console setting # reason="$1" dir=/var/run/dbus/at_console # for at_console we are only interested in local sessions test "$CK_SESSION_IS_LOCAL" = true || exit 0 test "$reason" = "session_added" -o "$reason" = "session_removed" || exit 0 sessid=${CK_SESSION_ID##*/} sessid=${sessid//[^A-Za-z0-9]/_} test -n "$sessid" || exit 1 name=`getent passwd "$CK_SESSION_USER_UID" 2>/dev/null | awk -F: '{print $1}'` test -n "$name" || exit 1 if test "$reason" = "session_added"; then mkdir -p "$dir/$name" touch "$dir/$name/$sessid" else rm "$dir/$name/$sessid" rmdir "$dir/$name" fi ++++++ pre_checkin.sh ++++++ #!/bin/bash # vim:sw=4 et # This script is called automatically during autobuild checkin. cp -lf dbus-1.changes dbus-1-x11.changes for spec in dbus-1-x11.spec; do cp -f $spec.in $spec for n in $(seq 1 10); do grep -q "COMMON$n-BEGIN" dbus-1.spec || continue { sed -n -e "1,/COMMON$n-BEGIN/p" $spec sed -n -e "/COMMON$n-BEGIN/,/COMMON$n-END/p" dbus-1.spec sed -n -e "/COMMON$n-END/,\$p" $spec.in; } > $spec.tmp && mv $spec.tmp $spec done # assuming hilbert has no such dir #if test -x /mounts/work/src/bin/tools/prepare_spec; then # /mounts/work/src/bin/tools/prepare_spec $spec > $spec.tmp && mv $spec.tmp $spec #fi done ++++++ rc.boot.dbus ++++++ #!/bin/sh # Author: Timo Hoenig <thoenig(a)suse.de> # # /etc/init.d/dbus # ### BEGIN INIT INFO # Provides: dbus # Required-Start: $local_fs # Should-Start: # Required-Stop: $local_fs # Should-Stop: # Default-Start: 2 3 5 # Default-Stop: # Short-Description: D-Bus is a message bus system for applications to talk to one another. # Description: D-Bus supplies both a system daemon and a per-user-login-session daemon. # Also, the message bus is built on top of a general one-to-one message # passing framework, which can be used by any two apps to communicate # directly (without going through the message bus daemon). ### END INIT INFO DBUS_DAEMON_BIN=/bin/dbus-daemon test -x $DBUS_DAEMON_BIN || exit 5 DBUS_DAEMON_PARAMETER="--system"; DBUS_DAEMON_PID_DIR="/var/run/dbus" DBUS_DAEMON_PID=$DBUS_DAEMON_PID_DIR/pid DBUS_MACHINE_ID_DIR="/var/lib/dbus" DBUS_MACHINE_ID=$DBUS_MACHINE_ID_DIR/machine-id DBUS_UUIIDGEN_BIN=/bin/dbus-uuidgen CONSOLEKIT_DAEMON_BIN="/usr/sbin/console-kit-daemon" CONSOLEKIT_PID_DIR="/var/run/ConsoleKit" CONSOLEKIT_PID=$CONSOLEKIT_PID_DIR/pid # Source LSB init functions # providing start_daemon, killproc, pidofproc, # log_success_msg, log_failure_msg and log_warning_msg. # This is currently not used by UnitedLinux based distributions and # not needed for init scripts for UnitedLinux only. If it is used, # the functions from rc.status should not be sourced or used. #. /lib/lsb/init-functions . /etc/rc.status # Reset status of this service rc_reset case "$1" in start) if [ -x $DBUS_UUIIDGEN_BIN -a ! -e $DBUS_MACHINE_ID ] ; then if [ ! -d $DBUS_MACHINE_ID_DIR ] ; then mkdir -p $DBUS_MACHINE_ID_DIR chown messagebus:messagebus $DBUS_MACHINE_ID_DIR fi echo -n "Creating universally unique ID..." $DBUS_UUIIDGEN_BIN --ensure rc_status -v fi if checkproc -k -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN ; then echo "D-Bus already started. Not starting." exit 0 fi if [ ! -d $DBUS_DAEMON_PID_DIR ] ; then mkdir -p $DBUS_DAEMON_PID_DIR chown messagebus:messagebus $DBUS_DAEMON_PID_DIR fi if [ -e $DBUS_DAEMON_PID ] ; then echo "Removing stale PID file $DBUS_DAEMON_PID." rm -f $DBUS_DAEMON_PID fi echo -n "Starting D-Bus daemon" start_daemon -f $DBUS_DAEMON_BIN $DBUS_DAEMON_PARAMETER rc_status -v ;; stop) echo -n "Shutting down D-Bus daemon" if [ -x $CONSOLEKIT_DAEMON_BIN ] ; then killproc -p $CONSOLEKIT_PID -TERM $CONSOLEKIT_DAEMON_BIN fi killproc -p $DBUS_DAEMON_PID -TERM $DBUS_DAEMON_BIN rc_status -v ;; try-restart) $0 status >/dev/null && $0 restart rc_status ;; restart) $0 stop $0 start rc_status ;; force-reload) $0 reload rc_status ;; reload) echo -n "Reload service D-Bus daemon" dbus-send --type=method_call --system --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig rc_status -v ;; status) echo -n "Checking for service D-Bus daemon" checkproc -k -p $DBUS_DAEMON_PID $DBUS_DAEMON_BIN if [ $? -eq 7 ]; then rc_failed 3 fi rc_status -v ;; probe) ## Optional: Probe for the necessity of a reload, print out the ## argument to this init script which is required for a reload. ## Note: probe is not (yet) part of LSB (as of 1.2) # test /etc/FOO/FOO.conf -nt /var/run/FOO.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_7_0-openjdk for openSUSE:12.2:Update
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package java-1_7_0-openjdk for openSUSE:12.2:Update checked in at 2012-10-31 16:00:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/java-1_7_0-openjdk (Old) and /work/SRC/openSUSE:12.2:Update/.java-1_7_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_7_0-openjdk", Maintainer is "" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.iyIHQr/_old 2012-10-31 16:00:21.000000000 +0100 +++ /var/tmp/diff_new_pack.iyIHQr/_new 2012-10-31 16:00:21.000000000 +0100 @@ -1 +1 @@ -<link package='java-1_7_0-openjdk.860' cicount='copy' /> +<link package='java-1_7_0-openjdk.1031' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xterm for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2012-10-31 14:06:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm", Maintainer is "meissner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2012-10-26 17:37:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2012-10-31 14:06:17.000000000 +0100 @@ -1,0 +2,18 @@ +Tue Oct 30 12:04:34 UTC 2012 - pcerny(a)suse.com + +- Patch #286 - 2012/10/29 + * fix minstall.in to work with "make docs" rule, so that patch + number appears in the corresponding generated documentation. + * modify minstall.in to keep the name shown in the heading + consistent with any renaming, e.g., for test-builds. + * check for misconfigured printerCommand resource on the first + use, warn and disable it if it does not specify an executable + command (Debian #691642). + * improve check for window-manager name needed to establish + usable default for activeIcon resource. This works around a + scenario where gdm does incomplete cleanup, leaving window + properties that refer to windows which no longer exist + (Redhat #869959). + + +------------------------------------------------------------------- Old: ---- xterm-285.tgz xterm-285.tgz.asc New: ---- xterm-286.tgz xterm-286.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.afdhOs/_old 2012-10-31 14:06:19.000000000 +0100 +++ /var/tmp/diff_new_pack.afdhOs/_new 2012-10-31 14:06:19.000000000 +0100 @@ -47,7 +47,7 @@ %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 285 +Version: 286 Release: 0 Summary: The basic X terminal program License: MIT ++++++ xterm-285.tgz -> xterm-286.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/MANIFEST new/xterm-286/MANIFEST --- old/xterm-285/MANIFEST 2012-10-24 02:59:18.000000000 +0200 +++ new/xterm-286/MANIFEST 2012-10-25 12:53:12.000000000 +0200 @@ -1,4 +1,4 @@ -MANIFEST for xterm-285, version xterm-285 +MANIFEST for xterm-286, version xterm-286 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/Makefile.in new/xterm-286/Makefile.in --- old/xterm-285/Makefile.in 2012-10-14 21:58:03.000000000 +0200 +++ new/xterm-286/Makefile.in 2012-10-29 10:17:12.000000000 +0100 @@ -1,4 +1,4 @@ -## $XTermId: Makefile.in,v 1.205 2012/10/14 19:58:03 tom Exp $ +## $XTermId: Makefile.in,v 1.206 2012/10/29 09:17:12 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # @@ -134,7 +134,7 @@ grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@ .man.$(manext) : - $(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS) + $(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS) $(actual_xterm) $(pixmapdir) .$(manext).html : GROFF_NO_SGR=stupid $(SHELL) -c "tbl $*.$(manext) | groff -Thtml -man" >$@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/charproc.c new/xterm-286/charproc.c --- old/xterm-285/charproc.c 2012-10-23 10:44:57.000000000 +0200 +++ new/xterm-286/charproc.c 2012-10-29 01:50:03.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.1265 2012/10/23 08:44:57 tom Exp $ */ +/* $XTermId: charproc.c,v 1.1268 2012/10/29 00:50:03 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -6020,9 +6020,9 @@ case ewGetWinState: /* Report the window's state */ if (AllowWindowOps(xw, ewGetWinState)) { TRACE(("...get window attributes\n")); - XGetWindowAttributes(screen->display, - VWindow(screen), - &win_attrs); + xtermGetWinAttrs(screen->display, + VWindow(screen), + &win_attrs); init_reply(ANSI_CSI); reply.a_pintro = 0; reply.a_nparam = 1; @@ -6038,9 +6038,9 @@ case ewGetWinPosition: /* Report the window's position */ if (AllowWindowOps(xw, ewGetWinPosition)) { TRACE(("...get window position\n")); - XGetWindowAttributes(screen->display, - WMFrameWindow(xw), - &win_attrs); + xtermGetWinAttrs(screen->display, + WMFrameWindow(xw), + &win_attrs); init_reply(ANSI_CSI); reply.a_pintro = 0; reply.a_nparam = 3; @@ -6056,17 +6056,10 @@ case ewGetWinSizePixels: /* Report the window's size in pixels */ if (AllowWindowOps(xw, ewGetWinSizePixels)) { TRACE(("...get window size in pixels\n")); - XGetWindowAttributes(screen->display, - VWindow(screen), - &win_attrs); init_reply(ANSI_CSI); reply.a_pintro = 0; reply.a_nparam = 3; reply.a_param[0] = 4; - /*FIXME: find if dtterm uses - * win_attrs.height or Height - * win_attrs.width or Width - */ reply.a_param[1] = (ParmType) Height(screen); reply.a_param[2] = (ParmType) Width(screen); reply.a_inters = 0; @@ -6605,8 +6598,8 @@ if (askedHeight == 0 || askedWidth == 0 || xw->misc.limit_resize > 0) { - XGetWindowAttributes(XtDisplay(xw), - RootWindowOfScreen(XtScreen(xw)), &attrs); + xtermGetWinAttrs(XtDisplay(xw), + RootWindowOfScreen(XtScreen(xw)), &attrs); } if (text) { @@ -7405,6 +7398,7 @@ init_Sres(screen.answer_back); + wnew->SPS.printer_checked = False; init_Sres(SPS.printer_command); init_Bres(SPS.printer_autoclose); init_Bres(SPS.printer_extent); @@ -8197,18 +8191,17 @@ req_type ? XGetAtomName(dpy, req_type) : "?")); property = XInternAtom(dpy, prop_name, False); - if (XGetWindowProperty(dpy, - w, - property, - 0L, - long_length, - False, - req_type, - &actual_return_type, - &actual_format_return, - &nitems_return, - &bytes_after_return, - &prop_return) != Success) { + if (!xtermGetWinProp(dpy, + w, + property, + 0L, + long_length, + req_type, + &actual_return_type, + &actual_format_return, + &nitems_return, + &bytes_after_return, + &prop_return)) { TRACE((".. Cannot get %s property.\n", prop_name)); } else if (prop_return != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/minstall.in new/xterm-286/minstall.in --- old/xterm-285/minstall.in 2012-10-23 23:05:09.000000000 +0200 +++ new/xterm-286/minstall.in 2012-10-29 10:23:22.000000000 +0100 @@ -1,5 +1,5 @@ #!/bin/sh -# $XTermId: minstall.in,v 1.13 2012/10/23 21:05:09 tom Exp $ +# $XTermId: minstall.in,v 1.15 2012/10/29 09:23:22 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # @@ -118,16 +118,18 @@ X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*$[^) ][^) ]*$.*/\1/'` test -z "$X_MANSECT" && X_MANSECT=$suffix -VERSION_H=`echo "$OLD_FILE" | sed -e 's,/[^/]*$,/version.h,'` +VERSION_H=`echo "$OLD_FILE" | sed -e 's,/[^/]*$,/version.h,' -e s',^[^/]*$,version.h,'` PATCH_NUM=`fgrep XTERM_PATCH $VERSION_H|sed -e 's/[^0-9]*//g'` PATCH_YMD=`fgrep XTERM_DATE $VERSION_H|sed -e 's,[^0-9/.-]*,,g'` # Provide for renaming in test-builds: APP_Name=`echo "$APP_name" | sed -e s/xterm/Xterm/` +APP_NAME=`echo "$APP_name" | tr '[a-z]' '[A-Z]'` sed -e 's%__vendorversion__%"X Window System"%' \ -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \ -e 's%__app_date__%'$PATCH_YMD% \ + -e "s%^\.TH [^ ][^ ]*%.TH $APP_NAME%" \ -e "s%^\.ds N Xterm%.ds N $APP_Name%" \ -e "s%^\.ds n xterm%.ds n $APP_name%" \ -e s%__default_termname__%@default_TERM@% \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/misc.c new/xterm-286/misc.c --- old/xterm-285/misc.c 2012-10-14 20:53:14.000000000 +0200 +++ new/xterm-286/misc.c 2012-10-29 00:09:35.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: misc.c,v 1.624 2012/10/14 18:53:14 tom Exp $ */ +/* $XTermId: misc.c,v 1.627 2012/10/28 23:09:35 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -1165,6 +1165,7 @@ void xtermWarning(const char *fmt,...) { + int save_err = errno; va_list ap; fprintf(stderr, "%s: ", ProgramName); @@ -1173,11 +1174,13 @@ (void) fflush(stderr); va_end(ap); + errno = save_err; } void xtermPerror(const char *fmt,...) { + int save_err = errno; char *msg = strerror(errno); va_list ap; @@ -1188,6 +1191,7 @@ (void) fflush(stderr); va_end(ap); + errno = save_err; } Window @@ -1513,12 +1517,12 @@ */ if (maximize && QueryMaximize(xw, &root_width, &root_height) - && XGetWindowAttributes(screen->display, - WMFrameWindow(xw), - &wm_attrs) - && XGetWindowAttributes(screen->display, - VShellWindow(xw), - &vshell_attrs)) { + && xtermGetWinAttrs(screen->display, + WMFrameWindow(xw), + &wm_attrs) + && xtermGetWinAttrs(screen->display, + VShellWindow(xw), + &vshell_attrs)) { if (screen->restore_data != True || screen->restore_width != root_width @@ -5700,12 +5704,13 @@ return 0; } -static Boolean -validWindow(Display * dpy, Window win, XWindowAttributes * attrs) +Boolean +xtermGetWinAttrs(Display * dpy, Window win, XWindowAttributes * attrs) { Boolean result = False; Status code; + memset(attrs, 0, sizeof(*attrs)); if (win != None) { XErrorHandler save = XSetErrorHandler(catch_x11_error); x11_errors = 0; @@ -5721,6 +5726,44 @@ return result; } +Boolean +xtermGetWinProp(Display * display, + Window win, + Atom property, + long long_offset, + long long_length, + Atom req_type, + Atom * actual_type_return, + int *actual_format_return, + unsigned long *nitems_return, + unsigned long *bytes_after_return, + unsigned char **prop_return) +{ + Boolean result = True; + + if (win != None) { + XErrorHandler save = XSetErrorHandler(catch_x11_error); + x11_errors = 0; + if (XGetWindowProperty(display, + win, + property, + long_offset, + long_length, + False, + req_type, + actual_type_return, + actual_format_return, + nitems_return, + bytes_after_return, + prop_return) == Success + && x11_errors == 0) { + result = True; + } + XSetErrorHandler(save); + } + return result; +} + void xtermEmbedWindow(Window winToEmbedInto) { @@ -5728,7 +5771,7 @@ XWindowAttributes attrs; TRACE(("checking winToEmbedInto %#lx\n", winToEmbedInto)); - if (validWindow(dpy, winToEmbedInto, &attrs)) { + if (xtermGetWinAttrs(dpy, winToEmbedInto, &attrs)) { XtermWidget xw = term; TScreen *screen = TScreenOf(xw); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/package/debian/changelog new/xterm-286/package/debian/changelog --- old/xterm-285/package/debian/changelog 2012-10-15 12:57:41.000000000 +0200 +++ new/xterm-286/package/debian/changelog 2012-10-25 12:56:37.000000000 +0200 @@ -1,3 +1,9 @@ +xterm-dev (286) unstable; urgency=low + + * Redhat #869959 + + -- Thomas E. Dickey <dickey(a)invisible-island.net> Thu, 25 Oct 2012 06:56:35 -0400 + xterm-dev (285) unstable; urgency=low * Miscellaneous fixes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/package/freebsd/Makefile new/xterm-286/package/freebsd/Makefile --- old/xterm-285/package/freebsd/Makefile 2012-10-24 01:59:46.000000000 +0200 +++ new/xterm-286/package/freebsd/Makefile 2012-10-30 00:55:09.000000000 +0100 @@ -5,7 +5,7 @@ # and "make makesum". PORTNAME= xterm -PORTVERSION= 285 +PORTVERSION= 286 CATEGORIES= x11 MASTER_SITES= ftp://invisible-island.net/xterm/ \ CRITICAL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/package/xterm.spec new/xterm-286/package/xterm.spec --- old/xterm-285/package/xterm.spec 2012-10-15 12:57:12.000000000 +0200 +++ new/xterm-286/package/xterm.spec 2012-10-25 12:55:22.000000000 +0200 @@ -1,7 +1,7 @@ -# $XTermId: xterm.spec,v 1.38 2012/10/15 10:57:12 tom Exp $ +# $XTermId: xterm.spec,v 1.39 2012/10/25 10:55:22 tom Exp $ Summary: X terminal emulator (development version) Name: xterm-dev -Version: 285 +Version: 286 Release: 1 License: X11 Group: User Interface/X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/print.c new/xterm-286/print.c --- old/xterm-285/print.c 2012-06-10 18:53:59.000000000 +0200 +++ new/xterm-286/print.c 2012-10-29 11:41:53.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: print.c,v 1.141 2012/06/10 16:53:59 tom Exp $ */ +/* $XTermId: print.c,v 1.147 2012/10/29 10:41:53 tom Exp $ */ /* * Copyright 1997-2011,2012 by Thomas E. Dickey @@ -454,16 +454,18 @@ exit(1); SPS.fp = popen(SPS.printer_command, "w"); - input = fdopen(my_pipe[0], "r"); - clearerr(input); - while (!ferror(input) && !feof(input)) { - if ((c = fgetc(input)) == EOF) - break; - fputc(c, SPS.fp); - if (isForm(c)) - fflush(SPS.fp); + if (SPS.fp != 0) { + input = fdopen(my_pipe[0], "r"); + clearerr(input); + while (!ferror(input) && !feof(input)) { + if ((c = fgetc(input)) == EOF) + break; + fputc(c, SPS.fp); + if (isForm(c)) + fflush(SPS.fp); + } + pclose(SPS.fp); } - pclose(SPS.fp); exit(0); } else { close(my_pipe[0]); /* won't read from printer */ @@ -644,13 +646,32 @@ /* * If there is no printer command, we will ignore printer controls. + * + * If we do have a printer command, we still have to verify that it will + * (perhaps) work if we pass it to popen(). At a minimum, the program + * must exist and be executable. If not, warn and disable the feature. */ Bool xtermHasPrinter(XtermWidget xw) { TScreen *screen = TScreenOf(xw); + Bool result = SPS.printer_checked; + + if (strlen(SPS.printer_command) != 0 && !result) { + char **argv = x_splitargs(SPS.printer_command); + if (argv && argv[0]) { + if (xtermFindShell(argv[0], False) == 0) { + xtermWarning("No program found for printerCommand: %s\n", SPS.printer_command); + SPS.printer_command = x_strdup(""); + } else { + SPS.printer_checked = True; + result = True; + } + } + TRACE(("xtermHasPrinter:%d\n", result)); + } - return (strlen(SPS.printer_command) != 0); + return result; } #define showPrinterControlMode(mode) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/ptyx.h new/xterm-286/ptyx.h --- old/xterm-285/ptyx.h 2012-10-08 02:39:33.000000000 +0200 +++ new/xterm-286/ptyx.h 2012-10-29 01:48:16.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: ptyx.h,v 1.756 2012/10/08 00:39:33 tom Exp $ */ +/* $XTermId: ptyx.h,v 1.757 2012/10/29 00:48:16 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -1514,6 +1514,7 @@ FILE * fp; /* output file/pipe used */ Boolean isOpen; /* output was opened/tried */ Boolean toFile; /* true when directly to file */ + Boolean printer_checked; /* printer_command is checked */ String printer_command; /* pipe/shell command string */ Boolean printer_autoclose; /* close printer when offline */ Boolean printer_extent; /* print complete page */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/screen.c new/xterm-286/screen.c --- old/xterm-285/screen.c 2012-09-22 03:13:11.000000000 +0200 +++ new/xterm-286/screen.c 2012-10-26 01:12:20.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: screen.c,v 1.468 2012/09/22 01:13:11 tom Exp $ */ +/* $XTermId: screen.c,v 1.469 2012/10/25 23:12:20 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -2812,23 +2812,22 @@ unsigned char *args; long *ldata; Boolean has_capability = False; - int rc; + Boolean rc; while (!has_capability) { - rc = XGetWindowProperty(dpy, - DefaultRootWindow(dpy), - atom_supported, - long_offset, - long_length, - False, /* do not delete */ - AnyPropertyType, /* req_type */ - &actual_type, /* actual_type_return */ - &actual_format, /* actual_format_return */ - &nitems, /* nitems_return */ - &bytes_after, /* bytes_after_return */ - &args /* prop_return */ + rc = xtermGetWinProp(dpy, + DefaultRootWindow(dpy), + atom_supported, + long_offset, + long_length, + AnyPropertyType, /* req_type */ + &actual_type, /* actual_type_return */ + &actual_format, /* actual_format_return */ + &nitems, /* nitems_return */ + &bytes_after, /* bytes_after_return */ + &args /* prop_return */ ); - if (rc != Success + if (!rc || actual_type != XA_ATOM) { break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/version.h new/xterm-286/version.h --- old/xterm-285/version.h 2012-10-23 12:45:19.000000000 +0200 +++ new/xterm-286/version.h 2012-10-30 00:24:31.000000000 +0100 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.348 2012/10/23 10:45:19 tom Exp $ */ +/* $XTermId: version.h,v 1.350 2012/10/29 23:24:31 tom Exp $ */ /* * Copyright 1998-2011,2012 by Thomas E. Dickey @@ -36,8 +36,8 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 285 -#define XTERM_DATE 2012-10-23 +#define XTERM_PATCH 286 +#define XTERM_DATE 2012-10-29 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/xterm.h new/xterm-286/xterm.h --- old/xterm-285/xterm.h 2012-10-14 20:34:32.000000000 +0200 +++ new/xterm-286/xterm.h 2012-10-26 01:18:58.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: xterm.h,v 1.708 2012/10/14 18:34:32 tom Exp $ */ +/* $XTermId: xterm.h,v 1.710 2012/10/25 23:18:58 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -974,6 +974,8 @@ #define TIMESTAMP_LEN 20 /* length of TIMESTAMP_FMT */ extern Bool AllocateTermColor(XtermWidget, ScrnColors *, int, const char *, Bool); +extern Boolean xtermGetWinAttrs(Display * /* dpy */, Window /* win */, XWindowAttributes * /* attrs */); +extern Boolean xtermGetWinProp(Display * /* dpy */, Window /* win */, Atom /* property */, long /* long_offset */, long /* long_length */, Atom /* req_type */, Atom * /* actual_type_return */, int * /* actual_format_return */, unsigned long * /* nitems_return */, unsigned long * /* bytes_after_return */, unsigned char ** /* prop_return */); extern Cursor make_colored_cursor (unsigned /* cursorindex */, unsigned long /* fg */, unsigned long /* bg */); extern OptionHelp * sortedOpts(OptionHelp *, XrmOptionDescRec *, Cardinal); extern String xtermEnvLocale (void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/xterm.log.html new/xterm-286/xterm.log.html --- old/xterm-285/xterm.log.html 2012-10-24 01:48:43.000000000 +0200 +++ new/xterm-286/xterm.log.html 2012-10-30 00:24:00.000000000 +0100 @@ -31,7 +31,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.1260 2012/10/23 23:48:43 tom Exp $ + $XTermId: xterm.log.html,v 1.1265 2012/10/29 23:24:00 tom Exp $ --> <html> @@ -70,6 +70,8 @@ the latest version of this file.</p> <ul> + <li><a href="#xterm_286">Patch #286 - 2012/10/29</a></li> + <li><a href="#xterm_285">Patch #285 - 2012/10/23</a></li> <li><a href="#xterm_284">Patch #284 - 2012/10/14</a></li> @@ -853,6 +855,29 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_286" id="xterm_286">Patch #286 - + 2012/10/29</a></h1> + + <ul> + <li>fix <code>minstall.in</code> to work with "make docs" rule, + so that patch number appears in the corresponding generated + documentation.</li> + + <li>modify <code>minstall.in</code> to keep the name shown in + the heading consistent with any renaming, e.g., for + test-builds.</li> + + <li>check for misconfigured <code>printerCommand</code> + resource on the first use, warn and disable it if it does not + specify an executable command (Debian #691642).</li> + + <li>improve check for window-manager name needed to establish + usable default for activeIcon resource. This works around a + scenario where <code>gdm</code> does incomplete cleanup, + leaving window properties that refer to windows which no longer + exist (Redhat #869959).</li> + </ul> + <h1><a name="xterm_285" id="xterm_285">Patch #285 - 2012/10/23</a></h1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-285/xterm.man new/xterm-286/xterm.man --- old/xterm-285/xterm.man 2012-10-23 13:03:04.000000000 +0200 +++ new/xterm-286/xterm.man 2012-10-26 01:25:26.000000000 +0200 @@ -1,5 +1,5 @@ '\" t -.\" $XTermId: xterm.man,v 1.549 2012/10/23 11:03:04 tom Exp $ +.\" $XTermId: xterm.man,v 1.550 2012/10/25 23:25:26 tom Exp $ .\" .\" Copyright 1996-2011,2012 by Thomas E. Dickey .\" @@ -1674,7 +1674,8 @@ \fI\*n\fP checks at startup, and shows an active icon only for window managers which it can identify and which are known to support the feature. These are \fIfvwm\fP (full support), and \fIwindow maker\fP (limited). -A few other windows managers (such as \fItwm\fP), support active icons, +A few other windows managers (such as \fItwm\fP and \fIctwm\fP) +support active icons, but do not support the extensions which allow \fI\*n\fP to identify the window manager. .TP 8 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vtkdata for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package vtkdata for openSUSE:Factory checked in at 2012-10-31 14:06:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtkdata (Old) and /work/SRC/openSUSE:Factory/.vtkdata.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vtkdata", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/vtkdata/vtkdata.changes 2012-05-31 17:11:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vtkdata.new/vtkdata.changes 2012-10-31 14:06:04.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Oct 26 14:28:19 UTC 2012 - badshah400(a)gmail.com + +- Update to version 5.10.1: + + No detailed changelog available. + +------------------------------------------------------------------- Old: ---- vtkdata-5.10.0.tar.gz New: ---- vtkdata-5.10.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtkdata.spec ++++++ --- /var/tmp/diff_new_pack.KnmDZg/_old 2012-10-31 14:06:11.000000000 +0100 +++ /var/tmp/diff_new_pack.KnmDZg/_new 2012-10-31 14:06:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: vtkdata -Version: 5.10.0 +Version: 5.10.1 Release: 0 %define series 5.10 Summary: Kitware VTK Library Data @@ -38,7 +38,7 @@ This package contains some example data for the Toolkit. %prep -%setup -q -n VTKData +%setup -q -n VTKData%{version} # Licensing problem, see bnc#764509 rm Data/2h2o.out @@ -49,7 +49,7 @@ mkdir -p %{buildroot}%{_docdir}/vtkdata mkdir -p %{buildroot}%{_datadir} -cp -a $RPM_BUILD_DIR/VTKData %{buildroot}%{_datadir}/vtkdata +cp -a $RPM_BUILD_DIR/VTKData%{version} %{buildroot}%{_datadir}/vtkdata %fdupes %{buildroot}%{_datadir}/vtkdata ++++++ vtkdata-5.10.0.tar.gz -> vtkdata-5.10.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/vtkdata/vtkdata-5.10.0.tar.gz /work/SRC/openSUSE:Factory/.vtkdata.new/vtkdata-5.10.1.tar.gz differ: char 5, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vtk for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2012-10-31 14:05:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtk (Old) and /work/SRC/openSUSE:Factory/.vtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vtk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2012-07-21 12:32:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new/vtk.changes 2012-10-31 14:05:54.000000000 +0100 @@ -1,0 +2,17 @@ +Fri Oct 26 14:04:41 UTC 2012 - badshah400(a)gmail.com + +- Update to version 5.10.1: + + Fix netCDF symbol mangling, which allows applications to use + an external netCDF library and VTK's internal copy + simultaneously + + Fixes for STL and SLC readers that prevent crashes and file + handle resource exhaustion + + Fix compilation on FreeBSD operating system + + A handful of fixes in VTK's Qt interface kit + + Fixes for interpreted language wrapping including a bug which + prevented java wrapping of VTK on power PC macs, and + compatibility with Tcl 8.6 +- Add vtk-fix-file-contains-date-time.patch to fix rpmlint + warning about a packaged file containing DATE and TIME. + +------------------------------------------------------------------- Old: ---- vtk-5.10.0.tar.gz New: ---- vtk-5.10.1.tar.gz vtk-fix-file-contains-date-time.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.uBDGFX/_old 2012-10-31 14:05:56.000000000 +0100 +++ /var/tmp/diff_new_pack.uBDGFX/_new 2012-10-31 14:05:56.000000000 +0100 @@ -17,7 +17,7 @@ Name: vtk -Version: 5.10.0 +Version: 5.10.1 Release: 0 %define series 5.10 # This is a variant BSD license, a cross between BSD and ZLIB. @@ -36,6 +36,8 @@ Patch2: vtk-soversion2.patch # PATCH-FIX-UPSTREAM vtk-sqldatabaseschema.patch badshah400(a)gmail.com -- Fix problems with vtkSQLDatabaseSchema.h Patch3: vtk-sqldatabaseschema.patch +# PATCH-FIX-UPSTREAM vtk-fix-file-contains-date-time.patch badshah400(a)gmail.com -- Fix file containing DATE and TIME +Patch4: vtk-fix-file-contains-date-time.patch %if 0%{?suse_version} > 1210 BuildRequires: Mesa-libGL-devel %else @@ -246,13 +248,14 @@ This package provides a few testing programs for VTK. %prep -%setup -q -n VTK +%setup -q -n VTK%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %if 0%{?suse_version} == 1140 %patch3 -p1 %endif +%patch4 -p1 # Remove build time references so build-compare can do its work #FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') ++++++ vtk-5.10.0.tar.gz -> vtk-5.10.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/vtk/vtk-5.10.0.tar.gz /work/SRC/openSUSE:Factory/.vtk.new/vtk-5.10.1.tar.gz differ: char 5, line 1 ++++++ vtk-fix-file-contains-date-time.patch ++++++ Index: VTK5.10.1/Utilities/vtknetcdf/libdispatch/error.c =================================================================== --- VTK5.10.1.orig/Utilities/vtknetcdf/libdispatch/error.c +++ VTK5.10.1/Utilities/vtknetcdf/libdispatch/error.c @@ -9,7 +9,7 @@ #include "ncdispatch.h" /* Tell the user the version of netCDF. */ -static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $"; +static const char nc_libvers[] = PACKAGE_VERSION; const char * nc_inq_libvers(void) ++++++ vtk-soversion2.patch ++++++ --- /var/tmp/diff_new_pack.uBDGFX/_old 2012-10-31 14:05:56.000000000 +0100 +++ /var/tmp/diff_new_pack.uBDGFX/_new 2012-10-31 14:05:56.000000000 +0100 @@ -1,8 +1,8 @@ -Index: VTK/Utilities/vtknetcdf/CMakeLists.txt +Index: VTK5.10.1/Utilities/vtknetcdf/CMakeLists.txt =================================================================== ---- VTK.orig/Utilities/vtknetcdf/CMakeLists.txt -+++ VTK/Utilities/vtknetcdf/CMakeLists.txt -@@ -350,6 +350,7 @@ TARGET_LINK_LIBRARIES(vtkNetCDF_cxx vtkN +--- VTK5.10.1.orig/Utilities/vtknetcdf/CMakeLists.txt ++++ VTK5.10.1/Utilities/vtknetcdf/CMakeLists.txt +@@ -348,6 +348,7 @@ TARGET_LINK_LIBRARIES(vtkNetCDF_cxx vtkN # Apply user-defined properties to the library target. IF(VTK_LIBRARY_PROPERTIES) SET_TARGET_PROPERTIES(vtkNetCDF PROPERTIES ${VTK_LIBRARY_PROPERTIES}) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scim-sunpinyin for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package scim-sunpinyin for openSUSE:Factory checked in at 2012-10-31 14:05:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-sunpinyin (Old) and /work/SRC/openSUSE:Factory/.scim-sunpinyin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-sunpinyin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-sunpinyin/scim-sunpinyin.changes 2012-09-17 17:00:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-sunpinyin.new/scim-sunpinyin.changes 2012-10-31 14:05:09.000000000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Wed Oct 31 09:50:59 UTC 2012 - fjkong(a)suse.com + +- fix: scim-setup window won't appear. + remove some deprecated functions, BuildRequire gtk3-devel + New: ---- scim-sunpinyin-remove-old-functions.patch scim-sunpinyin-sconstruct-gtk3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-sunpinyin.spec ++++++ --- /var/tmp/diff_new_pack.GBP0Fk/_old 2012-10-31 14:05:10.000000000 +0100 +++ /var/tmp/diff_new_pack.GBP0Fk/_new 2012-10-31 14:05:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for scim-sunpinyin +# spec file for package scim-sunpinyin # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -13,24 +13,42 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Name: scim-sunpinyin Version: 2.0.3 -Release: 1 +Release: 0 Summary: Sunpinyin module for scim -Group: System/I18n/Chinese License: LGPL-2.1 or CDDL-1.0 +Group: System/I18n/Chinese Url: http://code.google.com/p/sunpinyin/ %if 0%{?suse_version} -BuildRequires: scim-devel, sqlite3-devel, python >= 2.6, intltool, gcc-c++, scons, gtk2-devel +BuildRequires: gcc-c++ +BuildRequires: gtk3-devel +BuildRequires: intltool +BuildRequires: python >= 2.6 +BuildRequires: scim-devel +BuildRequires: scons +BuildRequires: sqlite3-devel %else -BuildRequires: scim-devel, sqlite-devel, python >= 2.6, intltool, gcc-c++, scons, gtk2-devel +BuildRequires: gcc-c++ +BuildRequires: gtk3-devel +BuildRequires: intltool +BuildRequires: python >= 2.6 +BuildRequires: scim-devel +BuildRequires: scons +BuildRequires: sqlite-devel %endif -BuildRequires: libsunpinyin-devel, libsunpinyin3 +BuildRequires: libsunpinyin-devel +BuildRequires: libsunpinyin3 Source: http://sunpinyin.googlecode.com/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -AutoReqProv: on + +#Add GTK_CHECK_VERSION to remove some deprecated functions fjkong(a)suse.com +Patch1: scim-sunpinyin-remove-old-functions.patch +#BuildRequires gtk3-devel fjkong(a)suse.com +Patch2: scim-sunpinyin-sconstruct-gtk3.patch %description SunPinyin @@ -60,6 +78,8 @@ %prep %setup -q -n %{name}-%{version} +%patch1 -p1 +%patch2 -p1 %build scons --prefix=/usr --libdir=%{_libdir} @@ -67,11 +87,9 @@ %install scons install --prefix=/usr --libdir=%{_libdir} --install-sandbox=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) #%doc ChangeLog README COPYING ++++++ scim-sunpinyin-remove-old-functions.patch ++++++ diff --git a/src/sunpinyin_imengine_setup.cpp b/src/sunpinyin_imengine_setup.cpp index 9c26e76..1f4dcaa 100644 --- a/src/sunpinyin_imengine_setup.cpp +++ b/src/sunpinyin_imengine_setup.cpp @@ -130,13 +130,20 @@ on_value_changed(GtkWidget * widget, } static GtkWidget * +#if GTK_CHECK_VERSION(2, 12, 0) +create_options_page(GtkTooltip *tooltips) +#else create_options_page(GtkTooltips *tooltips) +#endif { GtkWidget *vbox; GtkWidget *label; GtkWidget *button; - +#if GTK_CHECK_VERSION(3, 0, 0) + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); +#else vbox = gtk_vbox_new (FALSE, 12); +#endif gtk_container_set_border_width(GTK_CONTAINER(vbox), 12); GtkWidget *table = gtk_table_new (2, 2, FALSE); @@ -149,17 +156,35 @@ create_options_page(GtkTooltips *tooltips) (GtkAttachOptions) (GTK_FILL), 4, 4); +#if GTK_CHECK_VERSION(2, 24, 0) + GtkWidget *combo_box = gtk_combo_box_text_new(); +#else GtkWidget *combo_box = gtk_combo_box_new_text(); +#endif gtk_table_attach (GTK_TABLE (table), combo_box, 1, 2, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 4, 4); +#if GTK_CHECK_VERSION(2, 24, 0) + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), _("Classic Style")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), _("Instant Style")); +#else gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), _("Classic Style")); gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), _("Instant Style")); +#endif +#if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text (combo_box, _("You may feel more comfortable in classic style, " + "if you are used to input methods like scim-pinyin." + " In instant style, the most possible candidate " + "word will show up in the preedit area right after " + "its pinyin is input.")); + +#else gtk_tooltips_set_tip(tooltips, combo_box, _("You may feel more comfortable in classic style, " "if you are used to input methods like scim-pinyin." " In instant style, the most possible candidate " "word will show up in the preedit area right after " "its pinyin is input."), NULL); +#endif g_signal_connect(G_OBJECT(combo_box), "changed", G_CALLBACK(on_value_changed), NULL); input_style_combo = combo_box; @@ -170,15 +195,31 @@ create_options_page(GtkTooltips *tooltips) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 4, 4); +#if GTK_CHECK_VERSION(2, 24, 0) + combo_box = gtk_combo_box_text_new(); +#else combo_box = gtk_combo_box_new_text(); +#endif gtk_table_attach (GTK_TABLE (table), combo_box, 1, 2, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (GTK_FILL), 4, 4); +#if GTK_CHECK_VERSION(2, 24, 0) + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), _("GB2312")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), _("GBK")); +#else gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), _("GB2312")); gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), _("GBK")); +#endif +#if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text (combo_box, _("Choosing GBK over GB2312 will trade some speed " + "with a larger charset in which I search candidate " + "words/characters for you.")); + +#else gtk_tooltips_set_tip(tooltips, combo_box, _("Choosing GBK over GB2312 will trade some speed " "with a larger charset in which I search candidate " "words/characters for you."), NULL); +#endif g_signal_connect(G_OBJECT(combo_box), "changed", G_CALLBACK(on_value_changed), NULL); charset_combo = combo_box; @@ -203,7 +244,11 @@ create_options_page(GtkTooltips *tooltips) // MemoryPower GtkWidget *hbox; +#if GTK_CHECK_VERSION(3, 0, 0) + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); +#else hbox = gtk_hbox_new (FALSE, 0); +#endif gtk_widget_show (hbox); gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0); @@ -215,8 +260,13 @@ create_options_page(GtkTooltips *tooltips) gtk_misc_set_padding (GTK_MISC (label), 2, 0); button = gtk_spin_button_new_with_range (0, 10, 1); +#if GTK_CHECK_VERSION(2, 12, 0) + gtk_widget_set_tooltip_text (button, _("The larger this number is, the faster I " + "memorize/forget new words.")); +#else gtk_tooltips_set_tip(tooltips, button, _("The larger this number is, the faster I " "memorize/forget new words."), NULL); +#endif g_signal_connect (G_OBJECT(button), "value_changed", G_CALLBACK(on_value_changed), NULL); gtk_widget_show (button); @@ -236,10 +286,17 @@ create_setup_window () GtkWidget *notebook; GtkWidget *label; GtkWidget *page; +#if GTK_CHECK_VERSION(2, 12, 0) + GtkTooltip *tooltips; +#else GtkTooltips *tooltips; +#endif // Create the shared tooltips. +#if GTK_CHECK_VERSION(2, 12, 0) +#else tooltips = gtk_tooltips_new (); +#endif notebook = gtk_notebook_new (); ++++++ scim-sunpinyin-sconstruct-gtk3.patch ++++++ diff --git a/SConstruct b/SConstruct index 7739300..3d23028 100644 --- a/SConstruct +++ b/SConstruct @@ -94,6 +94,9 @@ conf = Configure(env, custom_tests={'CheckPKGConfig' : CheckPKGConfig, 'CheckPKG' : CheckPKG }) def DoConfigure(): + + gtk_version = 0 + if GetOption('clean'): return @@ -106,11 +109,22 @@ def DoConfigure(): if not conf.CheckPKG('sunpinyin-2.0'): Exit(1) - if not conf.CheckPKG('gtk+-2.0'): - Exit(1) + if conf.CheckPKG('gtk+-2.0'): + gtk_version=2 + if conf.CheckPKG('gtk+-3.0'): + gtk_version=3 + + if not gtk_version: + Exit(1) + env = conf.Finish() - env.ParseConfig('pkg-config scim sunpinyin-2.0 gtk+-2.0 --libs --cflags') + if (gtk_version == 2): + env.ParseConfig('pkg-config scim sunpinyin-2.0 gtk+-2.0 --libs --cflags') + elif (gtk_version == 3): + env.ParseConfig('pkg-config scim sunpinyin-2.0 gtk+-3.0 --libs --cflags') + else: + Exit(1) DoConfigure() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-net-ssh for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package rubygem-net-ssh for openSUSE:Factory checked in at 2012-10-31 14:04:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-net-ssh (Old) and /work/SRC/openSUSE:Factory/.rubygem-net-ssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-net-ssh", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-net-ssh/rubygem-net-ssh.changes 2012-09-25 14:17:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-net-ssh.new/rubygem-net-ssh.changes 2012-10-31 14:04:59.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Oct 29 08:17:40 UTC 2012 - coolo(a)suse.com + +- updated to version 2.6.1 + * removed dependency on jruby-pageant again, makes patch obsolete + remove-jruby-dep.diff + +------------------------------------------------------------------- Old: ---- net-ssh-2.6.0.gem remove-jruby-dep.diff New: ---- net-ssh-2.6.1.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-net-ssh.spec ++++++ --- /var/tmp/diff_new_pack.sRA5DY/_old 2012-10-31 14:05:00.000000000 +0100 +++ /var/tmp/diff_new_pack.sRA5DY/_new 2012-10-31 14:05:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: rubygem-net-ssh -Version: 2.6.0 +Version: 2.6.1 Release: 0 %define mod_name net-ssh %define mod_full_name %{mod_name}-%{version} @@ -27,8 +27,6 @@ BuildRequires: rubygem(rdoc) > 3.10 Url: http://github.com/net-ssh/net-ssh Source: %{mod_full_name}.gem -# PATCH-FIX-OPENSUSE remove dependency that only matters on win32 - coolo(a)suse.de -Patch0: remove-jruby-dep.diff Summary: Net::SSH: a pure-Ruby implementation of the SSH2 client protocol License: MIT Group: Development/Languages/Ruby @@ -56,11 +54,9 @@ Test::Unit or RSpec files, useful for developers. %prep -%gem_unpack -mv %{mod_full_name}.gemspec %{mod_name}.gemspec -%patch0 -p0 -mv %{mod_name}.gemspec %{mod_full_name}.gemspec -%gem_build +#gem_unpack +#if you need patches, apply them here and replace the # with a % sign in the surrounding lines +#gem_build %build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsyslog for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package rsyslog for openSUSE:Factory checked in at 2012-10-31 14:04:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rsyslog (Old) and /work/SRC/openSUSE:Factory/.rsyslog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rsyslog", Maintainer is "mt(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/rsyslog/rsyslog.changes 2012-10-19 08:51:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rsyslog.new/rsyslog.changes 2012-10-31 14:04:49.000000000 +0100 @@ -1,0 +2,43 @@ +Mon Oct 29 15:39:26 UTC 2012 - mt(a)suse.com + +- Update to 7.2.1 (v7-stable), a pure bug-fixing release: + - bugfix: ruleset()-object did only support a single statement + - added -D rsyslogd option to enable config parser debug mode + - improved syntax error messages by outputting the error token + - the rsyslog core now suspeneds actions after 10 failures in + a row. This was former the case after 1,000 failures and could + cause rsyslog to be spammed/ressources misused. + See the v6 compatibility doc for more details. + - ommongodb rate-limits error messages to prevent spamming the + syslog closes (for v7.2): + http://bugzilla.adiscon.com/show_bug.cgi?id=366 +- Enabled compilation of kmsg, the kernel’s new structured logging + system modile, mmaudit the message modification module supporting + Linux audit format and mmjsonparse providing the cee-enhanced + syslog format support message modification module. + +------------------------------------------------------------------- +Wed Oct 24 15:01:53 UTC 2012 - mt(a)suse.com + +- Update to 7.2.0 (v7-stable) a full structured-logging/CEE enabled + version which provides following features compared to v5-stable: + * greatly improved configuration language – the new language is + much more intuitive than the legacy format. It will also prevent + some typical mistakes simply be not permitting these invalid + constructs. Note that legacy format is still fully supported + (and you can of course do the same mistakes if you use legacy + format). + * greatly improved execution engine – with nested if/then/else + constructs as well as the capability to modify variables during + processing. + * full support for structured logging and project lumberjack/CEE. + this includes everything from being able to create, interpret + and handle JSON-based structured log messages, including the + ability to normalize legacy text log messages. + * more plugins – like support for MongoDB, HDFS, and ElasticSearch + as well as for the kernel’s new structured logging system. + * higher performance – many optimizations all over the code, like + 5 to 10 times faster execution time for script-based filters, + enhanced multithreaded TCP input plugin, DNS cache and many more. + +------------------------------------------------------------------- Old: ---- rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch rsyslog-6.4.2.tar.gz New: ---- rsyslog-7.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsyslog.spec ++++++ --- /var/tmp/diff_new_pack.BSXJhT/_old 2012-10-31 14:04:51.000000000 +0100 +++ /var/tmp/diff_new_pack.BSXJhT/_new 2012-10-31 14:04:51.000000000 +0100 @@ -20,7 +20,7 @@ Summary: The enhanced syslogd for Linux and Unix License: (GPL-3.0+ and Apache-2.0) Group: System/Daemons -Version: 6.4.2 +Version: 7.2.1 Release: 0 # for setting those bcond_with* configs see # http://lizards.opensuse.org/2008/09/12/conditional-features-aka-use-flags/ @@ -120,17 +120,15 @@ BuildRequires: systemd %endif %endif +BuildRequires: pkgconfig(json) >= 0.9 BuildRequires: pkgconfig(libee) >= 0.4.0 BuildRequires: pkgconfig(libestr) >= 0.1.2 +BuildRequires: pkgconfig(uuid) >= 2.21.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.rsyslog.com/files/download/%{name}/%{name}-%{upstream_version}.t… Source1: rsyslog.sysconfig Source2: rsyslog.conf.in Source4: rsyslog.d.remote.conf.in -#PATCH-FIX-OPENSUSE rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch andreas.stieger(a)gmx.de -- fix compiler error -Patch0: rsyslog-6.3.11-glblCheckCnf-no-return-in-nonvoid-function.patch -#PATCH-FIX-OPENSUSE rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch andreas.stieger(a)gmx.de -- fix compiler error -Patch1: rsyslog-6.4.1-CheckConnection-no-return-in-nonvoid-function.patch %description Rsyslog is an enhanced multi-threaded syslogd supporting, among others, @@ -296,8 +294,6 @@ %prep %setup -q -n %{name}-%{upstream_version} -%patch0 -%patch1 %if %{with systemd} %if 0%{?suse_version} <= 1140 # Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259 @@ -325,6 +321,7 @@ --enable-regexp \ --enable-zlib \ --enable-klog \ + --enable-kmsg \ --enable-inet \ %if %{with gnutls} --enable-gnutls \ @@ -367,6 +364,8 @@ --enable-pmrfc3164sd \ --enable-omruleset \ --enable-mmsnmptrapd \ + --enable-mmjsonparse \ + --enable-mmaudit \ --disable-static make %{?_smp_mflags:%{_smp_mflags}} V=1 @@ -577,6 +576,7 @@ %dir %{rsyslog_module_dir_nodeps} %{rsyslog_module_dir_nodeps}/imfile.so %{rsyslog_module_dir_nodeps}/imklog.so +%{rsyslog_module_dir_nodeps}/imkmsg.so %{rsyslog_module_dir_nodeps}/immark.so %{rsyslog_module_dir_nodeps}/imtcp.so %{rsyslog_module_dir_nodeps}/imudp.so @@ -598,6 +598,8 @@ %{rsyslog_module_dir_nodeps}/omuxsock.so %{rsyslog_module_dir_nodeps}/pmlastmsg.so %{rsyslog_module_dir_nodeps}/impstats.so +%{rsyslog_module_dir_nodeps}/mmaudit.so +%{rsyslog_module_dir_nodeps}/mmjsonparse.so %{rsyslog_module_dir_nodeps}/mmsnmptrapd.so %{rsyslog_module_dir_nodeps}/pmaixforwardedfrom.so %{rsyslog_module_dir_nodeps}/pmcisconames.so ++++++ rsyslog-6.4.2.tar.gz -> rsyslog-7.2.1.tar.gz ++++++ ++++ 49723 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-tz for openSUSE:Factory
by root＠hilbert.suse.de 31 Oct '12

31 Oct '12

Hello community, here is the log from the commit of package python-tz for openSUSE:Factory checked in at 2012-10-31 14:03:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tz (Old) and /work/SRC/openSUSE:Factory/.python-tz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tz", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/python-tz/python-tz.changes 2012-05-21 07:30:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-tz.new/python-tz.changes 2012-10-31 14:03:55.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Oct 25 17:46:25 UTC 2012 - opensuse(a)dstoecker.de + +- fix build for SLE + +------------------------------------------------------------------- python3-tz.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tz.spec ++++++ --- /var/tmp/diff_new_pack.sE05ep/_old 2012-10-31 14:04:01.000000000 +0100 +++ /var/tmp/diff_new_pack.sE05ep/_new 2012-10-31 14:04:01.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define pyname tz Name: python-%{pyname} %define modname py%{pyname} @@ -64,6 +65,8 @@ %defattr(-,root,root,-) %doc CHANGES.txt LICENSE.txt README.txt %{python_sitelib}/%{modname}/ +%if 0%{?sles_version} != 10 %{python_sitelib}/%{modname}-%{version}-py%{py_ver}.egg-info +%endif %changelog ++++++ python3-tz.spec ++++++ --- /var/tmp/diff_new_pack.sE05ep/_old 2012-10-31 14:04:01.000000000 +0100 +++ /var/tmp/diff_new_pack.sE05ep/_new 2012-10-31 14:04:01.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define pyname tz Name: python3-%{pyname} %define modname py%{pyname} @@ -67,7 +68,9 @@ %defattr(-,root,root,-) %doc CHANGES.txt LICENSE.txt README.txt %{python3_sitelib}/%{modname}/ +%if 0%{?sles_version} != 10 %{python3_sitelib}/%{modname}-%{version}-py%{py3_ver}.egg-info +%endif %if 0%{?suse_version} <= 1140 %dir %{_prefix}/lib/python%{py3_ver} %dir %{python3_sitelib} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0