The package rpms/cjdns.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/cjdns.git/commit/?id=59db84d2dc1d022....
Change: +ExclusiveArch: %{nodejs_arches}
Thanks.
Full change: ============
commit e80e13c84ac51f6294feccc67988ce98b18c0ce6 Author: Stuart D. Gathman stuart@gathman.org Date: Mon Nov 12 19:17:22 2018 -0500
Add back map permission I accidentally removed.
diff --git a/cjdns.selinux.patch b/cjdns.selinux.patch index 65d7f9c..77d3052 100644 --- a/cjdns.selinux.patch +++ b/cjdns.selinux.patch @@ -17,7 +17,7 @@ diff -up ./contrib/selinux/cjdns.te.selinux ./contrib/selinux/cjdns.te # Let master process run further restricted subprocess -allow cjdns_t cjdns_exec_t:file { execute_no_trans execmod }; -allow cjdns_t self:capability { net_admin net_raw setuid setgid sys_chroot sys_module }; -+allow cjdns_t cjdns_exec_t:file { execute_no_trans execmod }; ++allow cjdns_t cjdns_exec_t:file { execute_no_trans execmod map }; +allow cjdns_t self:capability { net_admin net_raw setuid setgid sys_chroot }; allow cjdns_t self:process { signal getcap setrlimit setcap }; -allow cjdns_t kernel_t:system module_request;
commit 7ff0fd412b5064871a2d7d9736b60f5682cd11e7 Author: Stuart D. Gathman stuart@gathman.org Date: Sun Nov 11 19:02:40 2018 -0500
Include python2-matplotlib for el7
diff --git a/cjdns.spec b/cjdns.spec index 1671102..4a51d9f 100644 --- a/cjdns.spec +++ b/cjdns.spec @@ -201,18 +201,19 @@ BuildArch: noarch Python tools for cjdns.
%package graph -Summary: Python tools for cjdns +Summary: Python peer graph tools for cjdns Group: System Environment/Base Requires: python2-%{name} = %{version}-%{release} %if 0%{?rhel} == 6 || 0%{?rhel} == 7 Requires: python-networkx +Requires: python2-matplotlib %else Requires: python2-networkx %endif BuildArch: noarch
%description graph -Python graphing tools for cjdns. +Python peer graph tools for cjdns.
%prep %setup -qn cjdns-%{name}-v%{version}
commit 18fe74de2399f9ff2c7275008b0ef5df18d47112 Merge: 161925e d142e0f Author: Stuart D. Gathman stuart@gathman.org Date: Thu Nov 8 22:16:56 2018 -0500
Merge branch 'master' into epel7
commit d142e0f98edd6fedbd1090aeff7cef810de6a742 Author: Stuart D. Gathman stuart@gathman.org Date: Thu Nov 8 22:15:59 2018 -0500
python2-rpm-macros not present on EPEL
diff --git a/cjdns.spec b/cjdns.spec index 3b5e73b..1671102 100644 --- a/cjdns.spec +++ b/cjdns.spec @@ -189,7 +189,11 @@ Provides: %{name}-python = %{version}-%{release} Obsoletes: %{name}-python < %{version}-%{release} Summary: Python tools for cjdns Group: System Environment/Base +%if 0%{?fedora} >= 18 BuildRequires: python2-rpm-macros +%else +BuildRequires: python-rpm-macros +%endif Requires: python2, %{name} = %{version}-%{release} BuildArch: noarch
commit 161925e023e0105ee0aff21cb13fec599b382ada Merge: 6a35a82 7b61aa8 Author: Stuart D. Gathman stuart@gathman.org Date: Wed Jul 18 18:36:19 2018 -0400
Merge branch 'master' into epel7
commit 6a35a828dc943c2c08b7115161cfe36b6bec8a48 Merge: d10b67e 2e1ec6b Author: Stuart D. Gathman stuart@gathman.org Date: Wed May 30 20:22:59 2018 -0400
Merge branch 'master' into epel7 Remove map permission - not present in epel7
diff --cc cjdns.selinux.patch index 34680df,77d3052..65d7f9c --- a/cjdns.selinux.patch +++ b/cjdns.selinux.patch @@@ -11,11 -11,13 +11,13 @@@ diff -up ./contrib/selinux/cjdns.te.sel }
type cjdns_t; - @@ -18,23 +18,23 @@ init_daemon_domain(cjdns_t,cjdns_exec_t) + @@ -17,24 +17,24 @@ init_daemon_domain(cjdns_t,cjdns_exec_t) + #============= cjdns_t ============== # Let master process run further restricted subprocess - allow cjdns_t cjdns_exec_t:file { execute_no_trans execmod }; + -allow cjdns_t cjdns_exec_t:file { execute_no_trans execmod }; -allow cjdns_t self:capability { net_admin net_raw setuid setgid sys_chroot sys_module }; -+allow cjdns_t cjdns_exec_t:file { execute_no_trans execmod map }; +++allow cjdns_t cjdns_exec_t:file { execute_no_trans execmod }; +allow cjdns_t self:capability { net_admin net_raw setuid setgid sys_chroot }; allow cjdns_t self:process { signal getcap setrlimit setcap }; -allow cjdns_t kernel_t:system module_request;
commit d10b67e1a26bd2d207529736473da7b4edda1dd1 Author: Stuart D. Gathman stuart@gathman.org Date: Tue Mar 6 14:15:33 2018 -0500
Fix changelog date
diff --git a/cjdns.spec b/cjdns.spec index 2deeda1..1ffcf4d 100644 --- a/cjdns.spec +++ b/cjdns.spec @@ -540,7 +540,7 @@ fi %{_bindir}/graphStats
%changelog -* Wed Mar 5 2018 Stuart Gathman stuart@gathman.org - 20.1-2 +* Tue Mar 6 2018 Stuart Gathman stuart@gathman.org - 20.1-2 - selinux: Allow map access to cjdns_exec_t - disable subnode by default
commit 38562d1dc11c7a03300d35604fcf26b0e59fd4f9 Author: Stuart D. Gathman stuart@gathman.org Date: Tue Mar 6 14:00:45 2018 -0500
Disable subnode
diff --git a/cjdns.spec b/cjdns.spec index b07597f..2deeda1 100644 --- a/cjdns.spec +++ b/cjdns.spec @@ -2,9 +2,11 @@ # Fedora review: http://bugzilla.redhat.com/1268716
# Option to enable SUBNODE mode (WIP) -%bcond_without subnode -# Use the optimized libnacl embedded with cjdns -%if %{with subnode} +%bcond_with subnode +# Option to use the optimized libnacl embedded with cjdns +%bcond_without embedded + +%if %{with subnode} || %{with embedded} %global use_embedded 1 %else %global use_embedded 0 @@ -47,7 +49,7 @@ Name: cjdns # major version is cjdns protocol version: Version: 20.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The privacy-friendly network without borders Group: System Environment/Base # cjdns is all GPLv3 except libuv which is MIT and BSD and ISC @@ -538,6 +540,10 @@ fi %{_bindir}/graphStats
%changelog +* Wed Mar 5 2018 Stuart Gathman stuart@gathman.org - 20.1-2 +- selinux: Allow map access to cjdns_exec_t +- disable subnode by default + * Wed Feb 21 2018 Stuart Gathman stuart@gathman.org - 20.1-1 - New upstream release
commit 72ae666bb9896461686d50f55285c0b65e7c15ee Merge: 164090c 66beed5 Author: Stuart D. Gathman stuart@gathman.org Date: Wed Feb 21 19:24:48 2018 -0500
Merge branch 'master' into epel7
commit 164090c6cc59e9428d22465b830ca8b8eec33ee0 Merge: a763a31 ebe5a5a Author: Stuart D. Gathman stuart@gathman.org Date: Wed May 24 20:05:30 2017 -0400
Merge branch 'master' into epel7
commit a763a31021d3994cfeb29c25e95c99acbf562627 Merge: 831e5fb 6975af8 Author: Stuart D. Gathman stuart@gathman.org Date: Mon Apr 24 20:29:48 2017 -0400
Merge branch 'master' into epel7
commit 831e5fb3c1778bf276fa6d891d6f52d3af565468 Merge: 538de79 78d1d51 Author: Stuart D. Gathman stuart@gathman.org Date: Fri Feb 24 21:24:35 2017 -0500
Merge branch 'master' into epel7
commit 538de792f0c0d3f223a1cfd1f673b3d06ed36e63 Merge: 01bb2de 25a0441 Author: Stuart D. Gathman stuart@gathman.org Date: Sat Oct 15 13:37:41 2016 -0400
Merge branch 'master' into epel7
commit 01bb2dea6c784747a916039b94ed8f49eced2c18 Merge: 7a05c92 eb9005a Author: Stuart D. Gathman stuart@gathman.org Date: Sun Jul 3 15:04:51 2016 -0400
Merge branch 'master' into epel7
commit 7a05c92088d2c881f1f37de1dd7e4d15cfe1dec5 Merge: 8b2fce2 3559534 Author: Stuart D. Gathman stuart@gathman.org Date: Fri Jun 24 12:23:19 2016 -0400
Merge branch 'master' into epel7
commit 8b2fce22037de8df0b3b2afcd69c0bf9dcf04f99 Merge: 862adfc 264d6d9 Author: Stuart D. Gathman stuart@gathman.org Date: Mon May 9 20:00:03 2016 -0400
Merge branch 'master' into epel7
commit 862adfcc2caef249a1c4b06cd4b50c359c105fa2 Merge: 59db84d 7134b1a Author: Stuart D. Gathman stuart@gathman.org Date: Mon Apr 18 23:09:53 2016 -0400
Merge branch 'master' into epel7
commit 59db84d2dc1d022ea8c675fe2db14dd1644495e1 Author: Stuart D. Gathman stuart@gathman.org Date: Sat Mar 26 11:56:19 2016 -0400
Add ExclusiveArch because of nodejs build system
diff --git a/cjdns.spec b/cjdns.spec index 2d34470..745003d 100644 --- a/cjdns.spec +++ b/cjdns.spec @@ -88,6 +88,8 @@ Requires(postun): systemd %endif Requires(pre): shadow-utils Provides: bundled(libuv) = 0.11.4 +# build system requires nodejs, unfortunately +ExclusiveArch: %{nodejs_arches}
%description Cjdns implements an encrypted IPv6 network using public-key cryptography for
arch-excludes@lists.fedoraproject.org