April 2015 - openSUSE Commits - openSUSE Mailing Lists

commit sratom for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package sratom for openSUSE:Factory checked in at 2015-04-02 16:03:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sratom (Old) and /work/SRC/openSUSE:Factory/.sratom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sratom" Changes: -------- --- /work/SRC/openSUSE:Factory/sratom/sratom.changes 2014-07-18 14:04:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sratom.new/sratom.changes 2015-04-02 16:03:13.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Mar 26 23:15:15 UTC 2015 - p.drouand(a)gmail.com + +- Update to version 0.4.6 + * Update for latest LV2 Atom Object simplification + * Don't set eg prefix in sratom_to_turtle + * Upgrade to waf 1.7.16 + +------------------------------------------------------------------- Old: ---- sratom-0.4.4.tar.bz2 New: ---- sratom-0.4.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sratom.spec ++++++ --- /var/tmp/diff_new_pack.7JaSO1/_old 2015-04-02 16:03:13.000000000 +0200 +++ /var/tmp/diff_new_pack.7JaSO1/_new 2015-04-02 16:03:13.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package sratom # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define soname 0 Name: sratom -Version: 0.4.4 +Version: 0.4.6 Release: 0 Summary: A library for serialising LV2 atoms to/from RDF License: ISC ++++++ sratom-0.4.4.tar.bz2 -> sratom-0.4.6.tar.bz2 ++++++ ++++ 3512 lines of diff (skipped)

1 0

commit cfengine for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at 2015-04-02 16:02:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine (Old) and /work/SRC/openSUSE:Factory/.cfengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cfengine" Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine/cfengine.changes 2015-03-18 13:07:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cfengine.new/cfengine.changes 2015-04-02 16:03:10.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Mar 23 10:19:37 UTC 2015 - tchvatal(a)suse.com + +- Partial fix for bnc#923417: + * 0001-Do-not-use-insecure-MD5-but-rather-SHA256.patch + +------------------------------------------------------------------- +Wed Mar 18 14:33:33 UTC 2015 - tchvatal(a)suse.com + +- Enable tests, 1 fail so document it + +------------------------------------------------------------------- +Wed Mar 18 14:32:09 UTC 2015 - tchvatal(a)suse.com + +- Enable pam and disable silent rules for make + +------------------------------------------------------------------- +Wed Mar 18 14:18:09 UTC 2015 - tchvatal(a)suse.com + +- Proceed bit more with cleaning, the RH sections are failing to build + for couple of years. Better readability without them so prune it + out +- Convert the in-spec build switches to %bcond +- Provide rcbla links to systemd services + +------------------------------------------------------------------- New: ---- 0001-Do-not-use-insecure-MD5-but-rather-SHA256.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.RUWBKx/_old 2015-04-02 16:03:11.000000000 +0200 +++ /var/tmp/diff_new_pack.RUWBKx/_new 2015-04-02 16:03:11.000000000 +0200 @@ -16,10 +16,6 @@ # -# set to 1 to enable adapter, leave 0 for minimal cfengine -%define with_mysql 0 -%define with_postgresql 0 -%define with_libvirt 0 %define srcname core-%{version} %define libname libpromises %define libsoname %{libname}3 @@ -32,6 +28,10 @@ %else %define have_systemd 0 %endif +# pass --with-bla to enable the build +%bcond_with mysql +%bcond_with postgresql +%bcond_with libvirt Name: cfengine Version: 3.6.5 Release: 0 @@ -66,8 +66,10 @@ Patch6: 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch # PATCH-FIX-UPSTREAM: Use ssl exponent of 65537 for FIPS bnc#922571 Patch7: cfengine-fips.patch +Patch8: 0001-Do-not-use-insecure-MD5-but-rather-SHA256.patch BuildRequires: bison BuildRequires: db-devel +BuildRequires: fdupes BuildRequires: flex BuildRequires: libacl-devel BuildRequires: libtool @@ -78,10 +80,6 @@ BuildRequires: pcre-devel Requires: %{libsoname} = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -# wtf? SLE_11 does not honor rpmlintrc -%if 0%{?suse_version} <= 1130 -BuildRequires: -post-build-checks -%endif %if %{have_systemd} Source7: cf-execd.service Source8: cf-monitord.service @@ -91,39 +89,26 @@ Source8: cf-execd Source9: cf-serverd %endif -# -# Disable mysql for SLE_11: -# -# configure: error: MySQL client library exports symbols clashing with -# OpenSSL. Get the update from distribution provider, recompile MySQL -# library or disable MySQL connector. See -# http://bugs.mysql.com/bug.php?id=65055 for details. -# -%if %{with_mysql} -%if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0 +%if %{with mysql} BuildRequires: mysql-devel %endif -%endif -%if %{with_libvirt} +%if %{with libvirt} BuildRequires: libvirt-devel %endif -%if %{with_postgresql} +%if %{with postgresql} BuildRequires: postgresql-devel %endif -%if !%{have_systemd} -# no systemd -> use cron -%if 0%{?centos_version} || 0%{?rhel_version} -Requires: vixie-cron -%else -Requires: cron -%endif -%endif %if %{have_systemd} BuildRequires: systemd %{?systemd_requires} +%else +# Without systemd we require cron +Requires: cron +Requires(post): %insserv_prereq %fillup_prereq %endif -%if 0%{?suse_version} > 01020 -BuildRequires: fdupes +# FHS was a hit with sle11 so it dies out otherwise +%if 0%{?suse_version} <= 1110 +BuildRequires: -post-build-checks %endif %description @@ -162,12 +147,6 @@ %package doc Summary: CFEngine automates large-scale IT computing infrastructure - documentation Group: Documentation/Other -%if 0%{?rhel_version} || 0%{?centos_version} -BuildRequires: tetex -BuildRequires: tetex-dvips -BuildRequires: tetex-latex -BuildRequires: texinfo -%endif %description doc Full documentation for cfengine @@ -181,15 +160,13 @@ %prep %setup -q -n %{srcname} -%if 0%{?suse_version} > 0 && 0%{?suse_version} <= 1110 -%patch2 -p1 -%endif -%if 0%{?rhel_version} >= 500 && 0%{?rhel_version} < 600 +%if 0%{?suse_version} <= 1110 %patch2 -p1 %endif %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 ##### rpmlint #### wrong-file-end-of-line-encoding @@ -202,64 +179,57 @@ cp -a $RPM_SOURCE_DIR/*pdf docs/ %build -autoreconf -fi -I m4 +autoreconf -fvi -I m4 # /usr/include/sys for acl.h -CC=gcc CFLAGS="%{optflags} -fno-strict-aliasing" \ +CC=cc CFLAGS="%{optflags} -fno-strict-aliasing" \ %configure \ --disable-static \ + --disable-silent-rules \ --enable-fhs \ --datadir=/var \ --with-workdir=%{workdir} \ -%if %{with_postgresql} +%if %{with postgresql} --with-postgresql \ %endif -%if %{with_mysql} -%if 0%{?suse_version} != 1110 && 0%{?rhel_version} == 0 && 0%{?fedora_version} != 20 +%if %{with mysql} --with-mysql \ %endif -%endif --without-qdbm \ --without-tokyocabinet \ --with-lmdb \ --with-pthreads \ --with-openssl \ --with-pcre \ -%if %{with_libvirt} +%if %{with libvirt} --with-libvirt \ %endif --with-libacl \ --with-libxml2 \ -%if 0%{?suse_version} >= 1110 - --docdir=%{_docdir}/%{name} -%else if 0%{?rhel_version} >= 600 - --docdir=%{_docdir}/%{name}-%{version} -%endif + --docdir=%{_docdir}/%{name} \ + --with-pam make %{?_smp_mflags} +%check +# FAIL: process_test +make check %{?_smp_mflags} || : + %install chmod -x ChangeLog make "DESTDIR=%{buildroot}" install -%if 0%{?suse_version} >= 1110 || 0%{?rhel_version} >= 600 # will appear in cfengine-examples rm -rf %{buildroot}/%{_docdir}/%{name}/examples -%endif install -d %{buildroot}/{usr/sbin,%{workdir}/{bin,inputs,reports}} # create dirs needed for better organizing dirs and files install -d %{buildroot}/%{basedir}/{backup,failsafe,config,plugins} -#%%{__install} -d %{buildroot}/%%{basedir}/config/{development,production} %if %{have_systemd} # systemd: install sample cron file in docdir -%if 0%{?suse_version} install -D -m0644 %{SOURCE10} %{buildroot}/%{_docdir}/%{name} %else -install -D -m0644 %{SOURCE10} %{buildroot}/%{_docdir}/%{name}-%{version} -%endif -%else # no systemd -> use cron # install cron file install -D -m0644 %{SOURCE10} %{buildroot}/%{_sysconfdir}/cron.d/%{name} @@ -270,6 +240,9 @@ install -D -m 0644 %{SOURCE7} %{buildroot}/%{_unitdir}/cf-execd.service install -D -m 0644 %{SOURCE8} %{buildroot}/%{_unitdir}/cf-monitord.service install -D -m 0644 %{SOURCE9} %{buildroot}/%{_unitdir}/cf-serverd.service +ln -s -f service %{buildroot}/%{_sbindir}/rccf-monitord +ln -s -f service %{buildroot}/%{_sbindir}/rccf-execd +ln -s -f service %{buildroot}/%{_sbindir}/rccf-serverd %else # install init scripts install -d %{buildroot}%{_sysconfdir}/init.d @@ -304,26 +277,25 @@ gzip %{buildroot}%{_mandir}/man8/$i.8 done -%if 0%{?suse_version} > 1010 +# Firewall install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine -%endif -%if 0%{?suse_version} > 01020 +# Ckeabyo dyoes %fdupes %{buildroot}%{_datadir}/cfengine -%endif - -# systemd -%if %{have_systemd} - -#################################################################### -# Systemd -#################################################################### %pre +%if %{have_systemd} %service_add_pre cf-execd.service cf-monitord.service cf-serverd.service +%endif %post +%if %{have_systemd} %service_add_post cf-execd.service cf-monitord.service cf-serverd.service +%else +for i in execd monitord serverd; do + %fillup_and_insserv cf-${i} +done +%endif /sbin/ldconfig if [ $1 -lt 2 ]; then # first install, generate key pair @@ -331,55 +303,29 @@ fi %preun +%if %{have_systemd} %service_del_preun cf-execd.service cf-monitord.service cf-serverd.service - -%postun -%service_del_postun cf-execd.service cf-monitord.service cf-serverd.service -if [ $1 -eq 0 ]; then - # clean up inputs cache dir on removal - rm -rf %{basedir}/inputs/* -fi -/sbin/ldconfig - -%else # !systemd - -#################################################################### -# Non-systemd -#################################################################### - -%preun -%if 0%{?suse_version} -%stop_on_removal cf-monitord -%stop_on_removal cf-execd -%stop_on_removal cf-serverd %else -%{_initddir}/cf-execd stop -%{_initddir}/cf-monitord stop -%{_initddir}/cf-serverd stop +for i in execd monitord serverd; do + %stop_on_removal cf-${i} +done %endif -%post -p /sbin/ldconfig - %postun -%if 0%{?suse_version} > 1010 +%if %{have_systemd} +%service_del_postun cf-execd.service cf-monitord.service cf-serverd.service +%else %insserv_cleanup - for i in execd monitord serverd; do +for i in execd monitord serverd; do %restart_on_update cf-${i} - done -%else - # Update ? - if [ ${1:-0} -eq 1 ]; then - for i in execd monitord serverd; do - %{_initddir}/cf-${i} restart - done - else -: - fi +done %endif +if [ $1 -eq 0 ]; then + # clean up inputs cache dir on removal + rm -rf %{basedir}/inputs/* +fi /sbin/ldconfig -%endif # !systemd - %post -n %{libsoname} -p /sbin/ldconfig %postun -n %{libsoname} -p /sbin/ldconfig @@ -402,20 +348,15 @@ %{_unitdir}/cf-serverd.service %else %config %attr(0755,root,root) %{_initddir}/* +%endif %{_sbindir}/rccf-execd %{_sbindir}/rccf-monitord %{_sbindir}/rccf-serverd -%endif -%if 0%{?suse_version} > 1010 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/cfengine -%endif - %{_mandir}/man8/* %dir %{basedir} - %dir %{workdir} %{workdir}/* - %if !%{have_systemd} %config(noreplace) %{_sysconfdir}/cron.d/%{name} %endif ++++++ 0001-Do-not-use-insecure-MD5-but-rather-SHA256.patch ++++++ >From a814751421422cad22373eb6e568272fd24e1532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal(a)gmail.com> Date: Mon, 23 Mar 2015 11:12:58 +0100 Subject: [PATCH] Do not use insecure MD5 but rather SHA256 --- libpromises/generic_agent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libpromises/generic_agent.c b/libpromises/generic_agent.c index eaace00..4863230 100644 --- a/libpromises/generic_agent.c +++ b/libpromises/generic_agent.c @@ -101,8 +101,8 @@ static void SanitizeEnvironment() ENTERPRISE_VOID_FUNC_2ARG_DEFINE_STUB(void, GenericAgentSetDefaultDigest, HashMethod *, digest, int *, digest_len) { - *digest = HASH_METHOD_MD5; - *digest_len = CF_MD5_LEN; + *digest = HASH_METHOD_SHA256; + *digest_len = CF_SHA256_LEN; } void MarkAsPolicyServer(EvalContext *ctx) -- 2.3.0

1 0

commit perl-Glib-Object-Introspection for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package perl-Glib-Object-Introspection for openSUSE:Factory checked in at 2015-04-02 16:02:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Glib-Object-Introspection (Old) and /work/SRC/openSUSE:Factory/.perl-Glib-Object-Introspection.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Glib-Object-Introspection" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Glib-Object-Introspection/perl-Glib-Object-Introspection.changes 2015-02-27 11:09:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Glib-Object-Introspection.new/perl-Glib-Object-Introspection.changes 2015-04-02 16:03:09.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Mar 26 10:56:21 UTC 2015 - sor.alexei(a)meowr.ru + +- Update to 0.029: + * Hook up the generic Glib::Boxed constructor on load, not in + setup(). + * Add support for marshalling GVariants, GArrays, GPtrArrays and + GByteArrays. + * Support flat arrays when converting from C to Perl. + +------------------------------------------------------------------- Old: ---- Glib-Object-Introspection-0.028.tar.gz New: ---- Glib-Object-Introspection-0.029.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Glib-Object-Introspection.spec ++++++ --- /var/tmp/diff_new_pack.m1mrqi/_old 2015-04-02 16:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.m1mrqi/_new 2015-04-02 16:03:10.000000000 +0200 @@ -18,7 +18,7 @@ %define cpan_name Glib-Object-Introspection Name: perl-Glib-Object-Introspection -Version: 0.028 +Version: 0.029 Release: 0 Summary: GObject Introspection bindings for Perl License: LGPL-2.1+ @@ -29,10 +29,10 @@ BuildRequires: perl-macros BuildRequires: perl(ExtUtils::Depends) BuildRequires: perl(ExtUtils::PkgConfig) -BuildRequires: perl(Glib) >= 1.180 +BuildRequires: perl(Glib) >= 1.310 BuildRequires: pkgconfig(gobject-introspection-1.0) -Requires: perl(Glib) >= 1.180 -%{perl_requires} +Requires: perl(Glib) >= 1.310 +%perl_requires %description This package provides perl bindings for GObject Introspection. ++++++ Glib-Object-Introspection-0.028.tar.gz -> Glib-Object-Introspection-0.029.tar.gz ++++++ ++++ 1719 lines of diff (skipped)

