October 2010 - openSUSE Commits - openSUSE Mailing Lists

commit festival for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package festival for openSUSE:Factory checked in at Sat Oct 2 01:22:15 CEST 2010. -------- --- festival/festival.changes 2009-06-10 14:40:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/festival/festival.changes 2010-09-30 14:50:22.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Sep 30 14:46:34 CEST 2010 - vuntz(a)opensuse.org + +- Add festival-safe-temp-file.patch: do not use the PID of the + process to create a temporary file. Mentioned in bnc#642507. + +------------------------------------------------------------------- +Wed Sep 29 12:27:31 CEST 2010 - vuntz(a)opensuse.org + +- Add festival-no-LD_LIBRARY_PATH-extension.patch and + speech_tools-no-LD_LIBRARY_PATH-extension.patch: do not change + LD_LIBRARY_PATH to include a directory that can be used by + malicious users. Fix bnc#642507. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- festival-no-LD_LIBRARY_PATH-extension.patch festival-safe-temp-file.patch speech_tools-no-LD_LIBRARY_PATH-extension.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ festival.spec ++++++ --- /var/tmp/diff_new_pack.cxd3h6/_old 2010-10-02 01:18:50.000000000 +0200 +++ /var/tmp/diff_new_pack.cxd3h6/_new 2010-10-02 01:18:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package festival (Version 1.96) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -21,11 +21,11 @@ Name: festival BuildRequires: gcc-c++ ncurses-devel pkgconfig Url: http://www.cstr.ed.ac.uk/projects/festival/ -License: BSD 3-Clause +License: BSD3c Group: Productivity/Text/Convertors AutoReqProv: on Version: 1.96 -Release: 121 +Release: 128 Summary: The Festival Speech Synthesis System Source0: festival-%{version}-beta.tar.bz2 Source1: speech_tools-1.2.96-beta.tar.bz2 @@ -42,6 +42,10 @@ Patch4: festival-1.95-libdir.patch Patch7: festival-1.95-audsp.patch Patch8: festival-1.96-chroot.patch +# PATCH-FIX-UPSTREAM festival-no-LD_LIBRARY_PATH-extension.patch bnc#642507 vuntz(a)opensuse.org -- Do not change LD_LIBRARY_PATH in binaries, to avoid any risks +Patch9: festival-no-LD_LIBRARY_PATH-extension.patch +# PATCH-FIX-UPSTREAM festival-safe-temp-file.patch bnc#642507 vuntz(a)opensuse.org -- Create temporary files in a safe way +Patch10: festival-safe-temp-file.patch # speech-tools patches Patch11: speech_tools-1.2.95-gcc4.patch Patch12: speech_tools-1.2.95-config.patch @@ -49,6 +53,8 @@ Patch14: speech_tools-1.2.95-returnvalue.patch Patch15: speech_tools-1.2.96-beta.patch Patch16: speech_tools-1.2.96-beta-const.patch +# PATCH-FIX-UPSTREAM speech_tools-no-LD_LIBRARY_PATH-extension.patch vuntz(a)opensuse.org -- Do not change LD_LIBRARY_PATH in binaries, to avoid any risks +Patch17: speech_tools-no-LD_LIBRARY_PATH-extension.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd @@ -59,16 +65,8 @@ techniques. It is written in C++ and has a Scheme-based command interpreter for general control. - - -Authors: --------- - Alan W Black <awb(a)cs.cmu.edu> - Rob Clark <robert(a)cstr.ed.ac.uk> - Korin Richmond <korin(a)cstr.ed.ac.uk> - %package devel -License: X11/MIT +License: MIT Summary: Development Package for Festival Group: Productivity/Text/Convertors AutoReqProv: on @@ -77,14 +75,6 @@ %description devel Files needed for developing software that uses Festival. - - -Authors: --------- - Alan W Black <awb(a)cs.cmu.edu> - Rob Clark <robert(a)cstr.ed.ac.uk> - Korin Richmond <korin(a)cstr.ed.ac.uk> - %prep %setup -q -b 1 -b 2 -b 3 -b 4 -q -n festival %patch0 @@ -94,6 +84,8 @@ %patch4 %patch7 %patch8 +%patch9 -p1 +%patch10 -p1 cd ../speech_tools #%patch11 -p1 %patch12 @@ -101,6 +93,7 @@ %patch14 -p1 %patch15 %patch16 +%patch17 -p1 %build # festival ++++++ festival-no-LD_LIBRARY_PATH-extension.patch ++++++ Index: festival/src/scripts/shared_script =================================================================== --- festival.orig/src/scripts/shared_script +++ festival/src/scripts/shared_script @@ -1,24 +1,5 @@ #!/bin/sh -# Festival shared script - -extend() { - var="$1" - extra="$2" - eval "val=\$$var" - - if [ -n "$val" ] - then - val="$extra:$val" - else - val="$extra" - fi - eval "$var='$val'" - eval "export $var" - } - -extend LD_LIBRARY_PATH "__EST__/lib:__LDPATH__" - exec __MAIN__/__PROGRAM__ "$@" exit 0 Index: festival/src/scripts/shared_setup_prl =================================================================== --- festival.orig/src/scripts/shared_setup_prl +++ /dev/null @@ -1,10 +0,0 @@ - -if (defined($ENV{LD_LIBRARY_PATH})) - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib:__LDPATH__:$ENV{LD_LIBRARY_PATH}"; - } -else - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib"; - } - Index: festival/src/scripts/shared_setup_sh =================================================================== --- festival.orig/src/scripts/shared_setup_sh +++ /dev/null @@ -1,20 +0,0 @@ - -# festival shared setup - -extend() { - var="$1" - extra="$2" - eval "val=\$$var" - - if [ -n "$val" ] - then - val="$extra:$val" - else - val="$extra" - fi - eval "$var='$val'" - eval "export $var" - } - -extend LD_LIBRARY_PATH "__EST__/lib:__LDPATH__" - ++++++ festival-safe-temp-file.patch ++++++ Index: festival/src/scripts/festival_server.sh =================================================================== --- festival.orig/src/scripts/festival_server.sh +++ festival/src/scripts/festival_server.sh @@ -210,14 +210,19 @@ trap "handle_term" 0 if $show then - create_server_startup $port $server_log /tmp/$$ 3>/dev/null + tmpfile=`mktemp -q` + if test $? -ne 0; then + echo "Error while getting configuration." + exit 1 + fi + create_server_startup $port $server_log "$tmpfile" 3>/dev/null fl=false while read l do if $fl ; then echo $l ; fi if [ "$l" = ";---" ] ; then fl=true ; fi - done </tmp/$$ - /bin/rm -f /tmp/$$ + done < "$tmpfile" + /bin/rm -f "$tmpfile" exit 0 fi ++++++ speech_tools-no-LD_LIBRARY_PATH-extension.patch ++++++ Index: speech_tools/scripts/shared_script =================================================================== --- speech_tools.orig/scripts/shared_script +++ speech_tools/scripts/shared_script @@ -1,24 +1,5 @@ #!/bin/sh -# EST shared script - -extend() { - var="$1" - extra="$2" - eval "val=\$$var" - - if [ -n "$val" ] - then - val="$extra:$val" - else - val="$extra" - fi - eval "$var='$val'" - eval "export $var" - } - -extend LD_LIBRARY_PATH "__LIB__:__LDPATH__" - exec __MAIN__/__PROGRAM__ "$@" exit 0 Index: speech_tools/scripts/shared_setup_prl =================================================================== --- speech_tools.orig/scripts/shared_setup_prl +++ /dev/null @@ -1,10 +0,0 @@ - -if (defined($ENV{LD_LIBRARY_PATH})) - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib:__LDPATH__:$ENV{LD_LIBRARY_PATH}"; - } -else - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib"; - } - Index: speech_tools/scripts/shared_setup_sh =================================================================== --- speech_tools.orig/scripts/shared_setup_sh +++ /dev/null @@ -1,20 +0,0 @@ - -# EST shared setup - -extend() { - var="$1" - extra="$2" - eval "val=\$$var" - - if [ -n "$val" ] - then - val="$extra:$val" - else - val="$extra" - fi - eval "$var='$val'" - eval "export $var" - } - -extend LD_LIBRARY_PATH "__TOP__/lib:__LDPATH__" - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 ggz-client-libs for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package ggz-client-libs for openSUSE:Factory checked in at Sat Oct 2 01:18:35 CEST 2010. -------- --- ggz-client-libs/ggz-client-libs.changes 2009-04-15 23:58:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/ggz-client-libs/ggz-client-libs.changes 2010-09-28 21:01:38.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 28 19:01:23 UTC 2010 - aj(a)suse.de + +- Recommend instead of require lang-package. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ggz-client-libs.spec ++++++ --- /var/tmp/diff_new_pack.hWx1uX/_old 2010-10-02 01:14:27.000000000 +0200 +++ /var/tmp/diff_new_pack.hWx1uX/_new 2010-10-02 01:14:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ggz-client-libs (Version 0.0.14.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -23,14 +23,14 @@ Name: ggz-client-libs Summary: The GGZ project makes free online gaming possible Version: 0.0.14.1 -Release: 60 -License: GPL v2 or later; LGPL v2.1 or later +Release: 67 +License: GPLv2+ ; LGPLv2.1+ Group: Amusements/Games/Other Source0: %{name}-%{version}.tar.bz2 Url: http://www.ggzgamingzone.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on -Requires: %{name}-lang = %{version} +Recommends: %{name}-lang %description The GGZ project makes free online gaming possible. @@ -38,7 +38,7 @@ %package devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: The GGZ project makes free online gaming possible Group: Amusements/Games/Other Requires: %{name} = %{version} libggz2-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lilo for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package lilo for openSUSE:Factory checked in at Sat Oct 2 01:14:15 CEST 2010. -------- --- lilo/lilo.changes 2010-08-31 01:26:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2010-09-30 11:04:09.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 30 09:02:39 UTC 2010 - stefan.fent(a)novell.com + +- add device-mapper and device-mapper-devel (respective -32 bit + for x86_64) to build with devicemapper supprt (bnc #642400) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.vZUPUF/_old 2010-10-02 01:13:07.000000000 +0200 +++ /var/tmp/diff_new_pack.vZUPUF/_new 2010-10-02 01:13:07.000000000 +0200 @@ -49,14 +49,20 @@ BuildRequires: bin86 BuildRequires: nasm %endif +%ifarch %ix86 +BuildRequires: device-mapper +BuildRequires: device-mapper-devel +%endif %ifarch x86_64 BuildRequires: glibc-devel-32bit %if 0%{?suse_version} > 1010 +BuildRequires: device-mapper-32bit +BuildRequires: device-mapper-devel-32bit BuildRequires: gcc-32bit %endif %endif Version: 22.8 -Release: 50 +Release: 51 Source0: lilo-ppc-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 Source86: lilo-%{version}.src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tftp for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package tftp for openSUSE:Factory checked in at Sat Oct 2 01:12:53 CEST 2010. -------- --- tftp/tftp.changes 2010-06-29 12:20:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/tftp/tftp.changes 2010-10-01 14:28:15.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 1 12:07:50 UTC 2010 - puzel(a)novell.com + +- add tftp-hpa-0.48-tzfix.patch (bnc#630297) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- tftp-hpa-0.48-tzfix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tftp.spec ++++++ --- /var/tmp/diff_new_pack.8N07X5/_old 2010-10-02 01:11:33.000000000 +0200 +++ /var/tmp/diff_new_pack.8N07X5/_new 2010-10-02 01:11:33.000000000 +0200 @@ -29,7 +29,7 @@ Requires: inet-daemon netcfg AutoReqProv: on Version: 0.48 -Release: 107 +Release: 110 Summary: Trivial File Transfer Protocol (TFTP) Source: tftp-hpa-git-%{version}.tar.bz2 Source1: tftp.xinetd @@ -38,6 +38,7 @@ Patch2: tftp-hpa-0.43_readline.diff Patch3: tftp-hpa-0.46_libedit.patch Patch4: tftp-hpa-0.49-fortify-strcpy-crash.patch +Patch5: tftp-hpa-0.48-tzfix.patch Patch42: tftp-hpa-0.43_old-autoconf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +60,7 @@ %patch2 %patch3 %patch4 -p1 +%patch5 -p1 %if 0%{?suse_version} < 1030 %patch42 %endif ++++++ tftp-hpa-0.48-tzfix.patch ++++++ Index: tftp-hpa-git-0.48/tftpd/tftpd.c =================================================================== --- tftp-hpa-git-0.48.orig/tftpd/tftpd.c +++ tftp-hpa-git-0.48/tftpd/tftpd.c @@ -350,6 +350,14 @@ int main(int argc, char **argv) #endif u_short tp_opcode; + time_t my_time = 0; + struct tm* p_tm; + char envtz[10]; + my_time = time(NULL); + p_tm = localtime(&my_time); + snprintf(envtz, sizeof(envtz) - 1, "UTC%+d", (p_tm->tm_gmtoff * -1)/3600); + setenv("TZ", envtz, 0); + /* basename() is way too much of a pain from a portability standpoint */ p = strrchr(argv[0], '/'); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at Sat Oct 2 00:46:45 CEST 2010. -------- --- libvirt/libvirt.changes 2010-08-07 06:24:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2010-09-28 22:27:52.000000000 +0200 @@ -1,0 +2,23 @@ +Tue Sep 28 14:20:32 MDT 2010 - jfehlig(a)novell.com + +- Fix build when virtualport support is available but macvtap is + disabled. + vport-configure.patch + +------------------------------------------------------------------- +Thu Sep 23 02:42:39 MDT 2010 - jfehlig(a)novell.com + +- Fix CDROM media change for Xen PV domains + modified xen-pv-cdrom.patch + bnc#636231 + +------------------------------------------------------------------- +Fri Sep 10 15:45:04 MDT 2010 - jfehlig(a)novell.com + +- Update to libvirt 0.8.4 + - various improvements to UML driver + - documentation improvements + - lot of bug fixes and other improvements + - enable ESX driver for openSUSE + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libvirt-0.8.3.tar.bz2 xen-tap2-support.patch New: ---- libvirt-0.8.4.tar.bz2 vport-configure.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.xP1sfZ/_old 2010-10-02 00:45:49.000000000 +0200 +++ /var/tmp/diff_new_pack.xP1sfZ/_new 2010-10-02 00:45:49.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libvirt (Version 0.8.3) +# spec file for package libvirt (Version 0.8.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ %define with_one 0 # hypervisor drivers that use a native remote protocol %define with_phyp 0 -%define with_esx 0 +%define with_esx 1 # host drivers %define with_network 1 %define with_storage_fs 1 @@ -45,6 +45,7 @@ %define with_hal 0 %define with_yajl 0 %define with_macvtap 0 +%define with_virtualport 0 # Xen is available only on i386 x86_64 %ifnarch %ix86 x86_64 @@ -114,13 +115,16 @@ %if %{with_macvtap} BuildRequires: libnl-devel %endif +%if %{with_esx} +BuildRequires: libcurl-devel +%endif # Only for directory ownership: BuildRequires: gtk-doc Url: http://libvirt.org/ License: LGPLv2.1+ Group: Development/Libraries/C and C++ AutoReqProv: yes -Version: 0.8.3 +Version: 0.8.4 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 @@ -145,13 +149,13 @@ Source0: %{name}-%{version}.tar.bz2 Source1: libvirtd.init # Upstream patches +Patch0: vport-configure.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch102: clone.patch Patch103: xen-pv-cdrom.patch Patch104: xen-domctl-ver7.patch -Patch105: xen-tap2-support.patch -Patch106: xend-disk-order.patch +Patch105: xend-disk-order.patch # Our patches Patch200: libvirtd-defaults.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -257,12 +261,12 @@ %prep %setup -q +%patch0 -p1 %patch100 -p1 %patch102 %patch103 -p1 %patch104 -p1 %patch105 -p1 -%patch106 -p1 %patch200 -p1 %build @@ -320,6 +324,9 @@ %if ! %{with_macvtap} %define _without_macvtap --without-macvtap %endif +%if ! %{with_virtualport} +%define _without_virtualport --without-virtualport +%endif autoreconf -f -i export CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static --with-pic \ @@ -342,6 +349,7 @@ %{?_without_udev} \ %{?_without_yajl} \ %{?_without_macvtap} \ + %{?_without_virtualport} \ --without-xen-proxy \ --libexecdir=%{_libdir}/%{name} \ --with-init-script=none \ ++++++ clone.patch ++++++ --- /var/tmp/diff_new_pack.xP1sfZ/_old 2010-10-02 00:45:49.000000000 +0200 +++ /var/tmp/diff_new_pack.xP1sfZ/_new 2010-10-02 00:45:49.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- src/lxc/lxc_container.c.orig +++ src/lxc/lxc_container.c -@@ -828,6 +828,9 @@ int lxcContainerStart(virDomainDefPtr de +@@ -831,6 +831,9 @@ int lxcContainerStart(virDomainDefPtr de lxc_child_argv_t args = { def, nveths, veths, control, ttyPath }; /* allocate a stack for the container */ @@ -12,7 +12,7 @@ if (VIR_ALLOC_N(stack, stacksize) < 0) { virReportOOMError(); return -1; -@@ -846,7 +849,11 @@ int lxcContainerStart(virDomainDefPtr de +@@ -849,7 +852,11 @@ int lxcContainerStart(virDomainDefPtr de flags |= CLONE_NEWNET; } @@ -24,7 +24,7 @@ VIR_FREE(stack); DEBUG("clone() completed, new container PID is %d", pid); -@@ -872,6 +879,7 @@ int lxcContainerAvailable(int features) +@@ -875,6 +882,7 @@ int lxcContainerAvailable(int features) char *childStack; char *stack; int childStatus; @@ -32,7 +32,7 @@ if (features & LXC_CONTAINER_FEATURE_USER) flags |= CLONE_NEWUSER; -@@ -879,14 +887,21 @@ int lxcContainerAvailable(int features) +@@ -882,14 +890,21 @@ int lxcContainerAvailable(int features) if (features & LXC_CONTAINER_FEATURE_NET) flags |= CLONE_NEWNET; ++++++ libvirt-0.8.3.tar.bz2 -> libvirt-0.8.4.tar.bz2 ++++++ libvirt/libvirt-0.8.3.tar.bz2 /mounts/work_src_done/STABLE/libvirt/libvirt-0.8.4.tar.bz2 differ: char 12, line 1 ++++++ libvirtd-defaults.patch ++++++ --- /var/tmp/diff_new_pack.xP1sfZ/_old 2010-10-02 00:45:49.000000000 +0200 +++ /var/tmp/diff_new_pack.xP1sfZ/_new 2010-10-02 00:45:49.000000000 +0200 @@ -1,7 +1,7 @@ -Index: libvirt-0.8.0/daemon/libvirtd.conf +Index: libvirt-0.8.4/daemon/libvirtd.conf =================================================================== ---- libvirt-0.8.0.orig/daemon/libvirtd.conf -+++ libvirt-0.8.0/daemon/libvirtd.conf +--- libvirt-0.8.4.orig/daemon/libvirtd.conf ++++ libvirt-0.8.4/daemon/libvirtd.conf @@ -18,8 +18,8 @@ # It is necessary to setup a CA and issue server certificates before # using this capability. @@ -28,11 +28,11 @@ # Override the default mDNS advertizement name. This must be # unique on the immediate broadcast network. -Index: libvirt-0.8.0/daemon/libvirtd.c +Index: libvirt-0.8.4/daemon/libvirtd.c =================================================================== ---- libvirt-0.8.0.orig/daemon/libvirtd.c -+++ libvirt-0.8.0/daemon/libvirtd.c -@@ -141,7 +141,7 @@ static int sigwrite = -1; /* Signa +--- libvirt-0.8.4.orig/daemon/libvirtd.c ++++ libvirt-0.8.4/daemon/libvirtd.c +@@ -142,7 +142,7 @@ static int sigwrite = -1; /* Signa static int ipsock = 0; /* -l Listen for TCP/IP */ /* Defaults for configuration file elements */ @@ -41,7 +41,7 @@ static int listen_tcp = 0; static char *listen_addr = (char *) LIBVIRTD_LISTEN_ADDR; static char *tls_port = (char *) LIBVIRTD_TLS_PORT; -@@ -163,7 +163,7 @@ static int auth_tcp = REMOTE_AUTH_NONE; +@@ -164,7 +164,7 @@ static int auth_tcp = REMOTE_AUTH_NONE; #endif static int auth_tls = REMOTE_AUTH_NONE; ++++++ vport-configure.patch ++++++ Rework configure logic for virtualport support V2: - added missing AC_ARG_WITH() for --with-virtualport In this patch I am reworking the logic around detecting virtual port support and requiring the libnl dependency. - It requires --with-macvtap and displays an error in case of --without-macvtap --with-virtualport. - It tests for availability of certain data in include files and displays an error in case the include file is not at the correct level and --with-virtualport was chosen - displays 'checking' messages for macvtap and virtualport support and results - libnl support is required when macvtap is found or requested; if libnl is not there, please supply without-macvtap Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> Index: libvirt-0.8.4/configure.ac =================================================================== --- libvirt-0.8.4.orig/configure.ac +++ libvirt-0.8.4/configure.ac @@ -2060,6 +2060,7 @@ AC_ARG_WITH([macvtap], [with_macvtap=${withval}], [with_macvtap=check]) +AC_MSG_CHECKING([whether to compile with macvtap support]) if test "$with_macvtap" != "no" ; then AC_TRY_COMPILE([ #include <sys/socket.h> #include <linux/rtnetlink.h> ], @@ -2077,19 +2078,35 @@ if test "$with_macvtap" != "no" ; then AC_DEFINE_UNQUOTED([WITH_MACVTAP], $val, [whether macvtap support is enabled]) fi AM_CONDITIONAL([WITH_MACVTAP], [test "$with_macvtap" = "yes"]) +AC_MSG_RESULT([$with_macvtap]) -AC_TRY_COMPILE([ #include <sys/socket.h> - #include <linux/rtnetlink.h> ], - [ int x = IFLA_PORT_MAX; ], - [ with_virtualport=yes ], - [ with_virtualport=no ]) -if test "$with_virtualport" = "yes"; then - val=1 -else - val=0 +AC_ARG_WITH([virtualport], + AC_HELP_STRING([--with-virtualport],[enable virtual port support @<:@default=check@:>@]), + [with_virtualport=${withval}], + [with_virtualport=check]) + +if test "$with_virtualport" != "no"; then + if test "$with_macvtap" = "no"; then + AC_MSG_ERROR([--with-virtualport requires --with-macvtap]) + fi + AC_MSG_CHECKING([whether to compile with virtual port support]) + AC_TRY_COMPILE([ #include <sys/socket.h> + #include <linux/rtnetlink.h> ], + [ int x = IFLA_PORT_MAX; ], + [ with_virtualport=yes ], + [ if test "$with_virtualport" = "yes" ; then + AC_MSG_ERROR([Installed linux headers don't show support for virtual port support.]) + fi + with_virtualport=no ]) + if test "$with_virtualport" = "yes"; then + val=1 + else + val=0 + fi + AC_DEFINE_UNQUOTED([WITH_VIRTUALPORT], $val, + [whether vsi vepa support is enabled]) + AC_MSG_RESULT([$with_virtualport]) fi -AC_DEFINE_UNQUOTED([WITH_VIRTUALPORT], $val, - [whether vsi vepa support is enabled]) AM_CONDITIONAL([WITH_VIRTUALPORT], [test "$with_virtualport" = "yes"]) @@ -2098,7 +2115,7 @@ dnl netlink library LIBNL_CFLAGS="" LIBNL_LIBS="" -if test "$with_macvtap" = "yes" || test "$with_virtualport" = "yes"; then +if test "$with_macvtap" = "yes"; then PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ ], [ AC_MSG_ERROR([libnl >= $LIBNL_REQUIRED is required for macvtap support]) ++++++ xen-name-for-devid.patch ++++++ --- /var/tmp/diff_new_pack.xP1sfZ/_old 2010-10-02 00:45:50.000000000 +0200 +++ /var/tmp/diff_new_pack.xP1sfZ/_new 2010-10-02 00:45:50.000000000 +0200 @@ -13,10 +13,10 @@ This approach allows removing a disk when domain is inactive. We obviously can't search xenstore when the domain is inactive. -Index: libvirt-0.8.1/src/xen/xend_internal.c +Index: libvirt-0.8.4/src/xen/xend_internal.c =================================================================== ---- libvirt-0.8.1.orig/src/xen/xend_internal.c -+++ libvirt-0.8.1/src/xen/xend_internal.c +--- libvirt-0.8.4.orig/src/xen/xend_internal.c ++++ libvirt-0.8.4/src/xen/xend_internal.c @@ -92,6 +92,7 @@ xenDaemonFormatSxprOnePCI(virDomainHostd static int @@ -25,7 +25,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -4178,7 +4179,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr +@@ -3964,7 +3965,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -34,7 +34,7 @@ /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); -@@ -4295,7 +4296,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr +@@ -4081,7 +4082,7 @@ xenDaemonUpdateDeviceFlags(virDomainPtr sexpr = virBufferContentAndReset(&buf); @@ -43,7 +43,7 @@ virXendError(VIR_ERR_OPERATION_INVALID, "%s", _("requested device does not exist")); goto cleanup; -@@ -4387,7 +4388,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr +@@ -4173,7 +4174,7 @@ xenDaemonDetachDeviceFlags(virDomainPtr def, xml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; @@ -52,7 +52,7 @@ goto cleanup; if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { -@@ -6135,6 +6136,7 @@ error: +@@ -5923,6 +5924,7 @@ error: */ static int virDomainXMLDevID(virDomainPtr domain, @@ -60,7 +60,7 @@ virDomainDeviceDefPtr dev, char *class, char *ref, -@@ -6143,27 +6145,33 @@ virDomainXMLDevID(virDomainPtr domain, +@@ -5931,8 +5933,12 @@ virDomainXMLDevID(virDomainPtr domain, xenUnifiedPrivatePtr priv = domain->conn->privateData; char *xref; char *tmp; @@ -73,6 +73,7 @@ if (dev->data.disk->driverName && STREQ(dev->data.disk->driverName, "tap")) strcpy(class, "tap"); +@@ -5942,19 +5948,21 @@ virDomainXMLDevID(virDomainPtr domain, else strcpy(class, "vbd"); ++++++ xen-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.xP1sfZ/_old 2010-10-02 00:45:50.000000000 +0200 +++ /var/tmp/diff_new_pack.xP1sfZ/_new 2010-10-02 00:45:50.000000000 +0200 @@ -1,16 +1,12 @@ -Index: libvirt-0.8.1/src/xen/xend_internal.c +Index: libvirt-0.8.4/src/xen/xend_internal.c =================================================================== ---- libvirt-0.8.1.orig/src/xen/xend_internal.c -+++ libvirt-0.8.1/src/xen/xend_internal.c -@@ -5545,7 +5545,10 @@ xenDaemonFormatSxprDisk(virConnectPtr co - } else if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { - virBufferVSprintf(buf, "(dev '%s:cdrom')", def->dst); - } else { -- virBufferVSprintf(buf, "(dev '%s')", def->dst); -+ if (def->device == VIR_DOMAIN_DISK_DEVICE_CDROM) -+ virBufferVSprintf(buf, "(dev '%s:cdrom')", def->dst); -+ else -+ virBufferVSprintf(buf, "(dev '%s')", def->dst); - } - - if (def->src) { +--- libvirt-0.8.4.orig/src/xen/xend_internal.c ++++ libvirt-0.8.4/src/xen/xend_internal.c +@@ -1422,7 +1422,6 @@ xenDaemonParseSxprDisks(virDomainDefPtr + /* There is a case without the uname to the CD-ROM device */ + offset = strchr(dst, ':'); + if (!offset || +- !hvm || + STRNEQ(offset, ":cdrom")) { + virXendError(VIR_ERR_INTERNAL_ERROR, + "%s", _("domain information incomplete, vbd has no src")); ++++++ xend-disk-order.patch ++++++ --- /var/tmp/diff_new_pack.xP1sfZ/_old 2010-10-02 00:45:50.000000000 +0200 +++ /var/tmp/diff_new_pack.xP1sfZ/_new 2010-10-02 00:45:50.000000000 +0200 @@ -1,8 +1,8 @@ -Index: libvirt-0.8.1/src/xen/xend_internal.c +Index: libvirt-0.8.4/src/xen/xend_internal.c =================================================================== ---- libvirt-0.8.1.orig/src/xen/xend_internal.c -+++ libvirt-0.8.1/src/xen/xend_internal.c -@@ -1616,20 +1616,24 @@ xenDaemonParseSxprDisks(virDomainDefPtr +--- libvirt-0.8.4.orig/src/xen/xend_internal.c ++++ libvirt-0.8.4/src/xen/xend_internal.c +@@ -1393,20 +1393,24 @@ xenDaemonParseSxprDisks(virDomainDefPtr const char *src = NULL; const char *dst = NULL; const char *mode = NULL; @@ -14,20 +14,20 @@ dst = sexpr_node(node, "device/vbd/dev"); mode = sexpr_node(node, "device/vbd/mode"); + bootable = sexpr_int(node, "device/vbd/bootable"); - } else if (sexpr_lookup(node, "device/tap")) { - src = sexpr_node(node, "device/tap/uname"); - dst = sexpr_node(node, "device/tap/dev"); - mode = sexpr_node(node, "device/tap/mode"); -+ bootable = sexpr_int(node, "device/tap/bootable"); - } else { + } else if (sexpr_lookup(node, "device/tap2")) { src = sexpr_node(node, "device/tap2/uname"); dst = sexpr_node(node, "device/tap2/dev"); mode = sexpr_node(node, "device/tap2/mode"); + bootable = sexpr_int(node, "device/tap2/bootable"); + } else { + src = sexpr_node(node, "device/tap/uname"); + dst = sexpr_node(node, "device/tap/dev"); + mode = sexpr_node(node, "device/tap/mode"); ++ bootable = sexpr_int(node, "device/tap/bootable"); } if (VIR_ALLOC(disk) < 0) -@@ -1754,7 +1758,12 @@ xenDaemonParseSxprDisks(virDomainDefPtr +@@ -1531,7 +1535,12 @@ xenDaemonParseSxprDisks(virDomainDefPtr if (VIR_REALLOC_N(def->disks, def->ndisks+1) < 0) goto no_memory; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 xkeyboard-config for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package xkeyboard-config for openSUSE:Factory checked in at Sat Oct 2 00:45:33 CEST 2010. -------- --- xkeyboard-config/xkeyboard-config.changes 2010-09-04 19:32:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/xkeyboard-config/xkeyboard-config.changes 2010-09-29 03:39:34.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 29 01:36:28 UTC 2010 - sndirsch(a)novell.com + +- xkeyboard-config 2.0 + * More layouts, more options. Updated translations. +- adjusted ibm_space_saver.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xkeyboard-config-1.9.tar.bz2 New: ---- xkeyboard-config-2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xkeyboard-config.spec ++++++ --- /var/tmp/diff_new_pack.UBtQQt/_old 2010-10-02 00:44:48.000000000 +0200 +++ /var/tmp/diff_new_pack.UBtQQt/_new 2010-10-02 00:44:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package xkeyboard-config (Version 1.9) +# spec file for package xkeyboard-config (Version 2.0 ) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,7 +27,7 @@ Provides: xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us PreReq: /bin/ln /bin/rm AutoReqProv: on -Version: 1.9 +Version: 2.0 Release: 1 Summary: The X Keyboard Extension Source: %name-%version.tar.bz2 ++++++ ibm_space_saver.diff ++++++ --- /var/tmp/diff_new_pack.UBtQQt/_old 2010-10-02 00:44:48.000000000 +0200 +++ /var/tmp/diff_new_pack.UBtQQt/_new 2010-10-02 00:44:48.000000000 +0200 @@ -1,7 +1,7 @@ --- rules/base.lists.part.orig 2010-09-04 18:41:55.000000000 +0200 +++ rules/base.lists.part 2010-09-04 19:04:39.000000000 +0200 @@ -73,6 +73,8 @@ - tm2030USB toshiba_s3000 trust trustda \ + toshiba_s3000 trust trustda \ unitekkb1925 yahoo +! $specialkbds = ibm_space_saver ++++++ xkeyboard-config-1.9.tar.bz2 -> xkeyboard-config-2.0.tar.bz2 ++++++ ++++ 52630 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 libtirpc for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package libtirpc for openSUSE:Factory checked in at Sat Oct 2 00:44:19 CEST 2010. -------- --- libtirpc/libtirpc.changes 2010-09-15 16:45:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/libtirpc/libtirpc.changes 2010-09-29 17:42:24.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 29 15:42:12 UTC 2010 - max(a)novell.com + +- Fix showmount -e hostname (bnc#633007). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtirpc.spec ++++++ --- /var/tmp/diff_new_pack.nNcb5N/_old 2010-10-02 00:43:39.000000000 +0200 +++ /var/tmp/diff_new_pack.nNcb5N/_new 2010-10-02 00:43:39.000000000 +0200 @@ -24,7 +24,7 @@ Group: System/Libraries AutoReqProv: on Version: 0.2.1_git201005272057 -Release: 2 +Release: 3 Summary: Transport Independent RPC Library Url: http://sourceforge.net/projects/libtirpc/ Source: %{name}-%{version}.tar.bz2 ++++++ libtirpc-getpmaphandle.patch ++++++ --- /var/tmp/diff_new_pack.nNcb5N/_old 2010-10-02 00:43:39.000000000 +0200 +++ /var/tmp/diff_new_pack.nNcb5N/_new 2010-10-02 00:43:39.000000000 +0200 @@ -85,7 +85,7 @@ + && strcmp(nconf->nc_proto, NC_TCP) != 0) goto try_rpcbind; + -+ client = getpmaphandle(nconf, IN4_LOCALHOST_STRING, &parms.r_addr); ++ client = getpmaphandle(nconf, host, &parms.r_addr); if (client == NULL) return (NULL); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nagios for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at Sat Oct 2 00:43:23 CEST 2010. -------- --- nagios/nagios.changes 2010-05-11 23:45:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/nagios/nagios.changes 2010-09-30 01:08:54.000000000 +0200 @@ -1,0 +2,112 @@ +Mon Sep 20 09:50:56 UTC 2010 - schneemann(a)b1-systems.de + +- removed unneeded filter "permissions-directory-setuid-bit" from + nagios-rpmlintrc + +------------------------------------------------------------------- +Tue Sep 7 06:43:37 UTC 2010 - schneemann(a)b1-systems.de + +- cleaned spec and sources, removed unused patches from source + +------------------------------------------------------------------- +Wed Sep 1 22:37:22 UTC 2010 - schneemann(a)b1-systems.de + +- reworked phone-home patch + +------------------------------------------------------------------- +Wed Sep 1 22:14:55 UTC 2010 - schneemann(a)b1-systems.de + +- Update to nagios 3.2.2, excerpt from changelog: +FIXES +* Fix for choosing next valid time on day of DST change when clocks go +one hour backwards +* Fix for nagios now erroring when "Error: Could not find any +contactgroup matching..." displayed +* Fix tap tests for Solaris 10 and newer versions of Test::Harness +* Fix for notifications not being sent out when scheduled downtime is +cancelled (Daniel Pouzzner) +* Fix for first notification delay being calculated incorrectly, and +notifications potentially going out early (Pawel Malachowski) +* Fix for text of scheduling downtime of all services on a host (Holger +Weiss) +* Fix for services inheriting notification period from hosts if not +defined (Gordon Messmer) +* Fix for incorrect service states on host failures (bug #130 Petya Kohts) +* Fix for incorrect service state attributes being set on host failures +(bug #128 Petya Kohts) +* Fix for non-scheduled hosts and services not being updated in NDOUtils +* Fix for incorrect host state counts in status CGI when viewing +servicegroups (bug #72) +* Fix for new Splunk integration query parameters (bug #136) +* Fix for extra field header in availability CSV export (bug #113) +* Fix for macro processing code modifying input string (Jochen Bern) +* Fix for event execution loop re-scheduling host checks instead of +executing them if service checks are disabled (bug #152) +* Fix for segfaults on Solaris (Torsten Huebler) +* Fix for incorrect comment expiration times being passed to event +broker (Mattieu Kermagot) + +------------------------------------------------------------------- +Thu Jul 15 20:56:09 UTC 2010 - lars(a)linux-schulserver.de + +- back to the old file permissions (once again for clean + nagios support) +- readded nonsense stuff again +- create/fix check_result_path if needed + +------------------------------------------------------------------- +Fri Jul 9 14:06:55 UTC 2010 - chris(a)computersalat.de + +- fix file/dir perms + o once again for centreon support +- spec mods + o sort TAGS + o added lost Authors (description) + o macros + o remove nonsense stuff + +------------------------------------------------------------------- +Thu Jun 24 10:16:35 UTC 2010 - lars(a)linux-schulserver.de + +- rebase phone-home patch + +------------------------------------------------------------------- +Tue Jun 22 09:00:37 UTC 2010 - lars(a)linux-schulserver.de + +- recommend nagios-plugins only to avoid buildcycles + +------------------------------------------------------------------- +Fri Jun 18 01:16:09 UTC 2010 - lars(a)linux-schulserver.de + +- fix init script: touch files if they do not exist- + +------------------------------------------------------------------- +Fri May 28 05:03:43 UTC 2010 - lars(a)linux-schulserver.de + +- disable patch8 - needs rebasing +- install PIDDIR if it's not /var/run to avoid owner problems + during start +- always change ownership of standard files to the right values + +------------------------------------------------------------------- +Mon May 24 16:30:36 UTC 2010 - lars(a)linux-schulserver.de + +- fix 'Schedule downtime for this host and all services' behavior + (http://tracker.nagios.org/view.php?id=133) +- fix typos resulting in non used style declarations + (http://tracker.nagios.org/view.php?id=150) +- fix deleting comments from the hashlist + (http://tracker.nagios.org/view.php?id=80) +- rebase nagios-p1.pl-location.patch +- fix a handful compiler warnings +- do not allow nagios to phone home: disable online_update_checks +- fix command-group +- BuildRequire net-tools for enabling WAP + +------------------------------------------------------------------- +Fri May 14 12:51:20 UTC 2010 - lars(a)linux-schulserver.de + +- check_verbose now always prints the resulting logfile - this + allows to see the warnings + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nagios-3.2.1.tar.bz2 New: ---- nagios-3.2.1-delete_correct_comment.patch nagios-3.2.2.tar.bz2 nagios-disable_phone_home.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.738XYj/_old 2010-10-02 00:32:33.000000000 +0200 +++ /var/tmp/diff_new_pack.738XYj/_new 2010-10-02 00:32:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package nagios (Version 3.2.1) +# spec file for package nagios (Version 3.2.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,12 +18,6 @@ Name: nagios -Version: 3.2.1 -Release: 3 -Summary: The Nagios Network Monitor -Url: http://www.nagios.org/ -Group: System/Monitoring -License: GPLv2+ %define nsusr nagios %define nsgrp nagios %define cmdusr wwwrun @@ -33,6 +27,12 @@ %define apache2_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)/conf.d # Macro that print mesages to syslog at package (un)install time %define nnmmsg logger -t %{name}/rpm +Summary: The Nagios Network Monitor +Version: 3.2.2 +Release: 1 +License: GPLv2+ +Group: System/Monitoring +Url: http://www.nagios.org/ Source0: %{name}-%{version}.tar.bz2 Source1: rc%{name} Source2: %{name}-rpmlintrc @@ -40,6 +40,7 @@ Source4: suse.de-nagios Source5: nagios.8 Source6: nagiosstats.8 +# Source10: %{name}-README.SuSE # PATCH-FIX-UPSTREAM fix for missing expression in return statement bnc#395203 Patch1: nagios.run_async_service_check.return.patch @@ -49,8 +50,21 @@ Patch3: nagios-fix_encoding_trends.cgi.patch # PATCH-FIX-UPSTREAM Fixes handling of forced checks Patch4: nagios-fix_forced_servicechecks.patch +# PATCH-FIX-UPSTREAM deleting comments removed more elements from the hashlist than it should (http://tracker.nagios.org/view.php?id=80) +Patch7: nagios-3.2.1-delete_correct_comment.patch # PATCH-FIX-OPENSUSE openSUSE uses a special location for p1.pl Patch10: nagios-p1.pl-location.patch +# PATCH-FIX-OPENSUSE disable Nagios online update checks for distributed packages +Patch11: nagios-disable_phone_home.patch +# +BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: /bin/logger +PreReq: coreutils +PreReq: grep +PreReq: pwdutils +PreReq: sed BuildRequires: apache2-devel BuildRequires: freetype2-devel BuildRequires: gd-devel @@ -60,16 +74,8 @@ BuildRequires: mailx BuildRequires: openssl-devel BuildRequires: pcre-devel +BuildRequires: net-tools BuildRequires: zlib-devel -PreReq: %fillup_prereq -PreReq: %insserv_prereq -PreReq: /bin/logger -PreReq: coreutils -PreReq: grep -PreReq: pwdutils -PreReq: sed -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} < 1010 BuildRequires: XFree86-devel BuildRequires: XFree86-libs @@ -78,15 +84,17 @@ %else BuildRequires: libapr-util1-devel BuildRequires: xorg-x11-devel -Recommends: %{name}-www Recommends: cron +Recommends: %{name}-www # we enable nagios embedded perl, but if people disable it... Recommends: perl = %{perl_version} %endif %if 0%{?suse_version} > 1020 BuildRequires: fdupes -%endif +Recommends: %{name}-plugins +%else Requires: %{name}-plugins +%endif Requires: mailx %description @@ -104,6 +112,12 @@ This package provide core programs for nagios. The web interface, documentation, and development files are built as separate packages + + +Authors: +-------- + Ethan Galstad <nagios(a)nagios.org> + %package www License: GPLv2+ Summary: Provides the HTML and CGI files for the Nagios web interface @@ -116,9 +130,7 @@ PreReq: pwdutils PreReq: sed Requires: %{name} = %{version} -Requires: gd -Requires: mod_php_any -Requires: php5 +Requires: gd php5 mod_php_any %description www Nagios is a program that will monitor hosts and services on your @@ -134,6 +146,12 @@ for the Nagios web interface. In addition, HTML documentation is included in this package. + + +Authors: +-------- + Ethan Galstad <nagios(a)nagios.org> + %package devel License: GPLv2+ Summary: Development files for nagios @@ -152,13 +170,22 @@ This package provides include files that Nagios-related applications may compile against. + + +Authors: +-------- + Ethan Galstad <nagios(a)nagios.org> + + %prep -%setup -q +%setup -q -n %{name}-%{version} %patch1 -p1 %patch2 -p0 %patch3 -p0 %patch4 -p0 -%patch10 +%patch7 -p1 +%patch10 -p0 +%patch11 -p0 find -name ".cvsignore" | xargs rm find -name ".gitignore" | xargs rm # fix p1.pl pathname of mini_epn @@ -186,7 +213,7 @@ --with-nagios-user=%{nsusr} \ --with-nagios-group=%{nsgrp} \ --with-command-user=%{cmdusr} \ - --with-command-grp=%{cmdgrp} \ + --with-command-group=%{cmdgrp} \ --with-gd-lib=%{_libdir} \ --with-gd-inc=%{_includedir} \ --with-template-objects \ @@ -226,7 +253,7 @@ popd 1>/dev/null %install -mkdir -p %{buildroot}%{_localstatedir}/log/%name/archives +mkdir -p %{buildroot}%{_localstatedir}/log/%{name}/archives mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%apache2_sysconfdir/ mkdir -p %{buildroot}%nslockfile_dir @@ -234,22 +261,22 @@ DESTDIR=%{buildroot} \ INSTALL_OPTS="" \ COMMAND_OPTS="" \ - CGICFGDIR="%{_sysconfdir}/%name" \ + CGICFGDIR="%{_sysconfdir}/%{name}" \ INIT_OPTS="" %{__make} install -C contrib \ DESTDIR=%{buildroot} \ INSTALL_OPTS="" # install event handlers -%{__install} -d -m0755 %{buildroot}%{_prefix}/lib/%name/plugins/eventhandlers/ -%{__cp} -afpv contrib/eventhandlers/* %{buildroot}%{_prefix}/lib/%name/plugins/eventhandlers/ +%{__install} -d -m0755 %{buildroot}%{_prefix}/lib/%{name}/plugins/eventhandlers/ +%{__cp} -afpv contrib/eventhandlers/* %{buildroot}%{_prefix}/lib/%{name}/plugins/eventhandlers/ # install directory for event brokers like ndoutils -%{__install} -d -m0755 %{buildroot}%{_prefix}/lib/%name/brokers +%{__install} -d -m0755 %{buildroot}%{_prefix}/lib/%{name}/brokers # install headers for development package -%{__install} -d -m0755 %{buildroot}%{_includedir}/%name/ +%{__install} -d -m0755 %{buildroot}%{_includedir}/%{name}/ pushd include for file in *.h; do if test "x${file}" != "xconfig.h" -a "x${file}" != "xsnprintf.h" -a "x${file}" != "xcgiutils.h" ; then - install -m 644 $file %{buildroot}%{_includedir}/%name/ + install -m 644 $file %{buildroot}%{_includedir}/%{name}/ fi; done popd @@ -258,35 +285,33 @@ # find sample-config/ -name "*.in" -exec rm {} \; find sample-config/ -name "*.in.orig" -exec rm {} \; -sed -e 's|command_file=.*|command_file=/var/spool/%name/nagios.cmd|g' \ +sed -e 's|command_file=.*|command_file=/var/spool/%{name}/nagios.cmd|g' \ -e 's|log_file=/var/lib/nagios/nagios.log|log_file=/var/log/nagios/nagios.log|g' \ -e 's|log_archive_path=/var/lib/nagios/archives|log_archive_path=/var/log/nagios/archives|g' \ -e 's|^lock_file=.*|lock_file=%nslockfile|g' \ - %{buildroot}%{_sysconfdir}/%name/nagios.cfg > %{buildroot}%{_sysconfdir}/%name/nagios.cfg.tmp -mv %{buildroot}%{_sysconfdir}/%name/nagios.cfg.tmp %{buildroot}%{_sysconfdir}/%name/nagios.cfg + %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg > %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg.tmp +mv %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg.tmp %{buildroot}%{_sysconfdir}/%{name}/nagios.cfg # # install SuSE specials # # README.SuSE file -sed -e 's@DATADIR@%{_datadir}/%name@g' -e 's@SYSCONFDIR@%{_sysconfdir}/%name@g' %{SOURCE10} > %_builddir/%name-%version/README.SuSE +sed -e 's@DATADIR@%{_datadir}/%{name}@g' -e 's@SYSCONFDIR@%{_sysconfdir}/%{name}@g' %{S:10} > %_builddir/%{name}-%version/README.SuSE # init-script -%{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%name -ln -sf ../../etc/init.d/%name %{buildroot}%{_sbindir}/rc%name +%{__install} -D -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name} +ln -sf ../../etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} # sysconfig script -%{__install} -D -m 0644 %{S:3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%name +%{__install} -D -m 0644 %{S:3} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} # install cronjob (gzip' the logfiles) -%{__install} -D -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/cron.weekly/%name +%{__install} -D -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name} # important ghost files -touch %{buildroot}%{_sysconfdir}/%name/htpasswd.users -touch %{buildroot}%{_localstatedir}/lib/%name/retention.dat -touch %{buildroot}%{_localstatedir}/lib/%name/status.dat -touch %{buildroot}%{_localstatedir}/log/%name/config.err +touch %{buildroot}%{_sysconfdir}/%{name}/htpasswd.users +touch %{buildroot}%{_localstatedir}/lib/%{name}/retention.dat +touch %{buildroot}%{_localstatedir}/lib/%{name}/status.dat +touch %{buildroot}%{_localstatedir}/log/%{name}/config.err touch %{buildroot}%nslockfile # install manpages -install -Dm644 %{SOURCE5} %{buildroot}%{_mandir}/man8/%{name}.8 -install -Dm644 %{SOURCE6} %{buildroot}%{_mandir}/man8/nagiosstats.8 -# resource.cfg can contain passwords -chmod 0640 %{buildroot}%{_sysconfdir}/%name/resource.cfg +install -Dm644 %{S:5} %{buildroot}%{_mandir}/man8/%{name}.8 +install -Dm644 %{S:6} %{buildroot}%{_mandir}/man8/nagiosstats.8 # some rpmlint stuff %if 0%{?suse_version} > 1020 %fdupes -s %{buildroot} @@ -328,9 +353,9 @@ if [ ${1:-0} -gt 1 ]; then # in the past, group www was used as cmdgrp - now we use the default: nagcmd if id -Gn %{nsusr} 2>/dev/null | grep -q %{cmdgrp} >/dev/null 2>&1 ; then - : # %nsusr is already in %cmdgrp group + : # %{nsusr} is already in %cmdgrp group else - # Add %nsusr to %cmdgrp. + # Add %{nsusr} to %cmdgrp. groupmod -A %{nsusr} %{cmdgrp} 2>/dev/null %{nnmmsg} "Added %{nsusr} to %{cmdgrp}" fi @@ -453,8 +478,6 @@ %exclude %{_prefix}/lib/%name/cgi/* %{_sbindir}/convertcfg %{_sbindir}/mini_epn -%attr(0750,root,%{cmdgrp}) %{_sbindir}/%{name} -%attr(0750,root,%{cmdgrp}) %{_sbindir}/nagiostats %{_sbindir}/new_mini_epn %{_sbindir}/rc%name # defattr change @@ -471,18 +494,20 @@ %attr(0644,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %nslockfile %attr(0600,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%name/retention.dat %attr(0664,%nsusr,%nsgrp) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/%name/status.dat +%attr(0750,root,%{cmdgrp}) %{_sbindir}/%{name} +%attr(0750,root,%{cmdgrp}) %{_sbindir}/nagiostats %files www %defattr(755,root,root) -%{_prefix}/lib/%name/cgi/* +%{_prefix}/lib/%{name}/cgi/* # defattr change %defattr(-,root,root) -%{_datadir}/%name/ -%config(noreplace) %{apache2_sysconfdir}/%name.conf -%attr(0640,root,%cmdgrp) %ghost %config(missingok,noreplace) %{_sysconfdir}/%name/htpasswd.users +%{_datadir}/%{name}/ +%config(noreplace) %{apache2_sysconfdir}/%{name}.conf +%attr(0640,root,%cmdgrp) %ghost %config(missingok,noreplace) %{_sysconfdir}/%{name}/htpasswd.users %files devel %defattr(-,root,root) -%{_includedir}/%name/ +%{_includedir}/%{name}/ %changelog ++++++ nagios-3.2.1-delete_correct_comment.patch ++++++ Index: nagios-3.2.1/common/comments.c =================================================================== --- nagios-3.2.1.orig/common/comments.c +++ nagios-3.2.1/common/comments.c @@ -201,7 +201,10 @@ int delete_comment(int type, unsigned lo if(last_hash) last_hash->nexthash=this_hash->nexthash; else - comment_hashlist[hashslot]=NULL; + if(this_hash->nexthash) + comment_hashlist[hashslot]=this_hash->nexthash; + else + comment_hashlist[hashslot]=NULL; break; } last_hash=this_hash; ++++++ nagios-3.2.1.tar.bz2 -> nagios-3.2.2.tar.bz2 ++++++ ++++ 5063 lines of diff (skipped) ++++++ nagios-disable_phone_home.patch ++++++ --- base/utils.c.orig 2010-09-02 00:33:38.000000000 +0200 +++ base/utils.c 2010-09-02 00:35:14.000000000 +0200 @@ -4450,131 +4450,14 @@ /* checks for updates at api.nagios.org */ int query_update_api(void){ - char *api_server="api.nagios.org"; - char *api_path="/versioncheck/"; - char *api_query=NULL; - char *api_query_opts=NULL; - char *buf=NULL; - char recv_buf[1024]; - int report_install=FALSE; - int result=OK; - char *ptr=NULL; - int current_line=0; - int buf_index=0; - int in_header=TRUE; - char *var=NULL; - char *val=NULL; - int sd=0; - int send_len=0; - int recv_len=0; int update_check_succeeded=FALSE; - /* report a new install, upgrade, or rollback */ - /* Nagios monitors the world and we monitor Nagios taking over the world. :-) */ - if(last_update_check==(time_t)0L) - report_install=TRUE; - if(last_program_version==NULL || strcmp(PROGRAM_VERSION,last_program_version)) - report_install=TRUE; - if(report_install==TRUE){ - asprintf(&api_query_opts,"&firstcheck=1"); - if(last_program_version!=NULL) - asprintf(&api_query_opts,"%s&last_version=%s",api_query_opts,last_program_version); - } - - /* generate the query */ - asprintf(&api_query,"v=1&product=nagios&tinycheck=1&stableonly=1&uid=%lu",update_uid); - if(bare_update_check==FALSE) - asprintf(&api_query,"%s&version=%s%s",api_query,PROGRAM_VERSION,(api_query_opts==NULL)?"":api_query_opts); - - /* generate the HTTP request */ - asprintf(&buf,"POST %s HTTP/1.0\r\n",api_path); - asprintf(&buf,"%sUser-Agent: Nagios/%s\r\n",buf,PROGRAM_VERSION); - asprintf(&buf,"%sConnection: close\r\n",buf); - asprintf(&buf,"%sHost: %s\r\n",buf,api_server); - asprintf(&buf,"%sContent-Type: application/x-www-form-urlencoded\r\n",buf); - asprintf(&buf,"%sContent-Length: %d\r\n",buf,strlen(api_query)); - asprintf(&buf,"%s\r\n",buf); - asprintf(&buf,"%s%s\r\n",buf,api_query); - - /* - printf("SENDING...\n"); - printf("==========\n"); - printf("%s",buf); - printf("\n"); - */ - - - result=my_tcp_connect(api_server,80,&sd,2); - /*printf("CONN RESULT: %d, SD: %d\n",result,sd);*/ - if(sd>0){ - - /* send request */ - send_len=strlen(buf); - result=my_sendall(sd,buf,&send_len,2); - /*printf("SEND RESULT: %d, SENT: %d\n",result,send_len);*/ - - /* get response */ - recv_len=sizeof(recv_buf); - result=my_recvall(sd,recv_buf,&recv_len,2); - recv_buf[sizeof(recv_buf)-1]='\x0'; - /*printf("RECV RESULT: %d, RECEIVED: %d\n",result,recv_len);*/ - - /* - printf("\n"); - printf("RECEIVED...\n"); - printf("===========\n"); - printf("%s",recv_buf); - printf("\n"); - */ - - /* close connection */ - close(sd); - - /* parse the result */ - in_header=TRUE; - while((ptr=get_next_string_from_buf(recv_buf,&buf_index,sizeof(recv_buf)))){ - - strip(ptr); - current_line++; - - if(!strcmp(ptr,"")){ - in_header=FALSE; - continue; - } - if(in_header==TRUE) - continue; - - var=strtok(ptr,"="); - val=strtok(NULL,"\n"); - /*printf("VAR: %s, VAL: %s\n",var,val);*/ - - if(!strcmp(var,"UPDATE_AVAILABLE")){ - update_available=atoi(val); - /* we were successful */ - update_check_succeeded=TRUE; - } - else if(!strcmp(var,"UPDATE_VERSION")){ - if(new_program_version) - my_free(new_program_version); - new_program_version=strdup(val); - } - else if(!strcmp(var,"UPDATE_RELEASEDATE")){ - } - } - } - - /* cleanup */ - my_free(buf); - my_free(api_query); - my_free(api_query_opts); + update_check_succeeded=TRUE; /* we were successful! */ if(update_check_succeeded==TRUE){ time(&last_update_check); - if(last_program_version) - free(last_program_version); - last_program_version=(char *)strdup(PROGRAM_VERSION); } return OK; ++++++ nagios-p1.pl-location.patch ++++++ --- /var/tmp/diff_new_pack.738XYj/_old 2010-10-02 00:32:34.000000000 +0200 +++ /var/tmp/diff_new_pack.738XYj/_new 2010-10-02 00:32:34.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- Makefile.in.orig +++ Makefile.in -@@ -24,6 +24,7 @@ +@@ -25,6 +25,7 @@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ CHECKRESULTDIR=@CHECKRESULTDIR@ CFGDIR=@sysconfdir@ @@ -10,7 +10,7 @@ BINDIR=@bindir@ CGIDIR=@sbindir@ LIBEXECDIR=@libexecdir@ -@@ -190,7 +191,7 @@ +@@ -219,7 +220,7 @@ install-basic: $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) if [ $(INSTALLPERLSTUFF) = yes ]; then \ @@ -23,7 +23,7 @@ =================================================================== --- configure.in.orig +++ configure.in -@@ -16,6 +16,7 @@ +@@ -16,6 +16,7 @@ PKG_REL_DATE="03-09-2010" dnl Figure out how to invoke "install" and what install options to use. AC_PROG_INSTALL AC_SUBST(INSTALL) @@ -46,7 +46,7 @@ =================================================================== --- sample-config/nagios.cfg.in.orig +++ sample-config/nagios.cfg.in -@@ -1047,7 +1047,7 @@ +@@ -1114,7 +1114,7 @@ date_format=us # embedded Perl interpreter) is located. If you didn't compile # Nagios with embedded Perl support, this option has no effect. ++++++ nagios-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.738XYj/_old 2010-10-02 00:32:34.000000000 +0200 +++ /var/tmp/diff_new_pack.738XYj/_new 2010-10-02 00:32:34.000000000 +0200 @@ -1,8 +1,10 @@ # common.css is used in cgi - and can be expanded by user addFilter("zero-length.*/usr/share/nagios/stylesheets/common.css"); # we need xntp for SLES9 -addFilter("init-script-non-var-dependency /etc/init.d/nagios xntpd"); +addFilter("init-script-non-var-dependency.*/etc/init.d/nagios xntpd"); # nagios comes with embedded perl -addFilter("W: no-dependency-on perl") +addFilter("no-dependency-on.*perl") # this is the directory, where users of the group nagcmd can trigger commands for nagios -addFilter("permissions-directory-setuid-bit.*/var/spool/nagios"); +#addFilter("permissions-directory-setuid-bit.*/var/spool/nagios"); +# The name of that package is used since years - no need to change it for this new 'policy' +addFilter("name-repeated-in-summary.*Nagios") ++++++ rcnagios ++++++ --- /var/tmp/diff_new_pack.738XYj/_old 2010-10-02 00:32:34.000000000 +0200 +++ /var/tmp/diff_new_pack.738XYj/_new 2010-10-02 00:32:34.000000000 +0200 @@ -39,13 +39,25 @@ # Read config and log errors in logfile function config_check () { - $NAGIOS_BIN -v "$NAGIOS_CFG" >/dev/null 2>&1 - if [ $? -eq 0 ]; then - return 0 - else - $NAGIOS_BIN -v "$NAGIOS_CFG" >"$NAGIOS_CFG_ERR_LOG" 2>&1 - return 1 - fi + case "$1" in + verbose) + $NAGIOS_BIN -v "$NAGIOS_CFG" >"$NAGIOS_CFG_ERR_LOG" 2>&1 + if [ $? -eq 0 ]; then + return 0 + else + return 1 + fi + ;; + *) + $NAGIOS_BIN -v "$NAGIOS_CFG" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + return 0 + else + $NAGIOS_BIN -v "$NAGIOS_CFG" >"$NAGIOS_CFG_ERR_LOG" 2>&1 + return 1 + fi + ;; + esac } # grab a config option @@ -66,11 +78,17 @@ test -f "$file" && rm -f "$file" done # set default access rights for files and directories - for file in "$check_result_path" "$log_file" "$state_retention_file" "$status_file"; do - if [ -e "$file" ]; then + for file in "$log_file" "$state_retention_file" "$status_file"; do + if [ ! -e "$file" ]; then touch "$file" - chown $nagios_user:$nagios_cmdgrp "$file" fi + chown $nagios_user:$nagios_cmdgrp "$file" + done + for dir in "$check_result_path" ; do + if [ ! -d "$dir" ]; then + mkdir -p "$dir" + fi + chown $nagios_user:$nagios_cmdgrp "$dir" done chmod 660 "$resource_file" chown $nagios_user:$nagios_cmdgrp "$resource_file" @@ -92,7 +110,7 @@ fi ;; *) - test -d $(dirname "$NAGIOS_PIDFILE") || install -d -m755 -o$nagios_user -g$nagios_cmdgrp $(dirname "$NAGIOS_PIDFILE") + install -d -m755 -o$nagios_user -g$nagios_cmdgrp $(dirname "$NAGIOS_PIDFILE") esac } @@ -172,7 +190,7 @@ sleep 2 fi check_files - check_lock_file + check_lock_file startproc $NICELEVEL -p "$lock_file" "$NAGIOS_BIN" -d "$NAGIOS_CFG" else echo "Error in configuration - please read $NAGIOS_CFG_ERR_LOG" @@ -245,27 +263,29 @@ checkproc -p "$lock_file" "$NAGIOS_BIN" rc_status -v ;; - check|check_verbose) - echo -n "Running configuration check... " + check) + echo -n "Starting configuration check " config_check if [ $? -eq 0 ]; then - echo -n "- Passed configuration check" - test -f "$NAGIOS_CFG_ERR_LOG" && rm "$NAGIOS_CFG_ERR_LOG" + echo "- passed configuration check" + test -f $NAGIOS_CFG_ERR_LOG && rm $NAGIOS_CFG_ERR_LOG rc_reset else - echo "- Error in configuration files" - case "$1" in - check_verbose) - cat "$NAGIOS_CFG_ERR_LOG" - ;; - *) - echo "Please read $NAGIOS_CFG_ERR_LOG" - ;; - esac + echo "- detected Error in configuration files" + echo "Please read $NAGIOS_CFG_ERR_LOG" rc_failed fi rc_status -v ;; + check_verbose) + echo "Running verbose configuration check..." + config_check verbose + exitcode=$? + cat "$NAGIOS_CFG_ERR_LOG" + rc_failed $exitcode + rc_status -v + rc_exit + ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|reload|check|check_verbose}" exit 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libfprint for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package libfprint for openSUSE:Factory checked in at Sat Oct 2 00:15:54 CEST 2010. -------- --- libfprint/libfprint.changes 2010-08-09 14:14:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/libfprint/libfprint.changes 2010-09-29 12:43:25.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 29 12:43:15 CEST 2010 - ro(a)suse.de + +- install examples correctly + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libfprint-install_examples.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libfprint.spec ++++++ --- /var/tmp/diff_new_pack.ef7Qrb/_old 2010-10-02 00:15:27.000000000 +0200 +++ /var/tmp/diff_new_pack.ef7Qrb/_new 2010-10-02 00:15:27.000000000 +0200 @@ -24,7 +24,7 @@ Group: Development/Libraries/C and C++ PreReq: %fillup_prereq Version: 0.1.0 -Release: 1 +Release: 2 %define _version 0.1.0-pre2 Summary: Library for fingerprint reader support BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +47,7 @@ Patch16: libfprint-0.1.0~pre2+upeke2driver.diff Patch17: libfprint-upeke2_6stage.diff Patch20: libfprint-enroll_retcode.patch +Patch21: libfprint-install_examples.patch Source99: baselibs.conf %description @@ -114,6 +115,7 @@ %patch15 %patch17 %patch20 +%patch21 %build autoreconf -fi @@ -128,8 +130,7 @@ %install make install DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/%{_bindir} -install -m 755 examples/enroll examples/verify examples/verify_live examples/img_capture $RPM_BUILD_ROOT/%{_bindir} +make -C examples install DESTDIR=$RPM_BUILD_ROOT %post -n libfprint0 -p /sbin/ldconfig ++++++ libfprint-install_examples.patch ++++++ --- examples/Makefile.am +++ examples/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = -I$(top_srcdir) -noinst_PROGRAMS = verify_live enroll verify img_capture +bin_PROGRAMS = verify_live enroll verify img_capture verify_live_SOURCES = verify_live.c verify_live_LDADD = ../libfprint/libfprint.la @@ -14,7 +14,7 @@ img_capture_LDADD = ../libfprint/libfprint.la if BUILD_X11_EXAMPLES -noinst_PROGRAMS += img_capture_continuous +noinst_PROGRAMS = img_capture_continuous img_capture_continuous_CFLAGS = $(X_CFLAGS) $(XV_CFLAGS) img_capture_continuous_SOURCES = img_capture_continuous.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libgpod for openSUSE:Factory
by root＠hilbert.suse.de 01 Oct '10

