April 2016 - openSUSE Commits - openSUSE Mailing Lists

commit cinnamon-settings-daemon for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package cinnamon-settings-daemon for openSUSE:Factory checked in at 2016-04-28 16:56:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-settings-daemon (Old) and /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-settings-daemon" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-settings-daemon/cinnamon-settings-daemon.changes 2016-03-16 10:35:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-settings-daemon.new/cinnamon-settings-daemon.changes 2016-04-28 17:01:42.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Apr 25 05:00:35 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.0.0: + * Add dbus method to play sound event on specified channel. + * Correct the icon shown in the OSD when the mic-mute button is + used. + * Power plugin: Fix CSD not notifying Cinnamon on device removal. + +------------------------------------------------------------------- Old: ---- cinnamon-settings-daemon-2.8.4.tar.gz New: ---- cinnamon-settings-daemon-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-settings-daemon.spec ++++++ --- /var/tmp/diff_new_pack.5YEd0c/_old 2016-04-28 17:01:44.000000000 +0200 +++ /var/tmp/diff_new_pack.5YEd0c/_new 2016-04-28 17:01:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: cinnamon-settings-daemon -Version: 2.8.4 +Version: 3.0.0 Release: 0 Summary: The settings Daemon for the Cinnamon Desktop License: GPL-2.0+ and LGPL-2.1 @@ -29,10 +29,12 @@ BuildRequires: gnome-common BuildRequires: hicolor-icon-theme BuildRequires: libtool +BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: xf86-input-wacom BuildRequires: pkgconfig(cinnamon-desktop) BuildRequires: pkgconfig(colord) +BuildRequires: pkgconfig(cvc) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) @@ -46,7 +48,7 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(libsystemd-login) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libwacom) BuildRequires: pkgconfig(libxklavier) BuildRequires: pkgconfig(nss) @@ -65,6 +67,7 @@ Summary: The settings Daemon for the Cinnamon Desktop -- Development Files Group: Development/Libraries/C and C++ Requires: %{name} = %{version} +Requires: pkg-config Requires: pkgconfig(dbus-glib-1) Requires: pkgconfig(glib-2.0) ++++++ cinnamon-settings-daemon-2.8.4.tar.gz -> cinnamon-settings-daemon-3.0.0.tar.gz ++++++ ++++ 7329 lines of diff (skipped)

1 0