1 0

commit ghc-bootstrap for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package ghc-bootstrap for openSUSE:Factory checked in at 2015-04-02 16:02:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-bootstrap (Old) and /work/SRC/openSUSE:Factory/.ghc-bootstrap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-bootstrap" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-bootstrap/ghc-bootstrap.changes 2014-09-22 18:50:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-bootstrap.new/ghc-bootstrap.changes 2015-04-02 16:03:04.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 26 08:24:04 UTC 2015 - peter.trommler(a)ohm-hochschule.de + +- use official tarballs for x86 and x86_64 +* fixes build on openSUSE 11.4 and SLE 11 +* bootstrap ghc is built against libgmp.so.3 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.Mfv1Fl/_old 2015-04-02 16:03:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Mfv1Fl/_new 2015-04-02 16:03:08.000000000 +0200 @@ -1,8 +1,8 @@ # # spec file for package ghc-bootstrap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2011, 2012 Peter Trommler peter.trommler(a)ohm-hochschule.de +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 Peter Trommler peter.trommler(a)ohm-hochschule.de # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %ifarch %{ix86} %define longarch i386 %endif @@ -36,7 +37,6 @@ %global debug_package %{nil} - Name: ghc-bootstrap Version: 7.6.3 Release: 0 @@ -47,13 +47,16 @@ Source: %{name}-%{version}.tar Source1: README.openSUSE Source2: LICENSE +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gmp-devel +Requires: gmp-devel # Building binary distributions is currently broken for ppc64le # use package 'ghc-bin' to bootstrap ppc64le # this will be fixed in version 7.8.3 and later ExclusiveArch: %{ix86} ppc ppc64 x86_64 -Provides: ghc-compiler = %{version} Provides: ghc-array Provides: ghc-base +Provides: ghc-compiler = %{version} Provides: ghc-containers Provides: ghc-deepseq Provides: ghc-directory @@ -126,7 +129,7 @@ language interfaces (C, C++, etc). A wide variety of Haskell related resources (tutorials, libraries, -specifications, documentation, compilers, interprbeters, references, +specifications, documentation, compilers, interpreters, references, contact information, links to research groups) are available from the Haskell home page at <http://www.haskell.org/>. @@ -137,13 +140,24 @@ cp %SOURCE2 . %build +%if 0%{suse_version} > 1130 +ln -s %{_libdir}/libgmp.so.10 libgmp.so.3 +export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH +%endif tar jxf ghc-%{version}-%{longarch}-unknown-linux.tar.bz2 cd ghc-%{version} ./configure --prefix=%{_prefix} %install +%if 0%{suse_version} > 1130 +export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH +%endif cd ghc-%{version} %makeinstall +%if 0%{suse_version} > 1130 +install -dm 0755 %{buildroot}%{_libdir} +ln -s %{_libdir}/libgmp.so.10 %{buildroot}%{_libdir}/libgmp.so.3 +%endif %post ghc-pkg recache @@ -155,5 +169,11 @@ %{_bindir}/* %{_prefix}/lib/ghc-%{version} %{_datadir}/doc/* +%if 0%{suse_version} > 1130 +%{_libdir}/libgmp.so.3 +%endif +%ifarch %{ix86} x86_64 +%{_mandir}/man1/ghc.1* +%endif %changelog ++++++ ghc-bootstrap-7.6.3.tar ++++++ Files /var/tmp/diff_new_pack.Mfv1Fl/_old and /var/tmp/diff_new_pack.Mfv1Fl/_new differ

1 0

