From a7962163fe14590b3b9eaec7e9d98f0759a4586daaa275fbefdb320e6b923d83 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 21 Nov 2017 14:07:42 +0000 Subject: [PATCH 1/8] - Update to version 20171121: * - permissions: adding kwayland (bsc#1062182) OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=182 --- _servicedata | 2 +- permissions.changes | 6 ++++++ permissions.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/_servicedata b/_servicedata index 0177e23..321ae18 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/permissions.git - 73fce42f13a75d8e1a572f366bcebd7a8a0ecbeb \ No newline at end of file + 8072ba415067d92adfe04b2c9e3ba5452e41ef1d \ No newline at end of file diff --git a/permissions.changes b/permissions.changes index cc05748..9cec3e5 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 21 14:03:29 UTC 2017 - krahmer@suse.com + +- Update to version 20171121: + * - permissions: adding kwayland (bsc#1062182) + ------------------------------------------------------------------- Mon Nov 06 15:55:58 UTC 2017 - eeich@suse.com diff --git a/permissions.spec b/permissions.spec index e55eee8..15eee24 100644 --- a/permissions.spec +++ b/permissions.spec @@ -20,7 +20,7 @@ BuildRequires: libcap-devel Name: permissions -Version: 20171106 +Version: 20171121 Release: 0 Provides: aaa_base:/etc/permissions PreReq: %fillup_prereq From 27f74ef4132a0c961ec0465851b684336e8c4db09c0fc792ce2d8e5c79dd326f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 21 Nov 2017 14:07:59 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=183 --- permissions-20171121.tar.xz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 permissions-20171121.tar.xz diff --git a/permissions-20171121.tar.xz b/permissions-20171121.tar.xz new file mode 100644 index 0000000..0b9c374 --- /dev/null +++ b/permissions-20171121.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1dd6dbc47f6964ef047dea5a9149477740e84f06c31c68e7db74500ef43b3331 +size 19920 From 914f17f6d2cd8b22ee402d1f7748a1227a0dea88f442512ba316f1c7ebc38eb5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 21 Nov 2017 16:14:45 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=184 --- permissions-20171106.tar.xz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 permissions-20171106.tar.xz diff --git a/permissions-20171106.tar.xz b/permissions-20171106.tar.xz deleted file mode 100644 index 46c2a87..0000000 --- a/permissions-20171106.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99db272036de941c6aaeaca0a6aeaeaa9d4e47f01e97a56dd5fad98c9c99b627 -size 19888 From 2688fa191a8c5db36bad49a9551a79b0a836bfef8d4330b3ba1ea11f28f453f9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 23 Nov 2017 14:58:07 +0000 Subject: [PATCH 4/8] Accepting request 544692 from home:RBrownSUSE:branches:Base:System Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544692 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=185 --- permissions.changes | 6 ++++++ permissions.spec | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/permissions.changes b/permissions.changes index 9cec3e5..305053b 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:41:09 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Tue Nov 21 14:03:29 UTC 2017 - krahmer@suse.com diff --git a/permissions.spec b/permissions.spec index 15eee24..9e3b730 100644 --- a/permissions.spec +++ b/permissions.spec @@ -17,6 +17,11 @@ # icecream 0 +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + BuildRequires: libcap-devel Name: permissions @@ -73,6 +78,6 @@ make DESTDIR="$RPM_BUILD_ROOT" install %{_bindir}/chkstat %{_mandir}/man5/permissions.5* %{_mandir}/man8/chkstat.8* -/var/adm/fillup-templates/sysconfig.security +%{_fillupdir}/sysconfig.security %changelog From 24ce7041d6d7fa9fe9ad69dbd11d74dc1e76577fc6d7758c0dc8843a510894bc Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 24 Nov 2017 16:26:13 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=186 --- permissions.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/permissions.spec b/permissions.spec index 9e3b730..063681a 100644 --- a/permissions.spec +++ b/permissions.spec @@ -61,7 +61,7 @@ Authors: make %{?_smp_mflags} CFLAGS="-W -Wall $RPM_OPT_FLAGS" FSCAPS_DEFAULT_ENABLED=0 %install -make DESTDIR="$RPM_BUILD_ROOT" install +make DESTDIR="$RPM_BUILD_ROOT" install fillupdir=%_fillupdir %post %{fillup_only -n security} From f434538bbde3ba4f289a723c5ef8c46ba76107bf333c607b49860c3fef91cebb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 29 Nov 2017 17:02:48 +0000 Subject: [PATCH 6/8] - Update to version 20171129: * permissions: adding gvfs (bsc#1065864) * Allow setgid incingacmd on directory /run/icinga2/cmd bsc#1069410 * Allow fping cap_net_raw (bsc#1047921) OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=187 --- _servicedata | 2 +- permissions-20171121.tar.xz | 3 --- permissions-20171129.tar.xz | 3 +++ permissions.changes | 8 ++++++++ permissions.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 permissions-20171121.tar.xz create mode 100644 permissions-20171129.tar.xz diff --git a/_servicedata b/_servicedata index 321ae18..a8bc9d0 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/permissions.git - 8072ba415067d92adfe04b2c9e3ba5452e41ef1d \ No newline at end of file + 37fe496b66d03043da61fc1af7cd51f21d4e2000 \ No newline at end of file diff --git a/permissions-20171121.tar.xz b/permissions-20171121.tar.xz deleted file mode 100644 index 0b9c374..0000000 --- a/permissions-20171121.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1dd6dbc47f6964ef047dea5a9149477740e84f06c31c68e7db74500ef43b3331 -size 19920 diff --git a/permissions-20171129.tar.xz b/permissions-20171129.tar.xz new file mode 100644 index 0000000..dbaff3e --- /dev/null +++ b/permissions-20171129.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2236dad31161c64e2977c11d47c4c90f64495582dc9749245eca3723a56f27b4 +size 20020 diff --git a/permissions.changes b/permissions.changes index 305053b..7512132 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 29 17:02:20 UTC 2017 - astieger@suse.com + +- Update to version 20171129: + * permissions: adding gvfs (bsc#1065864) + * Allow setgid incingacmd on directory /run/icinga2/cmd bsc#1069410 + * Allow fping cap_net_raw (bsc#1047921) + ------------------------------------------------------------------- Thu Nov 23 13:41:09 UTC 2017 - rbrown@suse.com diff --git a/permissions.spec b/permissions.spec index 063681a..8f28d8d 100644 --- a/permissions.spec +++ b/permissions.spec @@ -25,7 +25,7 @@ BuildRequires: libcap-devel Name: permissions -Version: 20171121 +Version: 20171129 Release: 0 Provides: aaa_base:/etc/permissions PreReq: %fillup_prereq From d85ec2cc61bceb03c3c48167f28566b87e89ebe0f13100d2277e8152b1ee3314 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 30 Nov 2017 10:35:19 +0000 Subject: [PATCH 7/8] Accepting request 546606 from home:pluskalm:branches:Base:System - Cleanup spec file with spec-cleaner - Drop conditions/definitions related to old distros OBS-URL: https://build.opensuse.org/request/show/546606 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=188 --- permissions.changes | 6 +++++ permissions.spec | 59 +++++++++++++++------------------------------ 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/permissions.changes b/permissions.changes index 7512132..4411c86 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 30 08:24:44 UTC 2017 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Drop conditions/definitions related to old distros + ------------------------------------------------------------------- Wed Nov 29 17:02:20 UTC 2017 - astieger@suse.com diff --git a/permissions.spec b/permissions.spec index 8f28d8d..a7f4303 100644 --- a/permissions.spec +++ b/permissions.spec @@ -14,70 +14,51 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# icecream 0 -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif - -BuildRequires: libcap-devel - Name: permissions Version: 20171129 Release: 0 -Provides: aaa_base:/etc/permissions -PreReq: %fillup_prereq Summary: SUSE Linux Default Permissions -# Maintained in github by the security team. +# Maintained in github by the security team. License: GPL-2.0+ Group: Productivity/Security -%if 0%{?suse_version} >= 1330 -Requires(pre): group(trusted) -#!BuildIgnore: group(trusted) -%endif -Source: permissions-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://github.com/openSUSE/permissions +Source: permissions-%{version}.tar.xz +BuildRequires: libcap-devel +#!BuildIgnore: group(trusted) +Requires(pre): %fillup_prereq +Requires(pre): group(trusted) +Provides: aaa_base:%{_sysconfdir}/permissions %description -Permission settings of files and directories depending on the -local security settings. The local security setting (easy, secure, -or paranoid) can be configured in /etc/sysconfig/security. - - -Authors: --------- - Werner Fink - Roman Drahtmüller - Michael Schröder - Ludwig Nussel +Permission settings of files and directories depending on the local +security settings. The local security setting (easy, secure, or paranoid) +can be configured in /etc/sysconfig/security. %prep %setup -q %build -make %{?_smp_mflags} CFLAGS="-W -Wall $RPM_OPT_FLAGS" FSCAPS_DEFAULT_ENABLED=0 +make %{?_smp_mflags} CFLAGS="-W -Wall %{optflags}" FSCAPS_DEFAULT_ENABLED=0 %install -make DESTDIR="$RPM_BUILD_ROOT" install fillupdir=%_fillupdir +%make_install fillupdir=%{_fillupdir} %post %{fillup_only -n security} # apply all potentially changed permissions -/usr/bin/chkstat --system +%{_bindir}/chkstat --system %files -%defattr(-,root,root,-) -%config /etc/permissions -%config /etc/permissions.easy -%config /etc/permissions.secure -%config /etc/permissions.paranoid -%config(noreplace) /etc/permissions.local +%config %{_sysconfdir}/permissions +%config %{_sysconfdir}/permissions.easy +%config %{_sysconfdir}/permissions.secure +%config %{_sysconfdir}/permissions.paranoid +%config(noreplace) %{_sysconfdir}/permissions.local %{_bindir}/chkstat -%{_mandir}/man5/permissions.5* -%{_mandir}/man8/chkstat.8* +%{_mandir}/man5/permissions.5%{ext_man} +%{_mandir}/man8/chkstat.8%{ext_man} %{_fillupdir}/sysconfig.security %changelog From 0433ec9d56d5d57e6d542c1117b3e6441a05e9613240cf4d179d4fef4ae27d79 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 5 Dec 2017 07:10:12 +0000 Subject: [PATCH 8/8] Accepting request 548215 from home:kukuk:branches:Base:System - fillup is required for post, not pre installation OBS-URL: https://build.opensuse.org/request/show/548215 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=189 --- permissions.changes | 5 +++++ permissions.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/permissions.changes b/permissions.changes index 4411c86..d993bc8 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 4 18:45:53 UTC 2017 - kukuk@suse.com + +- fillup is required for post, not pre installation + ------------------------------------------------------------------- Thu Nov 30 08:24:44 UTC 2017 - mpluskal@suse.com diff --git a/permissions.spec b/permissions.spec index a7f4303..9b6bac1 100644 --- a/permissions.spec +++ b/permissions.spec @@ -27,7 +27,7 @@ Url: http://github.com/openSUSE/permissions Source: permissions-%{version}.tar.xz BuildRequires: libcap-devel #!BuildIgnore: group(trusted) -Requires(pre): %fillup_prereq +Requires(post): %fillup_prereq Requires(pre): group(trusted) Provides: aaa_base:%{_sysconfdir}/permissions