diff --git a/_service b/_service index 1a50d79..0491e59 100644 --- a/_service +++ b/_service @@ -9,5 +9,4 @@ *.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/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-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 e1a6b05..7eb8fcc 100644 --- a/permissions.changes +++ b/permissions.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +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 + +- 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 + +- Fix RPM group, fix hard requirement on documentation. + Update description typography. + +------------------------------------------------------------------- +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..aaa9403 100644 --- a/permissions.spec +++ b/permissions.spec @@ -16,8 +16,10 @@ # +%define VERSION 20190429 + Name: permissions -Version: 20190212 +Version: %{VERSION} Release: 0 Summary: SUSE Linux Default Permissions # Maintained in github by the security team. @@ -25,17 +27,16 @@ 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 Requires(pre): group(trusted) +Requires: chkstat +Requires: permissions-config +Recommends: 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,25 +46,66 @@ 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 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} +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 +Requires(post): chkstat + +%description config +The actual 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 +Requires: permissions = %{VERSION} Requires: python3-zypp-plugin Requires: libzypp(plugin:commit) = 1 Summary: A zypper commit plugin for calling chkstat