Architecture specific change in rpms/golang-github-hashicorp-net-rpc-msgpackrpc.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-hashicorp-net-rpc-msgpackrpc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-hashicorp-net-rpc-m....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit f0c5a5f070d8fe25e839d78d1602da1021a997c0
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 20:06:24 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-net-rpc-msgpackrpc.spec b/golang-github-hashicorp-net-rpc-msgpackrpc.spec
index c3ec3fa..8ef2b64 100644
--- a/golang-github-hashicorp-net-rpc-msgpackrpc.spec
+++ b/golang-github-hashicorp-net-rpc-msgpackrpc.spec
@@ -1,167 +1,56 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo net-rpc-msgpackrpc
-# https://github.com/hashicorp/net-rpc-msgpackrpc
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/net-rpc-msgpackrpc
+%global provider_prefix github.com/hashicorp/net-rpc-msgpackrpc
+%global gobaseipath %{provider_prefix}
%global commit a14192a58a694c123d8fe5481d4a4727d6ae82f3
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20151116
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.12.git%{shortcommit}%{?dist}
+Release: 0.13.%{commitdate}git%{shortcommit}%{?dist}
Summary: Library for creating Go RPC client/server
License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
BuildRequires: golang(github.com/hashicorp/go-msgpack/codec)
BuildRequires: golang(github.com/hashicorp/go-multierror)
-%endif
-
-Requires: golang(github.com/hashicorp/go-msgpack/codec)
-Requires: golang(github.com/hashicorp/go-multierror)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-# Fails in koji
-# cannot find package "github.com/hashicorp/go-multierror" in any of:
-# /usr/lib/golang/src/github.com/hashicorp/go-multierror (from $GOROOT)
-# /builddir/build/BUILDROOT/golang-github-hashicorp-net-rpc-
-# msgpackrpc-0-0.4.gita14192a.fc24.i386/usr/share/gocode/src/
-# github.com/hashicorp/go-multierror (from $GOPATH)
-# /usr/share/gocode/src/github.com/hashicorp/go-multierror
-%gotest %{import_path}
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE.md
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE.md
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.13.20151116gita14192a
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.12.gita14192a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -203,4 +92,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
- First package for Fedora
resolves: #1212075
-
6 years, 1 month
Architecture specific change in rpms/golang-github-hashicorp-logutils.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-hashicorp-logutils.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-hashicorp-logutils.....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit cbeadc50cce6388554d599ee85ece4f7d8b5a257
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 18:19:57 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-logutils.spec b/golang-github-hashicorp-logutils.spec
index 2823466..2c73d41 100644
--- a/golang-github-hashicorp-logutils.spec
+++ b/golang-github-hashicorp-logutils.spec
@@ -1,155 +1,53 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo logutils
-# https://github.com/hashicorp/logutils
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/logutils
+%global provider_prefix github.com/hashicorp/logutils
+%global gobaseipath %{provider_prefix}
%global commit 0dc08b1671f34c4250ce212759ebd880f743d883
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150609
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.11.git%{shortcommit}%{?dist}
+Release: 0.12.%{commitdate}git%{shortcommit}%{?dist}
Summary: Utilities for slightly better logging in Go
License: MPLv2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-%endif
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.12.20150609git0dc08b1
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.11.git0dc08b1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
Architecture specific change in rpms/golang-github-hashicorp-hil.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-hashicorp-hil.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-hashicorp-hil.git/c....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 1dd6c3f7a1c981e59b45c009e7e834e979a45f04
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 18:18:50 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-hil.spec b/golang-github-hashicorp-hil.spec
index 7c8f337..5fa7ee2 100644
--- a/golang-github-hashicorp-hil.spec
+++ b/golang-github-hashicorp-hil.spec
@@ -1,195 +1,58 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%if 0%{?rhel} == 6
-%global with_unit_test 0
-%else
-%global with_unit_test 1
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo hil
-# https://github.com/hashicorp/hil
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/hil
+%global provider_prefix github.com/hashicorp/hil
+%global gobaseipath %{provider_prefix}
%global commit 1e86c6b523c55d1fa6c6e930ce80b548664c95c2
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20160712
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.4.git%{shortcommit}%{?dist}
+Release: 0.5.%{commitdate}git%{shortcommit}%{?dist}
Summary: HIL is a small embedded language for string interpolations
# Detected licences
# - *No copyright* MPL (v2.0) at 'LICENSE'
License: MPLv2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires: golang(github.com/mitchellh/mapstructure)
BuildRequires: golang(github.com/mitchellh/reflectwalk)
-%endif
-
-Requires: golang(github.com/mitchellh/mapstructure)
-Requires: golang(github.com/mitchellh/reflectwalk)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/ast) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
-%build
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%gotest %{import_path}/ast
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.5.20160712git1e86c6b
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.4.git1e86c6b
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
Architecture specific change in rpms/golang-github-hashicorp-consul-migrate.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-hashicorp-consul-migrate.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-hashicorp-consul-mi....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit 46ce1d19db167b8d3554c8486af6055edbd62e35
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 17:26:50 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-consul-migrate.spec b/golang-github-hashicorp-consul-migrate.spec
index 98c584a..c8ab137 100644
--- a/golang-github-hashicorp-consul-migrate.spec
+++ b/golang-github-hashicorp-consul-migrate.spec
@@ -1,172 +1,57 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-%global with_check 1
-%global with_unit_test 1
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo consul-migrate
-# https://github.com/hashicorp/consul-migrate
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/consul-migrate
+%global provider_prefix github.com/hashicorp/consul-migrate
+%global gobaseipath %{provider_prefix}
%global commit 4977886fc950a0db1a6f0bbadca56dfabf170f9c
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20150411
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.10.git%{shortcommit}%{?dist}
+Release: 0.11.%{commitdate}git%{shortcommit}%{?dist}
Summary: Consul server data migrator
License: MPLv2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
BuildRequires: golang(github.com/hashicorp/raft)
BuildRequires: golang(github.com/hashicorp/raft-boltdb)
BuildRequires: golang(github.com/hashicorp/raft-mdb)
-%endif
-
-Requires: golang(github.com/hashicorp/raft)
-Requires: golang(github.com/hashicorp/raft-boltdb)
-Requires: golang(github.com/hashicorp/raft-mdb)
-
-Provides: golang(%{import_path}/migrator) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/migrator/test-fixtures/raft/mdb/
-echo "%%dir %%{gopath}/src/%%{import_path}/./migrator" >> devel.file-list
-echo "%%dir %%{gopath}/src/%%{import_path}/./migrator/test-fixtures" >> devel.file-list
-echo "%%dir %%{gopath}/src/%%{import_path}/./migrator/test-fixtures/raft/" >> devel.file-list
-echo "%%dir %%{gopath}/src/%%{import_path}/./migrator/test-fixtures/raft/mdb" >> devel.file-list
-cp -pav './migrator/test-fixtures/raft/mdb/data.mdb' %{buildroot}/%{gopath}/src/%{import_path}/migrator/test-fixtures/raft/mdb/data.mdb
-echo "%%{gopath}/src/%%{import_path}/migrator/test-fixtures/raft/mdb/data.mdb" >> unit-test.file-list
-cp -pav './migrator/test-fixtures/raft/mdb/lock.mdb' %{buildroot}/%{gopath}/src/%{import_path}/migrator/test-fixtures/raft/mdb/lock.mdb
-echo "%%{gopath}/src/%%{import_path}/migrator/test-fixtures/raft/mdb/lock.mdb" >> unit-test.file-list
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall ./migrator
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-#%gotest %{import_path}/migrator
-%endif
+%gochecks %{gobaseipath}/migrator
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.11.20150411git4977886
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.10.git4977886
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
Architecture specific change in rpms/golang-github-hashicorp-go-uuid.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-hashicorp-go-uuid.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-hashicorp-go-uuid.g....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 03c51609dcf972fba35fd6d1738b960d2774ca93
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 18:15:13 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-go-uuid.spec b/golang-github-hashicorp-go-uuid.spec
index 37d029b..4084bda 100644
--- a/golang-github-hashicorp-go-uuid.spec
+++ b/golang-github-hashicorp-go-uuid.spec
@@ -1,185 +1,55 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo go-uuid
-# https://github.com/hashicorp/go-uuid
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/go-uuid
+%global provider_prefix github.com/hashicorp/go-uuid
+%global gobaseipath %{provider_prefix}
%global commit 64130c7a86d732268a38cb04cfbaf0cc987fda98
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20160717
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.4.git%{shortcommit}%{?dist}
+Release: 0.5.%{commitdate}git%{shortcommit}%{?dist}
Summary: Generates UUID-format strings using purely high quality random bytes
# Detected licences
# - *No copyright* MPL (v2.0) at 'LICENSE'
License: MPLv2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-%endif
-
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
-%build
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-# No dependency directories so far
-
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.5.20160717git64130c7
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.4.git64130c7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
Architecture specific change in rpms/pulseaudio.git
by githook-noreply@fedoraproject.org
The package rpms/pulseaudio.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pulseaudio.git/commit/?id=2d6ef54...
https://src.fedoraproject.org/cgit/rpms/pulseaudio.git/commit/?id=29fc384....
Change:
+%ifarch %{ix86}
+%ifarch %{ix86} s390x
Thanks.
Full change:
============
commit 72f9563c667db38a55c800ff301506c8885baf59
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Feb 28 11:25:07 2018 -0600
Release++
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 251b2a7..6f68df3 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -31,7 +31,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 12%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 13%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -667,11 +667,13 @@ exit 0
%changelog
-* Wed Feb 28 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-12
-- BR: gcc-c++
+* Wed Feb 28 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-13
- use %%license, %%ldconfig_scriptlets
- use better upstream patch for exit-idle-time
+* Sun Feb 25 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-12
+- BR: gcc-c++
+
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 11.1-11
- Escape macros in %%changelog
commit 79fe25c1db2f39df245c2e4e08718acaed86bc3e
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Wed Feb 28 11:23:29 2018 -0600
use better upstream patch for exit-idle-time
use %%license, %%ldconfig_scriptlets
diff --git a/pulseaudio-11.1-exit_idle_time-2.patch b/pulseaudio-11.1-exit_idle_time-2.patch
new file mode 100644
index 0000000..e648398
--- /dev/null
+++ b/pulseaudio-11.1-exit_idle_time-2.patch
@@ -0,0 +1,102 @@
+diff -up pulseaudio-11.1/src/modules/module-console-kit.c.foo pulseaudio-11.1/src/modules/module-console-kit.c
+--- pulseaudio-11.1/src/modules/module-console-kit.c.foo 2016-08-23 07:50:10.000000000 -0500
++++ pulseaudio-11.1/src/modules/module-console-kit.c 2018-02-28 11:01:50.138465311 -0600
+@@ -120,6 +120,19 @@ static void add_session(struct userdata
+
+ pa_log_debug("Added new session %s", id);
+
++ /* Positive exit_idle_time is only useful when we have no session tracking
++ * capability, so we can set it to 0 now that we have detected a session.
++ * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
++ * immediately when the session ends. That in turn is useful, because some
++ * systems (those that use pam_systemd but don't use systemd for managing
++ * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
++ * services that depend on the files in $XDG_RUNTIME_DIR. The directory
++ * contains our sockets, and if the sockets are removed without terminating
++ * pulseaudio, a quick relogin will likely cause trouble, because a new
++ * instance will be spawned while the old instance is still running. */
++ if (u->core->exit_idle_time > 0)
++ pa_core_set_exit_idle_time(u->core, 0);
++
+ fail:
+
+ if (m)
+diff -up pulseaudio-11.1/src/modules/module-systemd-login.c.foo pulseaudio-11.1/src/modules/module-systemd-login.c
+--- pulseaudio-11.1/src/modules/module-systemd-login.c.foo 2018-02-28 11:01:50.138465311 -0600
++++ pulseaudio-11.1/src/modules/module-systemd-login.c 2018-02-28 11:03:06.053396460 -0600
+@@ -86,6 +86,20 @@ static int add_session(struct userdata *
+ pa_hashmap_put(u->sessions, session->id, session);
+
+ pa_log_debug("Added new session %s", id);
++
++ /* Positive exit_idle_time is only useful when we have no session tracking
++ * capability, so we can set it to 0 now that we have detected a session.
++ * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
++ * immediately when the session ends. That in turn is useful, because some
++ * systems (those that use pam_systemd but don't use systemd for managing
++ * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
++ * services that depend on the files in $XDG_RUNTIME_DIR. The directory
++ * contains our sockets, and if the sockets are removed without terminating
++ * pulseaudio, a quick relogin will likely cause trouble, because a new
++ * instance will be spawned while the old instance is still running. */
++ if (u->core->exit_idle_time > 0)
++ pa_core_set_exit_idle_time(u->core, 0);
++
+ return 0;
+ }
+
+diff -up pulseaudio-11.1/src/modules/x11/module-x11-xsmp.c.foo pulseaudio-11.1/src/modules/x11/module-x11-xsmp.c
+--- pulseaudio-11.1/src/modules/x11/module-x11-xsmp.c.foo 2016-08-23 07:50:10.000000000 -0500
++++ pulseaudio-11.1/src/modules/x11/module-x11-xsmp.c 2018-02-28 11:01:50.138465311 -0600
+@@ -208,6 +208,19 @@ int pa__init(pa_module*m) {
+ if (!u->client)
+ goto fail;
+
++ /* Positive exit_idle_time is only useful when we have no session tracking
++ * capability, so we can set it to 0 now that we have detected a session.
++ * The benefit of setting exit_idle_time to 0 is that pulseaudio will exit
++ * immediately when the session ends. That in turn is useful, because some
++ * systems (those that use pam_systemd but don't use systemd for managing
++ * pulseaudio) clean $XDG_RUNTIME_DIR on logout, but fail to terminate all
++ * services that depend on the files in $XDG_RUNTIME_DIR. The directory
++ * contains our sockets, and if the sockets are removed without terminating
++ * pulseaudio, a quick relogin will likely cause trouble, because a new
++ * instance will be spawned while the old instance is still running. */
++ if (u->core->exit_idle_time > 0)
++ pa_core_set_exit_idle_time(u->core, 0);
++
+ pa_modargs_free(ma);
+
+ return 0;
+diff -up pulseaudio-11.1/src/pulsecore/core.c.foo pulseaudio-11.1/src/pulsecore/core.c
+--- pulseaudio-11.1/src/pulsecore/core.c.foo 2018-02-28 11:01:50.137465298 -0600
++++ pulseaudio-11.1/src/pulsecore/core.c 2018-02-28 11:01:50.139465323 -0600
+@@ -426,6 +426,16 @@ void pa_core_update_default_source(pa_co
+ pa_hook_fire(&core->hooks[PA_CORE_HOOK_DEFAULT_SOURCE_CHANGED], core->default_source);
+ }
+
++void pa_core_set_exit_idle_time(pa_core *core, int time) {
++ pa_assert(core);
++
++ if (time == core->exit_idle_time)
++ return;
++
++ pa_log_info("exit_idle_time: %i -> %i", core->exit_idle_time, time);
++ core->exit_idle_time = time;
++}
++
+ static void exit_callback(pa_mainloop_api *m, pa_time_event *e, const struct timeval *t, void *userdata) {
+ pa_core *c = userdata;
+ pa_assert(c->exit_event == e);
+diff -up pulseaudio-11.1/src/pulsecore/core.h.foo pulseaudio-11.1/src/pulsecore/core.h
+--- pulseaudio-11.1/src/pulsecore/core.h.foo 2018-02-28 11:01:50.120465090 -0600
++++ pulseaudio-11.1/src/pulsecore/core.h 2018-02-28 11:01:50.139465323 -0600
+@@ -255,6 +255,8 @@ void pa_core_set_configured_default_sour
+ void pa_core_update_default_sink(pa_core *core);
+ void pa_core_update_default_source(pa_core *core);
+
++void pa_core_set_exit_idle_time(pa_core *core, int time);
++
+ /* Check whether no one is connected to this core */
+ void pa_core_check_idle(pa_core *c);
+
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 568117a..251b2a7 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -59,9 +59,8 @@ Patch202: pulseaudio-9.0-disable_flat_volumes.patch
# see also https://bugs.freedesktop.org/show_bug.cgi?id=96638
Patch203: pulseaudio-8.99.2-getaffinity.patch
-# reduce exit-idle-time 20 -> 4
-# to mitigate http://bugzilla.redhat.com/1510301
-Patch204: pulseaudio-11.1-exit_idle_time.patch
+# upstreamed exit_idle_time solution, set to 0 in managed environments
+Patch204: pulseaudio-11.1-exit_idle_time-2.patch
# workaround rawhide build failures, avoid dup'd memfd_create declaration
# https://bugs.freedesktop.org/show_bug.cgi?id=104733
@@ -429,8 +428,7 @@ if ! getent passwd pulse >/dev/null ; then
fi
exit 0
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%posttrans
# handle renamed module-cork-music-on-phone => module-role-cork
@@ -440,7 +438,8 @@ exit 0
) ||:
%files
-%doc README LICENSE GPL LGPL
+%doc README
+%license LICENSE GPL LGPL
%config(noreplace) %{_sysconfdir}/pulse/daemon.conf
%config(noreplace) %{_sysconfdir}/pulse/default.pa
%config(noreplace) %{_sysconfdir}/pulse/system.pa
@@ -668,8 +667,10 @@ exit 0
%changelog
-* Sun Feb 25 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-12
+* Wed Feb 28 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-12
- BR: gcc-c++
+- use %%license, %%ldconfig_scriptlets
+- use better upstream patch for exit-idle-time
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 11.1-11
- Escape macros in %%changelog
commit f9e5f72e458634b91e1b5dc6f34377fa406e2ba5
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Sun Feb 25 13:40:51 2018 -0600
BR: gcc-c++
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 23e2590..568117a 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -31,7 +31,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 11%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 12%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -96,6 +96,7 @@ Patch104: v5-4-4-bluetooth-make-native-the-default-backend.patch
Patch106: Fix-realtime-scheduling-on-byt-cht.patch
BuildRequires: automake libtool
+BuildRequires: gcc-c++
BuildRequires: pkgconfig(bash-completion)
%global bash_completionsdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo '/etc/bash_completion.d')
BuildRequires: m4
@@ -667,6 +668,9 @@ exit 0
%changelog
+* Sun Feb 25 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-12
+- BR: gcc-c++
+
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 11.1-11
- Escape macros in %%changelog
commit f61f58a94502c09f12f396369f5bf66b3aeb9af9
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Fri Feb 9 09:05:35 2018 +0100
Escape macros in %changelog
Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/pulseaudio.spec b/pulseaudio.spec
index fa2e326..23e2590 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -31,7 +31,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 10%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 11%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -667,6 +667,9 @@ exit 0
%changelog
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 11.1-11
+- Escape macros in %%changelog
+
* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 11.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -909,7 +912,7 @@ exit 0
- 4.99.3
* Mon Jan 27 2014 Wim Taymans <wtaymans(a)redhat.com> - 4.99.2-2
-- don't mark .desktop and dbus configurations as %config
+- don't mark .desktop and dbus configurations as %%config
* Fri Jan 24 2014 Rex Dieter <rdieter(a)fedoraproject.org> - 4.99.2-1
- 4.99.2 (#1057528)
commit 6cee3ed5065161d5f09ecd8ce9b6654b483f9841
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 9 05:58:12 2018 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 012091f..fa2e326 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -31,7 +31,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 9%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 10%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -667,6 +667,9 @@ exit 0
%changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 11.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
* Thu Feb 01 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-9
- backport upstream fixes: memfd, qpape PyQt5 port
commit 8b607fa6eed0c3d5a89bc9565810cc42bd1beb05
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Feb 1 08:39:54 2018 -0600
missed one patch in prior commit
diff --git a/0106-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch b/0106-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch
new file mode 100644
index 0000000..f3d3b61
--- /dev/null
+++ b/0106-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch
@@ -0,0 +1,63 @@
+From dfb0460fb4743aec047cdf755a660a9ac2d0f3fb Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk(a)iki.fi>
+Date: Wed, 24 Jan 2018 03:51:49 +0200
+Subject: [PATCH 106/106] memfd-wrappers: only define memfd_create() if not
+ already defined
+
+glibc 2.27 is to be released soon, and it will provide memfd_create().
+If glibc provides the function, we must not define it ourselves,
+otherwise building fails due to conflict between the two implementations
+of the same function.
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=104733
+---
+ configure.ac | 3 +++
+ src/pulsecore/memfd-wrappers.h | 7 ++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0084c86e..0eb44b08 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -610,6 +610,9 @@ AS_IF([test "x$enable_memfd" = "xyes" && test "x$HAVE_MEMFD" = "x0"],
+ [AC_MSG_ERROR([*** Your Linux kernel does not support memfd shared memory.
+ *** Use linux v3.17 or higher for such a feature.])])
+
++AS_IF([test "x$HAVE_MEMFD" = "x1"],
++ AC_CHECK_FUNCS([memfd_create]))
++
+ AC_SUBST(HAVE_MEMFD)
+ AM_CONDITIONAL([HAVE_MEMFD], [test "x$HAVE_MEMFD" = x1])
+ AS_IF([test "x$HAVE_MEMFD" = "x1"], AC_DEFINE([HAVE_MEMFD], 1, [Have memfd shared memory.]))
+diff --git a/src/pulsecore/memfd-wrappers.h b/src/pulsecore/memfd-wrappers.h
+index 3bed9b2b..c7aadfd3 100644
+--- a/src/pulsecore/memfd-wrappers.h
++++ b/src/pulsecore/memfd-wrappers.h
+@@ -20,13 +20,14 @@
+ License along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+ ***/
+
+-#ifdef HAVE_MEMFD
++#if defined(HAVE_MEMFD) && !defined(HAVE_MEMFD_CREATE)
+
+ #include <sys/syscall.h>
+ #include <fcntl.h>
+
+ /*
+- * No glibc wrappers exist for memfd_create(2), so provide our own.
++ * Before glibc version 2.27 there was no wrapper for memfd_create(2),
++ * so we have to provide our own.
+ *
+ * Also define memfd fcntl sealing macros. While they are already
+ * defined in the kernel header file <linux/fcntl.h>, that file as
+@@ -63,6 +64,6 @@ static inline int memfd_create(const char *name, unsigned int flags) {
+ #define F_SEAL_WRITE 0x0008 /* prevent writes */
+ #endif
+
+-#endif /* HAVE_MEMFD */
++#endif /* HAVE_MEMFD && !HAVE_MEMFD_CREATE */
+
+ #endif
+--
+2.14.3
+
commit abb44473366db8e37108eef119e7458d4a4dfc15
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Feb 1 08:39:34 2018 -0600
backport upstream fixes: memfd, qpape PyQt5 port
diff --git a/0033-qpaeq-change-license-from-AGPL-to-LGPL-v2.1.patch b/0033-qpaeq-change-license-from-AGPL-to-LGPL-v2.1.patch
new file mode 100644
index 0000000..5e4b46e
--- /dev/null
+++ b/0033-qpaeq-change-license-from-AGPL-to-LGPL-v2.1.patch
@@ -0,0 +1,740 @@
+From 61217528a1cb5043ca3fa1051a73ad3268cfb3d8 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk(a)iki.fi>
+Date: Tue, 19 Sep 2017 17:25:47 +0300
+Subject: [PATCH 033/106] qpaeq: change license from AGPL to LGPL v2.1
+
+This removes one unnecessary exception in the PulseAudio licensing
+terms. In December 2016 I asked permission from all qpaeq contributors
+for the license change, and all gave the permission. I have archived the
+emails here:
+https://www.freedesktop.org/software/pulseaudio/misc/qpaeq_relicensing_emails.txt
+---
+ AGPL | 661 --------------------------------------------------------
+ LICENSE | 4 -
+ Makefile.am | 1 -
+ src/utils/qpaeq | 8 +-
+ 4 files changed, 4 insertions(+), 670 deletions(-)
+ delete mode 100644 AGPL
+
+diff --git a/AGPL b/AGPL
+deleted file mode 100644
+index dba13ed2..00000000
+--- a/AGPL
++++ /dev/null
+@@ -1,661 +0,0 @@
+- GNU AFFERO GENERAL PUBLIC LICENSE
+- Version 3, 19 November 2007
+-
+- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+- Everyone is permitted to copy and distribute verbatim copies
+- of this license document, but changing it is not allowed.
+-
+- Preamble
+-
+- The GNU Affero General Public License is a free, copyleft license for
+-software and other kinds of works, specifically designed to ensure
+-cooperation with the community in the case of network server software.
+-
+- The licenses for most software and other practical works are designed
+-to take away your freedom to share and change the works. By contrast,
+-our General Public Licenses are intended to guarantee your freedom to
+-share and change all versions of a program--to make sure it remains free
+-software for all its users.
+-
+- When we speak of free software, we are referring to freedom, not
+-price. Our General Public Licenses are designed to make sure that you
+-have the freedom to distribute copies of free software (and charge for
+-them if you wish), that you receive source code or can get it if you
+-want it, that you can change the software or use pieces of it in new
+-free programs, and that you know you can do these things.
+-
+- Developers that use our General Public Licenses protect your rights
+-with two steps: (1) assert copyright on the software, and (2) offer
+-you this License which gives you legal permission to copy, distribute
+-and/or modify the software.
+-
+- A secondary benefit of defending all users' freedom is that
+-improvements made in alternate versions of the program, if they
+-receive widespread use, become available for other developers to
+-incorporate. Many developers of free software are heartened and
+-encouraged by the resulting cooperation. However, in the case of
+-software used on network servers, this result may fail to come about.
+-The GNU General Public License permits making a modified version and
+-letting the public access it on a server without ever releasing its
+-source code to the public.
+-
+- The GNU Affero General Public License is designed specifically to
+-ensure that, in such cases, the modified source code becomes available
+-to the community. It requires the operator of a network server to
+-provide the source code of the modified version running there to the
+-users of that server. Therefore, public use of a modified version, on
+-a publicly accessible server, gives the public access to the source
+-code of the modified version.
+-
+- An older license, called the Affero General Public License and
+-published by Affero, was designed to accomplish similar goals. This is
+-a different license, not a version of the Affero GPL, but Affero has
+-released a new version of the Affero GPL which permits relicensing under
+-this license.
+-
+- The precise terms and conditions for copying, distribution and
+-modification follow.
+-
+- TERMS AND CONDITIONS
+-
+- 0. Definitions.
+-
+- "This License" refers to version 3 of the GNU Affero General Public License.
+-
+- "Copyright" also means copyright-like laws that apply to other kinds of
+-works, such as semiconductor masks.
+-
+- "The Program" refers to any copyrightable work licensed under this
+-License. Each licensee is addressed as "you". "Licensees" and
+-"recipients" may be individuals or organizations.
+-
+- To "modify" a work means to copy from or adapt all or part of the work
+-in a fashion requiring copyright permission, other than the making of an
+-exact copy. The resulting work is called a "modified version" of the
+-earlier work or a work "based on" the earlier work.
+-
+- A "covered work" means either the unmodified Program or a work based
+-on the Program.
+-
+- To "propagate" a work means to do anything with it that, without
+-permission, would make you directly or secondarily liable for
+-infringement under applicable copyright law, except executing it on a
+-computer or modifying a private copy. Propagation includes copying,
+-distribution (with or without modification), making available to the
+-public, and in some countries other activities as well.
+-
+- To "convey" a work means any kind of propagation that enables other
+-parties to make or receive copies. Mere interaction with a user through
+-a computer network, with no transfer of a copy, is not conveying.
+-
+- An interactive user interface displays "Appropriate Legal Notices"
+-to the extent that it includes a convenient and prominently visible
+-feature that (1) displays an appropriate copyright notice, and (2)
+-tells the user that there is no warranty for the work (except to the
+-extent that warranties are provided), that licensees may convey the
+-work under this License, and how to view a copy of this License. If
+-the interface presents a list of user commands or options, such as a
+-menu, a prominent item in the list meets this criterion.
+-
+- 1. Source Code.
+-
+- The "source code" for a work means the preferred form of the work
+-for making modifications to it. "Object code" means any non-source
+-form of a work.
+-
+- A "Standard Interface" means an interface that either is an official
+-standard defined by a recognized standards body, or, in the case of
+-interfaces specified for a particular programming language, one that
+-is widely used among developers working in that language.
+-
+- The "System Libraries" of an executable work include anything, other
+-than the work as a whole, that (a) is included in the normal form of
+-packaging a Major Component, but which is not part of that Major
+-Component, and (b) serves only to enable use of the work with that
+-Major Component, or to implement a Standard Interface for which an
+-implementation is available to the public in source code form. A
+-"Major Component", in this context, means a major essential component
+-(kernel, window system, and so on) of the specific operating system
+-(if any) on which the executable work runs, or a compiler used to
+-produce the work, or an object code interpreter used to run it.
+-
+- The "Corresponding Source" for a work in object code form means all
+-the source code needed to generate, install, and (for an executable
+-work) run the object code and to modify the work, including scripts to
+-control those activities. However, it does not include the work's
+-System Libraries, or general-purpose tools or generally available free
+-programs which are used unmodified in performing those activities but
+-which are not part of the work. For example, Corresponding Source
+-includes interface definition files associated with source files for
+-the work, and the source code for shared libraries and dynamically
+-linked subprograms that the work is specifically designed to require,
+-such as by intimate data communication or control flow between those
+-subprograms and other parts of the work.
+-
+- The Corresponding Source need not include anything that users
+-can regenerate automatically from other parts of the Corresponding
+-Source.
+-
+- The Corresponding Source for a work in source code form is that
+-same work.
+-
+- 2. Basic Permissions.
+-
+- All rights granted under this License are granted for the term of
+-copyright on the Program, and are irrevocable provided the stated
+-conditions are met. This License explicitly affirms your unlimited
+-permission to run the unmodified Program. The output from running a
+-covered work is covered by this License only if the output, given its
+-content, constitutes a covered work. This License acknowledges your
+-rights of fair use or other equivalent, as provided by copyright law.
+-
+- You may make, run and propagate covered works that you do not
+-convey, without conditions so long as your license otherwise remains
+-in force. You may convey covered works to others for the sole purpose
+-of having them make modifications exclusively for you, or provide you
+-with facilities for running those works, provided that you comply with
+-the terms of this License in conveying all material for which you do
+-not control copyright. Those thus making or running the covered works
+-for you must do so exclusively on your behalf, under your direction
+-and control, on terms that prohibit them from making any copies of
+-your copyrighted material outside their relationship with you.
+-
+- Conveying under any other circumstances is permitted solely under
+-the conditions stated below. Sublicensing is not allowed; section 10
+-makes it unnecessary.
+-
+- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+-
+- No covered work shall be deemed part of an effective technological
+-measure under any applicable law fulfilling obligations under article
+-11 of the WIPO copyright treaty adopted on 20 December 1996, or
+-similar laws prohibiting or restricting circumvention of such
+-measures.
+-
+- When you convey a covered work, you waive any legal power to forbid
+-circumvention of technological measures to the extent such circumvention
+-is effected by exercising rights under this License with respect to
+-the covered work, and you disclaim any intention to limit operation or
+-modification of the work as a means of enforcing, against the work's
+-users, your or third parties' legal rights to forbid circumvention of
+-technological measures.
+-
+- 4. Conveying Verbatim Copies.
+-
+- You may convey verbatim copies of the Program's source code as you
+-receive it, in any medium, provided that you conspicuously and
+-appropriately publish on each copy an appropriate copyright notice;
+-keep intact all notices stating that this License and any
+-non-permissive terms added in accord with section 7 apply to the code;
+-keep intact all notices of the absence of any warranty; and give all
+-recipients a copy of this License along with the Program.
+-
+- You may charge any price or no price for each copy that you convey,
+-and you may offer support or warranty protection for a fee.
+-
+- 5. Conveying Modified Source Versions.
+-
+- You may convey a work based on the Program, or the modifications to
+-produce it from the Program, in the form of source code under the
+-terms of section 4, provided that you also meet all of these conditions:
+-
+- a) The work must carry prominent notices stating that you modified
+- it, and giving a relevant date.
+-
+- b) The work must carry prominent notices stating that it is
+- released under this License and any conditions added under section
+- 7. This requirement modifies the requirement in section 4 to
+- "keep intact all notices".
+-
+- c) You must license the entire work, as a whole, under this
+- License to anyone who comes into possession of a copy. This
+- License will therefore apply, along with any applicable section 7
+- additional terms, to the whole of the work, and all its parts,
+- regardless of how they are packaged. This License gives no
+- permission to license the work in any other way, but it does not
+- invalidate such permission if you have separately received it.
+-
+- d) If the work has interactive user interfaces, each must display
+- Appropriate Legal Notices; however, if the Program has interactive
+- interfaces that do not display Appropriate Legal Notices, your
+- work need not make them do so.
+-
+- A compilation of a covered work with other separate and independent
+-works, which are not by their nature extensions of the covered work,
+-and which are not combined with it such as to form a larger program,
+-in or on a volume of a storage or distribution medium, is called an
+-"aggregate" if the compilation and its resulting copyright are not
+-used to limit the access or legal rights of the compilation's users
+-beyond what the individual works permit. Inclusion of a covered work
+-in an aggregate does not cause this License to apply to the other
+-parts of the aggregate.
+-
+- 6. Conveying Non-Source Forms.
+-
+- You may convey a covered work in object code form under the terms
+-of sections 4 and 5, provided that you also convey the
+-machine-readable Corresponding Source under the terms of this License,
+-in one of these ways:
+-
+- a) Convey the object code in, or embodied in, a physical product
+- (including a physical distribution medium), accompanied by the
+- Corresponding Source fixed on a durable physical medium
+- customarily used for software interchange.
+-
+- b) Convey the object code in, or embodied in, a physical product
+- (including a physical distribution medium), accompanied by a
+- written offer, valid for at least three years and valid for as
+- long as you offer spare parts or customer support for that product
+- model, to give anyone who possesses the object code either (1) a
+- copy of the Corresponding Source for all the software in the
+- product that is covered by this License, on a durable physical
+- medium customarily used for software interchange, for a price no
+- more than your reasonable cost of physically performing this
+- conveying of source, or (2) access to copy the
+- Corresponding Source from a network server at no charge.
+-
+- c) Convey individual copies of the object code with a copy of the
+- written offer to provide the Corresponding Source. This
+- alternative is allowed only occasionally and noncommercially, and
+- only if you received the object code with such an offer, in accord
+- with subsection 6b.
+-
+- d) Convey the object code by offering access from a designated
+- place (gratis or for a charge), and offer equivalent access to the
+- Corresponding Source in the same way through the same place at no
+- further charge. You need not require recipients to copy the
+- Corresponding Source along with the object code. If the place to
+- copy the object code is a network server, the Corresponding Source
+- may be on a different server (operated by you or a third party)
+- that supports equivalent copying facilities, provided you maintain
+- clear directions next to the object code saying where to find the
+- Corresponding Source. Regardless of what server hosts the
+- Corresponding Source, you remain obligated to ensure that it is
+- available for as long as needed to satisfy these requirements.
+-
+- e) Convey the object code using peer-to-peer transmission, provided
+- you inform other peers where the object code and Corresponding
+- Source of the work are being offered to the general public at no
+- charge under subsection 6d.
+-
+- A separable portion of the object code, whose source code is excluded
+-from the Corresponding Source as a System Library, need not be
+-included in conveying the object code work.
+-
+- A "User Product" is either (1) a "consumer product", which means any
+-tangible personal property which is normally used for personal, family,
+-or household purposes, or (2) anything designed or sold for incorporation
+-into a dwelling. In determining whether a product is a consumer product,
+-doubtful cases shall be resolved in favor of coverage. For a particular
+-product received by a particular user, "normally used" refers to a
+-typical or common use of that class of product, regardless of the status
+-of the particular user or of the way in which the particular user
+-actually uses, or expects or is expected to use, the product. A product
+-is a consumer product regardless of whether the product has substantial
+-commercial, industrial or non-consumer uses, unless such uses represent
+-the only significant mode of use of the product.
+-
+- "Installation Information" for a User Product means any methods,
+-procedures, authorization keys, or other information required to install
+-and execute modified versions of a covered work in that User Product from
+-a modified version of its Corresponding Source. The information must
+-suffice to ensure that the continued functioning of the modified object
+-code is in no case prevented or interfered with solely because
+-modification has been made.
+-
+- If you convey an object code work under this section in, or with, or
+-specifically for use in, a User Product, and the conveying occurs as
+-part of a transaction in which the right of possession and use of the
+-User Product is transferred to the recipient in perpetuity or for a
+-fixed term (regardless of how the transaction is characterized), the
+-Corresponding Source conveyed under this section must be accompanied
+-by the Installation Information. But this requirement does not apply
+-if neither you nor any third party retains the ability to install
+-modified object code on the User Product (for example, the work has
+-been installed in ROM).
+-
+- The requirement to provide Installation Information does not include a
+-requirement to continue to provide support service, warranty, or updates
+-for a work that has been modified or installed by the recipient, or for
+-the User Product in which it has been modified or installed. Access to a
+-network may be denied when the modification itself materially and
+-adversely affects the operation of the network or violates the rules and
+-protocols for communication across the network.
+-
+- Corresponding Source conveyed, and Installation Information provided,
+-in accord with this section must be in a format that is publicly
+-documented (and with an implementation available to the public in
+-source code form), and must require no special password or key for
+-unpacking, reading or copying.
+-
+- 7. Additional Terms.
+-
+- "Additional permissions" are terms that supplement the terms of this
+-License by making exceptions from one or more of its conditions.
+-Additional permissions that are applicable to the entire Program shall
+-be treated as though they were included in this License, to the extent
+-that they are valid under applicable law. If additional permissions
+-apply only to part of the Program, that part may be used separately
+-under those permissions, but the entire Program remains governed by
+-this License without regard to the additional permissions.
+-
+- When you convey a copy of a covered work, you may at your option
+-remove any additional permissions from that copy, or from any part of
+-it. (Additional permissions may be written to require their own
+-removal in certain cases when you modify the work.) You may place
+-additional permissions on material, added by you to a covered work,
+-for which you have or can give appropriate copyright permission.
+-
+- Notwithstanding any other provision of this License, for material you
+-add to a covered work, you may (if authorized by the copyright holders of
+-that material) supplement the terms of this License with terms:
+-
+- a) Disclaiming warranty or limiting liability differently from the
+- terms of sections 15 and 16 of this License; or
+-
+- b) Requiring preservation of specified reasonable legal notices or
+- author attributions in that material or in the Appropriate Legal
+- Notices displayed by works containing it; or
+-
+- c) Prohibiting misrepresentation of the origin of that material, or
+- requiring that modified versions of such material be marked in
+- reasonable ways as different from the original version; or
+-
+- d) Limiting the use for publicity purposes of names of licensors or
+- authors of the material; or
+-
+- e) Declining to grant rights under trademark law for use of some
+- trade names, trademarks, or service marks; or
+-
+- f) Requiring indemnification of licensors and authors of that
+- material by anyone who conveys the material (or modified versions of
+- it) with contractual assumptions of liability to the recipient, for
+- any liability that these contractual assumptions directly impose on
+- those licensors and authors.
+-
+- All other non-permissive additional terms are considered "further
+-restrictions" within the meaning of section 10. If the Program as you
+-received it, or any part of it, contains a notice stating that it is
+-governed by this License along with a term that is a further
+-restriction, you may remove that term. If a license document contains
+-a further restriction but permits relicensing or conveying under this
+-License, you may add to a covered work material governed by the terms
+-of that license document, provided that the further restriction does
+-not survive such relicensing or conveying.
+-
+- If you add terms to a covered work in accord with this section, you
+-must place, in the relevant source files, a statement of the
+-additional terms that apply to those files, or a notice indicating
+-where to find the applicable terms.
+-
+- Additional terms, permissive or non-permissive, may be stated in the
+-form of a separately written license, or stated as exceptions;
+-the above requirements apply either way.
+-
+- 8. Termination.
+-
+- You may not propagate or modify a covered work except as expressly
+-provided under this License. Any attempt otherwise to propagate or
+-modify it is void, and will automatically terminate your rights under
+-this License (including any patent licenses granted under the third
+-paragraph of section 11).
+-
+- However, if you cease all violation of this License, then your
+-license from a particular copyright holder is reinstated (a)
+-provisionally, unless and until the copyright holder explicitly and
+-finally terminates your license, and (b) permanently, if the copyright
+-holder fails to notify you of the violation by some reasonable means
+-prior to 60 days after the cessation.
+-
+- Moreover, your license from a particular copyright holder is
+-reinstated permanently if the copyright holder notifies you of the
+-violation by some reasonable means, this is the first time you have
+-received notice of violation of this License (for any work) from that
+-copyright holder, and you cure the violation prior to 30 days after
+-your receipt of the notice.
+-
+- Termination of your rights under this section does not terminate the
+-licenses of parties who have received copies or rights from you under
+-this License. If your rights have been terminated and not permanently
+-reinstated, you do not qualify to receive new licenses for the same
+-material under section 10.
+-
+- 9. Acceptance Not Required for Having Copies.
+-
+- You are not required to accept this License in order to receive or
+-run a copy of the Program. Ancillary propagation of a covered work
+-occurring solely as a consequence of using peer-to-peer transmission
+-to receive a copy likewise does not require acceptance. However,
+-nothing other than this License grants you permission to propagate or
+-modify any covered work. These actions infringe copyright if you do
+-not accept this License. Therefore, by modifying or propagating a
+-covered work, you indicate your acceptance of this License to do so.
+-
+- 10. Automatic Licensing of Downstream Recipients.
+-
+- Each time you convey a covered work, the recipient automatically
+-receives a license from the original licensors, to run, modify and
+-propagate that work, subject to this License. You are not responsible
+-for enforcing compliance by third parties with this License.
+-
+- An "entity transaction" is a transaction transferring control of an
+-organization, or substantially all assets of one, or subdividing an
+-organization, or merging organizations. If propagation of a covered
+-work results from an entity transaction, each party to that
+-transaction who receives a copy of the work also receives whatever
+-licenses to the work the party's predecessor in interest had or could
+-give under the previous paragraph, plus a right to possession of the
+-Corresponding Source of the work from the predecessor in interest, if
+-the predecessor has it or can get it with reasonable efforts.
+-
+- You may not impose any further restrictions on the exercise of the
+-rights granted or affirmed under this License. For example, you may
+-not impose a license fee, royalty, or other charge for exercise of
+-rights granted under this License, and you may not initiate litigation
+-(including a cross-claim or counterclaim in a lawsuit) alleging that
+-any patent claim is infringed by making, using, selling, offering for
+-sale, or importing the Program or any portion of it.
+-
+- 11. Patents.
+-
+- A "contributor" is a copyright holder who authorizes use under this
+-License of the Program or a work on which the Program is based. The
+-work thus licensed is called the contributor's "contributor version".
+-
+- A contributor's "essential patent claims" are all patent claims
+-owned or controlled by the contributor, whether already acquired or
+-hereafter acquired, that would be infringed by some manner, permitted
+-by this License, of making, using, or selling its contributor version,
+-but do not include claims that would be infringed only as a
+-consequence of further modification of the contributor version. For
+-purposes of this definition, "control" includes the right to grant
+-patent sublicenses in a manner consistent with the requirements of
+-this License.
+-
+- Each contributor grants you a non-exclusive, worldwide, royalty-free
+-patent license under the contributor's essential patent claims, to
+-make, use, sell, offer for sale, import and otherwise run, modify and
+-propagate the contents of its contributor version.
+-
+- In the following three paragraphs, a "patent license" is any express
+-agreement or commitment, however denominated, not to enforce a patent
+-(such as an express permission to practice a patent or covenant not to
+-sue for patent infringement). To "grant" such a patent license to a
+-party means to make such an agreement or commitment not to enforce a
+-patent against the party.
+-
+- If you convey a covered work, knowingly relying on a patent license,
+-and the Corresponding Source of the work is not available for anyone
+-to copy, free of charge and under the terms of this License, through a
+-publicly available network server or other readily accessible means,
+-then you must either (1) cause the Corresponding Source to be so
+-available, or (2) arrange to deprive yourself of the benefit of the
+-patent license for this particular work, or (3) arrange, in a manner
+-consistent with the requirements of this License, to extend the patent
+-license to downstream recipients. "Knowingly relying" means you have
+-actual knowledge that, but for the patent license, your conveying the
+-covered work in a country, or your recipient's use of the covered work
+-in a country, would infringe one or more identifiable patents in that
+-country that you have reason to believe are valid.
+-
+- If, pursuant to or in connection with a single transaction or
+-arrangement, you convey, or propagate by procuring conveyance of, a
+-covered work, and grant a patent license to some of the parties
+-receiving the covered work authorizing them to use, propagate, modify
+-or convey a specific copy of the covered work, then the patent license
+-you grant is automatically extended to all recipients of the covered
+-work and works based on it.
+-
+- A patent license is "discriminatory" if it does not include within
+-the scope of its coverage, prohibits the exercise of, or is
+-conditioned on the non-exercise of one or more of the rights that are
+-specifically granted under this License. You may not convey a covered
+-work if you are a party to an arrangement with a third party that is
+-in the business of distributing software, under which you make payment
+-to the third party based on the extent of your activity of conveying
+-the work, and under which the third party grants, to any of the
+-parties who would receive the covered work from you, a discriminatory
+-patent license (a) in connection with copies of the covered work
+-conveyed by you (or copies made from those copies), or (b) primarily
+-for and in connection with specific products or compilations that
+-contain the covered work, unless you entered into that arrangement,
+-or that patent license was granted, prior to 28 March 2007.
+-
+- Nothing in this License shall be construed as excluding or limiting
+-any implied license or other defenses to infringement that may
+-otherwise be available to you under applicable patent law.
+-
+- 12. No Surrender of Others' Freedom.
+-
+- If conditions are imposed on you (whether by court order, agreement or
+-otherwise) that contradict the conditions of this License, they do not
+-excuse you from the conditions of this License. If you cannot convey a
+-covered work so as to satisfy simultaneously your obligations under this
+-License and any other pertinent obligations, then as a consequence you may
+-not convey it at all. For example, if you agree to terms that obligate you
+-to collect a royalty for further conveying from those to whom you convey
+-the Program, the only way you could satisfy both those terms and this
+-License would be to refrain entirely from conveying the Program.
+-
+- 13. Remote Network Interaction; Use with the GNU General Public License.
+-
+- Notwithstanding any other provision of this License, if you modify the
+-Program, your modified version must prominently offer all users
+-interacting with it remotely through a computer network (if your version
+-supports such interaction) an opportunity to receive the Corresponding
+-Source of your version by providing access to the Corresponding Source
+-from a network server at no charge, through some standard or customary
+-means of facilitating copying of software. This Corresponding Source
+-shall include the Corresponding Source for any work covered by version 3
+-of the GNU General Public License that is incorporated pursuant to the
+-following paragraph.
+-
+- Notwithstanding any other provision of this License, you have
+-permission to link or combine any covered work with a work licensed
+-under version 3 of the GNU General Public License into a single
+-combined work, and to convey the resulting work. The terms of this
+-License will continue to apply to the part which is the covered work,
+-but the work with which it is combined will remain governed by version
+-3 of the GNU General Public License.
+-
+- 14. Revised Versions of this License.
+-
+- The Free Software Foundation may publish revised and/or new versions of
+-the GNU Affero General Public License from time to time. Such new versions
+-will be similar in spirit to the present version, but may differ in detail to
+-address new problems or concerns.
+-
+- Each version is given a distinguishing version number. If the
+-Program specifies that a certain numbered version of the GNU Affero General
+-Public License "or any later version" applies to it, you have the
+-option of following the terms and conditions either of that numbered
+-version or of any later version published by the Free Software
+-Foundation. If the Program does not specify a version number of the
+-GNU Affero General Public License, you may choose any version ever published
+-by the Free Software Foundation.
+-
+- If the Program specifies that a proxy can decide which future
+-versions of the GNU Affero General Public License can be used, that proxy's
+-public statement of acceptance of a version permanently authorizes you
+-to choose that version for the Program.
+-
+- Later license versions may give you additional or different
+-permissions. However, no additional obligations are imposed on any
+-author or copyright holder as a result of your choosing to follow a
+-later version.
+-
+- 15. Disclaimer of Warranty.
+-
+- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+-
+- 16. Limitation of Liability.
+-
+- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+-SUCH DAMAGES.
+-
+- 17. Interpretation of Sections 15 and 16.
+-
+- If the disclaimer of warranty and limitation of liability provided
+-above cannot be given local legal effect according to their terms,
+-reviewing courts shall apply local law that most closely approximates
+-an absolute waiver of all civil liability in connection with the
+-Program, unless a warranty or assumption of liability accompanies a
+-copy of the Program in return for a fee.
+-
+- END OF TERMS AND CONDITIONS
+-
+- How to Apply These Terms to Your New Programs
+-
+- If you develop a new program, and you want it to be of the greatest
+-possible use to the public, the best way to achieve this is to make it
+-free software which everyone can redistribute and change under these terms.
+-
+- To do so, attach the following notices to the program. It is safest
+-to attach them to the start of each source file to most effectively
+-state the exclusion of warranty; and each file should have at least
+-the "copyright" line and a pointer to where the full notice is found.
+-
+- <one line to give the program's name and a brief idea of what it does.>
+- Copyright (C) <year> <name of author>
+-
+- This program is free software: you can redistribute it and/or modify
+- it under the terms of the GNU Affero General Public License as published by
+- the Free Software Foundation, either version 3 of the License, or
+- (at your option) any later version.
+-
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU Affero General Public License for more details.
+-
+- You should have received a copy of the GNU Affero General Public License
+- along with this program. If not, see <http://www.gnu.org/licenses/>.
+-
+-Also add information on how to contact you by electronic and paper mail.
+-
+- If your software can interact with users remotely through a computer
+-network, you should also make sure that it provides a way for users to
+-get its source. For example, if your program is a web application, its
+-interface could display a "Source" link that leads users to an archive
+-of the code. There are many ways you could offer source, and different
+-solutions will be better for different programs; see section 13 for the
+-specific requirements.
+-
+- You should also get your employer (if you work as a programmer) or school,
+-if any, to sign a "copyright disclaimer" for the program, if necessary.
+-For more information on this, and how to apply and follow the GNU AGPL, see
+-<http://www.gnu.org/licenses/>.
+diff --git a/LICENSE b/LICENSE
+index 817427ae..8dfc62ad 100644
+--- a/LICENSE
++++ b/LICENSE
+@@ -35,10 +35,6 @@ src/pulsecore/filter/LICENSE.WEBKIT for details.
+ Additionally, a more permissive Sun license is used for code that performs
+ u-law, A-law and linear PCM conversions.
+
+-The qpaeq program (src/utils/qpaeq) is licensed under the GNU Affero General
+-Public License (version 3, or any later version at your discretion). See the
+-file AGPL for details.
+-
+ While we attempt to provide a summary here, it is the ultimate responsibility of
+ the packager to ensure the components they use in their build of PulseAudio
+ meets their license requirements.
+diff --git a/Makefile.am b/Makefile.am
+index 1f460a97..9a6b42a9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,7 +16,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+
+ EXTRA_DIST = \
+- AGPL \
+ bootstrap.sh \
+ coverity/model.c \
+ git-version-gen \
+diff --git a/src/utils/qpaeq b/src/utils/qpaeq
+index ac4b9e4a..f657659d 100755
+--- a/src/utils/qpaeq
++++ b/src/utils/qpaeq
+@@ -3,16 +3,16 @@
+ # Copyright (C) 2009 Jason Newton <nevion(a)gmail.com
+ #
+ # This program is free software: you can redistribute it and/or modify
+-# it under the terms of the GNU Affero General Public License as
+-# published by the Free Software Foundation, either version 3 of the
++# it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation, either version 2.1 of the
+ # License, or (at your option) any later version.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-# GNU Affero General Public License for more details.
++# GNU Lesser General Public License for more details.
+ #
+-# You should have received a copy of the GNU Affero General Public License
++# You should have received a copy of the GNU Lesser General Public License
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+--
+2.14.3
+
diff --git a/0085-client-conf-Add-a-default-value-for-disable-memfd.patch b/0085-client-conf-Add-a-default-value-for-disable-memfd.patch
new file mode 100644
index 0000000..e298aae
--- /dev/null
+++ b/0085-client-conf-Add-a-default-value-for-disable-memfd.patch
@@ -0,0 +1,25 @@
+From 2062fc8b0e69f383cfd4c4773bf8b9dcef20e035 Mon Sep 17 00:00:00 2001
+From: Arun Raghavan <arun(a)arunraghavan.net>
+Date: Fri, 27 Oct 2017 09:29:19 +0530
+Subject: [PATCH 085/106] client-conf: Add a default value for disable-memfd
+
+This got missed while adding the client option.
+---
+ src/pulse/client-conf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
+index a3c9486d..1daaf911 100644
+--- a/src/pulse/client-conf.c
++++ b/src/pulse/client-conf.c
+@@ -65,6 +65,7 @@ static const pa_client_conf default_conf = {
+ .cookie_file_from_client_conf = NULL,
+ .autospawn = true,
+ .disable_shm = false,
++ .disable_memfd = false,
+ .shm_size = 0,
+ .auto_connect_localhost = false,
+ .auto_connect_display = false
+--
+2.14.3
+
diff --git a/0090-qpaeq-port-to-PyQt5.patch b/0090-qpaeq-port-to-PyQt5.patch
new file mode 100644
index 0000000..aa4495e
--- /dev/null
+++ b/0090-qpaeq-port-to-PyQt5.patch
@@ -0,0 +1,201 @@
+From 480e0e74f43565d7ece72141666961ae8cc2ed75 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius(a)stikonas.eu>
+Date: Mon, 20 Nov 2017 19:56:53 +0000
+Subject: [PATCH 090/106] qpaeq: port to PyQt5
+
+---
+ src/utils/qpaeq | 68 ++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 34 insertions(+), 34 deletions(-)
+
+diff --git a/src/utils/qpaeq b/src/utils/qpaeq
+index f657659d..651d3a4e 100755
+--- a/src/utils/qpaeq
++++ b/src/utils/qpaeq
+@@ -18,13 +18,13 @@
+
+ import os,math,sys
+ try:
+- import PyQt4,sip
+- from PyQt4 import QtGui,QtCore
++ import PyQt5,sip
++ from PyQt5 import QtWidgets,QtCore
+ import dbus.mainloop.qt
+ import dbus
+ except ImportError as e:
+ sys.stderr.write('There was an error importing needed libraries\n'
+- 'Make sure you have qt4 and dbus-python installed\n'
++ 'Make sure you have qt5 and dbus-python installed\n'
+ 'The error that occured was:\n'
+ '\t%s\n' % (str(e)))
+ sys.exit(-1)
+@@ -62,7 +62,7 @@ def connect():
+ prop_iface='org.freedesktop.DBus.Properties'
+ eq_iface='org.PulseAudio.Ext.Equalizing1.Equalizer'
+ device_iface='org.PulseAudio.Core1.Device'
+-class QPaeq(QtGui.QWidget):
++class QPaeq(QtWidgets.QWidget):
+ manager_path='/org/pulseaudio/equalizing1'
+ manager_iface='org.PulseAudio.Ext.Equalizing1.Manager'
+ core_iface='org.PulseAudio.Core1'
+@@ -70,7 +70,7 @@ class QPaeq(QtGui.QWidget):
+ module_name='module-equalizer-sink'
+
+ def __init__(self):
+- QtGui.QWidget.__init__(self)
++ QtWidgets.QWidget.__init__(self)
+ self.setWindowTitle('qpaeq')
+ self.slider_widget=None
+ self.sink_name=None
+@@ -84,50 +84,50 @@ class QPaeq(QtGui.QWidget):
+ self.setMinimumSize(self.sizeHint())
+
+ def create_layout(self):
+- self.main_layout=QtGui.QVBoxLayout()
++ self.main_layout=QtWidgets.QVBoxLayout()
+ self.setLayout(self.main_layout)
+- toprow_layout=QtGui.QHBoxLayout()
+- sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
++ toprow_layout=QtWidgets.QHBoxLayout()
++ sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+ sizePolicy.setHorizontalStretch(0)
+ sizePolicy.setVerticalStretch(0)
+ #sizePolicy.setHeightForWidth(self.profile_box.sizePolicy().hasHeightForWidth())
+
+- toprow_layout.addWidget(QtGui.QLabel('Sink'))
+- self.sink_box = QtGui.QComboBox()
++ toprow_layout.addWidget(QtWidgets.QLabel('Sink'))
++ self.sink_box = QtWidgets.QComboBox()
+ self.sink_box.setSizePolicy(sizePolicy)
+ self.sink_box.setDuplicatesEnabled(False)
+- self.sink_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
+- #self.sink_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
++ self.sink_box.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically)
++ #self.sink_box.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+ toprow_layout.addWidget(self.sink_box)
+
+- toprow_layout.addWidget(QtGui.QLabel('Channel'))
+- self.channel_box = QtGui.QComboBox()
++ toprow_layout.addWidget(QtWidgets.QLabel('Channel'))
++ self.channel_box = QtWidgets.QComboBox()
+ self.channel_box.setSizePolicy(sizePolicy)
+ toprow_layout.addWidget(self.channel_box)
+
+- toprow_layout.addWidget(QtGui.QLabel('Preset'))
+- self.profile_box = QtGui.QComboBox()
++ toprow_layout.addWidget(QtWidgets.QLabel('Preset'))
++ self.profile_box = QtWidgets.QComboBox()
+ self.profile_box.setSizePolicy(sizePolicy)
+- self.profile_box.setInsertPolicy(QtGui.QComboBox.InsertAlphabetically)
+- #self.profile_box.setSizeAdjustPolicy(QtGui.QComboBox.AdjustToContents)
++ self.profile_box.setInsertPolicy(QtWidgets.QComboBox.InsertAlphabetically)
++ #self.profile_box.setSizeAdjustPolicy(QtWidgets.QComboBox.AdjustToContents)
+ toprow_layout.addWidget(self.profile_box)
+
+- large_icon_size=self.style().pixelMetric(QtGui.QStyle.PM_LargeIconSize)
++ large_icon_size=self.style().pixelMetric(QtWidgets.QStyle.PM_LargeIconSize)
+ large_icon_size=QtCore.QSize(large_icon_size,large_icon_size)
+- save_profile=QtGui.QToolButton()
+- save_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_DriveFDIcon))
++ save_profile=QtWidgets.QToolButton()
++ save_profile.setIcon(self.style().standardIcon(QtWidgets.QStyle.SP_DriveFDIcon))
+ save_profile.setIconSize(large_icon_size)
+ save_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+ save_profile.clicked.connect(self.save_profile)
+- remove_profile=QtGui.QToolButton()
+- remove_profile.setIcon(self.style().standardIcon(QtGui.QStyle.SP_TrashIcon))
++ remove_profile=QtWidgets.QToolButton()
++ remove_profile.setIcon(self.style().standardIcon(QtWidgets.QStyle.SP_TrashIcon))
+ remove_profile.setIconSize(large_icon_size)
+ remove_profile.setToolButtonStyle(QtCore.Qt.ToolButtonIconOnly)
+ remove_profile.clicked.connect(self.remove_profile)
+ toprow_layout.addWidget(save_profile)
+ toprow_layout.addWidget(remove_profile)
+
+- reset_button = QtGui.QPushButton('Reset')
++ reset_button = QtWidgets.QPushButton('Reset')
+ reset_button.clicked.connect(self.reset)
+ toprow_layout.addStretch()
+ toprow_layout.addWidget(reset_button)
+@@ -192,11 +192,11 @@ class QPaeq(QtGui.QWidget):
+ def save_profile(self):
+ #popup dialog box for name
+ current=self.profile_box.currentIndex()
+- profile,ok=QtGui.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
++ profile,ok=QtWidgets.QInputDialog.getItem(self,'Preset Name','Preset',self.profiles,current)
+ if not ok or profile=='':
+ return
+ if profile in self.profiles:
+- mbox=QtGui.QMessageBox(self)
++ mbox=QtWidgets.QMessageBox(self)
+ mbox.setText('%s preset already exists'%(profile,))
+ mbox.setInformativeText('Do you want to save over it?')
+ mbox.setStandardButtons(mbox.Save|mbox.Discard|mbox.Cancel)
+@@ -217,7 +217,7 @@ class QPaeq(QtGui.QWidget):
+ profile=self.profile_box.itemText(x)
+ self.filter_state.load_profile(profile)
+ def select_channel(self,x):
+- self.filter_state.channel = self.channel_box.itemData(x).toPyObject()
++ self.filter_state.channel = self.channel_box.itemData(x)
+ self._set_profile_name()
+ self.filter_state.readback()
+
+@@ -295,13 +295,13 @@ class QPaeq(QtGui.QWidget):
+ self.profile_box.blockSignals(False)
+
+
+-class SliderArray(QtGui.QWidget):
++class SliderArray(QtWidgets.QWidget):
+ def __init__(self,filter_state,parent=None):
+ super(SliderArray,self).__init__(parent)
+ #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
+ #self.setStyleSheet('font-family: monospace;'+outline%('blue'))
+ self.filter_state=filter_state
+- self.setLayout(QtGui.QHBoxLayout())
++ self.setLayout(QtWidgets.QHBoxLayout())
+ self.sub_array=None
+ self.set_sub_array(SliderArraySub(self.filter_state))
+ self.inhibit_resize=0
+@@ -359,11 +359,11 @@ class SliderArray(QtGui.QWidget):
+ self.set_sub_array(SliderArraySub(self.filter_state))
+ self.inhibit_resize-=1
+
+-class SliderArraySub(QtGui.QWidget):
++class SliderArraySub(QtWidgets.QWidget):
+ def __init__(self,filter_state,parent=None):
+ super(SliderArraySub,self).__init__(parent)
+ self.filter_state=filter_state
+- self.setLayout(QtGui.QGridLayout())
++ self.setLayout(QtWidgets.QGridLayout())
+ self.slider=[None]*len(self.filter_state.frequencies)
+ self.label=[None]*len(self.slider)
+ #self.setStyleSheet('padding: 0px; border-width: 0px; margin: 0px;')
+@@ -375,7 +375,7 @@ class SliderArraySub(QtGui.QWidget):
+ self.layout().addWidget(label,1,c,qt.AlignHCenter)
+ self.layout().setColumnMinimumWidth(c,max(label.sizeHint().width(),slider.sizeHint().width()))
+ def create_slider(slider_label):
+- slider=QtGui.QSlider(QtCore.Qt.Vertical,self)
++ slider=QtWidgets.QSlider(QtCore.Qt.Vertical,self)
+ label=SliderLabel(slider_label,filter_state,self)
+ slider.setRange(-1000,2000)
+ slider.setSingleStep(1)
+@@ -461,7 +461,7 @@ class SliderArraySub(QtGui.QWidget):
+ return int((x-1.0)*1000)
+ outline='border-width: 1px; border-style: solid; border-color: %s;'
+
+-class SliderLabel(QtGui.QLabel):
++class SliderLabel(QtWidgets.QLabel):
+ clicked=QtCore.pyqtSignal()
+ def __init__(self,label_text,filter_state,parent=None):
+ super(SliderLabel,self).__init__(parent)
+@@ -566,7 +566,7 @@ def subdivide(xs, t_points):
+
+ def main():
+ dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
+- app=QtGui.QApplication(sys.argv)
++ app=QtWidgets.QApplication(sys.argv)
+ qpaeq_main=QPaeq()
+ qpaeq_main.show()
+ sys.exit(app.exec_())
+--
+2.14.3
+
diff --git a/0093-alsa-fix-infinite-loop-with-Intel-HDMI-LPE.patch b/0093-alsa-fix-infinite-loop-with-Intel-HDMI-LPE.patch
new file mode 100644
index 0000000..ddd7abd
--- /dev/null
+++ b/0093-alsa-fix-infinite-loop-with-Intel-HDMI-LPE.patch
@@ -0,0 +1,142 @@
+From 94fc586c011537536cfb434376354699357af785 Mon Sep 17 00:00:00 2001
+From: Tanu Kaskinen <tanuk(a)iki.fi>
+Date: Thu, 28 Dec 2017 12:09:17 +0200
+Subject: [PATCH 093/106] alsa: fix infinite loop with Intel HDMI LPE
+
+The Intel HDMI LPE driver works in a peculiar way when the HDMI cable is
+not plugged in: any written audio is immediately discarded and underrun
+is reported. That resulted in an infinite loop, because PulseAudio tried
+to keep the buffer filled, which was futile since the written audio was
+immediately consumed/discarded.
+
+This patch adds special handling for the LPE driver: if the active port
+of the sink is unavailable, the sink suspends itself. A new suspend
+cause is added: PA_SUSPEND_UNAVAILABLE.
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100488
+---
+ src/modules/alsa/alsa-mixer.h | 1 +
+ src/modules/alsa/alsa-sink.c | 22 ++++++++++++++++++++++
+ src/modules/alsa/module-alsa-card.c | 34 ++++++++++++++++++++++++++++++++++
+ src/pulsecore/core.h | 1 +
+ 4 files changed, 58 insertions(+)
+
+diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
+index 4ebf1922..3577f435 100644
+--- a/src/modules/alsa/alsa-mixer.h
++++ b/src/modules/alsa/alsa-mixer.h
+@@ -364,6 +364,7 @@ int pa_alsa_set_mixer_rtpoll(struct pa_alsa_mixer_pdata *pd, snd_mixer_t *mixer,
+ struct pa_alsa_port_data {
+ pa_alsa_path *path;
+ pa_alsa_setting *setting;
++ bool suspend_when_unavailable;
+ };
+
+ void pa_alsa_add_ports(void *sink_or_source_new_data, pa_alsa_path_set *ps, pa_card *card);
+diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
+index 7936cfac..a80caab2 100644
+--- a/src/modules/alsa/alsa-sink.c
++++ b/src/modules/alsa/alsa-sink.c
+@@ -1527,6 +1527,11 @@ static int sink_set_port_cb(pa_sink *s, pa_device_port *p) {
+ s->set_volume(s);
+ }
+
++ if (data->suspend_when_unavailable && p->available == PA_AVAILABLE_NO)
++ pa_sink_suspend(s, true, PA_SUSPEND_UNAVAILABLE);
++ else
++ pa_sink_suspend(s, false, PA_SUSPEND_UNAVAILABLE);
++
+ return 0;
+ }
+
+@@ -2460,6 +2465,23 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
+ if (profile_set)
+ pa_alsa_profile_set_free(profile_set);
+
++ /* Suspend if necessary. FIXME: It would be better to start suspended, but
++ * that would require some core changes. It's possible to set
++ * pa_sink_new_data.suspend_cause, but that has to be done before the
++ * pa_sink_new() call, and we know if we need to suspend only after the
++ * pa_sink_new() call when the initial port has been chosen. Calling
++ * pa_sink_suspend() between pa_sink_new() and pa_sink_put() would
++ * otherwise work, but currently pa_sink_suspend() will crash if
++ * pa_sink_put() hasn't been called. */
++ if (u->sink->active_port) {
++ pa_alsa_port_data *port_data;
++
++ port_data = PA_DEVICE_PORT_DATA(u->sink->active_port);
++
++ if (port_data->suspend_when_unavailable && u->sink->active_port->available == PA_AVAILABLE_NO)
++ pa_sink_suspend(u->sink, true, PA_SUSPEND_UNAVAILABLE);
++ }
++
+ return u->sink;
+
+ fail:
+diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
+index 804b4f87..b193d40c 100644
+--- a/src/modules/alsa/module-alsa-card.c
++++ b/src/modules/alsa/module-alsa-card.c
+@@ -426,6 +426,22 @@ static int report_jack_state(snd_mixer_elem_t *melem, unsigned int mask) {
+ if (tp->avail == PA_AVAILABLE_NO)
+ pa_device_port_set_available(tp->port, tp->avail);
+
++ for (tp = tports; tp->port; tp++) {
++ pa_alsa_port_data *data;
++ pa_sink *sink;
++ uint32_t idx;
++
++ data = PA_DEVICE_PORT_DATA(tp->port);
++
++ if (!data->suspend_when_unavailable)
++ continue;
++
++ PA_IDXSET_FOREACH(sink, u->core->sinks, idx) {
++ if (sink->active_port == tp->port)
++ pa_sink_suspend(sink, tp->avail == PA_AVAILABLE_NO, PA_SUSPEND_UNAVAILABLE);
++ }
++ }
++
+ /* Update profile availabilities. The logic could be improved; for now we
+ * only set obviously unavailable profiles (those that contain only
+ * unavailable ports) to PA_AVAILABLE_NO and all others to
+@@ -836,6 +852,24 @@ int pa__init(pa_module *m) {
+ goto fail;
+ }
+
++ /* The Intel HDMI LPE driver needs some special handling. When the HDMI
++ * cable is not plugged in, trying to play audio doesn't work. Any written
++ * audio is immediately discarded and an underrun is reported, and that
++ * results in an infinite loop of "fill buffer, handle underrun". To work
++ * around this issue, the suspend_when_unavailable flag is used to stop
++ * playback when the HDMI cable is unplugged. */
++ if (pa_safe_streq(pa_proplist_gets(data.proplist, "alsa.driver_name"), "snd_hdmi_lpe_audio")) {
++ pa_device_port *port;
++ void *state;
++
++ PA_HASHMAP_FOREACH(port, data.ports, state) {
++ pa_alsa_port_data *port_data;
++
++ port_data = PA_DEVICE_PORT_DATA(port);
++ port_data->suspend_when_unavailable = true;
++ }
++ }
++
+ u->card = pa_card_new(m->core, &data);
+ pa_card_new_data_done(&data);
+
+diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
+index 79a095d2..afe6c25e 100644
+--- a/src/pulsecore/core.h
++++ b/src/pulsecore/core.h
+@@ -34,6 +34,7 @@ typedef enum pa_suspend_cause {
+ PA_SUSPEND_SESSION = 8, /* Used by module-hal for mark inactive sessions */
+ PA_SUSPEND_PASSTHROUGH = 16, /* Used to suspend monitor sources when the sink is in passthrough mode */
+ PA_SUSPEND_INTERNAL = 32, /* This is used for short period server-internal suspends, such as for sample rate updates */
++ PA_SUSPEND_UNAVAILABLE = 64, /* Used by device implementations that have to suspend when the device is unavailable */
+ PA_SUSPEND_ALL = 0xFFFF /* Magic cause that can be used to resume forcibly */
+ } pa_suspend_cause_t;
+
+--
+2.14.3
+
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 5972074..012091f 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -31,7 +31,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 8%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 9%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -74,9 +74,14 @@ Patch10: 0010-build-sys-add-iec958-stereo-input.conf-to-dist_alsap.patch
Patch15: 0015-alsa-mixer-round-not-truncate-in-to_alsa_dB.patch
Patch16: 0016-alsa-mixer-add-support-for-Steelseries-Arctis-7-head.patch
Patch18: 0018-build-sys-add-the-Arctis-configuration.patch
+Patch33: 0033-qpaeq-change-license-from-AGPL-to-LGPL-v2.1.patch
Patch35: 0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch
Patch74: 0074-build-sys-add-the-Dell-dock-TB16-configuration.patch
Patch84: 0084-sink-source-Don-t-finish-move-if-unlink-happens-afte.patch
+Patch85: 0085-client-conf-Add-a-default-value-for-disable-memfd.patch
+Patch90: 0090-qpaeq-port-to-PyQt5.patch
+Patch93: 0093-alsa-fix-infinite-loop-with-Intel-HDMI-LPE.patch
+Patch96: 0106-memfd-wrappers-only-define-memfd_create-if-not-alrea.patch
## upstreamable patches
# patchset from https://bugs.freedesktop.org/show_bug.cgi?id=100488
@@ -158,8 +163,12 @@ Enlightened Sound Daemon (ESOUND).
%package qpaeq
Summary: Pulseaudio equalizer interface
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: PyQt4
+Requires: python-qt5
+%if 0%{?fedora} > 27
+Requires: python2-dbus
+%else
Requires: dbus-python
+%endif
%description qpaeq
qpaeq is a equalizer interface for pulseaudio's equalizer sinks.
@@ -277,12 +286,18 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%patch15 -p1
%patch16 -p1
%patch18 -p1
+%patch33 -p1
%patch35 -p1
%patch74 -p1
%patch84 -p1
+%patch85 -p1
+%patch90 -p1
+%patch93 -p1
+%patch96 -p1
## upstreamable patches
-%patch100 -p1
+## per comments in the upstream bug, it would *appear* this one is no longer needed after applying patch93
+#patch100 -p1
# rawhide-only, for now, on hadess' advice --rex
%if 0%{?fedora} > 27
%patch101 -p1
@@ -296,9 +311,9 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%patch202 -p1 -b .disable_flat_volumes
#patch203 -p1 -b .affinity
%patch204 -p1 -b .exit_idle_time
-%if 0%{?fedora} > 27
-%patch205 -p1 -b .glibc_memfd
-%endif
+#if 0%{?fedora} > 27
+#patch205 -p1 -b .glibc_memfd
+#endif
sed -i.no_consolekit -e \
's/^load-module module-console-kit/#load-module module-console-kit/' \
@@ -386,9 +401,17 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/pulse-%{pa_major}/modules/module-detect.so
%ifarch %{ix86} s390x
# FIXME: i686 FAIL: cpu-remap-test
# FIXME: s390x FAIL: core-util-test
-%global tests_nonfatal ||:
+%global tests_nonfatal 1
%endif
-make %{?_smp_mflags} check %{?tests_nonfatal}
+%if 0%{?fedora} > 27
+# regression'ish failures on rawhide, not worth failing build (for now) -- rex
+%global tests_nonfatal 1
+%endif
+make %{?_smp_mflags} check || TESTS_ERROR=$?
+if [ "${TESTS_ERROR}" != "" ]; then
+cat src/test-suite.log
+%{!?tests_nonfatal:exit $TESTS_ERROR}
+fi
%endif
@@ -644,6 +667,9 @@ exit 0
%changelog
+* Thu Feb 01 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-9
+- backport upstream fixes: memfd, qpape PyQt5 port
+
* Mon Jan 08 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-8
- exit-idle-time = 4 (#1510301)
- f28+ ftbfs: memfd_create conflicts
commit 29fc3848acd22c52b31b517b2755607425e395e0
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jan 23 10:55:57 2018 -0600
non-fatal tests on s390x too
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 2121106..5972074 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -383,8 +383,9 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/pulse-%{pa_major}/modules/module-detect.so
%check
%if 0%{?tests}
-%ifarch %{ix86}
-# FIXME: i686 fails at least one: cpu-remap-test
+%ifarch %{ix86} s390x
+# FIXME: i686 FAIL: cpu-remap-test
+# FIXME: s390x FAIL: core-util-test
%global tests_nonfatal ||:
%endif
make %{?_smp_mflags} check %{?tests_nonfatal}
@@ -648,7 +649,7 @@ exit 0
- f28+ ftbfs: memfd_create conflicts
- drop getaffinity.patch (no longer needed)
- enable webrtc support for all archs
-- make tests non-fatal on i686
+- make tests non-fatal on i686,s390x
* Mon Dec 04 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-7
- backport 'pa_sink_input_assert_ref()' crashfix (#1472285)
commit 64b02411f60a652879df6f61472fce4b9cc022cf
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jan 23 10:54:56 2018 -0600
Revert "restore getaffinity.patch"
This reverts commit 19944e5a3e5ee2e98f2c02a26502916cb8916e94.
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 0e00a8a..2121106 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -294,8 +294,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%patch201 -p1 -b .autostart
%patch202 -p1 -b .disable_flat_volumes
-# (still) needed for s390x core-util-test
-%patch203 -p1 -b .affinity
+#patch203 -p1 -b .affinity
%patch204 -p1 -b .exit_idle_time
%if 0%{?fedora} > 27
%patch205 -p1 -b .glibc_memfd
@@ -647,6 +646,7 @@ exit 0
* Mon Jan 08 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-8
- exit-idle-time = 4 (#1510301)
- f28+ ftbfs: memfd_create conflicts
+- drop getaffinity.patch (no longer needed)
- enable webrtc support for all archs
- make tests non-fatal on i686
commit 19944e5a3e5ee2e98f2c02a26502916cb8916e94
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Tue Jan 23 10:35:30 2018 -0600
restore getaffinity.patch
still needed on s390x
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 2121106..0e00a8a 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -294,7 +294,8 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%patch201 -p1 -b .autostart
%patch202 -p1 -b .disable_flat_volumes
-#patch203 -p1 -b .affinity
+# (still) needed for s390x core-util-test
+%patch203 -p1 -b .affinity
%patch204 -p1 -b .exit_idle_time
%if 0%{?fedora} > 27
%patch205 -p1 -b .glibc_memfd
@@ -646,7 +647,6 @@ exit 0
* Mon Jan 08 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-8
- exit-idle-time = 4 (#1510301)
- f28+ ftbfs: memfd_create conflicts
-- drop getaffinity.patch (no longer needed)
- enable webrtc support for all archs
- make tests non-fatal on i686
commit 2d6ef54f778aab464b075f847048c163d0b140e9
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Jan 22 16:06:17 2018 -0600
more build fixes
- enable webrtc support for all archs
- getaffinity.patch (no longer needed)
- make tests non-fatal on i686
(in case anyone wonders, it fails the same with or without the aforementioned getaffinity.patch)
diff --git a/pulseaudio.spec b/pulseaudio.spec
index f9760ad..2121106 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -6,12 +6,10 @@
#global gitcommit aec811798cd883a454b9b5cd82c77831906bbd2d
#global shortcommit (c=%{gitcommit}; echo ${c:0:5})
-# FIXME/TODO: webrtc support currently FTBFS on f28+
-%if 0%{?fedora} < 28
-%ifarch x86_64 %{arm}
+# webrtc bits go wonky without this
+# see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
+%undefine _strict_symbol_defs_build
%global with_webrtc 1
-%endif
-%endif
# https://bugzilla.redhat.com/983606
%global _hardened_build 1
@@ -296,7 +294,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%patch201 -p1 -b .autostart
%patch202 -p1 -b .disable_flat_volumes
-%patch203 -p1 -b .affinity
+#patch203 -p1 -b .affinity
%patch204 -p1 -b .exit_idle_time
%if 0%{?fedora} > 27
%patch205 -p1 -b .glibc_memfd
@@ -385,7 +383,11 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/pulse-%{pa_major}/modules/module-detect.so
%check
%if 0%{?tests}
-make %{?_smp_mflags} check
+%ifarch %{ix86}
+# FIXME: i686 fails at least one: cpu-remap-test
+%global tests_nonfatal ||:
+%endif
+make %{?_smp_mflags} check %{?tests_nonfatal}
%endif
@@ -643,7 +645,10 @@ exit 0
%changelog
* Mon Jan 08 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-8
- exit-idle-time = 4 (#1510301)
-- f28+ ftbfs: memfd_create conflicts, disable webrtc support
+- f28+ ftbfs: memfd_create conflicts
+- drop getaffinity.patch (no longer needed)
+- enable webrtc support for all archs
+- make tests non-fatal on i686
* Mon Dec 04 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-7
- backport 'pa_sink_input_assert_ref()' crashfix (#1472285)
commit 92feb354761cdf733139e764397e4c15f5dcce1c
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Jan 22 14:20:32 2018 -0600
disable webrtc support f28+
another ftbfs :(
diff --git a/pulseaudio.spec b/pulseaudio.spec
index b53875a..f9760ad 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -6,9 +6,12 @@
#global gitcommit aec811798cd883a454b9b5cd82c77831906bbd2d
#global shortcommit (c=%{gitcommit}; echo ${c:0:5})
+# FIXME/TODO: webrtc support currently FTBFS on f28+
+%if 0%{?fedora} < 28
%ifarch x86_64 %{arm}
%global with_webrtc 1
%endif
+%endif
# https://bugzilla.redhat.com/983606
%global _hardened_build 1
@@ -640,6 +643,7 @@ exit 0
%changelog
* Mon Jan 08 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-8
- exit-idle-time = 4 (#1510301)
+- f28+ ftbfs: memfd_create conflicts, disable webrtc support
* Mon Dec 04 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-7
- backport 'pa_sink_input_assert_ref()' crashfix (#1472285)
commit fb2e1c2e67b97b2d0c626f486ba31cc99bc9c56f
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Jan 22 12:32:18 2018 -0600
workaround rawhide FTBFS
avoid dup memfd_create declaration
diff --git a/pulseaudio-11.1-glibc_memfd.patch b/pulseaudio-11.1-glibc_memfd.patch
new file mode 100644
index 0000000..085b7c9
--- /dev/null
+++ b/pulseaudio-11.1-glibc_memfd.patch
@@ -0,0 +1,15 @@
+diff -up pulseaudio-11.1/src/pulsecore/memfd-wrappers.h.glibc_memfd pulseaudio-11.1/src/pulsecore/memfd-wrappers.h
+--- pulseaudio-11.1/src/pulsecore/memfd-wrappers.h.glibc_memfd 2016-08-23 07:50:11.000000000 -0500
++++ pulseaudio-11.1/src/pulsecore/memfd-wrappers.h 2018-01-22 12:30:23.322574380 -0600
+@@ -33,9 +33,9 @@
+ * a whole conflicts with the original glibc header <fnctl.h>.
+ */
+
+-static inline int memfd_create(const char *name, unsigned int flags) {
++/* static inline int memfd_create(const char *name, unsigned int flags) {
+ return syscall(SYS_memfd_create, name, flags);
+-}
++} */
+
+ /* memfd_create(2) flags */
+
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 50f4a12..b53875a 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -62,6 +62,10 @@ Patch203: pulseaudio-8.99.2-getaffinity.patch
# to mitigate http://bugzilla.redhat.com/1510301
Patch204: pulseaudio-11.1-exit_idle_time.patch
+# workaround rawhide build failures, avoid dup'd memfd_create declaration
+# https://bugs.freedesktop.org/show_bug.cgi?id=104733
+Patch205: pulseaudio-11.1-glibc_memfd.patch
+
## upstream patches
Patch4: 0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch
Patch9: 0009-alsa-mixer-set-PCM-Capture-Source-for-iec958-input.patch
@@ -291,6 +295,9 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%patch202 -p1 -b .disable_flat_volumes
%patch203 -p1 -b .affinity
%patch204 -p1 -b .exit_idle_time
+%if 0%{?fedora} > 27
+%patch205 -p1 -b .glibc_memfd
+%endif
sed -i.no_consolekit -e \
's/^load-module module-console-kit/#load-module module-console-kit/' \
commit 95d5f4a3f19e8e54294d0aa238a237ba545d0d82
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Mon Jan 8 11:16:50 2018 -0600
exit-idle-time = 4 (#1510301)
diff --git a/pulseaudio-11.1-exit_idle_time.patch b/pulseaudio-11.1-exit_idle_time.patch
new file mode 100644
index 0000000..c1be7c5
--- /dev/null
+++ b/pulseaudio-11.1-exit_idle_time.patch
@@ -0,0 +1,24 @@
+diff -up pulseaudio-11.1/src/daemon/daemon-conf.c.idletime pulseaudio-11.1/src/daemon/daemon-conf.c
+--- pulseaudio-11.1/src/daemon/daemon-conf.c.idletime 2018-01-08 11:01:12.876616847 -0600
++++ pulseaudio-11.1/src/daemon/daemon-conf.c 2018-01-08 11:06:33.847102687 -0600
+@@ -69,7 +69,7 @@ static const pa_daemon_conf default_conf
+ .disallow_module_loading = false,
+ .disallow_exit = false,
+ .flat_volumes = false,
+- .exit_idle_time = 20,
++ .exit_idle_time = 4,
+ .scache_idle_time = 20,
+ .script_commands = NULL,
+ .dl_search_path = NULL,
+diff -up pulseaudio-11.1/src/daemon/daemon.conf.in.idletime pulseaudio-11.1/src/daemon/daemon.conf.in
+--- pulseaudio-11.1/src/daemon/daemon.conf.in.idletime 2018-01-08 11:01:12.876616847 -0600
++++ pulseaudio-11.1/src/daemon/daemon.conf.in 2018-01-08 11:04:52.309999961 -0600
+@@ -39,7 +39,7 @@ ifelse(@HAVE_DBUS@, 1, [dnl
+ ; realtime-scheduling = yes
+ ; realtime-priority = 5
+
+-; exit-idle-time = 20
++; exit-idle-time = 4
+ ; scache-idle-time = 20
+
+ ; dl-search-path = (depends on architecture)
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 1f83791..50f4a12 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -30,7 +30,7 @@
Name: pulseaudio
Summary: Improved Linux Sound Server
Version: %{pa_major}%{?pa_minor:.%{pa_minor}}
-Release: 7%{?snap:.%{snap}git%{shortcommit}}%{?dist}
+Release: 8%{?snap:.%{snap}git%{shortcommit}}%{?dist}
License: LGPLv2+
URL: http://www.freedesktop.org/wiki/Software/PulseAudio
%if 0%{?gitrel}
@@ -48,15 +48,19 @@ Source5: default.pa-for-gdm
# revert upstream commit to rely solely on autospawn for autostart, instead
# include a fallback to manual launch when autospawn fails, like when
# user disables autospawn, or logging in as root
-Patch1: pulseaudio-autostart.patch
+Patch201: pulseaudio-autostart.patch
# disable flat-volumes by default
# https://bugzilla.redhat.com/show_bug.cgi?id=1265267
-Patch2: pulseaudio-9.0-disable_flat_volumes.patch
+Patch202: pulseaudio-9.0-disable_flat_volumes.patch
# bz#1067470, only start threads on activ CPUs
# see also https://bugs.freedesktop.org/show_bug.cgi?id=96638
-Patch3: pulseaudio-8.99.2-getaffinity.patch
+Patch203: pulseaudio-8.99.2-getaffinity.patch
+
+# reduce exit-idle-time 20 -> 4
+# to mitigate http://bugzilla.redhat.com/1510301
+Patch204: pulseaudio-11.1-exit_idle_time.patch
## upstream patches
Patch4: 0004-alsa-mixer-Add-support-for-usb-audio-in-the-Dell-doc.patch
@@ -283,9 +287,10 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%endif
%patch106 -p1
-%patch1 -p1 -b .autostart
-%patch2 -p1 -b .disable_flat_volumes
-%patch3 -p1 -b .affinity
+%patch201 -p1 -b .autostart
+%patch202 -p1 -b .disable_flat_volumes
+%patch203 -p1 -b .affinity
+%patch204 -p1 -b .exit_idle_time
sed -i.no_consolekit -e \
's/^load-module module-console-kit/#load-module module-console-kit/' \
@@ -626,6 +631,9 @@ exit 0
%changelog
+* Mon Jan 08 2018 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-8
+- exit-idle-time = 4 (#1510301)
+
* Mon Dec 04 2017 Rex Dieter <rdieter(a)fedoraproject.org> - 11.1-7
- backport 'pa_sink_input_assert_ref()' crashfix (#1472285)
- --disable-tcpwrap on f28+ (#1518777)
6 years, 1 month
Architecture specific change in rpms/shim.git
by githook-noreply@fedoraproject.org
The package rpms/shim.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/shim.git/commit/?id=0abd456d3c3a8....
Change:
+%ifarch aarch64
Thanks.
Full change:
============
commit 0abd456d3c3a8a3d14c966472a54ee098f403a0e
Author: Peter Jones <pjones(a)redhat.com>
Date: Wed Feb 28 11:35:01 2018 -0500
Rename the .spec file and fix some paths.
Signed-off-by: Peter Jones <pjones(a)redhat.com>
diff --git a/shim-signed.spec b/shim-signed.spec
deleted file mode 100644
index d43d307..0000000
--- a/shim-signed.spec
+++ /dev/null
@@ -1,336 +0,0 @@
-%global debug_package %{nil}
-
-%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
-
-# this is literally to make vim's \c not put a brace at the end.
-%global _dist %{expand:%{?_module_build:%%{?dist}}}
-%global dist %{expand:%%{_dist}}
-
-Name: shim-signed
-Version: 13
-Release: 1%{dist}
-Summary: First-stage UEFI bootloader
-License: BSD
-URL: http://github.com/rhboot/shim/
-
-# Shim is only required on platforms implementing the UEFI secure boot
-# protocol. The only one of those we currently wish to support is 64-bit x86.
-# Adding further platforms will require adding appropriate relocation code.
-ExclusiveArch: x86_64 aarch64
-
-# keep these two lists of sources synched up arch-wise. That is 0 and 10
-# match, 1 and 11 match, ...
-Source0: BOOTX64.CSV
-Source1: BOOTAA64.CSV
-Source2: BOOTIA32.CSV
-
-Source10: shimaa64.efi
-Source11: shimia32.efi
-Source12: shimx64.efi
-
-%global shimverx64 13-3.fc27
-%global shimveria32 13-3.fc27
-%global shimveraa64 13-3.fc27
-
-%ifarch x86_64
-BuildRequires: shim-unsigned-x64 = %{shimverx64}
-BuildRequires: shim-unsigned-ia32 = %{shimveria32}
-%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
-%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32
-%endif
-%ifarch aarch64
-BuildRequires: shim-unsigned-aarch64 = %{shimveraa64}
-%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
-%endif
-BuildRequires: pesign >= 0.112-20.fc27
-
-%description
-Initial UEFI bootloader that handles chaining to a trusted full bootloader
-under secure boot environments. This package contains the version signed by
-the UEFI signing service.
-
-%define define_pkg(a:p:) \
-%{expand:%%package -n shim-%{-a*}} \
-Summary: First-stage UEFI bootloader \
-Requires: mokutil >= 1:0.2.0-1 \
-Provides: shim-signed-%{-a*} = %{version}-%{release} \
-Requires: dbxtool >= 0.6-3 \
-%{expand:%%if 0%%{-p*} \
-Provides: shim = %{version}-%{release} \
-Provides: shim-signed = %{version}-%{release} \
-Obsoletes: shim-signed < %{version}-%{release} \
-Obsoletes: shim < %{version}-%{release} \
-%%endif} \
-# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI \
-# is not compatible with SysV (there's no red zone under UEFI) and \
-# there isn't a POSIX-style C library. \
-# BuildRequires: OpenSSL \
-Provides: bundled(openssl) = 1.0.2j \
- \
-%{expand:%%description -n shim-%{-a*}} \
-Initial UEFI bootloader that handles chaining to a trusted full \
-bootloader under secure boot environments. This package contains the \
-version signed by the UEFI signing service. \
-%{nil}
-
-%ifarch x86_64
-%define_pkg -a x64 -p 1
-%define_pkg -a ia32
-%endif
-%ifarch aarch64
-%define_pkg -a aa64 -p 1
-%endif
-
-%prep
-cd %{_builddir}
-rm -rf shim-signed-%{version}
-mkdir shim-signed-%{version}
-
-%build
-%define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
-%define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
-
-# -a <efiarch>
-# -i <input>
-%define hash(a:i:d:) \
- pesign -i %{-i*} -h -P > shim.hash \
- read file0 hash0 < shim.hash \
- read file1 hash1 < %{-d*}/shim%{-a*}.hash \
- if ! [ "$hash0" = "$hash1" ]; then \
- echo Invalid signature\! > /dev/stderr \
- echo $hash0 vs $hash1 \
- exit 1 \
- fi \
- %{nil}
-
-# -i <input>
-# -o <output>
-%define sign(i:o:) \
- %{expand:%%pesign -s -i %{-i*} -o %{-o*}} \
- %{nil}
-
-# -b <binary prefix>
-# -a <efiarch>
-# -i <input>
-%define distrosign(b:a:d:) \
- cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \
- %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi}\
- %{nil}
-
-# -a <efiarch>
-# -A <EFIARCH>
-# -b <yes|no> # signed by this builder?
-# -c <yes|no> # signed by UEFI CA?
-# -i <shimARCH.efi>
-%define define_build(a:A:b:c:i:d:) \
-if [ "%{-c*}" = "yes" ]; then \
- %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \
-fi \
-cp %{-i*} shim%{-a*}.efi \
-if [ "%{-b*}" = "yes" ]; then \
- %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \
- mv shim%{-a*}-signed.efi shim%{-a*}-%{efidir}.efi \
-fi \
-if [ "%{-c*}" = "yes" ]; then \
- cp shim%{-a*}-%{efidir}.efi shim%{-a*}.efi \
-fi \
-%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \
-mv mm%{-a*}-signed.efi mm%{-a*}.efi \
-%{expand:%%distrosign -b fb -a %{-a*} -d %{-d*}} \
-mv fb%{-a*}-signed.efi fb%{-a*}.efi \
-rm -vf \\\
- mm%{-a*}-unsigned.efi \\\
- fb%{-a*}-unsigned.efi \\\
- shim%{-a*}-unsigned.efi \
-%{nil}
-
-cd shim-signed-%{version}
-%ifarch aarch64
-%define_build -a aa64 -A AA64 -i %{SOURCE10} -b yes -c no -d %{shimdiraa64}
-%endif
-%ifarch x86_64
-%define_build -a ia32 -A IA32 -i %{SOURCE11} -b yes -c yes -d %{shimdiria32}
-%define_build -a x64 -A X64 -i %{SOURCE12} -b yes -c yes -d %{shimdirx64}
-%endif
-
-%install
-# -a <efiarch>
-# -A <EFIARCH>
-# -b <BOOTCSV>
-%define do_install(a:A:b:) \
-install -m 0700 shim%{-a*}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}.efi \
-install -m 0700 shim%{-a*}-%{efidir}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}-%{efidir}.efi \
-install -m 0700 mm%{-a*}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mm%{-a*}.efi \
-install -m 0700 %{-b*} \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \
-install -m 0700 shim%{-a*}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOT%{-A*}.EFI \
-install -m 0700 fb%{-a*}.efi \\\
- $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fb%{-a*}.efi \
-%nil
-
-rm -rf $RPM_BUILD_ROOT
-cd shim-signed-%{version}
-install -D -d -m 0755 $RPM_BUILD_ROOT/boot/
-install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/
-install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/
-install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
-install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/
-
-%ifarch x86_64
-%do_install -a x64 -A X64 -b %{SOURCE0}
-%do_install -a ia32 -A IA32 -b %{SOURCE2}
-install -m 0700 %{SOURCE2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV
-install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mmx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
-install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
-install -m 0700 %{SOURCE12} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
-%endif
-%ifarch aarch64
-%do_install -a aa64 -A AA64 -b %{SOURCE1}
-install -m 0700 %{SOURCE10} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
-%endif
-
-# -a <efiarch>
-# -A <EFIARCH>
-%define define_files(a:A:) \
-%{expand:%%files -n shim-%{-a*}} \
-%dir /boot/efi \
-%dir /boot/efi/EFI \
-%dir /boot/efi/EFI/BOOT \
-%dir /boot/efi/EFI/%{efidir} \
-/boot/efi/EFI/%{efidir}/*%{-a*}*.efi \
-/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \
-/boot/efi/EFI/BOOT/*%{-a*}.efi \
-/boot/efi/EFI/BOOT/*%{-A*}.EFI \
-%{nil}
-
-%ifarch x86_64
-%define_files -a x64 -A X64
-/boot/efi/EFI/%{efidir}/BOOT.CSV
-/boot/efi/EFI/%{efidir}/MokManager.efi
-/boot/efi/EFI/%{efidir}/shim.efi
-/boot/efi/EFI/BOOT/fallback.efi
-
-%define_files -a ia32 -A IA32
-%endif
-%ifarch aarch64
-%define_files -a aa64 -A AA64
-/boot/efi/EFI/%{efidir}/shim.efi
-%endif
-
-%changelog
-* Wed Nov 01 2017 Peter Jones <pjones(a)redhat.com> - 13-1
-- Now with the actual signed 64-bit build of shim 13 for x64 as well.
-- Make everything under /boot/efi be mode 0700, since that's what FAT will
- show anyway, so that rpm -V is correct.
- Resolves: rhbz#1508516
-
-* Tue Oct 24 2017 Peter Jones <pjones(a)redhat.com> - 13-0.8
-- Now with signed 32-bit x86 build.
- Related: rhbz#1474861
-
-* Wed Oct 04 2017 Peter Jones <pjones(a)redhat.com> - 13-0.7
-- Make /boot/efi/EFI/fedora/shim.efi still exist on aarch64 as well.
- Resolves: rhbz#1497854
-
-* Tue Sep 19 2017 Peter Jones <pjones(a)redhat.com> - 13-0.6
-- Fix binary format issue on Aarch64
- Resolves: rhbz#1489604
-
-* Tue Sep 05 2017 Peter Jones <pjones(a)redhat.com> - 13-0.5
-- Make /boot/efi/EFI/fedora/shim.efi still exist on x86_64, since some
- machines have boot entries that point to it.
-
-* Tue Aug 29 2017 Peter Jones <pjones(a)redhat.com> - 13-0.4
-- Make our provides not get silently ignore by rpmbuild...
-
-* Fri Aug 25 2017 Peter Jones <pjones(a)redhat.com> - 13-0.3
-- x64: use the new fbx64.efi and mm64.efi as fallback.efi and MokManager.efi
-- Provide: "shim" in x64 and aa64 builds
-
-* Thu Aug 24 2017 Peter Jones <pjones(a)redhat.com> - 13-0.2
-- Obsolete old shim builds.
-
-* Tue Aug 22 2017 Peter Jones <pjones(a)redhat.com> - 13-0.1
-- Initial (partially unsigned) build for multi-arch support on x64/ia32.
-
-* Thu Mar 23 2017 Petr Šabata <contyk(a)redhat.com> - 0.8-9
-- Re-enable dist tag for module builds
-
-* Tue Feb 17 2015 Peter Jones <pjones(a)redhat.com> - 0.8-8
-- Don't dual-sign shim-%%{efidir}.efi either.
- Resolves: rhbz#1184765
-
-* Tue Feb 17 2015 Peter Jones <pjones(a)redhat.com> - 0.8-8
-- Require dbxtool
-
-* Wed Dec 17 2014 Peter Jones <pjones(a)redhat.com> - 0.8-7
-- Wrong -signed changes got built for aarch64 last time, for dumb reasons.
- Related: rhbz#1170289
-
-* Fri Dec 05 2014 Peter Jones <pjones(a)redhat.com> - 0.8-6
-- Rebuild once more so we can use a different -unsigned version on different
- arches (because we can't tag a newer build into aarch64 without an x86
- update to match.)
- Related: rhbz#1170289
-
-* Wed Dec 03 2014 Peter Jones <pjones(a)redhat.com> - 0.8-5
-- Rebuild for aarch64 path fixes
- Related: rhbz#1170289
-
-* Thu Oct 30 2014 Peter Jones <pjones(a)redhat.com> - 0.8-2
-- Remove the dist tag so people don't complain about what it says.
-
-* Fri Oct 24 2014 Peter Jones <pjones(a)redhat.com> - 0.8-1
-- Update to shim 0.8
- rhbz#1148230
- rhbz#1148231
- rhbz#1148232
-- Handle building on aarch64 as well
-
-* Fri Jul 18 2014 Peter Jones <pjones(a)redhat.com> - 0.7-2
-- Don't do multi-signing; too many machines screw up verification.
- Resolves: rhbz#1049749
-
-* Wed Nov 13 2013 Peter Jones <pjones(a)redhat.com> - 0.7-1
-- Update to shim 0.7
- Resolves: rhbz#1023767
-
-* Thu Oct 24 2013 Peter Jones <pjones(a)redhat.com> - 0.5-1
-- Update to shim 0.5
-
-* Thu Jun 20 2013 Peter Jones <pjones(a)redhat.com> - 0.4-1
-- Provide a fallback for uninitialized Boot#### and BootOrder
- Resolves: rhbz#963359
-- Move all signing from shim-unsigned to here
-- properly compare our generated hash from shim-unsigned with the hash of
- the signed binary (as opposed to doing it manually)
-
-* Fri May 31 2013 Peter Jones <pjones(a)redhat.com> - 0.2-4.4
-- Re-sign to get alignments that match the new specification.
- Resolves: rhbz#963361
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-4.3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Wed Jan 02 2013 Peter Jones <pjones(a)redhat.com> - 0.2-3.3
-- Add obsoletes and provides for earlier shim-signed packages, to cover
- the package update cases where previous versions were installed.
- Related: rhbz#888026
-
-* Mon Dec 17 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3.2
-- Make the shim-unsigned dep be on the subpackage.
-
-* Sun Dec 16 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3.1
-- Rebuild to provide "shim" package directly instead of just as a Provides:
-
-* Sat Dec 15 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3
-- Also provide shim-fedora.efi, signed only by the fedora signer.
-- Fix the fedora signature on the result to actually be correct.
-- Update for shim-unsigned 0.2-3
-
-* Mon Dec 03 2012 Peter Jones <pjones(a)redhat.com> - 0.2-2
-- Initial build
diff --git a/shim.spec b/shim.spec
new file mode 100644
index 0000000..f596e3f
--- /dev/null
+++ b/shim.spec
@@ -0,0 +1,339 @@
+%global debug_package %{nil}
+
+%global efidir %(eval echo $(grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/'))
+
+# this is literally to make vim's \c not put a brace at the end.
+%global _dist %{expand:%{?_module_build:%%{?dist}}}
+%global dist %{expand:%%{_dist}}
+
+Name: shim
+Version: 13
+Release: 2%{dist}
+Summary: First-stage UEFI bootloader
+License: BSD
+URL: http://github.com/rhboot/shim/
+
+# Shim is only required on platforms implementing the UEFI secure boot
+# protocol. The only one of those we currently wish to support is 64-bit x86.
+# Adding further platforms will require adding appropriate relocation code.
+ExclusiveArch: x86_64 aarch64
+
+# keep these two lists of sources synched up arch-wise. That is 0 and 10
+# match, 1 and 11 match, ...
+Source0: BOOTX64.CSV
+Source1: BOOTAA64.CSV
+Source2: BOOTIA32.CSV
+
+Source10: shimaa64.efi
+Source11: shimia32.efi
+Source12: shimx64.efi
+
+%global shimverx64 13-3.fc27
+%global shimveria32 13-3.fc27
+%global shimveraa64 13-3.fc27
+
+%ifarch x86_64
+BuildRequires: shim-unsigned-x64 = %{shimverx64}
+BuildRequires: shim-unsigned-ia32 = %{shimveria32}
+%global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
+%global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32
+%endif
+%ifarch aarch64
+BuildRequires: shim-unsigned-aarch64 = %{shimveraa64}
+%global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
+%endif
+BuildRequires: pesign >= 0.112-20.fc27
+
+%description
+Initial UEFI bootloader that handles chaining to a trusted full bootloader
+under secure boot environments. This package contains the version signed by
+the UEFI signing service.
+
+%define define_pkg(a:p:) \
+%{expand:%%package -n shim-%{-a*}} \
+Summary: First-stage UEFI bootloader \
+Requires: mokutil >= 1:0.2.0-1 \
+Provides: shim-signed-%{-a*} = %{version}-%{release} \
+Requires: dbxtool >= 0.6-3 \
+%{expand:%%if 0%%{-p*} \
+Provides: shim = %{version}-%{release} \
+Provides: shim-signed = %{version}-%{release} \
+Obsoletes: shim-signed < %{version}-%{release} \
+Obsoletes: shim < %{version}-%{release} \
+%%endif} \
+# Shim uses OpenSSL, but cannot use the system copy as the UEFI ABI \
+# is not compatible with SysV (there's no red zone under UEFI) and \
+# there isn't a POSIX-style C library. \
+# BuildRequires: OpenSSL \
+Provides: bundled(openssl) = 1.0.2j \
+ \
+%{expand:%%description -n shim-%{-a*}} \
+Initial UEFI bootloader that handles chaining to a trusted full \
+bootloader under secure boot environments. This package contains the \
+version signed by the UEFI signing service. \
+%{nil}
+
+%ifarch x86_64
+%define_pkg -a x64 -p 1
+%define_pkg -a ia32
+%endif
+%ifarch aarch64
+%define_pkg -a aa64 -p 1
+%endif
+
+%prep
+cd %{_builddir}
+rm -rf shim-%{version}
+mkdir shim-%{version}
+
+%build
+%define vendor_token_str %{expand:%%{nil}%%{?vendor_token_name:-t "%{vendor_token_name}"}}
+%define vendor_cert_str %{expand:%%{!?vendor_cert_nickname:-c "Red Hat Test Certificate"}%%{?vendor_cert_nickname:-c "%%{vendor_cert_nickname}"}}
+
+# -a <efiarch>
+# -i <input>
+%define hash(a:i:d:) \
+ pesign -i %{-i*} -h -P > shim.hash \
+ read file0 hash0 < shim.hash \
+ read file1 hash1 < %{-d*}/shim%{-a*}.hash \
+ if ! [ "$hash0" = "$hash1" ]; then \
+ echo Invalid signature\! > /dev/stderr \
+ echo $hash0 vs $hash1 \
+ exit 1 \
+ fi \
+ %{nil}
+
+# -i <input>
+# -o <output>
+%define sign(i:o:) \
+ %{expand:%%pesign -s -i %{-i*} -o %{-o*}} \
+ %{nil}
+
+# -b <binary prefix>
+# -a <efiarch>
+# -i <input>
+%define distrosign(b:a:d:) \
+ cp -av %{-d*}/%{-b*}%{-a*}.efi %{-b*}%{-a*}-unsigned.efi \
+ %{expand:%%sign -i %{-b*}%{-a*}-unsigned.efi -o %{-b*}%{-a*}-signed.efi}\
+ %{nil}
+
+# -a <efiarch>
+# -A <EFIARCH>
+# -b <yes|no> # signed by this builder?
+# -c <yes|no> # signed by UEFI CA?
+# -i <shimARCH.efi>
+%define define_build(a:A:b:c:i:d:) \
+if [ "%{-c*}" = "yes" ]; then \
+ %{expand:%%hash -i %{-i*} -a %{-a*} -d %{-d*}} \
+fi \
+cp %{-i*} shim%{-a*}.efi \
+if [ "%{-b*}" = "yes" ]; then \
+ %{expand:%%distrosign -b shim -a %{-a*} -d %{-d*}} \
+ mv shim%{-a*}-signed.efi shim%{-a*}-%{efidir}.efi \
+fi \
+if [ "%{-c*}" = "yes" ]; then \
+ cp shim%{-a*}-%{efidir}.efi shim%{-a*}.efi \
+fi \
+%{expand:%%distrosign -b mm -a %{-a*} -d %{-d*}} \
+mv mm%{-a*}-signed.efi mm%{-a*}.efi \
+%{expand:%%distrosign -b fb -a %{-a*} -d %{-d*}} \
+mv fb%{-a*}-signed.efi fb%{-a*}.efi \
+rm -vf \\\
+ mm%{-a*}-unsigned.efi \\\
+ fb%{-a*}-unsigned.efi \\\
+ shim%{-a*}-unsigned.efi \
+%{nil}
+
+cd shim-%{version}
+%ifarch aarch64
+%define_build -a aa64 -A AA64 -i %{SOURCE10} -b yes -c no -d %{shimdiraa64}
+%endif
+%ifarch x86_64
+%define_build -a ia32 -A IA32 -i %{SOURCE11} -b yes -c yes -d %{shimdiria32}
+%define_build -a x64 -A X64 -i %{SOURCE12} -b yes -c yes -d %{shimdirx64}
+%endif
+
+%install
+# -a <efiarch>
+# -A <EFIARCH>
+# -b <BOOTCSV>
+%define do_install(a:A:b:) \
+install -m 0700 shim%{-a*}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}.efi \
+install -m 0700 shim%{-a*}-%{efidir}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim%{-a*}-%{efidir}.efi \
+install -m 0700 mm%{-a*}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mm%{-a*}.efi \
+install -m 0700 %{-b*} \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \
+install -m 0700 shim%{-a*}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/BOOT%{-A*}.EFI \
+install -m 0700 fb%{-a*}.efi \\\
+ $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fb%{-a*}.efi \
+%nil
+
+rm -rf $RPM_BUILD_ROOT
+cd shim-%{version}
+install -D -d -m 0755 $RPM_BUILD_ROOT/boot/
+install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/
+install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/
+install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
+install -D -d -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/
+
+%ifarch x86_64
+%do_install -a x64 -A X64 -b %{SOURCE0}
+%do_install -a ia32 -A IA32 -b %{SOURCE2}
+install -m 0700 %{SOURCE2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/BOOT.CSV
+install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/mmx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
+install -m 0700 $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fbx64.efi $RPM_BUILD_ROOT/boot/efi/EFI/BOOT/fallback.efi
+install -m 0700 %{SOURCE12} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
+%endif
+%ifarch aarch64
+%do_install -a aa64 -A AA64 -b %{SOURCE1}
+install -m 0700 %{SOURCE10} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/shim.efi
+%endif
+
+# -a <efiarch>
+# -A <EFIARCH>
+%define define_files(a:A:) \
+%{expand:%%files -n shim-%{-a*}} \
+%dir /boot/efi \
+%dir /boot/efi/EFI \
+%dir /boot/efi/EFI/BOOT \
+%dir /boot/efi/EFI/%{efidir} \
+/boot/efi/EFI/%{efidir}/*%{-a*}*.efi \
+/boot/efi/EFI/%{efidir}/BOOT%{-A*}.CSV \
+/boot/efi/EFI/BOOT/*%{-a*}.efi \
+/boot/efi/EFI/BOOT/*%{-A*}.EFI \
+%{nil}
+
+%ifarch x86_64
+%define_files -a x64 -A X64
+/boot/efi/EFI/%{efidir}/BOOT.CSV
+/boot/efi/EFI/%{efidir}/MokManager.efi
+/boot/efi/EFI/%{efidir}/shim.efi
+/boot/efi/EFI/BOOT/fallback.efi
+
+%define_files -a ia32 -A IA32
+%endif
+%ifarch aarch64
+%define_files -a aa64 -A AA64
+/boot/efi/EFI/%{efidir}/shim.efi
+%endif
+
+%changelog
+* Wed Feb 28 2018 Peter Jones <pjones(a)redhat.com> - 13-2
+- Pivot the shim-signed package to be here.
+
+* Wed Nov 01 2017 Peter Jones <pjones(a)redhat.com> - 13-1
+- Now with the actual signed 64-bit build of shim 13 for x64 as well.
+- Make everything under /boot/efi be mode 0700, since that's what FAT will
+ show anyway, so that rpm -V is correct.
+ Resolves: rhbz#1508516
+
+* Tue Oct 24 2017 Peter Jones <pjones(a)redhat.com> - 13-0.8
+- Now with signed 32-bit x86 build.
+ Related: rhbz#1474861
+
+* Wed Oct 04 2017 Peter Jones <pjones(a)redhat.com> - 13-0.7
+- Make /boot/efi/EFI/fedora/shim.efi still exist on aarch64 as well.
+ Resolves: rhbz#1497854
+
+* Tue Sep 19 2017 Peter Jones <pjones(a)redhat.com> - 13-0.6
+- Fix binary format issue on Aarch64
+ Resolves: rhbz#1489604
+
+* Tue Sep 05 2017 Peter Jones <pjones(a)redhat.com> - 13-0.5
+- Make /boot/efi/EFI/fedora/shim.efi still exist on x86_64, since some
+ machines have boot entries that point to it.
+
+* Tue Aug 29 2017 Peter Jones <pjones(a)redhat.com> - 13-0.4
+- Make our provides not get silently ignore by rpmbuild...
+
+* Fri Aug 25 2017 Peter Jones <pjones(a)redhat.com> - 13-0.3
+- x64: use the new fbx64.efi and mm64.efi as fallback.efi and MokManager.efi
+- Provide: "shim" in x64 and aa64 builds
+
+* Thu Aug 24 2017 Peter Jones <pjones(a)redhat.com> - 13-0.2
+- Obsolete old shim builds.
+
+* Tue Aug 22 2017 Peter Jones <pjones(a)redhat.com> - 13-0.1
+- Initial (partially unsigned) build for multi-arch support on x64/ia32.
+
+* Thu Mar 23 2017 Petr Šabata <contyk(a)redhat.com> - 0.8-9
+- Re-enable dist tag for module builds
+
+* Tue Feb 17 2015 Peter Jones <pjones(a)redhat.com> - 0.8-8
+- Don't dual-sign shim-%%{efidir}.efi either.
+ Resolves: rhbz#1184765
+
+* Tue Feb 17 2015 Peter Jones <pjones(a)redhat.com> - 0.8-8
+- Require dbxtool
+
+* Wed Dec 17 2014 Peter Jones <pjones(a)redhat.com> - 0.8-7
+- Wrong -signed changes got built for aarch64 last time, for dumb reasons.
+ Related: rhbz#1170289
+
+* Fri Dec 05 2014 Peter Jones <pjones(a)redhat.com> - 0.8-6
+- Rebuild once more so we can use a different -unsigned version on different
+ arches (because we can't tag a newer build into aarch64 without an x86
+ update to match.)
+ Related: rhbz#1170289
+
+* Wed Dec 03 2014 Peter Jones <pjones(a)redhat.com> - 0.8-5
+- Rebuild for aarch64 path fixes
+ Related: rhbz#1170289
+
+* Thu Oct 30 2014 Peter Jones <pjones(a)redhat.com> - 0.8-2
+- Remove the dist tag so people don't complain about what it says.
+
+* Fri Oct 24 2014 Peter Jones <pjones(a)redhat.com> - 0.8-1
+- Update to shim 0.8
+ rhbz#1148230
+ rhbz#1148231
+ rhbz#1148232
+- Handle building on aarch64 as well
+
+* Fri Jul 18 2014 Peter Jones <pjones(a)redhat.com> - 0.7-2
+- Don't do multi-signing; too many machines screw up verification.
+ Resolves: rhbz#1049749
+
+* Wed Nov 13 2013 Peter Jones <pjones(a)redhat.com> - 0.7-1
+- Update to shim 0.7
+ Resolves: rhbz#1023767
+
+* Thu Oct 24 2013 Peter Jones <pjones(a)redhat.com> - 0.5-1
+- Update to shim 0.5
+
+* Thu Jun 20 2013 Peter Jones <pjones(a)redhat.com> - 0.4-1
+- Provide a fallback for uninitialized Boot#### and BootOrder
+ Resolves: rhbz#963359
+- Move all signing from shim-unsigned to here
+- properly compare our generated hash from shim-unsigned with the hash of
+ the signed binary (as opposed to doing it manually)
+
+* Fri May 31 2013 Peter Jones <pjones(a)redhat.com> - 0.2-4.4
+- Re-sign to get alignments that match the new specification.
+ Resolves: rhbz#963361
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.2-4.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jan 02 2013 Peter Jones <pjones(a)redhat.com> - 0.2-3.3
+- Add obsoletes and provides for earlier shim-signed packages, to cover
+ the package update cases where previous versions were installed.
+ Related: rhbz#888026
+
+* Mon Dec 17 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3.2
+- Make the shim-unsigned dep be on the subpackage.
+
+* Sun Dec 16 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3.1
+- Rebuild to provide "shim" package directly instead of just as a Provides:
+
+* Sat Dec 15 2012 Peter Jones <pjones(a)redhat.com> - 0.2-3
+- Also provide shim-fedora.efi, signed only by the fedora signer.
+- Fix the fedora signature on the result to actually be correct.
+- Update for shim-unsigned 0.2-3
+
+* Mon Dec 03 2012 Peter Jones <pjones(a)redhat.com> - 0.2-2
+- Initial build
6 years, 1 month
Architecture specific change in rpms/golang-github-hashicorp-go-sockaddr.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-hashicorp-go-sockaddr.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-hashicorp-go-sockad....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 5ae296e589c6ac4283602de078e6e8d5269d2062
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 18:12:19 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-go-sockaddr.spec b/golang-github-hashicorp-go-sockaddr.spec
index 1e053cf..b091d01 100644
--- a/golang-github-hashicorp-go-sockaddr.spec
+++ b/golang-github-hashicorp-go-sockaddr.spec
@@ -1,201 +1,64 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-# Depends on hasicorp/consul -> cyclic deps
-%global with_check 0
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo go-sockaddr
-# https://github.com/hashicorp/go-sockaddr
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/go-sockaddr
+%global provider_prefix github.com/hashicorp/go-sockaddr
+%global gobaseipath %{provider_prefix}
%global commit af174a6fe6c9f9a049a638e1dae7bc4442c4d426
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20161202
+
+%gocraftmeta -i
-Name: golang-%{provider}-%{project}-%{repo}
+Name: %{goname}
Version: 0
-Release: 0.5.git%{shortcommit}%{?dist}
+Release: 0.6.%{commitdate}git%{shortcommit}%{?dist}
Summary: IP Address/UNIX Socket convenience functions for Go
# Detected licences
# - *No copyright* MPL (v2.0) at 'LICENSE'
License: MPLv2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires: golang(github.com/hashicorp/errwrap)
#BuildRequires: golang(github.com/mitchellh/cli)
BuildRequires: golang-github-mitchellh-cli-devel-temporary
BuildRequires: golang(github.com/mitchellh/go-wordwrap)
BuildRequires: golang(github.com/ryanuber/columnize)
-%endif
-Requires: golang(github.com/hashicorp/errwrap)
#Requires: golang(github.com/mitchellh/cli)
-Requires: golang-github-mitchellh-cli-devel-temporary
-Requires: golang(github.com/mitchellh/go-wordwrap)
-Requires: golang(github.com/ryanuber/columnize)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-Provides: golang(%{import_path}/cmd/sockaddr/command) = %{version}-%{release}
-Provides: golang(%{import_path}/template) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test-devel
-Summary: Unit tests for %{name} package
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%if 0%{?with_check} && ! 0%{?with_bundled}
-#BuildRequires: golang(github.com/hashicorp/consul/lib)
-%endif
-
-# Circular dependency between consul and go-sockaddr
-#Requires: golang(github.com/hashicorp/consul/lib)
-
-%description unit-test-devel
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
+%gosetup
-%build
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go" | grep -v "cmd/sockaddr/vendor") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test-devel.file-list
-for file in $(find . -iname "*_test.go" | grep -v "cmd/sockaddr/vendor") ; do
- dirprefix=$(dirname $file)
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list
-
- while [ "$dirprefix" != "." ]; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list
- dirprefix=$(dirname $dirprefix)
- done
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/cmd/sockaddr/vendor:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%gotest %{import_path}
-%gotest %{import_path}/template
-%endif
+# Depends on hasicorp/consul -> cyclic deps
+#%%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test-devel -f unit-test-devel.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.6.20161202gitaf174a6
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.5.gitaf174a6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
Architecture specific change in rpms/golang-github-hashicorp-go-syslog.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-hashicorp-go-syslog.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-hashicorp-go-syslog....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
Thanks.
Full change:
============
commit cc6b44a8ada1489f397929e7de3e75143098a91f
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 18:13:05 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-go-syslog.spec b/golang-github-hashicorp-go-syslog.spec
index 3137616..bf28c08 100644
--- a/golang-github-hashicorp-go-syslog.spec
+++ b/golang-github-hashicorp-go-syslog.spec
@@ -1,155 +1,53 @@
-%if 0%{?fedora} || 0%{?rhel} == 6
-%global with_devel 1
-%global with_bundled 0
-%global with_debug 0
-# No tests
-%global with_check 0
-%global with_unit_test 0
-%else
-%global with_devel 0
-%global with_bundled 0
-%global with_debug 0
-%global with_check 0
-%global with_unit_test 0
-%endif
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo go-syslog
-# https://github.com/hashicorp/go-syslog
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/go-syslog
+%global provider_prefix github.com/hashicorp/go-syslog
+%global gobaseipath %{provider_prefix}
%global commit 42a2b573b664dbf281bd48c3cc12c086b17a39ba
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20151218
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.10.git%{shortcommit}%{?dist}
+Release: 0.11.%{commitdate}git%{shortcommit}%{?dist}
Summary: Golang syslog wrapper, cross-compile friendly
License: MIT
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
-%endif
-
-Provides: golang(%{import_path}) = %{version}-%{release}
-
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.11.20151218git42a2b57
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.10.git42a2b57
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month
Architecture specific change in rpms/golang-github-hashicorp-go-multierror.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-hashicorp-go-multierror.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-hashicorp-go-multie....
Change:
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
Thanks.
Full change:
============
commit 26ce2d0be055bebe3869f0c6bdbd845269bb09a1
Author: Jan Chaloupka <jchaloup(a)redhat.com>
Date: Wed Feb 28 18:05:22 2018 +0100
Autogenerate some parts using the new macros
diff --git a/golang-github-hashicorp-go-multierror.spec b/golang-github-hashicorp-go-multierror.spec
index d3a6c12..429ae1f 100644
--- a/golang-github-hashicorp-go-multierror.spec
+++ b/golang-github-hashicorp-go-multierror.spec
@@ -1,168 +1,55 @@
-# If any of the following macros should be set otherwise,
-# you can wrap any of them with the following conditions:
-# - %%if 0%%{centos} == 7
-# - %%if 0%%{?rhel} == 7
-# - %%if 0%%{?fedora} == 23
-# Or just test for particular distribution:
-# - %%if 0%%{centos}
-# - %%if 0%%{?rhel}
-# - %%if 0%%{?fedora}
-#
-# Be aware, on centos, both %%rhel and %%centos are set. If you want to test
-# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition.
-# (Don't forget to replace double percentage symbol with single one in order to apply a condition)
-
-# Generate devel rpm
-%global with_devel 1
-# Build project from bundled dependencies
-%global with_bundled 0
-# Build with debug info rpm
-%global with_debug 0
-# Run tests in check section
-%global with_check 1
-# Generate unit-test rpm
-%global with_unit_test 1
-
-%if 0%{?with_debug}
-%global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
-
-%global provider github
-%global provider_tld com
-%global project hashicorp
-%global repo go-multierror
-# https://github.com/hashicorp/go-multierror
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
+# http://github.com/hashicorp/go-multierror
+%global provider_prefix github.com/hashicorp/go-multierror
+%global gobaseipath %{provider_prefix}
%global commit d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20151116
-Name: golang-%{provider}-%{project}-%{repo}
+%gocraftmeta -i
+
+Name: %{goname}
Version: 0
-Release: 0.13.git%{shortcommit}%{?dist}
+Release: 0.14.%{commitdate}git%{shortcommit}%{?dist}
Summary: Package for representing a list of errors as a single error
License: MPLv2.0
-URL: https://%{provider_prefix}
-Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
-
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+URL: %{gourl}
+Source0: %{gosource}
%description
%{summary}
-%if 0%{?with_devel}
%package devel
Summary: %{summary}
BuildArch: noarch
-%if 0%{?with_check}
BuildRequires: golang(github.com/hashicorp/errwrap)
-%endif
-
-Requires: golang(github.com/hashicorp/errwrap)
-
-Provides: golang(%{import_path}) = %{version}-%{release}
%description devel
%{summary}
This package contains library source intended for
building other packages which use import path with
-%{import_path} prefix.
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%package unit-test
-Summary: Unit tests for %{name} package
-
-%if 0%{?with_check}
-#Here comes all BuildRequires: PACKAGE the unit tests
-#in %%check section need for running
-%endif
-
-# test subpackage tests code from devel subpackage
-Requires: %{name}-devel = %{version}-%{release}
-
-%description unit-test
-%{summary}
-
-This package contains unit tests for project
-providing packages with %{import_path} prefix.
-%endif
+%{gobaseipath} prefix.
%prep
-%setup -q -n %{repo}-%{commit}
-
-%build
+%gosetup
%install
-# source codes for building projects
-%if 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list
-# find all *.go but no *_test.go files and generate devel.file-list
-for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list
-done
-%endif
-
-# testing files for this project
-%if 0%{?with_unit_test} && 0%{?with_devel}
-install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-# find all *_test.go files and generate unit-test.file-list
-for file in $(find . -iname "*_test.go"); do
- echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list
- install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file)
- cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file
- echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test.file-list
-done
-%endif
-
-%if 0%{?with_devel}
-sort -u -o devel.file-list devel.file-list
-%endif
+%goinstall
%check
-%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel}
-%if ! 0%{?with_bundled}
-export GOPATH=%{buildroot}/%{gopath}:%{gopath}
-%else
-export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath}
-%endif
-
-%if ! 0%{?gotest:1}
-%global gotest go test
-%endif
-
-# failing, needs github.com/hashicorp/errwrap
-#%gotest %{import_path}
-%endif
+%gochecks
#define license tag if not already defined
%{!?_licensedir:%global license %doc}
-%if 0%{?with_devel}
%files devel -f devel.file-list
%license LICENSE
%doc README.md
-%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
-%endif
-
-%if 0%{?with_unit_test} && 0%{?with_devel}
-%files unit-test -f unit-test.file-list
-%license LICENSE
-%doc README.md
-%endif
%changelog
+* Wed Feb 28 2018 Jan Chaloupka <jchaloup(a)redhat.com> - 0-0.14.20151116gitd30f099
+- Autogenerate some parts using the new macros
+
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.13.gitd30f099
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 1 month