commit ibacm for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package ibacm for openSUSE:Factory checked in at 2016-04-28 16:56:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ibacm (Old) and /work/SRC/openSUSE:Factory/.ibacm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ibacm" Changes: -------- --- /work/SRC/openSUSE:Factory/ibacm/ibacm.changes 2015-11-08 14:36:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ibacm.new/ibacm.changes 2016-04-28 17:01:38.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 13 07:30:09 UTC 2016 - p.drouand(a)gmail.com + +- Update to version 1.2.0 + * Empty changelog + +------------------------------------------------------------------- Old: ---- ibacm-1.1.0.tar.gz New: ---- ibacm-1.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ibacm.spec ++++++ --- /var/tmp/diff_new_pack.jo3Nnp/_old 2016-04-28 17:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.jo3Nnp/_new 2016-04-28 17:01:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ibacm # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -19,7 +19,7 @@ %define so_ver 1 Name: ibacm -Version: 1.1.0 +Version: 1.2.0 Release: 0 Summary: InfiniBand Communication Manager Assistant License: GPL-2.0 or BSD-2-Clause @@ -82,11 +82,12 @@ %files -n lib%{name}p%{so_ver} %defattr(-,root,root,-) %dir %{_libdir}/%{name} -%{_libdir}/%{name}/lib%{name}p.* +%{_libdir}/%{name}/lib%{name}p.so.* %files devel %defattr(-,root,root,-) %{_includedir}/infiniband/acm.h %{_includedir}/infiniband/acm_prov.h +%{_libdir}/%{name}/lib%{name}p.so %changelog ++++++ ibacm-1.1.0.tar.gz -> ibacm-1.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/Makefile.am new/ibacm-1.2.0/Makefile.am --- old/ibacm-1.1.0/Makefile.am 2015-07-30 22:54:10.000000000 +0200 +++ new/ibacm-1.2.0/Makefile.am 2016-03-18 21:25:29.000000000 +0100 @@ -40,7 +40,7 @@ EXTRA_DIST = src/acm_util.h prov/acmp/src/libibacmp.map \ include/acm_mad.h src/libacm.h ibacm.init.in \ linux/osd.h linux/dlist.h ibacm.spec.in \ - $(man_MANS) ibacm_hosts.data + $(man_MANS) ibacm_hosts.data src/acm_netlink.h install-exec-hook: install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/Makefile.in new/ibacm-1.2.0/Makefile.in --- old/ibacm-1.1.0/Makefile.in 2015-07-30 22:55:40.000000000 +0200 +++ new/ibacm-1.2.0/Makefile.in 2016-03-18 21:26:44.000000000 +0100 @@ -306,7 +306,7 @@ EXTRA_DIST = src/acm_util.h prov/acmp/src/libibacmp.map \ include/acm_mad.h src/libacm.h ibacm.init.in \ linux/osd.h linux/dlist.h ibacm.spec.in \ - $(man_MANS) ibacm_hosts.data + $(man_MANS) ibacm_hosts.data src/acm_netlink.h all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/config.h.in new/ibacm-1.2.0/config.h.in --- old/ibacm-1.1.0/config.h.in 2015-07-30 22:56:49.000000000 +0200 +++ new/ibacm-1.2.0/config.h.in 2016-03-18 21:38:57.000000000 +0100 @@ -18,6 +18,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Have netlink header files */ +#undef HAVE_NETLINK + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/configure new/ibacm-1.2.0/configure --- old/ibacm-1.1.0/configure 2015-07-30 22:55:37.000000000 +0200 +++ new/ibacm-1.2.0/configure 2016-03-18 21:26:41.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for ibacm 1.1.0. +# Generated by GNU Autoconf 2.67 for ibacm 1.2.0. # # Report bugs to <linux-rdma(a)vger.kernel.org>. # @@ -701,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='ibacm' PACKAGE_TARNAME='ibacm' -PACKAGE_VERSION='1.1.0' -PACKAGE_STRING='ibacm 1.1.0' +PACKAGE_VERSION='1.2.0' +PACKAGE_STRING='ibacm 1.2.0' PACKAGE_BUGREPORT='linux-rdma(a)vger.kernel.org' PACKAGE_URL='' @@ -1427,7 +1427,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 ibacm 1.1.0 to adapt to many kinds of systems. +\`configure' configures ibacm 1.2.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1497,7 +1497,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ibacm 1.1.0:";; + short | recursive ) echo "Configuration of ibacm 1.2.0:";; esac cat <<\_ACEOF @@ -1601,7 +1601,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ibacm configure 1.1.0 +ibacm configure 1.2.0 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2148,7 +2148,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ibacm $as_me 1.1.0, which was +It was created by ibacm $as_me 1.2.0, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2966,7 +2966,7 @@ # Define the identity of the package. PACKAGE='ibacm' - VERSION='1.1.0' + VERSION='1.2.0' cat >>confdefs.h <<_ACEOF @@ -11656,6 +11656,26 @@ fi +ac_fn_c_check_header_mongrel "$LINENO" "rdma/rdma_netlink.h" "ac_cv_header_rdma_rdma_netlink_h" "$ac_includes_default" +if test "x$ac_cv_header_rdma_rdma_netlink_h" = x""yes; then : + ac_fn_c_check_header_mongrel "$LINENO" "rdma/ib_user_sa.h" "ac_cv_header_rdma_ib_user_sa_h" "$ac_includes_default" +if test "x$ac_cv_header_rdma_ib_user_sa_h" = x""yes; then : + +$as_echo "#define HAVE_NETLINK 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing rdma/ib_user_sa.h" >&5 +$as_echo "$as_me: WARNING: Missing rdma/ib_user_sa.h" >&2;} +fi + + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing rdma/rdma_netlink.h" >&5 +$as_echo "$as_me: WARNING: Missing rdma/rdma_netlink.h" >&2;} +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler support for atomics" >&5 $as_echo_n "checking compiler support for atomics... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12257,7 +12277,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ibacm $as_me 1.1.0, which was +This file was extended by ibacm $as_me 1.2.0, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12323,7 +12343,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ibacm config.status 1.1.0 +ibacm config.status 1.2.0 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/configure.ac new/ibacm-1.2.0/configure.ac --- old/ibacm-1.1.0/configure.ac 2015-07-30 22:54:03.000000000 +0200 +++ new/ibacm-1.2.0/configure.ac 2016-03-18 21:25:13.000000000 +0100 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([ibacm], [1.1.0], [linux-rdma(a)vger.kernel.org]) +AC_INIT([ibacm], [1.2.0], [linux-rdma(a)vger.kernel.org]) AC_CONFIG_SRCDIR([src/acm.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADERS([config.h]) @@ -61,6 +61,13 @@ AC_MSG_ERROR([<infiniband/umad.h> not found. Is libibumad installed?])) fi +dnl Check netlink header files +AC_CHECK_HEADER(rdma/rdma_netlink.h, + AC_CHECK_HEADER(rdma/ib_user_sa.h, + AC_DEFINE(HAVE_NETLINK, 1, [Have netlink header files]), + AC_MSG_WARN([Missing rdma/ib_user_sa.h])), + AC_MSG_WARN([Missing rdma/rdma_netlink.h])) + dnl Check for gcc atomic intrinsics AC_MSG_CHECKING(compiler support for atomics) AC_TRY_LINK([int i = 0;], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/ibacm.spec new/ibacm-1.2.0/ibacm.spec --- old/ibacm-1.1.0/ibacm.spec 2015-07-30 22:58:24.000000000 +0200 +++ new/ibacm-1.2.0/ibacm.spec 2016-03-18 21:51:09.000000000 +0100 @@ -1,5 +1,5 @@ Name: ibacm -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: InfiniBand Communication Manager Assistant diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/ibacm.spec.in new/ibacm-1.2.0/ibacm.spec.in --- old/ibacm-1.1.0/ibacm.spec.in 2015-07-30 22:54:10.000000000 +0200 +++ new/ibacm-1.2.0/ibacm.spec.in 2016-03-18 21:25:29.000000000 +0100 @@ -1,5 +1,5 @@ Name: ibacm -Version: 1.1.0 +Version: 1.2.0 Release: 1%{?dist} Summary: InfiniBand Communication Manager Assistant diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/prov/acmp/src/acmp.c new/ibacm-1.2.0/prov/acmp/src/acmp.c --- old/ibacm-1.1.0/prov/acmp/src/acmp.c 2015-07-30 22:54:10.000000000 +0200 +++ new/ibacm-1.2.0/prov/acmp/src/acmp.c 2016-03-18 21:25:29.000000000 +0100 @@ -46,15 +46,18 @@ #include <infiniband/acm_prov.h> #include <infiniband/umad.h> #include <infiniband/verbs.h> +#include <ifaddrs.h> #include <dlist.h> #include <dlfcn.h> #include <search.h> +#include <netdb.h> #include <net/if.h> #include <sys/ioctl.h> #include <net/if_arp.h> #include <netinet/in.h> #include <linux/netlink.h> #include <linux/rtnetlink.h> +#include "acm_util.h" #include "acm_mad.h" #define src_out data[0] @@ -1739,6 +1742,74 @@ } static int +acmp_check_addr_match(struct ifaddrs *iap, struct acm_ep_addr_data *saddr, + unsigned int d_family) +{ + char sip[INET6_ADDRSTRLEN] = {0}; + char dip[INET6_ADDRSTRLEN] = {0}; + const char *tmp; + size_t sock_size; + unsigned int s_family; + int ret; + + s_family = iap->ifa_addr->sa_family; + + if (!iap->ifa_addr || + !(iap->ifa_flags & IFF_UP) || + (s_family != d_family)) + return -1; + + sock_size = (s_family == AF_INET) ? sizeof(struct sockaddr_in) : + sizeof(struct sockaddr_in6); + + ret = getnameinfo(iap->ifa_addr, sock_size, + sip, sizeof(sip), + NULL, 0, NI_NUMERICHOST); + + if (ret) + return ret; + + tmp = inet_ntop(d_family, (void *)saddr->info.addr, dip, + sizeof(dip)); + if (!tmp) + return -1; + ret = memcmp(sip, dip, strlen(dip)); + return ret; +} + +static void +acmp_acquire_sgid(struct acm_ep_addr_data *saddr, + struct acmp_dest *dest) +{ + struct ifaddrs *addrs, *iap; + unsigned int d_family; + int ret; + + if (!ib_any_gid(&dest->path.sgid)) + return; + + if (dest->addr_type != ACM_ADDRESS_IP6 && + dest->addr_type != ACM_ADDRESS_IP) + return; + + if (getifaddrs(&addrs)) + return; + + d_family = (dest->addr_type == ACM_ADDRESS_IP) ? AF_INET : AF_INET6; + + for (iap = addrs; iap != NULL; iap = iap->ifa_next) { + ret = acmp_check_addr_match(iap, saddr, d_family); + if (!ret) { + ret = acm_if_get_sgid(iap->ifa_name, + &dest->path.sgid); + if (!ret) + break; + } + } + freeifaddrs(addrs); +} + +static int acmp_resolve_dest(struct acmp_ep *ep, struct acm_msg *msg, uint64_t id) { struct acmp_dest *dest; @@ -1774,6 +1845,7 @@ acm_log(2, "have address, resolving route\n"); acm_increment_counter(ACM_CNTR_ADDR_CACHE); atomic_inc(&ep->counters[ACM_CNTR_ADDR_CACHE]); + acmp_acquire_sgid(saddr, dest); status = acmp_resolve_path_sa(ep, dest, acmp_dest_sa_resp); if (status) { break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/src/acm.c new/ibacm-1.2.0/src/acm.c --- old/ibacm-1.1.0/src/acm.c 2015-07-30 22:54:10.000000000 +0200 +++ new/ibacm-1.2.0/src/acm.c 2016-03-18 21:25:29.000000000 +0100 @@ -46,6 +46,10 @@ #include <infiniband/acm_prov.h> #include <infiniband/umad.h> #include <infiniband/verbs.h> +#ifdef HAVE_NETLINK +#include <infiniband/umad_types.h> +#include <infiniband/umad_sa.h> +#endif #include <dlist.h> #include <dlfcn.h> #include <search.h> @@ -55,9 +59,18 @@ #include <netinet/in.h> #include <linux/netlink.h> #include <linux/rtnetlink.h> +#ifdef HAVE_NETLINK +#include <rdma/rdma_netlink.h> +#include <rdma/ib_user_sa.h> +#endif #include <poll.h> #include "acm_mad.h" #include "acm_util.h" +#ifdef HAVE_NETLINK +#if !defined(RDMA_NL_LS_F_ERR) + #include "acm_netlink.h" +#endif +#endif #define src_out data[0] #define src_index data[1] @@ -66,6 +79,9 @@ #define MAX_EP_ADDR 4 #define NL_MSG_BUF_SIZE 4096 #define ACM_PROV_NAME_SIZE 64 +#ifdef HAVE_NETLINK +#define NL_CLIENT_INDEX 0 +#endif struct acmc_subnet { DLIST_ENTRY entry; @@ -106,7 +122,8 @@ union ibv_gid *gid_tbl; uint16_t lid; uint16_t lid_mask; - int default_pkey_index; + int sa_pkey_index; + uint16_t def_acm_pkey; }; struct acmc_device { @@ -151,6 +168,23 @@ struct acm_sa_mad mad; }; +#ifdef HAVE_NETLINK +struct acm_nl_path { + struct nlattr attr_hdr; + struct ib_path_rec_data rec; +}; + +struct acm_nl_msg { + struct nlmsghdr nlmsg_header; + union { + uint8_t data[ACM_MSG_DATA_LENGTH]; + struct rdma_ls_resolve_header resolve_header; + struct nlattr attr[0]; + struct acm_nl_path path[0]; + }; +}; +#endif + static char def_prov_name[ACM_PROV_NAME_SIZE] = "ibacmp"; static DLIST_ENTRY provider_list; static struct acmc_prov *def_provider = NULL; @@ -172,6 +206,9 @@ static int acm_ep_insert_addr(struct acmc_ep *ep, const char *name, uint8_t *addr, size_t addr_len, uint8_t addr_type); static void acm_event_handler(struct acmc_device *dev); +#ifdef HAVE_NETLINK +static int acm_nl_send(SOCKET sock, struct acm_msg *msg); +#endif static struct sa_data { int timeout; @@ -466,7 +503,13 @@ goto release; } - ret = send(client->sock, (char *) msg, msg->hdr.length, 0); +#ifdef HAVE_NETLINK + if (id == NL_CLIENT_INDEX) + ret = acm_nl_send(client->sock, msg); + else +#endif + ret = send(client->sock, (char *) msg, msg->hdr.length, 0); + if (ret != msg->hdr.length) acm_log(0, "ERROR - failed to send response\n"); else @@ -597,6 +640,10 @@ } for (i = 0; i < FD_SETSIZE - 1; i++) { + #ifdef HAVE_NETLINK + if (i == NL_CLIENT_INDEX) + continue; + #endif if (!atomic_get(&client_array[i].refcnt)) break; } @@ -1346,6 +1393,330 @@ } } +#ifdef HAVE_NETLINK +static int acm_nl_send(SOCKET sock, struct acm_msg *msg) +{ + struct sockaddr_nl dst_addr; + struct acm_nl_msg acmnlmsg; + struct acm_nl_msg *orig; + int ret; + int datalen; + + orig = (struct acm_nl_msg *) msg->hdr.tid; + + memset(&dst_addr, 0, sizeof(dst_addr)); + dst_addr.nl_family = AF_NETLINK; + dst_addr.nl_groups = (1 << (RDMA_NL_GROUP_LS - 1)); + + memset(&acmnlmsg, 0, sizeof(acmnlmsg)); + acmnlmsg.nlmsg_header.nlmsg_len = NLMSG_HDRLEN; + acmnlmsg.nlmsg_header.nlmsg_pid = getpid(); + acmnlmsg.nlmsg_header.nlmsg_type = orig->nlmsg_header.nlmsg_type; + acmnlmsg.nlmsg_header.nlmsg_seq = orig->nlmsg_header.nlmsg_seq; + + if (msg->hdr.status != ACM_STATUS_SUCCESS) { + acm_log(2, "acm status no success = %d\n", msg->hdr.status); + acmnlmsg.nlmsg_header.nlmsg_flags |= RDMA_NL_LS_F_ERR; + } else { + acm_log(2, "acm status success\n"); + acmnlmsg.nlmsg_header.nlmsg_len += + NLA_ALIGN(sizeof(struct acm_nl_path)); + acmnlmsg.path[0].attr_hdr.nla_type = LS_NLA_TYPE_PATH_RECORD; + acmnlmsg.path[0].attr_hdr.nla_len = sizeof(struct acm_nl_path); + if (orig->resolve_header.path_use == + LS_RESOLVE_PATH_USE_UNIDIRECTIONAL) + acmnlmsg.path[0].rec.flags = IB_PATH_PRIMARY | + IB_PATH_OUTBOUND; + else + acmnlmsg.path[0].rec.flags = IB_PATH_PRIMARY | + IB_PATH_GMP | IB_PATH_BIDIRECTIONAL; + memcpy(acmnlmsg.path[0].rec.path_rec, + &msg->resolve_data[0].info.path, + sizeof(struct ibv_path_record)); + } + + datalen = NLMSG_ALIGN(acmnlmsg.nlmsg_header.nlmsg_len); + ret = sendto(sock, &acmnlmsg, datalen, 0, + (const struct sockaddr *)&dst_addr, + (socklen_t)sizeof(dst_addr)); + if (ret != datalen) { + acm_log(0, "ERROR - sendto = %d errno = %d\n", ret, errno); + ret = -1; + } else { + ret = msg->hdr.length; + } + + free(orig); + + return ret; +} + +#define NLA_LEN(nla) ((nla)->nla_len - NLA_HDRLEN) +#define NLA_DATA(nla) ((char *)(nla) + NLA_HDRLEN) + +static int acm_nl_parse_path_attr(struct nlattr *attr, + struct acm_ep_addr_data *data) +{ + struct ibv_path_record *path; + uint64_t *sid; + struct rdma_nla_ls_gid *gid; + uint8_t *tcl; + uint16_t *pkey; + uint16_t *qos; + uint16_t val; + int ret = 0; + +#define IBV_PATH_RECORD_QOS_MASK 0xfff0 + + path = &data->info.path; + switch (attr->nla_type & RDMA_NLA_TYPE_MASK) { + case LS_NLA_TYPE_SERVICE_ID: + sid = (uint64_t *) NLA_DATA(attr); + if (NLA_LEN(attr) == sizeof(*sid)) { + acm_log(2, "service_id 0x%llx\n", *sid); + path->service_id = htonll(*sid); + } else { + ret = -1; + } + break; + + case LS_NLA_TYPE_DGID: + gid = (struct rdma_nla_ls_gid *) NLA_DATA(attr); + if (NLA_LEN(attr) == sizeof(gid->gid)) { + acm_format_name(2, log_data, sizeof(log_data), + ACM_ADDRESS_GID, gid->gid, + sizeof(union ibv_gid)); + acm_log(2, "path dgid %s\n", log_data); + memcpy(path->dgid.raw, gid->gid, sizeof(path->dgid)); + data->flags |= ACM_EP_FLAG_DEST; + } else { + ret = -1; + } + break; + + case LS_NLA_TYPE_SGID: + gid = (struct rdma_nla_ls_gid *) NLA_DATA(attr); + if (NLA_LEN(attr) == sizeof(gid->gid)) { + acm_format_name(2, log_data, sizeof(log_data), + ACM_ADDRESS_GID, gid->gid, + sizeof(union ibv_gid)); + acm_log(2, "path sgid %s\n", log_data); + memcpy(path->sgid.raw, gid->gid, sizeof(path->sgid)); + data->flags |= ACM_EP_FLAG_SOURCE; + } else { + ret = -1; + } + break; + + case LS_NLA_TYPE_TCLASS: + tcl = (uint8_t *) NLA_DATA(attr); + if (NLA_LEN(attr) == sizeof(*tcl)) { + acm_log(2, "tclass 0x%x\n", *tcl); + path->tclass = *tcl; + } else { + ret = -1; + } + break; + + case LS_NLA_TYPE_PKEY: + pkey = (uint16_t *) NLA_DATA(attr); + if (NLA_LEN(attr) == sizeof(*pkey)) { + acm_log(2, "pkey 0x%x\n", *pkey); + path->pkey = htons(*pkey); + } else { + ret = -1; + } + break; + + case LS_NLA_TYPE_QOS_CLASS: + qos = (uint16_t *) NLA_DATA(attr); + if (NLA_LEN(attr) == sizeof(*qos)) { + acm_log(2, "qos_class 0x%x\n", *qos); + val = ntohs(path->qosclass_sl); + val &= ~IBV_PATH_RECORD_QOS_MASK; + val |= (*qos & IBV_PATH_RECORD_QOS_MASK); + path->qosclass_sl = htons(val); + } else { + ret = -1; + } + break; + + default: + acm_log(1, "WARN: unknown attr %x\n", attr->nla_type); + /* We can not ignore a mandatory attribute */ + if (attr->nla_type & RDMA_NLA_F_MANDATORY) + ret = -1; + break; + } + + return ret; +} + +static void acm_nl_process_invalid_request(struct acmc_client *client, + struct acm_nl_msg *acmnlmsg) +{ + struct acm_msg msg; + + memset(&msg, 0, sizeof(msg)); + msg.hdr.opcode = ACM_OP_RESOLVE; + msg.hdr.version = ACM_VERSION; + msg.hdr.length = ACM_MSG_HDR_LENGTH; + msg.hdr.status = ACM_STATUS_EINVAL; + msg.hdr.tid = (uint64_t) acmnlmsg; + + acm_nl_send(client->sock, &msg); +} + +static void acm_nl_process_resolve(struct acmc_client *client, + struct acm_nl_msg *acmnlmsg) +{ + struct acm_msg msg; + struct nlattr *attr; + int payload_len; + int resolve_hdr_len; + int rem; + int total_attr_len; + int status; + unsigned char *data; + + memset(&msg, 0, sizeof(msg)); + msg.hdr.opcode = ACM_OP_RESOLVE; + msg.hdr.version = ACM_VERSION; + msg.hdr.length = ACM_MSG_HDR_LENGTH + ACM_MSG_EP_LENGTH; + msg.hdr.status = ACM_STATUS_SUCCESS; + msg.hdr.tid = (uint64_t) acmnlmsg; + msg.resolve_data[0].type = ACM_EP_INFO_PATH; + + /* We support only one pathrecord */ + acm_log(2, "path use 0x%x\n", acmnlmsg->resolve_header.path_use); + if (acmnlmsg->resolve_header.path_use == + LS_RESOLVE_PATH_USE_UNIDIRECTIONAL) + msg.resolve_data[0].info.path.reversible_numpath = 1; + else + msg.resolve_data[0].info.path.reversible_numpath = + IBV_PATH_RECORD_REVERSIBLE | 1; + + data = (unsigned char *) &acmnlmsg->nlmsg_header + NLMSG_HDRLEN; + resolve_hdr_len = NLMSG_ALIGN(sizeof(struct rdma_ls_resolve_header)); + attr = (struct nlattr *) (data + resolve_hdr_len); + payload_len = acmnlmsg->nlmsg_header.nlmsg_len - NLMSG_HDRLEN - + resolve_hdr_len; + rem = payload_len; + while (1) { + if (rem < (int) sizeof(*attr) || + attr->nla_len < sizeof(*attr) || + attr->nla_len > rem) + break; + + status = acm_nl_parse_path_attr(attr, &msg.resolve_data[0]); + if (status) { + acm_nl_process_invalid_request(client, acmnlmsg); + return; + } + + /* Next attribute */ + total_attr_len = NLA_ALIGN(attr->nla_len); + rem -= total_attr_len; + attr = (struct nlattr *) ((char *) attr + total_attr_len); + } + + atomic_inc(&counter[ACM_CNTR_RESOLVE]); + acm_svr_resolve(client, &msg); +} + +static int acm_nl_is_valid_resolve_request(struct acm_nl_msg *acmnlmsg) +{ + int payload_len; + + payload_len = acmnlmsg->nlmsg_header.nlmsg_len - NLMSG_HDRLEN; + if (payload_len < (sizeof(struct rdma_ls_resolve_header) + + sizeof(struct nlattr))) + return 0; + + return 1; +} + +static void acm_nl_receive(struct acmc_client *client) +{ + struct acm_nl_msg *acmnlmsg; + int datalen = sizeof(*acmnlmsg); + int ret; + uint16_t client_inx, op; + + acmnlmsg = calloc(1, sizeof(*acmnlmsg)); + if (!acmnlmsg) { + acm_log(0, "Out of memory for recving nl msg.\n"); + return; + } + ret = recv(client->sock, acmnlmsg, datalen, 0); + if (!NLMSG_OK(&acmnlmsg->nlmsg_header, ret)) { + acm_log(0, "Netlink receive error: %d.\n", ret); + goto rcv_cleanup; + } + + acm_log(2, "nlmsg: len %d type 0x%x flags 0x%x seq %d pid %d\n", + acmnlmsg->nlmsg_header.nlmsg_len, + acmnlmsg->nlmsg_header.nlmsg_type, + acmnlmsg->nlmsg_header.nlmsg_flags, + acmnlmsg->nlmsg_header.nlmsg_seq, + acmnlmsg->nlmsg_header.nlmsg_pid); + + /* Currently we handle only request from the local service client */ + client_inx = RDMA_NL_GET_CLIENT(acmnlmsg->nlmsg_header.nlmsg_type); + op = RDMA_NL_GET_OP(acmnlmsg->nlmsg_header.nlmsg_type); + if (client_inx != RDMA_NL_LS) + goto rcv_cleanup; + + switch (op) { + case RDMA_NL_LS_OP_RESOLVE: + if (acm_nl_is_valid_resolve_request(acmnlmsg)) + acm_nl_process_resolve(client, acmnlmsg); + else + acm_nl_process_invalid_request(client, acmnlmsg); + break; + default: + /* Not supported*/ + acm_log(1, "WARN - invalid opcode %x\n", op); + acm_nl_process_invalid_request(client, acmnlmsg); + break; + } + + return; +rcv_cleanup: + free(acmnlmsg); +} + +static int acm_init_nl(void) +{ + struct sockaddr_nl src_addr; + int ret; + SOCKET nl_rcv_socket; + + nl_rcv_socket = socket(PF_NETLINK, SOCK_RAW, NETLINK_RDMA); + if (nl_rcv_socket == INVALID_SOCKET) { + acm_log(0, "ERROR - unable to allocate netlink recv socket\n"); + return socket_errno(); + } + + memset(&src_addr, 0, sizeof(src_addr)); + src_addr.nl_family = AF_NETLINK; + src_addr.nl_pid = getpid(); + src_addr.nl_groups = (1 << (RDMA_NL_GROUP_LS - 1)); + + ret = bind(nl_rcv_socket, (struct sockaddr *)&src_addr, + sizeof(src_addr)); + if (ret == SOCKET_ERROR) { + acm_log(0, "ERROR - unable to bind netlink socket\n"); + close(nl_rcv_socket); + return socket_errno(); + } + + /* init nl client structure */ + client_array[NL_CLIENT_INDEX].sock = nl_rcv_socket; + return 0; +} +#endif + static void acm_server(void) { fd_set readfds; @@ -1360,12 +1731,16 @@ acm_log(0, "ERROR - server listen failed\n"); return; } +#ifdef HAVE_NETLINK + ret = acm_init_nl(); + if (ret) + acm_log(1, "Warn - Netlink init failed\n"); +#endif while (1) { n = (int) listen_socket; FD_ZERO(&readfds); FD_SET(listen_socket, &readfds); - n = max(n, (int) ip_mon_socket); FD_SET(ip_mon_socket, &readfds); @@ -1399,7 +1774,12 @@ if (client_array[i].sock != INVALID_SOCKET && FD_ISSET(client_array[i].sock, &readfds)) { acm_log(2, "receiving from client %d\n", i); - acm_svr_receive(&client_array[i]); + #ifdef HAVE_NETLINK + if (i == NL_CLIENT_INDEX) + acm_nl_receive(&client_array[i]); + else + #endif + acm_svr_receive(&client_array[i]); } } @@ -1652,7 +2032,7 @@ continue; } } else { - pkey = 0xFFFF; + pkey = ep->port->def_acm_pkey; } if (!stricmp(dev_name, dev) && @@ -1846,6 +2226,7 @@ int i, ret; struct acmc_prov_context *dev_ctx; int index = -1; + uint16_t first_pkey = 0; acm_log(1, "%s %d\n", port->dev->device.verbs->device->name, port->port.port_num); @@ -1891,15 +2272,18 @@ goto err1; } - /* Determine the default pkey first. - Order of preference: 0xffff, 0x7fff, first pkey - */ + /* Determine the default pkey for SA access first. + * Order of preference: 0xffff, 0x7fff + * Use the first pkey as the default pkey for parsing address file. + */ for (i = 0; i < attr.pkey_tbl_len; i++) { ret = ibv_query_pkey(port->dev->device.verbs, port->port.port_num, i, &pkey); if (ret) continue; pkey = ntohs(pkey); + if (i == 0) + first_pkey = pkey; if (pkey == 0xffff) { index = i; break; @@ -1908,7 +2292,8 @@ index = i; } } - port->default_pkey_index = index < 0 ? 0: index; + port->sa_pkey_index = index < 0 ? 0 : index; + port->def_acm_pkey = first_pkey; for (i = 0; i < attr.pkey_tbl_len; i++) { ret = ibv_query_pkey(port->dev->device.verbs, @@ -2418,7 +2803,7 @@ mad->umad.addr.qkey = port->sa_addr.qkey; mad->umad.addr.lid = htons(port->sa_addr.lid); mad->umad.addr.sl = port->sa_addr.sl; - mad->umad.addr.pkey_index = req->ep->port->default_pkey_index; + mad->umad.addr.pkey_index = req->ep->port->sa_pkey_index; lock_acquire(&port->lock); if (port->sa_credits && DListEmpty(&port->sa_wait)) { @@ -2756,6 +3141,10 @@ acm_server(); acm_log(0, "shutting down\n"); +#ifdef HAVE_NETLINK + if (client_array[NL_CLIENT_INDEX].sock != INVALID_SOCKET) + close(client_array[NL_CLIENT_INDEX].sock); +#endif acm_close_providers(); acm_stop_sa_handler(); umad_done(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibacm-1.1.0/src/acm_netlink.h new/ibacm-1.2.0/src/acm_netlink.h --- old/ibacm-1.1.0/src/acm_netlink.h 1970-01-01 01:00:00.000000000 +0100 +++ new/ibacm-1.2.0/src/acm_netlink.h 2016-03-18 21:25:29.000000000 +0100 @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This software is available to you under the OpenFabrics.org BSD license + * below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#if !defined(ACM_NETLINK_H) +#define ACM_NETLINK_H + +/* + * This header file basically copies the local service related defines and + * structures from the latest kernel include/uapi/rdma/rdma_netlink.h file + * so that ibacm can be built without the latest kernel patches. + */ + +enum { + RDMA_NL_LS = 4, /* RDMA Local Services */ +}; + +enum { + RDMA_NL_GROUP_LS = 3, +}; + +/* + * Local service operations: + * RESOLVE - The client requests the local service to resolve a path. + * SET_TIMEOUT - The local service requests the client to set the timeout. + */ +enum { + RDMA_NL_LS_OP_RESOLVE = 0, + RDMA_NL_LS_OP_SET_TIMEOUT, + RDMA_NL_LS_NUM_OPS +}; + +/* Local service netlink message flags */ +#define RDMA_NL_LS_F_ERR 0x0100 /* Failed response */ + +/* + * Local service resolve operation family header. + * The layout for the resolve operation: + * nlmsg header + * family header + * attributes + */ + +/* + * Local service path use: + * Specify how the path(s) will be used. + * ALL - For connected CM operation (6 pathrecords) + * UNIDIRECTIONAL - For unidirectional UD (1 pathrecord) + * GMP - For miscellaneous GMP like operation (at least 1 reversible + * pathrecord) + */ +enum { + LS_RESOLVE_PATH_USE_ALL = 0, + LS_RESOLVE_PATH_USE_UNIDIRECTIONAL, + LS_RESOLVE_PATH_USE_GMP, + LS_RESOLVE_PATH_USE_MAX +}; + +#define LS_DEVICE_NAME_MAX 64 + +struct rdma_ls_resolve_header { + __u8 device_name[LS_DEVICE_NAME_MAX]; + __u8 port_num; + __u8 path_use; +}; + +/* Local service attribute type */ +#define RDMA_NLA_F_MANDATORY (1 << 13) +#define RDMA_NLA_TYPE_MASK (~(NLA_F_NESTED | NLA_F_NET_BYTEORDER | \ + RDMA_NLA_F_MANDATORY)) + +/* + * Local service attributes: + * Attr Name Size Byte order + * ----------------------------------------------------- + * PATH_RECORD struct ib_path_rec_data + * TIMEOUT u32 cpu + * SERVICE_ID u64 cpu + * DGID u8[16] BE + * SGID u8[16] BE + * TCLASS u8 + * PKEY u16 cpu + * QOS_CLASS u16 cpu + */ +enum { + LS_NLA_TYPE_UNSPEC = 0, + LS_NLA_TYPE_PATH_RECORD, + LS_NLA_TYPE_TIMEOUT, + LS_NLA_TYPE_SERVICE_ID, + LS_NLA_TYPE_DGID, + LS_NLA_TYPE_SGID, + LS_NLA_TYPE_TCLASS, + LS_NLA_TYPE_PKEY, + LS_NLA_TYPE_QOS_CLASS, + LS_NLA_TYPE_MAX +}; + +/* Local service DGID/SGID attribute: big endian */ +struct rdma_nla_ls_gid { + __u8 gid[16]; +}; + +#endif /* ACM_NETLINK_H */

