January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit python-zopeinterface for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package python-zopeinterface for openSUSE:Factory checked in at Sat Jan 15 02:56:25 CET 2011. -------- --- python-zopeinterface/python-zopeinterface.changes 2008-06-03 04:41:30.000000000 +0200 +++ python-zopeinterface/python-zopeinterface.changes 2011-01-12 10:25:56.000000000 +0100 @@ -1,0 +2,19 @@ +Wed Dec 15 14:34:50 UTC 2010 - saschpe(a)suse.de + +- add documentation files: COPYRIGHT.txt CHANGES.txt LICENSE.txt + +------------------------------------------------------------------- +Sun Dec 12 15:50:03 UTC 2010 - saschpe(a)gmx.de + +- update to 3.6.1 + * A non-ascii character in the changelog made 3.6.0 uninstallable + on Python 3 systems with another default encoding than UTF-8. + * Fixed compiler warnings under GCC 4.3.3. + * Python 2.3 is no longer supported. + * Use the standard Python doctest module instead of + zope.testing.doctest, which has been deprecated. + * Allow to bootstrap on Jython. +- re-packaged with py2pack + * now builds on all RPM-based distros + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zope.interface-3.3.0.tar.bz2 New: ---- zope.interface-3.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-zopeinterface.spec ++++++ --- /var/tmp/diff_new_pack.ISxS92/_old 2011-01-15 02:55:16.000000000 +0100 +++ /var/tmp/diff_new_pack.ISxS92/_new 2011-01-15 02:55:16.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-zopeinterface (Version 3.3.0) +# spec file for package python-zopeinterface # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -17,51 +17,61 @@ # norootforbuild +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -Name: python-zopeinterface -BuildRequires: python-devel -Summary: Python library for API definitions through interfaces -Version: 3.3.0 -Release: 108 -%define tarname zope.interface -Source: %{tarname}-%{version}.tar.bz2 -License: Zope Public License -Group: Development/Libraries/Python -Url: http://www.zope.org/Products/ZopeInterface +%define mod_name zopeinterface + +Name: python-%{mod_name} +Version: 3.6.1 +Release: 1 +Url: http://pypi.python.org/pypi/zope.interface +Summary: Interfaces for Python +License: ZPL 2.1 +Group: Development/Languages/Python +Source: zope.interface-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} +BuildRequires: python-devel +%if 0%{?suse_version} +%py_requires +%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} +BuildArch: noarch +%endif +%endif %description -Interfaces are objects that specify (document) the external behavior of -objects that "provide" them. An interface specifies behavior through: - -- informal documentation in a doc string - -- attribute definitions - -- invariants, which are conditions that must hold for objects that - provide the interface +This package is intended to be independently reusable in any Python +project. It is maintained by the Zope Toolkit project. -This is a separate distribution of the zope.interface package used in -Zope 3. +This package provides an implementation of object interfaces for Python. +Interfaces are a mechanism for labeling objects as conforming to a given +API or contract. So, this package can be considered as implementation of +the Design By Contract methodology support in Python. +Authors: +-------- + Zope Foundation and Contributors <zope-dev(a)zope.org> %prep -%setup -q -n %{tarname}-%{version} +export CFLAGS="%{optflags} -fno-strict-aliasing" +%setup -n zope.interface-%{version} %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -python setup.py build +%{__python} setup.py build %install -python setup.py install --prefix=%{_prefix} --record-rpm=INSTALLED_FILES --root="$RPM_BUILD_ROOT" +%{__python} setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?suse_version: --record-rpm=INSTALLED_FILES} %clean -rm -rf "$RPM_BUILD_ROOT" +%{__rm} -rf %{buildroot} -%files -f INSTALLED_FILES -%defattr(-,root,root) -%doc README.txt +%files %{?suse_version: -f INSTALLED_FILES} +%defattr(-,root,root,-) +%doc COPYRIGHT.txt CHANGES.txt LICENSE.txt README.txt +%if 0%{!?suse_version:1} +%python_sitelib/zope* +%python_sitelib/%{mod_name}* +%endif %changelog ++++++ zope.interface-3.3.0.tar.bz2 -> zope.interface-3.6.1.tar.bz2 ++++++ ++++ 10392 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvirt for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at Sat Jan 15 02:54:56 CET 2011. -------- --- libvirt/libvirt.changes 2010-12-11 00:34:43.000000000 +0100 +++ libvirt/libvirt.changes 2011-01-14 23:41:35.000000000 +0100 @@ -1,0 +2,31 @@ +Fri Jan 14 15:39:16 MST 2011 - jfehlig(a)novell.com + +- Fix generation of dnsmasq's --dhcp-hostsfile option + a43c7338-dnsmasq-hostfile-fix.patch +- Disable yajl support as the library does not yet exist in + SuSE distros. + +------------------------------------------------------------------- +Tue Jan 11 16:40:27 MST 2011 - jfehlig(a)novell.com + +- Support libvirt-guests on SuSE distros + use-libvirt-guests-on-suse.patch + bnc#653398 + +------------------------------------------------------------------- +Mon Jan 3 13:12:21 MST 2011 - jfehlig(a)novell.com + +- Update to libvirt 0.8.7 + - Preliminary support for VirtualBox 4.0 + - IPv6 support + - Add VMware Workstation and Player driver + - Add network disk support + +------------------------------------------------------------------- +Wed Dec 22 14:41:46 MST 2010 - jfehlig(a)novell.com + +- Fix VNC port reservation race in qemu driver + c58b1056-init-bitmap-size.patch + bnc#659431 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 45147ca3-macvtap-warning.patch 474b1c14-macvtap-undefined.patch libvirt-0.8.6.tar.bz2 New: ---- a43c7338-dnsmasq-hostfile-fix.patch libvirt-0.8.7.tar.bz2 use-libvirt-guests-on-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.N7u8H7/_old 2011-01-15 02:49:14.000000000 +0100 +++ /var/tmp/diff_new_pack.N7u8H7/_new 2011-01-15 02:49:14.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libvirt (Version 0.8.6) +# spec file for package libvirt # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -39,6 +39,8 @@ %define with_selinux 1 %define with_apparmor 0 # options +# still no yajl json library +%define with_yajl 0 %if 0%{?suse_version} >= 1130 %define with_capng 1 %else @@ -46,12 +48,10 @@ %endif %if 0%{?suse_version} >= 1140 %define with_netcf 1 -%define with_yajl 1 %define with_macvtap 1 %define with_virtualport 1 %else %define with_netcf 0 -%define with_yajl 0 %define with_macvtap 0 %define with_virtualport 0 %endif @@ -144,7 +144,7 @@ License: LGPLv2.1+ Group: Development/Libraries/C and C++ AutoReqProv: yes -Version: 0.8.6 +Version: 0.8.7 Release: 1 Summary: A C toolkit to interract with the virtualization capabilities of Linux # The client side, i.e. shared libs and virsh are in a subpackage @@ -169,8 +169,7 @@ Source0: %{name}-%{version}.tar.bz2 Source1: libvirtd.init # Upstream patches -Patch0: 45147ca3-macvtap-warning.patch -Patch1: 474b1c14-macvtap-undefined.patch +Patch0: a43c7338-dnsmasq-hostfile-fix.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch102: clone.patch @@ -179,6 +178,7 @@ Patch105: xend-disk-order.patch # Our patches Patch200: libvirtd-defaults.patch +Patch201: use-libvirt-guests-on-suse.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -283,13 +283,13 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch100 -p1 %patch102 %patch103 -p1 %patch104 -p1 %patch105 -p1 %patch200 -p1 +%patch201 -p1 %build %if ! %{with_xen} @@ -422,10 +422,11 @@ ln_dupes .%{_docdir}/%{name} ln_dupes ./usr/share/locale ) -# init script +# init scripts mkdir -p $RPM_BUILD_ROOT/etc/init.d install %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/libvirtd ln -s /etc/init.d/libvirtd $RPM_BUILD_ROOT/usr/sbin/rclibvirtd +ln -s /etc/init.d/libvirt-guests $RPM_BUILD_ROOT/usr/sbin/rclibvirt-guests %find_lang %{name} %clean @@ -435,6 +436,7 @@ /sbin/ldconfig %if 0%{?sles_version} %{fillup_and_insserv -f -y libvirtd} +%{fillup_only -n libvirt-guests} %endif %preun @@ -511,6 +513,9 @@ %{_bindir}/virt-xml-validate %{_bindir}/virt-pki-validate %{_libdir}/lib*.so.* +%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests +%config /etc/init.d/libvirt-guests +%{_sbindir}/rclibvirt-guests %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ ++++++ a43c7338-dnsmasq-hostfile-fix.patch ++++++ commit a43c7338d8772aa3a5bc0ec5914d3c28c20447c3 Author: Kay Schubert <kayegypt(a)web.de> Date: Thu Jan 6 09:14:58 2011 +0100 bridge: Fix generation of dnsmasq's --dhcp-hostsfile option I added a host definition to a network definition: <network> <name>Lokal</name> <uuid>2074f379-b82c-423f-9ada-305d8088daaa</uuid> <bridge name='virbr1' stp='on' delay='0' /> <ip address='192.168.180.1' netmask='255.255.255.0'> <dhcp> <range start='192.168.180.128' end='192.168.180.254' /> <host mac='23:74:00:03:42:02' name='somevm' ip='192.168.180.10' /> </dhcp> </ip> </network> But due to the wrong if-statement the argument --dhcp-hostsfile doesn't get added to the dnsmasq command. The patch below fixes it for me. diff --git a/AUTHORS b/AUTHORS index b204bd6..721b8f8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -142,6 +142,7 @@ Patches have also been contributed by: Josh Durgin <joshd(a)hq.newdream.net> Roopa Prabhu <roprabhu(a)cisco.com> Paweł Krześniak <pawel.krzesniak(a)gmail.com> + Kay Schubert <kayegypt(a)web.de> [....send patches to get your name here....] diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 7d43ef5..4c64a74 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -524,7 +524,7 @@ networkBuildDnsmasqArgv(virNetworkObjPtr network, goto cleanup; } - if (networkSaveDnsmasqHostsfile(ipdef, dctx, false) < 0) { + if (networkSaveDnsmasqHostsfile(ipdef, dctx, false) == 0) { virCommandAddArgPair(cmd, "--dhcp-hostsfile", dctx->hostsfile->path); } ++++++ libvirt-0.8.6.tar.bz2 -> libvirt-0.8.7.tar.bz2 ++++++ libvirt/libvirt-0.8.6.tar.bz2 libvirt/libvirt-0.8.7.tar.bz2 differ: char 11, line 1 ++++++ use-libvirt-guests-on-suse.patch ++++++ Index: libvirt-0.8.7/tools/Makefile.am =================================================================== --- libvirt-0.8.7.orig/tools/Makefile.am +++ libvirt-0.8.7/tools/Makefile.am @@ -129,18 +129,18 @@ install-data-local: install-init uninstall-local: uninstall-init -if LIBVIRT_INIT_SCRIPT_RED_HAT install-init: libvirt-guests.init - mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d + mkdir -p $(DESTDIR)$(sysconfdir)/init.d $(INSTALL_SCRIPT) libvirt-guests.init \ - $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests - mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig + $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests + mkdir -p $(DESTDIR)/var/adm/fillup-templates $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests + $(DESTDIR)/var/adm/fillup-templates/sysconfig.libvirt-guests uninstall-init: - rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirt-guests \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests + rm -f $(DESTDIR)$(sysconfdir)/init.d/libvirt-guests \ + $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests \ + $(DESTDIR)/var/adm/fillup-templates/sysconfig.libvirt-guests BUILT_SOURCES += libvirt-guests.init @@ -152,11 +152,6 @@ libvirt-guests.init: libvirt-guests.init < $< > $@-t && \ chmod a+x $@-t && \ mv $@-t $@ -else -install-init: -uninstall-init: -libvirt-guests.init: -endif # LIBVIRT_INIT_SCRIPT_RED_HAT CLEANFILES = $(bin_SCRIPTS) $(man1_MANS) Index: libvirt-0.8.7/tools/libvirt-guests.sysconf =================================================================== --- libvirt-0.8.7.orig/tools/libvirt-guests.sysconf +++ libvirt-0.8.7/tools/libvirt-guests.sysconf @@ -1,15 +1,23 @@ +## Path: System/Virtualization/libvirt + +## Type: string +## Default: default # URIs to check for running guests # example: URIS='default xen:/// vbox+tcp://host/system lxc:///' -#URIS=default +URIS=default +## Type: string +## Default: start # action taken on host boot # - start all guests which were running on shutdown are started on boot # regardless on their autostart settings # - ignore libvirt-guests init script won't start any guest on boot, however, # guests marked as autostart will still be automatically started by # libvirtd -#ON_BOOT=start +ON_BOOT=start +## Type: string +## Default: suspend # action taken on host shutdown # - suspend all running guests are suspended using virsh managedsave # - shutdown all running guests are asked to shutdown. Please be careful with @@ -18,7 +26,9 @@ # which just needs a long time to shutdown. When setting # ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a # value suitable for your guests. -#ON_SHUTDOWN=suspend +ON_SHUTDOWN=suspend +## Type: integer +## Default: 120 # number of seconds we're willing to wait for a guest to shut down -#SHUTDOWN_TIMEOUT=0 +SHUTDOWN_TIMEOUT=120 Index: libvirt-0.8.7/tools/libvirt-guests.init.in =================================================================== --- libvirt-0.8.7.orig/tools/libvirt-guests.init.in +++ libvirt-0.8.7/tools/libvirt-guests.init.in @@ -4,10 +4,10 @@ # ### BEGIN INIT INFO # Provides: libvirt-guests -# Required-Start: libvirtd -# Required-Stop: libvirtd -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Required-Start: $network $remote_fs libvirtd +# Required-Stop: $network $remote_fs libvirtd +# Default-Start: 3 5 +# Default-Stop: 0 1 2 4 6 # Short-Description: suspend/resume libvirt guests on shutdown/boot # Description: This is a script for suspending active libvirt guests # on shutdown and resuming them on next boot @@ -24,14 +24,13 @@ # See http://libvirt.org # +. /etc/rc.status +rc_reset + sysconfdir=@sysconfdir@ localstatedir=@localstatedir@ libvirtd=@sbindir@/libvirtd -# Source function library. -test ! -r "$sysconfdir"/rc.d/init.d/functions || - . "$sysconfdir"/rc.d/init.d/functions - URIS=default ON_BOOT=start ON_SHUTDOWN=suspend @@ -42,12 +41,10 @@ test -f "$sysconfdir"/sysconfig/libvirt- LISTFILE="$localstatedir"/lib/libvirt/libvirt-guests VAR_SUBSYS_LIBVIRT_GUESTS="$localstatedir"/lock/subsys/libvirt-guests -RETVAL=0 - retval() { "$@" if [ $? -ne 0 ]; then - RETVAL=1 + rc_failed 1 return 1 else return 0 @@ -71,12 +68,31 @@ run_virsh_c() { ( export LC_ALL=C; run_virsh "$@" ) } +await_daemon_up() +{ + uri=$1 + i=1 + rets=10 + run_virsh $uri list > /dev/null 2>&1 + while [ $? -ne 0 -a $i -lt $rets ]; do + sleep 1 + echo -n . + i=$(($i + 1)) + run_virsh $uri list > /dev/null 2>&1 + done + if [ $i -eq $rets ]; then + echo $"libvirt-guests unable to connect to URI: $uri" + return 1 + fi + return 0 +} + list_guests() { uri=$1 list=$(run_virsh_c $uri list) if [ $? -ne 0 ]; then - RETVAL=1 + rc_failed 1 return 1 fi @@ -84,7 +100,7 @@ list_guests() { for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do uuid=$(run_virsh_c $uri dominfo $id | awk '/^UUID:/{print $2}') if [ -z "$uuid" ]; then - RETVAL=1 + rc_failed 1 return 1 fi uuids="$uuids $uuid" @@ -111,7 +127,7 @@ guest_is_on() { guest_running=false info=$(run_virsh_c $uri dominfo $uuid) if [ $? -ne 0 ]; then - RETVAL=1 + rc_failed 1 return 1 fi @@ -148,6 +164,12 @@ start() { continue fi + await_daemon_up $uri + if [ $? -ne 0 ]; then + echo $"Ignoring guests on $uri URI, can't connect" + continue + fi + echo $"Resuming guests on $uri URI..." for guest in $list; do name=$(guest_name $uri $guest) @@ -227,7 +249,7 @@ stop() { suspending=false if [ $SHUTDOWN_TIMEOUT -le 0 ]; then echo $"Shutdown action requested but SHUTDOWN_TIMEOUT was not set" - RETVAL=6 + rc_failed 6 return fi fi @@ -291,14 +313,13 @@ gueststatus() { rh_status() { if [ -f "$LISTFILE" ]; then echo $"stopped, with saved guests" - RETVAL=3 + rc_failed 3 else if [ -f "$VAR_SUBSYS_LIBVIRT_GUESTS" ]; then echo $"started" else echo $"stopped, with no saved guests" fi - RETVAL=0 fi } @@ -340,4 +361,4 @@ case "$1" in usage ;; esac -exit $RETVAL +rc_exit ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gdm for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package gdm for openSUSE:Factory checked in at Sat Jan 15 02:48:55 CET 2011. -------- --- GNOME/gdm/gdm.changes 2011-01-12 18:46:53.000000000 +0100 +++ gdm/gdm.changes 2011-01-14 18:57:37.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Jan 14 18:51:02 CET 2011 - vuntz(a)opensuse.org + +- Rebase gdm-vt-allocation-hack.patch to actually apply. +- Apply gdm-vt-allocation-hack.patch on 11.4 and later again: the + topic needs more discussion, and without the hack, on a default + boot, a mingetty instance will receive all the input from Xorg. + This is because Xorg will start on tty2 and a mingetty will also + start there, because of the sysvinit configration. This is + extremely bad, since this means everything the user types will + lead to login attemps in mingetty. +- Add gnome-power-manager and iso-codes Recommends: they are both + improving the gdm experience, but are not mandatory. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.dmXwWK/_old 2011-01-15 02:47:34.000000000 +0100 +++ /var/tmp/diff_new_pack.dmXwWK/_new 2011-01-15 02:47:34.000000000 +0100 @@ -42,7 +42,7 @@ License: GPLv2+ Group: System/GUI/GNOME Version: 2.32.0 -Release: 2 +Release: 3 Summary: The GNOME Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -55,7 +55,7 @@ Patch2: gdm-helper-directory.patch # PATCH-FIX-OPENSUSE gdm-is-not-unstable-unless.patch vuntz(a)opensuse.org -- Make gdm think it's never running a development version unless SUSE_ENABLE_UNSTABLE_CHECK is set. This disables fatal warnings as well as abusive log Patch3: gdm-is-not-unstable-unless.patch -# PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj(a)novell.com -- Needed for user switching. Needed only for 11.3 and earlier +# PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj(a)novell.com -- Needed for user switching Patch4: gdm-vt-allocation-hack.patch # PATCH-FIX-UPSTREAM gdm-focus-user-chooser.patch bgo#629310 bnc#652938 vuntz(a)opensuse.org -- Correctly give the focus to the user chooser on startup Patch5: gdm-focus-user-chooser.patch @@ -102,7 +102,9 @@ # For groupadd, useradd, usermod PreReq: pwdutils PreReq: %insserv_prereq +Recommends: gnome-power-manager Recommends: gnome-settings-daemon +Recommends: iso-codes %gconf_schemas_prereq %description @@ -150,9 +152,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%if 0%{?suse_version} <= 1130 %patch4 -p1 -%endif %patch5 -p1 %patch6 -p1 %patch7 -p1 ++++++ gdm-vt-allocation-hack.patch ++++++ --- /var/tmp/diff_new_pack.dmXwWK/_old 2011-01-15 02:47:34.000000000 +0100 +++ /var/tmp/diff_new_pack.dmXwWK/_new 2011-01-15 02:47:34.000000000 +0100 @@ -1,17 +1,17 @@ -Index: gdm-2.31.2/daemon/gdm-server.c +Index: gdm-2.32.0/daemon/gdm-server.c =================================================================== ---- gdm-2.31.2.orig/daemon/gdm-server.c -+++ gdm-2.31.2/daemon/gdm-server.c -@@ -33,6 +33,8 @@ - #include <grp.h> - #include <signal.h> - #include <sys/resource.h> +--- gdm-2.32.0.orig/daemon/gdm-server.c ++++ gdm-2.32.0/daemon/gdm-server.c +@@ -27,6 +27,8 @@ + #include <string.h> + #include <sys/types.h> + #include <sys/wait.h> +#include <sys/ioctl.h> +#include <sys/vt.h> - - #ifdef HAVE_SYS_PRCTL_H - #include <sys/prctl.h> -@@ -154,6 +156,92 @@ _gdm_server_query_ck_for_display_device + #include <errno.h> + #include <ctype.h> + #include <pwd.h> +@@ -157,6 +159,92 @@ _gdm_server_query_ck_for_display_device return out; } @@ -104,7 +104,7 @@ char * gdm_server_get_display_device (GdmServer *server) { -@@ -314,6 +402,11 @@ gdm_server_resolve_command_line (GdmServ +@@ -317,6 +405,11 @@ gdm_server_resolve_command_line (GdmServ if (vtarg != NULL && ! gotvtarg) { argv[len++] = g_strdup (vtarg); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit acpica for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package acpica for openSUSE:Factory checked in at Sat Jan 15 02:46:22 CET 2011. -------- --- acpica/acpica.changes 2010-10-26 22:44:19.000000000 +0200 +++ acpica/acpica.changes 2011-01-14 16:02:04.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Jan 14 15:01:06 UTC 2011 - trenn(a)novell.com + +- Remove stale acpidump patches + +------------------------------------------------------------------- +Fri Jan 14 10:51:30 UTC 2011 - trenn(a)novell.com + +- Get latest acpidump tool from Len's acpi pmtools: + * Also dump dynamically loaded SSDTs +- Build against its own headers instead of acpica headers + -> unfortunately acpidump is still not part of acpica and + adjusting things ourselves is too much overhead. + + + +------------------------------------------------------------------- +Thu Jan 13 14:46:00 UTC 2011 - trenn(a)novell.com + +- Update to version 20110112 + Changes are listed in /usr/share/doc/packages/acpica/changes.txt + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- acpica-unix-20101013.tar.bz2 acpica_fix_scope_problems.patch acpidump-cleanup.diff acpidump.tar.bz2 acpidump_adjust_to_new_acpica_headers.patch unaligned_acpidump.patch New: ---- acpica-unix-20110112.tar.bz2 acpidump-20101221.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ acpica.spec ++++++ --- /var/tmp/diff_new_pack.Sv8jka/_old 2011-01-15 02:43:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Sv8jka/_new 2011-01-15 02:43:30.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package acpica (Version 20101013) +# spec file for package acpica # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -20,21 +20,18 @@ Name: acpica Url: http://acpica.org -Version: 20101013 +Version: 20110112 Release: 1 License: Intel ACPICA %define src_dir acpica-unix-%{version} +%define dmp_ver 20101221 Group: Development/Tools/Debuggers Summary: This is a set of tools to display and debug your BIOS ACPI tables Source: %{src_dir}.tar.bz2 Patch1: acpica-override-CFLAGS.diff Patch2: acpidump-override-CFLAGS.patch -Patch3: unaligned_acpidump.patch -Patch4: acpidump-cleanup.diff -Patch5: acpidump_adjust_to_new_acpica_headers.patch -Patch6: acpica_fix_scope_problems.patch Source1: ec_access.c -Source2: acpidump.tar.bz2 +Source2: acpidump-%{dmp_ver}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 ia64 x86_64 BuildRequires: bison flex @@ -64,10 +61,6 @@ %setup -n %{src_dir} -a 2 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" ++++++ acpica-unix-20101013.tar.bz2 -> acpica-unix-20110112.tar.bz2 ++++++ ++++ 11025 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit metacity for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package metacity for openSUSE:Factory checked in at Sat Jan 15 02:43:18 CET 2011. -------- --- GNOME/metacity/metacity.changes 2010-09-29 20:29:36.000000000 +0200 +++ metacity/metacity.changes 2011-01-14 16:54:00.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 14 16:43:49 CET 2011 - vuntz(a)opensuse.org + +- Add metacity-support-above-tab.patch: this adds an "Above_Tab" + pseudo-keysym, which is a feature that gnome-shell uses. Taken + from git. +- Add call to autoreconf needed by the patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- metacity-support-above-tab.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.9usLQt/_old 2011-01-15 02:40:49.000000000 +0100 +++ /var/tmp/diff_new_pack.9usLQt/_new 2011-01-15 02:40:49.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package metacity (Version 2.30.3) +# spec file for package metacity # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -33,13 +33,15 @@ License: GPLv2+ Group: System/GUI/GNOME Version: 2.30.3 -Release: 1 +Release: 2 Summary: A Fast Window Manager for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM metacity-uninitialized-variables.patch bgo619524 vuntz(a)opensuse.org -- Fix uninitialized variables Patch0: metacity-uninitialized-variables.patch # PATCH-FIX-UPSTREAM metacity-gdm-popup-error.patch bgo#588119 bnc#632726 vuntz(a)opensuse.org -- Taken from Fedora, to fix an error in gdm Patch1: metacity-gdm-popup-error.patch +# PATCH-FEATURE-UPSTREAM metacity-support-above-tab.patch vuntz(a)opensuse.org -- Add a "Above_Tab" pseudo-keysym, needed by gnome-shell. Taken from git. +Patch2: metacity-support-above-tab.patch # PATCH-FIX-OPENSUSE metacity-bnc385553-buggy-intel-xinerama.diff bnc385553 federico(a)novell.com - Sanitize overlapping (cloned) monitors from Xinerama Patch11: metacity-bnc385553-buggy-intel-xinerama.diff # PATCH-FIX-UPSTREAM metacity-key-list-binding.patch bnc576977 bgo609101 sbrabec(a)suse.cz -- Fix key bindings using key lists. @@ -77,8 +79,11 @@ translation-update-upstream %patch0 -p1 %patch1 -p1 +%patch2 -p1 %patch11 -p1 %patch14 -p1 +# Needed for patch2 +autoreconf -fi %build %configure\ ++++++ metacity-support-above-tab.patch ++++++ ++++ 602 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rubygem-mocha for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package rubygem-mocha for openSUSE:Factory checked in at Sat Jan 15 02:39:26 CET 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ rubygem-mocha/rubygem-mocha.changes 2010-06-11 19:50:08.000000000 +0200 @@ -0,0 +1,65 @@ +------------------------------------------------------------------- +Fri Jun 11 10:00:01 UTC 2010 - mrueckert(a)suse.de + +- use rubygems_requires macro + +------------------------------------------------------------------- +Mon Nov 16 10:30:51 UTC 2009 - dmacvicar(a)suse.de + +- update to 0.9.8 + * Fixed bug "NameError raised when using Mocha as a Rails plug-in" + - http://floehopper.lighthouseapp.com/projects/22289/tickets/53. + Since 0.9.6 the Rails plugin has been broken. See bug report for + details. You will need to explicitly load Mocha *after* the test + framework has been loaded, e.g. by adding "require 'mocha'" at the + bottom of test/test_helper.rb. + * Make Mocha::ParameterMatchers#regexp_matches, #includes, + #has_value, #has_key more robust. Thanks to Sander Hartlage. + * Allow passing a block to Mocha::Configuration methods to only + change configuration for the duration of the block. Thanks to Dan + Manges. + * Fixed bug "doc generation fails in 0.9.7 gem" - + http://floehopper.lighthouseapp.com/projects/22289/tickets/51. + * Remove rdoc template incorporating google analytics from source + control. The file just needs to exist locally and be ignored by + source control. This should stop the warning showing up on + e.g. RunCodeRun build results. + +------------------------------------------------------------------- +Wed Sep 2 06:52:25 UTC 2009 - mvidner(a)novell.com + +- update to 0.9.7 +- major changes: (more at http://mocha.rubyforge.org/files/RELEASE.html) + * Added support for ‘test-unit’ gem (version >= 2.0). + * Stop requiring rubygems + * Renamed Mocha::Standalone to Mocha::API to better reflect its purpose. + * Fix exception raised by HasEntry#matches? + * Fixes for MiniTest and Ruby 1.9.1 + +------------------------------------------------------------------- +Mon May 4 23:31:18 CEST 2009 - dmacvicar(a)suse.de + +- update to 0.9.5 +- Changelog: + * Fixed Lighthouse bug 32 - stub_everything should mean mock + responds to anything. + * Added Expectation#twice to improve readability. Tthanks + to pull request from Celestino Gomes. + * In Ruby 1.9, requiring ‘test/unit’ loads a thin wrapper around + MiniTest and Test::Unit::TestCase ends up inheriting from + MiniTest::Unit::TestCase. So we need to avoid including the + Mocha modules more than once to avoid nasty consequences. + Thanks to Matthias Hennemeyer for help with this. + * Ruby 1.9 includes rake, but not rake/contrib. For the moment + I‘ve moved the sshpublisher require into the only rake task + that needs it, so that I can at least run the tests in + Ruby 1.9. It looks like I will need to build a rake/contrib + gem or similar to get this working properly + intertwingly.net/blog/2008/01/07/Rake-Contrib-for-1-9 + +------------------------------------------------------------------- +Fri Jan 16 15:29:28 CET 2009 - mrueckert(a)suse.de + +- initial package of version 0.9.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mocha-0.9.8.gem rubygem-mocha.changes rubygem-mocha.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-mocha.spec ++++++ # # spec file for package rubygem-mocha # # 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: rubygem-mocha Version: 0.9.8 Release: 1 %define mod_name mocha # License: Other uncritical OpenSource License Group: Development/Languages/Ruby # BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: rubygems_with_buildroot_patch BuildRequires: rubygem-rake %rubygems_requires Requires: rubygem-rake # Url: http://mocha.rubyforge.org/ # http://rubyforge.org/projects/mocha/ Source: http://rubyforge.org/frs/download.php/63927/mocha-0.9.8.gem # Summary: A library for mocking and stubbing using a syntax like that of JMock %description Mocha is a library for mocking and stubbing using a syntax like that of JMock. It can be used with many testing frameworks e.g. Test::Unit, RSpec, test/spec, expectations, Dust, MiniTest and even JtestR. Mocha provides a unified, simple and readable syntax for both traditional mocking and partial mocking. Authors: -------- James Mead Paul Battley Chris Roos Ben Griffiths %prep %build %install %gem_install %{S:0} %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,-) %{_libdir}/ruby/gems/%{rb_ver}/cache/%{mod_name}-%{version}.gem %{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{version}/ %{_libdir}/ruby/gems/%{rb_ver}/specifications/%{mod_name}-%{version}.gemspec %doc %{_libdir}/ruby/gems/%{rb_ver}/doc/%{mod_name}-%{version}/ %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit device-mapper for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package device-mapper for openSUSE:Factory checked in at Sat Jan 15 02:37:59 CET 2011. -------- --- device-mapper/device-mapper.changes 2010-12-15 09:33:21.000000000 +0100 +++ device-mapper/device-mapper.changes 2011-01-14 11:08:50.000000000 +0100 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Fri Jan 14 10:08:08 UTC 2011 - lnussel(a)suse.de + +- the lsmod|grep in boot.device-mapper is superfluous, modprobe does + that internally anyways + +------------------------------------------------------------------- lvm2.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.31lbwg/_old 2011-01-15 02:37:36.000000000 +0100 +++ /var/tmp/diff_new_pack.31lbwg/_new 2011-01-15 02:37:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package device-mapper (Version 1.02.49) +# spec file for package device-mapper # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -27,7 +27,7 @@ %endif # Version: 1.02.49 -Release: 12 +Release: 13 Summary: Device Mapper Tools Source: LVM2.2.02.67.tgz Source1: boot.device-mapper ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.31lbwg/_old 2011-01-15 02:37:36.000000000 +0100 +++ /var/tmp/diff_new_pack.31lbwg/_new 2011-01-15 02:37:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lvm2-clvm (Version 2.02.67) +# spec file for package lvm2-clvm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -24,7 +24,7 @@ License: GPLv2+ ; LGPLv2.1+ Group: System/Base Version: 2.02.67 -Release: 10 +Release: 11 Requires: device-mapper >= 1.02.25 lvm2 = %{version} openais Provides: clvm PreReq: %fillup_prereq %insserv_prereq ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.31lbwg/_old 2011-01-15 02:37:36.000000000 +0100 +++ /var/tmp/diff_new_pack.31lbwg/_new 2011-01-15 02:37:36.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package lvm2 (Version 2.02.67) +# spec file for package lvm2 # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -28,7 +28,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 2.02.67 -Release: 12 +Release: 13 Summary: LVM2 Tools Source: LVM2.%{version}.tgz Source1: lvm.conf ++++++ boot.device-mapper ++++++ --- /var/tmp/diff_new_pack.31lbwg/_old 2011-01-15 02:37:36.000000000 +0100 +++ /var/tmp/diff_new_pack.31lbwg/_new 2011-01-15 02:37:36.000000000 +0100 @@ -18,15 +18,14 @@ rc_reset case "$1" in - start) - echo "Activating device mapper..." - lsmod | grep "^dm[-_]mod[ ]" >/dev/null 2>&1 || modprobe dm-mod - rc_status -v -r + start) + echo -n "Activating device mapper..." + modprobe dm-mod || rc_failed 1 + rc_status -v ;; stop) - # module unloading seems to be uneliable in kernel 2.6 - # rmmod dm-mod - # rc_status -v + rc_failed 3 + rc_status -v ;; status) rc_failed 4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hal for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package hal for openSUSE:Factory checked in at Sat Jan 15 02:37:21 CET 2011. -------- --- hal/hal-doc.changes 2010-12-10 15:54:00.000000000 +0100 +++ hal/hal-doc.changes 2011-01-15 02:36:37.742455000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 13 09:24:16 UTC 2011 - lnussel(a)suse.de + +- don't start hald at boot by default, use dbus activation instead + +------------------------------------------------------------------- hal.changes: same change calling whatdependson for head-i586 New: ---- org.freedesktop.Hal.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hal-doc.spec ++++++ --- /var/tmp/diff_new_pack.vXVPUr/_old 2011-01-15 02:36:43.000000000 +0100 +++ /var/tmp/diff_new_pack.vXVPUr/_new 2011-01-15 02:36:43.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package hal-doc (Version 0.5.14) +# spec file for package hal-doc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 13 +Release: 14 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons @@ -60,6 +60,7 @@ Source2: rc.hal Source3: pre_checkin.sh Source4: baselibs.conf +Source5: org.freedesktop.Hal.service Source50: hal-doc-rpmlintrc Source60: hal-rpmlintrc Patch0: hal-fix537452.diff @@ -213,6 +214,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/ rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/libhal/ rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/libhal-storage +install -D -m 755 %SOURCE5 %buildroot%{_datadir}/dbus-1/system-services/org.freedesktop.Hal.service %endif %fdupes %{buildroot} @@ -255,7 +257,7 @@ %post /sbin/ldconfig -%{insserv_force_if_yast haldaemon} +%{insserv_cleanup} %postun /sbin/ldconfig @@ -278,6 +280,7 @@ %{_bindir}/* %{_datadir}/hal/fdi/* %{_datadir}/PolicyKit/policy/* +%{_datadir}/dbus-1/system-services/org.freedesktop.Hal.service %{_libdir}/*hal*.so.* %{_prefix}/lib/hal/* %{_mandir}/man1/* ++++++ hal.spec ++++++ --- /var/tmp/diff_new_pack.vXVPUr/_old 2011-01-15 02:36:43.000000000 +0100 +++ /var/tmp/diff_new_pack.vXVPUr/_new 2011-01-15 02:36:43.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package hal (Version 0.5.14) +# spec file for package hal # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -28,7 +28,7 @@ %define dbus_release 1 %define hal_info_version 20091130 Version: 0.5.14 -Release: 13 +Release: 14 Url: http://freedesktop.org/Software/hal License: GPLv2+ ; AFL2.0 or GPLv2.0 Group: System/Daemons @@ -60,6 +60,7 @@ Source2: rc.hal Source3: pre_checkin.sh Source4: baselibs.conf +Source5: org.freedesktop.Hal.service Source50: hal-doc-rpmlintrc Source60: hal-rpmlintrc Patch0: hal-fix537452.diff @@ -213,6 +214,7 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal/ rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/libhal/ rm -rf $RPM_BUILD_ROOT/%{_datadir}/gtk-doc/html/libhal-storage +install -D -m 755 %SOURCE5 %buildroot%{_datadir}/dbus-1/system-services/org.freedesktop.Hal.service %endif %fdupes %{buildroot} @@ -255,7 +257,7 @@ %post /sbin/ldconfig -%{insserv_force_if_yast haldaemon} +%{insserv_cleanup} %postun /sbin/ldconfig @@ -278,6 +280,7 @@ %{_bindir}/* %{_datadir}/hal/fdi/* %{_datadir}/PolicyKit/policy/* +%{_datadir}/dbus-1/system-services/org.freedesktop.Hal.service %{_libdir}/*hal*.so.* %{_prefix}/lib/hal/* %{_mandir}/man1/* ++++++ org.freedesktop.Hal.service ++++++ [D-BUS Service] Name=org.freedesktop.Hal Exec=/sbin/service haldaemon start User=root ++++++ rc.hal ++++++ --- /var/tmp/diff_new_pack.vXVPUr/_old 2011-01-15 02:36:43.000000000 +0100 +++ /var/tmp/diff_new_pack.vXVPUr/_new 2011-01-15 02:36:43.000000000 +0100 @@ -55,18 +55,8 @@ chown haldaemon:haldaemon $HALDAEMON_PIDDIR \ $HALDAEMON_PIDDIR/hald-runner $HALDAEMON_PIDDIR/hald-local fi - if [ -e $HALDAEMON_PID ]; then - if checkproc $HALDAEMON_BIN ; then - echo "HAL already started. Not starting." - exit 0; - else - echo "Removing stale PID file $HALDAEMON_PID."; - rm -f $HALDAEMON_PID; - fi - fi - echo -n "Starting HAL daemon" - $HALDAEMON_BIN $HALDAEMON_PARA + start_daemon $HALDAEMON_BIN $HALDAEMON_PARA if [ -n "$INIT_VERSION" ] ; then rm -rf /media/.hal-mtab* @@ -98,8 +88,7 @@ $0 start ;; force-reload) - echo -n "Reload service HAL daemon" - $0 stop && $0 start + $0 try-restart rc_status ;; reload) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iso-codes for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package iso-codes for openSUSE:Factory checked in at Sat Jan 15 02:34:10 CET 2011. -------- --- GNOME/iso-codes/iso-codes.changes 2011-01-07 19:05:30.000000000 +0100 +++ iso-codes/iso-codes.changes 2011-01-14 19:57:46.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Jan 14 18:42:56 UTC 2011 - coolo(a)novell.com + +- Replace pyxml BuildRequires with python-lxml: pyxml was dropped. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iso-codes.spec ++++++ --- /var/tmp/diff_new_pack.aHRbNy/_old 2011-01-15 02:32:46.000000000 +0100 +++ /var/tmp/diff_new_pack.aHRbNy/_new 2011-01-15 02:32:46.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package iso-codes (Version 3.24) +# spec file for package iso-codes # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: iso-codes Version: 3.24 -Release: 1 +Release: 2 License: LGPLv2.1+ Summary: ISO Code Lists and Translations Url: http://alioth.debian.org/projects/pkg-isocodes/ @@ -27,7 +27,7 @@ Source: %{name}-%{version}.tar.bz2 BuildRequires: pkg-config BuildRequires: python-devel -BuildRequires: pyxml +BuildRequires: python-lxml BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit samba for openSUSE:Factory
by root＠hilbert.suse.de 15 Jan '11