commit qpid-cpp for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package qpid-cpp for openSUSE:Factory checked in at 2015-04-02 16:02:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qpid-cpp (Old) and /work/SRC/openSUSE:Factory/.qpid-cpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qpid-cpp" Changes: -------- New Changes file: --- /dev/null 2015-03-12 01:14:30.992027505 +0100 +++ /work/SRC/openSUSE:Factory/.qpid-cpp.new/perl-qpid.changes 2015-04-02 16:02:46.000000000 +0200 @@ -0,0 +1,41 @@ +------------------------------------------------------------------- +Wed Mar 25 09:07:48 UTC 2015 - fstrba(a)suse.com + +- Update to upstream 0.32 + +------------------------------------------------------------------- +Wed Feb 25 09:00:03 UTC 2015 - fstrba(a)suse.com + +- Update to upstream 0.30 +- Build from the qpid-cpp-0.30 tarball, since upstream changed the + packaging + +------------------------------------------------------------------- +Thu Jul 24 10:05:03 UTC 2014 - fstrba(a)suse.com + +- Upgrade to upstream version 0.28 +- Remove integrated patches: + * 0001-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch + * 0002-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch +- Build from the qpid-0.28 tarball, since qpid-perl tarballs are + not distributed for this version + +------------------------------------------------------------------- +Mon Apr 14 09:45:34 UTC 2014 - fstrba(a)suse.com + +- Upgrade to upstream version 0.26 +- New patches from Fedora: + * 0001-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch + * 0002-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch + +------------------------------------------------------------------- +Mon Sep 30 13:02:42 UTC 2013 - fridrich.strba(a)suse.com + +- Add BuildRoot line to fix build on older systems +- Depend on oldest swig known to work + +------------------------------------------------------------------- +Mon Sep 23 09:12:50 UTC 2013 - fridrich.strba(a)suse.com + +- Initial package based on Fedora's perl-qpid + New Changes file: --- /dev/null 2015-03-12 01:14:30.992027505 +0100 +++ /work/SRC/openSUSE:Factory/.qpid-cpp.new/qpid-cpp.changes 2015-04-02 16:02:46.000000000 +0200 @@ -0,0 +1,96 @@ +------------------------------------------------------------------- +Wed Mar 25 09:28:06 UTC 2015 - fstrba(a)suse.com + +- Mention qpid-cpp-rpmlintrc in the spec file + +------------------------------------------------------------------- +Wed Mar 25 09:06:48 UTC 2015 - fstrba(a)suse.com + +- Update to upstream 0.32 +- Removed integrated patches: + * 0002-NO-JIRA-Remove-dead-unused-code.patch + * 0003-QPID-6128-Fix-compiling-SocketAddress-on-ARM.patch + +------------------------------------------------------------------- +Wed Feb 25 09:00:03 UTC 2015 - fstrba(a)suse.com + +- Update to upstream 0.30 +- Rename the packate from qpid to qpid-cpp + * correspond to the upstream packaging +- Removed patches: + * 0002-NO-JIRA-Remove-unused-code.patch + * 0003-QPID-3650-Avoid-unaligned-memory-access.patch + * 0004-QPID-3650-Avoid-unaligned-memory-access.patch + * qpid-0.24-defaultstart.patch + * qpid-0.24-initdir.patch + * qpid-0.24-tests.patch + * qpid-0.28-cmake.patch +- Added patches: + * 0002-NO-JIRA-Remove-dead-unused-code.patch + * 0003-QPID-6128-Fix-compiling-SocketAddress-on-ARM.patch + * qpid-cpp-0.30-cmake.patch + * qpid-cpp-initdir.patch + * qpid-cpp-tests.patch + +------------------------------------------------------------------- +Thu Jul 24 08:23:29 UTC 2014 - fstrba(a)suse.com + +- Update to upstream 0.28 +- Removed integrated patches: + * 0002-QPID-4984-Fix-for-recovery-ambiguity-issue-other-cod.patch + * 0003-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch + * 0004-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch +- Add new upstream patches: + * 0002-NO-JIRA-Remove-unused-code.patch + * 0003-QPID-3650-Avoid-unaligned-memory-access.patch + * 0004-QPID-3650-Avoid-unaligned-memory-access.patch +- Rediff patch to correspond to the new sources + * qpid-0.26-cmake.patch -> qpid-0.28-cmake.patch +- Add patch to fix aarch64 build + * qpid-cpp-aarch64.patch +- Don't build qpid-tools as noarch since it contains two new binary + tools + +------------------------------------------------------------------- +Mon May 26 23:25:53 UTC 2014 - fstrba(a)suse.com + +- Move things from /var/run to /run + +------------------------------------------------------------------- +Mon Apr 14 09:35:07 UTC 2014 - fstrba(a)suse.com + +- Update to upstream 0.26 +- Removed patches: + * 02-QPID-4670-Move-to-proton-0.5-remove-dummy-string-in-.patch + * 03-QPID-5122-cleaner-encoding-of-index-for-delivery-tag.patch + * 05-QPID-5016-Zero-rmgr-struct-element-with-correct-size.patch + * 06-QPID-5126-Fix-for-building-legacy-store-on-ARM-platf.patch +- New patches from Fedora: + * 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch + * 0002-QPID-4984-Fix-for-recovery-ambiguity-issue-other-cod.patch + * 0003-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch + * 0004-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch +- Build fix with newer versions of cmake + * qpid-0.26-cmake.patch + +------------------------------------------------------------------- +Mon Jan 6 13:30:35 UTC 2014 - fridrich.strba(a)suse.com + +- Own some directories to avoid post-build errors + +------------------------------------------------------------------- +Mon Sep 30 12:53:36 UTC 2013 - fridrich.strba(a)suse.com + +- Add BuildRoot line to fix build on older systems +- Depend on oldest swig known to work + +------------------------------------------------------------------- +Mon Sep 30 12:17:33 UTC 2013 - fridrich.strba(a)suse.com + +- Fix packaging of store.so* and thus build with debuginfo flag + +------------------------------------------------------------------- +Fri Sep 20 14:25:02 UTC 2013 - fridrich.strba(a)suse.com + +- Initial package based on Fedora's qpid-cpp package + New: ---- 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch perl-qpid.changes perl-qpid.spec qpid-0.24-date.patch qpid-cpp-0.30-cmake.patch qpid-cpp-0.32.tar.gz qpid-cpp-aarch64.patch qpid-cpp-initdir.patch qpid-cpp-rpmlintrc qpid-cpp-tests.patch qpid-cpp.changes qpid-cpp.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-qpid.spec ++++++ # # spec file for package perl-qpid # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: perl-qpid Version: 0.32 Release: 0 Summary: Perl bindings for the Qpid messaging framework License: Apache-2.0 Group: Development/Libraries/Perl Url: http://qpid.apache.org/ Source0: http://www.apache.org/dist/qpid/%{version}/qpid-cpp-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: qpid-cpp-client-devel = %{version} BuildRequires: swig >= 2.0.9 Requires: perl = %{perl_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Perl bindings for the Qpid messaging framework. %prep %setup -q -n qpid-cpp-%{version} %build pushd bindings/qpid/perl perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" make %{?_smp_mflags} popd %install pushd bindings/qpid/perl make pure_install DESTDIR=%{buildroot} find %{buildroot} -type f -name .packlist -exec rm -f {} ';' find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null ';' rm -rf %{buildroot}%{perl_vendorarch}/auto/ popd %files %defattr(-,root,root) %{perl_vendorarch}/* %doc LICENSE %{_mandir}/man3/* %changelog ++++++ qpid-cpp.spec ++++++ # # spec file for package qpid-cpp # # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: qpid-cpp Version: 0.32 Release: 0 Summary: Libraries for Qpid C++ client applications License: Apache-2.0 Group: Productivity/Networking/Other Url: http://qpid.apache.org Source0: http://www.apache.org/dist/qpid/%{version}/%{name}-%{version}.tar.gz Source1000: %{name}-rpmlintrc Patch0: 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch Patch3: qpid-0.24-date.patch Patch4: qpid-cpp-tests.patch Patch5: qpid-cpp-initdir.patch Patch8: %{name}-0.30-cmake.patch Patch9: %{name}-aarch64.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cyrus-sasl BuildRequires: cyrus-sasl-devel BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libaio-devel BuildRequires: libtool BuildRequires: libuuid-devel BuildRequires: mozilla-nspr BuildRequires: mozilla-nspr-devel BuildRequires: mozilla-nss BuildRequires: mozilla-nss-devel BuildRequires: perl BuildRequires: pkgconfig BuildRequires: python BuildRequires: python-devel BuildRequires: python-xml BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: swig >= 2.0.9 BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1200 BuildRequires: systemd %endif %description Run-time libraries for AMQP client applications developed using Qpid C++. Clients exchange messages with an AMQP message broker using the AMQP protocol. %package client Summary: Libraries for Qpid C++ client applications License: Apache-2.0 Group: Productivity/Networking/Other %description client Run-time libraries for AMQP client applications developed using Qpid C++. Clients exchange messages with an AMQP message broker using the AMQP protocol. %files client %defattr(-,root,root,-) %doc DESIGN %doc LICENSE %doc NOTICE %doc README.txt %doc RELEASE_NOTES %{_libdir}/libqpidcommon.so.* %{_libdir}/libqpidclient.so.* %{_libdir}/libqpidtypes.so.* %{_libdir}/libqpidmessaging.so.* %dir %{_libdir}/qpid %dir %{_sysconfdir}/qpid %config(noreplace) %{_sysconfdir}/qpid/qpidc.conf %post client -p /sbin/ldconfig %postun client -p /sbin/ldconfig %package client-devel Summary: Header files, documentation and testing tools for developing Qpid C++ clients License: Apache-2.0 Group: Development/Libraries/C and C++ Requires: %{name}-client = %{version}-%{release} Requires: boost-devel Requires: libuuid-devel Requires: python %description client-devel Libraries, header files and documentation for developing AMQP clients in C++ using Qpid. Qpid implements the AMQP messaging specification. %files client-devel %defattr(-,root,root,-) %dir %{_includedir}/qpid %{_includedir}/qpid/*.h %{_includedir}/qpid/qpid.i %{_includedir}/qpid/swig_perl_typemaps.i %{_includedir}/qpid/swig_python_typemaps.i %{_includedir}/qpid/swig_ruby_typemaps.i %{_includedir}/qpid/sys %{_includedir}/qpid/messaging %{_includedir}/qpid/types %{_libdir}/libqpidcommon.so %{_libdir}/libqpidclient.so %{_libdir}/libqpidtypes.so %{_libdir}/libqpidmessaging.so %{_libdir}/pkgconfig/qpid.pc %{_datadir}/qpid %defattr(755,root,root,-) %{_bindir}/qpid-perftest %{_bindir}/qpid-topic-listener %{_bindir}/qpid-topic-publisher %{_bindir}/qpid-latency-test %{_bindir}/qpid-client-test %{_bindir}/qpid-txtest %{_bindir}/qpid-send %{_bindir}/qpid-receive %dir %{_libexecdir}/qpid %{_libexecdir}/qpid/tests %{_libdir}/cmake/Qpid %post client-devel -p /sbin/ldconfig %postun client-devel -p /sbin/ldconfig %package client-devel-docs Summary: AMQP client development documentation License: Apache-2.0 Group: Documentation/Other BuildArch: noarch %description client-devel-docs This package includes the AMQP clients development documentation in HTML format for easy browsing. %files client-devel-docs %defattr(-,root,root,-) %{_datadir}/doc/%{name}-%{version} %package server Summary: An AMQP message broker daemon License: Apache-2.0 Group: Productivity/Networking/Other Requires: %{name}-client = %{version}-%{release} Requires: cyrus-sasl %systemd_requires %description server A message broker daemon that receives stores and routes messages using the open AMQP messaging protocol. %files server %defattr(-,root,root,-) %{_libdir}/libqpidbroker.so.* %{_sbindir}/qpidd %{_sbindir}/rcqpidd %{_unitdir}/qpidd.service %dir %{_sysconfdir}/qpid %config(noreplace) %{_sysconfdir}/qpid/qpidd.conf %dir %{_sysconfdir}/sasl2 %config(noreplace) %{_sysconfdir}/sasl2/qpidd.conf %exclude %{_libdir}/qpid/daemon/ha.so %{_mandir}/man1/qpidd* %attr(755, qpidd, qpidd) %{_localstatedir}/lib/qpidd %ghost %attr(755, qpidd, qpidd) /run/qpidd %pre server getent group qpidd >/dev/null || groupadd -r qpidd getent passwd qpidd >/dev/null || \ useradd -r -M -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \ -c "Owner of Qpidd Daemons" qpidd %service_add_pre qpidd.service exit 0 %post server /sbin/ldconfig %service_add_post qpidd.service exit 0 %preun server %service_del_preun qpidd.service exit 0 %postun server /sbin/ldconfig %if 0%{?suse_version} >= 1200 %service_del_preun qpidd.service %endif exit 0 %package server-ha Summary: Extensions to the AMQP message broker to provide high availability License: Apache-2.0 Group: Productivity/Networking/Other Requires: %{name}-server = %{version}-%{release} Requires: python-qpid-qmf = %{version}-%{release} %description server-ha Provides extensions to the AMQP message broker to provide high availability. %files server-ha %defattr(-,root,root,-) # %{_bindir}/qpid-ha %dir %{_libdir}/qpid %dir %{_libdir}/qpid/daemon %{_libdir}/qpid/daemon/ha.so %{_unitdir}/qpidd-primary.service %pre server-ha %service_add_pre qpidd-primary.service exit 0 %post server-ha /sbin/ldconfig %service_add_post qpidd-primary.service exit 0 %preun server-ha %service_del_preun qpidd-primary.service exit 0 %postun server-ha /sbin/ldconfig %service_del_preun qpidd-primary.service exit 0 %package server-store Summary: Red Hat persistence extension to the Qpid messaging system License: LGPL-2.1+ Group: Productivity/Networking/Other Requires: %{name}-server = %{version} %description server-store Red Hat persistence extension to the Qpid AMQP broker: persistent message storage using either a libaio-based asynchronous journal, or synchronously with Berkeley DB. %files server-store %defattr(-,root,root,-) %dir %{_libdir}/qpid %dir %{_libdir}/qpid/daemon %post server-store -p /sbin/ldconfig %postun server-store -p /sbin/ldconfig %package -n python-qpid_messaging Summary: Python bindings for the Qpid messaging framework Group: Development/Libraries/Python Requires: python Requires: python-qpid-common %description -n python-qpid_messaging Python bindings for the Qpid messaging framework. %files -n python-qpid_messaging %defattr(-,root,root,-) %{python_sitearch}/qpid_messaging.py %{python_sitearch}/qpid_messaging.pyc %{python_sitearch}/qpid_messaging.pyo %{python_sitearch}/*_qpid_messaging.so %package -n qpid-qmf Summary: The QPID Management Framework Requires: python-qpid >= %{version} Requires: python-qpid-qmf = %{version} Requires: qpid-cpp-client >= %{version} %description -n qpid-qmf The Qpid Management Framework is a general-purpose management bus built on Qpid messaging. It takes advantage of the scalability, security, and rich capabilities of Qpid to provide flexible and easy-to-use manageability to a large set of applications. %files -n qpid-qmf %defattr(-,root,root,-) %{_libdir}/libqmf2.so.* %post -n qpid-qmf -p /sbin/ldconfig %postun -n qpid-qmf -p /sbin/ldconfig %package -n qpid-qmf-devel Summary: Header files and tools for developing QMF extensions Requires: qpid-cpp-client-devel >= %{version} Requires: qpid-qmf = %{version}-%{release} %description -n qpid-qmf-devel Header files and code-generation tools needed for developers of QMF-managed components. %files -n qpid-qmf-devel %defattr(-,root,root,-) %{_includedir}/qmf %{_libdir}/libqmf2.so %{_bindir}/qmf-gen %{python_sitelib}/qmfgen %{_libdir}/pkgconfig/qmf2.pc %post -n qpid-qmf-devel -p /sbin/ldconfig %postun -n qpid-qmf-devel -p /sbin/ldconfig %package -n python-qpid-qmf Summary: The QPID Management Framework bindings for python Requires: qpid-qmf = %{version}-%{release} %description -n python-qpid-qmf An extensible management framework layered on QPID messaging, bindings for python. %files -n python-qpid-qmf %defattr(-,root,root,-) %{python_sitearch}/qmf2.py* %{python_sitearch}/cqmf2.py* %{python_sitearch}/*_cqmf2.so %post -n python-qpid-qmf -p /sbin/ldconfig %postun -n python-qpid-qmf -p /sbin/ldconfig %prep %setup -q %patch0 -p3 %patch3 -p2 -b .date %patch4 -p1 -b .tests %patch5 -p1 -b .initdir %patch8 -p1 %patch9 -p2 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest" %build %cmake -DLIBEXEC_INSTALL_DIR=%{_libexecdir} make %{?_smp_mflags} make docs-user-api %{?_smp_mflags} pushd bindings/qpid/python make %{?_smp_mflags} popd %install mkdir -p -m0755 %{buildroot}%{_unitdir} %cmake_install chmod 755 %{buildroot}/%{python_sitearch}/*_qpid_messaging.so # clean up items we're not installing rm -f %{buildroot}%{_bindir}/qpid-python-test rm -f %{buildroot}%{_libdir}/libqpidbroker.so rm -f %{buildroot}%{_libdir}/libcqpid_perl.so rm -f %{buildroot}%{_libdir}/ruby/cqpid.so rm -rf %{buildroot}%{rb_sitelib} rm -rf %{buildroot}%{_libexecdir}/perl5 rm -rf %{buildroot}%{_libdir}/perl5 rm -rf %{buildroot}%{python_sitearch}/qpid_python*egg-info rm -rf %{buildroot}%{python_sitearch}/mllib rm -rf %{buildroot}%{python_sitearch}/qpid rm -rf %{buildroot}%{python_sitelib}/qpidtoollibs rm -rf %{buildroot}%{_libdir}/qpid/daemon/store.so* rm -rf %{buildroot}%{_initddir}/qpidd-primary rm -rf %{buildroot}%{_datadir}/qpid-tools rm -rf %{buildroot}%{_libexecdir}/qpid-qls-analyze # QMF Python management install -d %{_builddir}/cpp/managementgen/qmfgen \ %{buildroot}/%{python_sitelib} # install systemd files mkdir -p %{buildroot}%{_unitdir} install -pm 644 %{_builddir}/%{name}-%{version}%{_sysconfdir}/qpidd.service \ %{buildroot}%{_unitdir} install -pm 644 %{_builddir}/%{name}-%{version}%{_sysconfdir}/qpidd-primary.service \ %{buildroot}%{_unitdir} rm -f %{buildroot}%{_initddir}/qpidd rm -f %{buildroot}%{_sysconfdir}/init.d/qpidd.service # install perftests utilities mkdir -p %{buildroot}%{_bindir} pushd build/src/tests for ptest in %{perftests}; do libtool --mode=install install -m755 $ptest %{buildroot}%{_bindir} done popd mkdir -p %{buildroot}/run touch %{buildroot}/run/qpidd mkdir -p %{buildroot}%{_localstatedir}/lib/qpidd # Provide SUSE policy symlink /usr/sbin/rcFOO -> /etc/init.d/FOO # /usr/sbin/service exists only since openSUSE 12.3: %if 0%{?suse_version} > 1220 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcqpidd %else ln -s /sbin/service %{buildroot}%{_sbindir}/rcqpidd %endif # clean up leftover ruby files rm -rf %{buildroot}%{_prefix}/local/%{_lib}/ruby/site_ruby %fdupes -s %{buildroot} %check %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %changelog ++++++ 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch ++++++ >From d377a75fc454bd329f9dc340dd13aaab080fcf3a Mon Sep 17 00:00:00 2001 From: "Darryl L. Pierce" <mcpierce(a)gmail.com> Date: Wed, 3 Apr 2013 10:07:37 -0400 Subject: [PATCH 1/3] NO-JIRA: qpidd.service file for use on Fedora This patch provides the needed systemd file for running the Qpid broker as a service. --- qpid/cpp/etc/qpidd-primary.service | 15 +++++++++++++++ qpid/cpp/etc/qpidd.service | 14 ++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 qpid/cpp/etc/qpidd-primary.service create mode 100644 qpid/cpp/etc/qpidd.service diff --git a/qpid/cpp/etc/qpidd-primary.service b/qpid/cpp/etc/qpidd-primary.service new file mode 100644 index 0000000..f15168c --- /dev/null +++ b/qpid/cpp/etc/qpidd-primary.service @@ -0,0 +1,15 @@ +[Unit] +Description=An AMQP message broker cluster primary daemon. +Documentation=man:qpidd(1) http://qpid.apache.org/ +Requires=network.target +After=network.target + +[Service] +User=qpidd +Group=qpidd +Type=simple +EnvironmentFile=/etc/sysconfig/qpidd +ExecStart=/usr/sbin/qpid-ha -b localhost:$QPID_PORT promote + +[Install] +WantedBy=multi-user.target diff --git a/qpid/cpp/etc/qpidd.service b/qpid/cpp/etc/qpidd.service new file mode 100644 index 0000000..10a99d1 --- /dev/null +++ b/qpid/cpp/etc/qpidd.service @@ -0,0 +1,14 @@ +[Unit] +Description=An AMQP message broker daemon. +Documentation=man:qpidd(1) http://qpid.apache.org/ +Requires=network.target +After=network.target + +[Service] +User=qpidd +Group=qpidd +Type=simple +ExecStart=/usr/sbin/qpidd --config /etc/qpid/qpidd.conf + +[Install] +WantedBy=multi-user.target -- 1.9.3 ++++++ qpid-0.24-date.patch ++++++ --- qpid-0.24/cpp/docs/api/footer.html 2011-04-28 21:59:44.000000000 +0200 +++ qpid-0.24/cpp/docs/api/footer.html 2013-09-20 16:07:18.991547492 +0200 @@ -25,7 +25,7 @@ <address style="text-align: right;"> <small> -Generated on $date for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion</small> +Generated on for $projectname by <a href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion</small> </address> </body> </html> ++++++ qpid-cpp-0.30-cmake.patch ++++++ --- qpid-cpp-0.30/bindings/qmf2/ruby/CMakeLists.txt 2014-06-18 00:44:15.000000000 +0200 +++ qpid-cpp-0.30/bindings/qmf2/ruby/CMakeLists.txt 2014-09-30 11:20:00.681660874 +0200 @@ -24,9 +24,9 @@ CPLUSPLUS ON SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings") -if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) +if (((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) OR (${CMAKE_MAJOR_VERSION} GREATER 2)) set (RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_PATH}) -endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) +endif (((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) OR (${CMAKE_MAJOR_VERSION} GREATER 2)) include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include --- qpid-cpp-0.30/bindings/qpid/ruby/CMakeLists.txt 2014-06-18 00:44:15.000000000 +0200 +++ qpid-cpp-0.30/bindings/qpid/ruby/CMakeLists.txt 2014-09-30 11:20:00.681660874 +0200 @@ -33,9 +33,9 @@ CPLUSPLUS ON SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include;-I${qpid-cpp_SOURCE_DIR}/bindings") -if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) +if (((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) OR (${CMAKE_MAJOR_VERSION} GREATER 2)) set (RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_PATH}) -endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) +endif (((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8)) OR (${CMAKE_MAJOR_VERSION} GREATER 2)) include_directories(${RUBY_INCLUDE_DIRS} ${qpid-cpp_SOURCE_DIR}/include ++++++ qpid-cpp-aarch64.patch ++++++ --- qpid-0.28/cpp/src/qpid/legacystore/jrnl/jcfg.h.orig 2014-06-07 11:55:17.797677146 +0100 +++ qpid-0.28/cpp/src/qpid/legacystore/jrnl/jcfg.h 2014-06-07 11:56:10.759498664 +0100 @@ -39,7 +39,7 @@ #elif defined(__PPC__) || defined(__s390__) /* big endian, 32 bits */ #define JRNL_BIG_ENDIAN #define JRNL_32_BIT -#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || (__arm64__) /* little endian, 64 bits */ +#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || (__aarch64__) /* little endian, 64 bits */ #define JRNL_LITTLE_ENDIAN #define JRNL_64_BIT #elif defined(__powerpc64__) || defined(__s390x__) /* big endian, 64 bits */ ++++++ qpid-cpp-initdir.patch ++++++ --- qpid-cpp-0.30/BuildInstallSettings.cmake 2014-10-07 10:46:41.714961240 +0200 +++ qpid-cpp-0.30/BuildInstallSettings.cmake 2014-10-07 10:47:24.627005594 +0200 @@ -161,7 +161,7 @@ set (QPID_INSTALL_SBINDIR sbin) set (QPID_INSTALL_TESTDIR ${LIBEXEC_INSTALL_DIR}/qpid/tests) # Directory for test executables set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}/qpid) - set (QPID_INSTALL_INITDDIR ${SYSCONF_INSTALL_DIR}/rc.d/init.d) + set (QPID_INSTALL_INITDDIR ${SYSCONF_INSTALL_DIR}/init.d) set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2) set (QPID_INSTALL_DATADIR ${SHARE_INSTALL_DIR}/qpid) set (QPID_INSTALL_EXAMPLESDIR ${SHARE_INSTALL_DIR}/qpid/examples) ++++++ qpid-cpp-rpmlintrc ++++++ addFilter("shlib-policy-name-error") ++++++ qpid-cpp-tests.patch ++++++ --- qpid-cpp-0.30/BuildInstallSettings.cmake 2013-10-29 22:24:26.000000000 +0100 +++ qpid-cpp-0.30/BuildInstallSettings.cmake 2014-10-07 10:25:34.655021101 +0200 @@ -132,12 +132,14 @@ # CMAKE_INSTALL_PREFIX - this is a standard cmake variable # INCLUDE_INSTALL_DIR # LIB_INSTALL_DIR + # LIBEXEC_INSTALL_DIR # SYSCONF_INSTALL_DIR # SHARE_INSTALL_DIR # So make these cached variables and the specific variables non cached and # derived from them. set (INCLUDE_INSTALL_DIR include CACHE PATH "Include file directory") set (LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Library object file directory") + set (LIBEXEC_INSTALL_DIR lib CACHE PATH "Whatever") set (SYSCONF_INSTALL_DIR etc CACHE PATH "System read only configuration directory") set (SHARE_INSTALL_DIR share CACHE PATH "Shared read only data directory") set (DOC_INSTALL_DIR ${SHARE_INSTALL_DIR}/doc/${CMAKE_PROJECT_NAME}-${QPID_VERSION_FULL} CACHE PATH "Shared read only data directory") @@ -157,7 +159,7 @@ # These are always relative to $CMAKE_INSTALL_PREFIX set (QPID_INSTALL_BINDIR bin) set (QPID_INSTALL_SBINDIR sbin) - set (QPID_INSTALL_TESTDIR libexec/qpid/tests) # Directory for test executables + set (QPID_INSTALL_TESTDIR ${LIBEXEC_INSTALL_DIR}/qpid/tests) # Directory for test executables set (QPID_INSTALL_CONFDIR ${SYSCONF_INSTALL_DIR}/qpid) set (QPID_INSTALL_INITDDIR ${SYSCONF_INSTALL_DIR}/rc.d/init.d) set (QPID_INSTALL_SASLDIR ${SYSCONF_INSTALL_DIR}/sasl2) --- qpid-cpp-0.30/src/tests/install_env.sh.in 2012-03-27 22:32:18.000000000 +0200 +++ qpid-cpp-0.30/src/tests/install_env.sh.in 2014-10-07 10:25:34.655021101 +0200 @@ -21,6 +21,6 @@ prefix=`absdir @prefix@` export QPID_INSTALL_PREFIX=$prefix -export PATH=$prefix/bin:$prefix/sbin:$prefix/libexec/qpid/tests:$PATH +export PATH=$prefix/bin:$prefix/sbin:$prefix/lib/qpid/tests:$PATH export LD_LIBRARY_PATH=$prefix/lib:$LD_LIBRARY_PATH export PYTHONPATH=$prefix/lib/python2.6/site-packages:$PYTHONPATH