1 0

commit python-django-registration for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package python-django-registration for openSUSE:Factory checked in at 2016-04-28 16:56:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-django-registration (Old) and /work/SRC/openSUSE:Factory/.python-django-registration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-django-registration" Changes: -------- --- /work/SRC/openSUSE:Factory/python-django-registration/python-django-registration.changes 2013-10-01 08:29:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-django-registration.new/python-django-registration.changes 2016-04-28 17:01:36.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 19 13:37:33 UTC 2016 - appleonkel(a)opensuse.org + +- Update to version 2.0.4 + + No Changelog +- Use new specfile from py2pack + +------------------------------------------------------------------- Old: ---- django-registration-1.0.tar.gz New: ---- django-registration-2.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-django-registration.spec ++++++ --- /var/tmp/diff_new_pack.4MROhF/_old 2016-04-28 17:01:38.000000000 +0200 +++ /var/tmp/diff_new_pack.4MROhF/_new 2016-04-28 17:01:38.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-django-registration # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,32 +16,33 @@ # -Summary: A simple, generic user-registration application for Django -License: BSD-3-Clause -Group: Development/Libraries/Python Name: python-django-registration -Version: 1.0 +Version: 2.0.4 Release: 0 -Url: http://code.google.com/p/django-registration/ +Summary: An extensible user-registration application for Django +License: BSD-3-Clause +Group: Development/Languages/Python +Url: https://github.com/ubernostrum/django-registration/ Source: https://pypi.python.org/packages/source/d/django-registration/django-regist… +Requires: python-Django >= 1.7 +BuildRequires: python-Django >= 1.7 +BuildRequires: python-devel >= 2.7 +BuildRequires: python-setuptools BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python -BuildRequires: python-devel -Requires: python-django -%py_requires -%if %{?suse_version: %{suse_version} > 1110} %{!?suse_version:1} -BuildArch: noarch +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %else -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +BuildArch: noarch %endif %description -A simple, generic user-registration application for Django +This is a fairly simple user-registration application for Django, +designed to make allowing user signups as painless as possible. It +requires a functional installation of Django 1.7 or newer, but has no +other dependencies. -This is just a simple, portable, generic user-registration application for Django projects. Workflow follows a simple pattern: -* A user signs up for a new account, which will be inactive by default. -* An email is sent to the address they used to register, containing an activation link. -* Once they click the activation link, the account becomes active and they can log in as normal. +Full documentation is `available online +<https://django-registration.readthedocs.org/>`_. %prep %setup -q -n django-registration-%{version} @@ -50,11 +51,14 @@ python setup.py build %install -python setup.py install --root=%{buildroot} --prefix=%{_prefix} +python setup.py install --prefix=%{_prefix} --root=%{buildroot} + +%check +python setup.py test %files -%defattr(-, root, root, 0755) -%doc README LICENSE CHANGELOG docs/* +%defattr(-,root,root,-) +%doc AUTHORS LICENSE README.rst %{python_sitelib}/* %changelog ++++++ django-registration-1.0.tar.gz -> django-registration-2.0.4.tar.gz ++++++ ++++ 14841 lines of diff (skipped)