01 Oct '10

Hello community, here is the log from the commit of package libgpod for openSUSE:Factory checked in at Sat Oct 2 00:15:10 CEST 2010. -------- --- GNOME/libgpod/libgpod.changes 2010-09-11 20:14:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/libgpod/libgpod.changes 2010-09-30 21:51:44.000000000 +0200 @@ -1,0 +2,22 @@ +Thu Sep 30 14:51:22 CDT 2010 - gburt(a)suse.de + +- Don't require libimobiledevice on older distros + +------------------------------------------------------------------- +Thu Sep 30 18:36:52 CEST 2010 - vuntz(a)opensuse.org + +- Update to version 0.7.95: + + Improvements to the generation of the sqlite databases (used by + iOS devices), in particular improved playcounts handling. + + Bug fixes and playlist support for mono bindings + + Small itdb_start_sync/itdb_stop_sync behaviour change, now the + calls need to be paired, but itdb_start_sync can be called N + times, and the "Sync in Progress" screen will only go away + after the Nth call to itdb_stop_sync + + Be more smart when auto-guessing whether to use iPod_Control or + iTunes_Control + + Improve error handling in itdb_init and itdb_write, before that + there were error cases that were not properly reported to the + caller + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libgpod-0.7.94.tar.bz2 New: ---- libgpod-0.7.95.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgpod.spec ++++++ --- /var/tmp/diff_new_pack.Mz4J04/_old 2010-10-02 00:14:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Mz4J04/_new 2010-10-02 00:14:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libgpod (Version 0.7.94) +# spec file for package libgpod (Version 0.7.95) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,8 +19,8 @@ Name: libgpod -Version: 0.7.94 -Release: 3 +Version: 0.7.95 +Release: 1 Url: http://www.gtkpod.org/libgpod.html Group: System/Libraries License: LGPLv2.1+ @@ -36,7 +36,9 @@ BuildRequires: hal-devel %endif BuildRequires: intltool +%if 0%{?suse_version} >= 1130 BuildRequires: libimobiledevice-devel +%endif BuildRequires: libplist-devel BuildRequires: libusb-devel BuildRequires: libxml2-devel ++++++ libgpod-0.7.94.tar.bz2 -> libgpod-0.7.95.tar.bz2 ++++++ ++++ 3655 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