From e7563d435d3fecf12e739498cc27da9fc8bf453974f66bb36e3d924b3b32facf Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 12 Apr 2019 13:08:09 +0000 Subject: [PATCH 1/5] Accepting request 693721 from home:jsegitz:branches:Base:System - Created new subpackages -config, -doc and standalone package chkstat where we can start a better versioning scheme and require it from the original package OBS-URL: https://build.opensuse.org/request/show/693721 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=215 --- permissions.changes | 7 +++++ permissions.spec | 66 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/permissions.changes b/permissions.changes index e1a6b05..aff987c 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 11 11:18:36 UTC 2019 - jsegitz@suse.com + +- Created new subpackages -config, -doc and standalone package chkstat + where we can start a better versioning scheme and require it from the + original package + ------------------------------------------------------------------- Tue Feb 12 14:29:45 UTC 2019 - jsegitz@suse.com diff --git a/permissions.spec b/permissions.spec index afed1db..fff4bb8 100644 --- a/permissions.spec +++ b/permissions.spec @@ -16,8 +16,10 @@ # +%define VERSION 20190212 + Name: permissions -Version: 20190212 +Version: %{VERSION} Release: 0 Summary: SUSE Linux Default Permissions # Maintained in github by the security team. @@ -29,13 +31,11 @@ BuildRequires: libcap-devel #!BuildIgnore: group(trusted) Requires(post): %fillup_prereq Requires(pre): group(trusted) +Requires: chkstat +Requires: permissions-config +Requires: permissions-doc 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. - %prep %setup -q @@ -45,22 +45,62 @@ make %{?_smp_mflags} CFLAGS="-W -Wall %{optflags}" FSCAPS_DEFAULT_ENABLED=0 %install %make_install fillupdir=%{_fillupdir} -%post -%{fillup_only -n security} -# apply all potentially changed permissions -%{_bindir}/chkstat --system +%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. + +This package doesn't contain files, it just requires the necessary packages. %files + +%package doc +Summary: SUSE Linux Default Permissions documentation +Group: Productivity/Security +Version: %{suse_version}_%{VERSION} +Release: 0 + +%description doc +Documentation for the permission files /etc/permissions* + +%files doc +%{_mandir}/man5/permissions.5%{ext_man} + +%package config +Summary: SUSE Linux Default Permissions config files +Group: Productivity/Security +Version: %{suse_version}_%{VERSION} +Release: 0 + +%description config +The acutal permissions configuration files /etc/permission.* + +%files config %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%{ext_man} -%{_mandir}/man8/chkstat.8%{ext_man} %{_fillupdir}/sysconfig.security +%post config +%{fillup_only -n security} +# apply all potentially changed permissions +%{_bindir}/chkstat --system + +%package -n chkstat +Summary: SUSE Linux Default Permissions tool +Group: Productivity/Security +Version: %{suse_version}_%{VERSION} +Release: 0 + +%description -n chkstat +Tool to check and set file permissions + +%files -n chkstat +%{_bindir}/chkstat +%{_mandir}/man8/chkstat.8%{ext_man} + %package -n permissions-zypp-plugin BuildArch: noarch Requires: permissions = %version From edfc5837d102de8c704db22d9035968ca9e33d6525f937df733d436f3d0a99a8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 15 Apr 2019 18:37:33 +0000 Subject: [PATCH 2/5] Accepting request 693920 from home:jengelh:branches:Base:System - Fix RPM group, fix hard requirement on documentation. Update description typography. OBS-URL: https://build.opensuse.org/request/show/693920 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=216 --- permissions.changes | 6 ++++++ permissions.spec | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/permissions.changes b/permissions.changes index aff987c..782500b 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 13 17:12:12 UTC 2019 - Jan Engelhardt + +- Fix RPM group, fix hard requirement on documentation. + Update description typography. + ------------------------------------------------------------------- Thu Apr 11 11:18:36 UTC 2019 - jsegitz@suse.com diff --git a/permissions.spec b/permissions.spec index fff4bb8..0524eea 100644 --- a/permissions.spec +++ b/permissions.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -33,7 +33,7 @@ Requires(post): %fillup_prereq Requires(pre): group(trusted) Requires: chkstat Requires: permissions-config -Requires: permissions-doc +Recommends: permissions-doc Provides: aaa_base:%{_sysconfdir}/permissions %prep @@ -47,21 +47,21 @@ make %{?_smp_mflags} CFLAGS="-W -Wall %{optflags}" FSCAPS_DEFAULT_ENABLED=0 %description Permission settings of files and directories depending on the local -security settings. The local security setting (easy, secure, or paranoid) +security settings. The local security setting ("easy", "secure", or "paranoid") can be configured in /etc/sysconfig/security. -This package doesn't contain files, it just requires the necessary packages. +This package does not contain files, it just requires the necessary packages. %files %package doc Summary: SUSE Linux Default Permissions documentation -Group: Productivity/Security +Group: Documentation/Man Version: %{suse_version}_%{VERSION} Release: 0 %description doc -Documentation for the permission files /etc/permissions* +Documentation for the permission files /etc/permissions*. %files doc %{_mandir}/man5/permissions.5%{ext_man} @@ -73,7 +73,7 @@ Version: %{suse_version}_%{VERSION} Release: 0 %description config -The acutal permissions configuration files /etc/permission.* +The actual permissions configuration files, /etc/permission.*. %files config %config %{_sysconfdir}/permissions @@ -95,7 +95,7 @@ Version: %{suse_version}_%{VERSION} Release: 0 %description -n chkstat -Tool to check and set file permissions +Tool to check and set file permissions. %files -n chkstat %{_bindir}/chkstat From 741577cc7cab3cf65456369f934928fe08588fc8db6e0b53a189dfc810910fb6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 1 May 2019 06:26:24 +0000 Subject: [PATCH 3/5] Accepting request 699578 from home:jsegitz:branches:Base:System - Update to version 20190429: * removed entry for /var/cache/man. Conflicts with packaging and man:man is the better setting anyway (bsc#1133678) * fixed error in description of permissions.paranoid. Make it clear that this is not a usable profile, but intended as a base for own developments OBS-URL: https://build.opensuse.org/request/show/699578 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=217 --- _servicedata | 2 +- permissions-20190212.tar.xz | 3 --- permissions-20190429.tar.xz | 3 +++ permissions.changes | 9 +++++++++ permissions.spec | 10 +++++----- 5 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 permissions-20190212.tar.xz create mode 100644 permissions-20190429.tar.xz diff --git a/_servicedata b/_servicedata index 46efd5f..1c948e6 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/openSUSE/permissions.git - b3af647ecf37350b62e774e798e2ce4b7f0bff60 \ No newline at end of file + 938c49d3c1b0820d2a301a8018709efed9a6ce61 \ No newline at end of file diff --git a/permissions-20190212.tar.xz b/permissions-20190212.tar.xz deleted file mode 100644 index db852a8..0000000 --- a/permissions-20190212.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a08d41db3a26aa5bd457866e86e2e9ca2ac5a5b208257ce4592f552e6dbab8d6 -size 19660 diff --git a/permissions-20190429.tar.xz b/permissions-20190429.tar.xz new file mode 100644 index 0000000..62b286c --- /dev/null +++ b/permissions-20190429.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29bd4d65d64bfd13e68e0a1aea36d9633b8a68c8d6684ed1510e7d9d8c42be4e +size 19660 diff --git a/permissions.changes b/permissions.changes index 782500b..585e2d5 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Apr 30 08:57:37 UTC 2019 - opensuse-packaging@opensuse.org + +- Update to version 20190429: + * removed entry for /var/cache/man. Conflicts with packaging and man:man is + the better setting anyway (bsc#1133678) + * fixed error in description of permissions.paranoid. Make it clear that this + is not a usable profile, but intended as a base for own developments + ------------------------------------------------------------------- Sat Apr 13 17:12:12 UTC 2019 - Jan Engelhardt diff --git a/permissions.spec b/permissions.spec index 0524eea..a3a93e7 100644 --- a/permissions.spec +++ b/permissions.spec @@ -12,11 +12,11 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define VERSION 20190212 +%define VERSION 20190429 Name: permissions Version: %{VERSION} @@ -57,7 +57,7 @@ This package does not contain files, it just requires the necessary packages. %package doc Summary: SUSE Linux Default Permissions documentation Group: Documentation/Man -Version: %{suse_version}_%{VERSION} +Version: 20190429%{suse_version}_%{VERSION} Release: 0 %description doc @@ -69,7 +69,7 @@ Documentation for the permission files /etc/permissions*. %package config Summary: SUSE Linux Default Permissions config files Group: Productivity/Security -Version: %{suse_version}_%{VERSION} +Version: 20190429%{suse_version}_%{VERSION} Release: 0 %description config @@ -91,7 +91,7 @@ The actual permissions configuration files, /etc/permission.*. %package -n chkstat Summary: SUSE Linux Default Permissions tool Group: Productivity/Security -Version: %{suse_version}_%{VERSION} +Version: 20190429%{suse_version}_%{VERSION} Release: 0 %description -n chkstat From 9bbb7deff7cd25029975450cfd0337e7d9ba9205dfe4168567e1cd6760eb4ad3 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 2 May 2019 13:24:27 +0000 Subject: [PATCH 4/5] Accepting request 700150 from home:jsegitz:branches:Base:System - Fixed versions. Removed set_version from _service file, doesn't work with the new packaging. Call fix_version.sh to set current date as version instead - Fixed requires for -config and -zypp-plugin OBS-URL: https://build.opensuse.org/request/show/700150 OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=218 --- _service | 1 - fix_version.sh | 6 ++++++ permissions.changes | 8 ++++++++ permissions.spec | 9 +++++---- 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 fix_version.sh diff --git a/_service b/_service index 1a50d79..0491e59 100644 --- a/_service +++ b/_service @@ -9,5 +9,4 @@ *.tar xz - diff --git a/fix_version.sh b/fix_version.sh new file mode 100644 index 0000000..8852264 --- /dev/null +++ b/fix_version.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +version=`date '+%Y%m%d'` + +echo "setting version to ${version}" +sed -E -i -e "s/^%define VERSION [0-9]+/%define VERSION ${version}/" permissions.spec diff --git a/permissions.changes b/permissions.changes index 585e2d5..7eb8fcc 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 2 09:46:05 UTC 2019 - jsegitz@suse.com + +- Fixed versions. Removed set_version from _service file, doesn't + work with the new packaging. Call fix_version.sh to set current + date as version instead +- Fixed requires for -config and -zypp-plugin + ------------------------------------------------------------------- Tue Apr 30 08:57:37 UTC 2019 - opensuse-packaging@opensuse.org diff --git a/permissions.spec b/permissions.spec index a3a93e7..674ab83 100644 --- a/permissions.spec +++ b/permissions.spec @@ -57,7 +57,7 @@ This package does not contain files, it just requires the necessary packages. %package doc Summary: SUSE Linux Default Permissions documentation Group: Documentation/Man -Version: 20190429%{suse_version}_%{VERSION} +Version: %{suse_version}_%{VERSION} Release: 0 %description doc @@ -69,8 +69,9 @@ Documentation for the permission files /etc/permissions*. %package config Summary: SUSE Linux Default Permissions config files Group: Productivity/Security -Version: 20190429%{suse_version}_%{VERSION} +Version: %{suse_version}_%{VERSION} Release: 0 +Requires(post): chkstat %description config The actual permissions configuration files, /etc/permission.*. @@ -91,7 +92,7 @@ The actual permissions configuration files, /etc/permission.*. %package -n chkstat Summary: SUSE Linux Default Permissions tool Group: Productivity/Security -Version: 20190429%{suse_version}_%{VERSION} +Version: %{suse_version}_%{VERSION} Release: 0 %description -n chkstat @@ -103,7 +104,7 @@ Tool to check and set file permissions. %package -n permissions-zypp-plugin BuildArch: noarch -Requires: permissions = %version +Requires: permissions = %{VERSION} Requires: python3-zypp-plugin Requires: libzypp(plugin:commit) = 1 Summary: A zypper commit plugin for calling chkstat From 7ef24ac09f5107086741fb3c4e1c9508ee681da9aa03732ea7e667a64405bedb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 2 May 2019 13:38:50 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/permissions?expand=0&rev=219 --- permissions.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/permissions.spec b/permissions.spec index 674ab83..aaa9403 100644 --- a/permissions.spec +++ b/permissions.spec @@ -27,6 +27,7 @@ License: GPL-2.0-or-later Group: Productivity/Security Url: http://github.com/openSUSE/permissions Source: permissions-%{version}.tar.xz +Source1: fix_version.sh BuildRequires: libcap-devel #!BuildIgnore: group(trusted) Requires(post): %fillup_prereq