1 0

commit cinnamon-screensaver for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package cinnamon-screensaver for openSUSE:Factory checked in at 2016-04-28 16:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old) and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-screensaver" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes 2016-01-22 01:06:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new/cinnamon-screensaver.changes 2016-04-28 17:01:33.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Apr 25 05:00:35 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.0.0: + * configure.ac: Drop obsolete macro. + * configure.ac: Use dots when printing dbus version. + * Support new libsystemd (which replaces libsystemd-login). + * Stop trying to make gnome-screensaver* a symlink to + cinnamon-screensaver*. + +------------------------------------------------------------------- Old: ---- cinnamon-screensaver-2.8.0.tar.gz New: ---- cinnamon-screensaver-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.dwS1YJ/_old 2016-04-28 17:01:35.000000000 +0200 +++ /var/tmp/diff_new_pack.dwS1YJ/_new 2016-04-28 17:01:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-screensaver # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX 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: cinnamon-screensaver -Version: 2.8.0 +Version: 3.0.0 Release: 0 Summary: Cinnamon screensaver and locker License: GPL-2.0+ @@ -29,6 +29,7 @@ Patch0: %{name}-xscreensaver-path.patch BuildRequires: gnome-common BuildRequires: pam-devel +BuildRequires: pkg-config BuildRequires: update-desktop-files BuildRequires: xmlto BuildRequires: pkgconfig(cinnamon-desktop) @@ -36,7 +37,7 @@ BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libgnomekbdui) -BuildRequires: pkgconfig(libsystemd-login) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: pkgconfig(xext) ++++++ cinnamon-screensaver-2.8.0.tar.gz -> cinnamon-screensaver-3.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-2.8.0/configure.ac new/cinnamon-screensaver-3.0.0/configure.ac --- old/cinnamon-screensaver-2.8.0/configure.ac 2015-10-16 17:06:50.000000000 +0200 +++ new/cinnamon-screensaver-3.0.0/configure.ac 2016-04-23 17:15:11.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.60) AC_INIT([cinnamon-screensaver], - [2.8.0], + [3.0.0], [https://github.com/linuxmint/cinnamon-screensaver/issues]) AC_CONFIG_SRCDIR(src/cinnamon-screensaver.c) @@ -15,7 +15,6 @@ AM_MAINTAINER_MODE([enable]) IT_PROG_INTLTOOL([0.35.0]) -AC_ISC_POSIX AC_PROG_CC AM_PROG_CC_C_O AC_STDC_HEADERS @@ -124,7 +123,7 @@ exit 1 else - echo "Your dbus version is $DBUS_VERSION_MAJOR,$DBUS_VERSION_MINOR,$DBUS_VERSION_MICRO." + echo "Your dbus version is $DBUS_VERSION_MAJOR.$DBUS_VERSION_MINOR.$DBUS_VERSION_MICRO." DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MAJOR=$DBUS_VERSION_MAJOR" DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MINOR=$DBUS_VERSION_MINOR" DBUS_CFLAGS="$DBUS_CFLAGS -DDBUS_VERSION_MICRO=$DBUS_VERSION_MICRO" @@ -581,7 +580,9 @@ dnl logind support dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no]) +PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [ + PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no]) +]) if test x$have_logind = xyes ; then AC_DEFINE(HAVE_LOGIND, 1, [logind support]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-2.8.0/debian/changelog new/cinnamon-screensaver-3.0.0/debian/changelog --- old/cinnamon-screensaver-2.8.0/debian/changelog 2015-10-16 17:06:50.000000000 +0200 +++ new/cinnamon-screensaver-3.0.0/debian/changelog 2016-04-23 17:15:11.000000000 +0200 @@ -1,3 +1,17 @@ +cinnamon-screensaver (3.0.0) sarah; urgency=medium + + [ monsta ] + * configure.ac: drop obsolete macro + * configure.ac: use dots when printing dbus version + + [ Clement Lefebvre ] + * Support new libsystemd (which replaces libsystemd-login) + + [ Michael Webster ] + * Stop trying to make gnome-screensaver* a symlink to cinnamon-screensaver* + + -- Clement Lefebvre <root(a)linuxmint.com> Sat, 23 Apr 2016 16:14:29 +0100 + cinnamon-screensaver (2.8.0) rosa; urgency=medium [ JosephMcc ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-2.8.0/debian/cinnamon-screensaver.postinst new/cinnamon-screensaver-3.0.0/debian/cinnamon-screensaver.postinst --- old/cinnamon-screensaver-2.8.0/debian/cinnamon-screensaver.postinst 2015-10-16 17:06:50.000000000 +0200 +++ new/cinnamon-screensaver-3.0.0/debian/cinnamon-screensaver.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -#!/bin/sh - -set -e - -if [ ! -e /usr/bin/gnome-screensaver ]; then - echo "Linking /usr/bin/gnome-screensaver to /usr/bin/cinnamon-screensaver" - ln -s /usr/bin/cinnamon-screensaver /usr/bin/gnome-screensaver -fi - -if [ ! -e /usr/bin/gnome-screensaver-command ]; then - echo "Linking /usr/bin/gnome-screensaver-command to /usr/bin/cinnamon-screensaver-command" - ln -s /usr/bin/cinnamon-screensaver-command /usr/bin/gnome-screensaver-command -fi - -#DEBHELPER# - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-screensaver-2.8.0/debian/control new/cinnamon-screensaver-3.0.0/debian/control --- old/cinnamon-screensaver-2.8.0/debian/control 2015-10-16 17:06:50.000000000 +0200 +++ new/cinnamon-screensaver-3.0.0/debian/control 2016-04-23 17:15:11.000000000 +0200 @@ -13,7 +13,7 @@ libgnomekbd-dev (>= 3.6.0), libgtk-3-dev (>= 3.1.4), libpam0g-dev, - libsystemd-login-dev [linux-any], + libsystemd-login-dev [linux-any] | libsystemd-dev [linux-any], libwebkit2gtk-3.0-dev, libx11-dev, libxext-dev,