15 Jan '11

Hello community, here is the log from the commit of package samba for openSUSE:Factory checked in at Sat Jan 15 02:32:26 CET 2011. -------- --- samba/samba.changes 2010-12-05 23:58:21.000000000 +0100 +++ samba/samba.changes 2011-01-14 19:26:07.000000000 +0100 @@ -1,0 +2,47 @@ +Fri Jan 14 15:22:51 CET 2011 - lmuelle(a)suse.de + +- No longer force activation of the cifs service on post-11.3 systems. +- Add X-UnitedLinux-Default-Enabled to the cifs init script on pre-11.4 + systems. +- Move the cifs init script nfs dependencies from Required to Should. + +------------------------------------------------------------------- +Tue Jan 4 16:26:37 UTC 2011 - lmuelle(a)suse.de + +- Recommend to install samba-krb-printing from samba-winbind on post-10.3 + systems; (bnc#661845). + +------------------------------------------------------------------- +Thu Dec 30 12:52:39 CET 2010 - ddiss(a)suse.de + +- Fix error paths in cups_async_callback(), an empty cups printer list should + not be treated as an error; (bnc#661842). + +------------------------------------------------------------------- +Tue Dec 21 16:31:15 CET 2010 - ddiss(a)suse.de + +- Abide by printcap cache time, reload parent smbd pcap cache on expiry; + (bso#7836); (bnc#625936). + +------------------------------------------------------------------- +Fri Dec 17 20:01:38 CET 2010 - ddiss(a)suse.de + +- Fix race in cups async printer services reload; (bso#7836); (bnc#625936). + +------------------------------------------------------------------- +Mon Dec 13 00:54:03 CET 2010 - ro(a)suse.de + +- Don't tweak with baselibs.conf during %post if not present; (bnc#652620). + +------------------------------------------------------------------- +Thu Dec 9 13:31:15 UTC 2010 - lmuelle(a)suse.de + +- Don't make use of baselibs.conf on SUSE Linux Enterprise 10; (bnc#652620). + +------------------------------------------------------------------- +Tue Dec 7 16:48:25 UTC 2010 - lmuelle(a)suse.de + +- Don't use --tmpdir as this option isn't known by mktemp of SUSE Linux + Enterprise 10; (bnc#652620). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.XL5mrx/_old 2011-01-15 02:27:31.000000000 +0100 +++ /var/tmp/diff_new_pack.XL5mrx/_new 2011-01-15 02:27:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package samba-doc (Version 3.5.6) +# spec file for package samba-doc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -66,7 +66,7 @@ %endif Url: http://www.samba.org/ Version: 3.5.6 -Release: 2 +Release: 3 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -396,7 +396,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.XL5mrx/_old 2011-01-15 02:27:31.000000000 +0100 +++ /var/tmp/diff_new_pack.XL5mrx/_new 2011-01-15 02:27:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package samba (Version 3.5.6) +# spec file for package samba # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -71,7 +71,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.6 -Release: 2 +Release: 3 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -173,7 +173,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package client @@ -219,7 +219,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -246,7 +246,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %endif @@ -276,7 +276,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %endif @@ -303,7 +303,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if %{make_utils} @@ -341,7 +341,7 @@ %endif Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 -Recommends: cron logrotate +Recommends: cron logrotate samba-krb-printing %endif PreReq: coreutils /sbin/ldconfig %{?insserv_prereq} /usr/sbin/groupadd @@ -354,7 +354,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -379,7 +379,7 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %else @@ -424,7 +424,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libnetapi0 @@ -443,7 +443,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libnetapi-devel @@ -463,7 +463,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -483,7 +483,7 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %else @@ -519,7 +519,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtalloc2 @@ -538,7 +538,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtalloc-devel @@ -558,7 +558,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtdb1 @@ -577,7 +577,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtdb-devel @@ -597,7 +597,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libwbclient0 @@ -616,7 +616,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libwbclient-devel @@ -636,7 +636,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtevent0 @@ -655,7 +655,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libtevent-devel @@ -676,7 +676,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libldb0 @@ -696,7 +696,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %package -n libldb-devel @@ -716,7 +716,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %if %{make_ldapsmb} @@ -727,7 +727,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 294 +Release: 295 Requires: perl-ldap %description -n ldapsmb @@ -740,7 +740,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %endif @@ -763,7 +763,7 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2472 +Source Timestamp: 2486 Branch : 3.5.6 %endif @@ -1103,6 +1103,8 @@ scriptSuffix="-900" elif test 0%{?suse_version} -lt 1011; then scriptSuffix="-1010" +elif test 0%{?suse_version} -lt 1131; then + scriptSuffix="-1130" fi %endif startScripts="smb nmb winbind %{cifs_init_script}" @@ -1344,7 +1346,9 @@ /sbin/ldconfig if [ ${1:-0} -eq 1 ]; then # Only insserv cifs if we're not in update mode. -%{?fillup_and_insserv:%{fillup_and_insserv -fy %cifs_init_script}} +%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131 +%{?insserv_force_if_yast:%{insserv_force_if_yast cifs}} +%endif ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script} @@ -1521,9 +1525,9 @@ %clean [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" -%if 0%{?suse_version} < 1110 +if [ -e ${RPM_SOURCE_DIR}/baselibs.conf -a 0%{?suse_version} -gt 0 -a 0%{?suse_version} -lt 1110 ]; then sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf -%endif +fi %files -f filelist-samba %defattr(-,root,root) ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.XL5mrx/_old 2011-01-15 02:27:31.000000000 +0100 +++ /var/tmp/diff_new_pack.XL5mrx/_new 2011-01-15 02:27:31.000000000 +0100 @@ -1,2 +1,2 @@ -2472 +2486 Branch : 3.5.6 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/series new/patches/series --- old/patches/series 2010-12-05 23:56:24.000000000 +0100 +++ new/patches/series 2011-01-11 22:50:34.000000000 +0100 @@ -28,6 +28,9 @@ suse/configure.diff -p0 # Work around bad use of autoconf interna suse/testsuite_libsmbclient_src_Makefile.diff -p0 # use new source3 dir name suse/smb_traffic_analyzer_v2.diff -p0 # backport of smbta v2 +suse/async_printcap_svc_update.diff -p0 # bso 7836, bnc 625936 +suse/printcap_cache_time_abide.diff -p0 # bso 7836, bnc 625936 +suse/no_cups_printers_error.diff -p0 # bnc 661842 # this one should always live at the end and should be redone # diabled cf. 280452 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/async_printcap_svc_update.diff new/patches/suse/async_printcap_svc_update.diff --- old/patches/suse/async_printcap_svc_update.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/suse/async_printcap_svc_update.diff 2011-01-11 22:50:34.000000000 +0100 @@ -0,0 +1,237 @@ +From: David Disseldorp <ddiss(a)suse.de> +Date: Sun, 19 Dec 2010 19:52:08 +0100 +Subject: [PATCH 1/2] s3-printing: reload shares after pcap cache fill +Bugzilla: bso#7836, bnc#649526 + +Index: source3/printing/print_cups.c +=================================================================== +--- source3/printing/print_cups.c.orig ++++ source3/printing/print_cups.c +@@ -445,13 +445,19 @@ static bool cups_pcap_load_async(int *pf + _exit(0); + } + ++struct cups_async_cb_args { ++ int pipe_fd; ++ void (*post_cache_fill_fn)(void); ++}; ++ + static void cups_async_callback(struct event_context *event_ctx, + struct fd_event *event, + uint16 flags, + void *p) + { + TALLOC_CTX *frame = talloc_stackframe(); +- int fd = *(int *)p; ++ struct cups_async_cb_args *cb_args = (struct cups_async_cb_args *)p; ++ int fd = cb_args->pipe_fd; + struct pcap_cache *tmp_pcap_cache = NULL; + + DEBUG(5,("cups_async_callback: callback received for printer data. " +@@ -545,27 +551,34 @@ static void cups_async_callback(struct e + + /* And the systemwide pcap cache. */ + pcap_cache_replace(local_pcap_copy); ++ ++ /* Caller may have requested post cache fill callback */ ++ if (cb_args->post_cache_fill_fn) ++ cb_args->post_cache_fill_fn(); + } else { + DEBUG(2,("cups_async_callback: failed to read a new " + "printer list\n")); + } + close(fd); +- TALLOC_FREE(p); ++ TALLOC_FREE(cb_args); + TALLOC_FREE(cache_fd_event); + } + +-bool cups_cache_reload(void) ++bool cups_cache_reload(void (*post_cache_fill_fn)(void)) + { +- int *p_pipe_fd = TALLOC_P(NULL, int); ++ struct cups_async_cb_args *cb_args; ++ int *p_pipe_fd; + +- if (!p_pipe_fd) { ++ cb_args = TALLOC_P(NULL, struct cups_async_cb_args); ++ if (!cb_args) + return false; +- } +- ++ cb_args->post_cache_fill_fn = post_cache_fill_fn; ++ p_pipe_fd = &cb_args->pipe_fd; + *p_pipe_fd = -1; + + /* Set up an async refresh. */ + if (!cups_pcap_load_async(p_pipe_fd)) { ++ talloc_free(cb_args); + return false; + } + if (!local_pcap_copy) { +@@ -578,7 +591,7 @@ bool cups_cache_reload(void) + cups_async_callback(smbd_event_context(), + NULL, + EVENT_FD_READ, +- (void *)p_pipe_fd); ++ (void *)cb_args); + if (!local_pcap_copy) { + return false; + } +@@ -595,10 +608,10 @@ bool cups_cache_reload(void) + NULL, *p_pipe_fd, + EVENT_FD_READ, + cups_async_callback, +- (void *)p_pipe_fd); ++ (void *)cb_args); + if (!cache_fd_event) { + close(*p_pipe_fd); +- TALLOC_FREE(p_pipe_fd); ++ talloc_free(cb_args); + return false; + } + } +Index: source3/printing/pcap.c +=================================================================== +--- source3/printing/pcap.c.orig ++++ source3/printing/pcap.c +@@ -125,13 +125,14 @@ void pcap_cache_replace(const struct pca + } + } + +-void pcap_cache_reload(void) ++void pcap_cache_reload(void (*post_cache_fill_fn)(void)) + { + const char *pcap_name = lp_printcapname(); + bool pcap_reloaded = False; + struct pcap_cache *tmp_cache = NULL; + XFILE *pcap_file; + char *pcap_line; ++ bool post_cache_fill_fn_handled = false; + + DEBUG(3, ("reloading printcap cache\n")); + +@@ -146,7 +147,12 @@ void pcap_cache_reload(void) + + #ifdef HAVE_CUPS + if (strequal(pcap_name, "cups")) { +- pcap_reloaded = cups_cache_reload(); ++ pcap_reloaded = cups_cache_reload(post_cache_fill_fn); ++ /* ++ * cups_cache_reload() is async and calls post_cache_fill_fn() ++ * on successful completion ++ */ ++ post_cache_fill_fn_handled = true; + goto done; + } + #endif +@@ -244,6 +250,8 @@ done: + + if (pcap_reloaded) + pcap_cache_destroy_specific(&tmp_cache); ++ if (post_cache_fill_fn_handled == false) ++ post_cache_fill_fn(); + else { + pcap_cache_destroy_specific(&pcap_cache); + pcap_cache = tmp_cache; +Index: source3/smbd/server.c +=================================================================== +--- source3/smbd/server.c.orig ++++ source3/smbd/server.c +@@ -734,9 +734,9 @@ static void smbd_parent_loop(struct smbd + /* NOTREACHED return True; */ + } + +-/**************************************************************************** +- Reload printers +-**************************************************************************/ ++/*************************************************************************** ++purge stale printers and reload from pre-populated pcap cache ++***************************************************************************/ + void reload_printers(void) + { + int snum; +@@ -744,9 +744,9 @@ void reload_printers(void) + int pnum = lp_servicenumber(PRINTERS_NAME); + const char *pname; + +- pcap_cache_reload(); ++ SMB_ASSERT(pcap_cache_loaded()); + +- /* remove stale printers */ ++ DEBUG(10, ("reloading printer services from pcap cache\n")); + for (snum = 0; snum < n_services; snum++) { + /* avoid removing PRINTERS_NAME or non-autoloaded printers */ + if (snum == pnum || !(lp_snum_ok(snum) && lp_print_ok(snum) && +@@ -793,7 +793,7 @@ bool reload_services(bool test) + + ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True); + +- reload_printers(); ++ pcap_cache_reload(&reload_printers); + + /* perhaps the config filename is now set */ + if (!test) +Index: source3/printing/load.c +=================================================================== +--- source3/printing/load.c.orig ++++ source3/printing/load.c +@@ -53,12 +53,11 @@ static void add_auto_printers(void) + } + + /*************************************************************************** +-load automatic printer services ++load automatic printer services from pre-populated pcap cache + ***************************************************************************/ + void load_printers(void) + { +- if (!pcap_cache_loaded()) +- pcap_cache_reload(); ++ SMB_ASSERT(pcap_cache_loaded()); + + add_auto_printers(); + +Index: source3/include/proto.h +=================================================================== +--- source3/include/proto.h.orig ++++ source3/include/proto.h +@@ -4892,7 +4892,7 @@ void pcap_cache_destroy_specific(struct + bool pcap_cache_add(const char *name, const char *comment); + bool pcap_cache_loaded(void); + void pcap_cache_replace(const struct pcap_cache *cache); +-void pcap_cache_reload(void); ++void pcap_cache_reload(void (*post_cache_fill_fn)(void)); + bool pcap_printername_ok(const char *printername); + void pcap_printer_fn_specific(const struct pcap_cache *, void (*fn)(const char *, const char *, void *), void *); + void pcap_printer_fn(void (*fn)(const char *, const char *, void *), void *); +@@ -4903,7 +4903,7 @@ bool aix_cache_reload(void); + + /* The following definitions come from printing/print_cups.c */ + +-bool cups_cache_reload(void); ++bool cups_cache_reload(void (*post_cache_fill_fn)(void)); + bool cups_pull_comment_location(NT_PRINTER_INFO_LEVEL_2 *printer); + + /* The following definitions come from printing/print_generic.c */ +Index: source3/web/swat.c +=================================================================== +--- source3/web/swat.c.orig ++++ source3/web/swat.c +@@ -490,7 +490,7 @@ static int save_reload(int snum) + return 0; + } + iNumNonAutoPrintServices = lp_numservices(); +- load_printers(); ++ pcap_cache_reload(&load_printers); + + return 1; + } +@@ -1434,7 +1434,7 @@ const char *lang_msg_rotate(TALLOC_CTX * + load_config(True); + load_interfaces(); + iNumNonAutoPrintServices = lp_numservices(); +- load_printers(); ++ pcap_cache_reload(&load_printers); + + cgi_setup(get_dyn_SWATDIR(), !demo_mode); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/no_cups_printers_error.diff new/patches/suse/no_cups_printers_error.diff --- old/patches/suse/no_cups_printers_error.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/suse/no_cups_printers_error.diff 2011-01-11 22:50:34.000000000 +0100 @@ -0,0 +1,102 @@ +From: David Disseldorp <ddiss(a)suse.de> +Date: 2010-12-30 12:16:56 CET +Subject: An empty cups printer list is treated as an error +Bugzilla: bnc#661842 + +Index: source3/printing/print_cups.c +=================================================================== +--- source3/printing/print_cups.c.orig ++++ source3/printing/print_cups.c +@@ -459,6 +459,7 @@ static void cups_async_callback(struct e + struct cups_async_cb_args *cb_args = (struct cups_async_cb_args *)p; + int fd = cb_args->pipe_fd; + struct pcap_cache *tmp_pcap_cache = NULL; ++ bool ret_ok = true; + + DEBUG(5,("cups_async_callback: callback received for printer data. " + "fd = %d\n", fd)); +@@ -476,6 +477,7 @@ static void cups_async_callback(struct e + if (ret != sizeof(namelen)) { + DEBUG(10,("cups_async_callback: namelen read failed %d %s\n", + errno, strerror(errno))); ++ ret_ok = false; + break; + } + +@@ -490,6 +492,7 @@ static void cups_async_callback(struct e + if (ret != sizeof(infolen)) { + DEBUG(10,("cups_async_callback: infolen read failed %s\n", + strerror(errno))); ++ ret_ok = false; + break; + } + +@@ -499,6 +502,7 @@ static void cups_async_callback(struct e + if (namelen) { + name = TALLOC_ARRAY(frame, char, namelen); + if (!name) { ++ ret_ok = false; + break; + } + ret = sys_read(fd, name, namelen); +@@ -509,6 +513,7 @@ static void cups_async_callback(struct e + if (ret != namelen) { + DEBUG(10,("cups_async_callback: name read failed %s\n", + strerror(errno))); ++ ret_ok = false; + break; + } + DEBUG(11,("cups_async_callback: read name %s\n", +@@ -519,6 +524,7 @@ static void cups_async_callback(struct e + if (infolen) { + info = TALLOC_ARRAY(frame, char, infolen); + if (!info) { ++ ret_ok = false; + break; + } + ret = sys_read(fd, info, infolen); +@@ -529,6 +535,7 @@ static void cups_async_callback(struct e + if (ret != infolen) { + DEBUG(10,("cups_async_callback: info read failed %s\n", + strerror(errno))); ++ ret_ok = false; + break; + } + DEBUG(11,("cups_async_callback: read info %s\n", +@@ -538,26 +545,29 @@ static void cups_async_callback(struct e + } + + /* Add to our local pcap cache. */ +- pcap_cache_add_specific(&tmp_pcap_cache, name, info); ++ ret_ok = pcap_cache_add_specific(&tmp_pcap_cache, name, info); + TALLOC_FREE(name); + TALLOC_FREE(info); ++ if (!ret_ok) { ++ DEBUG(0, ("failed to add to tmp pcap cache\n")); ++ break; ++ } + } + + TALLOC_FREE(frame); +- if (tmp_pcap_cache) { +- /* We got a namelist, replace our local cache. */ ++ if (!ret_ok) { ++ DEBUG(0,("failed to read a new printer list\n")); ++ pcap_cache_destroy_specific(&tmp_pcap_cache); ++ } else { ++ /* We got a possibly empty namelist, replace our local cache. */ + pcap_cache_destroy_specific(&local_pcap_copy); + local_pcap_copy = tmp_pcap_cache; + + /* And the systemwide pcap cache. */ + pcap_cache_replace(local_pcap_copy); +- + /* Caller may have requested post cache fill callback */ + if (cb_args->post_cache_fill_fn) + cb_args->post_cache_fill_fn(); +- } else { +- DEBUG(2,("cups_async_callback: failed to read a new " +- "printer list\n")); + } + close(fd); + TALLOC_FREE(cb_args); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/printcap_cache_time_abide.diff new/patches/suse/printcap_cache_time_abide.diff --- old/patches/suse/printcap_cache_time_abide.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/patches/suse/printcap_cache_time_abide.diff 2011-01-11 22:50:34.000000000 +0100 @@ -0,0 +1,52 @@ +From: David Disseldorp <ddiss(a)suse.de> +Date: Mon, 10 Jan 2011 14:08:07 +0100 +Subject: [PATCH 2/2] s3-printing: update parent smbd pcap cache +Bugzilla: bso#7836, bnc#649526 + +Index: source3/smbd/process.c +=================================================================== +--- source3/smbd/process.c.orig ++++ source3/smbd/process.c +@@ -2079,7 +2079,7 @@ void check_reload(time_t t) + || (t-last_printer_reload_time < 0) ) + { + DEBUG( 3,( "Printcap cache time expired.\n")); +- reload_printers(); ++ pcap_cache_reload(&reload_printers); + last_printer_reload_time = t; + } + } +Index: source3/smbd/server.c +=================================================================== +--- source3/smbd/server.c.orig ++++ source3/smbd/server.c +@@ -541,6 +541,14 @@ static bool smbd_open_one_socket(struct + return true; + } + ++static bool parent_housekeeping_fn(const struct timeval *now, void *private_data) ++{ ++ DEBUG(5, ("\'ouskeeping\n")); ++ /* check if we need to reload services */ ++ check_reload(time(NULL)); ++ return true; ++} ++ + /**************************************************************************** + Open the socket communication. + ****************************************************************************/ +@@ -668,6 +676,14 @@ static bool open_sockets_smbd(struct smb + claim_connection(NULL,"", + FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_DBWRAP); + ++ if (!(event_add_idle(smbd_event_context(), NULL, ++ timeval_set(SMBD_SELECT_TIMEOUT, 0), ++ "parent_housekeeping", parent_housekeeping_fn, ++ parent))) { ++ DEBUG(0, ("Could not add housekeeping event\n")); ++ exit(1); ++ } ++ + /* Listen to messages */ + + messaging_register(smbd_messaging_context(), NULL, ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/cifs new/vendor-files/init/cifs --- old/vendor-files/init/cifs 2010-11-11 22:58:51.000000000 +0100 +++ new/vendor-files/init/cifs 2011-01-14 15:32:46.000000000 +0100 @@ -25,10 +25,10 @@ # ### BEGIN INIT INFO # Provides: cifs -# Required-Start: $network $syslog nfs -# Should-Start: nmb -# Required-Stop: $network $syslog nfs -# Should-Stop: nmb +# Required-Start: $network $syslog +# Should-Start: nfs nmb +# Required-Stop: $network $syslog +# Should-Stop: nfs nmb # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Import remote SMB/ CIFS (MS Windows) file systems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/cifs-1130 new/vendor-files/init/cifs-1130 --- old/vendor-files/init/cifs-1130 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/init/cifs-1130 2011-01-14 15:33:13.000000000 +0100 @@ -0,0 +1,223 @@ +#! /bin/sh +# Copyright (c) 1999-2009 SuSE Linux AG, Nuernberg, Germany. +# All rights reserved. +# +# Author: Thomas Fehr, 1999-2001 +# Lars Mueller <lmuelle(a)suse.de>, 2002-2009 +# Bjoern Jacke <bjacke(a)SerNet.de> 2004 +# +# /etc/init.d/cifs +# and its symbolic link +# /usr/sbin/rccifs +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +### BEGIN INIT INFO +# Provides: cifs +# Required-Start: $network $syslog +# Should-Start: nfs nmb +# Required-Stop: $network $syslog +# Should-Stop: nfs nmb +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# X-UnitedLinux-Default-Enabled: yes +# Short-Description: Import remote SMB/ CIFS (MS Windows) file systems +# Description: Import remote SMB/ CIFS (MS Windows) file systems +### END INIT INFO + +# To access SMB/ CIFS servers beyond the network broadcast domain it may be +# necessary to also activate the nmb service. Also see section 'cifs and nmb +# service' in /usr/share/doc/packages/samba/README.SUSE + +. /etc/rc.status +rc_reset + +LC_ALL=en_US +CIFSTAB="/etc/samba/cifstab" +SMB_CONF="/etc/samba/smb.conf" +CIFS_STATE_FILE="/var/lock/subsys/cifs" +SLEEP=1 +TIMEOUT=10 + +grep -q " cifs " /proc/mounts +test $? -eq 0 && cifs_used=yes || cifs_used=no + +case "$1" in + start) + grep -q '^[[:space:]]*[^#].*[[:space:]]cifs[[:space:]]' /etc/fstab + rc=$? + if [ ! -f ${CIFSTAB} -a ${rc} -ne 0 ]; then + echo -n >&2 "No ${CIFSTAB} found and no type cifs active in /etc/fstab. " + rc_status -s + exit 6 + fi + echo -n "Mount CIFS File Systems " + service_used="no" + if [ ${rc} -eq 0 ]; then + service_used="yes" + timer=${TIMEOUT} + JOBS="none" + printdot="" + while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do + if [ -z "${printdot}" ]; then + echo + echo -n "from /etc/fstab " + mount -at cifs >/dev/null & + PID=$! + fi + test -e /proc/$PID || JOBS="" + if [ "${JOBS}" ]; then + timer=$[${timer}-1] + echo -n "." + sleep ${SLEEP} + printdot="yes" + fi + done + test "${printdot}" && echo -n " " + if [ "${JOBS}" -a ${timer} -eq 0 ]; then + echo -n >&2 " Error: timeout while mount. " + rc_failed + fi + rc_status -v + fi + timer=-1 + test -e ${CIFSTAB} && \ + while read service mountpoint vfstype options; do + case "${service}" in + ""|\#*|\;*) continue ;; + esac + # Set default vfstype which is also a hack for old + # cifstab formated files without a vfstype set. + if [ "${vfstype}" != "cifs" -a -z "${options}" ]; then + options="${vfstype}" + vfstype="cifs" + fi + # If no options are set use an empty password. + if [ -z "${options}" ]; then + options="password=" + fi + if [ ${timer} -eq -1 ]; then + echo -en "from ${CIFSTAB} \n" + timer=0 + fi + # Remove /s at the end of a mount point. + mountpoint=$( echo "$mountpoint"|sed "s/\/*$//") + if grep -q "[[:space:]]$mountpoint[[:space:]]" /proc/mounts; then + echo -n "$mountpoint: mount point already in use. " + rc_status -s + continue + fi + service_used="yes" + echo -n "${service} on ${mountpoint} type ${vfstype} " + rc_reset + timer=${TIMEOUT} + JOBS="none" + printdot="" + while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do + if [ -z "${printdot}" ]; then + mount -t "${vfstype}" -o ${options} "${service}" "${mountpoint}" >/dev/null & + PID=$! + fi + test -e /proc/$PID || JOBS="" + if [ "${JOBS}" ]; then + timer=$[${timer}-1] + echo -n "." + sleep ${SLEEP} + printdot="yes" + fi + done + test "${printdot}" && echo -n " " + if [ "${JOBS}" -a ${timer} -eq 0 ]; then + echo -n >&2 " Error: timeout while mount. " + rc_failed + fi + rc_status -v + done < ${CIFSTAB} + test "${service_used}" = "no" && rc_status -u + touch ${CIFS_STATE_FILE} + ;; + stop) + echo -n "Umount CIFS File Systems " + if [ "${cifs_used}" = "yes" ]; then + # + # Unmount in background due to possible long timeouts + # + timer=${TIMEOUT} + JOBS="none" + printdot="" + while [ "${JOBS}" ] && [ ${timer} -gt 0 ]; do + if [ -z "${printdot}" ]; then + umount -at cifs & + PID=$! + fi + test -e /proc/$PID || JOBS="" + if [ "${JOBS}" ]; then + timer=$[${timer}-1] + echo -n "." + sleep ${SLEEP} + printdot="yes" + fi + done + test "${printdot}" && echo -n " " + if [ "${JOBS}" -a ${timer} -eq 0 ]; then + echo -n >&2 " Error: timeout while umount. " + rc_failed + fi + fi + rc_status -v + ;; + try-restart|condrestart) + if test "$1" = "condrestart"; then + echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" + fi + $0 status + if test $? = 0; then + $0 restart + else + rc_reset + fi + rc_status + ;; + force-reload|restart) + $0 stop + $0 start + rc_status + ;; + reload) + echo -n "Reload mounted CIFS File Systems " + rc_failed 3 + rc_status -v + ;; + status) + echo -n "Checking for mounted CIFS File Systems " + if [ "${cifs_used}" = "yes" ]; then + mount -t cifs | while read service on mountpoint type vfstype rest; do + echo + echo -n "${service} on ${mountpoint} type ${vfstype} " + done + else + rc_failed 3 + fi + rc_status -v + ;; + probe) + test ${CIFSTAB} -nt ${CIFS_STATE_FILE} -o \ + ${SMB_CONF} -nt ${CIFS_STATE_FILE} && echo restart + ;; + *) + echo "Usage: $0 {start|stop|status|force-reload|reload|restart|reload|probe}" + exit 1 + ;; +esac +rc_exit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/nmb-1130 new/vendor-files/init/nmb-1130 --- old/vendor-files/init/nmb-1130 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/init/nmb-1130 2011-01-15 02:27:32.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to nmb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smb-1130 new/vendor-files/init/smb-1130 --- old/vendor-files/init/smb-1130 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/init/smb-1130 2011-01-15 02:27:32.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to smb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/smbfs-1130 new/vendor-files/init/smbfs-1130 --- old/vendor-files/init/smbfs-1130 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/init/smbfs-1130 2011-01-15 02:27:32.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to smbfs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/init/winbind-1130 new/vendor-files/init/winbind-1130 --- old/vendor-files/init/winbind-1130 1970-01-01 01:00:00.000000000 +0100 +++ new/vendor-files/init/winbind-1130 2011-01-15 02:27:32.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to winbind diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2010-12-05 23:56:42.000000000 +0100 +++ new/vendor-files/tools/package-data 2011-01-14 21:05:13.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2472" +SAMBA_PACKAGE_SVN_VERSION="2486" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0