December 2017 - openSUSE Commits - openSUSE Mailing Lists

commit libgtpnl for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package libgtpnl for openSUSE:Factory checked in at 2017-12-29 18:51:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgtpnl (Old) and /work/SRC/openSUSE:Factory/.libgtpnl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgtpnl" Fri Dec 29 18:51:51 2017 rev:2 rq:560207 version:1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libgtpnl/libgtpnl.changes 2017-05-16 14:37:54.000292420 +0200 +++ /work/SRC/openSUSE:Factory/.libgtpnl.new/libgtpnl.changes 2017-12-29 18:51:58.986396834 +0100 @@ -1,0 +2,13 @@ +Thu Dec 28 00:37:51 UTC 2017 - jengelh(a)inai.de + +- Update to new upstream release 1.1.0 + * gtp: fix missing initialization of netns file descriptor + * tools,gtp-genl: gtp-tunnel: fix wrong MS address + * tools: gtp-tunnel: restore option parsing + * tools: gtp-link: allow to delete links + * tools: gtp-link: bind to GTP UDP sockets + * Fix look-up of GTP tunnel by TEI + * Add support for SGSN role via IFLA_GTP_ROLE + * Add support for SGSN role via IFLA_GTP_ROLE + +------------------------------------------------------------------- Old: ---- libgtpnl-1.0.1.7.tar.xz New: ---- libgtpnl-1.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgtpnl.spec ++++++ --- /var/tmp/diff_new_pack.po7dKY/_old 2017-12-29 18:51:59.494250975 +0100 +++ /var/tmp/diff_new_pack.po7dKY/_new 2017-12-29 18:51:59.498249826 +0100 @@ -17,7 +17,7 @@ Name: libgtpnl -Version: 1.0.1.7 +Version: 1.1.0 Release: 0 Summary: GPRS tunnel configuration library License: GPL-2.0+ and LGPL-2.1+ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.po7dKY/_old 2017-12-29 18:51:59.538238340 +0100 +++ /var/tmp/diff_new_pack.po7dKY/_new 2017-12-29 18:51:59.538238340 +0100 @@ -2,8 +2,8 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">git://git.osmocom.org/libgtpnl</param> - <param name="revision">master</param> - <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@</param> + <param name="revision">1.1.0</param> + <param name="versionformat">1.1.0</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ libgtpnl-1.0.1.7.tar.xz -> libgtpnl-1.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/Make_global.am new/libgtpnl-1.1.0/Make_global.am --- old/libgtpnl-1.0.1.7/Make_global.am 2017-03-24 15:39:17.000000000 +0100 +++ new/libgtpnl-1.1.0/Make_global.am 2017-11-12 15:33:02.000000000 +0100 @@ -18,7 +18,7 @@ # set age to 0. # </snippet> # -LIBVERSION=0:0:0 +LIBVERSION=1:0:1 AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_srcdir}/include ${LIBMNL_CFLAGS} AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/Makefile.am new/libgtpnl-1.1.0/Makefile.am --- old/libgtpnl-1.0.1.7/Makefile.am 2017-03-24 15:39:17.000000000 +0100 +++ new/libgtpnl-1.1.0/Makefile.am 2017-11-12 15:33:02.000000000 +0100 @@ -9,3 +9,5 @@ pkgconfig_DATA = libgtpnl.pc ${pkgconfig_DATA}: ${top_builddir}/config.status + +@RELMAKE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/configure.ac new/libgtpnl-1.1.0/configure.ac --- old/libgtpnl-1.0.1.7/configure.ac 2017-03-24 15:39:17.000000000 +0100 +++ new/libgtpnl-1.1.0/configure.ac 2017-11-12 15:33:02.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to create configure. -AC_INIT([libgtpnl], [1.0.1]) +AC_INIT([libgtpnl], [1.1.0]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([m4]) @@ -13,6 +13,10 @@ dnl Dependencies PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.0]) +dnl include release helper +RELMAKE='-include osmo-release.mk' +AC_SUBST([RELMAKE]) + AC_PROG_CC AM_PROG_CC_C_O AC_EXEEXT @@ -24,6 +28,18 @@ *) AC_MSG_ERROR([Linux only, dude!]);; esac +AC_ARG_ENABLE(sanitize, + [AS_HELP_STRING( + [--enable-sanitize], + [Compile with address sanitizer enabled], + )], + [sanitize=$enableval], [sanitize="no"]) +if test x"$sanitize" = x"yes" +then + CFLAGS="$CFLAGS -fsanitize=address -fsanitize=undefined" + CPPFLAGS="$CPPFLAGS -fsanitize=address -fsanitize=undefined" +fi + regular_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_REENTRANT" regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wmissing-prototypes -Wshadow -Wstrict-prototypes \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/contrib/jenkins.sh new/libgtpnl-1.1.0/contrib/jenkins.sh --- old/libgtpnl-1.0.1.7/contrib/jenkins.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libgtpnl-1.1.0/contrib/jenkins.sh 2017-11-12 15:33:02.000000000 +0100 @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +set -ex + +osmo-clean-workspace.sh + +autoreconf --install --force +./configure --enable-sanitize CFLAGS="-Werror" CPPFLAGS="-Werror" +$MAKE $PARALLEL_MAKE +$MAKE distcheck + +osmo-clean-workspace.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/debian/changelog new/libgtpnl-1.1.0/debian/changelog --- old/libgtpnl-1.0.1.7/debian/changelog 1970-01-01 01:00:00.000000000 +0100 +++ new/libgtpnl-1.1.0/debian/changelog 2017-11-12 15:33:02.000000000 +0100 @@ -0,0 +1,16 @@ +libgtpnl (1.1.0) UNRELEASED; urgency=medium + + * Add genl_socket_close() function + * Add contrib/jenkins.sh for jenkins build verification + * Add '--enable-sanitize' from other osmocom projects + * gtp_build_payload(): Support absent peer and SGSN address + * Use release helper from libosmocore + * add 'm4' subdirectory to .gitignore + + -- Harald Welte <laforge(a)gnumonks.org> Sun, 12 Nov 2017 23:31:27 +0900 + +libgtpnl (1.0.1) unstable; urgency=medium + + * Initial release. + + -- Harald Welte <laforge(a)gnumonks.org> Mon, 30 Oct 2017 23:03:47 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/debian/compat new/libgtpnl-1.1.0/debian/compat --- old/libgtpnl-1.0.1.7/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ new/libgtpnl-1.1.0/debian/compat 2017-11-12 15:33:02.000000000 +0100 @@ -0,0 +1 @@ +9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/debian/control new/libgtpnl-1.1.0/debian/control --- old/libgtpnl-1.0.1.7/debian/control 1970-01-01 01:00:00.000000000 +0100 +++ new/libgtpnl-1.1.0/debian/control 2017-11-12 15:33:02.000000000 +0100 @@ -0,0 +1,45 @@ +Source: libgtpnl +Maintainer: Harald Welte <laforge(a)gnumonks.org> +Section: libs +Priority: optional +Build-Depends: debhelper (>= 9), + autotools-dev, + autoconf, + automake, + libtool, + dh-autoreconf, + git, + pkg-config, + libmnl-dev +Standards-Version: 3.9.8 +Vcs-Git: git://git.osmocom.org/libgtpnl.git +Vcs-Browser: http://git.osmocom.org/gitweb?p=libgtpnl.git;a=summary +Homepage: https://projects.osmocom.org/projects/openggsn + +Package: libgtpnl1 +Section: libs +Architecture: any +Multi-Arch: same +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Linux kernel GTP-U netlink library + +Package: libgtpnl-dev +Architecture: any +Multi-Arch: same +Section: libdevel +Depends: libmnl-dev, + libgtpnl1 (= ${binary:Version}), + ${misc:Depends} +Description: Development headers for Linux kernel GTP-U netlink library + The header files provided by this package may be used to develop + applications against the libgtpnl library. + +Package: libgtpnl-dbg +Architecture: any +Multi-Arch: same +Section: debug +Priority: extra +Depends: libgtpnl1 (= ${binary:Version}), + ${misc:Depends} +Description: Debug symbols for Linux kernel GTP-U netlink library diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/debian/libgtpnl-dev.install new/libgtpnl-1.1.0/debian/libgtpnl-dev.install --- old/libgtpnl-1.0.1.7/debian/libgtpnl-dev.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libgtpnl-1.1.0/debian/libgtpnl-dev.install 2017-11-12 15:33:02.000000000 +0100 @@ -0,0 +1,4 @@ +usr/include/* +usr/lib/*/lib*.so +usr/lib/*/lib*.la +usr/lib/*/pkgconfig/* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/debian/libgtpnl1.install new/libgtpnl-1.1.0/debian/libgtpnl1.install --- old/libgtpnl-1.0.1.7/debian/libgtpnl1.install 1970-01-01 01:00:00.000000000 +0100 +++ new/libgtpnl-1.1.0/debian/libgtpnl1.install 2017-11-12 15:33:02.000000000 +0100 @@ -0,0 +1 @@ +usr/lib/*/libgtpnl*.so.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/debian/rules new/libgtpnl-1.1.0/debian/rules --- old/libgtpnl-1.0.1.7/debian/rules 1970-01-01 01:00:00.000000000 +0100 +++ new/libgtpnl-1.1.0/debian/rules 2017-11-12 15:33:02.000000000 +0100 @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) +DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) +VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions + +%: + dh $@ --with autoreconf --fail-missing + +override_dh_strip: + dh_strip --dbg-package=libgtpnl-dbg + +override_dh_install: + sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'` + dh_install + +# Print test results in case of a failure +override_dh_auto_test: + dh_auto_test || (find . -name testsuite.log -exec cat {} \; ; false) + +override_dh_autoreconf: + echo $(VERSION) > .tarball-version + dh_autoreconf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/include/libgtpnl/gtpnl.h new/libgtpnl-1.1.0/include/libgtpnl/gtpnl.h --- old/libgtpnl-1.0.1.7/include/libgtpnl/gtpnl.h 2017-03-24 15:39:17.000000000 +0100 +++ new/libgtpnl-1.1.0/include/libgtpnl/gtpnl.h 2017-11-12 15:33:02.000000000 +0100 @@ -7,6 +7,7 @@ struct nlmsghdr; struct mnl_socket *genl_socket_open(void); +void genl_socket_close(struct mnl_socket *nl); struct nlmsghdr *genl_nlmsg_build_hdr(char *buf, uint16_t type, uint16_t flags, uint32_t seq, uint8_t cmd); int genl_socket_talk(struct mnl_socket *nl, struct nlmsghdr *nlh, uint32_t seq, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/src/genl.c new/libgtpnl-1.1.0/src/genl.c --- old/libgtpnl-1.0.1.7/src/genl.c 2017-03-24 15:39:17.000000000 +0100 +++ new/libgtpnl-1.1.0/src/genl.c 2017-11-12 15:33:02.000000000 +0100 @@ -106,6 +106,12 @@ } EXPORT_SYMBOL(genl_socket_open); +void genl_socket_close(struct mnl_socket *nl) +{ + mnl_socket_close(nl); +} +EXPORT_SYMBOL(genl_socket_close); + int genl_socket_talk(struct mnl_socket *nl, struct nlmsghdr *nlh, uint32_t seq, int (*cb)(const struct nlmsghdr *nlh, void *data), void *data) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/src/gtp-genl.c new/libgtpnl-1.1.0/src/gtp-genl.c --- old/libgtpnl-1.0.1.7/src/gtp-genl.c 2017-03-24 15:39:17.000000000 +0100 +++ new/libgtpnl-1.1.0/src/gtp-genl.c 2017-11-12 15:33:02.000000000 +0100 @@ -48,8 +48,10 @@ if (t->ifns >= 0) mnl_attr_put_u32(nlh, GTPA_NET_NS_FD, t->ifns); mnl_attr_put_u32(nlh, GTPA_LINK, t->ifidx); - mnl_attr_put_u32(nlh, GTPA_PEER_ADDRESS, t->sgsn_addr.s_addr); - mnl_attr_put_u32(nlh, GTPA_MS_ADDRESS, t->ms_addr.s_addr); + if (t->sgsn_addr.s_addr) + mnl_attr_put_u32(nlh, GTPA_PEER_ADDRESS, t->sgsn_addr.s_addr); + if (t->ms_addr.s_addr) + mnl_attr_put_u32(nlh, GTPA_MS_ADDRESS, t->ms_addr.s_addr); if (t->gtp_version == GTP_V0) { mnl_attr_put_u64(nlh, GTPA_TID, t->u.v0.tid); mnl_attr_put_u16(nlh, GTPA_FLOW, t->u.v0.flowid); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgtpnl-1.0.1.7/src/libgtpnl.map new/libgtpnl-1.1.0/src/libgtpnl.map --- old/libgtpnl-1.0.1.7/src/libgtpnl.map 2017-03-24 15:39:17.000000000 +0100 +++ new/libgtpnl-1.1.0/src/libgtpnl.map 2017-11-12 15:33:02.000000000 +0100 @@ -1,6 +1,7 @@ LIBGTPNL_1.0 { global: genl_socket_open; + genl_socket_close; genl_nlmsg_build_hdr; genl_socket_talk; genl_lookup_family;