1 0

commit cinnamon-desktop for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package cinnamon-desktop for openSUSE:Factory checked in at 2016-04-28 16:56:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-desktop (Old) and /work/SRC/openSUSE:Factory/.cinnamon-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-desktop/cinnamon-desktop.changes 2016-03-16 10:35:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-desktop.new/cinnamon-desktop.changes 2016-04-28 17:01:30.000000000 +0200 @@ -1,0 +2,22 @@ +Mon Apr 25 05:00:35 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.0.0: + * a11y schema: Limit desktop zoom max magnification to 15x. + * Add installer functions to check and install packages via + PackageKit. + * enums: Add zoom lens shape enum and magnifier key. + * gnome-installer: Use a GTask for the IsInstalled loop, so the + main thread isn't blocked. Add some feedback to the test script + to check this. + * Schemas: Add a few keys for a11y stuff. + * Add libcvc source and packages to build. + * gvc-channel-map.h: Add missing include. + * gvc-channel-map.c: Remove redundant include. + * thumbnail: Fix a code path where the mutex is never unlocked. + * Some fixes for introspection. + * gvc_mixer_ui_device.c: Fix comment block causing a build + warning. +- Add gnome-software (gnome-packagekit-session) dependency to + libcinnamon-desktop package as did upstream. + +------------------------------------------------------------------- Old: ---- cinnamon-desktop-2.8.1.tar.gz New: ---- cinnamon-desktop-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-desktop.spec ++++++ --- /var/tmp/diff_new_pack.cZhl6y/_old 2016-04-28 17:01:32.000000000 +0200 +++ /var/tmp/diff_new_pack.cZhl6y/_new 2016-04-28 17:01:32.000000000 +0200 @@ -18,9 +18,12 @@ %define soname libcinnamon-desktop %define sover 4 +%define soname_cvc libcvc +%define sover_cvc 0 %define typelib typelib-1_0-CinnamonDesktop-3_0 +%define typelib_cvc typelib-1_0-Cvc-1_0 Name: cinnamon-desktop -Version: 2.8.1 +Version: 3.0.0 Release: 0 Summary: Libcinnamon-desktop API License: GPL-2.0+ and MIT @@ -31,6 +34,7 @@ # PATCH-FIX-OPENSUSE cinnamon-desktop-correct-background-path.patch sor.alexi(a)meowr.ru -- Fix path to Adwaita background. Patch0: %{name}-correct-background-path.patch BuildRequires: gnome-common +BuildRequires: pkg-config BuildRequires: python-devel BuildRequires: yelp-tools BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.22.0 @@ -38,6 +42,8 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.37.3 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.7 BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.16 +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: pkgconfig(xext) >= 1.1 BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xkeyboard-config) @@ -57,6 +63,7 @@ Summary: Libcinnamon-desktop API Group: System/Libraries Requires: %{soname}-data >= %{version} +Requires: gnome-software Provides: %{name} = %{version} Provides: %{soname} = %{version} Obsoletes: %{name} < %{version} @@ -100,13 +107,14 @@ cinnamon-about program as well as some desktop-wide documents. This package provides the GObject Introspection bindings for -cinnamon-desktop. +libcinnamon-desktop. %package -n %{soname}-devel Summary: Libcinnamon-desktop API -- Development Files Group: Development/Libraries/C and C++ Requires: %{soname}%{sover} = %{version} Requires: %{typelib} = %{version} +Requires: pkg-config Requires: pkgconfig(gtk+-3.0) >= 3.3.16 Requires: pkgconfig(xkbfile) Provides: %{name}-devel = %{version} @@ -116,7 +124,40 @@ cinnamon-desktop contains the libcinnamon-desktop library, the cinnamon-about program as well as some desktop-wide documents. -This package contains development files for cinnamon-desktop. +This package contains development files for libcinnamon-desktop. + +%package -n %{soname_cvc}%{sover_cvc} +Summary: LibCVC API +Group: System/Libraries + +%description -n %{soname_cvc}%{sover_cvc} +Utility library for volume control of pulseaudio from gobject-based +Cinnamon modules/applications. + +%package -n %{typelib_cvc} +Summary: LibCVC API -- Introspection bindings +Group: System/Libraries + +%description -n %{typelib_cvc} +Utility library for volume control of pulseaudio from gobject-based +Cinnamon modules/applications. + +This package provides the GObject Introspection bindings for libcvc. + +%package -n %{soname_cvc}-devel +Summary: LibCVC API -- Development Files +Group: Development/Libraries/C and C++ +Requires: %{soname_cvc}%{sover_cvc} = %{version} +Requires: %{typelib_cvc} = %{version} +Requires: pkg-config +Requires: pkgconfig(libpulse) +Requires: pkgconfig(libpulse-mainloop-glib) + +%description -n %{soname_cvc}-devel +Utility library for volume control of pulseaudio from gobject-based +Cinnamon modules/applications. + +This package contains development files for libcvc. %prep %setup -q @@ -142,6 +183,10 @@ %postun -n %{soname}%{sover} -p /sbin/ldconfig +%post -n %{soname_cvc}%{sover_cvc} -p /sbin/ldconfig + +%postun -n %{soname_cvc}%{sover_cvc} -p /sbin/ldconfig + %files -n %{soname}%{sover} %defattr(-,root,root) %doc AUTHORS COPYING* README debian/changelog @@ -160,14 +205,30 @@ %files -n %{typelib} %defattr(-,root,root) -%{_libdir}/girepository-1.0/CDesktopEnums-3.0.typelib %{_libdir}/girepository-1.0/CinnamonDesktop-3.0.typelib +%{_libdir}/girepository-1.0/CDesktopEnums-3.0.typelib %files -n %{soname}-devel %defattr(-,root,root) %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/%{soname}.so -%{_datadir}/gir-1.0/*.gir +%{_datadir}/gir-1.0/CinnamonDesktop-3.0.gir +%{_datadir}/gir-1.0/CDesktopEnums-3.0.gir + +%files -n %{soname_cvc}%{sover_cvc} +%defattr(-,root,root) +%doc AUTHORS COPYING* README debian/changelog +%{_libdir}/%{soname_cvc}.so.%{sover_cvc}* + +%files -n %{typelib_cvc} +%defattr(-,root,root) +%{_libdir}/girepository-1.0/Cvc-1.0.typelib + +%files -n %{soname_cvc}-devel +%defattr(-,root,root) +%{_libdir}/pkgconfig/cvc.pc +%{_libdir}/%{soname_cvc}.so +%{_datadir}/gir-1.0/Cvc-1.0.gir %changelog ++++++ cinnamon-desktop-2.8.1.tar.gz -> cinnamon-desktop-3.0.0.tar.gz ++++++ ++++ 9626 lines of diff (skipped)