1 0

commit belle-sip for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package belle-sip for openSUSE:Factory checked in at 2015-04-02 16:02:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/belle-sip (Old) and /work/SRC/openSUSE:Factory/.belle-sip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "belle-sip" Changes: -------- --- /work/SRC/openSUSE:Factory/belle-sip/belle-sip.changes 2015-03-18 13:04:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.belle-sip.new/belle-sip.changes 2015-04-02 16:02:44.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Mar 23 10:16:05 UTC 2015 - sor.alexei(a)meowr.ru + +- Switch from obsolete polarssl to mbedtls. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ belle-sip.spec ++++++ --- /var/tmp/diff_new_pack.SZJBRx/_old 2015-04-02 16:02:45.000000000 +0200 +++ /var/tmp/diff_new_pack.SZJBRx/_new 2015-04-02 16:02:45.000000000 +0200 @@ -30,14 +30,11 @@ BuildRequires: antlr3c-devel BuildRequires: autoconf BuildRequires: automake -# Needed for tests, tests use net so useless for OBS -# BuildRequires: cunit-devel BuildRequires: gcc-c++ BuildRequires: java -BuildRequires: libpolarssl-devel BuildRequires: libtool +BuildRequires: mbedtls-devel BuildRequires: pkg-config -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Belle-sip is a SIP (RFC3261) implementation written in C, with an object oriented API. @@ -68,7 +65,6 @@ autoreconf -fi %configure \ --disable-strict \ - --disable-tests \ --disable-static make %{?_smp_mflags}

1 0

commit weston for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package weston for openSUSE:Factory checked in at 2015-04-02 16:02:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/weston (Old) and /work/SRC/openSUSE:Factory/.weston.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "weston" Changes: -------- --- /work/SRC/openSUSE:Factory/weston/weston.changes 2014-09-30 19:37:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.weston.new/weston.changes 2015-04-02 16:02:42.000000000 +0200 @@ -1,0 +2,84 @@ +Tue Mar 10 12:04:57 UTC 2015 - mpluskal(a)suse.com + +- Update to 1.7.0 + * Improve the look of shadows for small (<128 pixel wide or high) + clients. This resulted in observable dark lines in menus with + fewer than 3 items. + * A handful of fixes for xwm/Xwayland oddities, including better + handling of popups/tooltips that to be top level, and better + sizing of fullscreened X apps to not include the border in + their height and + width calculations. + * An optimization to gl-renderer reduces the geometry needed for + representing complex scenes, by utilizing pixman's y-x banded + rectangles. + * Memory allocation is cleaned up and standardized internally, to + better demonstrate best practices in avoiding common leaks and + crashes. + * Doubleclicking on a window title bar now maximizes it. + * Several fixes to glitches found during mode switching or + restoring back to native. And refactor the mode switching code + into several specialized routines, so further mode switch + handling can be done more flexibly. + * Fix logind-util to do DRM-device synchronization only on DRM, + and to pass the Activate signal immediately for other + compositor backends. + * Fix a couple problematic tests in the testsuite to skip in + situations they're always going to fail. + * Fix hang when closing the output if colord plugin is enabled + due to an incorrect GMutex value in the mutex lock output + notifier handler. + * Multiple keyboard and pointer button events are better + handled; we only forward the first and less press and + release events, and suppress extraneous ones. + +------------------------------------------------------------------- +Tue Jan 27 21:47:25 UTC 2015 - jengelh(a)inai.de + +- Update to new upstream prerelease 1.6.92 +* gl-renderer: compress pixman bands to simplify geometry +* compositor-headless: allow rendering with pixman +* compositor: Add idle timeout option to weston.ini +* protocol: add presentation extension v5 +* compositor: add stub implementation of presentation interface +* compositor: drop legacy backends in favor of libinput + +------------------------------------------------------------------- +Thu Jan 22 08:07:12 UTC 2015 - sor.alexei(a)meowr.ru + +- Update to new upstream release 1.6.1 +* cairo-util: fix shadows for small clients +* clipboard: set fd member of clipboard_source +* compositor: add missing newline to help text +* compositor: Display option help text only for enabled backends +* compositor: Fix tabbing of help output +* compositor: Fix typos in help text +* compositor: List only available backends in help text +* compositor: Propagate errors from module_init +* compositor: (Whitespace-only) Indent with tabs +* compositor-x11: Fix some shutdown crashes +* configure.ac: bump version to 1.6.1 for stable release +* configure.ac: Clarify libinput requirement +* desktop-shell: don't crash input-panel if no kbd focus +* dnd: Fix some mouse cursor issues +* input: don't run the key bindings on focus in +* input: fix access to invalid resource +* input: swallow the key press event when running a compositor key binding +* Makefile.am: Link weston_multi_resource against rt library +* protocol: Fix some typos in protocol files +* releasing: Typo +* releasing: update web host name +* shell: don't crash on create_common_surface() failure +* shell: fix weston_output_mode_switch() usage +* smoke: Don't commit an xdg_surface with a NULL buffer +* smoke: fix valgrind invalid read errors +* text: Don't crash if a seat has no keyboard +* text: Fix some typos +* text: Fix typo +* window: use roundtrip instead of dispatch after get_registry +* xwayland: fix fullscreening +* xwm: fix a crash in handle_state +* zoom: Check the value of level before using it. +- Disable libinput backend for now as it requires libinput < 0.8.0. + +------------------------------------------------------------------- Old: ---- weston-1.6.0.tar.xz New: ---- weston-1.7.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ weston.spec ++++++ --- /var/tmp/diff_new_pack.sPDYZC/_old 2015-04-02 16:02:43.000000000 +0200 +++ /var/tmp/diff_new_pack.sPDYZC/_new 2015-04-02 16:02:43.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package weston # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: weston %define lname libweston0 -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: Wayland Reference Compositor License: HPND and CC-BY-SA-3.0 @@ -57,17 +57,17 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libdrm) >= 2.4.30 BuildRequires: pkgconfig(libffi) -BuildRequires: pkgconfig(libinput) >= 0.6.0 +BuildRequires: pkgconfig(libinput) >= 0.8.0 BuildRequires: pkgconfig(libsystemd-login) >= 198 BuildRequires: pkgconfig(libudev) >= 136 BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(pixman-1) >= 0.25.2 BuildRequires: pkgconfig(poppler-glib) -BuildRequires: pkgconfig(wayland-client) >= 1.5.91 +BuildRequires: pkgconfig(wayland-client) >= 1.6.92 BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-scanner) -BuildRequires: pkgconfig(wayland-server) >= 1.5.91 +BuildRequires: pkgconfig(wayland-server) >= 1.6.92 BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-xfixes) BuildRequires: pkgconfig(xcursor) @@ -109,8 +109,9 @@ #fi # Ensure people will use pkgconfig to locate headers. # Implicit enable-libunwind would make the tests run endlessly on i586. -%configure --disable-static --includedir="%_includedir/pkg/%name" \ - --disable-setuid-install --disable-libunwind +%configure --disable-static --includedir="%_includedir/%name" \ + --disable-setuid-install --disable-libinput-backend \ + --disable-libunwind make %{?_smp_mflags} %install @@ -135,11 +136,12 @@ %_libexecdir/%name-* %_libdir/%name/ %_datadir/%name/ +%_datadir/wayland-sessions/ %_mandir/man?/*.* %files devel %defattr(-,root,root) -%_includedir/pkg/ +%_includedir/%name/ %_libdir/pkgconfig/%name.pc %changelog ++++++ 0001-build-honor-results-obtained-by-pkg-config-libinput.patch ++++++ --- /var/tmp/diff_new_pack.sPDYZC/_old 2015-04-02 16:02:43.000000000 +0200 +++ /var/tmp/diff_new_pack.sPDYZC/_new 2015-04-02 16:02:43.000000000 +0200 @@ -6,14 +6,14 @@ The error was: src/libinput-seat.c:30:22: fatal error: libinput.h: No such file or directory --- - Makefile.am | 3 ++- + Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/Makefile.am b/Makefile.am -index b2d6893..7f3e5d3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,7 +34,8 @@ AM_CPPFLAGS = \ +Index: weston-1.6.91/Makefile.am +=================================================================== +--- weston-1.6.91.orig/Makefile.am ++++ weston-1.6.91/Makefile.am +@@ -41,7 +41,8 @@ AM_CPPFLAGS = \ -DDATADIR='"$(datadir)"' \ -DMODULEDIR='"$(moduledir)"' \ -DLIBEXECDIR='"$(libexecdir)"' \ @@ -21,8 +21,5 @@ + -DBINDIR='"$(bindir)"' \ + $(LIBINPUT_BACKEND_CFLAGS) - CLEANFILES = weston.ini $(BUILT_SOURCES) + CLEANFILES = weston.ini ivi-shell/weston.ini $(BUILT_SOURCES) --- -2.0.0 - ++++++ weston-1.6.0.tar.xz -> weston-1.7.0.tar.xz ++++++ ++++ 25870 lines of diff (skipped)

1 0

commit yast2-core for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package yast2-core for openSUSE:Factory checked in at 2015-04-02 16:02:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-core (Old) and /work/SRC/openSUSE:Factory/.yast2-core.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-core" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-core/yast2-core.changes 2015-03-16 09:40:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-core.new/yast2-core.changes 2015-04-02 16:02:35.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Mar 30 10:55:31 UTC 2015 - jreidinger(a)suse.com + +- Fix YCP symbol comparison with GCC 5 (thanks schubi for + performance measurement and mvidner for review) (boo#914255) +- 3.1.17 + +------------------------------------------------------------------- Old: ---- yast2-core-3.1.16.tar.bz2 New: ---- yast2-core-3.1.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.vAbo6Y/_old 2015-04-02 16:02:35.000000000 +0200 +++ /var/tmp/diff_new_pack.vAbo6Y/_new 2015-04-02 16:02:35.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-core -Version: 3.1.16 +Version: 3.1.17 Release: 0 Url: https://github.com/yast/yast-core ++++++ yast2-core-3.1.16.tar.bz2 -> yast2-core-3.1.17.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.16/liby2util-r/src/include/y2util/Ustring.h new/yast2-core-3.1.17/liby2util-r/src/include/y2util/Ustring.h --- old/yast2-core-3.1.16/liby2util-r/src/include/y2util/Ustring.h 2015-03-03 17:59:08.000000000 +0100 +++ new/yast2-core-3.1.17/liby2util-r/src/include/y2util/Ustring.h 2015-03-30 13:04:15.000000000 +0200 @@ -189,7 +189,7 @@ friend bool operator==( const Ustring & lhs, const Ustring & rhs ) { // Ustrings share their string representation - return ( lhs->c_str() == rhs->c_str() ); + return ( lhs.asString() == rhs.asString() ); } friend bool operator==( const Ustring & lhs, const std::string & rhs ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.16/package/yast2-core.changes new/yast2-core-3.1.17/package/yast2-core.changes --- old/yast2-core-3.1.16/package/yast2-core.changes 2015-03-03 17:59:08.000000000 +0100 +++ new/yast2-core-3.1.17/package/yast2-core.changes 2015-03-30 13:04:15.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Mar 30 10:55:31 UTC 2015 - jreidinger(a)suse.com + +- Fix YCP symbol comparison with GCC 5 (thanks schubi for + performance measurement and mvidner for review) (boo#914255) +- 3.1.17 + +------------------------------------------------------------------- Tue Mar 3 14:49:39 UTC 2015 - mvidner(a)suse.com - Fixed compilation (but not tests) with GCC 5 (boo#914255). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-core-3.1.16/package/yast2-core.spec new/yast2-core-3.1.17/package/yast2-core.spec --- old/yast2-core-3.1.16/package/yast2-core.spec 2015-03-03 17:59:08.000000000 +0100 +++ new/yast2-core-3.1.17/package/yast2-core.spec 2015-03-30 13:04:15.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-core -Version: 3.1.16 +Version: 3.1.17 Release: 0 Url: https://github.com/yast/yast-core