1 0

commit ranger for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package ranger for openSUSE:Factory checked in at 2017-12-29 18:51:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ranger (Old) and /work/SRC/openSUSE:Factory/.ranger.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ranger" Fri Dec 29 18:51:47 2017 rev:2 rq:560191 version:1.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ranger/ranger.changes 2017-02-03 19:59:42.827912560 +0100 +++ /work/SRC/openSUSE:Factory/.ranger.new/ranger.changes 2017-12-29 18:51:56.263178965 +0100 @@ -1,0 +2,12 @@ +Wed Dec 27 18:01:01 UTC 2017 - antoine.belvire(a)opensuse.org + +- Fix wrong conditionals for desktop_database_post(un) calls. + +------------------------------------------------------------------- +Mon Dec 11 13:04:03 UTC 2017 - sogal(a)volted.net + +- Update desktop database upon ranger installation/removal +- Fixed desktop file by adding GenericName entry using + ranger.desktop.patch + +------------------------------------------------------------------- New: ---- ranger.desktop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ranger.spec ++++++ --- /var/tmp/diff_new_pack.lAKA02/_old 2017-12-29 18:51:57.130929740 +0100 +++ /var/tmp/diff_new_pack.lAKA02/_new 2017-12-29 18:51:57.134928591 +0100 @@ -1,3 +1,4 @@ +# # spec file for package ranger # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. @@ -15,6 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: ranger @@ -26,6 +28,8 @@ Url: http://ranger.nongnu.org Source: http://nongnu.org/ranger/ranger-%{version}.tar.gz Source99: ranger-rpmlintrc +# PATCH-FIX-UPSTREAM ranger.desktop.patch -- Add missing GenericName +Patch0: ranger.desktop.patch BuildRequires: python-devel >= 2.5.1 Requires: file Requires: python-curses @@ -62,6 +66,8 @@ %setup -q sed -e 's|#!/bin/python|#!%{_bindir}/env python|' -i doc/tools/convert_papermode_to_metadata.py +%patch0 -p1 + %build python ./setup.py build @@ -72,8 +78,12 @@ rm -rf "%{buildroot}%{_datadir}/doc/ranger" -%if 0%{?suse_version} -%suse_update_desktop_file -r "%{name}" System FileManager +%if 0%{?suse_version} < 1330 +%post +%desktop_database_post + +%postun +%desktop_database_postun %endif %files ++++++ ranger-1.8.1.tar.gz ++++++ ++++++ ranger.desktop.patch ++++++ --- ranger-1.8.1.orig/doc/ranger.desktop 2017-12-11 13:46:27.000000000 +0100 +++ ranger-1.8.1/doc/ranger.desktop 2017-12-21 14:33:47.854478237 +0100 @@ -1,9 +1,11 @@ [Desktop Entry] Type=Application Name=ranger +GenericName=ranger +X-SuSE-translate=false Comment=Launches the ranger file manager Icon=utilities-terminal Terminal=true Exec=ranger -Categories=ConsoleOnly;System;FileTools;FileManager +Categories=ConsoleOnly;System;FileTools;FileManager; MimeType=inode/directory;