1 0

commit cinnamon-control-center for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package cinnamon-control-center for openSUSE:Factory checked in at 2016-04-28 16:56:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old) and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-control-center" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes 2016-01-22 01:06:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-control-center.new/cinnamon-control-center.changes 2016-04-28 17:01:26.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Apr 25 05:00:35 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.0.0: + * Remove universal-access (moved to cinnamon). + * configure.ac: Remove PKG_CHECK_MODULES for defunct sound panel. + * Remove sound settings in preparation for port to Cinnamon. + * Updated pot and generated file.s +- Restore System/GUI/Other group to follow openSUSE guidelines. + +------------------------------------------------------------------- Old: ---- cinnamon-control-center-2.8.1.tar.gz New: ---- cinnamon-control-center-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-control-center.spec ++++++ --- /var/tmp/diff_new_pack.w1Vr0k/_old 2016-04-28 17:01:29.000000000 +0200 +++ /var/tmp/diff_new_pack.w1Vr0k/_new 2016-04-28 17:01:29.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-control-center # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ %define soname libcinnamon-control-center %define sover 1 Name: cinnamon-control-center -Version: 2.8.1 +Version: 3.0.0 Release: 0 Summary: Utilities to configure the Cinnamon desktop License: GPL-2.0 and GPL-3.0+ and MIT -Group: System/GUI/Cinnamon +Group: System/GUI/Other Url: https://github.com/linuxmint/cinnamon-control-center Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{v… BuildRequires: cups-devel @@ -32,6 +32,7 @@ BuildRequires: gnome-common BuildRequires: hicolor-icon-theme BuildRequires: intltool +BuildRequires: pkg-config BuildRequires: systemd-devel BuildRequires: update-desktop-files BuildRequires: xsltproc @@ -87,7 +88,7 @@ %package common Summary: Common files for the Cinnamon configuration utilities -Group: System/GUI/Cinnamon +Group: System/GUI/Other Recommends: %{name}-lang BuildArch: noarch @@ -108,6 +109,7 @@ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: %{soname}%{sover} = %{version} +Requires: pkg-config Requires: pkgconfig(gtk+-3.0) >= 3.8.0 %description devel @@ -159,7 +161,6 @@ %files %defattr(-,root,root) %doc COPYING README debian/changelog -%config %{_sysconfdir}/xdg/autostart/cinnamon-sound-applet.desktop %{_bindir}/cinnamon-* %{_datadir}/applications/cinnamon-*.desktop %{_datadir}/polkit-1/rules.d/%{name}.rules ++++++ cinnamon-control-center-2.8.1.tar.gz -> cinnamon-control-center-3.0.0.tar.gz ++++++ ++++ 43584 lines of diff (skipped)

1 0

commit cinnamon-menus for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package cinnamon-menus for openSUSE:Factory checked in at 2016-04-28 16:56:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-menus (Old) and /work/SRC/openSUSE:Factory/.cinnamon-menus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cinnamon-menus" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-menus/cinnamon-menus.changes 2016-01-21 23:41:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-menus.new/cinnamon-menus.changes 2016-04-28 17:01:20.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 25 05:00:35 UTC 2016 - sor.alexei(a)meowr.ru + +- Update to version 3.0.0: + * configure.ac: Drop an obsolete macro. + +------------------------------------------------------------------- Old: ---- cinnamon-menus-2.8.0.tar.gz New: ---- cinnamon-menus-3.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-menus.spec ++++++ --- /var/tmp/diff_new_pack.r5vLT6/_old 2016-04-28 17:01:23.000000000 +0200 +++ /var/tmp/diff_new_pack.r5vLT6/_new 2016-04-28 17:01:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-menus # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define soname libcinnamon-menu-3 %define sover 0 Name: cinnamon-menus -Version: 2.8.0 +Version: 3.0.0 Release: 0 Summary: A menu system for the Cinnamon Desktop License: LGPL-2.1+ @@ -28,7 +28,6 @@ Url: https://github.com/linuxmint/cinnamon-menus Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}-%{version}.… Source1: baselibs.conf -BuildRequires: autogen BuildRequires: gnome-common BuildRequires: intltool BuildRequires: python3-devel ++++++ cinnamon-menus-2.8.0.tar.gz -> cinnamon-menus-3.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-2.8.0/configure.ac new/cinnamon-menus-3.0.0/configure.ac --- old/cinnamon-menus-2.8.0/configure.ac 2015-10-16 15:02:29.000000000 +0200 +++ new/cinnamon-menus-3.0.0/configure.ac 2016-04-23 16:57:07.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.62) -AC_INIT([cinnamon-menus], [2.8.0]) +AC_INIT([cinnamon-menus], [3.0.0]) AC_CONFIG_SRCDIR(libmenu/gmenu-tree.h) AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) @@ -22,7 +22,6 @@ LIB_MENU_LT_VERSION=0:1:0 AC_SUBST(LIB_MENU_LT_VERSION) -AC_ISC_POSIX AC_PROG_CC AC_STDC_HEADERS AC_ARG_PROGRAM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-menus-2.8.0/debian/changelog new/cinnamon-menus-3.0.0/debian/changelog --- old/cinnamon-menus-2.8.0/debian/changelog 2015-10-16 15:02:29.000000000 +0200 +++ new/cinnamon-menus-3.0.0/debian/changelog 2016-04-23 16:57:07.000000000 +0200 @@ -1,3 +1,10 @@ +cinnamon-menus (3.0.0) sarah; urgency=medium + + [ monsta ] + * configure.ac: drop obsolete macro + + -- Clement Lefebvre <root(a)linuxmint.com> Sat, 23 Apr 2016 15:56:27 +0100 + cinnamon-menus (2.8.0) rosa; urgency=medium * 2.8.0

