January 2014 - openSUSE Commits - openSUSE Mailing Lists

commit rpcbind for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package rpcbind for openSUSE:Factory checked in at 2014-01-31 13:35:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpcbind (Old) and /work/SRC/openSUSE:Factory/.rpcbind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpcbind" Changes: -------- --- /work/SRC/openSUSE:Factory/rpcbind/rpcbind.changes 2014-01-23 15:55:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/rpcbind.changes 2014-01-31 13:35:57.000000000 +0100 @@ -2 +2,37 @@ -Mon Jan 20 12:26:55 UTC 2014 - okir(a)suse.com +Thu Jan 23 16:58:25 UTC 2014 - okir(a)suse.com + +- Fixed rpc broadcast handling (bnc#857324) + Upgraded to upstream 0.2.1-rc4 as part of this, and rebased the + patch set. + + Added: + 0001-Fix-building-one-systems-w-out-nss.h.patch + 0002-Rename-configure.in-to-configure.ac.patch + 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch + Deleted (already upstream): + 0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch + Renumbered (previous numbering shown below): + 0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch + 0002-Remove-obsolete-function-in6_fillscopeid.patch + 0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch + 0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch + 0006-First-part-of-init_transport-refactoring.patch + 0007-init_transport-move-the-registration-code-into-a-sep.patch + 0008-Fix-the-behavior-when-specifying-the-h-option.patch + 0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch + 0010-Support-systemd-activation.patch + 0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch + 0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch + 0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch + 0014-Notify-systemd-unconditionally.patch + 0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch + 0016-configure-check-for-nss.h.patch + 0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch + 0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch + 0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch + 0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch + 0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch + 0023-rpcinfo-remove-obsolete-function-get_inet_address.patch + +------------------------------------------------------------------- +Mon Jan 20 12:20:02 UTC 2014 - okir(a)suse.com Old: ---- 0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch 0002-Remove-obsolete-function-in6_fillscopeid.patch 0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch 0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch 0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch 0006-First-part-of-init_transport-refactoring.patch 0007-init_transport-move-the-registration-code-into-a-sep.patch 0008-Fix-the-behavior-when-specifying-the-h-option.patch 0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch 0010-Support-systemd-activation.patch 0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch 0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch 0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch 0014-Notify-systemd-unconditionally.patch 0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch 0016-configure-check-for-nss.h.patch 0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch 0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch 0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch 0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch 0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch 0023-rpcinfo-remove-obsolete-function-get_inet_address.patch rpcbind-0.2.1_git1b0fdf5.tar.bz2 New: ---- 0001-Fix-building-one-systems-w-out-nss.h.patch 0002-Rename-configure.in-to-configure.ac.patch 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch 0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch 0005-Remove-obsolete-function-in6_fillscopeid.patch 0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch 0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch 0008-First-part-of-init_transport-refactoring.patch 0009-init_transport-move-the-registration-code-into-a-sep.patch 0010-Fix-the-behavior-when-specifying-the-h-option.patch 0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch 0012-Support-systemd-activation.patch 0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch 0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch 0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch 0016-Notify-systemd-unconditionally.patch 0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch 0018-configure-check-for-nss.h.patch 0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch 0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch 0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch 0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch 0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch rpcbind-0.2.1_rc4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpcbind.spec ++++++ --- /var/tmp/diff_new_pack.m9KMt0/_old 2014-01-31 13:35:58.000000000 +0100 +++ /var/tmp/diff_new_pack.m9KMt0/_new 2014-01-31 13:35:58.000000000 +0100 @@ -17,12 +17,12 @@ Name: rpcbind -Version: 0.2.1_git1b0fdf5 +Version: 0.2.1_rc4 Release: 0 Summary: Transport independent RPC portmapper License: BSD-4-Clause Group: Productivity/Networking/System -Url: http://git.infradead.org/users/steved/rpcbind.git +Url: git://git.infradead.org/users/steved/rpcbind.git Source: %{name}-%{version}.tar.bz2 Source2: sysconfig.rpcbind Source3: rpcbind.xml @@ -33,28 +33,32 @@ BuildRequires: pkgconfig BuildRequires: tcpd-devel PreReq: %fillup_prereq -Patch0: 0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch -Patch1: 0002-Remove-obsolete-function-in6_fillscopeid.patch -Patch2: 0003-configure-fix-the-case-when-with-rpcuser-is-not-give.patch -Patch3: 0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch -Patch4: 0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch -Patch5: 0006-First-part-of-init_transport-refactoring.patch -Patch6: 0007-init_transport-move-the-registration-code-into-a-sep.patch -Patch7: 0008-Fix-the-behavior-when-specifying-the-h-option.patch -Patch8: 0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch -Patch9: 0010-Support-systemd-activation.patch -Patch10: 0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch -Patch11: 0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch -Patch12: 0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch -Patch13: 0014-Notify-systemd-unconditionally.patch -Patch14: 0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch -Patch15: 0016-configure-check-for-nss.h.patch -Patch16: 0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch -Patch17: 0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch -Patch18: 0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch -Patch19: 0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch -Patch20: 0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch -Patch21: 0023-rpcinfo-remove-obsolete-function-get_inet_address.patch + +# The next three are from upstream, applied directly on top of rc4. +Patch0: 0001-Fix-building-one-systems-w-out-nss.h.patch +Patch1: 0002-Rename-configure.in-to-configure.ac.patch +Patch2: 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch +Patch3: 0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch +Patch4: 0005-Remove-obsolete-function-in6_fillscopeid.patch +Patch5: 0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch +Patch6: 0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch +Patch7: 0008-First-part-of-init_transport-refactoring.patch +Patch8: 0009-init_transport-move-the-registration-code-into-a-sep.patch +Patch9: 0010-Fix-the-behavior-when-specifying-the-h-option.patch +Patch10: 0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch +Patch11: 0012-Support-systemd-activation.patch +Patch12: 0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch +Patch13: 0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch +Patch14: 0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch +Patch15: 0016-Notify-systemd-unconditionally.patch +Patch16: 0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch +Patch17: 0018-configure-check-for-nss.h.patch +Patch18: 0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch +Patch19: 0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch +Patch20: 0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch +Patch21: 0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch +Patch22: 0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch +Patch23: 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch %define statefile /var/lib/portmap.state BuildRequires: pkgconfig(systemd) @@ -100,6 +104,8 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 +%patch23 -p1 %build autoreconf -fiv ++++++ 0001-Fix-building-one-systems-w-out-nss.h.patch ++++++ >From c4814d539434391df4dfa61551e5e2e96947326d Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier(a)gentoo.org> Date: Thu, 21 Feb 2013 10:39:33 -0500 Subject: [PATCH 01/24] Fix building one systems w/out nss.h The nss.h header is glibc-specific, so use the existing HAVE_NSS_H define to avoid including/using it when it is not available. URL: http://bugs.gentoo.org/458024 Reported-by: Mark Reiche <porphyr(a)gmx.de> Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> Signed-off-by: Steve Dickson <steved(a)redhat.com> --- src/rpcbind.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/rpcbind.c b/src/rpcbind.c index 9a0504d..83dbe93 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -67,7 +67,11 @@ #include <pwd.h> #include <string.h> #include <errno.h> +#ifdef HAVE_NSS_H #include <nss.h> +#else +static inline void __nss_configure_lookup(const char *db, const char *s) {} +#endif #include "rpcbind.h" /*#define RPCBIND_DEBUG*/ -- 1.7.12.4 ++++++ 0002-Rename-configure.in-to-configure.ac.patch ++++++ >From 5618b2f89a752e8bacf9f7c847fd99484a9d3bbc Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier(a)gentoo.org> Date: Tue, 26 Mar 2013 10:59:42 -0400 Subject: [PATCH 02/24] Rename configure.in to configure.ac Newer autotools wants this to end in .ac. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> Signed-off-by: Steve Dickson <steved(a)redhat.com> --- configure.ac | 39 +++++++++++++++++++++++++++++++++++++++ configure.in | 39 --------------------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..2b67720 --- /dev/null +++ b/configure.ac @@ -0,0 +1,39 @@ +AC_INIT(rpcbind, 0.2.0) + +AM_INIT_AUTOMAKE +AC_CONFIG_SRCDIR([src/rpcbind.c]) +AC_PREFIX_DEFAULT(/usr) +AC_PROG_CC + +AC_ARG_ENABLE([libwrap], + AS_HELP_STRING([--enable-libwrap], [Enables host name checking through tcpd @<:@default=no@:>@])) +AM_CONDITIONAL(LIBWRAP, test x$enable_libwrap = xyes) + +AC_ARG_ENABLE([debug], + AS_HELP_STRING([--enable-debug], [Turns on rpcbind debugging @<:@default=no@:>@])) +AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes) + +AC_ARG_ENABLE([warmstarts], + AS_HELP_STRING([--enable-warmstarts], [Enables Warm Starts @<:@default=no@:>@])) +AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes) + +AC_ARG_WITH([statedir], + AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp@:>@]) + ,, [with_statedir=/tmp]) +AC_SUBST([statedir], [$with_statedir]) + +AC_ARG_WITH([rpcuser], + AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]), + ,, [with_rpcuser=root]) +AC_SUBST([rpcuser], [$with_rpcuser]) + +PKG_CHECK_MODULES([TIRPC], [libtirpc]) + +AS_IF([test x$enable_libwrap = xyes], [ + AC_CHECK_LIB([wrap], [hosts_access], , + AC_MSG_ERROR([libwrap support requested but unable to find libwrap])) +]) + +AC_SEARCH_LIBS([pthread_create], [pthread]) + +AC_OUTPUT([Makefile]) diff --git a/configure.in b/configure.in deleted file mode 100644 index 2b67720..0000000 --- a/configure.in +++ /dev/null @@ -1,39 +0,0 @@ -AC_INIT(rpcbind, 0.2.0) - -AM_INIT_AUTOMAKE -AC_CONFIG_SRCDIR([src/rpcbind.c]) -AC_PREFIX_DEFAULT(/usr) -AC_PROG_CC - -AC_ARG_ENABLE([libwrap], - AS_HELP_STRING([--enable-libwrap], [Enables host name checking through tcpd @<:@default=no@:>@])) -AM_CONDITIONAL(LIBWRAP, test x$enable_libwrap = xyes) - -AC_ARG_ENABLE([debug], - AS_HELP_STRING([--enable-debug], [Turns on rpcbind debugging @<:@default=no@:>@])) -AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes) - -AC_ARG_ENABLE([warmstarts], - AS_HELP_STRING([--enable-warmstarts], [Enables Warm Starts @<:@default=no@:>@])) -AM_CONDITIONAL(WARMSTART, test x$enable_warmstarts = xyes) - -AC_ARG_WITH([statedir], - AS_HELP_STRING([--with-statedir=ARG], [use ARG as state dir @<:@default=/tmp@:>@]) - ,, [with_statedir=/tmp]) -AC_SUBST([statedir], [$with_statedir]) - -AC_ARG_WITH([rpcuser], - AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]), - ,, [with_rpcuser=root]) -AC_SUBST([rpcuser], [$with_rpcuser]) - -PKG_CHECK_MODULES([TIRPC], [libtirpc]) - -AS_IF([test x$enable_libwrap = xyes], [ - AC_CHECK_LIB([wrap], [hosts_access], , - AC_MSG_ERROR([libwrap support requested but unable to find libwrap])) -]) - -AC_SEARCH_LIBS([pthread_create], [pthread]) - -AC_OUTPUT([Makefile]) -- 1.7.12.4 ++++++ 0003-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch ++++++ >From b3b031b07cc5909aaf964f9d4cf46f6097769320 Mon Sep 17 00:00:00 2001 From: Steve Dickson <steved(a)redhat.com> Date: Wed, 21 Aug 2013 14:40:22 -0400 Subject: [PATCH 03/24] rpcbind: rpcuser not being set in Makefile.am Commit 8d7a0708 cause a regression where the rpcuser id was not being set, which in turn cause rpcbind to immediately exit. This patch removes the extra ',' that was in the AC_ARG_WITH statement in the configure.ac file. Signed-off-by: Steve Dickson <steved(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2b67720..1cf42d3 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_ARG_WITH([statedir], AC_SUBST([statedir], [$with_statedir]) AC_ARG_WITH([rpcuser], - AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]), + AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]) ,, [with_rpcuser=root]) AC_SUBST([rpcuser], [$with_rpcuser]) -- 1.7.12.4 ++++++ 0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch -> 0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0001-Silence-a-warning-about-setgroups-being-implicitly-d.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0004-Silence-a-warning-about-setgroups-being-implicitly-d.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From a45afd335e7e5965666ac5052a54b3981796b351 Mon Sep 17 00:00:00 2001 +From 2b08a74a9be128a46cefae87354e21e67f506bc0 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 11:43:13 +0200 -Subject: [PATCH 01/13] Silence a warning about setgroups() being implicitly +Subject: [PATCH 04/24] Silence a warning about setgroups() being implicitly defined Signed-off-by: Olaf Kirch <okir(a)suse.de> ++++++ 0002-Remove-obsolete-function-in6_fillscopeid.patch -> 0005-Remove-obsolete-function-in6_fillscopeid.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0002-Remove-obsolete-function-in6_fillscopeid.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0005-Remove-obsolete-function-in6_fillscopeid.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 6ec7d84694e560c7e1968b1ba02cbf69802da290 Mon Sep 17 00:00:00 2001 +From f474754a2dee2f0b53435b79800611eebcdff2ac Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 11:43:51 +0200 -Subject: [PATCH 02/13] Remove obsolete function in6_fillscopeid +Subject: [PATCH 05/24] Remove obsolete function in6_fillscopeid This seems to be an old remnant from the very early days of IPv6 when the kernel would include the ifindex in the link-local ++++++ 0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch -> 0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0004-In-init_transport-move-creation-of-COTS-sockets-clos.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 77ccf636447cce013f84ee7b7b09f0fe3adcec87 Mon Sep 17 00:00:00 2001 +From 2dbc060dd45240216ae37217690f974f57a653f6 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 09:11:45 +0200 -Subject: [PATCH 04/13] In init_transport, move creation of COTS sockets +Subject: [PATCH 06/24] In init_transport, move creation of COTS sockets closer to where they are used Signed-off-by: Olaf Kirch <okir(a)suse.de> ++++++ 0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch -> 0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0005-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 369cc50768a9929ef0adf4b58987ce08cc3675b6 Mon Sep 17 00:00:00 2001 +From 18c451ad482debbe7dab00699f4df8b075cee112 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 09:12:49 +0200 -Subject: [PATCH 05/13] The use of AI_NUMERICHOST in init_transport() is +Subject: [PATCH 07/24] The use of AI_NUMERICHOST in init_transport() is broken. In its current form, when seeing a dotted quad or a numeric IPv6 address, ++++++ 0006-First-part-of-init_transport-refactoring.patch -> 0008-First-part-of-init_transport-refactoring.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0006-First-part-of-init_transport-refactoring.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0008-First-part-of-init_transport-refactoring.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 9cea37f331fe76a9690e93677999cc47f3f70631 Mon Sep 17 00:00:00 2001 +From 5388d9b484838437c364aed925f3f6acb021264d Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 09:26:37 +0200 -Subject: [PATCH 06/13] First part of init_transport refactoring +Subject: [PATCH 08/24] First part of init_transport refactoring This patch splits out the hostname resolution and socket creation/binding code into individual functions, and calls those from init_transport instead. ++++++ 0007-init_transport-move-the-registration-code-into-a-sep.patch -> 0009-init_transport-move-the-registration-code-into-a-sep.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0007-init_transport-move-the-registration-code-into-a-sep.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0009-init_transport-move-the-registration-code-into-a-sep.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From a43a3b1ab5545d835af2867c343ee195a6256665 Mon Sep 17 00:00:00 2001 +From bf8bb37d6265f986fed55afc3f15b9e526da2226 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 09:49:15 +0200 -Subject: [PATCH 07/13] init_transport: move the registration code into a +Subject: [PATCH 09/24] init_transport: move the registration code into a separate function Signed-off-by: Olaf Kirch <okir(a)suse.de> ++++++ 0008-Fix-the-behavior-when-specifying-the-h-option.patch -> 0010-Fix-the-behavior-when-specifying-the-h-option.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0008-Fix-the-behavior-when-specifying-the-h-option.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0010-Fix-the-behavior-when-specifying-the-h-option.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 2a825515a2b6304e27f0e28fd5da562d44d6cbfe Mon Sep 17 00:00:00 2001 +From 774ccd8224f8a6b76fce4204d3084ffb8cc09e5f Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 09:58:51 +0200 -Subject: [PATCH 08/13] Fix the behavior when specifying the -h option +Subject: [PATCH 10/24] Fix the behavior when specifying the -h option Currently, when specifying the "-h" option, rpcbind will try to create sockets for all specified addresses, plus the loopback address. However, ++++++ 0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch -> 0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0009-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 734101ba29f0b169d72e8ec6de6d924922f1583c Mon Sep 17 00:00:00 2001 +From 038db9589e4cf64b0a7307132d08bfa4547d59b1 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 10:10:41 +0200 -Subject: [PATCH 09/13] Clean up the way we handle the -h option in +Subject: [PATCH 11/24] Clean up the way we handle the -h option in init_transport There's some odd realloc()ing going on, which is plain ugly. @@ -13,7 +13,7 @@ 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/src/rpcbind.c b/src/rpcbind.c -index c3679e2..1d59362 100644 +index c3679e2..3b753c6 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -632,52 +632,46 @@ init_transport(struct netconfig *nconf) ++++++ 0010-Support-systemd-activation.patch -> 0012-Support-systemd-activation.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0010-Support-systemd-activation.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0012-Support-systemd-activation.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From c3ec796dd8f177a3c6ab9b76de490dbfe2c86476 Mon Sep 17 00:00:00 2001 +From d92c22d7e8d476b7772ce4e3d8e23200d0048b45 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 11:26:42 +0200 -Subject: [PATCH 10/13] Support systemd activation. +Subject: [PATCH 12/24] Support systemd activation. This code is loosely based on previous work by Tom Gundersen <teg(a)jklm.no>. @@ -67,7 +67,7 @@ AC_CHECK_LIB([wrap], [hosts_access], , AC_MSG_ERROR([libwrap support requested but unable to find libwrap])) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 1d59362..32e6deb 100644 +index 3b753c6..baf1ac0 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -56,6 +56,9 @@ ++++++ 0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch -> 0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0011-socket-activation-Fix-rpcbind.service-to-use-separat.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0013-socket-activation-Fix-rpcbind.service-to-use-separat.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 994e57f91c58e9e88c9f793e948e8d3af6ff4528 Mon Sep 17 00:00:00 2001 +From 487918f173a899ce39b426ceeaa830d3c45fbd2d Mon Sep 17 00:00:00 2001 From: Jeff Mahoney <jeffm(a)suse.com> Date: Tue, 20 Aug 2013 15:20:13 +0200 -Subject: [PATCH 11/13] socket-activation: Fix rpcbind.service to use separate +Subject: [PATCH 13/24] socket-activation: Fix rpcbind.service to use separate sockets systemd will, by default, pass a socket that provides both IPv4 and @@ -18,7 +18,7 @@ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 32e6deb..d2b25fa 100644 +index baf1ac0..aec0510 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -50,6 +50,7 @@ ++++++ 0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch -> 0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0012-When-using-systemd-redirect-syslog-calls-to-the-syst.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 2eae383ebb716b27a6ac0aa2c0c2288f92b56b4e Mon Sep 17 00:00:00 2001 +From 3ac02ec367c314770774c4c9f82e8c2c75c7a28c Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 15:59:17 +0200 -Subject: [PATCH 12/13] When using systemd, redirect syslog() calls to the +Subject: [PATCH 14/24] When using systemd, redirect syslog() calls to the systemd journal Signed-off-by: Olaf Kirch <okir(a)suse.de> @@ -123,7 +123,7 @@ } pml->pml_map = pmap; diff --git a/src/rpcbind.c b/src/rpcbind.c -index d2b25fa..964c2d3 100644 +index aec0510..50c042c 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -59,18 +59,20 @@ ++++++ 0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch -> 0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0013-When-using-systemd-activation-make-rpcbind-notify-sy.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0015-When-using-systemd-activation-make-rpcbind-notify-sy.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 417e4dc9a33711843a36c700fbc3ce1d7a823a0d Mon Sep 17 00:00:00 2001 +From 117cc8049b1dec667507f7824ccae3cd1d8b31fb Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 20 Aug 2013 16:01:59 +0200 -Subject: [PATCH 13/13] When using systemd activation, make rpcbind notify +Subject: [PATCH 15/24] When using systemd activation, make rpcbind notify system when ready to service requests Signed-off-by: Olaf Kirch <okir(a)suse.de> @@ -11,7 +11,7 @@ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 964c2d3..7fa6baf 100644 +index 50c042c..6d1f1a3 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -260,7 +260,10 @@ main(int argc, char *argv[]) ++++++ 0014-Notify-systemd-unconditionally.patch -> 0016-Notify-systemd-unconditionally.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0014-Notify-systemd-unconditionally.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0016-Notify-systemd-unconditionally.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 95d8dc18699638313a2b9bd3dcd3b84eaed432d8 Mon Sep 17 00:00:00 2001 +From 114b974116d44201a4dba6b7e9311f0ffb318ee3 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Fri, 10 Jan 2014 11:29:40 +0100 -Subject: [PATCH 14/14] Notify systemd unconditionally +Subject: [PATCH 16/24] Notify systemd unconditionally rpcbind may be started from systemd with or without socket activation. However, in both cases systemd would expect to be notified of successful @@ -16,7 +16,7 @@ 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rpcbind.c b/src/rpcbind.c -index 7fa6baf..8df2950 100644 +index 6d1f1a3..b070c32 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -260,9 +260,13 @@ main(int argc, char *argv[]) ++++++ 0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch -> 0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0015-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0017-Pull-the-sysconfig-file-into-rpcbind.service-and-use.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 565692c3c88c6e94f31fb511c374d5a9f3c31075 Mon Sep 17 00:00:00 2001 +From 343c55b1137efae9e7d469ec5b5972ca70f1cc80 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 14 Jan 2014 16:19:04 +0100 -Subject: [PATCH 15/15] Pull the sysconfig file into rpcbind.service and use +Subject: [PATCH 17/24] Pull the sysconfig file into rpcbind.service and use Signed-off-by: Olaf Kirch <okir(a)suse.de> --- ++++++ 0016-configure-check-for-nss.h.patch -> 0018-configure-check-for-nss.h.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0016-configure-check-for-nss.h.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0018-configure-check-for-nss.h.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 0be5e1d603226b3226e4204f67471788eacf475c Mon Sep 17 00:00:00 2001 +From 87b31d8406e6049fb4facfc483f4d8c9339d6f46 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Tue, 14 Jan 2014 16:40:55 +0100 -Subject: [PATCH 17/17] configure: check for <nss.h> +Subject: [PATCH 18/24] configure: check for <nss.h> There's code in rpcbind that tries to configure nss lookups so that it avoids NIS when resolving user names or service names. Unfortunately, this ++++++ 0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch -> 0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0018-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0019-rpcinfo-ip_ping-clean-up-client-ping-create-destroy.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From c5033b0f86f3e6a45dcb6cc1d8b5700f1fbba0b8 Mon Sep 17 00:00:00 2001 +From 409c1b26b8134589d13768a37ebffd3ff7d031db Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Mon, 20 Jan 2014 11:49:15 +0100 -Subject: [PATCH 18/23] rpcinfo ip_ping: clean up client ping/create/destroy +Subject: [PATCH 19/24] rpcinfo ip_ping: clean up client ping/create/destroy The code doing the actual RPC NULL calls and the handling of VERSMISMATCH was a bit convoluted. We would destroy and re-create ++++++ 0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch -> 0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0019-rpcinfo-introduce-new-helper-function-ip_getclient.patch 2014-01-23 15:55:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0020-rpcinfo-introduce-new-helper-function-ip_getclient.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 0a3522bab588d8308769f8696e3e7bc9fe5eb5af Mon Sep 17 00:00:00 2001 +From 45e77bd50177044aad7812a613b03188d115f665 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Mon, 20 Jan 2014 11:43:37 +0100 -Subject: [PATCH 19/23] rpcinfo: introduce new helper function ip_getclient +Subject: [PATCH 20/24] rpcinfo: introduce new helper function ip_getclient This function tries to obtain the address of a given host/program/version, using the specified protocol (one of udp or tcp), and create a client ++++++ 0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch -> 0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0020-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch 2014-01-23 15:55:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0021-rpcinfo-make-t-u-options-support-IPv6-addresses-too.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 00ad3e8c82610179177d02c5490c941907fcd109 Mon Sep 17 00:00:00 2001 +From feb828a6db505451e053e4f73332071d53a75c42 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Mon, 20 Jan 2014 12:26:40 +0100 -Subject: [PATCH 20/23] rpcinfo: make -t/-u options support IPv6 addresses, +Subject: [PATCH 21/24] rpcinfo: make -t/-u options support IPv6 addresses, too Currently, rpcinfo supports two ways to test whether a given ++++++ 0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch -> 0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0021-rpcinfo-remove-obsolete-function-clnt_com_create.patch 2014-01-23 15:55:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0022-rpcinfo-remove-obsolete-function-clnt_com_create.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From 59ac2533d7eb9e9f7faed968846d4b11cc2c3123 Mon Sep 17 00:00:00 2001 +From a7b8fdf863eca0d992597ff853fd95cb4e375358 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Mon, 20 Jan 2014 12:51:29 +0100 -Subject: [PATCH 21/23] rpcinfo: remove obsolete function clnt_com_create +Subject: [PATCH 22/24] rpcinfo: remove obsolete function clnt_com_create Signed-off-by: Olaf Kirch <okir(a)suse.de> --- ++++++ 0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch -> 0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0022-Make-rpcinfo-p-support-IPv6-addresses-too.patch 2014-01-23 15:55:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0023-Make-rpcinfo-p-support-IPv6-addresses-too.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From b0921131b08c81c33498c6b0b91f8ddf55d73e2f Mon Sep 17 00:00:00 2001 +From efe7c73ea490f9cd184fa974f1a4d67bd93d8269 Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Mon, 20 Jan 2014 13:08:18 +0100 -Subject: [PATCH 22/23] Make rpcinfo -p support IPv6 addresses, too +Subject: [PATCH 23/24] Make rpcinfo -p support IPv6 addresses, too While this is not strictly necessary (you can use "rpcinfo <hostname>" instead), some older scripts may rely on rpcinfo to work with just about any hostname. ++++++ 0023-rpcinfo-remove-obsolete-function-get_inet_address.patch -> 0024-rpcinfo-remove-obsolete-function-get_inet_address.patch ++++++ --- /work/SRC/openSUSE:Factory/rpcbind/0023-rpcinfo-remove-obsolete-function-get_inet_address.patch 2014-01-23 15:55:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rpcbind.new/0024-rpcinfo-remove-obsolete-function-get_inet_address.patch 2014-01-31 13:35:57.000000000 +0100 @@ -1,7 +1,7 @@ -From f1190d2cb5331282e7b3dda7dcf08d9832d183dd Mon Sep 17 00:00:00 2001 +From c2d5de2c81e9d8d4cdaaafa2b7ae925c6e62c5ad Mon Sep 17 00:00:00 2001 From: Olaf Kirch <okir(a)suse.de> Date: Mon, 20 Jan 2014 13:09:46 +0100 -Subject: [PATCH 23/23] rpcinfo: remove obsolete function get_inet_address +Subject: [PATCH 24/24] rpcinfo: remove obsolete function get_inet_address Signed-off-by: Olaf Kirch <okir(a)suse.de> --- -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fonts-config for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package fonts-config for openSUSE:Factory checked in at 2014-01-31 13:35:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fonts-config (Old) and /work/SRC/openSUSE:Factory/.fonts-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fonts-config" Changes: -------- --- /work/SRC/openSUSE:Factory/fonts-config/fonts-config.changes 2013-10-02 13:27:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config.changes 2014-01-31 13:35:19.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Jan 30 12:38:10 UTC 2014 - pgajdos(a)suse.com + +- fonts-config 20131102 [bnc#860097]: + * do not check for font module used -> fixes TTCap entries + generation + * drop generating ghostscript fontmap + * drop generating ooo xcu file + * --quiet means quiet now + +------------------------------------------------------------------- Old: ---- Common.xcu.template suse-font-dirs.conf.template ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fonts-config.spec ++++++ --- /var/tmp/diff_new_pack.seAnPD/_old 2014-01-31 13:35:20.000000000 +0100 +++ /var/tmp/diff_new_pack.seAnPD/_new 2014-01-31 13:35:20.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fonts-config # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,37 +17,34 @@ Name: fonts-config -Version: 20080121 +Version: 20131102 Release: 0 Summary: Configures Fonts for X Windows and other applications License: GPL-2.0+ Group: System/X11/Fonts -Source: fonts-config -Source2: sysconfig.fonts-config -Source3: Common.xcu.template -Source5: fontconfig.SuSE.properties.template -Source6: suse-hinting.conf.template -Source7: suse-bitmaps.conf.template -Source8: suse-font-dirs.conf.template +Source0: fonts-config +Source1: sysconfig.fonts-config +Source2: fontconfig.SuSE.properties.template +Source3: suse-hinting.conf.template +Source4: suse-bitmaps.conf.template BuildRequires: fontconfig BuildRequires: fontpackages-devel Requires(pre): %fillup_prereq -Requires(pre): sysvinit-tools -Requires: fontconfig >= 2.3.93.20060103 +%reconfigure_fonts_prereq +Requires: fontconfig Requires: perl(English) -Recommends: ft2demos -Provides: xf86tools:/usr/sbin/fonts-config +Recommends: mkfontscale +Recommends: mkfontdir BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%reconfigure_fonts_prereq %description Configures Fonts for X Windows and other applications. -Usually fonts-config is called automatically via SuSEconfig (SuSEconfig ---module fonts), which is usually automatically called by YaST2. You -can also execute fonts-config directly, which is mainly useful for -debugging it. +Usually fonts-config is called automatically when package containing +font is installed, upgraded or removed. But you can also execute +fonts-config directly, which is mainly useful to debug it (use +--debug flag). %prep @@ -59,39 +56,42 @@ mkdir -p %{buildroot}%{_datadir}/fonts-config mkdir -p %{buildroot}/%{_mandir}/man1 mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -install -m 755 $RPM_SOURCE_DIR/fonts-config %{buildroot}%{_prefix}/sbin -install -m 644 $RPM_SOURCE_DIR/*.template %{buildroot}%{_datadir}/fonts-config -pod2man --section 1 --center=" " $RPM_SOURCE_DIR/fonts-config > \ +install -m 755 %{SOURCE0} %{buildroot}%{_prefix}/sbin +install -m 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{buildroot}%{_datadir}/fonts-config +pod2man --section 1 --center=" " %{SOURCE0} > \ %{buildroot}/%{_mandir}/man1/fonts-config.1 -install -m 644 $RPM_SOURCE_DIR/sysconfig.fonts-config \ +install -m 644 %{SOURCE1} \ %{buildroot}%{_localstatedir}/adm/fillup-templates/ # mkdir %{buildroot}%{_datadir}/%{name}/conf.avail/ -sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE6} \ +sed -e's/_BYTECODE_BW_MAX_PIXEL_/0/' %{SOURCE3} \ > %{buildroot}%{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf -sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE7} \ +sed -e's/_USE_EMBEDDED_BITMAPS_PLACEHOLDER_//' %{SOURCE4} \ > %{buildroot}%{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf # -mkdir -p %{buildroot}%{_fontsconfddir} -ln -s %{_datadir}/%{name}/conf.avail/12-suse-hinting-bc.conf \ - %{buildroot}%{_fontsconfddir}/12-suse-hinting-bc.conf -ln -s %{_datadir}/%{name}/conf.avail/17-suse-bitmaps.conf \ - %{buildroot}%{_fontsconfddir}/17-suse-bitmaps.conf +%link_avail_to_system_fontsconf 12-suse-hinting-bc.conf +%link_avail_to_system_fontsconf 17-suse-bitmaps.conf %post %{fillup_only -n fonts-config} -%reconfigure_fonts_post +%reconfigure_fonts_post -c exit 0 +%postun +%reconfigure_fonts_postun -c + +%posttrans +%reconfigure_fonts_posttrans + %files %defattr(-,root,root) +%dir %{_datadir}/fonts-config +%files_fontsconf_availdir %{_sbindir}/fonts-config -%dir %{_datadir}/fonts-config/ -%{_datadir}/fonts-config/* +%{_datadir}/fonts-config/*.template %{_mandir}/man1/fonts-config.1.gz %{_localstatedir}/adm/fillup-templates/sysconfig.fonts-config -%dir %{_datadir}/%{name}/conf.avail -%{_datadir}/%{name}/conf.avail/*.conf -%{_fontsconfddir}/* +%files_fontsconf_file -l 12-suse-hinting-bc.conf +%files_fontsconf_file -l 17-suse-bitmaps.conf %changelog ++++++ fontconfig.SuSE.properties.template ++++++ --- /var/tmp/diff_new_pack.seAnPD/_old 2014-01-31 13:35:20.000000000 +0100 +++ /var/tmp/diff_new_pack.seAnPD/_new 2014-01-31 13:35:20.000000000 +0100 @@ -3,7 +3,7 @@ # # -# generated by /usr/sbin/fonts-config (called by "SuSEconfig --module fonts"). +# generated by /usr/sbin/fonts-config # # Version ++++++ fonts-config ++++++ ++++ 3113 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/fonts-config/fonts-config ++++ and /work/SRC/openSUSE:Factory/.fonts-config.new/fonts-config ++++++ suse-hinting.conf.template ++++++ --- /var/tmp/diff_new_pack.seAnPD/_old 2014-01-31 13:35:20.000000000 +0100 +++ /var/tmp/diff_new_pack.seAnPD/_new 2014-01-31 13:35:20.000000000 +0100 @@ -20,7 +20,7 @@ disables this rule by default because most users don't like that bitmap look and feel. If you like a bitmap look and feel of your desktop, - copy this rule into your ~/.fonts.conf file and replace the '0' + edit BYTECODE_BW_MAX_PIXEL sysconfig variable - replace '0' with non-zero pixelsize limit. Using '18' as the pixelsize limit is a good choice if you have the fonts in this list installed and like a bitmap look and feel. ++++++ sysconfig.fonts-config ++++++ --- /var/tmp/diff_new_pack.seAnPD/_old 2014-01-31 13:35:20.000000000 +0100 +++ /var/tmp/diff_new_pack.seAnPD/_new 2014-01-31 13:35:20.000000000 +0100 @@ -1,32 +1,21 @@ ## Path: Desktop ## Description: Display font configuration -## Type: yesno -## Default: yes +## Type: integer +## Default: quiet # -# generate TTCap entries in fonts.dir, which can be used by -# xtt/freetype font module +# type of output (quiet=0, verbose=1, debug=256) # -GENERATE_TTCAP_ENTRIES="yes" - -## Path: System/Printing -## Description: Printer font configuration -## Type: yesno -## Default: no -# -# generate fontmaps for ghostscript -# -# (needs 'ftdump' from the 'ft2demos' package). -# -GENERATE_GHOSTSCRIPT_FONTMAPS="no" +VERBOSITY="0" ## Path: Desktop ## Description: Display font configuration ## Type: yesno ## Default: yes # -# generate font setup for OpenOffice +# generate TTCap entries in fonts.dir, which can be used by +# xtt/freetype font module # -GENERATE_OOO_FONT_SETUP="yes" +GENERATE_TTCAP_ENTRIES="yes" ## Path: Desktop ## Description: Display font configuration -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2014-01-31 11:51:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-network" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2014-01-23 15:59:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2014-01-31 11:51:25.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 30 09:55:29 UTC 2014 - mfilka(a)suse.com + +- bnc#861078 + - network configuration created during installation is copied to + target +- 3.1.16 + +------------------------------------------------------------------- Old: ---- yast2-network-3.1.15.tar.bz2 New: ---- yast2-network-3.1.16.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.GaQnhy/_old 2014-01-31 11:51:26.000000000 +0100 +++ /var/tmp/diff_new_pack.GaQnhy/_new 2014-01-31 11:51:26.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.15 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-network-3.1.15.tar.bz2 -> yast2-network-3.1.16.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.15/README.md new/yast2-network-3.1.16/README.md --- old/yast2-network-3.1.15/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-3.1.16/README.md 2014-01-30 11:52:43.000000000 +0100 @@ -0,0 +1,86 @@ +YaST Network Module +====================== + +The YaST2 Network module manages network configuration including device configuration, +DNS, Routing and more + +Features +-------- + + * device configuration via netconfig + * network service selection (netconfig, NetworkManager, wicked) + * routing configuration + * DNS and hostname setup + * remote administration setup + +Some features are SuSE Linux specific. + +[![Code Climate](https://codeclimate.com/github/yast/yast-network.png)](https://cod… + +Installation +------------ + +To install the latest stable version on openSUSE or SLE, use zypper: + + $ sudo zypper install yast2-network + +Running +------- + +To run the module, use the following command as root: + + $ yast2 lan + +This will start complex dialog with most of features available. +For more options see section on [running YaST](https://en.opensuse.org/SDB:Starting_YaST) +in the YaST documentation. + +Documentation +------------- + +User YaST documentation is available in [general YaST documentation](https://en.opensuse.org/Portal:YaST). + +Developer documentation specific for this module is in the [doc](doc) +directory. + +Development +----------- + +This module is developed as part of YaST. See +[YaST development documentation]( + https://en.opensuse.org/openSUSE:YaST_development) +for information about [YaST architecture]( + https://en.opensuse.org/openSUSE:YaST:_Architecture_Overview), +[development environment]( +https://en.opensuse.org/openSUSE:YaST:_Preparing_the_Development_Environment) +and other development-related topics. + +To get the source code, clone the GitHub repository: + + $ git clone https://github.com/yast/yast-network.git + +Alternatively, you can fork the repository and clone your fork. This is most +useful if you plan to contribute into the project. + +Before doing anything useful with the code, you need to setup a development +environment. Fortunately, this is quite simple: + + $ sudo zypper install yast2-devtools + +To run the module from the source code, use the `run` Rake task: + + $ rake run + +To run the testsuite, use the `test` Rake task: + + $ rake test + +For a complete list of tasks, run `rake -T`. + +Before submitting any change please read our [contribution +guidelines](CONTRIBUTING.md). + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](https://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.15/package/yast2-network.changes new/yast2-network-3.1.16/package/yast2-network.changes --- old/yast2-network-3.1.15/package/yast2-network.changes 2014-01-21 13:43:33.000000000 +0100 +++ new/yast2-network-3.1.16/package/yast2-network.changes 2014-01-30 11:52:43.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 30 09:55:29 UTC 2014 - mfilka(a)suse.com + +- bnc#861078 + - network configuration created during installation is copied to + target +- 3.1.16 + +------------------------------------------------------------------- Tue Jan 21 10:30:13 UTC 2014 - mfilka(a)suse.com - bnc#859181 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.15/package/yast2-network.spec new/yast2-network-3.1.16/package/yast2-network.spec --- old/yast2-network-3.1.15/package/yast2-network.spec 2014-01-21 13:43:33.000000000 +0100 +++ new/yast2-network-3.1.16/package/yast2-network.spec 2014-01-30 11:52:43.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 3.1.15 +Version: 3.1.16 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.15/src/clients/save_network.rb new/yast2-network-3.1.16/src/clients/save_network.rb --- old/yast2-network-3.1.15/src/clients/save_network.rb 2014-01-21 13:43:33.000000000 +0100 +++ new/yast2-network-3.1.16/src/clients/save_network.rb 2014-01-30 11:52:43.000000000 +0100 @@ -706,11 +706,9 @@ copy_from = String.Quote(Builtins.sformat("%1%2", sysconfig, file)) Builtins.y2milestone("Copy %1 into %2", copy_from, copy_to) cmd = Builtins.sformat("cp %1 %2", copy_from, copy_to) - Builtins.y2internal( - "cml %1:%2", - cmd, - SCR.Execute(path(".target.bash_output"), cmd) - ) + ret = SCR.Execute(path(".target.bash_output"), cmd) + + Builtins.y2error("cmd: '#{cmd}' failed: #{ret}") if ret["exit"] != 0 end # merge files with default installed by sysconfig @@ -761,13 +759,13 @@ # when root is on nfs/iscsi set startmode=nfsroot #176804 device = NetworkStorage.getDevice(Installation.destdir) - Builtins.y2internal( + Builtins.y2debug( "%1 directory is on %2 device", Installation.destdir, device ) @network_disk = NetworkStorage.isDiskOnNetwork(device) - Builtins.y2internal("Network based device: %1", @network_disk) + Builtins.y2milestone("Network based device: %1", @network_disk) if Arch.s390 @@ -852,18 +850,11 @@ ) ) else - Builtins.y2internal("file %1 exists", net_destfile) + Builtins.y2milestone("Not copying file %1 - it already exists", net_destfile) end - install_inf = ReadInstallInf() - configure_network = false - if install_inf - configure_network = Ops.get_string( - @InstallInf, - "firststage_network", - "0" - ) == "1" - CopyConfiguredNetworkFiles() if configure_network + if ReadInstallInf() + CopyConfiguredNetworkFiles() else Builtins.y2error("Error while reading install.inf!") end @@ -874,26 +865,13 @@ LanUdevAuto.Write if Mode.autoinst + SCR.Execute(path(".target.bash"), "chkconfig network on") - if install_inf - # string hwcfgname = CreateHardwareFile(); - # string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); - - if !configure_network - CreateIfcfg() - CreateOtherNetworkFiles() - end - - SCR.Execute(path(".target.bash"), "chkconfig network on") - - # if portmap running - start it after reboot - WFM.Execute( - path(".local.bash"), - "pidofproc rpcbind && touch /var/lib/YaST2/network_install_rpcbind" - ) - else - Builtins.y2error("Error while reading install.inf!") - end + # if portmap running - start it after reboot + WFM.Execute( + path(".local.bash"), + "pidofproc rpcbind && touch /var/lib/YaST2/network_install_rpcbind" + ) nil end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-client for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at 2014-01-31 11:51:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ldap-client (Old) and /work/SRC/openSUSE:Factory/.yast2-ldap-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ldap-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ldap-client/yast2-ldap-client.changes 2013-12-08 19:50:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ldap-client.new/yast2-ldap-client.changes 2014-01-31 11:51:19.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 21 09:54:15 UTC 2014 - vmoravec(a)suse.com + +- Support LDAPS FATE#316086 +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-ldap-client-3.1.3.tar.bz2 New: ---- yast2-ldap-client-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.QRlDJ5/_old 2014-01-31 11:51:19.000000000 +0100 +++ /var/tmp/diff_new_pack.QRlDJ5/_new 2014-01-31 11:51:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-ldap-client # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-ldap-client -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,7 +27,7 @@ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 BuildRequires: yast2-network BuildRequires: yast2-pam BuildRequires: yast2-testsuite ++++++ yast2-ldap-client-3.1.3.tar.bz2 -> yast2-ldap-client-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/VERSION new/yast2-ldap-client-3.1.4/VERSION --- old/yast2-ldap-client-3.1.3/VERSION 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/package/yast2-ldap-client.changes new/yast2-ldap-client-3.1.4/package/yast2-ldap-client.changes --- old/yast2-ldap-client-3.1.3/package/yast2-ldap-client.changes 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/package/yast2-ldap-client.changes 2014-01-30 12:25:11.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 21 09:54:15 UTC 2014 - vmoravec(a)suse.com + +- Support LDAPS FATE#316086 +- 3.1.4 + +------------------------------------------------------------------- Thu Dec 5 16:44:42 CET 2013 - jsuchome(a)suse.cz - remove krb5 realm and kdc from sssd config when Kerberos support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/package/yast2-ldap-client.spec new/yast2-ldap-client-3.1.4/package/yast2-ldap-client.spec --- old/yast2-ldap-client-3.1.3/package/yast2-ldap-client.spec 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/package/yast2-ldap-client.spec 2014-01-30 12:25:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-ldap-client -Version: 3.1.0 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,7 +26,7 @@ Group: System/YaST License: GPL-2.0 BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-pam yast2-testsuite yast2-network -BuildRequires: yast2-devtools >= 3.0.6 +BuildRequires: yast2-devtools >= 3.1.10 PreReq: %fillup_prereq diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/src/autoyast-rnc/ldap_client.rnc new/yast2-ldap-client-3.1.4/src/autoyast-rnc/ldap_client.rnc --- old/yast2-ldap-client-3.1.3/src/autoyast-rnc/ldap_client.rnc 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/src/autoyast-rnc/ldap_client.rnc 2014-01-30 12:25:11.000000000 +0100 @@ -9,6 +9,7 @@ ldap_domain? & ldap_server? & ldap_tls? & + ldaps? & create_ldap? & start_ldap? & member_attribute? & @@ -43,6 +44,7 @@ login_enabled = element login_enabled { BOOLEAN } file_server = element file_server { BOOLEAN } ldap_tls = element ldap_tls { BOOLEAN } +ldaps = element ldaps { BOOLEAN } start_ldap = element start_ldap { BOOLEAN } create_ldap = element create_ldap { BOOLEAN } sssd = element sssd { BOOLEAN } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/src/include/ldap/ui.rb new/yast2-ldap-client-3.1.4/src/include/ldap/ui.rb --- old/yast2-ldap-client-3.1.3/src/include/ldap/ui.rb 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/src/include/ldap/ui.rb 2014-01-30 12:25:11.000000000 +0100 @@ -210,86 +210,215 @@ true end + def switch_ssl_config_widgets mode + switch = + case mode + when :on then true + when :off then false + end + + [ + :protocols, + :tls_cacertdir, + :br_tls_cacertdir, + :tls_cacertfile, + :br_tls_cacertfile, + :url, + :import_cert, + :request_server_certificate + ].each {|widget_id| UI.ChangeWidget(Id(widget_id), :Enabled, switch) } + end + # Popup for TLS/SSL related stuff def SSLConfiguration certTmpFile = Builtins.sformat("%1/__LDAPcert.crt", Directory.tmpdir) tls_cacertdir = Ldap.tls_cacertdir tls_cacertfile = Ldap.tls_cacertfile - ldap_id_use_start_tls = Ldap.ldap_tls + use_tls = Ldap.ldap_tls + use_ldaps = Ldap.ldaps + request_server_certificate = Ldap.request_server_certificate UI.OpenDialog( Opt(:decorated), HBox( - HSpacing(1), VBox( - VSpacing(0.5), + VSpacing(0.6), HSpacing(75), - Left( - CheckBox( - Id(:ldap_id_use_start_tls), - # checkbox label - _("Use TLS for Identity Resolve"), - ldap_id_use_start_tls - ) - ), - VSpacing(0.4), - HBox( - InputField( - Id(:tls_cacertdir), - Opt(:hstretch), - # inputfield label - _("Cer&tificate Directory"), - tls_cacertdir - ), - VBox( - Bottom( - # button label - PushButton(Id(:br_tls_cacertdir), _("B&rowse")) + Frame( + _("SSL/TLS Configuration"), + HBox( + VBox( + Left( + CheckBox( + Id(:secure_ldap), + Opt(:notify), + _("Use SSL/TLS"), + Ldap.use_secure_connection? + ) + ), + HSpacing(1), + VBox( + VSpacing(0.5), + HSpacing(75), + Frame( + _("Protocols"), + HBox( + HSpacing(0.5), + VBox( + VSpacing(0.4), + RadioButtonGroup( + Id(:protocols), + Left( + HVSquash( + VBox( + Left( + RadioButton( + Id(:use_tls), + Opt(:notify), + _("StartTLS"), + use_tls + ) + ), + Left( + RadioButton( + Id(:use_ldaps), + Opt(:notify), + _("LDAPS"), + use_ldaps + ) + ), + ) + ) + ) + ), + VSpacing(0.4) + ) + ) + ), + VSpacing(0.5), + Frame( + _("TLS Options"), + HBox( + HSpacing(0.5), + VBox( + VSpacing(0.4), + HBox( + Left( + CheckBox( + Id(:request_server_certificate), + Opt(:notify), + _("Request server certificate"), + request_server_certificate == 'demand' + ) + ) + ) + ) + ) + ), + VSpacing(0.5), + Frame( + _("Certificates"), + HBox( + HSpacing(0.5), + VBox( + VSpacing(0.4), + HBox( + InputField( + Id(:tls_cacertdir), + Opt(:hstretch), + # inputfield label + _("Cer&tificate Directory"), + tls_cacertdir + ), + VBox( + Bottom( + # button label + PushButton(Id(:br_tls_cacertdir), _("B&rowse")) + ) + ) + ), + HBox( + InputField( + Id(:tls_cacertfile), + Opt(:hstretch), + # inputfield label + _("CA Cert&ificate File"), + tls_cacertfile + ), + VBox( + Bottom( + # button label + PushButton(Id(:br_tls_cacertfile), _("Brows&e")) + ) + ) + ), + HBox( + InputField( + Id(:url), + Opt(:hstretch), + # inputfield label + _("CA Certificate URL for Download") + ), + VBox( + Bottom( + # push button label + PushButton(Id(:import_cert), _("Do&wnload CA Certificate")) + ) + ) + ) + ) + ) + ) + ) ) ) ), - HBox( - InputField( - Id(:tls_cacertfile), - Opt(:hstretch), - # inputfield label - _("CA Cert&ificate File"), - tls_cacertfile - ), - VBox( - Bottom( - # button label - PushButton(Id(:br_tls_cacertfile), _("Brows&e")) - ) - ) - ), - HBox( - InputField( - Id(:url), - Opt(:hstretch), - # inputfield label - _("CA Certificate URL for Download") - ), - VBox( - Bottom( - # push button label - PushButton(Id(:import_cert), _("Do&wnload CA Certificate")) - ) - ) - ), - ButtonBox( - PushButton(Id(:ok), Label.OKButton), - PushButton(Id(:cancel), Label.CancelButton) - ), - VSpacing(0.5) + ButtonBox( + PushButton(Id(:ok), Label.OKButton), + PushButton(Id(:cancel), Label.CancelButton) ), - HSpacing(1) + VSpacing(0.4) + ), + HSpacing(1) ) ) - ret = :again + + switch_ssl_config_widgets(:off) unless Ldap.use_secure_connection? + + result = :again + begin - ret = Convert.to_symbol(UI.UserInput) - if ret == :br_tls_cacertdir + result = Convert.to_symbol(UI.UserInput) + + case result + when :secure_ldap + secure_ldap = UI.QueryWidget(Id(:secure_ldap), :Value) + case secure_ldap + when true + switch_ssl_config_widgets(:on) + when false + switch_ssl_config_widgets(:off) + use_ldaps = false + use_tls = false + end + + when :use_tls + use_tls = true + use_ldaps = false + Ldap.modified = true + UI.ChangeWidget(Id(:request_server_certificate), :Value, true) + + when :use_ldaps + use_ldaps = true + use_tls = false + Ldap.modified = true + UI.ChangeWidget(Id(:request_server_certificate), :Value, true) + + when :request_server_certificate + widget_checked = UI.QueryWidget(Id(:request_server_certificate), :Value) + request_server_certificate = widget_checked ? 'demand' : 'allow' + + when :br_tls_cacertdir dir = UI.AskForExistingDirectory( tls_cacertdir, # popup label @@ -299,7 +428,8 @@ tls_cacertdir = dir UI.ChangeWidget(Id(:tls_cacertdir), :Value, dir) end - elsif ret == :br_tls_cacertfile + + when :br_tls_cacertfile file = UI.AskForExistingFile( tls_cacertfile, "*.pem *.crt", @@ -311,19 +441,8 @@ tls_cacertfile = file UI.ChangeWidget(Id(:tls_cacertfile), :Value, file) end - else - tls_cacertdir = Convert.to_string( - UI.QueryWidget(Id(:tls_cacertdir), :Value) - ) - tls_cacertfile = Convert.to_string( - UI.QueryWidget(Id(:tls_cacertfile), :Value) - ) - ldap_id_use_start_tls = UI.QueryWidget( - Id(:ldap_id_use_start_tls), - :Value - ) == true - end - if ret == :import_cert + + when :import_cert dir = tls_cacertdir dir = "/etc/openldap/cacerts/" if dir == "" @@ -391,17 +510,20 @@ Ldap.modified = true end end - end while ret != :ok && ret != :cancel + + end while result != :ok && result != :cancel UI.CloseDialog - if ret == :ok + if result == :ok Ldap.tls_cacertfile = tls_cacertfile Ldap.tls_cacertdir = tls_cacertdir - Ldap.ldap_tls = ldap_id_use_start_tls + Ldap.request_server_certificate = request_server_certificate + Ldap.ldap_tls = use_tls + Ldap.ldaps = use_ldaps end - ret == :ok + result == :ok end # The main dialog for ldap-client configuration @@ -446,9 +568,24 @@ "to encrypt your communication with the LDAP server. You may download a CA\n" + "certificate file in PEM format from a given URL.\n" ) + + _( + "A TLS session may require special client configuration. One of the config + options is TLS_REQCERT which specifies what checks to perform on server certificates. + The value is the level that can be specified with keywords never, allow, + try and demand. In the SSL/TLS Configuration dialog there is + the option Request server certificate which will set the TLS_REQCERT + configuration option to demand if it's enabled or to allow if it's disabled.\n" + ) + + _( + "In addition to LDAP URLs and TLS/SSL encryption, LDAP supports LDAPS URLs. + LDAPS URLs use SSL connections instead of plain connections. They have a syntax + similar to LDAP URLs except the schemes are different and the default port for LDAPS URLs + is 636 instead of 389.\n" + ) + # help text 8/9 _( - "To configure advanced LDAP settings, click\nAdvanced Configuration.\n" + "To configure advanced LDAP settings, click\nAdvanced Configuration.\n" + + "To configure security settings, click\nSSL/TLS Configuration.\n" ) # help text 9/9 (additional) autofs_help_text = _( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/src/modules/Ldap.rb new/yast2-ldap-client-3.1.4/src/modules/Ldap.rb --- old/yast2-ldap-client-3.1.3/src/modules/Ldap.rb 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/src/modules/Ldap.rb 2014-01-30 12:25:11.000000000 +0100 @@ -27,9 +27,12 @@ # # $Id$ require "yast" +require "uri" module Yast class LdapClass < Module + TLS_REQCERT_DEFAULT = 'demand' + def main Yast.import "UI" textdomain "ldap-client" @@ -61,7 +64,6 @@ # DN of base configuration object @base_config_dn = "" - Yast.include self, "ldap/routines.rb" # Required packages for this module to operate @@ -108,6 +110,9 @@ @base_dn_changed = false @ldap_tls = true + @ldaps = false + # Openldap configuration option TLS_REQCERT + @request_server_certificate = TLS_REQCERT_DEFAULT # CA certificates for server certificate verification # At least one of these are required if tls_checkpeer is "yes" @@ -321,6 +326,12 @@ } end + def use_secure_connection? + @ldap_tls || @ldaps + end + + alias_method :use_secure_connection, :use_secure_connection? + #---------------------------------------------------------------- # If the base DN has changed from a nonempty one, it may only be @@ -408,6 +419,7 @@ @start = settings.fetch("start_ldap", false) @ldap_tls = settings.fetch("ldap_tls", false) + @ldaps = settings.fetch("ldaps", false) @login_enabled = settings.fetch("login_enabled", true) @_start_autofs = settings.fetch("start_autofs", false) @file_server = settings.fetch("file_server", false) @@ -467,6 +479,7 @@ "ldap_server" => @server, "ldap_domain" => @base_dn, "ldap_tls" => @ldap_tls, + "ldaps" => @ldaps, "bind_dn" => @bind_dn, "file_server" => @file_server, "base_config_dn" => @base_config_dn, @@ -538,6 +551,12 @@ @ldap_tls ? _("Yes") : Summary.NotConfigured ) + summary = Summary.AddHeader(summary, _("LDAPS")) + summary = Summary.AddLine( + summary, + @ldaps ? _("Yes") : Summary.NotConfigured + ) + # summary item summary = Summary.AddHeader( summary, @@ -588,9 +607,14 @@ # summary summary = Ops.add( Ops.add(summary, " "), - _("LDAP TLS/SSL Configured") + _("LDAP TLS Configured") ) end + + if @ldaps + summary << " " << _("LDAPS Configured") + end + if @start && @sssd # summary summary = Ops.add( @@ -751,11 +775,23 @@ if uri == "" ret = ReadLdapConfEntry("host", "") else + detect_ldaps(uri) ret = uri2servers(uri) end ret end + def detect_ldaps uri + uri = URI.parse(uri) + @ldaps = uri.scheme == 'ldaps' + current_tls_reqcert = read_openldap_config('TLS_REQCERT') + @request_server_certificate = current_tls_reqcert || TLS_REQCERT_DEFAULT + end + + def detect_uri_scheme + @ldaps ? 'ldaps://' : 'ldap://' + end + # Reads LDAP settings from the SCR # @return success def Read @@ -1881,7 +1917,7 @@ end if Builtins.contains(ocs, "susegrouptemplate") - return ["top", "posixGroup", "groupOfNames"] + return ["top", "posixGroup", "groupOfNames"] # TODO sometimes there is groupofuniquenames... elsif Builtins.contains(ocs, "suseusertemplate") return ["top", "posixAccount", "shadowAccount", "InetOrgPerson"] @@ -2216,82 +2252,39 @@ # ldap client utilities (like ldapsearch) # @return modified? def WriteOpenLdapConf - write_openldap_conf = @openldap_modified - return false if !Package.Installed("openldap2-client") - - out = Convert.to_map( - SCR.Execute(path(".target.bash_output"), "/bin/rpm -V openldap2-client") - ) - - open_host = [] - open_uri = Convert.to_list( - SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".uri")) - ) - if open_uri == [] - open_uri = Convert.to_list( - SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".URI")) - ) - end - if open_uri == [] - open_host = Convert.to_list( - SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".host")) - ) + uris = @server.split.map {|u| detect_uri_scheme + u }.join(' ') + set_openldap('URI', uris) + set_openldap('HOST', nil) + set_openldap('BASE', @base_dn) + + if @ldaps || @ldap_tls + set_openldap('TLS_REQCERT', @request_server_certificate) + set_openldap('TLS_CACERTDIR', @tls_cacertdir.empty? ? nil : @tls_cacertdir) + set_openldap('TLS_CACERT', @tls_cacertfile.empty? ? nil : @tls_cacertfile) else - open_host = [uri2servers(Ops.get_string(open_uri, 0, ""))] - end - open_base = Convert.to_list( - SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".base")) - ) - - # if the config file was not modified by user yet - if !Builtins.issubstring( - Ops.get_string(out, "stdout", ""), - "/etc/openldap/ldap.conf" - ) - write_openldap_conf = true - # if there are same values as in /etc/ldap.conf - elsif @old_server == Ops.get_string(open_host, 0, "") && - @old_base_dn == Ops.get_string(open_base, 0, "") - write_openldap_conf = true + set_openldap('TLS_REQCERT', nil) + set_openldap('TLS_CACERTDIR', nil) + set_openldap('TLS_CACERT', nil) end - if write_openldap_conf - # update ldap.conf - SCR.Write( - path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".host"), - nil - ) - - uri = Builtins.mergestring( - Builtins.maplist(Builtins.splitstring(@server, " \t")) do |u| - Ops.add("ldap://", u) - end, - " " - ) - - SCR.Write( - path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".uri"), - [uri] - ) - - SCR.Write( - path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".base"), - [@base_dn] - ) + Builtins.y2milestone("file /etc/openldap/ldap.conf was modified") + end - SCR.Write( - path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".TLS_CACERTDIR"), - @tls_cacertdir == "" ? nil : [@tls_cacertdir] - ) - SCR.Write( - path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".TLS_CACERT"), - @tls_cacertfile == "" ? nil : [@tls_cacertfile] - ) + def set_openldap key, value + SCR.Write( + path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".#{key}"), + value.nil? ? nil : [value] + ) + end - Builtins.y2milestone("file /etc/openldap/ldap.conf was modified") + def read_openldap_config entry + result = SCR.Read(path(".etc.ldap_conf.v.\"/etc/openldap/ldap.conf\".#{entry}")) + case result + when Array then result.first + when String then result + else result end - write_openldap_conf end # Write updated /etc/sssd/sssd.conf file @@ -2351,7 +2344,7 @@ uri = Builtins.mergestring( Builtins.maplist(Builtins.splitstring(@server, " \t")) do |s| - Builtins.sformat("ldap://%1", s) + detect_uri_scheme + s end, "," ) @@ -2643,7 +2636,7 @@ if !WriteLDAP({ @base_config_dn => config_object }) Builtins.y2error("%1 cannot be created", @base_config_dn) end - end + end #TODO fail? end @@ -2868,7 +2861,7 @@ WriteLdapConfEntry("host", nil) uri = Builtins.mergestring( Builtins.maplist(Builtins.splitstring(@server, " \t")) do |u| - Ops.add("ldap://", u) + detect_uri_scheme + u end, " " ) @@ -2886,6 +2879,8 @@ if @ldap_tls WriteLdapConfEntry("ssl", "start_tls") + elsif @ldaps + WriteLdapConfEntry("ssl", nil) else WriteLdapConfEntry("ssl", "no") end @@ -2934,7 +2929,7 @@ "tls_checkpeer", @tls_checkpeer == "yes" ? nil : @tls_checkpeer ) - WriteNscdCache(@start && @sssd) unless oes + WriteNscdCache(@start && @sssd) unless @oes end if @start # ldap used for authentication # ---------- correct pam_password value for Novell eDirectory @@ -3368,6 +3363,8 @@ publish :variable => :old_base_dn, :type => "string", :private => true publish :variable => :base_dn_changed, :type => "boolean", :private => true publish :variable => :ldap_tls, :type => "boolean" + publish :variable => :ldaps, :type => "boolean" + publish :variable => :request_server_certificate, :type => "string" publish :variable => :tls_cacertdir, :type => "string" publish :variable => :tls_cacertfile, :type => "string" publish :variable => :tls_checkpeer, :type => "string" @@ -3492,7 +3489,7 @@ publish :function => :CommitTemplates, :type => "boolean (map)" publish :function => :WriteToLDAP, :type => "map (map)" publish :function => :WriteLDAP, :type => "boolean (map)" - publish :function => :WriteOpenLdapConf, :type => "boolean ()" + publish :function => :WriteOpenLdapConf, :type => "void ()" publish :function => :WriteSSSDConfig, :type => "boolean ()" publish :function => :WritePlusLine, :type => "boolean (boolean)" publish :function => :CheckOrderOfCreation, :type => "boolean ()" @@ -3506,6 +3503,7 @@ publish :function => :SetAnonymous, :type => "void (boolean)" publish :function => :SetGUI, :type => "void (boolean)" publish :function => :RestartSSHD, :type => "void (boolean)" + publish :function => :use_secure_connection, :type => "boolean ()" end Ldap = LdapClass.new diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/testsuite/tests/Export.out new/yast2-ldap-client-3.1.4/testsuite/tests/Export.out --- old/yast2-ldap-client-3.1.3/testsuite/tests/Export.out 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/testsuite/tests/Export.out 2014-01-30 12:25:11.000000000 +0100 @@ -21,4 +21,4 @@ Read .etc.krb5_conf.v."SUSE.CZ"."kdc" ["kdc.suse.cz"] Return true Dump ============================================ -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_realm":"SUSE.CZ", "krb5_server":"kdc.suse.cz", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "sssd_with_krb":true, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_realm":"SUSE.CZ", "krb5_server":"kdc.suse.cz", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldaps":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":false, "sssd_with_krb":true, "start_autofs":false, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/testsuite/tests/Export2.out new/yast2-ldap-client-3.1.4/testsuite/tests/Export2.out --- old/yast2-ldap-client-3.1.3/testsuite/tests/Export2.out 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/testsuite/tests/Export2.out 2014-01-30 12:25:11.000000000 +0100 @@ -28,4 +28,4 @@ Read .etc.sssd_conf.v."domain/default"."ldap_group_search_base" nil Read .etc.sssd_conf.v."domain/default"."ldap_autofs_search_base" nil Return true -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_realm":"SUSE.CZ", "krb5_server":"kdc.suse.cz", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":true, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "nss_base_passwd":"ou=users,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_realm":"SUSE.CZ", "krb5_server":"kdc.suse.cz", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":true, "ldaps":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "nss_base_passwd":"ou=users,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/testsuite/tests/Export3.out new/yast2-ldap-client-3.1.4/testsuite/tests/Export3.out --- old/yast2-ldap-client-3.1.3/testsuite/tests/Export3.out 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/testsuite/tests/Export3.out 2014-01-30 12:25:11.000000000 +0100 @@ -28,4 +28,4 @@ Read .etc.sssd_conf.v."domain/default"."ldap_group_search_base" "ou=group,dc=suse,dc=cz" Read .etc.sssd_conf.v."domain/default"."ldap_autofs_search_base" nil Return true -Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_realm":"SUSE.CZ", "krb5_server":"kdc.suse.cz,kdc.suse.de", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] +Return $["base_config_dn":"", "bind_dn":"uid=manager,dc=suse,dc=cz", "create_ldap":false, "file_server":false, "krb5_realm":"SUSE.CZ", "krb5_server":"kdc.suse.cz,kdc.suse.de", "ldap_domain":"dc=suse,dc=cz", "ldap_server":"localhost", "ldap_tls":false, "ldaps":false, "login_enabled":true, "member_attribute":"member", "mkhomedir":true, "nss_base_group":"ou=group,dc=suse,dc=cz", "pam_password":"crypt", "sssd":true, "sssd_cache_credentials":true, "sssd_enumerate":true, "sssd_ldap_schema":"rfc2307", "sssd_with_krb":true, "start_autofs":true, "start_ldap":true, "tls_cacertdir":"/etc/openldap/cacerts/"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/testsuite/tests/Read.out new/yast2-ldap-client-3.1.4/testsuite/tests/Read.out --- old/yast2-ldap-client-3.1.3/testsuite/tests/Read.out 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/testsuite/tests/Read.out 2014-01-30 12:25:11.000000000 +0100 @@ -1,5 +1,6 @@ Dump ==== reading... ============================ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" +Read .etc.ldap_conf.v."/etc/openldap/ldap.conf".TLS_REQCERT "demand" Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/testsuite/tests/Read.rb new/yast2-ldap-client-3.1.4/testsuite/tests/Read.rb --- old/yast2-ldap-client-3.1.3/testsuite/tests/Read.rb 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/testsuite/tests/Read.rb 2014-01-30 12:25:11.000000000 +0100 @@ -34,6 +34,9 @@ "tls_cacertfile" => nil, "tls_checkpeer" => "no", "uri" => "ldap://localhost:333" + }, + "/etc/openldap/ldap.conf" => { + "TLS_REQCERT" => 'demand' } } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/testsuite/tests/Read2.out new/yast2-ldap-client-3.1.4/testsuite/tests/Read2.out --- old/yast2-ldap-client-3.1.3/testsuite/tests/Read2.out 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/testsuite/tests/Read2.out 2014-01-30 12:25:11.000000000 +0100 @@ -1,4 +1,5 @@ Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" +Read .etc.ldap_conf.v."/etc/openldap/ldap.conf".TLS_REQCERT nil Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" @@ -31,6 +32,7 @@ Dump nss: -ou=group,dc=suse,dc=cz- Dump nss: -dc=suse,dc=cz- Read .etc.ldap_conf.v."/etc/ldap.conf"."uri" "ldap://localhost:333" +Read .etc.ldap_conf.v."/etc/openldap/ldap.conf".TLS_REQCERT nil Read .etc.ldap_conf.v."/etc/ldap.conf"."base" "dc=suse,dc=cz" Read .etc.ldap_conf.v."/etc/ldap.conf"."ssl" nil Read .etc.ldap_conf.v."/etc/ldap.conf"."tls_cacertdir" "/etc/openldap/cacerts/" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-client-3.1.3/testsuite/tests/Read2.rb new/yast2-ldap-client-3.1.4/testsuite/tests/Read2.rb --- old/yast2-ldap-client-3.1.3/testsuite/tests/Read2.rb 2013-12-05 16:55:00.000000000 +0100 +++ new/yast2-ldap-client-3.1.4/testsuite/tests/Read2.rb 2014-01-30 12:25:11.000000000 +0100 @@ -36,6 +36,9 @@ "tls_cacertfile" => nil, "tls_checkpeer" => "no", "uri" => "ldap://localhost:333" + }, + "/etc/openldap/ldap.conf" => { + "TLS_REQCERT" => nil } } }, -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2014-01-31 11:51:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2014-01-29 07:17:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2014-01-31 11:51:14.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Jan 30 15:43:05 UTC 2014 - jreidinger(a)suse.com + +- Remove write to non-existing /etc/sysconfig/suseconfig + (FATE#100011) +- 3.1.27 + +------------------------------------------------------------------- +Thu Jan 30 15:42:52 CET 2014 - aschnell(a)suse.de + +- fixed DASD detection (bnc#860398) +- 3.1.26 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.25.tar.bz2 New: ---- yast2-installation-3.1.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.YJn2uu/_old 2014-01-31 11:51:15.000000000 +0100 +++ /var/tmp/diff_new_pack.YJn2uu/_new 2014-01-31 11:51:15.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.25 +Version: 3.1.27 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.25.tar.bz2 -> yast2-installation-3.1.27.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.25/package/yast2-installation.changes new/yast2-installation-3.1.27/package/yast2-installation.changes --- old/yast2-installation-3.1.25/package/yast2-installation.changes 2014-01-28 17:04:55.000000000 +0100 +++ new/yast2-installation-3.1.27/package/yast2-installation.changes 2014-01-30 17:19:57.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Jan 30 15:43:05 UTC 2014 - jreidinger(a)suse.com + +- Remove write to non-existing /etc/sysconfig/suseconfig + (FATE#100011) +- 3.1.27 + +------------------------------------------------------------------- +Thu Jan 30 15:42:52 CET 2014 - aschnell(a)suse.de + +- fixed DASD detection (bnc#860398) +- 3.1.26 + +------------------------------------------------------------------- Tue Jan 28 15:37:15 UTC 2014 - jreidinger(a)suse.com - Fix exporting configuration in first stage (FATE#308539) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.25/package/yast2-installation.spec new/yast2-installation-3.1.27/package/yast2-installation.spec --- old/yast2-installation-3.1.25/package/yast2-installation.spec 2014-01-28 17:04:55.000000000 +0100 +++ new/yast2-installation-3.1.27/package/yast2-installation.spec 2014-01-30 17:19:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-installation # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.25 +Version: 3.1.27 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.25/src/clients/inst_disks_activate.rb new/yast2-installation-3.1.27/src/clients/inst_disks_activate.rb --- old/yast2-installation-3.1.25/src/clients/inst_disks_activate.rb 2014-01-28 17:04:55.000000000 +0100 +++ new/yast2-installation-3.1.27/src/clients/inst_disks_activate.rb 2014-01-30 17:19:57.000000000 +0100 @@ -1,7 +1,7 @@ # encoding: utf-8 # ------------------------------------------------------------------------------ -# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +# Copyright (c) [2006-2014] Novell, Inc. All Rights Reserved. # # # This program is free software; you can redistribute it and/or modify it under @@ -61,7 +61,7 @@ # detect DASD disks disks = SCR.Read(path(".probe.disk")) - @have_dasd = disks.any? {|d| d["device"] == "dasd" } + @have_dasd = disks.any? {|d| d["device"] == "DASD" } # detect zFCP disks controllers = SCR.Read(path(".probe.storage")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.25/src/clients/save_config_finish.rb new/yast2-installation-3.1.27/src/clients/save_config_finish.rb --- old/yast2-installation-3.1.25/src/clients/save_config_finish.rb 2014-01-28 17:04:55.000000000 +0100 +++ new/yast2-installation-3.1.27/src/clients/save_config_finish.rb 2014-01-30 17:19:57.000000000 +0100 @@ -163,15 +163,6 @@ end Progress.NextStep # progress step title - Progress.Title(_("Configuring the superuser's environment...")) - SCR.Write( - path(".sysconfig.suseconfig.CWD_IN_USER_PATH"), - Builtins.contains(Product.flags, "usercwd") ? "yes" : "no" - ) - SCR.Write(path(".sysconfig.suseconfig"), nil) - - Progress.NextStep - # progress step title Progress.Title(_("Saving security settings...")) SCR.Write( path(".sysconfig.security.CHECK_SIGNATURES"), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package yast2-bootloader for openSUSE:Factory checked in at 2014-01-31 11:51:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-bootloader (Old) and /work/SRC/openSUSE:Factory/.yast2-bootloader.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-bootloader" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-bootloader/yast2-bootloader.changes 2014-01-14 20:01:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-bootloader.new/yast2-bootloader.changes 2014-01-31 11:51:11.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 28 09:56:33 UTC 2014 - jreidinger(a)suse.com + +- Fix examining MBR +- 3.1.4 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-3.1.3.tar.bz2 New: ---- yast2-bootloader-3.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.JbcmyV/_old 2014-01-31 11:51:11.000000000 +0100 +++ /var/tmp/diff_new_pack.JbcmyV/_new 2014-01-31 11:51:11.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-bootloader-3.1.3.tar.bz2 -> yast2-bootloader-3.1.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/package/yast2-bootloader.changes new/yast2-bootloader-3.1.4/package/yast2-bootloader.changes --- old/yast2-bootloader-3.1.3/package/yast2-bootloader.changes 2014-01-14 13:07:45.000000000 +0100 +++ new/yast2-bootloader-3.1.4/package/yast2-bootloader.changes 2014-01-30 14:13:00.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 28 09:56:33 UTC 2014 - jreidinger(a)suse.com + +- Fix examining MBR +- 3.1.4 + +------------------------------------------------------------------- Tue Jan 14 10:37:06 UTC 2014 - jreidinger(a)suse.com - handle problematic conversion of perl undef in perl-json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/package/yast2-bootloader.spec new/yast2-bootloader-3.1.4/package/yast2-bootloader.spec --- old/yast2-bootloader-3.1.3/package/yast2-bootloader.spec 2014-01-14 13:07:45.000000000 +0100 +++ new/yast2-bootloader-3.1.4/package/yast2-bootloader.spec 2014-01-30 14:13:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 3.1.3 +Version: 3.1.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/include/bootloader/grub/options.rb new/yast2-bootloader-3.1.4/src/include/bootloader/grub/options.rb --- old/yast2-bootloader-3.1.3/src/include/bootloader/grub/options.rb 2014-01-14 11:06:53.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/include/bootloader/grub/options.rb 2014-01-30 14:13:00.000000000 +0100 @@ -590,8 +590,7 @@ boot_devices = BootStorage.getPartitionList(:boot, "grub") value = "" if BootCommon.VerifyMDArray - if BootCommon.enable_md_array_redundancy == nil || - BootCommon.enable_md_array_redundancy + if BootCommon.enable_md_array_redundancy UI.ChangeWidget(Id("enable_redundancy"), :Value, true) else UI.ChangeWidget(Id("enable_redundancy"), :Value, false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/include/bootloader/routines/lib_iface.rb new/yast2-bootloader-3.1.4/src/include/bootloader/routines/lib_iface.rb --- old/yast2-bootloader-3.1.3/src/include/bootloader/routines/lib_iface.rb 2014-01-14 13:07:45.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/include/bootloader/routines/lib_iface.rb 2014-01-30 14:13:00.000000000 +0100 @@ -411,7 +411,7 @@ device_data = TmpYAMLFile.new(device) ret_data = TmpYAMLFile.new - run_pbl_yaml "#{ret_data.path}=ExamineMBR(#{device_data})" + run_pbl_yaml "#{ret_data.path}=ExamineMBR(#{device_data.path})" ret = ret_data.data Builtins.y2milestone("Device: %1 includes in MBR: %2", device, ret) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootCommon.rb new/yast2-bootloader-3.1.4/src/modules/BootCommon.rb --- old/yast2-bootloader-3.1.3/src/modules/BootCommon.rb 2014-01-14 11:06:53.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/modules/BootCommon.rb 2014-01-30 14:13:00.000000000 +0100 @@ -982,6 +982,8 @@ # detect bootloader @loader_type = Convert.to_string(SCR.Read(path(".probe.boot_arch"))) @loader_type = "zipl" if @loader_type == "s390" + # ppc uses grub2 (fate #315753) + @loader_type = "grub2" if @loader_type == "ppc" # suppose grub2 should superscede grub .. @loader_type = "grub2" if @loader_type == "grub" Builtins.y2milestone("Bootloader detection returned %1", @loader_type) @@ -1146,7 +1148,8 @@ ] if Arch.i386 || Arch.x86_64 ret = Convert.convert( - Builtins.merge(ret, ["lilo", "grub", "grub2"]), + # don't add lilo (fate #314886) + Builtins.merge(ret, ["grub", "grub2"]), :from => "list", :to => "list <string>" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootGRUB.rb new/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb --- old/yast2-bootloader-3.1.3/src/modules/BootGRUB.rb 2014-01-14 11:06:53.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/modules/BootGRUB.rb 2014-01-30 14:13:00.000000000 +0100 @@ -456,19 +456,6 @@ "__devs" => [] } ) - elsif StorageDevices.FloppyPresent - out = Builtins.add( - out, - { - "name" => BootCommon.translateSectionTitle("floppy"), - "original_name" => "floppy", - "type" => "other", - "chainloader" => "/dev/fd0", - "__changed" => true, - "__auto" => true, - "__devs" => [] - } - ) end out = Builtins.add(out, CreateLinuxSection("failsafe")) out = Builtins.add(out, CreateLinuxSection("memtest86")) @@ -525,27 +512,25 @@ GfxMenu.ReadStatusAcousticSignal md_value = BootStorage.addMDSettingsToGlobals pB_md_value = Ops.get(BootCommon.globals, "boot_md_mbr", "") - if md_value != pB_md_value - if pB_md_value != "" - disks = Builtins.splitstring(pB_md_value, ",") - disks = Builtins.filter(disks) { |v| v != "" } - if Builtins.size(disks) == 2 - BootCommon.enable_md_array_redundancy = true - md_value = "" - end - Builtins.y2milestone( - "disks from md array (perl Bootloader): %1", - disks - ) - end - if md_value != "" - BootCommon.enable_md_array_redundancy = false - Ops.set(BootCommon.globals, "boot_md_mbr", md_value) - Builtins.y2milestone( - "Add md array to globals: %1", - BootCommon.globals - ) + if pB_md_value != "" + disks = Builtins.splitstring(pB_md_value, ",") + disks = Builtins.filter(disks) { |v| v != "" } + if Builtins.size(disks) == 2 + BootCommon.enable_md_array_redundancy = true + md_value = "" end + Builtins.y2milestone( + "disks from md array (perl Bootloader): %1", + disks + ) + end + if md_value != "" + BootCommon.enable_md_array_redundancy = false + Ops.set(BootCommon.globals, "boot_md_mbr", md_value) + Builtins.y2milestone( + "Add md array to globals: %1", + BootCommon.globals + ) end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-bootloader-3.1.3/src/modules/BootGRUB2.rb new/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb --- old/yast2-bootloader-3.1.3/src/modules/BootGRUB2.rb 2014-01-14 11:06:53.000000000 +0100 +++ new/yast2-bootloader-3.1.4/src/modules/BootGRUB2.rb 2014-01-30 14:13:00.000000000 +0100 @@ -84,27 +84,25 @@ if Mode.normal md_value = BootStorage.addMDSettingsToGlobals pB_md_value = Ops.get(BootCommon.globals, "boot_md_mbr", "") - if md_value != pB_md_value - if pB_md_value != "" - disks = Builtins.splitstring(pB_md_value, ",") - disks = Builtins.filter(disks) { |v| v != "" } - if Builtins.size(disks) == 2 - BootCommon.enable_md_array_redundancy = true - md_value = "" - end - Builtins.y2milestone( - "disks from md array (perl Bootloader): %1", - disks - ) - end - if md_value != "" - BootCommon.enable_md_array_redundancy = false - Ops.set(BootCommon.globals, "boot_md_mbr", md_value) - Builtins.y2milestone( - "Add md array to globals: %1", - BootCommon.globals - ) + if pB_md_value != "" + disks = Builtins.splitstring(pB_md_value, ",") + disks = Builtins.filter(disks) { |v| v != "" } + if Builtins.size(disks) == 2 + BootCommon.enable_md_array_redundancy = true + md_value = "" end + Builtins.y2milestone( + "disks from md array (perl Bootloader): %1", + disks + ) + end + if md_value != "" + BootCommon.enable_md_array_redundancy = false + Ops.set(BootCommon.globals, "boot_md_mbr", md_value) + Builtins.y2milestone( + "Add md array to globals: %1", + BootCommon.globals + ) end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2 for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2014-01-31 11:50:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2014-01-24 21:42:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2014-01-31 11:50:48.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 30 09:27:43 UTC 2014 - mfilka(a)suse.com + +- bnc#861078 + - detected network service set properly when running in + installation mode +- 3.1.17 + +------------------------------------------------------------------- Old: ---- yast2-3.1.16.tar.bz2 New: ---- yast2-3.1.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.x7U0Jk/_old 2014-01-31 11:50:49.000000000 +0100 +++ /var/tmp/diff_new_pack.x7U0Jk/_new 2014-01-31 11:50:49.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.16 +Version: 3.1.17 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-3.1.16.tar.bz2 -> yast2-3.1.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/library/general/test/Makefile.am new/yast2-3.1.17/library/general/test/Makefile.am --- old/yast2-3.1.16/library/general/test/Makefile.am 2014-01-22 12:26:53.000000000 +0100 +++ new/yast2-3.1.17/library/general/test/Makefile.am 2014-01-30 16:11:59.000000000 +0100 @@ -1,5 +1,6 @@ TESTS = \ - linuxrc_test.rb + linuxrc_test.rb \ + hooks_test.rb TEST_EXTENSIONS = .rb RB_LOG_COMPILER = rspec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/library/general/test/hooks_test.rb new/yast2-3.1.17/library/general/test/hooks_test.rb --- old/yast2-3.1.16/library/general/test/hooks_test.rb 2014-01-22 12:26:53.000000000 +0100 +++ new/yast2-3.1.17/library/general/test/hooks_test.rb 2014-01-30 16:11:59.000000000 +0100 @@ -56,14 +56,14 @@ it "tracks the results of the run hook files" do hook = Hooks.run 'before_hook' expect(Hooks.last.results.size).to eq(2) - failed_hook_file = Hooks.find('before_hook').results.first - expect(failed_hook_file.exit).not_to eq(0) - expect(failed_hook_file.stderr).to match(/failure/) + failed_hook_file = Hooks.find('before_hook').files.first + expect(failed_hook_file.result.exit).not_to eq(0) + expect(failed_hook_file.result.stderr).to match(/failure/) expect(failed_hook_file.output).to match(/failure/) - succeeded_hook_file = Hooks.find('before_hook').results.last - expect(succeeded_hook_file.exit).to eq(0) - expect(succeeded_hook_file.stdout).to match(/success/) + succeeded_hook_file = Hooks.find('before_hook').files.last + expect(succeeded_hook_file.result.exit).to eq(0) + expect(succeeded_hook_file.result.stdout).to match(/success/) expect(succeeded_hook_file.output).to match(/success/) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/library/network/src/modules/NetworkService.rb new/yast2-3.1.17/library/network/src/modules/NetworkService.rb --- old/yast2-3.1.16/library/network/src/modules/NetworkService.rb 2014-01-22 12:26:53.000000000 +0100 +++ new/yast2-3.1.17/library/network/src/modules/NetworkService.rb 2014-01-30 16:11:59.000000000 +0100 @@ -130,19 +130,19 @@ # @return true when the network is managed by an external tool, # like NetworkManager, false otherwise def network_manager? - cached_name == :network_manager + cached_service?(:network_manager) end alias_method :is_network_manager, :network_manager? def netconfig? - cached_name == :netconfig + cached_service?(:netconfig) end alias_method :is_netconfig, :netconfig? def wicked? - cached_name == :wicked + cached_service?(:wicked) end alias_method :is_wicked, :wicked? @@ -178,8 +178,16 @@ @current_name = :network_manager when "wicked" @current_name = :wicked + else + if Mode.installation || Mode.config + Builtins.y2milestone("Running in installer, use default: wicked") + @current_name = :wicked + else + Builtins.y2error("Cannot determine used network service.") + raise "Cannot detect used network service" + end end - + @cached_name = @current_name Builtins.y2milestone("Current backend: #{@current_name}") @@ -354,6 +362,8 @@ end end + private + # Replies with currently selected network service name # # Currently known backends: @@ -362,12 +372,19 @@ # - :wicked - supported (via its backward compatibility to # ifup) # - private def cached_name Read() return @cached_name end + # Checks if currently cached service is the given one + def cached_service?( service) + cached_name == service + rescue + Builtins.y2error("NetworkService: error when checking cached network service") + false + end + # Restarts wicked backend directly def wicked_restart run_wicked( "ifdown", "all") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/library/network/test/network_service_test.rb new/yast2-3.1.17/library/network/test/network_service_test.rb --- old/yast2-3.1.16/library/network/test/network_service_test.rb 2014-01-22 12:26:53.000000000 +0100 +++ new/yast2-3.1.17/library/network/test/network_service_test.rb 2014-01-30 16:11:59.000000000 +0100 @@ -12,7 +12,19 @@ context "smoke test" do describe "#is_network_manager" do it "does not crash" do - expect([true, false].include? Yast::NetworkService.is_network_manager).to be_true + expect{ Yast::NetworkService.is_network_manager }.not_to raise_error + end + end + + describe "#is_wicked" do + it "does not crash" do + expect{ Yast::NetworkService.is_wicked }.not_to raise_error + end + end + + describe "#is_netconfig" do + it "does not crash" do + expect{ Yast::NetworkService.is_netconfig }.not_to raise_error end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/package/yast2.changes new/yast2-3.1.17/package/yast2.changes --- old/yast2-3.1.16/package/yast2.changes 2014-01-22 12:26:53.000000000 +0100 +++ new/yast2-3.1.17/package/yast2.changes 2014-01-30 16:11:59.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Jan 30 09:27:43 UTC 2014 - mfilka(a)suse.com + +- bnc#861078 + - detected network service set properly when running in + installation mode +- 3.1.17 + +------------------------------------------------------------------- Tue Jan 21 14:57:14 UTC 2014 - jreidinger(a)suse.com - remove from wizard icons for title as proposed by Ken diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.16/package/yast2.spec new/yast2-3.1.17/package/yast2.spec --- old/yast2-3.1.16/package/yast2.spec 2014-01-22 12:26:53.000000000 +0100 +++ new/yast2-3.1.17/package/yast2.spec 2014-01-30 16:11:59.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.16 +Version: 3.1.17 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gfxboot for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package gfxboot for openSUSE:Factory checked in at 2014-01-31 11:50:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gfxboot (Old) and /work/SRC/openSUSE:Factory/.gfxboot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gfxboot" Changes: -------- --- /work/SRC/openSUSE:Factory/gfxboot/gfxboot.changes 2013-12-19 12:08:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gfxboot.new/gfxboot.changes 2014-01-31 11:50:37.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Jan 24 15:37:57 CET 2014 - snwint(a)suse.de + +- fix compiler warning +- hrvoje.senjan: use FT_SYNTHESIS_H macro +- set min video mode to 1024x576 +- remove use-recommended-freetype-include.patch + +------------------------------------------------------------------- Old: ---- gfxboot-4.5.1.tar.bz2 use-recommended-freetype-include.patch New: ---- gfxboot-4.5.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gfxboot.spec ++++++ --- /var/tmp/diff_new_pack.huebvD/_old 2014-01-31 11:50:38.000000000 +0100 +++ /var/tmp/diff_new_pack.huebvD/_new 2014-01-31 11:50:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gfxboot # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,19 @@ Name: gfxboot -Version: 4.5.1 +Version: 4.5.2 Release: 0 Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX License: GPL-2.0+ Group: System/Boot Url: http://en.opensuse.org/SDB:Gfxboot -Source: gfxboot-4.5.1.tar.bz2 +Source: gfxboot-4.5.2.tar.bz2 Source1: KDE.tar.bz2 Source2: openSUSE.tar.bz2 Source3: SLED.tar.bz2 Source4: SLES.tar.bz2 Source5: upstream.tar.bz2 Source6: examples.tar.bz2 -# PATCH-FIX-UPSTREAM use-recommended-freetype-include.patch -- Freetype upstream recommends using their macros together with -# ft2build include. Positive sideeffect is that this patch makes it build with both freetype2 2.5.1, and older versions -Patch0: use-recommended-freetype-include.patch BuildRequires: fdupes BuildRequires: freetype2-devel BuildRequires: fribidi @@ -120,7 +117,6 @@ %prep %setup -%patch0 -p1 %setup -T -D -a 1 %setup -T -D -a 2 %setup -T -D -a 3 ++++++ KDE.tar.bz2 ++++++ ++++++ SLED.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/SLED/config new/themes/SLED/config --- old/themes/SLED/config 2012-09-06 12:07:10.000000000 +0200 +++ new/themes/SLED/config 2014-01-24 15:24:50.000000000 +0100 @@ -1,2 +1,2 @@ -product=SLED 11 +product=SLED 12 based_on=openSUSE ++++++ SLES.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/SLES/config new/themes/SLES/config --- old/themes/SLES/config 2012-09-06 12:07:10.000000000 +0200 +++ new/themes/SLES/config 2014-01-24 15:24:42.000000000 +0100 @@ -1,2 +1,2 @@ -product=SLES 11 +product=SLES 12 based_on=openSUSE ++++++ examples.tar.bz2 ++++++ ++++++ gfxboot-4.5.1.tar.bz2 -> gfxboot-4.5.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.1/VERSION new/gfxboot-4.5.2/VERSION --- old/gfxboot-4.5.1/VERSION 2012-10-01 10:53:30.000000000 +0200 +++ new/gfxboot-4.5.2/VERSION 2014-01-24 15:37:54.000000000 +0100 @@ -1 +1 @@ -4.5.1 +4.5.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.1/changelog new/gfxboot-4.5.2/changelog --- old/gfxboot-4.5.1/changelog 2012-10-01 10:53:31.000000000 +0200 +++ new/gfxboot-4.5.2/changelog 2014-01-24 15:37:55.000000000 +0100 @@ -1,4 +1,9 @@ -2012-10-01: HEAD +2014-01-24: HEAD + - fix compiler warning + - hrvoje.senjan: use FT_SYNTHESIS_H macro + - set min video mode to 1024x576 + +2012-10-01: 4.5.1 - start using 'default' video entry 2012-03-28: 4.5.0 @@ -207,603 +212,3 @@ - implemented realloc function - file read works with files of unknown size (-1) -2008-12-03: 4.1.19 - - copy en.tlk - -2008-12-02: 4.1.18 - - enabled penguin theme for openSUSE - -2008-12-01: 4.1.17 - - new texts for speech support (bnc #391313) - -2008-11-20: 4.1.16 - - translations, again (bnc #445350) - -2008-11-20: 4.1.15 - - make lang list changes more fault tolerant - - updated translations (bnc #445350) - -2008-11-20: 4.1.14 - - updated translations - - removed special livecd menu text replacements - - new font - - translations updated - - new mkbootdisk - -2008-11-12: 4.1.13 - - no beep in installed system (fate #303481) - -2008-11-07: 4.1.12 - - fixed 'portuguese' spelling (bnc #442407) - -2008-11-06: 4.1.11 - - all menus have speech support now - - speech works with languages != english - - in input lines the char at cursor position is spoken - - all menus have speech support now - - in input lines the char at cursor position is spelled - -2008-11-04: 4.1.10 - - fix last livecd patch - - can replace '_' with space in menu entries - -2008-11-04: 4.1.9 - - for livecds: don't switch to text mode with F9 (bnc #391313) - -2008-10-16: 4.1.8 - - updated openSUSE theme - -2008-10-06: 4.1.7 - - updated SLES/SLED themes - -2008-09-29: 4.1.6 - - new SLE themes - -2008-09-26: 4.1.5 - - added - - added - - translations updated - -2008-09-25: 4.1.4 - - keyboard dialog - -2008-09-25: 4.1.3 - - better monitor detection (bnc #407786) - - fix default video size selection (bnc #407786) - -2008-09-11: 4.1.2 - - baud rate autodetect - - infobox handling ok - - support serial lines - -2008-08-20: 4.1.1 - - SLE themes - -2008-08-18: 4.1.0 - - use File::Temp - - help pages can have several anchors - - use @@@XXX@@@ instead of &XXX; in help texts to mark variables - - updated gfxboot doc - - fix help to better tolerate broken help setup - - dump old texts - - replace fkeys with entities - - dump old texts - - english translations - - new Makefile - - new help texts - - new help text script - - new font - - more vms - - enhanced gfxboot script - -2008-05-26: 4.0.14 - - updated translations - - make driver update menu configurable - - added 'download url' item to driver update menu - -2008-05-26: 4.0.12 - - 11.0 theme - -2008-05-19: 4.0.11 - - turn sound off before loading kernel (bnc #392016) - - partly moved to new theme - - use 32 bit graphics mode for bootloader - -2008-05-15: 4.0.10 - - rewrote config parser - - move most layout parameters to config file - -2008-05-09: 4.0.9 - - show F9 hint - -2008-05-09: 4.0.8 - - added korean, galician and thai - - updated translations - -2008-05-07: 4.0.7 - - F9: add braille=1 - -2008-04-28: 4.0.6 - - added experimental speach output - - added beep when bootloader is ready (fate #303482) - - added 'visually impaired' mode key (F9) (fate #303482) - - WAV file playback works again - -2008-04-14: 4.0.5 - - bootloader check only if needed - -2008-04-11: 4.0.4 - - more fixes - - fix script - -2008-04-10: 4.0.3 - - gfxboot can handle themes & translations - - fixed typo in gfxboot.cfg - -2008-04-08: 4.0.2 - - added upstream theme - - added 'gfxboot' (boot screen config tool) - - added man page - - first version - -2008-02-04: 4.0.1 - - added optional 'mediacheck' - -2008-02-04: 4.0.0 - - new distclean target - - Makefile rewrite to handle themes - - source tree layout changed - -2007-10-08: 3.3.39 - - Avi Kivity: SS does not survive switch to PM in KVM (bnc #307194) - -2007-09-25: 3.3.38 - - 'benventuno' is not really an italian word (bnc #327546) - -2007-09-14: 3.3.37 - - fixed build - -2007-09-12: 3.3.36 - - new splash animation - - always ask for VBE2 info (to e.g. get 1366x768 listed - #298025) - -2007-09-10: 3.3.35 - - translations updated - -2007-08-22: 3.3.34 - - fix livecd mode - -2007-08-20: 3.3.33 - - new translations - - Lenovo theme - - lenovo oem test data - -2007-08-13: 3.3.32 - - use autohinting - -2007-08-10: 3.3.31 - - allow to set default values for repository - -2007-08-09: 3.3.30 - - new texts - - use en_US - -2007-07-26: 3.3.28 - - adjusted menu texts - -2007-07-24: 3.3.27 - - no graphics on problematic via boards (bnc #231104) - -2007-07-23: 3.3.26 - - go green - - moved 'install - XXX' variants into submenu, added 'repair' entry (bnc #293827) - - added Sinhala - - speed up arabic - - rewrote line edit function - - intro aborted if any key pressed (bnc #219570) - - added Walloon - - line edit function rewritten - -2007-03-15: 3.3.24 - - rtl, cont. - - rtl, cont - - rtl, cont - - rtl, cont - - basic rtl support - -2007-03-12: 3.3.23 - - two-line panel - - new languages - - new languages - -2007-02-09: 3.3.22 - - different 'Hindi' spelling - -2007-02-07: 3.3.21 - - added Gujarati & Marathi translations - -2007-02-07: 3.3.20 - - no penguins - - new font - - language cleanup - - added some code to debug monitor detection - -2007-01-22: 3.3.19 - - fix language/keymap setting (bnc #223518) - -2006-11-24: 3.3.18 - - fixed penguin theme bug (bnc #216991) - - lang menu sometimes shows only locale name - -2006-11-20: 3.3.17 - - new translations - - translations updated - - minor penguin correction - -2006-11-17: 3.3.16 - - penguins more likely during winter - - layout tuned - - adjust 640x480 menu sizes (bnc #221139) - -2006-11-15: 3.3.15 - - updated documentation - - get initrd size right for progress bar - -2006-11-14: 3.3.14 - - fix doc file permission - -2006-11-13: 3.3.13 - - final 10.2 theme - - new help texts - - new po files - - new install help - - rewrite - -2006-11-07: 3.3.12 - - new translations - -2006-10-27: 3.3.11 - - unpack_bootlogo taks care of gfxboot.cfg - - penguin theme is back - - adjust html help text parser - -2006-10-26: 3.3.10 - - new font - - new translations - - new translations - - new translations - - removed duplicate - - removed double txt_password entry - - fix po files - -2006-10-23: 3.3.9 - - added 'noinstallopt' option to gfxboot.cfg - - new syslinux - - 3.31 - - translations updated - -2006-09-25: 3.3.7 - - Arabic is back - -2006-09-25: 3.3.6 - - added 'firmware' menu entry - -2006-09-20: 3.3.5 - - support Punjabi (Gurmukhi script) - -2006-09-20: 3.3.4 - - use latin script for serbian - - added some indic fonts - - back to 4 bits - - fixed font rendering bug, back to 3 bits - -2006-09-19: 3.3.3 - - use 4 bit for antialiasing (not 3) - -2006-09-19: 3.3.2 - - fix Estonian support - -2006-09-18: 3.3.1 - - added Estonian - - put hard disk install option back in - - support antialiased fonts - -2006-08-24: 3.3.0 - - 32 bit rewrite finished - - changed interface to bootloader - - updated boot loader - - new syslinux - - changed interface to bootloader + increased internal - version number - - new lilo - - removed some obsolete things - -2006-08-21: 3.2.37 - - 32 bit - - 32 bit - - 32 bit - - moved modplayer to 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bits - - 32 bit - - removed 16 bit pm mode support - - 32 bit - - sound file added - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - removed last traces of old 32 bit code - - better idle loop - - 32 bit - - use O99 - - new kroete code - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit - - 32 bit, cont. - - 32 bit, cont. - -2006-08-07: 3.2.36 - - oss logos added - - move to 32 bit, cont. - - added script to check 16/32 bit context switches - - move to 32 bit, cont. - -2006-08-01: 3.2.35 - - started internal rewrite to run all code in 32 bit pm - -2006-07-24: 3.2.34 - - fixed Zen theme - -2006-07-19: 3.2.33 - - added Catalan & Vietnamese - - better debug window - - fixed minor file reading bug - - better internal locale handling - - separated en locale into en_GB & en_US - -2006-07-17: 3.2.32 - - more than one boot option line, finished (bnc #160066) - - xen test set - - make it openSUSE - - more than one boot option line, finished - - added 'about' button - - more than one boot option line, cont. - - newer pictures - -2006-07-10: 3.2.31 - - using beta pictures - - adjusted Zen - - allow more than one boot option line - - more cleanup - - removed obsolete code - - use disk image, not floppy for lilo testing - - some code cleanup - - workaround for interlaced mode issue on some ATI cards (bnc #177982) - - made 'Text Mode' translatable (bnc #179582) - - menu bar fits menu text width - - made full panel default - - ShiftTab now works - - remove duplicate video modes (bnc #145749) - - new Zen pictures - - use disk image, not floppy for grub testing - -2006-06-09: 3.2.30 - - translations updated - - minor Zen theme change - -2006-05-23: 3.2.29 - - added Zen texts & theme - - translations updated - -2006-05-22: 3.2.28 - - add check to handle insufficient real mode handling in Xen on VMX - machines (bnc #175473) - - allow per menu entry memory checks via mem.min[<label>] and - mem.msg[<label>] in gfxboot.cfg - -2006-05-15: 3.2.27 - - fix random memory corruption when trying to open a nonexistent - file (bnc #165846) - -2006-05-02: 3.2.26 - - texts updated - -2006-04-27: 3.2.25 - - implemented inbyte/outbyte to access i/o space (bnc #170167) - -2006-04-19: 3.2.24 - - fix drawing bug (bnc #166914) - -2006-04-07: 3.2.23 - - translations updated - - fine-tuned splash - -2006-04-04: 3.2.22 - - fixed Khmer menu entry - -2006-04-03: 3.2.21 - - fixed evil memory corruption bug - -2006-03-31: 3.2.20 - - added 'share' input field for smb install - - some more texts are translatable - - Live-CD preparations - -2006-03-30: 3.2.19 - - adjusted 640x480 fallback layout - - added driver update dialog that lets you enter the update file name - -2006-03-29: 3.2.18 - - better 'welcome' screen - -2006-03-28: 3.2.17 - - new welcome screen - -2006-03-27: 3.2.16 - - translations updated - - texts updated - -2006-03-13: 3.2.15 - - theme works - - moved keymapchars to bin - - theme, cont. - - themes updated - -2006-03-06: 3.2.14 - - translations updated - - theme, part 2 - -2006-02-28: 3.2.13 - - new theme - - more cleanups - - updated test data & script - -2006-02-21: 3.2.12 - - add noapic boot option (bnc #150030) - -2006-02-14: 3.2.11 - - apic - -2006-02-09: 3.2.10 - - more defensive monitor detection (bnc #149578) - - monitor detection can be skipped - -2006-01-26: 3.2.9 - - go for 8 bit framebuffer if there are no 16 bit modes (bnc #144742) - -2006-01-23: 3.2.8 - - better monitor detection - - cjwatson(a)ubuntu.com: support big-endian cpio archives (bnc #140119) - - support direct driverupdate loading from CD-ROM (fate #152) - - add new languages - -2006-01-16: 3.2.7 - - show all options in grub/lilo (bnc #136377) - - translations & font updated - - new syslinux - -2005-12-14: 3.2.6 - - fixed to work correctly with grub & lilo - -2005-12-05: 3.2.5 - - script cleanup - - Colin Watson <cjwatson(a)ubuntu.com>: build fixes for x86-64 - - fixed kernel splash loading - - include 'unpack_bootlogo' script in package - -2005-11-30: 3.2.4 - - adjust to syslinux 3.11 - - remove some primary words and reimplement them as bytecode - - read config options from 'gfxboot.cfg' - - syslinux update - - read config options from 'gfxboot.cfg' - - boot link removed - - texts updated - - new lilo & grub packages - - remove some primary words and reimplement them as bytecode - - adjust to syslinux 3.11 - - new test data - - no longer support dosemu for testing - -2005-10-19: 3.2.3 - - offer Croatian - -2005-10-12: 3.2.2 - - do only aligned dword reads from video memory - some ATI boards - need this (bnc #114804) - -2005-10-07: 3.2.1 - - needs syslinux with updated gfx patch - - texts updated for 10.1 - - implemented filesize, getcwd, chdir commands - - using new cd layout - - needs syslinux with updated gfx patch - - texts updated for 10.1 - - new syslinux - -2005-09-20: 3.2.0 - - gcc fixes - - better testing script - -2005-09-09: 3.1.8 - - fixed test - -2005-09-05: 3.1.7 - - Finnish texts updated - -2005-09-02: 3.1.6 - - fix color handling bug (bnc #72232) - - show penguins a bit more often - -2005-08-29: 3.1.5 - - dansk translations - - 'Serbian' translated - - rename help keys - - long menus are wrapped - - added 640x480 fallback for i845-like boards - - new translations - - updated language list - - too many modifiers - - added more keymaps (bnc #113265) - -2005-08-24: 3.1.4 - - a different shade of blue - - fixed penguin theme drawing bug - -2005-08-22: 3.1.3 - - new translations - -2005-08-22: 3.1.2 - - add penguin theme - - Dansk keymap added - - 8 bit jpeg - -2005-08-15: 3.1.1 - - new translations - - fixed Dansk locale (bnc #104084) - - new translations added - - jpg instead of pcx - - x renamed - -2005-08-05: 3.1.0 - - new theme - - removed - - support alpha channel - - added new texts - - texts updated - - better conv2 script - -2005-06-23: 3.0.22 - - full 32 bit support - -2005-06-22: 3.0.21 - - documentation updated - -2005-04-27: 3.0.20 - - harddisk install option gone (bnc #60128) - - syslinux updated for testing - -2005-04-22: 3.0.19 - - fixed 16 bit color mode selection (bnc #79312) - - added live cd entry - -2005-04-20: 3.0.17 - - taiwan text fix - -2005-04-11: 3.0.16 - - fixed file reading - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.1/gfxboot-compile.c new/gfxboot-4.5.2/gfxboot-compile.c --- old/gfxboot-4.5.1/gfxboot-compile.c 2012-09-06 12:07:10.000000000 +0200 +++ new/gfxboot-4.5.2/gfxboot-compile.c 2014-01-24 15:34:56.000000000 +0100 @@ -1272,16 +1272,14 @@ } } - changed = 1; - - optimize_code1(lf) || - optimize_code2(lf) || - optimize_code3(lf) || - optimize_code4(lf) || - optimize_code5(lf) || - optimize_code6(lf) || - optimize_code7(lf) || - (changed = 0); + changed = + optimize_code1(lf) || + optimize_code2(lf) || + optimize_code3(lf) || + optimize_code4(lf) || + optimize_code5(lf) || + optimize_code6(lf) || + optimize_code7(lf) ? 1 : 0; return changed; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.1/gfxboot-font.c new/gfxboot-4.5.2/gfxboot-font.c --- old/gfxboot-4.5.1/gfxboot-font.c 2012-09-06 12:07:10.000000000 +0200 +++ new/gfxboot-4.5.2/gfxboot-font.c 2014-01-24 15:26:56.000000000 +0100 @@ -13,7 +13,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#include <freetype/ftsynth.h> +#include FT_SYNTHESIS_H #define MAGIC 0xd2828e06 ++++++ openSUSE.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/config new/themes/openSUSE/config --- old/themes/openSUSE/config 2012-09-06 12:07:10.000000000 +0200 +++ new/themes/openSUSE/config 2014-01-24 15:24:30.000000000 +0100 @@ -1,2 +1,2 @@ -product=openSUSE 12.2 +product=openSUSE 13.2 based_on= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_video.inc new/themes/openSUSE/src/dia_video.inc --- old/themes/openSUSE/src/dia_video.inc 2012-10-01 10:51:42.000000000 +0200 +++ new/themes/openSUSE/src/dia_video.inc 2014-01-24 15:23:18.000000000 +0100 @@ -137,8 +137,8 @@ over 0xbfff and 6 2 roll 0x4000 and % fb support exch vm_color_bits eq and % color bits - over 600 ge and % height >= 600 - 2 index 800 ge and % width >= 800 + over 576 ge and % height >= 576 + 2 index 1024 ge and % width >= 1024 { 1 "" "" 5 -2 roll ] } { pop pop pop pop } ifelse } ifelse } for ++++++ upstream.tar.bz2 ++++++ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit swig for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package swig for openSUSE:Factory checked in at 2014-01-31 11:45:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/swig (Old) and /work/SRC/openSUSE:Factory/.swig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "swig" Changes: -------- --- /work/SRC/openSUSE:Factory/swig/swig.changes 2013-10-02 20:29:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.swig.new/swig.changes 2014-01-31 11:45:07.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 29 19:57:02 UTC 2014 - badshah400(a)gmail.com + +- Add patch swig-support-octave-3.8.0.patch: adds support for + octave version 3.8.0 to swig; patch taken from upstream git + and rebased for present version. + +------------------------------------------------------------------- New: ---- swig-support-octave-3.8.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ swig.spec ++++++ --- /var/tmp/diff_new_pack.lANoF2/_old 2014-01-31 11:45:08.000000000 +0100 +++ /var/tmp/diff_new_pack.lANoF2/_new 2014-01-31 11:45:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package swig # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,8 @@ Patch12: ruby-1.8.6-newobject.patch # PATCH-FIX-UPSTREAM swig-lua-fix-void-return-for-int-functions.patch bnc#843310 badshah400(a)gmail.com -- Fix functions returning void when int is expected for lua bindings Patch13: swig-lua-fix-void-return-for-int-functions.patch +# PATCH-FIX-UPSTREAM swig-support-octave-3.8.0.patch badshah400(a)gmail.com -- Support octave 3.8.0 (this fixes octave 3.8.0 bindings of several packages failing to build in Factory such as mathgl, plplot, etc.), patch taken from upstream and rebased for current version. +Patch14: swig-support-octave-3.8.0.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel @@ -141,6 +143,7 @@ %endif %patch9 %patch13 -p1 +%patch14 -p1 %build %configure --disable-ccache ++++++ swig-support-octave-3.8.0.patch ++++++ https://github.com/swig/swig/commit/5b167cc12daf9ea275c17fedaefc975450613ab2 >From 5b167cc12daf9ea275c17fedaefc975450613ab2 Mon Sep 17 00:00:00 2001 From: Karl Wette <karl.wette(a)ligo.org> Date: Mon, 13 Jan 2014 18:24:17 +1300 Subject: [PATCH] octave: update support to Octave version 3.8.0 diff --git a/Lib/octave/octrun.swg b/Lib/octave/octrun.swg index 41d1c7a..2174a0f 100644 --- a/Lib/octave/octrun.swg +++ b/Lib/octave/octrun.swg @@ -1,20 +1,88 @@ #include <octave/version.h> -#ifndef OCTAVE_API_VERSION_NUMBER - - // Hack to distinguish between Octave 3.2 and earlier versions before OCTAVE_API_VERSION_NUMBER existed - #define ComplexLU __ignore - #include <octave/CmplxLU.h> - #undef ComplexLU - #ifdef octave_Complex_LU_h - # define OCTAVE_API_VERSION_NUMBER 36 - #else - # define OCTAVE_API_VERSION_NUMBER 37 - #endif -#endif +// Macro for enabling features which require Octave version >= major.minor.patch +#define SWIG_OCTAVE_PREREQ(major, minor, patch) \ + ( (OCTAVE_MAJOR_VERSION<<16) + (OCTAVE_MINOR_VERSION<<8) + OCTAVE_PATCH_VERSION >= ((major)<<16) + ((minor)<<8) + (patch) ) + +// Reconstruct Octave major, minor, and patch versions for releases prior to 3.8.1 +#if !defined(OCTAVE_MAJOR_VERSION) + +# if !defined(OCTAVE_API_VERSION_NUMBER) + +// Hack to distinguish between Octave 3.8.0, which removed OCTAVE_API_VERSION_NUMBER but did not yet +// introduce OCTAVE_MAJOR_VERSION, and Octave <= 3.2, which did not define OCTAVE_API_VERSION_NUMBER +# include <octave/ov.h> +# if defined(octave_ov_h) +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 8 +# define OCTAVE_PATCH_VERSION 0 +# else + +// Hack to distinguish between Octave 3.2 and earlier versions, before OCTAVE_API_VERSION_NUMBER existed +# define ComplexLU __ignore +# include <octave/CmplxLU.h> +# undef ComplexLU +# if defined(octave_Complex_LU_h) + +// We know only that this version is prior to Octave 3.2, i.e. OCTAVE_API_VERSION_NUMBER < 37 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 1 +# define OCTAVE_PATCH_VERSION 99 + +# else + +// OCTAVE_API_VERSION_NUMBER == 37 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 2 +# define OCTAVE_PATCH_VERSION 0 + +# endif // defined(octave_Complex_LU_h) + +# endif // defined(octave_ov_h) -#if OCTAVE_API_VERSION_NUMBER < 37 +// Correlation between Octave API and version numbers extracted from Octave's +// ChangeLogs; version is the *earliest* released Octave with that API number +# elif OCTAVE_API_VERSION_NUMBER >= 48 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 6 +# define OCTAVE_PATCH_VERSION 0 + +# elif OCTAVE_API_VERSION_NUMBER >= 45 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 4 +# define OCTAVE_PATCH_VERSION 1 + +# elif OCTAVE_API_VERSION_NUMBER >= 42 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 3 +# define OCTAVE_PATCH_VERSION 54 + +# elif OCTAVE_API_VERSION_NUMBER >= 41 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 3 +# define OCTAVE_PATCH_VERSION 53 + +# elif OCTAVE_API_VERSION_NUMBER >= 40 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 3 +# define OCTAVE_PATCH_VERSION 52 + +# elif OCTAVE_API_VERSION_NUMBER >= 39 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 3 +# define OCTAVE_PATCH_VERSION 51 + +# else // OCTAVE_API_VERSION_NUMBER == 38 +# define OCTAVE_MAJOR_VERSION 3 +# define OCTAVE_MINOR_VERSION 3 +# define OCTAVE_PATCH_VERSION 50 + +# endif // !defined(OCTAVE_API_VERSION_NUMBER) + +#endif // !defined(OCTAVE_MAJOR_VERSION) + +#if !SWIG_OCTAVE_PREREQ(3,2,0) #define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, FS ## cname, args, nargout, doc) #else #define SWIG_DEFUN(cname, wname, doc) DEFUNX_DLD(#cname, wname, G ## cname, args, nargout, doc) @@ -427,7 +495,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); if (error_state) return dim_vector(1,1); } return d; - } else if (out.is_matrix_type() || out.is_real_nd_array() || out.is_numeric_type() ) { + } else if (out.is_matrix_type() || out.is_numeric_type() ) { if (out.rows()==1 || out.columns()==1) { Array<int> a = out.int_vector_value(); if (error_state) return dim_vector(1,1); @@ -746,7 +814,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); return outarg(0).string_value(); } -#if OCTAVE_API_VERSION_NUMBER >= 40 +#if SWIG_OCTAVE_PREREQ(3,3,52) virtual octave_map map_value() const { return octave_map(); } @@ -982,7 +1050,7 @@ SWIGRUNTIME void swig_acquire_ownership_obj(void *vptr, int own); virtual std::string string_value(bool force = false) const { return ptr->string_value(force); } -#if OCTAVE_API_VERSION_NUMBER >= 40 +#if SWIG_OCTAVE_PREREQ(3,3,52) virtual octave_map map_value() const { return ptr->map_value(); } #else @@ -1293,10 +1361,12 @@ SWIGRUNTIME void SWIG_Octave_SetGlobalValue(std::string name, const octave_value } SWIGRUNTIME void SWIG_Octave_LinkGlobalValue(std::string name) { -#if OCTAVE_API_VERSION_NUMBER < 37 +#if !SWIG_OCTAVE_PREREQ(3,2,0) link_to_global_variable(curr_sym_tab->lookup(name, true)); #else +#if !SWIG_OCTAVE_PREREQ(3,8,0) symbol_table::varref(name); +#endif symbol_table::mark_global(name); #endif } diff --git a/Lib/octave/octruntime.swg b/Lib/octave/octruntime.swg index 43313c3..fbf2007 100644 --- a/Lib/octave/octruntime.swg +++ b/Lib/octave/octruntime.swg @@ -25,7 +25,7 @@ static bool SWIG_init_user(octave_swig_type* module_ns); SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) { bool retn; { -#if OCTAVE_API_VERSION_NUMBER < 38 +#if !SWIG_OCTAVE_PREREQ(3,3,50) unwind_protect::begin_frame("SWIG_Octave_LoadModule"); unwind_protect_int(error_state); unwind_protect_int(warning_state); @@ -44,7 +44,7 @@ SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) { discard_warning_messages = true; feval(name, octave_value_list(), 0); retn = (error_state == 0); -#if OCTAVE_API_VERSION_NUMBER < 38 +#if !SWIG_OCTAVE_PREREQ(3,3,50) unwind_protect::run_frame("SWIG_Octave_LoadModule"); #endif } @@ -57,7 +57,7 @@ SWIGINTERN bool SWIG_Octave_LoadModule(std::string name) { SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::string name) { bool retn; { -#if OCTAVE_API_VERSION_NUMBER < 38 +#if !SWIG_OCTAVE_PREREQ(3,3,50) unwind_protect::begin_frame("SWIG_Octave_InstallFunction"); unwind_protect_int(error_state); unwind_protect_int(warning_state); @@ -80,7 +80,7 @@ SWIGINTERN bool SWIG_Octave_InstallFunction(octave_function *octloadfcn, std::st error_state = 0; feval("autoload", args, 0); retn = (error_state == 0); -#if OCTAVE_API_VERSION_NUMBER < 38 +#if !SWIG_OCTAVE_PREREQ(3,3,50) unwind_protect::run_frame("SWIG_Octave_InstallFunction"); #endif } @@ -196,7 +196,7 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { // definitely affects version 3.2.*, not sure about 3.3.*, seems to be fixed in // version 3.4.* and above. can be turned off with macro definition. #ifndef SWIG_OCTAVE_NO_SEGFAULT_HACK -#if 36 < OCTAVE_API_VERSION_NUMBER && OCTAVE_API_VERSION_NUMBER < 45 +#if SWIG_OCTAVE_PREREQ(3,2,0) && !SWIG_OCTAVE_PREREQ(3,4,1) octave_exit = ::_Exit; #endif #endif @@ -212,7 +212,7 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { // workaround bug in octave where installing global variable of custom type and then // exiting without explicitly clearing the variable causes octave to segfault. -#if OCTAVE_API_VERSION_NUMBER > 36 +#if SWIG_OCTAVE_PREREQ(3,2,0) octave_value_list eval_args; eval_args.append("base"); eval_args.append("function __swig_atexit__; " @@ -297,7 +297,7 @@ DEFUN_DLD( SWIG_name, args, nargout, SWIG_name_usage ) { } } -#if OCTAVE_API_VERSION_NUMBER < 37 +#if !SWIG_OCTAVE_PREREQ(3,2,0) mlock(me->name()); #else mlock(); -- 1.8.5.1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pulseaudio for openSUSE:Factory
by root＠hilbert.suse.de 31 Jan '14

31 Jan '14

Hello community, here is the log from the commit of package pulseaudio for openSUSE:Factory checked in at 2014-01-31 11:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pulseaudio (Old) and /work/SRC/openSUSE:Factory/.pulseaudio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pulseaudio" Changes: -------- --- /work/SRC/openSUSE:Factory/pulseaudio/pulseaudio.changes 2014-01-28 15:38:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pulseaudio.new/pulseaudio.changes 2014-01-31 11:44:59.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 30 09:53:30 UTC 2014 - oholecek(a)suse.cz + +- update to version 5.0 RC3 (4.99.3) +- reenable orc + +------------------------------------------------------------------- Old: ---- pulseaudio-4.99.2.tar.xz New: ---- pulseaudio-4.99.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.VJRVl4/_old 2014-01-31 11:45:00.000000000 +0100 +++ /var/tmp/diff_new_pack.VJRVl4/_new 2014-01-31 11:45:00.000000000 +0100 @@ -17,7 +17,7 @@ Name: pulseaudio -Version: 4.99.2 +Version: 4.99.3 Release: 0 %define drvver 4.99 %define soname 0 @@ -294,7 +294,6 @@ %build %configure \ - --disable-orc \ --disable-static \ --disable-rpath \ --enable-systemd \ ++++++ pulseaudio-4.99.2.tar.xz -> pulseaudio-4.99.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/.tarball-version new/pulseaudio-4.99.3/.tarball-version --- old/pulseaudio-4.99.2/.tarball-version 2014-01-23 20:02:18.000000000 +0100 +++ new/pulseaudio-4.99.3/.tarball-version 2014-01-29 20:51:04.000000000 +0100 @@ -1 +1 @@ -4.99.2 +4.99.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/.version new/pulseaudio-4.99.3/.version --- old/pulseaudio-4.99.2/.version 2014-01-23 20:02:18.000000000 +0100 +++ new/pulseaudio-4.99.3/.version 2014-01-29 20:51:04.000000000 +0100 @@ -1 +1 @@ -4.99.2 +4.99.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/configure new/pulseaudio-4.99.3/configure --- old/pulseaudio-4.99.2/configure 2014-01-23 20:01:07.000000000 +0100 +++ new/pulseaudio-4.99.3/configure 2014-01-29 20:49:50.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for pulseaudio 4.99.2. +# Generated by GNU Autoconf 2.69 for pulseaudio 4.99.3. # # Report bugs to <pulseaudio-discuss (at) lists (dot) freedesktop (dot) org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='pulseaudio' PACKAGE_TARNAME='pulseaudio' -PACKAGE_VERSION='4.99.2' -PACKAGE_STRING='pulseaudio 4.99.2' +PACKAGE_VERSION='4.99.3' +PACKAGE_STRING='pulseaudio 4.99.3' PACKAGE_BUGREPORT='pulseaudio-discuss (at) lists (dot) freedesktop (dot) org' PACKAGE_URL='http://pulseaudio.org/' @@ -1703,7 +1703,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 pulseaudio 4.99.2 to adapt to many kinds of systems. +\`configure' configures pulseaudio 4.99.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1773,7 +1773,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of pulseaudio 4.99.2:";; + short | recursive ) echo "Configuration of pulseaudio 4.99.3:";; esac cat <<\_ACEOF @@ -2043,7 +2043,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -pulseaudio configure 4.99.2 +pulseaudio configure 4.99.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2633,7 +2633,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by pulseaudio $as_me 4.99.2, which was +It was created by pulseaudio $as_me 4.99.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3585,7 +3585,7 @@ # Define the identity of the package. PACKAGE='pulseaudio' - VERSION='4.99.2' + VERSION='4.99.3' cat >>confdefs.h <<_ACEOF @@ -28369,7 +28369,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by pulseaudio $as_me 4.99.2, which was +This file was extended by pulseaudio $as_me 4.99.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -28436,7 +28436,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -pulseaudio config.status 4.99.2 +pulseaudio config.status 4.99.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/orc.mak new/pulseaudio-4.99.3/orc.mak --- old/pulseaudio-4.99.2/orc.mak 2014-01-21 14:39:57.000000000 +0100 +++ new/pulseaudio-4.99.3/orc.mak 2014-01-29 20:48:03.000000000 +0100 @@ -22,6 +22,7 @@ EXTRA_DIST += $(addsuffix .orc,$(ORC_SOURCE)) +if HAVE_ORC ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE)) ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE)) @@ -44,3 +45,4 @@ %-orc-gen.h: %.orc @mkdir -p $(@D) $(orcc_v_gen)$(ORCC) --header -o $@ $< +endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/Makefile.am new/pulseaudio-4.99.3/src/Makefile.am --- old/pulseaudio-4.99.2/src/Makefile.am 2014-01-23 19:58:11.000000000 +0100 +++ new/pulseaudio-4.99.3/src/Makefile.am 2014-01-29 20:48:03.000000000 +0100 @@ -932,8 +932,8 @@ libpulsecore_@PA_MAJORMINOR@_la_LIBADD += libpulsecore_sconv_neon.la libpulsecore_mix_neon.la endif -if HAVE_ORC ORC_SOURCE += pulsecore/svolume +if HAVE_ORC libpulsecore_@PA_MAJORMINOR@_la_SOURCES += pulsecore/svolume_orc.c nodist_libpulsecore_@PA_MAJORMINOR@_la_SOURCES = pulsecore/svolume-orc-gen.c pulsecore/svolume-orc-gen.h libpulsecore_@PA_MAJORMINOR@_la_CFLAGS += $(ORC_CFLAGS) @@ -1950,8 +1950,8 @@ modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \ modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h module_echo_cancel_la_CFLAGS += -DHAVE_ADRIAN_EC=1 -if HAVE_ORC ORC_SOURCE += modules/echo-cancel/adrian-aec +if HAVE_ORC nodist_module_echo_cancel_la_SOURCES = \ modules/echo-cancel/adrian-aec-orc-gen.c \ modules/echo-cancel/adrian-aec-orc-gen.h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/Makefile.in new/pulseaudio-4.99.3/src/Makefile.in --- old/pulseaudio-4.99.2/src/Makefile.in 2014-01-23 20:01:14.000000000 +0100 +++ new/pulseaudio-4.99.3/src/Makefile.in 2014-01-29 20:49:57.000000000 +0100 @@ -147,36 +147,38 @@ $(am__dist_udevrules_DATA_DIST) \ $(am__pulseinclude_HEADERS_DIST) \ $(top_srcdir)/build-aux/test-driver +@HAVE_ORC_TRUE@am__append_6 = $(ORC_BUILT_SOURCE) $(ORC_BUILT_HEADER) +@HAVE_ORC_TRUE@am__append_7 = $(BUILT_SOURCES) bin_PROGRAMS = pulseaudio$(EXEEXT) pacat$(EXEEXT) pactl$(EXEEXT) \ $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) -@HAVE_DBUS_TRUE@am__append_6 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_7 = daemon/server-lookup.c daemon/server-lookup.h -@HAVE_DBUS_TRUE@am__append_8 = $(DBUS_LIBS) -@OS_IS_WIN32_FALSE@am__append_9 = pasuspender -@HAVE_AF_UNIX_TRUE@am__append_10 = pacmd -@HAVE_X11_TRUE@am__append_11 = pax11publish -@HAVE_X11_TRUE@am__append_12 = start-pulseaudio-x11 start-pulseaudio-kde -@OS_IS_WIN32_FALSE@am__append_13 = \ +@HAVE_DBUS_TRUE@am__append_8 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_9 = daemon/server-lookup.c daemon/server-lookup.h +@HAVE_DBUS_TRUE@am__append_10 = $(DBUS_LIBS) +@OS_IS_WIN32_FALSE@am__append_11 = pasuspender +@HAVE_AF_UNIX_TRUE@am__append_12 = pacmd +@HAVE_X11_TRUE@am__append_13 = pax11publish +@HAVE_X11_TRUE@am__append_14 = start-pulseaudio-x11 start-pulseaudio-kde +@OS_IS_WIN32_FALSE@am__append_15 = \ @OS_IS_WIN32_FALSE@ sigbus-test \ @OS_IS_WIN32_FALSE@ usergroup-test -@OS_IS_DARWIN_FALSE@am__append_14 = \ +@OS_IS_DARWIN_FALSE@am__append_16 = \ @OS_IS_DARWIN_FALSE@ once-test -@HAVE_SIGXCPU_TRUE@am__append_15 = \ +@HAVE_SIGXCPU_TRUE@am__append_17 = \ @HAVE_SIGXCPU_TRUE@ cpulimit-test \ @HAVE_SIGXCPU_TRUE@ cpulimit-test2 -@HAVE_GLIB20_TRUE@am__append_16 = \ +@HAVE_GLIB20_TRUE@am__append_18 = \ @HAVE_GLIB20_TRUE@ mainloop-test-glib -@HAVE_GTK30_TRUE@am__append_17 = \ +@HAVE_GTK30_TRUE@am__append_19 = \ @HAVE_GTK30_TRUE@ gtk-test -@HAVE_ALSA_TRUE@am__append_18 = \ +@HAVE_ALSA_TRUE@am__append_20 = \ @HAVE_ALSA_TRUE@ alsa-time-test -@HAVE_ALSA_TRUE@am__append_19 = \ +@HAVE_ALSA_TRUE@am__append_21 = \ @HAVE_ALSA_TRUE@ alsa-mixer-path-test @HAVE_TESTS_TRUE@TESTS = $(am__EXEEXT_8) @@ -187,251 +189,250 @@ @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@check_PROGRAMS = \ @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_8) \ @BUILD_TESTS_DEFAULT_FALSE@@HAVE_TESTS_TRUE@ $(am__EXEEXT_12) -@OS_IS_WIN32_TRUE@am__append_20 = pulsecore/poll-win32.c pulsecore/poll.h -@OS_IS_WIN32_FALSE@am__append_21 = pulsecore/poll-posix.c pulsecore/poll.h -@HAVE_X11_TRUE@am__append_22 = \ +@OS_IS_WIN32_TRUE@am__append_22 = pulsecore/poll-win32.c pulsecore/poll.h +@OS_IS_WIN32_FALSE@am__append_23 = pulsecore/poll-posix.c pulsecore/poll.h +@HAVE_X11_TRUE@am__append_24 = \ @HAVE_X11_TRUE@ pulse/client-conf-x11.c pulse/client-conf-x11.h \ @HAVE_X11_TRUE@ pulsecore/x11prop.c pulsecore/x11prop.h -@HAVE_X11_TRUE@am__append_23 = $(X11_CFLAGS) -@HAVE_X11_TRUE@am__append_24 = $(X11_LIBS) -@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_25 = $(JOURNAL_FLAGS) -@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_26 = $(JOURNAL_LIBS) -@OS_IS_WIN32_TRUE@am__append_27 = \ +@HAVE_X11_TRUE@am__append_25 = $(X11_CFLAGS) +@HAVE_X11_TRUE@am__append_26 = $(X11_LIBS) +@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_27 = $(JOURNAL_FLAGS) +@HAVE_SYSTEMD_JOURNAL_TRUE@am__append_28 = $(JOURNAL_LIBS) +@OS_IS_WIN32_TRUE@am__append_29 = \ @OS_IS_WIN32_TRUE@ pulsecore/mutex-win32.c pulsecore/mutex.h \ @OS_IS_WIN32_TRUE@ pulsecore/thread-win32.c pulsecore/thread.h \ @OS_IS_WIN32_TRUE@ pulsecore/semaphore-win32.c pulsecore/semaphore.h -@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_28 = \ +@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_30 = \ @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@ pulsecore/mutex-posix.c pulsecore/mutex.h \ @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@ pulsecore/thread-posix.c pulsecore/thread.h \ @OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@ pulsecore/semaphore-osx.c pulsecore/semaphore.h -@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_29 = "-I/Developer/Headers/FlatCarbon/" +@OS_IS_DARWIN_TRUE@@OS_IS_WIN32_FALSE@am__append_31 = "-I/Developer/Headers/FlatCarbon/" #libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS += "-framework CoreServices" -@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@am__append_30 = \ +@OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@am__append_32 = \ @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@ pulsecore/mutex-posix.c pulsecore/mutex.h \ @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@ pulsecore/thread-posix.c pulsecore/thread.h \ @OS_IS_DARWIN_FALSE@@OS_IS_WIN32_FALSE@ pulsecore/semaphore-posix.c pulsecore/semaphore.h -@HAVE_LIBASYNCNS_TRUE@am__append_31 = $(LIBASYNCNS_CFLAGS) -@HAVE_LIBASYNCNS_TRUE@am__append_32 = $(LIBASYNCNS_LIBS) -@OS_IS_WIN32_TRUE@am__append_33 = pulsecore/dllmain.c -@HAVE_DBUS_TRUE@am__append_34 = \ +@HAVE_LIBASYNCNS_TRUE@am__append_33 = $(LIBASYNCNS_CFLAGS) +@HAVE_LIBASYNCNS_TRUE@am__append_34 = $(LIBASYNCNS_LIBS) +@OS_IS_WIN32_TRUE@am__append_35 = pulsecore/dllmain.c +@HAVE_DBUS_TRUE@am__append_36 = \ @HAVE_DBUS_TRUE@ pulsecore/dbus-util.c pulsecore/dbus-util.h \ @HAVE_DBUS_TRUE@ pulsecore/rtkit.c pulsecore/rtkit.h -@HAVE_DBUS_TRUE@am__append_35 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_36 = $(DBUS_LIBS) -@HAVE_GLIB20_TRUE@am__append_37 = \ +@HAVE_DBUS_TRUE@am__append_37 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_38 = $(DBUS_LIBS) +@HAVE_GLIB20_TRUE@am__append_39 = \ @HAVE_GLIB20_TRUE@ pulse/glib-mainloop.h -@HAVE_GLIB20_TRUE@am__append_38 = \ +@HAVE_GLIB20_TRUE@am__append_40 = \ @HAVE_GLIB20_TRUE@ libpulse-mainloop-glib.la -@HAVE_DBUS_TRUE@am__append_39 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_40 = $(DBUS_LIBS) -@HAVE_OSS_WRAPPER_TRUE@am__append_41 = padsp -@HAVE_OSS_WRAPPER_TRUE@am__append_42 = padsp -@HAVE_NEON_TRUE@am__append_43 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la -@HAVE_NEON_TRUE@am__append_44 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la -@HAVE_ORC_TRUE@am__append_45 = pulsecore/svolume -@HAVE_ORC_TRUE@am__append_46 = pulsecore/svolume_orc.c -@HAVE_ORC_TRUE@am__append_47 = $(ORC_CFLAGS) -@HAVE_ORC_TRUE@am__append_48 = $(ORC_LIBS) -@HAVE_X11_TRUE@am__append_49 = pulsecore/x11wrap.c pulsecore/x11wrap.h -@HAVE_X11_TRUE@am__append_50 = $(X11_CFLAGS) -@HAVE_X11_TRUE@am__append_51 = $(X11_LIBS) -@HAVE_DBUS_TRUE@am__append_52 = \ +@HAVE_DBUS_TRUE@am__append_41 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_42 = $(DBUS_LIBS) +@HAVE_OSS_WRAPPER_TRUE@am__append_43 = padsp +@HAVE_OSS_WRAPPER_TRUE@am__append_44 = padsp +@HAVE_NEON_TRUE@am__append_45 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la +@HAVE_NEON_TRUE@am__append_46 = libpulsecore_sconv_neon.la libpulsecore_mix_neon.la +@HAVE_ORC_TRUE@am__append_47 = pulsecore/svolume_orc.c +@HAVE_ORC_TRUE@am__append_48 = $(ORC_CFLAGS) +@HAVE_ORC_TRUE@am__append_49 = $(ORC_LIBS) +@HAVE_X11_TRUE@am__append_50 = pulsecore/x11wrap.c pulsecore/x11wrap.h +@HAVE_X11_TRUE@am__append_51 = $(X11_CFLAGS) +@HAVE_X11_TRUE@am__append_52 = $(X11_LIBS) +@HAVE_DBUS_TRUE@am__append_53 = \ @HAVE_DBUS_TRUE@ pulsecore/dbus-shared.c pulsecore/dbus-shared.h \ @HAVE_DBUS_TRUE@ pulsecore/protocol-dbus.c pulsecore/protocol-dbus.h -@HAVE_DBUS_TRUE@am__append_53 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_54 = $(DBUS_LIBS) -@HAVE_GDBM_TRUE@am__append_55 = pulsecore/database-gdbm.c -@HAVE_GDBM_TRUE@am__append_56 = $(GDBM_CFLAGS) -@HAVE_GDBM_TRUE@am__append_57 = $(GDBM_LIBS) -@HAVE_TDB_TRUE@am__append_58 = pulsecore/database-tdb.c -@HAVE_TDB_TRUE@am__append_59 = $(TDB_CFLAGS) -@HAVE_TDB_TRUE@am__append_60 = $(TDB_LIBS) -@HAVE_SIMPLEDB_TRUE@am__append_61 = pulsecore/database-simple.c -@HAVE_WEBRTC_TRUE@am__append_62 = libwebrtc-util.la -@HAVE_ESOUND_TRUE@am__append_63 = \ +@HAVE_DBUS_TRUE@am__append_54 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_55 = $(DBUS_LIBS) +@HAVE_GDBM_TRUE@am__append_56 = pulsecore/database-gdbm.c +@HAVE_GDBM_TRUE@am__append_57 = $(GDBM_CFLAGS) +@HAVE_GDBM_TRUE@am__append_58 = $(GDBM_LIBS) +@HAVE_TDB_TRUE@am__append_59 = pulsecore/database-tdb.c +@HAVE_TDB_TRUE@am__append_60 = $(TDB_CFLAGS) +@HAVE_TDB_TRUE@am__append_61 = $(TDB_LIBS) +@HAVE_SIMPLEDB_TRUE@am__append_62 = pulsecore/database-simple.c +@HAVE_WEBRTC_TRUE@am__append_63 = libwebrtc-util.la +@HAVE_ESOUND_TRUE@am__append_64 = \ @HAVE_ESOUND_TRUE@ libprotocol-esound.la # We need to emulate sendmsg/recvmsg to support this on Win32 -@OS_IS_WIN32_FALSE@am__append_64 = \ +@OS_IS_WIN32_FALSE@am__append_65 = \ @OS_IS_WIN32_FALSE@ librtp.la -@HAVE_AVAHI_TRUE@am__append_65 = \ +@HAVE_AVAHI_TRUE@am__append_66 = \ @HAVE_AVAHI_TRUE@ libavahi-wrap.la -@HAVE_DBUS_TRUE@am__append_66 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_67 = $(DBUS_LIBS) +@HAVE_DBUS_TRUE@am__append_67 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_68 = $(DBUS_LIBS) ################################### # Plug-in libraries # ################################### # Serveral module (e.g. libalsa-util.la) -@HAVE_DBUS_TRUE@am__append_68 = \ +@HAVE_DBUS_TRUE@am__append_69 = \ @HAVE_DBUS_TRUE@ module-console-kit.la -@HAVE_ESOUND_TRUE@am__append_69 = \ +@HAVE_ESOUND_TRUE@am__append_70 = \ @HAVE_ESOUND_TRUE@ module-esound-protocol-tcp.la \ @HAVE_ESOUND_TRUE@ module-esound-sink.la # See comment at librtp.la above -@OS_IS_WIN32_FALSE@am__append_70 = \ +@OS_IS_WIN32_FALSE@am__append_71 = \ @OS_IS_WIN32_FALSE@ module-rtp-send.la \ @OS_IS_WIN32_FALSE@ module-rtp-recv.la -@HAVE_AF_UNIX_TRUE@am__append_71 = \ +@HAVE_AF_UNIX_TRUE@am__append_72 = \ @HAVE_AF_UNIX_TRUE@ module-cli-protocol-unix.la \ @HAVE_AF_UNIX_TRUE@ module-simple-protocol-unix.la \ @HAVE_AF_UNIX_TRUE@ module-http-protocol-unix.la \ @HAVE_AF_UNIX_TRUE@ module-native-protocol-unix.la -@HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@am__append_72 = \ +@HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@am__append_73 = \ @HAVE_AF_UNIX_TRUE@@HAVE_ESOUND_TRUE@ module-esound-protocol-unix.la -@HAVE_MKFIFO_TRUE@am__append_73 = \ +@HAVE_MKFIFO_TRUE@am__append_74 = \ @HAVE_MKFIFO_TRUE@ module-pipe-sink.la \ @HAVE_MKFIFO_TRUE@ module-pipe-source.la -@HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@am__append_74 = \ +@HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@am__append_75 = \ @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@ module-esound-compat-spawnfd.la \ @HAVE_ESOUND_TRUE@@OS_IS_WIN32_FALSE@ module-esound-compat-spawnpid.la -@HAVE_REGEX_TRUE@am__append_75 = \ +@HAVE_REGEX_TRUE@am__append_76 = \ @HAVE_REGEX_TRUE@ module-match.la -@HAVE_X11_TRUE@am__append_76 = \ +@HAVE_X11_TRUE@am__append_77 = \ @HAVE_X11_TRUE@ module-x11-bell.la \ @HAVE_X11_TRUE@ module-x11-publish.la \ @HAVE_X11_TRUE@ module-x11-xsmp.la \ @HAVE_X11_TRUE@ module-x11-cork-request.la -@HAVE_OSS_OUTPUT_TRUE@am__append_77 = \ +@HAVE_OSS_OUTPUT_TRUE@am__append_78 = \ @HAVE_OSS_OUTPUT_TRUE@ liboss-util.la \ @HAVE_OSS_OUTPUT_TRUE@ module-oss.la -@HAVE_COREAUDIO_TRUE@am__append_78 = \ +@HAVE_COREAUDIO_TRUE@am__append_79 = \ @HAVE_COREAUDIO_TRUE@ module-coreaudio-detect.la \ @HAVE_COREAUDIO_TRUE@ module-coreaudio-device.la pulselibexec_PROGRAMS = $(am__EXEEXT_14) -@HAVE_ALSA_TRUE@am__append_79 = \ +@HAVE_ALSA_TRUE@am__append_80 = \ @HAVE_ALSA_TRUE@ libalsa-util.la \ @HAVE_ALSA_TRUE@ module-alsa-sink.la \ @HAVE_ALSA_TRUE@ module-alsa-source.la \ @HAVE_ALSA_TRUE@ module-alsa-card.la -@HAVE_SOLARIS_TRUE@am__append_80 = \ +@HAVE_SOLARIS_TRUE@am__append_81 = \ @HAVE_SOLARIS_TRUE@ module-solaris.la -@HAVE_AVAHI_TRUE@am__append_81 = \ +@HAVE_AVAHI_TRUE@am__append_82 = \ @HAVE_AVAHI_TRUE@ module-zeroconf-publish.la \ @HAVE_AVAHI_TRUE@ module-zeroconf-discover.la -@HAVE_BONJOUR_TRUE@am__append_82 = \ +@HAVE_BONJOUR_TRUE@am__append_83 = \ @HAVE_BONJOUR_TRUE@ module-bonjour-publish.la -@HAVE_LIRC_TRUE@am__append_83 = \ +@HAVE_LIRC_TRUE@am__append_84 = \ @HAVE_LIRC_TRUE@ module-lirc.la -@HAVE_XEN_TRUE@am__append_84 = \ +@HAVE_XEN_TRUE@am__append_85 = \ @HAVE_XEN_TRUE@ module-xenpv-sink.la -@HAVE_EVDEV_TRUE@am__append_85 = \ +@HAVE_EVDEV_TRUE@am__append_86 = \ @HAVE_EVDEV_TRUE@ module-mmkbd-evdev.la -@HAVE_JACK_TRUE@am__append_86 = \ +@HAVE_JACK_TRUE@am__append_87 = \ @HAVE_JACK_TRUE@ module-jack-sink.la \ @HAVE_JACK_TRUE@ module-jack-source.la -@HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@am__append_87 = \ +@HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@am__append_88 = \ @HAVE_DBUS_TRUE@@HAVE_JACK_TRUE@ module-jackdbus-detect.la -@HAVE_GCONF_TRUE@am__append_88 = \ +@HAVE_GCONF_TRUE@am__append_89 = \ @HAVE_GCONF_TRUE@ module-gconf.la -@HAVE_GCONF_TRUE@am__append_89 = \ +@HAVE_GCONF_TRUE@am__append_90 = \ @HAVE_GCONF_TRUE@ gconf-helper -@HAVE_WAVEOUT_TRUE@am__append_90 = \ +@HAVE_WAVEOUT_TRUE@am__append_91 = \ @HAVE_WAVEOUT_TRUE@ module-waveout.la -@HAVE_HAL_COMPAT_TRUE@am__append_91 = \ +@HAVE_HAL_COMPAT_TRUE@am__append_92 = \ @HAVE_HAL_COMPAT_TRUE@ module-hal-detect.la -@HAVE_UDEV_TRUE@am__append_92 = \ +@HAVE_UDEV_TRUE@am__append_93 = \ @HAVE_UDEV_TRUE@ module-udev-detect.la -@HAVE_SYSTEMD_TRUE@am__append_93 = \ +@HAVE_SYSTEMD_TRUE@am__append_94 = \ @HAVE_SYSTEMD_TRUE@ module-systemd-login.la -@HAVE_DBUS_TRUE@am__append_94 = \ +@HAVE_DBUS_TRUE@am__append_95 = \ @HAVE_DBUS_TRUE@ module-rygel-media-server.la \ @HAVE_DBUS_TRUE@ module-dbus-protocol.la -@HAVE_BLUEZ_TRUE@am__append_95 = \ +@HAVE_BLUEZ_TRUE@am__append_96 = \ @HAVE_BLUEZ_TRUE@ module-bluetooth-discover.la \ @HAVE_BLUEZ_TRUE@ module-bluetooth-policy.la -@HAVE_BLUEZ_4_TRUE@am__append_96 = \ +@HAVE_BLUEZ_4_TRUE@am__append_97 = \ @HAVE_BLUEZ_4_TRUE@ libbluez4-util.la \ @HAVE_BLUEZ_4_TRUE@ module-bluez4-discover.la \ @HAVE_BLUEZ_4_TRUE@ module-bluez4-device.la -@HAVE_BLUEZ_5_TRUE@am__append_97 = \ +@HAVE_BLUEZ_5_TRUE@am__append_98 = \ @HAVE_BLUEZ_5_TRUE@ libbluez5-util.la \ @HAVE_BLUEZ_5_TRUE@ module-bluez5-discover.la \ @HAVE_BLUEZ_5_TRUE@ module-bluez5-device.la -@HAVE_OPENSSL_TRUE@am__append_98 = \ +@HAVE_OPENSSL_TRUE@am__append_99 = \ @HAVE_OPENSSL_TRUE@ libraop.la \ @HAVE_OPENSSL_TRUE@ module-raop-sink.la -@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@am__append_99 = \ +@HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@am__append_100 = \ @HAVE_AVAHI_TRUE@@HAVE_OPENSSL_TRUE@ module-raop-discover.la -@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_100 = \ +@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_101 = \ @HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@ module-equalizer-sink.la -@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_101 = utils/qpaeq -@HAVE_ESOUND_TRUE@am__append_102 = \ +@HAVE_DBUS_TRUE@@HAVE_FFTW_TRUE@am__append_102 = utils/qpaeq +@HAVE_ESOUND_TRUE@am__append_103 = \ @HAVE_ESOUND_TRUE@ module-esound-protocol-tcp-symdef.h \ @HAVE_ESOUND_TRUE@ module-esound-protocol-unix-symdef.h \ @HAVE_ESOUND_TRUE@ module-esound-compat-spawnfd-symdef.h \ @HAVE_ESOUND_TRUE@ module-esound-compat-spawnpid-symdef.h \ @HAVE_ESOUND_TRUE@ module-esound-sink-symdef.h -@HAVE_DBUS_TRUE@am__append_103 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_104 = $(DBUS_LIBS) -@HAVE_UDEV_TRUE@am__append_105 = modules/udev-util.h modules/udev-util.c -@HAVE_UDEV_TRUE@am__append_106 = $(UDEV_LIBS) -@HAVE_UDEV_TRUE@am__append_107 = $(UDEV_CFLAGS) -@HAVE_DBUS_TRUE@am__append_108 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c -@HAVE_DBUS_TRUE@am__append_109 = $(DBUS_LIBS) -@HAVE_DBUS_TRUE@am__append_110 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_111 = $(DBUS_LIBS) -@HAVE_DBUS_TRUE@am__append_112 = $(DBUS_CFLAGS) -@HAVE_DBUS_TRUE@am__append_113 = $(DBUS_LIBS) -@HAVE_DBUS_TRUE@am__append_114 = $(DBUS_CFLAGS) -@HAVE_ADRIAN_EC_TRUE@am__append_115 = \ +@HAVE_DBUS_TRUE@am__append_104 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_105 = $(DBUS_LIBS) +@HAVE_UDEV_TRUE@am__append_106 = modules/udev-util.h modules/udev-util.c +@HAVE_UDEV_TRUE@am__append_107 = $(UDEV_LIBS) +@HAVE_UDEV_TRUE@am__append_108 = $(UDEV_CFLAGS) +@HAVE_DBUS_TRUE@am__append_109 = modules/reserve.h modules/reserve.c modules/reserve-monitor.h modules/reserve-monitor.c +@HAVE_DBUS_TRUE@am__append_110 = $(DBUS_LIBS) +@HAVE_DBUS_TRUE@am__append_111 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_112 = $(DBUS_LIBS) +@HAVE_DBUS_TRUE@am__append_113 = $(DBUS_CFLAGS) +@HAVE_DBUS_TRUE@am__append_114 = $(DBUS_LIBS) +@HAVE_DBUS_TRUE@am__append_115 = $(DBUS_CFLAGS) +@HAVE_ADRIAN_EC_TRUE@am__append_116 = \ @HAVE_ADRIAN_EC_TRUE@ modules/echo-cancel/adrian-aec.c modules/echo-cancel/adrian-aec.h \ @HAVE_ADRIAN_EC_TRUE@ modules/echo-cancel/adrian.c modules/echo-cancel/adrian.h -@HAVE_ADRIAN_EC_TRUE@am__append_116 = -DHAVE_ADRIAN_EC=1 -@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_117 = modules/echo-cancel/adrian-aec -@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_118 = $(ORC_LIBS) -@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_119 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel -@HAVE_SPEEX_TRUE@am__append_120 = modules/echo-cancel/speex.c -@HAVE_WEBRTC_TRUE@am__append_121 = -DHAVE_WEBRTC=1 -@HAVE_WEBRTC_TRUE@am__append_122 = libwebrtc-util.la +@HAVE_ADRIAN_EC_TRUE@am__append_117 = -DHAVE_ADRIAN_EC=1 +@HAVE_ADRIAN_EC_TRUE@am__append_118 = modules/echo-cancel/adrian-aec +@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_119 = $(ORC_LIBS) +@HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__append_120 = $(ORC_CFLAGS) -I$(top_builddir)/src/modules/echo-cancel +@HAVE_SPEEX_TRUE@am__append_121 = modules/echo-cancel/speex.c +@HAVE_WEBRTC_TRUE@am__append_122 = -DHAVE_WEBRTC=1 +@HAVE_WEBRTC_TRUE@am__append_123 = libwebrtc-util.la subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/acx_libwrap.m4 \ @@ -858,7 +859,7 @@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ libpulsecommon-@PA_MAJORMINOR@.la libpulse.la \ - libpulsecore-foreign.la $(am__append_44) $(am__DEPENDENCIES_7) \ + libpulsecore-foreign.la $(am__append_46) $(am__DEPENDENCIES_7) \ $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_8) \ $(am__DEPENDENCIES_9) am__libpulsecore_@PA_MAJORMINOR@_la_SOURCES_DIST = \ @@ -1304,7 +1305,7 @@ @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@am__DEPENDENCIES_10 = \ @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@ $(am__DEPENDENCIES_1) module_echo_cancel_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10) $(am__append_122) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_10) $(am__append_123) am__module_echo_cancel_la_SOURCES_DIST = \ modules/echo-cancel/module-echo-cancel.c \ modules/echo-cancel/null.c modules/echo-cancel/echo-cancel.h \ @@ -2117,7 +2118,7 @@ echo_cancel_test_OBJECTS = $(am_echo_cancel_test_OBJECTS) \ $(nodist_echo_cancel_test_OBJECTS) am__DEPENDENCIES_11 = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_10) $(am__append_122) + $(am__DEPENDENCIES_10) $(am__append_123) echo_cancel_test_DEPENDENCIES = $(am__DEPENDENCIES_11) echo_cancel_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -3413,32 +3414,31 @@ ################################### # Includes # ################################### -BUILT_SOURCES = $(ORC_BUILT_SOURCE) $(ORC_BUILT_HEADER) \ - $(SYMDEF_FILES) builddirs +BUILT_SOURCES = $(am__append_6) $(SYMDEF_FILES) builddirs ################################### # Some minor stuff # ################################### -CLEANFILES = $(BUILT_SOURCES) $(am__append_42) \ +CLEANFILES = $(am__append_7) $(am__append_44) \ daemon/pulseaudio.desktop daemon/pulseaudio-kde.desktop -ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE)) -ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE)) -orcc_v_gen = $(orcc_v_gen_$(V)) -orcc_v_gen_ = $(orcc_v_gen_$(AM_DEFAULT_VERBOSITY)) -orcc_v_gen_0 = @echo " ORCC $@"; -cp_v_gen = $(cp_v_gen_$(V)) -cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY)) -cp_v_gen_0 = @echo " CP $@"; -ORC_SOURCE = $(am__append_45) $(am__append_117) +@HAVE_ORC_TRUE@ORC_BUILT_SOURCE = $(addsuffix -orc-gen.c,$(ORC_SOURCE)) +@HAVE_ORC_TRUE@ORC_BUILT_HEADER = $(addsuffix -orc-gen.h,$(ORC_SOURCE)) +@HAVE_ORC_TRUE@orcc_v_gen = $(orcc_v_gen_$(V)) +@HAVE_ORC_TRUE@orcc_v_gen_ = $(orcc_v_gen_$(AM_DEFAULT_VERBOSITY)) +@HAVE_ORC_TRUE@orcc_v_gen_0 = @echo " ORCC $@"; +@HAVE_ORC_TRUE@cp_v_gen = $(cp_v_gen_$(V)) +@HAVE_ORC_TRUE@cp_v_gen_ = $(cp_v_gen_$(AM_DEFAULT_VERBOSITY)) +@HAVE_ORC_TRUE@cp_v_gen_0 = @echo " CP $@"; +ORC_SOURCE = pulsecore/svolume $(am__append_118) pulseaudio_SOURCES = daemon/caps.c daemon/caps.h daemon/cmdline.c \ daemon/cmdline.h daemon/cpulimit.c daemon/cpulimit.h \ daemon/daemon-conf.c daemon/daemon-conf.h daemon/dumpmodules.c \ daemon/dumpmodules.h daemon/ltdl-bind-now.c \ - daemon/ltdl-bind-now.h daemon/main.c $(am__append_7) -pulseaudio_CFLAGS = $(AM_CFLAGS) $(CAP_CFLAGS) $(am__append_6) + daemon/ltdl-bind-now.h daemon/main.c $(am__append_9) +pulseaudio_CFLAGS = $(AM_CFLAGS) $(CAP_CFLAGS) $(am__append_8) pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINOR@.la \ libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(LIBLTDL) \ - $(CAP_LIBS) $(am__append_8) + $(CAP_LIBS) $(am__append_10) # This is needed because automake doesn't properly expand the foreach below pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(PREOPEN_LIBS) @PREOPEN_MODS_FALSE@PREOPEN_LIBS = $(modlibexec_LTLIBRARIES) @@ -3449,8 +3449,8 @@ ################################### # Utility programs # ################################### -bin_SCRIPTS = esdcompat $(am__append_12) $(am__append_41) \ - $(am__append_101) +bin_SCRIPTS = esdcompat $(am__append_14) $(am__append_43) \ + $(am__append_102) pacat_SOURCES = utils/pacat.c pacat_LDADD = $(AM_LDADD) libpulse.la libpulsecommon-@PA_MAJORMINOR@.la $(LIBSNDFILE_LIBS) pacat_CFLAGS = $(AM_CFLAGS) $(LIBSNDFILE_CFLAGS) @@ -3477,7 +3477,7 @@ ################################### # We split the foreign code off to not be annoyed by warnings we don't care about -noinst_LTLIBRARIES = liblo-test-util.la $(am__append_43) \ +noinst_LTLIBRARIES = liblo-test-util.la $(am__append_45) \ libpulsecore-foreign.la TESTS_default = mainloop-test strlist-test close-test memblockq-test \ channelmap-test thread-mainloop-test utf8-test format-test \ @@ -3485,12 +3485,12 @@ asyncmsgq-test queue-test rtpoll-test resampler-test \ smoother-test thread-test volume-test mix-test proplist-test \ cpu-test lock-autospawn-test mult-s16-test mix-special-test \ - $(am__append_13) $(am__append_14) $(am__append_16) \ - $(am__append_19) + $(am__append_15) $(am__append_16) $(am__append_18) \ + $(am__append_21) TESTS_norun = ipacl-test mcalign-test pacat-simple parec-simple \ flist-test remix-test rtstutter sig2str-test stripnul \ - echo-cancel-test lo-latency-test $(am__append_15) \ - $(am__append_17) $(am__append_18) + echo-cancel-test lo-latency-test $(am__append_17) \ + $(am__append_19) $(am__append_20) # These tests need a running pulseaudio daemon TESTS_daemon = \ @@ -3766,21 +3766,21 @@ pulsecore/time-smoother.h pulsecore/tokenizer.c \ pulsecore/tokenizer.h pulsecore/usergroup.c \ pulsecore/usergroup.h pulsecore/sndfile-util.c \ - pulsecore/sndfile-util.h pulsecore/socket.h $(am__append_20) \ - $(am__append_21) $(am__append_22) $(am__append_27) \ - $(am__append_28) $(am__append_30) $(am__append_33) \ - $(am__append_34) + pulsecore/sndfile-util.h pulsecore/socket.h $(am__append_22) \ + $(am__append_23) $(am__append_24) $(am__append_29) \ + $(am__append_30) $(am__append_32) $(am__append_35) \ + $(am__append_36) # proplist-util.h uses these header files, but not the library itself! libpulsecommon_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) \ - $(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS) $(am__append_23) \ - $(am__append_25) $(GLIB20_CFLAGS) $(GTK30_CFLAGS) \ - $(am__append_29) $(am__append_31) $(am__append_35) + $(LIBJSON_CFLAGS) $(LIBSNDFILE_CFLAGS) $(am__append_25) \ + $(am__append_27) $(GLIB20_CFLAGS) $(GTK30_CFLAGS) \ + $(am__append_31) $(am__append_33) $(am__append_37) libpulsecommon_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) \ - -avoid-version $(am__append_24) $(am__append_26) + -avoid-version $(am__append_26) $(am__append_28) libpulsecommon_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) \ $(LIBJSON_LIBS) $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) \ - $(LIBSNDFILE_LIBS) $(am__append_32) $(am__append_36) + $(LIBSNDFILE_LIBS) $(am__append_34) $(am__append_38) ################################### # Client library # @@ -3795,12 +3795,12 @@ pulse/sample.h pulse/scache.h pulse/simple.h pulse/stream.h \ pulse/subscribe.h pulse/thread-mainloop.h pulse/timeval.h \ pulse/utf8.h pulse/util.h pulse/version.h pulse/volume.h \ - pulse/xmalloc.h $(am__append_37) + pulse/xmalloc.h $(am__append_39) ################################### # Daemon core library # ################################### -lib_LTLIBRARIES = libpulse.la libpulse-simple.la $(am__append_38) \ +lib_LTLIBRARIES = libpulse.la libpulse-simple.la $(am__append_40) \ libpulsecore-@PA_MAJORMINOR@.la # Public interface @@ -3835,10 +3835,10 @@ pulse/volume.c pulse/volume.h \ pulse/xmalloc.c pulse/xmalloc.h -libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(am__append_39) +libpulse_la_CFLAGS = $(AM_CFLAGS) $(LIBJSON_CFLAGS) $(am__append_41) libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LTLIBICONV) \ $(LIBJSON_LIBS) libpulsecommon-@PA_MAJORMINOR@.la \ - $(am__append_40) + $(am__append_42) libpulse_la_LDFLAGS = $(AM_LDFLAGS) $(VERSIONING_LDFLAGS) -version-info $(LIBPULSE_VERSION_INFO) libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h libpulse_simple_la_CFLAGS = $(AM_CFLAGS) @@ -3900,22 +3900,22 @@ pulsecore/source-output.c pulsecore/source-output.h \ pulsecore/source.c pulsecore/source.h pulsecore/start-child.c \ pulsecore/start-child.h pulsecore/thread-mq.c \ - pulsecore/thread-mq.h pulsecore/database.h $(am__append_46) \ - $(am__append_49) $(am__append_52) $(am__append_55) \ - $(am__append_58) $(am__append_61) + pulsecore/thread-mq.h pulsecore/database.h $(am__append_47) \ + $(am__append_50) $(am__append_53) $(am__append_56) \ + $(am__append_59) $(am__append_62) libpulsecore_@PA_MAJORMINOR@_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \ $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) \ - $(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) $(am__append_47) \ - $(am__append_50) $(am__append_53) $(am__append_56) \ - $(am__append_59) + $(LIBSNDFILE_CFLAGS) $(WINSOCK_CFLAGS) $(am__append_48) \ + $(am__append_51) $(am__append_54) $(am__append_57) \ + $(am__append_60) libpulsecore_@PA_MAJORMINOR@_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version \ - $(am__append_51) + $(am__append_52) libpulsecore_@PA_MAJORMINOR@_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) \ $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) \ $(WINSOCK_LIBS) $(LTLIBICONV) \ libpulsecommon-@PA_MAJORMINOR@.la libpulse.la \ - libpulsecore-foreign.la $(am__append_44) $(am__append_48) \ - $(am__append_54) $(am__append_57) $(am__append_60) + libpulsecore-foreign.la $(am__append_46) $(am__append_49) \ + $(am__append_55) $(am__append_58) $(am__append_61) @HAVE_NEON_TRUE@libpulsecore_sconv_neon_la_SOURCES = pulsecore/sconv_neon.c @HAVE_NEON_TRUE@libpulsecore_sconv_neon_la_CFLAGS = $(AM_CFLAGS) $(NEON_CFLAGS) @HAVE_NEON_TRUE@libpulsecore_mix_neon_la_SOURCES = pulsecore/mix_neon.c @@ -3936,8 +3936,8 @@ ### the head, and not the other way! modlibexec_LTLIBRARIES = libcli.la libprotocol-cli.la \ libprotocol-simple.la libprotocol-http.la \ - libprotocol-native.la $(am__append_62) $(am__append_63) \ - $(am__append_64) $(am__append_65) $(am__append_68) \ + libprotocol-native.la $(am__append_63) $(am__append_64) \ + $(am__append_65) $(am__append_66) $(am__append_69) \ module-cli.la module-cli-protocol-tcp.la \ module-simple-protocol-tcp.la module-null-sink.la \ module-null-source.la module-sine-source.la module-detect.la \ @@ -3958,17 +3958,17 @@ module-virtual-source.la module-virtual-surround-sink.la \ module-switch-on-connect.la module-switch-on-port-available.la \ module-filter-apply.la module-filter-heuristics.la \ - module-role-ducking.la $(am__append_69) $(am__append_70) \ - $(am__append_71) $(am__append_72) $(am__append_73) \ - $(am__append_74) $(am__append_75) $(am__append_76) \ - $(am__append_77) $(am__append_78) $(am__append_79) \ - $(am__append_80) $(am__append_81) $(am__append_82) \ - $(am__append_83) $(am__append_84) $(am__append_85) \ - $(am__append_86) $(am__append_87) $(am__append_88) \ - $(am__append_90) $(am__append_91) $(am__append_92) \ - $(am__append_93) $(am__append_94) $(am__append_95) \ - $(am__append_96) $(am__append_97) $(am__append_98) \ - $(am__append_99) $(am__append_100) + module-role-ducking.la $(am__append_70) $(am__append_71) \ + $(am__append_72) $(am__append_73) $(am__append_74) \ + $(am__append_75) $(am__append_76) $(am__append_77) \ + $(am__append_78) $(am__append_79) $(am__append_80) \ + $(am__append_81) $(am__append_82) $(am__append_83) \ + $(am__append_84) $(am__append_85) $(am__append_86) \ + $(am__append_87) $(am__append_88) $(am__append_89) \ + $(am__append_91) $(am__append_92) $(am__append_93) \ + $(am__append_94) $(am__append_95) $(am__append_96) \ + $(am__append_97) $(am__append_98) $(am__append_99) \ + $(am__append_100) $(am__append_101) libprotocol_simple_la_SOURCES = pulsecore/protocol-simple.c pulsecore/protocol-simple.h libprotocol_simple_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_simple_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la @@ -3983,11 +3983,11 @@ libprotocol_http_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h libprotocol_native_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \ - $(am__append_66) + $(am__append_67) libprotocol_native_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version libprotocol_native_la_LIBADD = $(AM_LIBADD) \ libpulsecore-@PA_MAJORMINOR@.la \ - libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(am__append_67) + libpulsecommon-@PA_MAJORMINOR@.la libpulse.la $(am__append_68) @HAVE_ESOUND_TRUE@libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h @HAVE_ESOUND_TRUE@libprotocol_esound_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version @HAVE_ESOUND_TRUE@libprotocol_esound_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la @@ -4119,7 +4119,7 @@ module-switch-on-connect-symdef.h \ module-switch-on-port-available-symdef.h \ module-filter-apply-symdef.h module-filter-heuristics-symdef.h \ - $(am__append_102) + $(am__append_103) # Simple protocol module_simple_protocol_tcp_la_SOURCES = modules/module-protocol-stub.c @@ -4254,10 +4254,10 @@ module_remap_source_la_LIBADD = $(MODULE_LIBADD) module_ladspa_sink_la_SOURCES = modules/module-ladspa-sink.c modules/ladspa.h module_ladspa_sink_la_CFLAGS = -DLADSPA_PATH=\"$(libdir)/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/local/lib64/ladspa:/usr/lib64/ladspa\" \ - $(AM_CFLAGS) $(SERVER_CFLAGS) $(am__append_103) + $(AM_CFLAGS) $(SERVER_CFLAGS) $(am__append_104) module_ladspa_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_ladspa_sink_la_LIBADD = $(MODULE_LIBADD) $(LIBLTDL) \ - $(am__append_104) + $(am__append_105) module_equalizer_sink_la_SOURCES = modules/module-equalizer-sink.c module_equalizer_sink_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) $(DBUS_CFLAGS) $(FFTW_CFLAGS) module_equalizer_sink_la_LDFLAGS = $(MODULE_LDFLAGS) @@ -4341,12 +4341,12 @@ modules/alsa/alsa-mixer.h modules/alsa/alsa-sink.c \ modules/alsa/alsa-sink.h modules/alsa/alsa-source.c \ modules/alsa/alsa-source.h modules/reserve-wrap.c \ - modules/reserve-wrap.h $(am__append_105) $(am__append_108) + modules/reserve-wrap.h $(am__append_106) $(am__append_109) libalsa_util_la_LDFLAGS = -avoid-version libalsa_util_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) \ - $(am__append_106) $(am__append_109) + $(am__append_107) $(am__append_110) libalsa_util_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \ - $(ASOUNDLIB_CFLAGS) $(am__append_107) $(am__append_110) + $(ASOUNDLIB_CFLAGS) $(am__append_108) $(am__append_111) module_alsa_sink_la_SOURCES = modules/alsa/module-alsa-sink.c module_alsa_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_alsa_sink_la_LIBADD = $(MODULE_LIBADD) $(ASOUNDLIB_LIBS) libalsa-util.la @@ -4453,15 +4453,15 @@ module_device_restore_la_SOURCES = modules/module-device-restore.c module_device_restore_la_LDFLAGS = $(MODULE_LDFLAGS) module_device_restore_la_LIBADD = $(MODULE_LIBADD) \ - libprotocol-native.la $(am__append_111) -module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_112) + libprotocol-native.la $(am__append_112) +module_device_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_113) # Stream volume/muted/device restore module module_stream_restore_la_SOURCES = modules/module-stream-restore.c module_stream_restore_la_LDFLAGS = $(MODULE_LDFLAGS) module_stream_restore_la_LIBADD = $(MODULE_LIBADD) \ - libprotocol-native.la $(am__append_113) -module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_114) + libprotocol-native.la $(am__append_114) +module_stream_restore_la_CFLAGS = $(AM_CFLAGS) $(am__append_115) # Card profile restore module module_card_restore_la_SOURCES = modules/module-card-restore.c @@ -4503,13 +4503,13 @@ module_echo_cancel_la_SOURCES = \ modules/echo-cancel/module-echo-cancel.c \ modules/echo-cancel/null.c modules/echo-cancel/echo-cancel.h \ - $(am__append_115) $(am__append_120) + $(am__append_116) $(am__append_121) module_echo_cancel_la_LDFLAGS = $(MODULE_LDFLAGS) module_echo_cancel_la_LIBADD = $(MODULE_LIBADD) $(LIBSPEEX_LIBS) \ - $(am__append_118) $(am__append_122) + $(am__append_119) $(am__append_123) module_echo_cancel_la_CFLAGS = $(AM_CFLAGS) $(SERVER_CFLAGS) \ - $(LIBSPEEX_CFLAGS) $(am__append_116) $(am__append_119) \ - $(am__append_121) + $(LIBSPEEX_CFLAGS) $(am__append_117) $(am__append_120) \ + $(am__append_122) @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@nodist_module_echo_cancel_la_SOURCES = \ @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@ modules/echo-cancel/adrian-aec-orc-gen.c \ @HAVE_ADRIAN_EC_TRUE@@HAVE_ORC_TRUE@ modules/echo-cancel/adrian-aec-orc-gen.h @@ -10592,13 +10592,13 @@ @HAVE_X11_TRUE@@INTLTOOL_DESKTOP_RULE@ -%-orc-gen.c: %.orc - @mkdir -p $(@D) - $(orcc_v_gen)$(ORCC) --implementation -o $@ $< - -%-orc-gen.h: %.orc - @mkdir -p $(@D) - $(orcc_v_gen)$(ORCC) --header -o $@ $< +@HAVE_ORC_TRUE@%-orc-gen.c: %.orc +@HAVE_ORC_TRUE@ @mkdir -p $(@D) +@HAVE_ORC_TRUE@ $(orcc_v_gen)$(ORCC) --implementation -o $@ $< + +@HAVE_ORC_TRUE@%-orc-gen.h: %.orc +@HAVE_ORC_TRUE@ @mkdir -p $(@D) +@HAVE_ORC_TRUE@ $(orcc_v_gen)$(ORCC) --header -o $@ $< @HAVE_TESTS_TRUE@check-daemon: $(TESTS_daemon) @HAVE_TESTS_TRUE@ PATH=$(builddir):${PATH} $(top_srcdir)/src/tests/test-daemon.sh $(TESTS_daemon) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/daemon/caps.c new/pulseaudio-4.99.3/src/daemon/caps.c --- old/pulseaudio-4.99.2/src/daemon/caps.c 2014-01-23 19:57:55.000000000 +0100 +++ new/pulseaudio-4.99.3/src/daemon/caps.c 2014-01-29 20:48:03.000000000 +0100 @@ -86,6 +86,9 @@ pa_assert_se(cap_clear(caps) == 0); pa_assert_se(cap_set_proc(caps) == 0); pa_assert_se(cap_free(caps) == 0); +#elif defined(__FreeBSD__) + /* FreeBSD doesn't have this functionality, even though sys/capability.h is + * available. See https://bugs.freedesktop.org/show_bug.cgi?id=73967 */ #else #error "Don't know how to do capabilities on your system. Please send a patch." #endif /* __linux__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/daemon/pulseaudio-kde.desktop.in new/pulseaudio-4.99.3/src/daemon/pulseaudio-kde.desktop.in --- old/pulseaudio-4.99.2/src/daemon/pulseaudio-kde.desktop.in 2014-01-21 14:39:57.000000000 +0100 +++ new/pulseaudio-4.99.3/src/daemon/pulseaudio-kde.desktop.in 2014-01-29 20:48:03.000000000 +0100 @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 _Name=PulseAudio Sound System KDE Routing Policy _Comment=Start the PulseAudio Sound System with KDE Routing Policy Exec=start-pulseaudio-kde diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/daemon/pulseaudio.desktop.in new/pulseaudio-4.99.3/src/daemon/pulseaudio.desktop.in --- old/pulseaudio-4.99.2/src/daemon/pulseaudio.desktop.in 2014-01-21 14:39:57.000000000 +0100 +++ new/pulseaudio-4.99.3/src/daemon/pulseaudio.desktop.in 2014-01-29 20:48:03.000000000 +0100 @@ -1,6 +1,5 @@ [Desktop Entry] Version=1.0 -Encoding=UTF-8 _Name=PulseAudio Sound System _Comment=Start the PulseAudio Sound System Exec=start-pulseaudio-x11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/modules/echo-cancel/adrian-aec.orc new/pulseaudio-4.99.3/src/modules/echo-cancel/adrian-aec.orc --- old/pulseaudio-4.99.2/src/modules/echo-cancel/adrian-aec.orc 1970-01-01 01:00:00.000000000 +0100 +++ new/pulseaudio-4.99.3/src/modules/echo-cancel/adrian-aec.orc 2014-01-21 14:39:57.000000000 +0100 @@ -0,0 +1,8 @@ +.function update_tap_weights +.dest 4 w float +.source 4 xf float +.floatparam 4 mikro_ef +.temp 4 tmp float + +mulf tmp, mikro_ef, xf +addf w, w, tmp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/modules/module-card-restore.c new/pulseaudio-4.99.3/src/modules/module-card-restore.c --- old/pulseaudio-4.99.2/src/modules/module-card-restore.c 2014-01-23 19:57:55.000000000 +0100 +++ new/pulseaudio-4.99.3/src/modules/module-card-restore.c 2014-01-29 20:48:03.000000000 +0100 @@ -390,6 +390,7 @@ return PA_HOOK_OK; if ((entry = entry_read(u, card->name))) { + pa_xfree(entry->profile); entry->profile = pa_xstrdup(card->active_profile->name); pa_log_info("Storing card profile for card %s.", card->name); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/modules/module-device-manager.c new/pulseaudio-4.99.3/src/modules/module-device-manager.c --- old/pulseaudio-4.99.2/src/modules/module-device-manager.c 2014-01-23 19:57:55.000000000 +0100 +++ new/pulseaudio-4.99.3/src/modules/module-device-manager.c 2014-01-29 20:48:03.000000000 +0100 @@ -605,6 +605,8 @@ PA_IDXSET_FOREACH(sink, u->core->sinks, idx) { if ((pa_sink*) ignore_device == sink) continue; + if (!PA_SINK_IS_LINKED(sink->state)) + continue; if (pa_streq(sink->name, device_name)) { found = true; idx = sink->index; /* Is this needed? */ @@ -617,6 +619,8 @@ PA_IDXSET_FOREACH(source, u->core->sources, idx) { if ((pa_source*) ignore_device == source) continue; + if (!PA_SOURCE_IS_LINKED(source->state)) + continue; if (pa_streq(source->name, device_name)) { found = true; idx = source->index; /* Is this needed? */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/pulsecore/module.c new/pulseaudio-4.99.3/src/pulsecore/module.c --- old/pulseaudio-4.99.2/src/pulsecore/module.c 2014-01-23 19:57:55.000000000 +0100 +++ new/pulseaudio-4.99.3/src/pulsecore/module.c 2014-01-29 20:48:03.000000000 +0100 @@ -67,7 +67,7 @@ /* strip .so from the end of name, if present */ n = pa_xstrdup(name); - p = rindex(n, '.'); + p = strrchr(n, '.'); if (p && pa_streq(p, PA_SOEXT)) p[0] = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/pulsecore/resampler.c new/pulseaudio-4.99.3/src/pulsecore/resampler.c --- old/pulseaudio-4.99.2/src/pulsecore/resampler.c 2014-01-23 19:57:55.000000000 +0100 +++ new/pulseaudio-4.99.3/src/pulsecore/resampler.c 2014-01-29 20:48:03.000000000 +0100 @@ -65,13 +65,14 @@ size_t resample_buf_size; size_t from_work_format_buf_size; - /* points to buffer before resampling stage, remap */ + /* points to buffer before resampling stage, remap or to_work */ pa_memchunk *leftover_buf; size_t *leftover_buf_size; - /* have_leftover points to leftover_in_remap */ + /* have_leftover points to leftover_in_remap or leftover_in_to_work */ bool *have_leftover; bool leftover_in_remap; + bool leftover_in_to_work; pa_sample_format_t work_format; uint8_t work_channels; @@ -397,12 +398,7 @@ calc_map_table(r); - pa_log_info("Using resampler '%s'", pa_resample_method_to_string(method)); - r->work_format = pa_resampler_choose_work_format(method, a->format, b->format, r->map_required); - - pa_log_info("Using %s as working format.", pa_sample_format_to_string(r->work_format)); - r->w_sz = pa_sample_size_of_format(r->work_format); if (r->i_ss.format != r->work_format) { @@ -427,14 +423,31 @@ } } - /* leftover buffer is the buffer before the resampling stage */ - r->leftover_buf = &r->remap_buf; - r->leftover_buf_size = &r->remap_buf_size; - r->have_leftover = &r->leftover_in_remap; + if (r->o_ss.channels <= r->i_ss.channels) { + /* pipeline is: format conv. -> remap -> resample -> format conv. */ + r->work_channels = r->o_ss.channels; + + /* leftover buffer is remap output buffer (before resampling) */ + r->leftover_buf = &r->remap_buf; + r->leftover_buf_size = &r->remap_buf_size; + r->have_leftover = &r->leftover_in_remap; + } else { + /* pipeline is: format conv. -> resample -> remap -> format conv. */ + r->work_channels = r->i_ss.channels; - r->work_channels = r->o_ss.channels; + /* leftover buffer is to_work output buffer (before resampling) */ + r->leftover_buf = &r->to_work_format_buf; + r->leftover_buf_size = &r->to_work_format_buf_size; + r->have_leftover = &r->leftover_in_to_work; + } r->w_fz = pa_sample_size_of_format(r->work_format) * r->work_channels; + pa_log_debug("Resampler:"); + pa_log_debug(" rate %d -> %d (method %s)", a->rate, b->rate, pa_resample_method_to_string(r->method)); + pa_log_debug(" format %s -> %s (intermediate %s)", pa_sample_format_to_string(a->format), + pa_sample_format_to_string(b->format), pa_sample_format_to_string(r->work_format)); + pa_log_debug(" channels %d -> %d (resampling %d)", a->channels, b->channels, r->work_channels); + /* initialize implementation */ if (init_table[method](r) < 0) goto fail; @@ -1140,40 +1153,72 @@ pa_init_remap(m); } -static size_t fit_buf(pa_resampler *r, pa_memchunk *buf, size_t size) { - if (!buf->memblock || size < buf->length) { - size = buf->length; - if (buf->memblock) +/* check if buf's memblock is large enough to hold 'len' bytes; create a + * new memblock if necessary and optionally preserve 'copy' data bytes */ +static void fit_buf(pa_resampler *r, pa_memchunk *buf, size_t len, size_t *size, size_t copy) { + pa_assert(size); + + if (!buf->memblock || len > *size) { + pa_memblock *new_block = pa_memblock_new(r->mempool, len); + + if (buf->memblock) { + if (copy > 0) { + void *src = pa_memblock_acquire(buf->memblock); + void *dst = pa_memblock_acquire(new_block); + pa_assert(copy <= len); + memcpy(dst, src, copy); + pa_memblock_release(new_block); + pa_memblock_release(buf->memblock); + } + pa_memblock_unref(buf->memblock); + } - buf->memblock = pa_memblock_new(r->mempool, size); + buf->memblock = new_block; + *size = len; } - return size; + + buf->length = len; } static pa_memchunk* convert_to_work_format(pa_resampler *r, pa_memchunk *input) { - unsigned n_samples; + unsigned in_n_samples, out_n_samples; void *src, *dst; + bool have_leftover; + size_t leftover_length = 0; pa_assert(r); pa_assert(input); pa_assert(input->memblock); /* Convert the incoming sample into the work sample format and place them - * in to_work_format_buf. */ + * in to_work_format_buf. The leftover data is already converted, so it's + * part of the output buffer. */ - if (!r->to_work_format_func || !input->length) + have_leftover = r->leftover_in_to_work; + r->leftover_in_to_work = false; + + if (!have_leftover && (!r->to_work_format_func || !input->length)) return input; + else if (input->length <= 0) + return &r->to_work_format_buf; - n_samples = (unsigned) ((input->length / r->i_fz) * r->i_ss.channels); + in_n_samples = out_n_samples = (unsigned) ((input->length / r->i_fz) * r->i_ss.channels); - r->to_work_format_buf.length = r->w_sz * n_samples; - r->to_work_format_buf_size = fit_buf(r, &r->to_work_format_buf, r->to_work_format_buf_size); + if (have_leftover) { + leftover_length = r->to_work_format_buf.length; + out_n_samples += (unsigned) (leftover_length / r->w_sz); + } + + fit_buf(r, &r->to_work_format_buf, r->w_sz * out_n_samples, &r->to_work_format_buf_size, leftover_length); src = pa_memblock_acquire_chunk(input); - dst = pa_memblock_acquire(r->to_work_format_buf.memblock); + dst = (uint8_t *) pa_memblock_acquire(r->to_work_format_buf.memblock) + leftover_length; - r->to_work_format_func(n_samples, src, dst); + if (r->to_work_format_func) + r->to_work_format_func(in_n_samples, src, dst); + else + memcpy(dst, src, input->length); pa_memblock_release(input->memblock); pa_memblock_release(r->to_work_format_buf.memblock); @@ -1212,24 +1257,7 @@ } out_n_samples = out_n_frames * r->o_ss.channels; - r->remap_buf.length = out_n_samples * r->w_sz; - - if (have_leftover) { - if (r->remap_buf_size < r->remap_buf.length) { - pa_memblock *new_block = pa_memblock_new(r->mempool, r->remap_buf.length); - - src = pa_memblock_acquire(r->remap_buf.memblock); - dst = pa_memblock_acquire(new_block); - memcpy(dst, src, leftover_length); - pa_memblock_release(r->remap_buf.memblock); - pa_memblock_release(new_block); - - pa_memblock_unref(r->remap_buf.memblock); - r->remap_buf.memblock = new_block; - r->remap_buf_size = r->remap_buf.length; - } - } else - r->remap_buf_size = fit_buf(r, &r->remap_buf, r->remap_buf_size); + fit_buf(r, &r->remap_buf, out_n_samples * r->w_sz, &r->remap_buf_size, leftover_length); src = pa_memblock_acquire_chunk(input); dst = (uint8_t *) pa_memblock_acquire(r->remap_buf.memblock) + leftover_length; @@ -1257,8 +1285,7 @@ pa_assert(len > 0); /* Store the leftover data. */ - r->leftover_buf->length = len; - *r->leftover_buf_size = fit_buf(r, r->leftover_buf, *r->leftover_buf_size); + fit_buf(r, r->leftover_buf, len, r->leftover_buf_size, 0); *r->have_leftover = true; dst = pa_memblock_acquire(r->leftover_buf->memblock); @@ -1280,9 +1307,7 @@ in_n_frames = (unsigned) (input->length / r->w_fz); out_n_frames = ((in_n_frames*r->o_ss.rate)/r->i_ss.rate)+EXTRA_FRAMES; - - r->resample_buf.length = r->w_fz * out_n_frames; - r->resample_buf_size = fit_buf(r, &r->resample_buf, r->resample_buf_size); + fit_buf(r, &r->resample_buf, r->w_fz * out_n_frames, &r->resample_buf_size, 0); leftover_n_frames = r->impl.resample(r, input, in_n_frames, &r->resample_buf, &out_n_frames); @@ -1312,9 +1337,7 @@ n_samples = (unsigned) (input->length / r->w_sz); n_frames = n_samples / r->o_ss.channels; - - r->from_work_format_buf.length = r->o_fz * n_frames; - r->from_work_format_buf_size = fit_buf(r, &r->from_work_format_buf, r->from_work_format_buf_size); + fit_buf(r, &r->from_work_format_buf, r->o_fz * n_frames, &r->from_work_format_buf_size, 0); src = pa_memblock_acquire_chunk(input); dst = pa_memblock_acquire(r->from_work_format_buf.memblock); @@ -1337,8 +1360,16 @@ buf = (pa_memchunk*) in; buf = convert_to_work_format(r, buf); - buf = remap_channels(r, buf); - buf = resample(r, buf); + + /* Try to save resampling effort: if we have more output channels than + * input channels, do resampling first, then remapping. */ + if (r->o_ss.channels <= r->i_ss.channels) { + buf = remap_channels(r, buf); + buf = resample(r, buf); + } else { + buf = resample(r, buf); + buf = remap_channels(r, buf); + } if (buf->length) { buf = convert_from_work_format(r, buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pulseaudio-4.99.2/src/pulsecore/svolume.orc new/pulseaudio-4.99.3/src/pulsecore/svolume.orc --- old/pulseaudio-4.99.2/src/pulsecore/svolume.orc 1970-01-01 01:00:00.000000000 +0100 +++ new/pulseaudio-4.99.3/src/pulsecore/svolume.orc 2014-01-21 14:39:57.000000000 +0100 @@ -0,0 +1,84 @@ +# This file is part of PulseAudio. +# +# Copyright 2010 Lennart Poettering +# Copyright 2010 Wim Taymans <wim.taymans(a)collabora.co.uk> +# Copyright 2010 Arun Raghavan <arun.raghavan(a)collabora.co.uk> +# +# PulseAudio is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; either version 2.1 of the License, +# or (at your option) any later version. +# +# PulseAudio is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with PulseAudio; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA. + +# S16NE 1- and 2-channel volume scaling work as follows: +# +# params: samples s (signed 16-bit), volume v (signed 32-bit < 2^31) +# +# 32 16 0 (type of operation) +# sample = | sample | (signed) +# s = | 0 | sample | (unsigned) +# +# if (sample < 0) +# signc = | 0 | 0xffff | (unsigned) +# else +# signc = | 0 | 0 | (unsigned) +# +# if (sample < 0) +# ml = | 0 | -((s*vl) >> 16) | (unsigned) +# else +# ml = | 0 | (s*vl) >> 16 | (unsigned) +# +# vh = | v >> 16 | (signed, but sign bit is always zero +# since PA_VOLUME_MAX is 0x0fffffff) +# mh = | (s * vh) >> 16 | (signed) +# ml = | ml + mh | (signed) +# sample = | (ml >> 16) | (signed, saturated) + +.function pa_volume_s16ne_orc_1ch +.dest 2 samples int16_t +.param 4 v int32_t +.temp 2 vh +.temp 4 s +.temp 4 mh +.temp 4 ml +.temp 4 signc + +convuwl s, samples +x2 cmpgtsw signc, 0, s +x2 andw signc, signc, v +x2 mulhuw ml, s, v +subl ml, ml, signc +convhlw vh, v +mulswl mh, samples, vh +addl ml, ml, mh +convssslw samples, ml + +.function pa_volume_s16ne_orc_2ch +.dest 4 samples int16_t +.longparam 8 vols +.temp 8 v +.temp 4 vh +.temp 8 s +.temp 8 mh +.temp 8 ml +.temp 8 signc + +loadpq v, vols +x2 convuwl s, samples +x4 cmpgtsw signc, 0, s +x4 andw signc, signc, v +x4 mulhuw ml, s, v +x2 subl ml, ml, signc +x2 convhlw vh, v +x2 mulswl mh, samples, vh +x2 addl ml, ml, mh +x2 convssslw samples, ml -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0