1 0

commit lollypop for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package lollypop for openSUSE:Factory checked in at 2017-12-29 18:51:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lollypop (Old) and /work/SRC/openSUSE:Factory/.lollypop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lollypop" Fri Dec 29 18:51:43 2017 rev:31 rq:560179 version:0.9.306 Changes: -------- --- /work/SRC/openSUSE:Factory/lollypop/lollypop.changes 2017-10-17 01:53:14.544398696 +0200 +++ /work/SRC/openSUSE:Factory/.lollypop.new/lollypop.changes 2017-12-29 18:51:52.676209172 +0100 @@ -1,0 +2,24 @@ +Wed Dec 27 13:20:01 UTC 2017 - antoine.belvire(a)opensuse.org + +- Update to version 0.9.306: + * Fix crash due to broken commit. + * Add support for audio/x-wavpack. + * Update GTK minimal version to 3.20. + * Update translations. +- Changes from version 0.9.305: + * Allow jumping to artist from search view. + * Rework fullscreen layout. + * Choose startup view. +- Update spec file: + * Change URL and Source fields: Lollypop has moved to GNOME's + infrastructure. + * Drop post(un) scriptlets: They are empty for Tumbleweed and + Leap 15 and this package does not build anymore with previous + versions of openSUSE. + * Drop glib2_gsettings_schema_requires (was needed for post(un) + macros). + * Drop conditionals for openSUSE Leap 42.3 and older. + * Ran spec-cleaner. +- Add _service file. + +------------------------------------------------------------------- Old: ---- lollypop-0.9.304.tar.xz New: ---- _service lollypop-0.9.306.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lollypop.spec ++++++ --- /var/tmp/diff_new_pack.G0dLtR/_old 2017-12-29 18:51:53.899857730 +0100 +++ /var/tmp/diff_new_pack.G0dLtR/_new 2017-12-29 18:51:53.903856581 +0100 @@ -17,15 +17,15 @@ %global gobject_introspection_version 1.35.9 -%global gtk3_version 3.14 +%global gtk3_version 3.20 Name: lollypop -Version: 0.9.304 +Version: 0.9.306 Release: 0 Summary: GNOME music playing application License: GPL-3.0+ Group: Productivity/Multimedia/Sound/Players -Url: http://gnumdk.github.io/lollypop-web/ -Source0: https://github.com/gnumdk/lollypop/releases/download/%{version}/%{name}-%{v… +Url: https://wiki.gnome.org/Apps/Lollypop +Source0: %{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: gettext-runtime >= 0.19.7 BuildRequires: git-core @@ -54,14 +54,11 @@ Requires(post): desktop-file-utils Requires(pre): desktop-file-utils Recommends: %{name}-lang = %{version} -Recommends: lollypop-portal -Recommends: kid3-cli Recommends: easytag -BuildArch: noarch -%glib2_gsettings_schema_requires -%if 0%{?suse_version} > 1320 +Recommends: kid3-cli +Recommends: lollypop-portal Recommends: python3-wikipedia -%endif +BuildArch: noarch %description Lollypop is a GNOME music playing application. It provides the following @@ -116,28 +113,12 @@ %fdupes %{buildroot}%{python3_sitelib}/%{name}/ %fdupes %{buildroot}%{_datadir}/ -%post -%icon_theme_cache_post -%icon_theme_cache_post HighContrast -%desktop_database_post -%glib2_gsettings_schema_post - -%postun -%icon_theme_cache_postun -%icon_theme_cache_postun HighContrast -%desktop_database_postun -%glib2_gsettings_schema_postun - %files -f %{name}.lang %doc AUTHORS LICENSE README.md %{_bindir}/%{name} %{_bindir}/%{name}-cli %exclude %{_libexecdir}/lollypop-sp %{_datadir}/%{name} -%{_datadir}/help/*/%{name} -%if 0%{?suse_version} == 1315 -%dir %{_datadir}/appdata -%endif %{_datadir}/appdata/org.gnome.Lollypop.appdata.xml %{_datadir}/applications/org.gnome.Lollypop.desktop %{_datadir}/glib-2.0/schemas/org.gnome.Lollypop.gschema.xml @@ -146,7 +127,6 @@ %{python3_sitelib}/lollypop/ %files -n gnome-shell-search-provider-%{name} -%defattr(-,root,root) %{_libexecdir}/lollypop-sp %{_datadir}/dbus-1/services/org.gnome.Lollypop.SearchProvider.service %dir %{_datadir}/gnome-shell ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="changesgenerate">enable</param> <param name="revision">0.9.306</param> <param name="scm">git</param> <param name="url">https://gitlab.gnome.org/gnumdk/lollypop.git</param> <param name="versionformat">@PARENT_TAG@</param> </service> <service mode="disabled" name="recompress"> <param name="compression">xz</param> <param name="file">*.tar</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ lollypop-0.9.304.tar.xz -> lollypop-0.9.306.tar.xz ++++++ ++++ 15365 lines of diff (skipped)