1 0

commit audacity for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2016-04-28 16:56:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "audacity" Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2015-10-26 12:49:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.audacity.new/audacity.changes 2016-04-28 17:01:16.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Apr 24 21:35:43 UTC 2016 - sor.alexei(a)meowr.ru + +- Add audacity-2.1.1-fix-tempdir.patch from upstream: fix usage of + custom temp directories (boo#976964). + +------------------------------------------------------------------- New: ---- audacity-2.1.1-fix-tempdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.Hy1Gya/_old 2016-04-28 17:01:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Hy1Gya/_new 2016-04-28 17:01:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package audacity # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,6 @@ %define _use_internal_dependency_generator 0 %define __find_requires %{wx_requires} -%bcond_with restricted %bcond_with mad %bcond_with lame %bcond_with twolame @@ -40,6 +39,8 @@ Patch2: %{name}-fix-nonsense.patch # PATCH-FIX-UPSTREAM audacity-ffmpeg.patch reddwarf(a)opensuse.org -- Patch to compile with latest ffmpeg. Patch3: %{name}-ffmpeg.patch +# PATCH-FIX-UPSTREAM audacity-2.1.1-fix-tempdir.patch boo#976964 -- Fix usage of custom temp directories (commit 2a6d423). +Patch4: %{name}-2.1.1-fix-tempdir.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cmake @@ -54,6 +55,9 @@ BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 BuildRequires: pkgconfig(id3tag) BuildRequires: pkgconfig(jack) +BuildRequires: pkgconfig(libavcodec) >= 51.53 +BuildRequires: pkgconfig(libavformat) >= 52.12 +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(sndfile) @@ -70,11 +74,6 @@ Recommends: libavformat Recommends: libavutil Recommends: libmp3lame0 -%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse}) || %{with restricted} -BuildRequires: pkgconfig(libavcodec) >= 51.53 -BuildRequires: pkgconfig(libavformat) >= 52.12 -BuildRequires: pkgconfig(libavutil) -%endif %if %{with mad} BuildRequires: pkgconfig(mad) %endif @@ -100,9 +99,10 @@ %patch1 -p1 %patch2 -p1 %patch3 +%patch4 -p1 cp -f %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions. -rm -rf lib-src/{expat,libvamp,libsoxr}/ +rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg}/ %if %{with lame} rm -rf lib-src/lame/ %endif ++++++ audacity-2.1.1-fix-tempdir.patch ++++++ --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -1640,7 +1640,7 @@ bool AudacityApp::CreateSingleInstanceCh mChecker = new wxSingleInstanceChecker(); #if defined(__UNIX__) - wxString sockFile(defaultTempDir + wxT("/.audacity.sock")); + wxString sockFile(dir + wxT("/.audacity.sock")); #endif wxString runningTwoCopiesStr = _("Running two copies of Audacity simultaneously may cause\ndata loss or cause your system to crash.\n\n");

1 0

commit meld for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package meld for openSUSE:Factory checked in at 2016-04-28 16:56:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meld (Old) and /work/SRC/openSUSE:Factory/.meld.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meld" Changes: -------- --- /work/SRC/openSUSE:Factory/meld/meld.changes 2016-04-01 13:03:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.meld.new/meld.changes 2016-04-28 17:01:13.000000000 +0200 @@ -1,0 +2,16 @@ +Sat Apr 23 22:45:55 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 3.15.3: + + Handle unicode dates in non-UTF8 locales in folder comparison. + + Try to auto-detect when to use our dark theme highlighting. + + After undo/redo actions in file comparisons, place the cursor + at the natural edit position and scroll it back onscreen. + +------------------------------------------------------------------- +Sat Apr 23 22:45:54 UTC 2016 - michael(a)stroeder.com + +- Require python-gobject-Gdk: pygobject was further split in order + to be able to install it without X-dependencies. As meld is a + GUI application, the dependency on the X-stack is no issue. + +------------------------------------------------------------------- Old: ---- meld-3.15.2.tar.xz New: ---- meld-3.15.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meld.spec ++++++ --- /var/tmp/diff_new_pack.ON9Tn2/_old 2016-04-28 17:01:16.000000000 +0200 +++ /var/tmp/diff_new_pack.ON9Tn2/_new 2016-04-28 17:01:16.000000000 +0200 @@ -17,7 +17,7 @@ Name: meld -Version: 3.15.2 +Version: 3.15.3 Release: 0 Summary: Visual diff and merge tool License: GPL-2.0+ @@ -44,6 +44,7 @@ # needed for VCS diffs Requires: patch Requires: python-gconf +Requires: python-gobject-Gdk Requires: python-gtk >= 2.8.0 Recommends: %{name}-lang Recommends: python-gtksourceview ++++++ meld-3.15.2.tar.xz -> meld-3.15.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.2/NEWS new/meld-3.15.3/NEWS --- old/meld-3.15.2/NEWS 2016-03-27 23:38:57.000000000 +0200 +++ new/meld-3.15.3/NEWS 2016-04-19 21:47:52.000000000 +0200 @@ -1,4 +1,16 @@ +2016-04-20 meld 3.15.3 +====================== + + Fixes: + + * Handle unicode dates in non-UTF8 locales in folder comparison (Kai + Willadsen) + * Try to auto-detect when to use our dark theme highlighting (Kai Willadsen) + * After undo/redo actions in file comparisons, place the cursor at the + natural edit position and scroll it back onscreen (Kai Willadsen) + + 2016-03-28 meld 3.15.2 ====================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.2/PKG-INFO new/meld-3.15.3/PKG-INFO --- old/meld-3.15.2/PKG-INFO 2016-03-27 23:39:15.000000000 +0200 +++ new/meld-3.15.3/PKG-INFO 2016-04-19 21:48:18.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: meld -Version: 3.15.2 +Version: 3.15.3 Summary: Visual diff and merge tool Home-page: http://meldmerge.org Author: Kai Willadsen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.2/meld/conf.py new/meld-3.15.3/meld/conf.py --- old/meld-3.15.2/meld/conf.py 2016-03-05 23:51:32.000000000 +0100 +++ new/meld-3.15.3/meld/conf.py 2016-04-15 22:43:53.000000000 +0200 @@ -3,7 +3,7 @@ import sys __package__ = "meld" -__version__ = "3.15.2" +__version__ = "3.15.3" # START; these paths are clobbered on install by meld.build_helpers DATADIR = os.path.join(sys.prefix, "share", "meld") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.2/meld/dirdiff.py new/meld-3.15.3/meld/dirdiff.py --- old/meld-3.15.2/meld/dirdiff.py 2016-03-14 22:02:55.000000000 +0100 +++ new/meld-3.15.3/meld/dirdiff.py 2016-04-16 00:48:51.000000000 +0200 @@ -21,6 +21,7 @@ import datetime import errno import functools +import locale import os import re import shutil @@ -1319,6 +1320,7 @@ all_present_same = self.file_compare(lof, regexes) different = 1 one_isdir = [None for i in range(self.model.ntree)] + locale_encoding = locale.getpreferredencoding() for j in range(self.model.ntree): if mod_times[j]: isdir = os.path.isdir( files[j] ) @@ -1346,6 +1348,7 @@ TIME = self.model.column_index(COL_TIME, j) mod_datetime = datetime.datetime.fromtimestamp(mod_times[j]) time_str = mod_datetime.strftime("%a %d %b %Y %H:%M:%S") + time_str = time_str.decode(locale_encoding, errors='replace') self.model.set_value(it, TIME, time_str) def natural_size(bytes): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.2/meld/filediff.py new/meld-3.15.3/meld/filediff.py --- old/meld-3.15.2/meld/filediff.py 2016-03-14 22:02:55.000000000 +0100 +++ new/meld-3.15.3/meld/filediff.py 2016-04-15 22:43:53.000000000 +0200 @@ -211,11 +211,9 @@ self._cached_match = CachedSequenceMatcher() for buf in self.textbuffer: + buf.undo_sequence = self.undosequence buf.connect("notify::has-selection", self.update_text_actions_sensitivity) - buf.connect('begin_user_action', - self.on_textbuffer_begin_user_action) - buf.connect('end_user_action', self.on_textbuffer_end_user_action) buf.data.connect('file-changed', self.notify_file_changed) self.ui_file = gnomeglade.ui_file("filediff-ui.xml") @@ -573,9 +571,9 @@ for mergedfile in merger.merge_2_files(src, dst): pass self._sync_vscroll_lock = True - self.on_textbuffer_begin_user_action() + self.textbuffer[dst].begin_user_action() self.textbuffer[dst].set_text(mergedfile) - self.on_textbuffer_end_user_action() + self.textbuffer[dst].end_user_action() def resync(): self._sync_vscroll_lock = False @@ -598,9 +596,9 @@ for mergedfile in merger.merge_3_files(False): pass self._sync_vscroll_lock = True - self.on_textbuffer_begin_user_action() + self.textbuffer[dst].begin_user_action() self.textbuffer[dst].set_text(mergedfile) - self.on_textbuffer_end_user_action() + self.textbuffer[dst].end_user_action() def resync(): self._sync_vscroll_lock = False self._sync_vscroll(self.scrolledwindow[0].get_vadjustment(), 0) @@ -862,19 +860,24 @@ self.emit('close', 0) return response + def _scroll_to_actions(self, actions): + """Scroll all views affected by *actions* to the current cursor""" + + affected_buffers = set(a.buffer for a in actions) + for buf in affected_buffers: + buf_index = self.textbuffer.index(buf) + view = self.textview[buf_index] + view.scroll_mark_onscreen(buf.get_insert()) + def on_undo_activate(self): if self.undosequence.can_undo(): - self.undosequence.undo() + actions = self.undosequence.undo() + self._scroll_to_actions(actions) def on_redo_activate(self): if self.undosequence.can_redo(): - self.undosequence.redo() - - def on_textbuffer_begin_user_action(self, *buffer): - self.undosequence.begin_group() - - def on_textbuffer_end_user_action(self, *buffer): - self.undosequence.end_group() + actions = self.undosequence.redo() + self._scroll_to_actions(actions) def on_text_insert_text(self, buf, it, text, textlen): text = text_type(text, 'utf8') @@ -1817,10 +1820,10 @@ dst_end = b1.get_iter_at_line_or_eof(chunk[4]) t0 = text_type(b0.get_text(src_start, src_end, False), 'utf8') mark0 = b1.create_mark(None, dst_start, True) - self.on_textbuffer_begin_user_action() + self.textbuffer[dst].begin_user_action() b1.delete(dst_start, dst_end) new_end = b1.insert_at_line(chunk[3], t0) - self.on_textbuffer_end_user_action() + self.textbuffer[dst].end_user_action() mark1 = b1.create_mark(None, new_end, True) if chunk[1] == chunk[2]: # TODO: Need a more specific colour here; conflict is wrong diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.2/meld/meldbuffer.py new/meld-3.15.3/meld/meldbuffer.py --- old/meld-3.15.2/meld/meldbuffer.py 2016-03-05 23:51:32.000000000 +0100 +++ new/meld-3.15.3/meld/meldbuffer.py 2016-04-15 22:43:53.000000000 +0200 @@ -42,6 +42,7 @@ bind_settings(self) self.data = MeldBufferData() self.user_action_count = 0 + self.undo_sequence = None meldsettings.connect('changed', self.on_setting_changed) self.set_style_scheme(meldsettings.style_scheme) @@ -51,8 +52,12 @@ def do_begin_user_action(self, *args): self.user_action_count += 1 + if self.undo_sequence: + self.undo_sequence.begin_group() def do_end_user_action(self, *args): + if self.undo_sequence: + self.undo_sequence.end_group() self.user_action_count -= 1 def do_apply_tag(self, tag, start, end): @@ -303,10 +308,14 @@ start = self.buffer.get_iter_at_offset(self.offset) end = self.buffer.get_iter_at_offset(self.offset + len(self.text)) self.buffer.delete(start, end) + self.buffer.place_cursor(end) + return [self] def insert(self): start = self.buffer.get_iter_at_offset(self.offset) + self.buffer.place_cursor(start) self.buffer.insert(start, self.text) + return [self] class BufferInsertionAction(BufferAction): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.2/meld/misc.py new/meld-3.15.3/meld/misc.py --- old/meld-3.15.2/meld/misc.py 2016-03-14 22:02:55.000000000 +0100 +++ new/meld-3.15.3/meld/misc.py 2016-04-16 00:44:17.000000000 +0200 @@ -25,6 +25,7 @@ import subprocess from gi.repository import Gdk +from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk from gi.repository import GtkSource @@ -144,7 +145,30 @@ return hbox -MELD_STYLE_SCHEME = "meld-base" +def get_base_style_scheme(): + MELD_STYLE_SCHEME = "meld-base" + MELD_STYLE_SCHEME_DARK = "meld-dark" + + global base_style_scheme + + if base_style_scheme: + return base_style_scheme + + env_theme = GLib.getenv('GTK_THEME') + if env_theme: + use_dark = env_theme.endswith(':dark') + else: + gtk_settings = Gtk.Settings.get_default() + use_dark = gtk_settings.props.gtk_application_prefer_dark_theme + base_scheme_name = ( + MELD_STYLE_SCHEME_DARK if use_dark else MELD_STYLE_SCHEME) + + manager = GtkSource.StyleSchemeManager.get_default() + base_style_scheme = manager.get_scheme(base_scheme_name) + + return base_style_scheme + +base_style_scheme = None def parse_rgba(string): @@ -165,10 +189,9 @@ style = source_style.get_style(name) style_attr = getattr(style.props, attribute) if style else None if not style or not style_attr: - manager = GtkSource.StyleSchemeManager.get_default() - source_style = manager.get_scheme(MELD_STYLE_SCHEME) + base_style = get_base_style_scheme() try: - style = source_style.get_style(name) + style = base_style.get_style(name) style_attr = getattr(style.props, attribute) except AttributeError: pass @@ -506,7 +529,7 @@ span = match.span(i + 1) if span != (-1, -1) and span[0] != span[1]: filter_ranges.append(span) - + filter_ranges = merge_intervals(filter_ranges) for (start, end) in reversed(filter_ranges): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meld-3.15.2/meld/undo.py new/meld-3.15.3/meld/undo.py --- old/meld-3.15.2/meld/undo.py 2016-02-26 21:43:53.000000000 +0100 +++ new/meld-3.15.3/meld/undo.py 2016-04-15 22:43:53.000000000 +0200 @@ -44,12 +44,16 @@ self.buffer = seq.actions[0].buffer def undo(self): + actions = [] while self.seq.can_undo(): - self.seq.undo() + actions.extend(self.seq.undo()) + return actions def redo(self): + actions = [] while self.seq.can_redo(): - self.seq.redo() + actions.extend(self.seq.redo()) + return actions class UndoSequence(GObject.GObject): @@ -144,7 +148,7 @@ self.emit('checkpointed', buf, False) could_redo = self.can_redo() self.next_redo -= 1 - self.actions[self.next_redo].undo() + actions = self.actions[self.next_redo].undo() self.busy = False if not self.can_undo(): self.emit('can-undo', 0) @@ -152,6 +156,7 @@ self.emit('can-redo', 1) if self.checkpointed(buf): self.emit('checkpointed', buf, True) + return actions def redo(self): """Redo an action. @@ -166,7 +171,7 @@ could_undo = self.can_undo() a = self.actions[self.next_redo] self.next_redo += 1 - a.redo() + actions = a.redo() self.busy = False if not could_undo: self.emit('can-undo', 1) @@ -174,6 +179,7 @@ self.emit('can-redo', 0) if self.checkpointed(buf): self.emit('checkpointed', buf, True) + return actions def checkpoint(self, buf): start = self.next_redo

1 0

commit tmux for openSUSE:Factory
by root＠hilbert.suse.de 28 Apr '16

28 Apr '16

Hello community, here is the log from the commit of package tmux for openSUSE:Factory checked in at 2016-04-28 16:56:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tmux (Old) and /work/SRC/openSUSE:Factory/.tmux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tmux" Changes: -------- --- /work/SRC/openSUSE:Factory/tmux/tmux.changes 2016-04-12 19:40:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tmux.new/tmux.changes 2016-04-28 17:01:09.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Apr 24 10:51:55 UTC 2016 - mpluskal(a)suse.com + +- Add correct systemd requires (boo#976922) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tmux.spec ++++++ --- /var/tmp/diff_new_pack.x2tEMq/_old 2016-04-28 17:01:13.000000000 +0200 +++ /var/tmp/diff_new_pack.x2tEMq/_new 2016-04-28 17:01:13.000000000 +0200 @@ -28,11 +28,13 @@ # PATCH-FIX-OPENSUSE crrodriguez(a)opensuse.org -- Use /run/tmux instead of /tmp as the default socket path, this add some robustness against accidental deletion via systemd-tmpfiles-clean, tmpwatch, or similar Patch0: tmux-socket-path.patch BuildRequires: automake +BuildRequires: pkg-config BuildRequires: pkgconfig BuildRequires: utempter-devel +BuildRequires: pkgconfig(libevent) >= 2.0 BuildRequires: pkgconfig(systemd) BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkgconfig(libevent) >= 2.0 +%{?systemd_requires} %if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(ncurses) %else @@ -62,7 +64,7 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +make %{?_smp_mflags} DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_tmpfilesdir} printf 'd /run/tmux 1777 root root -' > %{buildroot}%{_tmpfilesdir}/tmux.conf

1 0