1 0

commit pcp for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package pcp for openSUSE:Factory checked in at 2015-04-02 16:02:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcp (Old) and /work/SRC/openSUSE:Factory/.pcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcp" Changes: -------- --- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2015-03-09 10:00:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pcp.new/pcp.changes 2015-04-02 16:02:28.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Mar 18 23:13:23 UTC 2015 - ddiss(a)suse.com + +- Ensure the perl modules correctly link against the PCP libraries; + (bnc#841204). + + remove 0004-Remove-CPAN-rpaths.patch + +------------------------------------------------------------------- Old: ---- 0004-Remove-CPAN-rpaths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcp.spec ++++++ --- /var/tmp/diff_new_pack.nfNIiR/_old 2015-04-02 16:02:29.000000000 +0200 +++ /var/tmp/diff_new_pack.nfNIiR/_new 2015-04-02 16:02:29.000000000 +0200 @@ -78,23 +78,21 @@ Source2: pcp-rpmlintrc %endif -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de +# PATCH-FIX-OPENSUSE, kkaempf(a)suse.de Patch1: 0001-Fix-XEN-build.patch -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de +# PATCH-FIX-OPENSUSE, kkaempf(a)suse.de Patch2: 0002-Install-libraries-without-exec-permission.patch -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de +# PATCH-FIX-OPENSUSE, kkaempf(a)suse.de Patch3: 0003-pcp-legacy-init-lsb.patch -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de -Patch4: 0004-Remove-CPAN-rpaths.patch -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de +# PATCH-FIX-OPENSUSE, kkaempf(a)suse.de Patch5: 0005-Remove-runlevel-4-from-init-scripts.patch -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de +# PATCH-FIX-OPENSUSE, kkaempf(a)suse.de Patch6: 0006-create-pmlogger-and-pmie-logdirs-during-install.patch -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de +# PATCH-FIX-OPENSUSE, kkaempf(a)suse.de Patch7: 0007-Honor-CFLAGS-in-qmake.patch -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de +# PATCH-FIX-OPENSUSE, kkaempf(a)suse.de Patch8: 0008-SUSE-fy-pmsnap-control-path.patch -# PACTH-FIX-OPENSUSE, kkaempf(a)suse.de +# PATCH-FIX-OPENSUSE, kkaempf(a)suse.de Patch9: 0009-pmsnap-control-var-www-srv-www.patch # There are no papi/libpfm devel packages for s390 nor for some rhels, disable @@ -172,7 +170,7 @@ BuildRequires: systemtap-sdt-devel %endif %endif -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl-ExtUtils-MakeMaker %if 0%{?suse_version} BuildRequires: update-desktop-files %else @@ -449,9 +447,8 @@ Url: http://www.pcp.io %if 0%{?suse_version} %perl_requires -%else -Requires: pcp-libs = %{version}-%{release} %endif +Requires: %{lib_pkg} = %{version}-%{release} %description -n perl-PCP-PMDA The PCP::PMDA Perl module contains the language bindings for @@ -471,9 +468,8 @@ Requires: pcp >= %{version} %if 0%{?suse_version} %perl_requires -%else -Requires: pcp-libs = %{version}-%{release} %endif +Requires: %{lib_pkg} = %{version}-%{release} %description -n perl-PCP-MMV The PCP::MMV module contains the Perl language bindings for @@ -494,9 +490,8 @@ Requires: pcp >= %{version} %if 0%{?suse_version} %perl_requires -%else -Requires: pcp-libs = %{version}-%{release} %endif +Requires: %{lib_pkg} = %{version}-%{release} %description -n perl-PCP-LogImport The PCP::LogImport module contains the Perl language bindings for @@ -514,9 +509,8 @@ Requires: pcp >= %{version} %if 0%{?suse_version} %perl_requires -%else -Requires: pcp-libs = %{version}-%{release} %endif +Requires: %{lib_pkg} = %{version}-%{release} %description -n perl-PCP-LogSummary The PCP::LogSummary module provides a Perl module for using the @@ -782,7 +776,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1

1 0

commit DirectFB for openSUSE:Factory
by root＠hilbert.suse.de 02 Apr '15

02 Apr '15