1 0

commit klee-uclibc for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package klee-uclibc for openSUSE:Factory checked in at 2017-12-29 18:51:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/klee-uclibc (Old) and /work/SRC/openSUSE:Factory/.klee-uclibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "klee-uclibc" Fri Dec 29 18:51:38 2017 rev:6 rq:560177 version:1.0.0+git.20170324 Changes: -------- --- /work/SRC/openSUSE:Factory/klee-uclibc/klee-uclibc.changes 2017-12-21 11:28:53.256883318 +0100 +++ /work/SRC/openSUSE:Factory/.klee-uclibc.new/klee-uclibc.changes 2017-12-29 18:51:51.512543386 +0100 @@ -1,0 +2,6 @@ +Wed Dec 27 10:50:34 UTC 2017 - dimstar(a)opensuse.org + +- Revert llvm_version back to 4: klee is not ready yet to build + using llvm5. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ klee-uclibc.spec ++++++ --- /var/tmp/diff_new_pack.MZOKdK/_old 2017-12-29 18:51:52.136364220 +0100 +++ /var/tmp/diff_new_pack.MZOKdK/_new 2017-12-29 18:51:52.136364220 +0100 @@ -16,7 +16,7 @@ # -%define llvm_version 5 +%define llvm_version 4 %define version_unconverted 1.0.0+git.20170324

