From c6c0f6864480f442a087285cdbccf0ee18cff61a83c5b48360c9675e6bc1c685 Mon Sep 17 00:00:00 2001 From: Johannes Segitz Date: Wed, 11 Nov 2020 10:46:39 +0000 Subject: [PATCH 1/2] Accepting request 847754 from home:mgerstner:branches:Base:System - Update to version 20201111: * squid: remove basic_pam_auth which doesn't need special perms (bsc#1171569) * mgetty: remove long dead (or never existing) locks directory (bsc#1171882) * adjust squid pinger path (bsc#1171569) * profiles: remove now superfluous squid pinger paths (bsc#1171569) * ksgrd_network_helper: remove obviously wrong path * etc/permissions: remove unnecessary, duplicate, outdated entries * chkstat: implement support for variables in profile paths in new variables.conf * man pages: add documentation about variables, update copyrights * profiles: use new variables feature to remove redundant entries * profiles: prepare /usr/sbin versions of profile entries (bsc#1029961) * Makefile: support CXXFLAGS and LDFLAGS override / extension via make/env variables (bsc#1178475) * Makefile: compile with LFO support to fix 32-bit emulation on 64-bit hosts (bsc#1178476) * README: added information about know limitations of this approach - adjusted spec file: - package new variables.conf - apply %{optflags} correctly via CXXFLAGS variable - drop FSCAPS_DEFAULT_ENABLED which isn't recognized anymore by the refactored chkstat sources. This is now the default. OBS-URL: https://build.opensuse.org/request/show/847754 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=289 --- _servicedata | 2 +- permissions-20201008.tar.xz | 3 --- permissions-20201111.tar.xz | 3 +++ permissions.changes | 24 ++++++++++++++++++++++++ permissions.spec | 5 +++-- 5 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 permissions-20201008.tar.xz create mode 100644 permissions-20201111.tar.xz diff --git a/_servicedata b/_servicedata index aa51711..d82ae54 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/permissions.git - 92eac1c845a2b647cc1aeb6c862fc6c93cc50b3d \ No newline at end of file + cc9cec0e1ec03843765dc2dd6e746e7dfdc1f8fe \ No newline at end of file diff --git a/permissions-20201008.tar.xz b/permissions-20201008.tar.xz deleted file mode 100644 index fb5b353..0000000 --- a/permissions-20201008.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aca5ac4a9f989df2c01176a37260898ae03feea41ff8c28bbf1ff775ffceb5f9 -size 44324 diff --git a/permissions-20201111.tar.xz b/permissions-20201111.tar.xz new file mode 100644 index 0000000..445e5a4 --- /dev/null +++ b/permissions-20201111.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e01c2b36d75d2542ba803245d35a0d38040b45d6e4e257e82dc8714e47352a30 +size 47032 diff --git a/permissions.changes b/permissions.changes index bfb14e1..74fce4d 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Wed Nov 11 09:30:37 UTC 2020 - matthias.gerstner@suse.com + +- Update to version 20201111: + * squid: remove basic_pam_auth which doesn't need special perms (bsc#1171569) + * mgetty: remove long dead (or never existing) locks directory (bsc#1171882) + * adjust squid pinger path (bsc#1171569) + * profiles: remove now superfluous squid pinger paths (bsc#1171569) + * ksgrd_network_helper: remove obviously wrong path + * etc/permissions: remove unnecessary, duplicate, outdated entries + * chkstat: implement support for variables in profile paths in new + variables.conf + * man pages: add documentation about variables, update copyrights + * profiles: use new variables feature to remove redundant entries + * profiles: prepare /usr/sbin versions of profile entries (bsc#1029961) + * Makefile: support CXXFLAGS and LDFLAGS override / extension via make/env variables (bsc#1178475) + * Makefile: compile with LFO support to fix 32-bit emulation on 64-bit hosts (bsc#1178476) + * README: added information about know limitations of this approach +- adjusted spec file: + - package new variables.conf + - apply %{optflags} correctly via CXXFLAGS variable + - drop FSCAPS_DEFAULT_ENABLED which isn't recognized anymore by the + refactored chkstat sources. This is now the default. + ------------------------------------------------------------------- Thu Oct 08 09:19:32 UTC 2020 - matthias.gerstner@suse.com diff --git a/permissions.spec b/permissions.spec index 4924167..c69b3f5 100644 --- a/permissions.spec +++ b/permissions.spec @@ -16,7 +16,7 @@ # -%define VERSION_DATE 20201008 +%define VERSION_DATE 20201111 Name: permissions Version: %{VERSION_DATE}.%{suse_version} @@ -43,7 +43,7 @@ Provides: aaa_base:%{_datadir}/permissions %autosetup -n permissions-%{VERSION_DATE} %build -make %{?_smp_mflags} CFLAGS="-W -Wall %{optflags}" FSCAPS_DEFAULT_ENABLED=0 +make %{?_smp_mflags} CXXFLAGS="%{optflags}" %install %make_install fillupdir=%{_fillupdir} @@ -92,6 +92,7 @@ The actual permissions configuration files, /usr/share/permissions/permission.*. %{_datadir}/permissions/permissions.easy %{_datadir}/permissions/permissions.secure %{_datadir}/permissions/permissions.paranoid +%{_datadir}/permissions/variables.conf %config(noreplace) %{_sysconfdir}/permissions.local %{_fillupdir}/sysconfig.security From 172fdb46a38deae6cc06a62ad86a57c1d0532798cd839607d1ee59f95df79335 Mon Sep 17 00:00:00 2001 From: Matthias Gerstner Date: Mon, 7 Dec 2020 13:52:52 +0000 Subject: [PATCH 2/2] Accepting request 853107 from home:lnussel:branches:Base:System move man page to where the documented files are A separate package for a single man page really is overkill. See also discussion at https://lists.opensuse.org/archives/list/packaging@lists.opensuse.org/message/5FSP57UVYLS7BNBDNF4EGHW5TEEZUS5D/ OBS-URL: https://build.opensuse.org/request/show/853107 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=290 --- permissions.changes | 5 +++++ permissions.spec | 15 ++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/permissions.changes b/permissions.changes index 74fce4d..b76b120 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 4 12:58:20 UTC 2020 - Ludwig Nussel + +- move man page to where the documented files are + ------------------------------------------------------------------- Wed Nov 11 09:30:37 UTC 2020 - matthias.gerstner@suse.com diff --git a/permissions.spec b/permissions.spec index c69b3f5..f698ffa 100644 --- a/permissions.spec +++ b/permissions.spec @@ -36,7 +36,6 @@ BuildRequires: tclap BuildRequires: python3-base Requires: chkstat Requires: permissions-config -Recommends: permissions-doc Provides: aaa_base:%{_datadir}/permissions %prep @@ -60,18 +59,6 @@ This package does not contain files, it just requires the necessary packages. %files -%package doc -Summary: SUSE Linux Default Permissions documentation -Group: Documentation/Man -Version: %{suse_version}_%{VERSION_DATE} -Release: 0 - -%description doc -Documentation for the permission files /usr/share/permissions/permissions*. - -%files doc -%{_mandir}/man5/permissions.5%{ext_man} - %package config Summary: SUSE Linux Default Permissions config files Group: Productivity/Security @@ -81,6 +68,7 @@ Requires(post): %fillup_prereq Requires(post): chkstat #!BuildIgnore: group(trusted) Requires(pre): group(trusted) +Obsoletes: permissions-doc <= %{suse_version}_%{VERSION_DATE} %description config The actual permissions configuration files, /usr/share/permissions/permission.*. @@ -95,6 +83,7 @@ The actual permissions configuration files, /usr/share/permissions/permission.*. %{_datadir}/permissions/variables.conf %config(noreplace) %{_sysconfdir}/permissions.local %{_fillupdir}/sysconfig.security +%{_mandir}/man5/permissions.5%{ext_man} %post config %{fillup_only -n security}