Hello community, here is the log from the commit of package DirectFB for openSUSE:Factory checked in at 2015-04-02 16:02:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/DirectFB (Old) and /work/SRC/openSUSE:Factory/.DirectFB.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "DirectFB" Changes: -------- --- /work/SRC/openSUSE:Factory/DirectFB/DirectFB.changes 2015-02-06 10:45:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.DirectFB.new/DirectFB.changes 2015-04-02 16:02:14.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Mar 30 06:29:54 UTC 2015 - pgajdos(a)suse.com + +- security update + * CVE-2014-2977 [bnc#878345] + + DirectFB-CVE-2014-2977.patch + * CVE-2014-2978 [bnc#878349] + + DirectFB-CVE-2014-2978.patch + +------------------------------------------------------------------- +Mon Mar 23 08:54:48 UTC 2015 - pgajdos(a)suse.com + +- Update to version 1.7.7 + * Core: allow access to core part data during its initialisation + * Client: Create extended Graphics State object when needed for + later usage + * Core: Cascaded interlock in favor of optimization. + * libfusion: deallocate call tls properly + +------------------------------------------------------------------- Old: ---- DirectFB-1.7.6.tar.gz New: ---- DirectFB-1.7.7.tar.gz DirectFB-CVE-2014-2977.patch DirectFB-CVE-2014-2978.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ DirectFB.spec ++++++ --- /var/tmp/diff_new_pack.rSEdHw/_old 2015-04-02 16:02:15.000000000 +0200 +++ /var/tmp/diff_new_pack.rSEdHw/_new 2015-04-02 16:02:15.000000000 +0200 @@ -16,12 +16,12 @@ # -%global directfbdir %{_libdir}/directfb-1.7-6 -%global libdirectfb libdirectfb-1_7-6 -%global libdfb lib++dfb-1_7-6 +%global directfbdir %{_libdir}/directfb-1.7-7 +%global libdirectfb libdirectfb-1_7-7 +%global libdfb lib++dfb-1_7-7 Name: DirectFB -Version: 1.7.6 +Version: 1.7.7 Release: 0 Summary: Graphics Library for Framebuffer Devices License: LGPL-2.1+ @@ -60,6 +60,8 @@ Patch20: DirectFB-setregion.patch # PATCH-FIX_OPENSUSE drop test_foo as it does not build in 1.7, mvyskocil(a)suse.com Patch21: DirectFB-1.7.3-drop-test_foo.patch +Patch22: DirectFB-CVE-2014-2977.patch +Patch23: DirectFB-CVE-2014-2978.patch BuildRequires: LibVNCServer-devel %if 0%{?suse_version} > 1220 # Mesa-lib* available only in 12.2+ @@ -221,6 +223,8 @@ %patch19 -p1 -b .fusionID %patch20 -p1 %patch21 -p1 +%patch22 +%patch23 #Disable ppc asm since compilation fails (and it seems better to use glibc) sed -i.noppcasm -e 's/want_ppcasm=yes/want_ppcasm=no/'g configure.in configure ++++++ DirectFB-1.7.6.tar.gz -> DirectFB-1.7.7.tar.gz ++++++ ++++ 1694 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/ChangeLog new/DirectFB-1.7.7/ChangeLog --- old/DirectFB-1.7.6/ChangeLog 2014-08-14 09:17:47.000000000 +0200 +++ new/DirectFB-1.7.7/ChangeLog 2015-02-09 18:16:46.000000000 +0100 @@ -1,3 +1,81 @@ +commit 56ba4031a184031c1149f1e0f73214509e9c0293 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Mon Nov 17 12:19:49 2014 +0100 + + Core: allow access to core part data during its initialisation + +commit 0b0c22d6a1ddfa894b1240cd375931934f033e60 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Fri Oct 31 13:53:07 2014 +0100 + + configure: Evaluate module directory to show final directory + +commit 6fece410a5b946f1c0c017a66ea5884c7747dbcf +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Fri Oct 31 13:51:13 2014 +0100 + + configure: Change --with-sysroot option to --with-runtime-sysroot to avoid conflict with newer autoconf + +commit 549eb402b3141fb98c64f31bf84d116e2234fbe0 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Sat Sep 20 15:35:10 2014 +0200 + + mknames: add typecast to avoid errors with C++ + +commit 4d422fbdf6add491f20164b8b33a0b7b9064b06c +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Sun Feb 1 10:15:13 2015 +0100 + + Client: Create extended Graphics State object when needed for later usage + +commit 3a960cc384f97ea07e72385b442d6f65583a40cf +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Sun Feb 1 10:18:12 2015 +0100 + + ignore + +commit 618c81557d92e75351303c95aa086dd9657d7170 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Sun Feb 1 10:16:23 2015 +0100 + + debug: add some timing info to surface interface construct / destruct + +commit e5c8ab0e391ef139b9efc143053994a0bb34c409 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Sun Feb 1 10:04:27 2015 +0100 + + Core: Cascaded interlock in favor of optimization. + +commit 6f09d498b57d3559ba22e0d043664303a0ee1c37 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Sun Feb 1 10:01:24 2015 +0100 + + libfusion: deallocate call tls properly + +commit 36566929135390deb249c89ed657c057942a58fc +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Sun Feb 1 09:58:42 2015 +0100 + + 1.7.7 + +commit 2f4f78cc43fa7e6ee8411c5f284aa533ad003729 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Sun Feb 1 09:56:19 2015 +0100 + + 2015 + +commit 09d8d058ced264a3a7fd4041bbc4c95893d42691 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Tue Nov 4 08:38:19 2014 +0100 + + Core: When creating the layer surface also pass along the DSCAPS_GL flag. + +commit e2221b1dcad2c44f57b8f8e962c3e0816f393b94 +Author: Denis Oliver Kropp <dok(a)directfb.org> +Date: Thu Aug 14 09:21:39 2014 +0200 + + directfb 1.7.6 + commit 4b4ca723b8dc7d83b8cd8c709f4b0d5e7a96e06b Author: Denis Oliver Kropp <dok(a)directfb.org> Date: Thu Aug 14 09:17:21 2014 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/configure.in new/DirectFB-1.7.7/configure.in --- old/DirectFB-1.7.6/configure.in 2014-08-14 09:19:24.000000000 +0200 +++ new/DirectFB-1.7.7/configure.in 2015-02-09 18:16:46.000000000 +0100 @@ -16,7 +16,7 @@ # DIRECTFB_MAJOR_VERSION=1 DIRECTFB_MINOR_VERSION=7 -DIRECTFB_MICRO_VERSION=6 +DIRECTFB_MICRO_VERSION=7 DIRECTFB_INTERFACE_AGE=0 DIRECTFB_BINARY_AGE=0 DIRECTFB_VERSION=$DIRECTFB_MAJOR_VERSION.$DIRECTFB_MINOR_VERSION.$DIRECTFB_MICRO_VERSION @@ -2624,8 +2624,8 @@ # Sysroot used for runtime module loading, etc. -AC_ARG_WITH(sysroot, - AC_HELP_STRING([--with-sysroot=DIR], +AC_ARG_WITH(runtime-sysroot, + AC_HELP_STRING([--with-runtime-sysroot=DIR], [search for lib/share et al within DIR at runtime,] [e.g. when loading modules]), [RUNTIME_SYSROOT="$withval"], [RUNTIME_SYSROOT=]) @@ -2981,6 +2981,10 @@ ], [chmod +x directfb-config]) +eval eval_moduledir=$MODULEDIR +eval eval_moduledir=$eval_moduledir +eval eval_moduledir=$eval_moduledir + AC_MSG_RESULT([ Build options: @@ -2990,7 +2994,7 @@ Config files in $SYSCONFDIR Build shared libs $enable_shared Build static libs $enable_static - Module directory $MODULEDIR + Module directory $eval_moduledir CC $CC CXX $CXX LD $LD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/directfb.spec new/DirectFB-1.7.7/directfb.spec --- old/DirectFB-1.7.6/directfb.spec 2014-08-14 09:22:23.000000000 +0200 +++ new/DirectFB-1.7.7/directfb.spec 2015-02-11 15:44:46.000000000 +0100 @@ -1,5 +1,5 @@ %define name directfb -%define version 1.7.6 +%define version 1.7.7 %define oname DirectFB %define libname lib%name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/include/directfb_keynames.h new/DirectFB-1.7.7/include/directfb_keynames.h --- old/DirectFB-1.7.6/include/directfb_keynames.h 2014-08-14 09:22:59.000000000 +0200 +++ new/DirectFB-1.7.7/include/directfb_keynames.h 2015-02-11 15:44:56.000000000 +0100 @@ -517,7 +517,7 @@ { DIKS_CUSTOM253, "CUSTOM253" }, \ { DIKS_CUSTOM254, "CUSTOM254" }, \ { DIKS_CUSTOM255, "CUSTOM255" }, \ - { DIKS_NULL, "NULL" } \ + { (DFBInputDeviceKeySymbol) DIKS_NULL, "NULL" } \ }; @@ -643,7 +643,7 @@ { DIKI_KP_7, "KP_7" }, \ { DIKI_KP_8, "KP_8" }, \ { DIKI_KP_9, "KP_9" }, \ - { DIKI_UNKNOWN, "UNKNOWN" } \ + { (DFBInputDeviceKeyIdentifier) DIKI_UNKNOWN, "UNKNOWN" } \ }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/include/directfb_strings.h new/DirectFB-1.7.7/include/directfb_strings.h --- old/DirectFB-1.7.6/include/directfb_strings.h 2014-08-14 09:22:59.000000000 +0200 +++ new/DirectFB-1.7.7/include/directfb_strings.h 2015-02-11 15:44:56.000000000 +0100 @@ -51,7 +51,7 @@ { DSPF_LUT4, "LUT4" }, \ { DSPF_ALUT8, "ALUT8" }, \ { DSPF_LUT1, "LUT1" }, \ - { DSPF_UNKNOWN, "UNKNOWN" } \ + { (DFBSurfacePixelFormat) DSPF_UNKNOWN, "UNKNOWN" } \ }; @@ -74,7 +74,7 @@ { DSPD_ADD, "ADD" }, \ { DSPD_XOR, "XOR" }, \ { DSPD_DST, "DST" }, \ - { DSPD_NONE, "NONE" } \ + { (DFBSurfacePorterDuffRule) DSPD_NONE, "NONE" } \ }; @@ -100,7 +100,7 @@ { DSCAPS_STEREO, "STEREO" }, \ { DSCAPS_SHARED, "SHARED" }, \ { DSCAPS_ROTATED, "ROTATED" }, \ - { DSCAPS_NONE, "NONE" } \ + { (DFBSurfaceCapabilities) DSCAPS_NONE, "NONE" } \ }; @@ -114,7 +114,7 @@ { DSCS_BT601, "BT601" }, \ { DSCS_BT601_FULLRANGE, "BT601_FULLRANGE" }, \ { DSCS_BT709, "BT709" }, \ - { DSCS_UNKNOWN, "UNKNOWN" } \ + { (DFBSurfaceColorSpace) DSCS_UNKNOWN, "UNKNOWN" } \ }; @@ -129,7 +129,7 @@ { DIDTF_JOYSTICK, "JOYSTICK" }, \ { DIDTF_REMOTE, "REMOTE" }, \ { DIDTF_VIRTUAL, "VIRTUAL" }, \ - { DIDTF_NONE, "NONE" } \ + { (DFBInputDeviceTypeFlags) DIDTF_NONE, "NONE" } \ }; @@ -145,7 +145,7 @@ { DSDRAW_DST_PREMULTIPLY, "DST_PREMULTIPLY" }, \ { DSDRAW_DEMULTIPLY, "DEMULTIPLY" }, \ { DSDRAW_XOR, "XOR" }, \ - { DSDRAW_NOFX, "NOFX" } \ + { (DFBSurfaceDrawingFlags) DSDRAW_NOFX, "NOFX" } \ }; @@ -180,7 +180,7 @@ { DSBLIT_ROP, "ROP" }, \ { DSBLIT_SRC_COLORMATRIX, "SRC_COLORMATRIX" }, \ { DSBLIT_SRC_CONVOLUTION, "SRC_CONVOLUTION" }, \ - { DSBLIT_NOFX, "NOFX" } \ + { (DFBSurfaceBlittingFlags) DSBLIT_NOFX, "NOFX" } \ }; @@ -201,7 +201,7 @@ { DSFLIP_SWAP, "SWAP" }, \ { DSFLIP_UPDATE, "UPDATE" }, \ { DSFLIP_WAITFORSYNC, "WAITFORSYNC" }, \ - { DSFLIP_NONE, "NONE" } \ + { (DFBSurfaceFlipFlags) DSFLIP_NONE, "NONE" } \ }; @@ -222,7 +222,7 @@ { DSBF_DESTCOLOR, "DESTCOLOR" }, \ { DSBF_INVDESTCOLOR, "INVDESTCOLOR" }, \ { DSBF_SRCALPHASAT, "SRCALPHASAT" }, \ - { DSBF_UNKNOWN, "UNKNOWN" } \ + { (DFBSurfaceBlendFunction) DSBF_UNKNOWN, "UNKNOWN" } \ }; @@ -235,7 +235,7 @@ { DICAPS_KEYS, "KEYS" }, \ { DICAPS_AXES, "AXES" }, \ { DICAPS_BUTTONS, "BUTTONS" }, \ - { DICAPS_NONE, "NONE" } \ + { (DFBInputDeviceCapabilities) DICAPS_NONE, "NONE" } \ }; @@ -249,7 +249,7 @@ { DLTF_VIDEO, "VIDEO" }, \ { DLTF_STILL_PICTURE, "STILL_PICTURE" }, \ { DLTF_BACKGROUND, "BACKGROUND" }, \ - { DLTF_NONE, "NONE" } \ + { (DFBDisplayLayerTypeFlags) DLTF_NONE, "NONE" } \ }; @@ -282,7 +282,7 @@ { DLCAPS_CLIP_REGIONS, "CLIP_REGIONS" }, \ { DLCAPS_LR_MONO, "LR_MONO" }, \ { DLCAPS_STEREO, "STEREO" }, \ - { DLCAPS_NONE, "NONE" } \ + { (DFBDisplayLayerCapabilities) DLCAPS_NONE, "NONE" } \ }; @@ -297,7 +297,7 @@ { DLBM_BACKSYSTEM, "BACKSYSTEM" }, \ { DLBM_TRIPLE, "TRIPLE" }, \ { DLBM_WINDOWS, "WINDOWS" }, \ - { DLBM_UNKNOWN, "UNKNOWN" } \ + { (DFBDisplayLayerBufferMode) DLBM_UNKNOWN, "UNKNOWN" } \ }; @@ -317,7 +317,7 @@ { DWCAPS_NOFOCUS, "NOFOCUS" }, \ { DWCAPS_LR_MONO, "LR_MONO" }, \ { DWCAPS_STEREO, "STEREO" }, \ - { DWCAPS_NONE, "NONE" } \ + { (DFBWindowCapabilities) DWCAPS_NONE, "NONE" } \ }; @@ -337,7 +337,7 @@ { DLOP_LR_MONO, "LR_MONO" }, \ { DLOP_STEREO, "STEREO" }, \ { DLOP_STEREO, "STEREO" }, \ - { DLOP_NONE, "NONE" } \ + { (DFBDisplayLayerOptions) DLOP_NONE, "NONE" } \ }; @@ -363,7 +363,7 @@ { DWOP_KEEP_ABOVE, "KEEP_ABOVE" }, \ { DWOP_KEEP_UNDER, "KEEP_UNDER" }, \ { DWOP_FOLLOW_BOUNDS, "FOLLOW_BOUNDS" }, \ - { DWOP_NONE, "NONE" } \ + { (DFBWindowOptions) DWOP_NONE, "NONE" } \ }; @@ -378,7 +378,7 @@ { DSCCAPS_MIXERS, "MIXERS" }, \ { DSCCAPS_ENCODERS, "ENCODERS" }, \ { DSCCAPS_OUTPUTS, "OUTPUTS" }, \ - { DSCCAPS_NONE, "NONE" } \ + { (DFBScreenCapabilities) DSCCAPS_NONE, "NONE" } \ }; @@ -403,7 +403,7 @@ { DSECAPS_RESOLUTION, "RESOLUTION" }, \ { DSECAPS_FRAMING, "FRAMING" }, \ { DSECAPS_ASPECT_RATIO, "ASPECT_RATIO" }, \ - { DSECAPS_NONE, "NONE" } \ + { (DFBScreenEncoderCapabilities) DSECAPS_NONE, "NONE" } \ }; @@ -416,7 +416,7 @@ { DSET_CRTC, "CRTC" }, \ { DSET_TV, "TV" }, \ { DSET_DIGITAL, "DIGITAL" }, \ - { DSET_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenEncoderType) DSET_UNKNOWN, "UNKNOWN" } \ }; @@ -438,7 +438,7 @@ { DSETV_NTSC_M_JPN, "NTSC_M_JPN" }, \ { DSETV_DIGITAL, "DIGITAL" }, \ { DSETV_NTSC_443, "NTSC_443" }, \ - { DSETV_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenEncoderTVStandards) DSETV_UNKNOWN, "UNKNOWN" } \ }; @@ -454,7 +454,7 @@ { DSOCAPS_CONNECTOR_SEL, "CONNECTOR_SEL" }, \ { DSOCAPS_SLOW_BLANKING, "SLOW_BLANKING" }, \ { DSOCAPS_RESOLUTION, "RESOLUTION" }, \ - { DSOCAPS_NONE, "NONE" } \ + { (DFBScreenOutputCapabilities) DSOCAPS_NONE, "NONE" } \ }; @@ -472,7 +472,7 @@ { DSOC_COMPONENT, "COMPONENT" }, \ { DSOC_HDMI, "HDMI" }, \ { DSOC_656, "656" }, \ - { DSOC_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenOutputConnectors) DSOC_UNKNOWN, "UNKNOWN" } \ }; @@ -489,7 +489,7 @@ { DSOS_YCBCR, "YCBCR" }, \ { DSOS_HDMI, "HDMI" }, \ { DSOS_656, "656" }, \ - { DSOS_NONE, "NONE" } \ + { (DFBScreenOutputSignals) DSOS_NONE, "NONE" } \ }; @@ -503,7 +503,7 @@ { DSOSB_4x3, "4x3" }, \ { DSOSB_FOLLOW, "FOLLOW" }, \ { DSOSB_MONITOR, "MONITOR" }, \ - { DSOSB_OFF, "OFF" } \ + { (DFBScreenOutputSlowBlankingSignals) DSOSB_OFF, "OFF" } \ }; @@ -536,7 +536,7 @@ { DSOR_2560_1600, "2560_1600" }, \ { DSOR_3840_2160, "3840_2160" }, \ { DSOR_4096_2160, "4096_2160" }, \ - { DSOR_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenOutputResolution) DSOR_UNKNOWN, "UNKNOWN" } \ }; @@ -550,7 +550,7 @@ { DSMCAPS_SUB_LEVEL, "SUB_LEVEL" }, \ { DSMCAPS_SUB_LAYERS, "SUB_LAYERS" }, \ { DSMCAPS_BACKGROUND, "BACKGROUND" }, \ - { DSMCAPS_NONE, "NONE" } \ + { (DFBScreenMixerCapabilities) DSMCAPS_NONE, "NONE" } \ }; @@ -563,7 +563,7 @@ { DSMT_FULL, "FULL" }, \ { DSMT_SUB_LEVEL, "SUB_LEVEL" }, \ { DSMT_SUB_LAYERS, "SUB_LAYERS" }, \ - { DSMT_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenMixerTree) DSMT_UNKNOWN, "UNKNOWN" } \ }; @@ -583,7 +583,7 @@ { DSETP_RED, "RED" }, \ { DSETP_BLUE, "BLUE" }, \ { DSETP_BLACK, "BLACK" }, \ - { DSETP_OFF, "OFF" } \ + { (DFBScreenEncoderTestPicture) DSETP_OFF, "OFF" } \ }; @@ -595,7 +595,7 @@ #define DirectFBScreenEncoderScanModeNames(Identifier) struct DFBScreenEncoderScanModeName Identifier[] = { \ { DSESM_INTERLACED, "INTERLACED" }, \ { DSESM_PROGRESSIVE, "PROGRESSIVE" }, \ - { DSESM_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenEncoderScanMode) DSESM_UNKNOWN, "UNKNOWN" } \ }; @@ -619,7 +619,7 @@ { DSECONF_RESOLUTION, "RESOLUTION" }, \ { DSECONF_FRAMING, "FRAMING" }, \ { DSECONF_ASPECT_RATIO, "ASPECT_RATIO" }, \ - { DSECONF_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenEncoderConfigFlags) DSECONF_UNKNOWN, "UNKNOWN" } \ }; @@ -638,7 +638,7 @@ { DSEF_30HZ, "30HZ" }, \ { DSEF_24HZ, "24HZ" }, \ { DSEF_23_976HZ, "23_976HZ" }, \ - { DSEF_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenEncoderFrequency) DSEF_UNKNOWN, "UNKNOWN" } \ }; @@ -653,7 +653,7 @@ { DSEPF_STEREO_TOP_AND_BOTTOM, "STEREO_TOP_AND_BOTTOM" }, \ { DSEPF_STEREO_FRAME_PACKING, "STEREO_FRAME_PACKING" }, \ { DSEPF_STEREO_SIDE_BY_SIDE_FULL, "STEREO_SIDE_BY_SIDE_FULL" }, \ - { DSEPF_UNKNOWN, "UNKNOWN" } \ + { (DFBScreenEncoderPictureFraming) DSEPF_UNKNOWN, "UNKNOWN" } \ }; @@ -677,7 +677,7 @@ { DFXL_BLIT2, "BLIT2" }, \ { DFXL_TILEBLIT, "TILEBLIT" }, \ { DFXL_DRAWSTRING, "DRAWSTRING" }, \ - { DFXL_NONE, "NONE" } \ + { (DFBAccelerationMask) DFXL_NONE, "NONE" } \ }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/include/directfb_version.h new/DirectFB-1.7.7/include/directfb_version.h --- old/DirectFB-1.7.6/include/directfb_version.h 2014-08-14 09:22:23.000000000 +0200 +++ new/DirectFB-1.7.7/include/directfb_version.h 2015-02-11 15:44:46.000000000 +0100 @@ -31,7 +31,7 @@ #define DIRECTFB_MAJOR_VERSION (1) #define DIRECTFB_MINOR_VERSION (7) -#define DIRECTFB_MICRO_VERSION (6) +#define DIRECTFB_MICRO_VERSION (7) #define DIRECTFB_BINARY_AGE (0) #define DIRECTFB_INTERFACE_AGE (0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/include/directfb_water_strings.h new/DirectFB-1.7.7/include/directfb_water_strings.h --- old/DirectFB-1.7.6/include/directfb_water_strings.h 2014-08-14 09:22:59.000000000 +0200 +++ new/DirectFB-1.7.7/include/directfb_water_strings.h 2015-02-11 15:44:56.000000000 +0100 @@ -33,7 +33,7 @@ { WET_QUAD_CURVE_STRIP, "QUAD_CURVE_STRIP" }, \ { WET_CUBIC_CURVE, "CUBIC_CURVE" }, \ { WET_CUBIC_CURVE_STRIP, "CUBIC_CURVE_STRIP" }, \ - { WET_UNKNOWN, "UNKNOWN" } \ + { (WaterElementType) WET_UNKNOWN, "UNKNOWN" } \ }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/lib/fusion/call.c new/DirectFB-1.7.7/lib/fusion/call.c --- old/DirectFB-1.7.6/lib/fusion/call.c 2014-07-15 17:59:08.000000000 +0200 +++ new/DirectFB-1.7.7/lib/fusion/call.c 2015-02-01 10:01:44.000000000 +0100 @@ -79,14 +79,74 @@ static DirectTLS call_tls_key; +DirectResult +flush_calls( FusionWorld *world, int lock, CallTLS *call_tls ) +{ + DirectResult ret = DR_OK; + + D_DEBUG_AT( Fusion_Call, "%s( %p, lock %d )\n", __FUNCTION__, world, lock ); + + if (call_tls->bins_num > 0) { +#if D_DEBUG_ENABLED + D_DEBUG_AT( Fusion_Call, " -> num %d, length %u\n", call_tls->bins_num, call_tls->bins_data_len ); + + if (direct_log_domain_check( &Fusion_Call )) { + int i; + + for (i=0; i<call_tls->bins_num; i++) { + D_DEBUG_AT( Fusion_Call, " -> [%2d] call_id 0x%08x, call_arg %3d, length %3u, flasg 0x%08x\n", i, + call_tls->bins[i].call_id, + call_tls->bins[i].call_arg, + call_tls->bins[i].length, + call_tls->bins[i].flags ); + } + } +#endif + + if (call_tls->dispatcher) { + D_DEBUG_AT( Fusion_Call, " -> I AM THE DISPATCHER, NOT FLUSHING\n" ); + D_WARN("no flush in dispatcher"); + return DR_OK; + } + + call_tls->bins[call_tls->bins_num - 1].flags &= ~(FCEF_FOLLOW | FCEF_QUEUE); + + while (ioctl( world->fusion_fd, FUSION_CALL_EXECUTE3, call_tls->bins )) { + switch (errno) { + case EINTR: + continue; + case EINVAL: + D_ERROR ("Fusion/Call: invalid call (id 0x%08x)\n", call_tls->bins[0].call_id); + ret = DR_INVARG; + break; + case EIDRM: + D_ERROR ("Fusion/Call: call got destroyed (id 0x%08x)\n", call_tls->bins[0].call_id); + ret = DR_DESTROYED; + break; + default: + break; + } + + D_PERROR ("FUSION_CALL_EXECUTE3 (num %d, len %d)", call_tls->bins_num, call_tls->bins_data_len ); + + ret = DR_FAILURE; + break; + } + + call_tls->bins_num = 0; + call_tls->bins_data_len = 0; + } + + return ret; +} + static void call_tls_destroy( void *arg ) { CallTLS *call_tls = arg; - D_MAGIC_ASSERT( call_tls, CallTLS ); - fusion_world_flush_calls( call_tls->world, 0 ); + flush_calls( call_tls->world, 0, call_tls ); D_ASSUME( call_tls->bins_num == 0 ); @@ -600,65 +660,13 @@ DirectResult fusion_world_flush_calls( FusionWorld *world, int lock ) { - DirectResult ret = DR_OK; - CallTLS *call_tls; + CallTLS *call_tls; call_tls = Call_GetTLS( world ); D_DEBUG_AT( Fusion_Call, "%s( %p, lock %d )\n", __FUNCTION__, world, lock ); - if (call_tls->bins_num > 0) { -#if D_DEBUG_ENABLED - D_DEBUG_AT( Fusion_Call, " -> num %d, length %u\n", call_tls->bins_num, call_tls->bins_data_len ); - - if (direct_log_domain_check( &Fusion_Call )) { - int i; - - for (i=0; i<call_tls->bins_num; i++) { - D_DEBUG_AT( Fusion_Call, " -> [%2d] call_id 0x%08x, call_arg %3d, length %3u, flasg 0x%08x\n", i, - call_tls->bins[i].call_id, - call_tls->bins[i].call_arg, - call_tls->bins[i].length, - call_tls->bins[i].flags ); - } - } -#endif - - if (call_tls->dispatcher) { - D_DEBUG_AT( Fusion_Call, " -> I AM THE DISPATCHER, NOT FLUSHING\n" ); - D_WARN("no flush in dispatcher"); - return DR_OK; - } - - call_tls->bins[call_tls->bins_num - 1].flags &= ~(FCEF_FOLLOW | FCEF_QUEUE); - - while (ioctl( world->fusion_fd, FUSION_CALL_EXECUTE3, call_tls->bins )) { - switch (errno) { - case EINTR: - continue; - case EINVAL: - D_ERROR ("Fusion/Call: invalid call (id 0x%08x)\n", call_tls->bins[0].call_id); - ret = DR_INVARG; - break; - case EIDRM: - D_ERROR ("Fusion/Call: call got destroyed (id 0x%08x)\n", call_tls->bins[0].call_id); - ret = DR_DESTROYED; - break; - default: - break; - } - - D_PERROR ("FUSION_CALL_EXECUTE3 (num %d, len %d)", call_tls->bins_num, call_tls->bins_data_len ); - - ret = DR_FAILURE; - break; - } - - call_tls->bins_num = 0; - call_tls->bins_data_len = 0; - } - - return ret; + return flush_calls( world, lock, call_tls ); } DirectResult diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/lib/fusiondale/fusiondale_version.h new/DirectFB-1.7.7/lib/fusiondale/fusiondale_version.h --- old/DirectFB-1.7.6/lib/fusiondale/fusiondale_version.h 2014-08-14 09:22:23.000000000 +0200 +++ new/DirectFB-1.7.7/lib/fusiondale/fusiondale_version.h 2015-02-11 15:44:47.000000000 +0100 @@ -26,7 +26,7 @@ #define FUSIONDALE_MAJOR_VERSION (1) #define FUSIONDALE_MINOR_VERSION (7) -#define FUSIONDALE_MICRO_VERSION (6) +#define FUSIONDALE_MICRO_VERSION (7) #define FUSIONDALE_BINARY_AGE (0) #define FUSIONDALE_INTERFACE_AGE (0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/lib/fusionsound/fusionsound_version.h new/DirectFB-1.7.7/lib/fusionsound/fusionsound_version.h --- old/DirectFB-1.7.6/lib/fusionsound/fusionsound_version.h 2014-08-14 09:22:24.000000000 +0200 +++ new/DirectFB-1.7.7/lib/fusionsound/fusionsound_version.h 2015-02-11 15:44:47.000000000 +0100 @@ -30,7 +30,7 @@ #define FUSIONSOUND_MAJOR_VERSION (1) #define FUSIONSOUND_MINOR_VERSION (7) -#define FUSIONSOUND_MICRO_VERSION (6) +#define FUSIONSOUND_MICRO_VERSION (7) #define FUSIONSOUND_BINARY_AGE (0) #define FUSIONSOUND_INTERFACE_AGE (0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/lib/sawman/sawman_strings.h new/DirectFB-1.7.7/lib/sawman/sawman_strings.h --- old/DirectFB-1.7.6/lib/sawman/sawman_strings.h 2014-08-14 09:23:02.000000000 +0200 +++ new/DirectFB-1.7.7/lib/sawman/sawman_strings.h 2015-02-11 15:44:59.000000000 +0100 @@ -12,7 +12,7 @@ { SWMPF_MASTER, "MASTER" }, \ { SWMPF_MANAGER, "MANAGER" }, \ { SWMPF_EXITING, "EXITING" }, \ - { SWMPF_NONE, "NONE" } \ + { (SaWManProcessFlags) SWMPF_NONE, "NONE" } \ }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/core/CoreGraphicsStateClient.cpp new/DirectFB-1.7.7/src/core/CoreGraphicsStateClient.cpp --- old/DirectFB-1.7.6/src/core/CoreGraphicsStateClient.cpp 2014-08-14 09:04:51.000000000 +0200 +++ new/DirectFB-1.7.7/src/core/CoreGraphicsStateClient.cpp 2015-02-02 07:29:24.000000000 +0100 @@ -273,12 +273,14 @@ client( client ), last_cookie(0) { - dfb_graphics_state_attach( client->gfx_state, CoreGraphicsStateClient_Reaction, this, &gfx_reaction ); + if (client->gfx_state) + dfb_graphics_state_attach( client->gfx_state, CoreGraphicsStateClient_Reaction, this, &gfx_reaction ); } virtual ~CoreGraphicsStateClientPrivate() { - dfb_graphics_state_detach( client->gfx_state, &gfx_reaction ); + if (client->gfx_state) + dfb_graphics_state_detach( client->gfx_state, &gfx_reaction ); } void handleDone( u32 cookie ) @@ -328,6 +330,22 @@ } +static DFBResult +CoreGraphicsStateClient_init_state( CoreGraphicsStateClient *client ) +{ + DFBResult ret; + + if (!client->gfx_state) { + ret = ::CoreDFB_CreateState( client->core, &client->gfx_state ); + if (ret) + return ret; + + D_DEBUG_AT( Core_GraphicsStateClient, " -> gfxstate id 0x%x\n", client->gfx_state->object.ref.multi.id ); + } + + return DFB_OK; +} + DFBResult CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client, CardState *state ) @@ -347,19 +365,21 @@ client->requestor = NULL; client->throttle = NULL; - ret = CoreDFB_CreateState( state->core, &client->gfx_state ); - if (ret) - return ret; - - D_DEBUG_AT( Core_GraphicsStateClient, " -> gfxstate id 0x%x\n", client->gfx_state->object.ref.multi.id ); - if (dfb_config->task_manager) { if (dfb_config->call_nodirect) { if (direct_thread_get_tid( direct_thread_self() ) == fusion_dispatcher_tid(state->core->world)) { + ret = CoreGraphicsStateClient_init_state( client ); + if (ret) + return ret; + client->renderer = new DirectFB::Renderer( client->state, client->gfx_state ); } } else if (!fusion_config->secure_fusion || dfb_core_is_master( client->core )) { + ret = CoreGraphicsStateClient_init_state( client ); + if (ret) + return ret; + client->renderer = new DirectFB::Renderer( client->state, client->gfx_state ); client->throttle = new ThrottleBlocking( *client->renderer ); client->renderer->SetThrottle( client->throttle ); @@ -370,6 +390,10 @@ !(!dfb_config->call_nodirect && (dfb_core_is_master( client->core ) || !fusion_config->secure_fusion))) { + ret = CoreGraphicsStateClient_init_state( client ); + if (ret) + return ret; + client->requestor = new DirectFB::IGraphicsState_Requestor( core_dfb, client->gfx_state ); } @@ -388,7 +412,7 @@ void CoreGraphicsStateClient_Deinit( CoreGraphicsStateClient *client ) { - D_DEBUG_AT( Core_GraphicsStateClient, "%s( client %p, gfxstate id 0x%x )\n", __FUNCTION__, client, client->gfx_state->object.ref.multi.id ); + D_DEBUG_AT( Core_GraphicsStateClient, "%s( client %p, gfxstate id 0x%x )\n", __FUNCTION__, client, client->gfx_state ? client->gfx_state->object.ref.multi.id : 0 ); D_MAGIC_ASSERT( client, CoreGraphicsStateClient ); @@ -412,7 +436,8 @@ delete (CoreGraphicsStateClientPrivate *) client->priv; - dfb_graphics_state_unref( client->gfx_state ); + if (client->gfx_state) + dfb_graphics_state_unref( client->gfx_state ); client_list.RemoveClient( client ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/core/CoreSurface_real.cpp new/DirectFB-1.7.7/src/core/CoreSurface_real.cpp --- old/DirectFB-1.7.6/src/core/CoreSurface_real.cpp 2014-08-14 09:04:51.000000000 +0200 +++ new/DirectFB-1.7.7/src/core/CoreSurface_real.cpp 2015-02-01 20:36:12.000000000 +0100 @@ -161,14 +161,8 @@ CoreSurfaceAccessorID accessor, CoreSurfaceAccessFlags access ) { - int locks; - - locks = dfb_surface_allocation_locks( allocation ); - /* * Manage access interlocks. - * - * SOON FIXME: Clearing flags only when not locked yet. Otherwise nested GPU/CPU locks are a problem. */ /* Software read/write access... */ if (accessor != CSAID_GPU) { @@ -180,13 +174,11 @@ /* Software read access after hardware write requires flush of the (bus) read cache. */ dfb_gfxcard_flush_read_cache(); - if (!locks) { - /* ...clear hardware write access. */ - allocation->accessed[CSAID_GPU] = (CoreSurfaceAccessFlags)(allocation->accessed[CSAID_GPU] & ~CSAF_WRITE); + /* ...clear hardware write access. */ + allocation->accessed[CSAID_GPU] = (CoreSurfaceAccessFlags)(allocation->accessed[CSAID_GPU] & ~CSAF_WRITE); - /* ...clear hardware read access (to avoid syncing twice). */ - allocation->accessed[CSAID_GPU] = (CoreSurfaceAccessFlags)(allocation->accessed[CSAID_GPU] & ~CSAF_READ); - } + /* ...clear hardware read access (to avoid syncing twice). */ + allocation->accessed[CSAID_GPU] = (CoreSurfaceAccessFlags)(allocation->accessed[CSAID_GPU] & ~CSAF_READ); } /* Software write access... */ @@ -197,8 +189,7 @@ dfb_gfxcard_wait_serial( &allocation->gfx_serial ); /* ...clear hardware read access. */ - if (!locks) - allocation->accessed[CSAID_GPU] = (CoreSurfaceAccessFlags)(allocation->accessed[CSAID_GPU] & ~CSAF_READ); + allocation->accessed[CSAID_GPU] = (CoreSurfaceAccessFlags)(allocation->accessed[CSAID_GPU] & ~CSAF_READ); } } } @@ -218,8 +209,7 @@ dfb_gfxcard_flush_texture_cache(); /* ...clear software read and write access. */ - if (!locks) - allocation->accessed[CSAID_CPU] = (CoreSurfaceAccessFlags)(allocation->accessed[CSAID_CPU] & ~(CSAF_READ | CSAF_WRITE)); + allocation->accessed[CSAID_CPU] = (CoreSurfaceAccessFlags)(allocation->accessed[CSAID_CPU] & ~(CSAF_READ | CSAF_WRITE)); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/core/core_parts.c new/DirectFB-1.7.7/src/core/core_parts.c --- old/DirectFB-1.7.6/src/core/core_parts.c 2013-12-19 01:16:24.000000000 +0100 +++ new/DirectFB-1.7.7/src/core/core_parts.c 2015-02-09 18:16:46.000000000 +0100 @@ -73,6 +73,9 @@ if (core_part->size_shared) shared = SHCALLOC( pool, 1, core_part->size_shared ); + core_part->data_local = local; + core_part->data_shared = shared; + ret = core_part->Initialize( core, local, shared ); if (ret) { D_ERROR( "DirectFB/Core: Could not initialize '%s' core!\n" @@ -85,14 +88,15 @@ if (local) D_FREE( local ); + core_part->data_local = NULL; + core_part->data_shared = NULL; + return ret; } if (shared) core_arena_add_shared_field( core, core_part->name, shared ); - core_part->data_local = local; - core_part->data_shared = shared; core_part->initialized = true; return DFB_OK; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/core/core_strings.h new/DirectFB-1.7.7/src/core/core_strings.h --- old/DirectFB-1.7.6/src/core/core_strings.h 2014-08-14 09:23:01.000000000 +0200 +++ new/DirectFB-1.7.7/src/core/core_strings.h 2015-02-11 15:44:58.000000000 +0100 @@ -17,7 +17,7 @@ { CSTF_INTERNAL, "INTERNAL" }, \ { CSTF_EXTERNAL, "EXTERNAL" }, \ { CSTF_PREALLOCATED, "PREALLOCATED" }, \ - { CSTF_NONE, "NONE" } \ + { (CoreSurfaceTypeFlags) CSTF_NONE, "NONE" } \ }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/core/layer_context.c new/DirectFB-1.7.7/src/core/layer_context.c --- old/DirectFB-1.7.6/src/core/layer_context.c 2014-08-14 09:04:51.000000000 +0200 +++ new/DirectFB-1.7.7/src/core/layer_context.c 2015-02-01 20:36:12.000000000 +0100 @@ -1851,7 +1851,8 @@ /* Add available surface capabilities. */ caps |= config->surface_caps & (DSCAPS_INTERLACED | DSCAPS_SEPARATED | - DSCAPS_PREMULTIPLIED); + DSCAPS_PREMULTIPLIED | + DSCAPS_GL); scon.flags = CSCONF_SIZE | CSCONF_FORMAT | CSCONF_COLORSPACE | CSCONF_CAPS; scon.size.w = config->width; @@ -1929,7 +1930,7 @@ sconfig.flags = CSCONF_SIZE | CSCONF_FORMAT | CSCONF_COLORSPACE | CSCONF_CAPS; sconfig.caps = surface->config.caps & ~(DSCAPS_FLIPPING | DSCAPS_INTERLACED | - DSCAPS_SEPARATED | DSCAPS_PREMULTIPLIED | + DSCAPS_SEPARATED | DSCAPS_PREMULTIPLIED | DSCAPS_ROTATED | DSCAPS_STEREO); switch (config->buffermode) { @@ -1956,7 +1957,8 @@ /* Add available surface capabilities. */ sconfig.caps |= config->surface_caps & (DSCAPS_INTERLACED | DSCAPS_SEPARATED | - DSCAPS_PREMULTIPLIED); + DSCAPS_PREMULTIPLIED | + DSCAPS_GL); if (config->options & DLOP_DEINTERLACING) sconfig.caps |= DSCAPS_INTERLACED; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/core/surface_pool.c new/DirectFB-1.7.7/src/core/surface_pool.c --- old/DirectFB-1.7.6/src/core/surface_pool.c 2014-08-14 09:04:51.000000000 +0200 +++ new/DirectFB-1.7.7/src/core/surface_pool.c 2015-02-09 18:16:46.000000000 +0100 @@ -1184,7 +1184,9 @@ D_ASSERT( callback != NULL ); fusion_vector_foreach (allocation, i, pool->allocs) { - if (callback( allocation, ctx ) == DFENUM_CANCEL) + D_MAGIC_ASSERT( allocation, CoreSurfaceAllocation ); + + if (allocation->data && callback( allocation, ctx ) == DFENUM_CANCEL) break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/directfb.c new/DirectFB-1.7.7/src/directfb.c --- old/DirectFB-1.7.6/src/directfb.c 2014-07-15 08:54:58.000000000 +0200 +++ new/DirectFB-1.7.7/src/directfb.c 2015-02-01 20:36:12.000000000 +0100 @@ -1,6 +1,6 @@ /* - (c) Copyright 2012-2013 DirectFB integrated media GmbH - (c) Copyright 2001-2013 The world wide DirectFB Open Source Community (directfb.org) + (c) Copyright 2012-2015 DirectFB integrated media GmbH + (c) Copyright 2001-2015 The world wide DirectFB Open Source Community (directfb.org) (c) Copyright 2000-2004 Convergence (integrated media) GmbH All rights reserved. @@ -203,9 +203,9 @@ if ( !(direct_config->quiet & DMT_BANNER) && dfb_config->banner) { direct_log_printf( NULL, "\n" - " ~~~~~~~~~~~~~~~~~~~~~~~~~~| DirectFB " DIRECTFB_VERSION DIRECTFB_VERSION_VENDOR " |~~~~~~~~~~~~~~~~~~~~~~~~~~\n" - " (c) 2012-2013 DirectFB integrated media GmbH\n" - " (c) 2001-2013 The world wide DirectFB Open Source Community\n" + " ~~~~~~~~~~~~~~~~~~~~~~~~~| DirectFB " DIRECTFB_VERSION DIRECTFB_VERSION_VENDOR " |~~~~~~~~~~~~~~~~~~~~~~~~~~\n" + " (c) 2012-2015 DirectFB integrated media GmbH\n" + " (c) 2001-2015 The world wide DirectFB Open Source Community\n" " (c) 2000-2004 Convergence (integrated media) GmbH\n" " ----------------------------------------------------------------\n" "\n" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/display/idirectfbsurface.c new/DirectFB-1.7.7/src/display/idirectfbsurface.c --- old/DirectFB-1.7.6/src/display/idirectfbsurface.c 2014-08-14 09:04:51.000000000 +0200 +++ new/DirectFB-1.7.7/src/display/idirectfbsurface.c 2015-02-01 20:45:25.000000000 +0100 @@ -155,6 +155,8 @@ D_ASSERT( data != NULL ); D_ASSERT( data->children_data == NULL ); + D_DEBUG_AT( Surface, " -> flushing graphics state...\n" ); + if (data->memory_permissions_count) { // FIXME: currently just enough for df_dok CoreGraphicsStateClient_FlushCurrent( 1 ); @@ -166,8 +168,11 @@ else CoreGraphicsStateClient_FlushCurrent( 0 ); - if (data->surface_client) + if (data->surface_client) { + D_DEBUG_AT( Surface, " -> releasing surface client...\n" ); + dfb_surface_client_unref( data->surface_client ); + } parent = data->parent; if (parent) { @@ -199,12 +204,20 @@ dfb_state_destroy( &data->state ); - if (data->font) + if (data->font) { + D_DEBUG_AT( Surface, " -> releasing font...\n" ); + data->font->Release( data->font ); + } if (data->surface) { - if (data->locked) + if (data->locked) { + D_DEBUG_AT( Surface, " -> unlocking buffer...\n" ); + dfb_surface_unlock_buffer( data->surface, &data->lock ); + } + + D_DEBUG_AT( Surface, " -> releasing surface...\n" ); dfb_surface_unref( data->surface ); } @@ -218,8 +231,13 @@ DIRECT_DEALLOCATE_INTERFACE( thiz ); - if (parent) + if (parent) { + D_DEBUG_AT( Surface, " -> releasing parent...\n" ); + parent->Release( parent ); + } + + D_DEBUG_AT( Surface, " -> done.\n" ); } static DirectResult @@ -2556,6 +2574,8 @@ return ret; } + D_ASSERT( num <= bytes ); + /* Calculate string width. */ for (i=0; i<num; i++) { unsigned int current = indices[i]; @@ -3643,6 +3663,8 @@ data->src_eye = DSSE_LEFT; + D_DEBUG_AT( Surface, " -> initializing CoreGraphicsStateClient...\n" ); + ret = CoreGraphicsStateClient_Init( &data->state_client, &data->state ); if (ret) return ret; // FIXME: deinit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/gfx/generic/generic_blit.c new/DirectFB-1.7.7/src/gfx/generic/generic_blit.c --- old/DirectFB-1.7.6/src/gfx/generic/generic_blit.c 2013-12-19 01:16:24.000000000 +0100 +++ new/DirectFB-1.7.7/src/gfx/generic/generic_blit.c 2015-02-11 14:32:14.000000000 +0100 @@ -141,13 +141,17 @@ gfxs->Astep = gfxs->Bstep = 1; - int mask_x = 0; - int mask_y = 0; + int mask_x = rect->x; + int mask_y = rect->y; int mask_h = gfxs->mask_height; - if ((state->blittingflags & (DSBLIT_SRC_MASK_ALPHA | DSBLIT_SRC_MASK_COLOR)) && (state->src_mask_flags & DSMF_STENCIL)) { - mask_x = state->src_mask_offset.x; - mask_y = state->src_mask_offset.y; + if (state->blittingflags & (DSBLIT_SRC_MASK_ALPHA | DSBLIT_SRC_MASK_COLOR)) { + if (state->src_mask_flags & DSMF_STENCIL) { + mask_x = 0; + mask_y = 0; + } + mask_x += state->src_mask_offset.x; + mask_y += state->src_mask_offset.y; } if (rotflip_blittingflags == (DSBLIT_FLIP_HORIZONTAL | DSBLIT_FLIP_VERTICAL)) { // 180 deg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/media/idirectfbfont.c new/DirectFB-1.7.7/src/media/idirectfbfont.c --- old/DirectFB-1.7.6/src/media/idirectfbfont.c 2013-12-19 01:16:24.000000000 +0100 +++ new/DirectFB-1.7.7/src/media/idirectfbfont.c 2015-02-01 20:45:08.000000000 +0100 @@ -316,6 +316,8 @@ return ret; } + D_ASSERT( num <= bytes ); + for (i=0; i<num; i++) { unsigned int current = indices[i]; CoreGlyphData *glyph; @@ -428,6 +430,8 @@ return ret; } + D_ASSERT( num <= bytes ); + /* Calculate string width. */ for (i=0; i<num; i++) { unsigned int current = indices[i]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/src/misc/conf.c new/DirectFB-1.7.7/src/misc/conf.c --- old/DirectFB-1.7.6/src/misc/conf.c 2014-08-14 09:04:51.000000000 +0200 +++ new/DirectFB-1.7.7/src/misc/conf.c 2015-02-01 20:46:09.000000000 +0100 @@ -1255,7 +1255,7 @@ return DFB_INVARG; } - if (id < 0 || id > D_ARRAY_SIZE(dfb_config->layers)) { + if (id < 0 || id >= D_ARRAY_SIZE(dfb_config->layers)) { D_ERROR("DirectFB/Config '%s': ID %d out of bounds!\n", name, id); return DFB_INVARG; } @@ -2455,7 +2455,7 @@ DFBResult dfb_config_read( const char *filename ) { DFBResult ret = DFB_OK; - char line[400]; + char line[400+1]; FILE *f; char *slash = 0; @@ -2491,7 +2491,7 @@ } /* must copy filename for path, due to const'ness */ - char nwd[strlen(filename)]; + char nwd[strlen(filename)+1]; strcpy( nwd, filename ); nwd[slash-filename] = 0; if (chdir( nwd )) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/systems/fbdev/fbdev.c new/DirectFB-1.7.7/systems/fbdev/fbdev.c --- old/DirectFB-1.7.6/systems/fbdev/fbdev.c 2013-12-19 01:16:24.000000000 +0100 +++ new/DirectFB-1.7.7/systems/fbdev/fbdev.c 2015-02-01 20:42:59.000000000 +0100 @@ -330,7 +330,7 @@ static void dfb_fbdev_get_pci_info( FBDevShared *shared ) { - char buf[512]; + char buf[512+1]; int vendor = -1; int model = -1; FILE *fp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/systems/x11/primary.c new/DirectFB-1.7.7/systems/x11/primary.c --- old/DirectFB-1.7.6/systems/x11/primary.c 2014-08-14 09:04:51.000000000 +0200 +++ new/DirectFB-1.7.7/systems/x11/primary.c 2015-02-09 18:16:46.000000000 +0100 @@ -764,8 +764,8 @@ update_screen( DFBX11 *x11, const DFBRectangle *clip, CoreSurfaceBufferLock *lock, XWindow *xw ) { void *dst; - u8 *srces[3]; - int pitches[3]; + u8 *srces[3] = { 0 }; + int pitches[3] = { 0 }; unsigned int offset = 0; XImage *ximage; CoreSurfaceAllocation *allocation; @@ -874,7 +874,7 @@ dst = xw->virtualscreen + rect.x * xw->bpp + (rect.y + offset) * ximage->bytes_per_line; - dfb_surface_get_data_offsets( allocation->surface, lock->addr, lock->pitch, rect.x, rect.y, + dfb_surface_get_data_offsets( &allocation->config, lock->addr, lock->pitch, rect.x, rect.y, 3, srces, pitches ); switch (xw->depth) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/DirectFB-1.7.6/tools/mknames.sh new/DirectFB-1.7.7/tools/mknames.sh --- old/DirectFB-1.7.6/tools/mknames.sh 2013-07-17 04:49:59.000000000 +0200 +++ new/DirectFB-1.7.7/tools/mknames.sh 2015-02-09 18:16:46.000000000 +0100 @@ -28,6 +28,6 @@ egrep "^ +${PREFIX}_[0-9A-Za-z_]+[ ,]" $HEADER | grep -v ${PREFIX}_${NULL} | perl -p -e "s/^\\s*(${PREFIX}_)([\\w_]+)[ ,].*/ \\{ \\1\\2, \\\"\\2\\\" \\}, \\\\/" cat << EOF - { ${PREFIX}_${NULL}, "${NULL}" } \\ + { ($ENUM) ${PREFIX}_${NULL}, "${NULL}" } \\ }; EOF ++++++ DirectFB-CVE-2014-2977.patch ++++++ Index: proxy/dispatcher/idirectfbsurface_dispatcher.c =================================================================== --- proxy/dispatcher/idirectfbsurface_dispatcher.c.orig 2014-03-22 21:05:18.000000000 +0100 +++ proxy/dispatcher/idirectfbsurface_dispatcher.c 2015-03-23 13:07:30.840507533 +0100 @@ -1729,6 +1729,9 @@ VOODOO_PARSER_GET_INT( parser, pitch ); VOODOO_PARSER_END( parser ); + /* CVE-2014-2977 */ + DFB_RECTANGLE_ASSERT_IF( rect ); + if (encoded) { switch (encoded) { case 2: { ++++++ DirectFB-CVE-2014-2978.patch ++++++ Index: proxy/dispatcher/idirectfbsurface_dispatcher.c =================================================================== --- proxy/dispatcher/idirectfbsurface_dispatcher.c.orig 2014-03-22 21:05:18.000000000 +0100 +++ proxy/dispatcher/idirectfbsurface_dispatcher.c 2015-03-23 15:03:28.650053384 +0100 @@ -1629,6 +1629,11 @@ dst[out++] = RLE16_KEY; } else { + /* CVE-2014-2978 */ + if (count > num - out ) { + break; + } + last = src[n++]; while (count >= 4) { @@ -1679,6 +1684,11 @@ dst[out++] = RLE32_KEY; } else { + /* CVE-2014-2978 */ + if (count > num - out ) { + break; + } + last = src[n++]; while (count >= 4) {

1 0