1 0

commit icinga for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package icinga for openSUSE:Factory checked in at 2017-12-29 18:51:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icinga (Old) and /work/SRC/openSUSE:Factory/.icinga.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "icinga" Fri Dec 29 18:51:36 2017 rev:59 rq:560176 version:1.14.2 Changes: -------- --- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2017-12-20 10:40:20.352924641 +0100 +++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2017-12-29 18:51:42.915012666 +0100 @@ -1,0 +2,8 @@ +Wed Dec 20 15:18:20 UTC 2017 - thardeck(a)suse.com + +- update to upstream version 1.14.2 + * Again, this only affects source installations. Packages are safe. + * Don't change ownership of STATEDIR + * Change --with-tmp-{file,path} to default to $localstatedir instead of /tmp + +------------------------------------------------------------------- Old: ---- v1.14.1.tar.gz New: ---- v1.14.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icinga.spec ++++++ --- /var/tmp/diff_new_pack.u6aunv/_old 2017-12-29 18:51:50.928711068 +0100 +++ /var/tmp/diff_new_pack.u6aunv/_new 2017-12-29 18:51:50.932709919 +0100 @@ -21,7 +21,7 @@ %endif Name: icinga -Version: 1.14.1 +Version: 1.14.2 Release: 0 Summary: Host/service/network monitoring program ++++++ v1.14.1.tar.gz -> v1.14.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/icinga/v1.14.1.tar.gz /work/SRC/openSUSE:Factory/.icinga.new/v1.14.2.tar.gz differ: char 15, line 1

1 0

commit elementary-theme for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package elementary-theme for openSUSE:Factory checked in at 2017-12-29 18:51:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/elementary-theme (Old) and /work/SRC/openSUSE:Factory/.elementary-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "elementary-theme" Fri Dec 29 18:51:30 2017 rev:9 rq:560112 version:5.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/elementary-theme/elementary-theme.changes 2017-10-26 18:44:41.123107614 +0200 +++ /work/SRC/openSUSE:Factory/.elementary-theme.new/elementary-theme.changes 2017-12-29 18:51:38.744210554 +0100 @@ -1,0 +2,5 @@ +Tue Dec 26 11:02:52 UTC 2017 - avvissu(a)yandex.by + +- Drop gtk3-engine-unico (nothing provides gtk3-engine-unico) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ elementary-theme.spec ++++++ --- /var/tmp/diff_new_pack.si6sQu/_old 2017-12-29 18:51:40.099821212 +0100 +++ /var/tmp/diff_new_pack.si6sQu/_new 2017-12-29 18:51:40.103820063 +0100 @@ -62,7 +62,6 @@ %package -n gtk3-metatheme-elementary Summary: The elementary GTK Theme -- GTK+ 3 Support Group: System/GUI/GNOME -Requires: gtk3-engine-unico Requires: metatheme-elementary-common = %{version} Supplements: packageand(metatheme-elementary-common:gtk3)

1 0

commit phpMyAdmin for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:Factory checked in at 2017-12-29 18:51:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpMyAdmin (Old) and /work/SRC/openSUSE:Factory/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin" Fri Dec 29 18:51:25 2017 rev:146 rq:560103 version:4.7.7 Changes: -------- --- /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin.changes 2017-12-03 10:13:13.187428570 +0100 +++ /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin.changes 2017-12-29 18:51:34.857326898 +0100 @@ -1,0 +2,9 @@ +Mon Dec 25 19:14:32 UTC 2017 - astieger(a)suse.com + +- phpMyAdmin 4.7.7: + * Fixed displaying of formatted numeric values for some locales + * Ensure datetimepicker is always loaded for datetime fields + * Fixed PHP error when browsing certain results + * Fix XSRF/CSRF vulnerability (bsc#1074066, PMASA-2017-09) + +------------------------------------------------------------------- Old: ---- phpMyAdmin-4.7.6-all-languages.tar.xz phpMyAdmin-4.7.6-all-languages.tar.xz.asc New: ---- phpMyAdmin-4.7.7-all-languages.tar.xz phpMyAdmin-4.7.7-all-languages.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.wqEXIM/_old 2017-12-29 18:51:35.813052406 +0100 +++ /var/tmp/diff_new_pack.wqEXIM/_new 2017-12-29 18:51:35.817051257 +0100 @@ -29,7 +29,7 @@ %define ap_grp nogroup %endif Name: phpMyAdmin -Version: 4.7.6 +Version: 4.7.7 Release: 0 Summary: Administration of MySQL over the web License: GPL-2.0+ ++++++ phpMyAdmin-4.7.6-all-languages.tar.xz -> phpMyAdmin-4.7.7-all-languages.tar.xz ++++++ /work/SRC/openSUSE:Factory/phpMyAdmin/phpMyAdmin-4.7.6-all-languages.tar.xz /work/SRC/openSUSE:Factory/.phpMyAdmin.new/phpMyAdmin-4.7.7-all-languages.tar.xz differ: char 26, line 1

1 0

