July 2014 - openSUSE Commits - openSUSE Mailing Lists

commit Mesa for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2014-07-31 10:04:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "Mesa" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2014-07-29 21:21:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2014-07-31 10:04:08.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 29 16:58:23 CEST 2014 - tiwai(a)suse.de + +- Reduce error log level for annoying dlopen messages (bnc#889391) + U_mesa-glx-Reduce-error-log-level.patch + +------------------------------------------------------------------- New: ---- U_mesa-glx-Reduce-error-log-level.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.nQeNxR/_old 2014-07-31 10:04:10.000000000 +0200 +++ /var/tmp/diff_new_pack.nQeNxR/_new 2014-07-31 10:04:10.000000000 +0200 @@ -149,6 +149,7 @@ Patch13: u_mesa-8.0.1-fix-16bpp.patch # Patch from Fedora, use shmget when available, under llvmpipe Patch15: u_mesa-8.0-llvmpipe-shmget.patch +Patch16: U_mesa-glx-Reduce-error-log-level.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -514,6 +515,7 @@ #%patch15 -p1 #%patch13 -p1 ### +%patch16 -p1 %build rm -f src/mesa/depend ++++++ U_mesa-glx-Reduce-error-log-level.patch ++++++ >From 0406f59eebb77e537b50f5cac3a20355686d2a4d Mon Sep 17 00:00:00 2001 From: Courtney Goeltzenleuchter <courtney(a)LunarG.com> Date: Wed, 26 Feb 2014 14:27:08 -0700 Subject: [PATCH] mesa: glx: Reduce error log level MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The code that parses LIBGL_DRIVERS_PATH was printing an error for every attempted dlopen. It's not an error to have to check multiple items in the path, only an error if no suitable library is found. Reduced the load error to a warning to match behavior of dynamic linker. Signed-off-by: Courtney Goeltzenleuchter <courtney(a)LunarG.com> Reviewed-by: Kristian Høgsberg <krh(a)bitplanet.net> --- src/glx/dri_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index 8bf47054a325..63c8de38c7c3 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -140,7 +140,7 @@ driOpenDriver(const char *driverName) if (handle != NULL) break; else - ErrorMessageF("dlopen %s failed (%s)\n", realDriverName, dlerror()); + InfoMessageF("dlopen %s failed (%s)\n", realDriverName, dlerror()); } if (!handle) -- 2.0.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdrm for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2014-07-31 10:03:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdrm" Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2014-07-29 16:48:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdrm.new/libdrm.changes 2014-07-31 10:04:04.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Jul 29 22:33:46 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de + +- Update to version 2.4.56: + Libdrm 2.4.56 has been released. It fixes MSAA for the Radeon Hawaii GPU. +- Remove upstreamed patch: + u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch + +------------------------------------------------------------------- Old: ---- libdrm-2.4.55.tar.bz2 u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch New: ---- libdrm-2.4.56.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.Fm9rlf/_old 2014-07-31 10:04:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Fm9rlf/_new 2014-07-31 10:04:07.000000000 +0200 @@ -18,7 +18,7 @@ Name: libdrm Url: http://dri.freedesktop.org/ -Version: 2.4.55 +Version: 2.4.56 Release: 0 Provides: libdrm23 = %{version} Obsoletes: libdrm23 < %{version} @@ -39,7 +39,6 @@ Source2: baselibs.conf # PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c Patch2: u_Fix-compilation-on-systems-that-don-t-provide-O_CLOE.patch -Patch3: u_No-longer-hardcode-path-for-drm.h-include-in-qxl_drm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.63 @@ -164,7 +163,6 @@ %prep %setup -q %patch2 -p1 -%patch3 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ++++++ libdrm-2.4.55.tar.bz2 -> libdrm-2.4.56.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.55/aclocal.m4 new/libdrm-2.4.56/aclocal.m4 --- old/libdrm-2.4.55/aclocal.m4 2014-07-25 15:19:39.000000000 +0200 +++ new/libdrm-2.4.56/aclocal.m4 2014-07-29 18:13:51.000000000 +0200 @@ -180,61 +180,6 @@ fi[]dnl ])# PKG_CHECK_MODULES - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.55/build-aux/config.guess new/libdrm-2.4.56/build-aux/config.guess --- old/libdrm-2.4.55/build-aux/config.guess 2014-07-25 15:19:40.000000000 +0200 +++ new/libdrm-2.4.56/build-aux/config.guess 2014-07-29 18:13:52.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - *:MSYS*:*) + i*:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) + or32:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,26 +1260,16 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1371,6 +1361,154 @@ exit ;; esac +eval $set_cc_for_build +cat >$dummy.c <<EOF +#ifdef _SEQUENT_ +# include <sys/types.h> +# include <sys/utsname.h> +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach $[0-9]*$.*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include <sys/param.h> +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac +fi + cat >&2 <<EOF $0: unable to guess system type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.55/build-aux/config.sub new/libdrm-2.4.56/build-aux/config.sub --- old/libdrm-2.4.55/build-aux/config.sub 2014-07-25 15:19:40.000000000 +0200 +++ new/libdrm-2.4.56/build-aux/config.sub 2014-07-29 18:13:52.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2014-05-01' +timestamp='2013-08-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -265,7 +265,6 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -283,10 +282,8 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -298,7 +295,8 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -326,7 +324,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -383,7 +381,6 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -403,10 +400,8 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -418,7 +413,6 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ - | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -1380,7 +1374,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1598,6 +1592,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.55/configure new/libdrm-2.4.56/configure --- old/libdrm-2.4.55/configure 2014-07-25 15:19:39.000000000 +0200 +++ new/libdrm-2.4.56/configure 2014-07-29 18:13:52.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libdrm 2.4.55. +# Generated by GNU Autoconf 2.69 for libdrm 2.4.56. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=DRI>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='libdrm' PACKAGE_TARNAME='libdrm' -PACKAGE_VERSION='2.4.55' -PACKAGE_STRING='libdrm 2.4.55' +PACKAGE_VERSION='2.4.56' +PACKAGE_STRING='libdrm 2.4.56' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=DRI' PACKAGE_URL='' @@ -1388,7 +1388,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libdrm 2.4.55 to adapt to many kinds of systems. +\`configure' configures libdrm 2.4.56 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1458,7 +1458,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libdrm 2.4.55:";; + short | recursive ) echo "Configuration of libdrm 2.4.56:";; esac cat <<\_ACEOF @@ -1613,7 +1613,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libdrm configure 2.4.55 +libdrm configure 2.4.56 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2036,7 +2036,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libdrm $as_me 2.4.55, which was +It was created by libdrm $as_me 2.4.56, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2905,7 +2905,7 @@ # Define the identity of the package. PACKAGE='libdrm' - VERSION='2.4.55' + VERSION='2.4.56' cat >>confdefs.h <<_ACEOF @@ -13919,7 +13919,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libdrm $as_me 2.4.55, which was +This file was extended by libdrm $as_me 2.4.56, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13985,7 +13985,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libdrm config.status 2.4.55 +libdrm config.status 2.4.56 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.55/configure.ac new/libdrm-2.4.56/configure.ac --- old/libdrm-2.4.55/configure.ac 2014-07-25 15:08:04.000000000 +0200 +++ new/libdrm-2.4.56/configure.ac 2014-07-29 18:11:41.000000000 +0200 @@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.55], + [2.4.56], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI] [libdrm]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.55/include/drm/Makefile new/libdrm-2.4.56/include/drm/Makefile --- old/libdrm-2.4.55/include/drm/Makefile 2014-07-25 15:19:51.000000000 +0200 +++ new/libdrm-2.4.56/include/drm/Makefile 2014-07-29 18:13:55.000000000 +0200 @@ -189,21 +189,21 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = ${SHELL} /home/mlankhorst/nfs/xorg/libdrm/build-aux/missing aclocal-1.14 +ACLOCAL = ${SHELL} /home/marek/dev/drm/build-aux/missing aclocal-1.14 ALLOCA = AMTAR = $${TAR-tar} AM_DEFAULT_VERBOSITY = 0 AR = ar -AUTOCONF = ${SHELL} /home/mlankhorst/nfs/xorg/libdrm/build-aux/missing autoconf -AUTOHEADER = ${SHELL} /home/mlankhorst/nfs/xorg/libdrm/build-aux/missing autoheader -AUTOMAKE = ${SHELL} /home/mlankhorst/nfs/xorg/libdrm/build-aux/missing automake-1.14 +AUTOCONF = ${SHELL} /home/marek/dev/drm/build-aux/missing autoconf +AUTOHEADER = ${SHELL} /home/marek/dev/drm/build-aux/missing autoheader +AUTOMAKE = ${SHELL} /home/marek/dev/drm/build-aux/missing automake-1.14 AWK = gawk CAIRO_CFLAGS = -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 CAIRO_LIBS = -lcairo CC = gcc CCDEPMODE = depmode=gcc3 -CFLAGS = -g -O2 -CLOCK_LIB = -lrt +CFLAGS = -g -O2 -fno-omit-frame-pointer +CLOCK_LIB = CPP = gcc -E CPPFLAGS = CYGPATH_W = echo @@ -230,12 +230,12 @@ LIBS = LIBTOOL = $(SHELL) $(top_builddir)/libtool LIBUDEV_CFLAGS = -LIBUDEV_LIBS = -ludev -lrt +LIBUDEV_LIBS = -ludev LIPO = LN_S = ln -s LTLIBOBJS = MAINT = -MAKEINFO = ${SHELL} /home/mlankhorst/nfs/xorg/libdrm/build-aux/missing makeinfo +MAKEINFO = ${SHELL} /home/marek/dev/drm/build-aux/missing makeinfo MANIFEST_TOOL = : MANPAGES_STYLESHEET = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl MKDIR_P = /bin/mkdir -p @@ -248,10 +248,10 @@ PACKAGE = libdrm PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=DRI PACKAGE_NAME = libdrm -PACKAGE_STRING = libdrm 2.4.55 +PACKAGE_STRING = libdrm 2.4.56 PACKAGE_TARNAME = libdrm PACKAGE_URL = -PACKAGE_VERSION = 2.4.55 +PACKAGE_VERSION = 2.4.56 PATH_SEPARATOR = : PCIACCESS_CFLAGS = PCIACCESS_LIBS = -lpciaccess @@ -263,17 +263,17 @@ RANLIB = ranlib SED = /bin/sed SET_MAKE = -SHELL = /bin/sh +SHELL = /bin/bash STRIP = strip -VALGRIND_CFLAGS = -I/usr/local/include/valgrind -VALGRIND_LIBS = -L/usr/local/lib/x86_64-linux-gnu/valgrind -lcoregrind-amd64-linux -lvex-amd64-linux -lgcc -VERSION = 2.4.55 +VALGRIND_CFLAGS = -I/usr/include/valgrind +VALGRIND_LIBS = -L/usr/lib/valgrind -lcoregrind-amd64-linux -lvex-amd64-linux -lgcc +VERSION = 2.4.56 WARN_CFLAGS = -Wall -Wextra -Wsign-compare -Werror-implicit-function-declaration -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wpacked -Wswitch-enum -Wmissing-format-attribute -Wstrict-aliasing=2 -Winit-self -Wdeclaration-after-statement -Wold-style-definition -Wno-missing-field-initializers -Wno-unused-parameter -Wno-attributes -Wno-long-long -Winline XSLTPROC = /usr/bin/xsltproc -abs_builddir = /home/mlankhorst/nfs/xorg/libdrm/include/drm -abs_srcdir = /home/mlankhorst/nfs/xorg/libdrm/include/drm -abs_top_builddir = /home/mlankhorst/nfs/xorg/libdrm -abs_top_srcdir = /home/mlankhorst/nfs/xorg/libdrm +abs_builddir = /home/marek/dev/drm/include/drm +abs_srcdir = /home/marek/dev/drm/include/drm +abs_top_builddir = /home/marek/dev/drm +abs_top_srcdir = /home/marek/dev/drm ac_ct_AR = ar ac_ct_CC = gcc ac_ct_DUMPBIN = @@ -302,9 +302,9 @@ htmldir = ${docdir} includedir = ${prefix}/include infodir = ${datarootdir}/info -install_sh = ${SHELL} /home/mlankhorst/nfs/xorg/libdrm/build-aux/install-sh +install_sh = ${SHELL} /home/marek/dev/drm/build-aux/install-sh kernel_source = -libdir = ${exec_prefix}/lib +libdir = /usr/lib/x86_64-linux-gnu libexecdir = ${exec_prefix}/libexec localedir = ${datarootdir}/locale localstatedir = ${prefix}/var @@ -312,8 +312,8 @@ mkdir_p = $(MKDIR_P) oldincludedir = /usr/include pdfdir = ${docdir} -pkgconfigdir = ${exec_prefix}/lib/pkgconfig -prefix = /usr/local +pkgconfigdir = /usr/lib/x86_64-linux-gnu/pkgconfig +prefix = /usr program_transform_name = s,x,x, psdir = ${docdir} sbindir = ${exec_prefix}/sbin diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.55/include/drm/qxl_drm.h new/libdrm-2.4.56/include/drm/qxl_drm.h --- old/libdrm-2.4.55/include/drm/qxl_drm.h 2014-07-25 15:18:49.000000000 +0200 +++ new/libdrm-2.4.56/include/drm/qxl_drm.h 2014-07-29 00:24:32.000000000 +0200 @@ -25,7 +25,7 @@ #define QXL_DRM_H #include <stddef.h> -#include "drm/drm.h" +#include "drm.h" /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdrm-2.4.55/radeon/radeon_surface.c new/libdrm-2.4.56/radeon/radeon_surface.c --- old/libdrm-2.4.55/radeon/radeon_surface.c 2014-07-25 15:07:41.000000000 +0200 +++ new/libdrm-2.4.56/radeon/radeon_surface.c 2014-07-29 00:24:32.000000000 +0200 @@ -1914,7 +1914,7 @@ sample_split = 1; break; case CIK__SAMPLE_SPLIT__2: - sample_split = 1; + sample_split = 2; break; case CIK__SAMPLE_SPLIT__4: sample_split = 4; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfce4-branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package xfce4-branding-openSUSE for openSUSE:Factory checked in at 2014-07-31 10:03:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-branding-openSUSE/xfce4-branding-openSUSE.changes 2014-06-18 10:59:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-branding-openSUSE.new/xfce4-branding-openSUSE.changes 2014-07-31 10:04:02.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Jul 29 20:39:18 UTC 2014 - gber(a)opensuse.org + +- recommend xfce4-panel-plugin-xfce4battery which is in the panel + branding + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.xSa9Pb/_old 2014-07-31 10:04:04.000000000 +0200 +++ /var/tmp/diff_new_pack.xSa9Pb/_new 2014-07-31 10:04:04.000000000 +0200 @@ -84,6 +84,7 @@ # uses xfce4-panel-plugin-mixer Recommends: xfce4-mixer Recommends: xfce4-panel-plugin-mixer +Recommends: xfce4-panel-plugin-xfce4battery Conflicts: otherproviders(xfce4-panel-branding) Provides: xfce4-panel-branding = %{xfce4_panel_version} Supplements: packageand(xfce4-panel:branding-openSUSE) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-YAML-LibYAML for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package perl-YAML-LibYAML for openSUSE:Factory checked in at 2014-07-31 10:03:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-YAML-LibYAML (Old) and /work/SRC/openSUSE:Factory/.perl-YAML-LibYAML.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-YAML-LibYAML" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-YAML-LibYAML/perl-YAML-LibYAML.changes 2012-05-31 17:09:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-YAML-LibYAML.new/perl-YAML-LibYAML.changes 2014-07-31 10:03:58.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Jul 28 05:30:44 UTC 2014 - coolo(a)suse.com + +- updated to 0.44 + - Doc fix. GitHub-Issue-#6. Thanks to Debian Perl Group for finding this. + + 0.43 Sat Jul 12 10:04:07 PDT 2014 + - Test::Base tests needed 'inc' in @INC + + 0.42 Fri Jul 11 14:45:58 PDT 2014 + - Switch to Zilla::Dist + - No longer dep on Test::Base, Spiffy, and Filter::Util::Call + - Remove test/changes.t + + 0.41 Wed Mar 13 10:34:55 PDT 2013 + - Removed another C++ // style comment. jdb++ + + 0.40 Tue Mar 12 11:05:34 PDT 2013 + - Removed C++ // style comments, for better portability. jdb++ + + 0.39 Mon Feb 11 18:08:04 PST 2013 + - Using the latest libyaml codebase + - https://github.com/yaml/libyaml/tree/perl-yaml-xs + - Changes have been made to start moving libyaml to 1.2 + +------------------------------------------------------------------- Old: ---- YAML-LibYAML-0.38.tar.gz New: ---- YAML-LibYAML-0.44.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-YAML-LibYAML.spec ++++++ --- /var/tmp/diff_new_pack.l57QNH/_old 2014-07-31 10:04:01.000000000 +0200 +++ /var/tmp/diff_new_pack.l57QNH/_new 2014-07-31 10:04:01.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-YAML-LibYAML # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,34 +17,27 @@ Name: perl-YAML-LibYAML -Version: 0.38 +Version: 0.44 Release: 0 %define cpan_name YAML-LibYAML -Summary: YAML::LibYAML Perl module -License: GPL-1.0+ or Artistic-1.0 +Summary: Perl YAML Serialization using XS and libyaml +License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/YAML-LibYAML/ Source: http://www.cpan.org/authors/id/I/IN/INGY/%{cpan_name}-%{version}.tar.gz -Patch1: CVE-2012-1152-YAML-LibYAML-0.35-format-error.patch +Patch0: CVE-2012-1152-YAML-LibYAML-0.35-format-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros %{perl_requires} %description -Kirill Siminov's libyaml is arguably the best YAML implementation. The C -library is written precisely to the YAML 1.1 specification. It was originally -bound to Python and was later bound to Ruby. - -This module is a Perl XS binding to libyaml which offers Perl the best YAML -support to date. - -This module exports the functions Dump and Load. These functions are intended -to work exactly like YAML.pm's corresponding functions. +Perl YAML Serialization using XS and libyaml %prep %setup -q -n %{cpan_name}-%{version} -%patch1 -p1 +%patch0 -p1 +find . -type f -print0 | xargs -0 chmod 644 %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" @@ -59,7 +52,7 @@ %perl_gen_filelist %files -f %{name}.files -%defattr(644,root,root,755) -%doc Changes README +%defattr(-,root,root,755) +%doc Changes LICENSE README %changelog ++++++ YAML-LibYAML-0.38.tar.gz -> YAML-LibYAML-0.44.tar.gz ++++++ ++++ 9753 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tor for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package tor for openSUSE:Factory checked in at 2014-07-31 07:41:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tor (Old) and /work/SRC/openSUSE:Factory/.tor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tor" Changes: -------- --- /work/SRC/openSUSE:Factory/tor/tor.changes 2014-06-10 14:38:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tor.new/tor.changes 2014-07-31 07:42:11.000000000 +0200 @@ -1,0 +2,32 @@ +Wed Jul 30 22:52:17 UTC 2014 - andreas.stieger(a)gmx.de + +- Tor 0.2.4.23 [bnc#889688] [CVE-2014-5117] + Slows down the risk from guard rotation and backports several + important fixes from the Tor 0.2.5 alpha release series. +- Major features: + - Clients now look at the "usecreatefast" consensus parameter to + decide whether to use CREATE_FAST or CREATE cells for the first hop + of their circuit. This approach can improve security on connections + where Tor's circuit handshake is stronger than the available TLS + connection security levels, but the tradeoff is more computational + load on guard relays. + - Make the number of entry guards configurable via a new + NumEntryGuards consensus parameter, and the number of directory + guards configurable via a new NumDirectoryGuards consensus + parameter. +- Major bugfixes: + - Fix a bug in the bounds-checking in the 32-bit curve25519-donna + implementation that caused incorrect results on 32-bit + implementations when certain malformed inputs were used along with + a small class of private ntor keys. +- Minor bugfixes: + - Warn and drop the circuit if we receive an inbound 'relay early' + cell. + - Correct a confusing error message when trying to extend a circuit + via the control protocol but we don't know a descriptor or + microdescriptor for one of the specified relays. + - Avoid an illegal read from stack when initializing the TLS module + using a version of OpenSSL without all of the ciphers used by the + v2 link handshake. + +------------------------------------------------------------------- Old: ---- tor-0.2.4.22.tar.gz tor-0.2.4.22.tar.gz.asc New: ---- tor-0.2.4.23.tar.gz tor-0.2.4.23.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tor.spec ++++++ --- /var/tmp/diff_new_pack.LOEz0P/_old 2014-07-31 07:42:13.000000000 +0200 +++ /var/tmp/diff_new_pack.LOEz0P/_new 2014-07-31 07:42:13.000000000 +0200 @@ -23,7 +23,7 @@ %define torgroup %{name} %define home_dir %{_localstatedir}/lib/empty Name: tor -Version: 0.2.4.22 +Version: 0.2.4.23 Release: 0 Summary: Anonymizing overlay network for TCP (The onion router) License: BSD-3-Clause ++++++ tor-0.2.4.22.tar.gz -> tor-0.2.4.23.tar.gz ++++++ ++++ 58180 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit osm-gps-map for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package osm-gps-map for openSUSE:Factory checked in at 2014-07-31 07:41:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osm-gps-map (Old) and /work/SRC/openSUSE:Factory/.osm-gps-map.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osm-gps-map" Changes: -------- --- /work/SRC/openSUSE:Factory/osm-gps-map/osm-gps-map.changes 2014-07-29 21:22:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.osm-gps-map.new/osm-gps-map.changes 2014-07-31 07:42:10.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Jul 30 15:20:16 UTC 2014 - ecsos(a)schirra.net + +- Update to version 1.0.2: + + Fix build with new giscanner. + + Build fixes. + + Fix open-street-maps. + +------------------------------------------------------------------- Old: ---- 1.0.1.tar.gz New: ---- 1.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osm-gps-map.spec ++++++ --- /var/tmp/diff_new_pack.EuKN7G/_old 2014-07-31 07:42:11.000000000 +0200 +++ /var/tmp/diff_new_pack.EuKN7G/_new 2014-07-31 07:42:11.000000000 +0200 @@ -1,6 +1,7 @@ # # spec file for package osm-gps-map # +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -15,14 +16,15 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: osm-gps-map -Version: 1.0.1 +Version: 1.0.2 Release: 0 -License: GPL-2.0+ Summary: A Gtk+ Widget for Displaying OpenStreetMap tiles -Url: http://nzjrs.github.io/osm-gps-map/ +License: GPL-2.0+ Group: Productivity/Other -Source: https://github.com/nzjrs/osm-gps-map/archive/1.0.1.tar.gz +Url: http://nzjrs.github.io/osm-gps-map/ +Source: https://github.com/nzjrs/osm-gps-map/archive/%{version}.tar.gz BuildRequires: gnome-common BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 ++++++ 1.0.1.tar.gz -> 1.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osm-gps-map-1.0.1/NEWS new/osm-gps-map-1.0.2/NEWS --- old/osm-gps-map-1.0.1/NEWS 2013-06-19 10:59:12.000000000 +0200 +++ new/osm-gps-map-1.0.2/NEWS 2014-04-08 22:31:11.000000000 +0200 @@ -1,3 +1,9 @@ +Changes in 1.0.2 +====================== + * Fix build with new giscanner + * Build fixes guillomovitch <guillomovitch(a)gmail.com> + * Fix open-street-maps Andrew Gee <andrew(a)andrewgee.org> + Changes in 1.0.1 ====================== * Build fixes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osm-gps-map-1.0.1/configure.ac new/osm-gps-map-1.0.2/configure.ac --- old/osm-gps-map-1.0.1/configure.ac 2013-06-19 10:59:12.000000000 +0200 +++ new/osm-gps-map-1.0.2/configure.ac 2014-04-08 22:31:11.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) AC_INIT([osm-gps-map], - [1.0.1], + [1.0.2], [http://github.com/nzjrs/osm-gps-map/issues] [osm-gps-map]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osm-gps-map-1.0.1/src/Makefile.am new/osm-gps-map-1.0.2/src/Makefile.am --- old/osm-gps-map-1.0.1/src/Makefile.am 2013-06-19 10:59:12.000000000 +0200 +++ new/osm-gps-map-1.0.2/src/Makefile.am 2014-04-08 22:31:11.000000000 +0200 @@ -29,7 +29,8 @@ $(no_undefined) libosmgpsmap_1_0_la_LIBADD = \ - $(OSMGPSMAP_LIBS) + $(OSMGPSMAP_LIBS) \ + -lm sources_private_h = \ converter.h \ @@ -73,18 +74,18 @@ ## GObject Introspection Support -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(builddir) --warn-all -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) +INTROSPECTION_SCANNER_ARGS = $(INTROSPECTION_FLAGS) --add-include-path=$(srcdir) --add-include-path=$(builddir) --warn-all +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(builddir) if HAVE_INTROSPECTION introspection_sources = $(sources_c) $(sources_public_h) OsmGpsMap-1.0.gir: libosmgpsmap-1.0.la OsmGpsMap_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0 -OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS) +OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS) -I$(srcdir) -I$(builddir) OsmGpsMap_1_0_gir_LIBS = libosmgpsmap-1.0.la OsmGpsMap_1_0_gir_FILES = $(introspection_sources) -OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps +OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps --c-include "osm-gps-map.h" INTROSPECTION_GIRS += OsmGpsMap-1.0.gir girdir = $(datadir)/gir-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osm-gps-map-1.0.1/src/osm-gps-map-source.c new/osm-gps-map-1.0.2/src/osm-gps-map-source.c --- old/osm-gps-map-1.0.1/src/osm-gps-map-source.c 2013-06-19 10:59:12.000000000 +0200 +++ new/osm-gps-map-1.0.2/src/osm-gps-map-source.c 2014-04-08 22:31:11.000000000 +0200 @@ -93,7 +93,8 @@ case OSM_GPS_MAP_SOURCE_OSM_PUBLIC_TRANSPORT: return "http://tile.xn--pnvkarte-m4a.de/tilegen/#Z/#X/#Y.png"; case OSM_GPS_MAP_SOURCE_OSMC_TRAILS: - return "http://topo.geofabrik.de/trails/#Z/#X/#Y.png"; + // Appears to be shut down + return NULL; case OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE: return "http://maps-for-free.com/layer/relief/z#Z/row#Y/#Z_#X-#Y.jpg"; case OSM_GPS_MAP_SOURCE_GOOGLE_STREET: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osm-gps-map-1.0.1/src/osm-gps-map-widget.c new/osm-gps-map-1.0.2/src/osm-gps-map-widget.c --- old/osm-gps-map-1.0.1/src/osm-gps-map-widget.c 2013-06-19 10:59:12.000000000 +0200 +++ new/osm-gps-map-1.0.2/src/osm-gps-map-widget.c 2014-04-08 22:31:11.000000000 +0200 @@ -145,7 +145,7 @@ #define ENABLE_DEBUG (0) #define EXTRA_BORDER (0) #define OSM_GPS_MAP_SCROLL_STEP (10) -#define USER_AGENT "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071127 Firefox/2.0.0.11" +#define USER_AGENT "libosmgpsmap/1.0" #define DOWNLOAD_RETRIES 3 #define MAX_DOWNLOAD_TILES 10000 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-ioflo for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package python-ioflo for openSUSE:Factory checked in at 2014-07-31 07:41:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ioflo (Old) and /work/SRC/openSUSE:Factory/.python-ioflo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ioflo" Changes: -------- --- /work/SRC/openSUSE:Factory/python-ioflo/python-ioflo.changes 2014-07-17 06:58:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-ioflo.new/python-ioflo.changes 2014-07-31 07:42:07.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 30 19:10:17 UTC 2014 - aboe76(a)gmail.com + +- Updated to v0.9.39 +- Cleanup some non python3 compatible print statement in tests Lint cleanup + +------------------------------------------------------------------- Old: ---- ioflo-0.9.38.tar.gz New: ---- ioflo-0.9.39.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ioflo.spec ++++++ --- /var/tmp/diff_new_pack.xJk4t0/_old 2014-07-31 07:42:10.000000000 +0200 +++ /var/tmp/diff_new_pack.xJk4t0/_new 2014-07-31 07:42:10.000000000 +0200 @@ -16,7 +16,7 @@ # Name: python-ioflo -Version: 0.9.38 +Version: 0.9.39 Release: 0 License: MIT Summary: Python IoFlo ++++++ ioflo-0.9.38.tar.gz -> ioflo-0.9.39.tar.gz ++++++ ++++ 2067 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-libnacl for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package python-libnacl for openSUSE:Factory checked in at 2014-07-31 07:41:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-libnacl (Old) and /work/SRC/openSUSE:Factory/.python-libnacl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-libnacl" Changes: -------- --- /work/SRC/openSUSE:Factory/python-libnacl/python-libnacl.changes 2014-07-17 06:58:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-libnacl.new/python-libnacl.changes 2014-07-31 07:42:06.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Jul 30 19:04:29 UTC 2014 - aboe76(a)gmail.com + +- Updated to 1.2.0 +his release introduces the DualKey class, secure key saving and loading, +as well as enhancements to the time_nonce function. + +Dual Key Class +Dual Keys are classes which can encrypt and sign data. These classes generate +and maintain both Curve25519 and Ed25519 keys, as well as all methods for both encryption and signing. + +Time Nonce Improvements +The original time nonce routine used the first 20 chars of the 24 char nonce for the microsecond +timestamp (based on salt's jid), leaving 4 chars for random data. This new nonce uses far fewer +chars for the timestamp by hex encoding the float of microseconds into just 13 chars, +leaving 11 chars of random data. This makes the default nonce safer and more secure.on. + +------------------------------------------------------------------- Old: ---- libnacl-1.1.0.tar.gz New: ---- libnacl-1.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libnacl.spec ++++++ --- /var/tmp/diff_new_pack.4Fwwm9/_old 2014-07-31 07:42:07.000000000 +0200 +++ /var/tmp/diff_new_pack.4Fwwm9/_new 2014-07-31 07:42:07.000000000 +0200 @@ -16,7 +16,7 @@ # Name: python-libnacl -Version: 1.1.0 +Version: 1.2.0 Release: 0 License: Apache-2.0 Summary: Python bindings for libsodium/tweetnacl based on ctypes ++++++ libnacl-1.1.0.tar.gz -> libnacl-1.2.0.tar.gz ++++++ ++++ 1815 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-raet for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package python-raet for openSUSE:Factory checked in at 2014-07-31 07:41:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-raet (Old) and /work/SRC/openSUSE:Factory/.python-raet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-raet" Changes: -------- --- /work/SRC/openSUSE:Factory/python-raet/python-raet.changes 2014-07-18 06:41:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-raet.new/python-raet.changes 2014-07-31 07:42:05.000000000 +0200 @@ -1,0 +2,28 @@ +Wed Jul 30 18:46:21 UTC 2014 - aboe76(a)gmail.com + +- Updated to 0.2.12 +0.2.11 release: + - Lookup remote in stack handleOneRx by using packet.index since it already substitutes + ha if se is zero. Then also lookup remote in haRemotes if not found in .uidRemotes + - Update joinent transaction + - Change the way persistence reaping is handled. Instead of removing remote from memory, + mark it with .reaped attribute. This avoide problematic use case of having to restoreRemote + from disk when doing lookup in Joinent. Update .manage + - Also unreap anytime a packet is received from a remote +0.2.10 release: + - Transactions now referenced and processed per remote not at stack.transactions sets + stage for later doing broadcast transactions +0.2.9 release: + - Finished support for role keep files in Road +0.2.8 release: + - Support for msgpack in Keep files more support for role in Road estates fixes in join transaction +0.2.7 release: + - bugfix +0.2.6 release: + - If verify keep fails then clear the keep file. This autoclears cache when upgrading format of + keep file. Also more support for role. +0.2.5 release: + - Refactored odicts indexing access attributes for remotes so can now access by uid, by name, or by ha. + - Updated associated accessors Provides more consistent view onto Stack Road or Lane Prepatory to adding + remote.role for key management +------------------------------------------------------------------- Old: ---- raet-0.2.4.tar.gz New: ---- raet-0.2.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-raet.spec ++++++ --- /var/tmp/diff_new_pack.vhg6Ma/_old 2014-07-31 07:42:06.000000000 +0200 +++ /var/tmp/diff_new_pack.vhg6Ma/_new 2014-07-31 07:42:06.000000000 +0200 @@ -16,7 +16,7 @@ # Name: python-raet -Version: 0.2.4 +Version: 0.2.12 Release: 0 License: Apache-2.0 Summary: Reliable Asynchronous Event Transport protocol ++++++ raet-0.2.4.tar.gz -> raet-0.2.12.tar.gz ++++++ ++++ 3348 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-http-server for openSUSE:Factory
by root＠hilbert.suse.de 31 Jul '14

31 Jul '14

Hello community, here is the log from the commit of package yast2-http-server for openSUSE:Factory checked in at 2014-07-31 07:41:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-http-server (Old) and /work/SRC/openSUSE:Factory/.yast2-http-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-http-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-http-server/yast2-http-server.changes 2013-10-20 10:54:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-http-server.new/yast2-http-server.changes 2014-07-31 07:42:04.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 30 15:03:11 UTC 2014 - cwh(a)suse.com + +- replaced given/when by regular if/elsif cascades to get rid of + perl's 'experimental' warnings (bnc#889595) +- 3.1.1 + +------------------------------------------------------------------- Old: ---- yast2-http-server-3.1.0.tar.bz2 New: ---- yast2-http-server-3.1.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-http-server.spec ++++++ --- /var/tmp/diff_new_pack.I8zanV/_old 2014-07-31 07:42:05.000000000 +0200 +++ /var/tmp/diff_new_pack.I8zanV/_new 2014-07-31 07:42:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-http-server # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,7 +32,7 @@ BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-network BuildRequires: yast2-packagemanager-devel BuildRequires: yast2-perl-bindings ++++++ yast2-http-server-3.1.0.tar.bz2 -> yast2-http-server-3.1.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/CONTRIBUTING.md new/yast2-http-server-3.1.1/CONTRIBUTING.md --- old/yast2-http-server-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-http-server-3.1.1/CONTRIBUTING.md 2014-07-30 17:49:43.000000000 +0200 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/VERSION new/yast2-http-server-3.1.1/VERSION --- old/yast2-http-server-3.1.0/VERSION 2013-10-16 12:29:50.000000000 +0200 +++ new/yast2-http-server-3.1.1/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/package/yast2-http-server.changes new/yast2-http-server-3.1.1/package/yast2-http-server.changes --- old/yast2-http-server-3.1.0/package/yast2-http-server.changes 2013-10-16 12:29:50.000000000 +0200 +++ new/yast2-http-server-3.1.1/package/yast2-http-server.changes 2014-07-30 17:49:43.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jul 30 15:03:11 UTC 2014 - cwh(a)suse.com + +- replaced given/when by regular if/elsif cascades to get rid of + perl's 'experimental' warnings (bnc#889595) +- 3.1.1 + +------------------------------------------------------------------- Wed Sep 18 16:26:06 UTC 2013 - lslezak(a)suse.cz - do not use *.spec.in template, use *.spec file with RPM macros diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/package/yast2-http-server.spec new/yast2-http-server-3.1.1/package/yast2-http-server.spec --- old/yast2-http-server-3.1.0/package/yast2-http-server.spec 2013-10-16 12:29:50.000000000 +0200 +++ new/yast2-http-server-3.1.1/package/yast2-http-server.spec 2014-07-30 17:49:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-http-server -Version: 3.1.0 +Version: 3.1.1 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,7 +26,7 @@ Group: System/YaST License: GPL-2.0 BuildRequires: yast2-network docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libzio -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 Requires: yast2-network yast2-perl-bindings libzio # DnsServerApi moved to yast2.rpm (bnc#392606) # Wizard::SetDesktopTitleAndIcon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-http-server-3.1.0/src/modules/YaPI/HTTPD.pm new/yast2-http-server-3.1.1/src/modules/YaPI/HTTPD.pm --- old/yast2-http-server-3.1.0/src/modules/YaPI/HTTPD.pm 2013-10-16 12:29:50.000000000 +0200 +++ new/yast2-http-server-3.1.1/src/modules/YaPI/HTTPD.pm 2014-07-30 17:49:43.000000000 +0200 @@ -296,7 +296,6 @@ =cut package YaPI::HTTPD; -use feature "switch"; use Data::Dumper; use YaPI; use YaST::YCP qw(:LOGGING sformat); @@ -355,25 +354,23 @@ } foreach my $key (sort keys (%{$vhost_files})) { - given($key) { - when ("ip-based") { - foreach my $hostList ($vhost_files->{'ip-based'}) { - foreach my $hostentryHash (@$hostList) { - push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); - } - } - } - when ("main") { - push (@ret, $vhost_files->{'main'}{HOSTID}) if (defined ($vhost_files->{'main'}{HOSTID})); - } - default { - foreach my $hostList ( $vhost_files->{$key} ) { - foreach my $hostentryHash ( @$hostList ) { - push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); - } - } - } - } + if($key eq "ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + foreach my $hostentryHash (@$hostList) { + push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); + } + } + } + elsif($key eq "main") { + push (@ret, $vhost_files->{'main'}{HOSTID}) if (defined ($vhost_files->{'main'}{HOSTID})); + } + else { + foreach my $hostList ( $vhost_files->{$key} ) { + foreach my $hostentryHash ( @$hostList ) { + push (@ret, $hostentryHash->{HOSTID}) if ($hostentryHash->{HOSTID}); + } + } + } } return \@ret; @@ -422,26 +419,24 @@ my $ret=undef; foreach my $key (sort keys (%{$vhost_files})) { - given ($key) { - when ("ip-based") { - foreach my $hostList ( $vhost_files->{'ip-based'} ) { - foreach my $hostentryHash (@$hostList) { - $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); - } - } - } - when ("main") { - $ret = $vhost_files->{'main'} - if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); - } - default { - foreach my $hostList ($vhost_files->{$key}) { - foreach my $hostentryHash (@$hostList) { - $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); - } - } - } - } + if($key eq "ip-based") { + foreach my $hostList ( $vhost_files->{'ip-based'} ) { + foreach my $hostentryHash (@$hostList) { + $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } + elsif($key eq "main") { + $ret = $vhost_files->{'main'} + if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); + } + else { + foreach my $hostList ($vhost_files->{$key}) { + foreach my $hostentryHash (@$hostList) { + $ret = $hostentryHash if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } } return [@{$ret->{'DATA'}}] if (defined $ret); @@ -456,28 +451,26 @@ my %ret = (); foreach my $key (keys (%{$vhost_files})) { - given($key) { - when ("ip-based") { - foreach my $hostList ($vhost_files->{'ip-based'}) { - foreach my $hostentryHash (@$hostList) { - %ret = (type => 'ip-based', id => $hostentryHash->{HostIP}) - if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); - } - } - } - when ("main") { - %ret = (type => 'main') - if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); - } - default { - foreach my $hostList ($vhost_files->{$key}) { - foreach my $hostentryHash (@$hostList) { - %ret = (type => 'name-based',id => $hostentryHash->{HostIP}) - if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); - } - } - } - } + if($key eq "ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + foreach my $hostentryHash (@$hostList) { + %ret = (type => 'ip-based', id => $hostentryHash->{HostIP}) + if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } + elsif($key eq "main") { + %ret = (type => 'main') + if ((defined $vhost_files->{'main'}{HOSTID}) && ($vhost_files->{'main'}{HOSTID} eq $hostid)); + } + else { + foreach my $hostList ($vhost_files->{$key}) { + foreach my $hostentryHash (@$hostList) { + %ret = (type => 'name-based',id => $hostentryHash->{HostIP}) + if (($hostentryHash->{HOSTID}) && ($hostentryHash->{HOSTID} eq $hostid)); + } + } + } } return \%ret; @@ -530,24 +523,22 @@ my $hostid = shift; foreach my $key (keys (%{$vhost_files})) { - given($key) { - when ("ip-based") { - foreach my $hostList ($vhost_files->{'ip-based'}) { - my @tmp_list = (); - foreach my $hostentryHash (@$hostList) { + if($key eq "ip-based") { + foreach my $hostList ($vhost_files->{'ip-based'}) { + my @tmp_list = (); + foreach my $hostentryHash (@$hostList) { push(@tmp_list, $hostentryHash) if ($hostid ne $hostentryHash->{HOSTID}); - } - $vhost_files->{'ip-based'} = \@tmp_list; - } - } - when ("main") { - delete $vhost_files->{'main'} if ($hostid eq 'main'); - } - default { - my $vhost = $vhost_files->{$key}->[0]->{'HOSTID'}; - delete $vhost_files->{$key} if ($vhost eq $hostid); - } - } + } + $vhost_files->{'ip-based'} = \@tmp_list; + } + } + elsif($key eq "main") { + delete $vhost_files->{'main'} if ($hostid eq 'main'); + } + else { + my $vhost = $vhost_files->{$key}->[0]->{'HOSTID'}; + delete $vhost_files->{$key} if ($vhost eq $hostid); + } } } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0