commit flannel for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package flannel for openSUSE:Factory checked in at 2017-12-29 18:51:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/flannel (Old) and /work/SRC/openSUSE:Factory/.flannel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "flannel" Fri Dec 29 18:51:22 2017 rev:8 rq:560101 version:0.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/flannel/flannel.changes 2017-11-30 12:45:04.474609809 +0100 +++ /work/SRC/openSUSE:Factory/.flannel.new/flannel.changes 2017-12-29 18:51:29.930741851 +0100 @@ -1,0 +2,14 @@ +Mon Nov 27 09:28:36 UTC 2017 - opensuse-packaging(a)opensuse.org + +- Update to version 0.9.1: + * kube: Update manifests to v0.9.1 + * network/iptables: Add iptables rules to FORWARD chain + * kube-flannel.yml: Update to v0.9.0 and improve docs + * Update README.md + * Fix horrendous README typo + * Always ensure iptables masquerade rules are installed + * Makefile: Stop pulling the unused lib from kube-cross + * subnet/*: Remove unused reservations code + * use init container to install cni on flannel daemonset + +------------------------------------------------------------------- Old: ---- flannel-0.8.0.tar.xz New: ---- flannel-0.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ flannel.spec ++++++ --- /var/tmp/diff_new_pack.1KpqSc/_old 2017-12-29 18:51:31.058417973 +0100 +++ /var/tmp/diff_new_pack.1KpqSc/_new 2017-12-29 18:51:31.082411083 +0100 @@ -22,7 +22,7 @@ %endif Name: flannel -Version: 0.8.0 +Version: 0.9.1 Release: 0 Summary: An etcd backed network fabric for containers License: Apache-2.0 @@ -36,7 +36,7 @@ BuildRequires: golang-packaging BuildRequires: systemd BuildRequires: xz -BuildRequires: golang(API) = 1.8 +BuildRequires: golang(API) >= 1.8 Requires(post): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build %{go_nostrip} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.1KpqSc/_old 2017-12-29 18:51:31.286352509 +0100 +++ /var/tmp/diff_new_pack.1KpqSc/_new 2017-12-29 18:51:31.290351361 +0100 @@ -4,8 +4,8 @@ <param name="url">git@github.com:coreos/flannel.git</param> <param name="exclude">.git</param> <param name="filename">flannel</param> - <param name="versionformat">0.8.0</param> - <param name="revision">v0.8.0</param> + <param name="versionformat">0.9.1</param> + <param name="revision">v0.9.1</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> ++++++ flannel-0.8.0.tar.xz -> flannel-0.9.1.tar.xz ++++++ ++++ 2424 lines of diff (skipped)

1 0

commit higan for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package higan for openSUSE:Factory checked in at 2017-12-29 18:51:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/higan (Old) and /work/SRC/openSUSE:Factory/.higan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "higan" Fri Dec 29 18:51:18 2017 rev:4 rq:560099 version:0.106 Changes: -------- --- /work/SRC/openSUSE:Factory/higan/higan.changes 2017-12-03 10:12:39.900638787 +0100 +++ /work/SRC/openSUSE:Factory/.higan.new/higan.changes 2017-12-29 18:51:26.387759423 +0100 @@ -1,0 +2,5 @@ +Mon Dec 25 02:49:47 UTC 2017 - kamikazow(a)opensuse.org + +- Use GCC 7 for Leap 42.x + +------------------------------------------------------------------- @@ -5,2 +10,2 @@ - rename create-config.patch to create_config.patch to match - debian url reference +- Rename create-config.patch to create_config.patch to match + Debian URL reference ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ higan.spec ++++++ --- /var/tmp/diff_new_pack.zQAEr2/_old 2017-12-29 18:51:27.719376972 +0100 +++ /var/tmp/diff_new_pack.zQAEr2/_new 2017-12-29 18:51:27.739371230 +0100 @@ -65,9 +65,9 @@ ExcludeArch: aarch64 # openSUSE Leap 42.x defaults to GCC 4 %if 0%{?suse_version} == 1315 -%define _cxx g++-6 -BuildRequires: gcc6 -BuildRequires: gcc6-c++ +%define _cxx g++-7 +BuildRequires: gcc7 +BuildRequires: gcc7-c++ %else %define _cxx g++ BuildRequires: gcc

1 0

commit cacti-spine for openSUSE:Factory
by root＠hilbert.suse.de 29 Dec '17

29 Dec '17

Hello community, here is the log from the commit of package cacti-spine for openSUSE:Factory checked in at 2017-12-29 18:51:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cacti-spine (Old) and /work/SRC/openSUSE:Factory/.cacti-spine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cacti-spine" Fri Dec 29 18:51:13 2017 rev:8 rq:560095 version:1.1.29 Changes: -------- --- /work/SRC/openSUSE:Factory/cacti-spine/cacti-spine.changes 2017-11-20 17:07:20.561555964 +0100 +++ /work/SRC/openSUSE:Factory/.cacti-spine.new/cacti-spine.changes 2017-12-29 18:51:22.976739094 +0100 @@ -1,0 +2,6 @@ +Wed Dec 27 11:33:03 UTC 2017 - liedke(a)rz.uni-mannheim.de + +- Update to version 1.1.29 + * issue#39: Have spine match cacti_log function + +------------------------------------------------------------------- Old: ---- 1.1.28.tar.gz New: ---- 1.1.29.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cacti-spine.spec ++++++ --- /var/tmp/diff_new_pack.ab9jyX/_old 2017-12-29 18:51:23.532579452 +0100 +++ /var/tmp/diff_new_pack.ab9jyX/_new 2017-12-29 18:51:23.532579452 +0100 @@ -17,7 +17,7 @@ Name: cacti-spine -Version: 1.1.28 +Version: 1.1.29 Release: 0 Url: https://github.com/Cacti/spine Source: https://github.com/Cacti/spine/archive/release/%{version}.tar.gz ++++++ 1.1.28.tar.gz -> 1.1.29.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.1.28/ChangeLog new/spine-release-1.1.29/ChangeLog --- old/spine-release-1.1.28/ChangeLog 2017-10-28 00:59:37.000000000 +0200 +++ new/spine-release-1.1.29/ChangeLog 2017-12-27 03:58:33.000000000 +0100 @@ -1,5 +1,8 @@ The Cacti Group | spine +1.1.29 +-issue#39: Have spine match cacti_log function + 1.1.28 -feature: release to match Cacti release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.1.28/configure.ac new/spine-release-1.1.29/configure.ac --- old/spine-release-1.1.28/configure.ac 2017-10-28 00:59:37.000000000 +0200 +++ new/spine-release-1.1.29/configure.ac 2017-12-27 03:58:33.000000000 +0100 @@ -1,5 +1,5 @@ AC_PREREQ(2.53) -AC_INIT(Spine Poller, 1.1.28, http://www.cacti.net/issues.php) +AC_INIT(Spine Poller, 1.1.29, http://www.cacti.net/issues.php) AC_CONFIG_AUX_DIR(config) AC_SUBST(ac_aux_dir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.1.28/spine.c new/spine-release-1.1.29/spine.c --- old/spine-release-1.1.28/spine.c 2017-10-28 00:59:37.000000000 +0200 +++ new/spine-release-1.1.29/spine.c 2017-12-27 03:58:33.000000000 +0100 @@ -257,6 +257,12 @@ /* set default verbosity */ set.log_level = POLLER_VERBOSITY_LOW; + /* set default log separator */ + set.log_datetime_separator = GDC_DEFAULT; + + /* set default log format */ + set.log_datetime_format = GD_DEFAULT; + /* set the default exit code */ set.exit_code = 0; @@ -340,11 +346,11 @@ if (STRIMATCH(getarg(opt, &argv), "online")) { set.mode = REMOTE_ONLINE; - } + } else if (STRIMATCH(getarg(opt, &argv), "offline")) { set.mode = REMOTE_OFFLINE; - } + } else if (STRIMATCH(getarg(opt, &argv), "recovery")) { set.mode = REMOTE_RECOVERY; @@ -583,7 +589,7 @@ if (set.device_threads_exists) { SPINE_LOG_MEDIUM(("NOTE: Spine will support multithread device polling.")); }else{ - SPINE_LOG_MEDIUM(("NOTE: Spine did not detect multithreaded device polling.")); + SPINE_LOG_MEDIUM(("NOTE: Spine did not detect multithreaded device polling.")); } /* obtain the list of hosts to poll */ @@ -935,4 +941,3 @@ die("ERROR: option %s requires a parameter", optname); } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.1.28/spine.h new/spine-release-1.1.29/spine.h --- old/spine-release-1.1.28/spine.h 2017-10-28 00:59:37.000000000 +0200 +++ new/spine-release-1.1.29/spine.h 2017-12-27 03:58:33.000000000 +0100 @@ -217,6 +217,26 @@ #define POLLER_VERBOSITY_DEBUG 5 #define POLLER_VERBOSITY_DEVDBG 6 +/* logging separator constants */ +#define GDC_MIN 0 +#define GDC_HYPHEN 0 +#define GDC_SLASH 1 +#define GDC_DOT 2 +#define GDC_MAX 2 +#define GDC_DEFAULT 1 + +/* logging format constants */ +#define GD_FMT_SIZE 21 +#define GD_MIN 0 +#define GD_MO_D_Y 0 +#define GD_MN_D_Y 1 +#define GD_D_MO_Y 2 +#define GD_D_MN_Y 3 +#define GD_Y_MO_D 4 +#define GD_Y_MN_D 5 +#define GD_MAX 5 +#define GD_DEFAULT 5 + /* host availability statics */ #define AVAIL_NONE 0 #define AVAIL_SNMP_AND_PING 1 @@ -333,6 +353,8 @@ int log_pstats; char selective_device_debug[SMALL_BUFSIZE]; int spine_log_level; + int log_datetime_separator; + int log_datetime_format; /* ping settings */ int icmp_avail; int availability_method; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.1.28/util.c new/spine-release-1.1.29/util.c --- old/spine-release-1.1.28/util.c 2017-10-28 00:59:37.000000000 +0200 +++ new/spine-release-1.1.29/util.c 2017-12-27 03:58:33.000000000 +0100 @@ -102,7 +102,7 @@ if (result != 0) { if (mysql_num_rows(result) > 0) { mysql_row = mysql_fetch_row(result); - + if (mysql_row != NULL) { retval = strdup(mysql_row[0]); db_free_result(result); @@ -196,7 +196,7 @@ if (result != 0) { if (mysql_num_rows(result) > 0) { mysql_row = mysql_fetch_row(result); - + if (mysql_row != NULL) { retval = strdup(mysql_row[1]); db_free_result(result); @@ -286,6 +286,26 @@ snprintf(set.path_logfile, SMALL_BUFSIZE, "%s/log/cacti.log", web_root); } + /* get log separator */ + if ((res = getsetting(&mysql, "default_datechar")) != 0) { + set.log_datetime_separator = atoi(res); + free((char *)res); + + if (set.log_datetime_separator < GDC_MIN || set.log_datetime_separator > GDC_MAX) { + set.log_datetime_separator = GDC_DEFAULT; + } + } + + /* get log separator */ + if ((res = getsetting(&mysql, "default_datechar")) != 0) { + set.log_datetime_separator = atoi(res); + free((char *)res); + + if (set.log_datetime_separator < GDC_MIN || set.log_datetime_separator > GDC_MAX) { + set.log_datetime_separator = GDC_DEFAULT; + } + } + /* log the path_webroot variable */ SPINE_LOG_DEBUG(("DEBUG: The path_php_server variable is %s", set.path_php_server)); @@ -703,6 +723,56 @@ exit(set.exit_code); } +char * get_date_format() +{ + char *log_fmt; + if (!(log_fmt = (char *) malloc(GD_FMT_SIZE))) { + die("ERROR: Fatal malloc error: util.c get_date_format!"); + } + + char log_sep = '/'; + if (set.log_datetime_separator < GDC_MIN || set.log_datetime_separator > GDC_MAX) { + set.log_datetime_separator = GDC_DEFAULT; + } + + if (set.log_datetime_format < GD_MIN || set.log_datetime_format > GD_MAX) { + set.log_datetime_format = GD_DEFAULT; + } + + switch (set.log_datetime_separator) + { + case GDC_DOT: + log_sep = '.'; + break; + case GDC_HYPHEN: + log_sep = '-'; + break; + default: + log_sep = '/'; + break; + } + + switch (set.log_datetime_format) + { + case GD_MO_D_Y: + snprintf(log_fmt, GD_FMT_SIZE, "%%m%c%%d%c%%Y %%H:%%M:%%S - ", log_sep, log_sep); + case GD_MN_D_Y: + snprintf(log_fmt, GD_FMT_SIZE, "%%b%c%%d%c%%Y %%H:%%M:%%S - ", log_sep, log_sep); + case GD_D_MO_Y: + snprintf(log_fmt, GD_FMT_SIZE, "%%d%c%%m%c%%Y %%H:%%M:%%S - ", log_sep, log_sep); + case GD_D_MN_Y: + snprintf(log_fmt, GD_FMT_SIZE, "%%d%c%%b%c%%Y %%H:%%M:%%S - ", log_sep, log_sep); + case GD_Y_MO_D: + snprintf(log_fmt, GD_FMT_SIZE, "%%Y%c%%m%c%%d %%H:%%M:%%S - ", log_sep, log_sep); + case GD_Y_MN_D: + snprintf(log_fmt, GD_FMT_SIZE, "%%Y%c%%b%c%%d %%H:%%M:%%S - ", log_sep, log_sep); + default: + snprintf(log_fmt, GD_FMT_SIZE, "%%Y%c%%m%c%%d %%H:%%M:%%S - ", log_sep, log_sep); + } + + return (log_fmt); +} + /*! \fn void spine_log(const char *format, ...) * \brief output's log information to the desired cacti logfile. * \param *logmessage a pointer to the pre-formated log message. @@ -747,7 +817,24 @@ localtime_r(&nowbin,&now_time); now_ptr = &now_time; - if (strftime(flogmessage, 50, "%Y-%m-%d %H:%M:%S - ", now_ptr) == (size_t) 0) { + char * log_fmt = get_date_format(); + if (strlen(log_fmt) == 0) { + #ifdef DISABLE_STDERR + fp = stdout; + #else + fp = stderr; + #endif + + if ((set.stderr_notty) && (fp == stderr)) { + /* do nothing stderr does not exist */ + }else if ((set.stdout_notty) && (fp == stdout)) { + /* do nothing stdout does not exist */ + }else{ + fprintf(fp, "ERROR: Could not get format from get_date_format()\n"); + } + } + + if (strftime(flogmessage, 50, log_fmt, now_ptr) == (size_t) 0) { #ifdef DISABLE_STDERR fp = stdout; #else @@ -833,6 +920,8 @@ } } + free(log_fmt); + return TRUE; } @@ -1238,22 +1327,22 @@ unsigned long long hex2dec(char *str) { int i = 0; unsigned long long number = 0; - + if (!str) return 0; /* first revers the string */ reverse(str); - + while (*str) { switch (*str) { - case '0': + case '0': i++; break; - case '1': + case '1': number += pow(16, i) * 1; i++; break; - case '2': + case '2': number += pow(16, i) * 2; i++; break; @@ -1261,15 +1350,15 @@ number += pow(16, i) * 3; i++; break; - case '4': + case '4': number += pow(16, i) * 4; i++; break; - case '5': + case '5': number += pow(16, i) * 5; i++; break; - case '6': + case '6': number += pow(16, i) * 6; i++; break; @@ -1277,7 +1366,7 @@ number += pow(16, i) * 7; i++; break; - case '8': + case '8': number += pow(16, i) * 8; i++; break; @@ -1285,7 +1374,7 @@ number += pow(16, i) * 9; i++; break; - case 'a': case 'A': + case 'a': case 'A': number += pow(16, i) * 10; i++; break; @@ -1293,7 +1382,7 @@ number += pow(16, i) * 11; i++; break; - case 'c': case 'C': + case 'c': case 'C': number += pow(16, i) * 12; i++; break; @@ -1301,7 +1390,7 @@ number += pow(16, i) * 13; i++; break; - case 'e': case 'E': + case 'e': case 'E': number += pow(16, i) * 14; i++; break; @@ -1399,7 +1488,7 @@ #else if (hasCaps() != TRUE) { seteuid(0); - + if (geteuid() != 0) { SPINE_LOG_DEBUG(("WARNING: Spine NOT running asroot. This is required if using ICMP. Please run \"chown root:root spine;chmod +s spine\" to resolve.")); set.icmp_avail = FALSE; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spine-release-1.1.28/util.h new/spine-release-1.1.29/util.h --- old/spine-release-1.1.28/util.h 2017-10-28 00:59:37.000000000 +0200 +++ new/spine-release-1.1.29/util.h 2017-12-27 03:58:33.000000000 +0100 @@ -85,3 +85,6 @@ /* see if we can do things as root */ extern void checkAsRoot(); + +/* log format */ +extern char *get_date_format();

1 0