diff --git a/apparmor.spec b/apparmor.spec index dfde40d..b313fd4 100644 --- a/apparmor.spec +++ b/apparmor.spec @@ -1,7 +1,7 @@ # -# spec file for package apparmor-parser (Version 2.3.1) +# spec file for package apparmor # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,45 +46,45 @@ Name: apparmor %endif Summary: AppArmor userlevel parser utility Version: 2.5.1 -Release: 42 +Release: 1 Group: Productivity/Networking/Security Source0: apparmor-%{version}.tar.bz2 -Source1: %{name}-profile-editor.png -Source2: %{name}-profile-editor.desktop -Source3: update-trans.sh -Patch: testsuite-build-fix -Patch1: pam-apparmor-include -Patch2: mod_apparmor-includes -Patch3: tomcat-build-fixes +Source1: %{name}-profile-editor.png +Source2: %{name}-profile-editor.desktop +Source3: update-trans.sh +Patch: testsuite-build-fix +Patch1: pam-apparmor-include +Patch2: mod_apparmor-includes +Patch3: tomcat-build-fixes Patch4: apparmor-swig-build-fix Patch5: apparmor-scripts -Patch6: apparmor-translation-fixes -Patch7: apparmor-perl -Patch8: apparmor-no-caching-test -Patch9: apparmorapplet-gnome-build-fix -Patch10: apparmor-utils-SubDomain -Patch11: apparmor-utils-cleanup-on-abort -Patch12: apparmor-utils-translation-unification -Patch13: apparmor-utils-add-log-types -Patch14: apparmor-utils-filenames-in-slash -Patch15: apparmor-utils-null-path-fix -Patch16: apparmor-utils-string-split -Patch17: apparmor-profiles-cupsd-fix -Patch18: apparmor-profiles-sshd-fix -Patch19: apparmor-profiles-syslog-ng-fix -Patch20: apparmor-docs-techdoc-grammar-fixes -Patch21: apparmor-parser-string-fixes -Patch22: apparmor-startproc.patch -Patch23: apparmor-2.5.1-unified-build -Patch24: apparmor-2.5.1-rpmlint-asprintf -Patch25: apparmor-2.5.1-ntpd-proc-fixes -Patch26: apparmor-2.5.1-edirectory-profile -Patch27: apparmor-2.5.1-firefox-proc-fix -Patch28: apparmor-2.5.1-unconfined-fixes -Patch29: apparmor-2.5.1-fix-parser-use-after-free +Patch6: apparmor-translation-fixes +Patch7: apparmor-perl +Patch8: apparmor-no-caching-test +Patch9: apparmorapplet-gnome-build-fix +Patch10: apparmor-utils-SubDomain +Patch11: apparmor-utils-cleanup-on-abort +Patch12: apparmor-utils-translation-unification +Patch13: apparmor-utils-add-log-types +Patch14: apparmor-utils-filenames-in-slash +Patch15: apparmor-utils-null-path-fix +Patch16: apparmor-utils-string-split +Patch17: apparmor-profiles-cupsd-fix +Patch18: apparmor-profiles-sshd-fix +Patch19: apparmor-profiles-syslog-ng-fix +Patch20: apparmor-docs-techdoc-grammar-fixes +Patch21: apparmor-parser-string-fixes +Patch22: apparmor-startproc.patch +Patch23: apparmor-2.5.1-unified-build +Patch24: apparmor-2.5.1-rpmlint-asprintf +Patch25: apparmor-2.5.1-ntpd-proc-fixes +Patch26: apparmor-2.5.1-edirectory-profile +Patch27: apparmor-2.5.1-firefox-proc-fix +Patch28: apparmor-2.5.1-unconfined-fixes +Patch29: apparmor-2.5.1-fix-parser-use-after-free Patch30: apparmor-2.5.1-ldapclient-profile -Patch31: apparmor-utils-support-newer-auditd-formatted-messages -Patch32: fix-two-x-transition-conflict-bugs +Patch31: apparmor-utils-support-newer-auditd-formatted-messages +Patch32: fix-two-x-transition-conflict-bugs License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: https://launchpad.net/apparmor @@ -94,33 +94,33 @@ PreReq: %{insserv_prereq} aaa_base %endif BuildRequires: gcc-c++ BuildRequires: pkg-config -BuildRequires: pcre-devel +BuildRequires: pcre-devel %define apparmor_bin_prefix /lib/apparmor BuildRequires: bison flex latex2html w3m BuildRequires: texlive-latex -BuildRequires: swig +BuildRequires: swig %if %{with python} -BuildRequires: swig python-devel +BuildRequires: python-devel swig %endif %if %{with ruby} -BuildRequires: swig ruby-devel +BuildRequires: ruby-devel swig %endif %if %{with pam} -BuildRequires: pam-devel -Requires: pam pam-config -PreReq: pam pam-config +BuildRequires: pam-devel +Requires: pam pam-config +PreReq: pam pam-config %endif %if %{with apache} -BuildRequires: apache2-devel +BuildRequires: apache2-devel %endif %if %{with tomcat} -BuildRequires: java-devel >= 1.6.0 ant tomcat6 +BuildRequires: ant java-devel >= 1.6.0 tomcat6 %endif %if %{with editor} @@ -140,19 +140,20 @@ BuildRequires: audit-devel dbus-1-devel libapparmor-devel pkg-config %endif %package parser +License: GPLv2+ Summary: AppArmor userlevel parser utility Group: Productivity/Networking/Security Obsoletes: subdomain_parser < %{version} -Obsoletes: subdomain-parser < %{version} +Obsoletes: subdomain-parser < %{version} Obsoletes: subdomain-parser-demo < %{version} -Obsoletes: subdomain-parser-common < %{version} -Obsoletes: subdomain-leaf-cert < %{version} +Obsoletes: subdomain-parser-common < %{version} +Obsoletes: subdomain-leaf-cert < %{version} Obsoletes: libimnxcert < %{version} Provides: subdomain_parser = %{version} -Provides: subdomain-parser = %{version} +Provides: subdomain-parser = %{version} Provides: subdomain-parser-demo = %{version} -Provides: subdomain-parser-common = %{version} -Provides: subdomain-leaf-cert = %{version} +Provides: subdomain-parser-common = %{version} +Provides: subdomain-leaf-cert = %{version} Provides: libimnxcert = %{version} %description parser @@ -163,8 +164,9 @@ This package is part of a suite of tools that used to be named SubDomain. %package docs -Summary: AppArmor Documentation package -Group: Documentation/Other +License: GPLv2+ +Summary: AppArmor Documentation package +Group: Documentation/Other %description docs This package contains documentation for AppArmor. @@ -180,9 +182,12 @@ Authors: Seth Arnold %if %{with apache} + %package -n apache2-mod_apparmor +License: GPLv2+ Summary: AppArmor module for apache2 Group: Productivity/Security + %description -n apache2-mod_apparmor apache2-modapparmor adds support to apache2 to provide AppArmor confinement to individual cgi scripts handled by apache modules like @@ -201,10 +206,10 @@ Authors: %package -n libapparmor1 Summary: Utility library for AppArmor Group: Development/Libraries/C and C++ -License: LGPL v2.1 or later +License: LGPLv2.1+ %ifarch ppc64 -Obsoletes: libapparmor-64bit < %{version} -Provides: libapparmor-64bit = ${version} +Obsoletes: libapparmor-64bit < %{version} +Provides: libapparmor-64bit = ${version} %endif Provides: libapparmor = %{version} Provides: libimmunix = %{version} @@ -222,7 +227,7 @@ Authors: Matt Barringer %package -n libapparmor-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Requires: libapparmor1 = %{version}-%{release} Group: Development/Libraries/C and C++ Provides: libapparmor:/usr/include/sys/apparmor.h @@ -238,13 +243,13 @@ Authors: Matt Barringer %package -n perl-apparmor -License: GPL v2 only ; LGPL v2.1 or later +License: GPLv2 ; LGPLv2.1+ Requires: libapparmor1 = %{version} Requires: perl = %{perl_version} Group: Development/Libraries/Perl Summary: Perl interface for libapparmor functions -Provides: perl-libapparmor -Obsoletes: perl-libapparmor < 2.5 +Provides: perl-libapparmor +Obsoletes: perl-libapparmor < 2.5 %description -n perl-apparmor This package provides the perl interface to AppArmor. It is used for perl @@ -256,15 +261,16 @@ Authors: Matt Barringer %if %{with python} + %package -n python-apparmor -License: GPL v2 only ; LGPL v2.1 or later +License: GPLv2 ; LGPLv2.1+ Requires: libapparmor1 = %{version} -BuildRequires: python +BuildRequires: python Requires: python = %{python_version} Group: Development/Libraries/Python Summary: Python interface for libapparmor functions -Provides: python-libapparmor -Obsoletes: python-libapparmor < 2.5 +Provides: python-libapparmor +Obsoletes: python-libapparmor < 2.5 %description -n python-apparmor This package provides the python interface to AppArmor. It is used for python @@ -277,14 +283,15 @@ Authors: %endif %if %{with ruby} + %package -n ruby-apparmor -License: GPL v2 only ; LGPL v2.1 or later +License: GPLv2 ; LGPLv2.1+ Requires: libapparmor1 = %{version} Requires: ruby = %{ruby_version} Group: Development/Libraries/Ruby Summary: Ruby interface for libapparmor functions -Provides: ruby-libapparmor -Obsoletes: ruby-libapparmor < 2.5 +Provides: ruby-libapparmor +Obsoletes: ruby-libapparmor < 2.5 %description -n ruby-apparmor This package provides the ruby interface to AppArmor. It is used for ruby @@ -297,10 +304,11 @@ Authors: %endif %package profiles +License: GPLv2 ; LGPLv2.1+ Summary: AppArmor profiles that are loaded into the apparmor kernel module Group: Productivity/Security -Obsoletes: subdomain-profiles < %{version} -Provides: subdomain-profiles = %{version} +Obsoletes: subdomain-profiles < %{version} +Provides: subdomain-profiles = %{version} %description profiles Base profiles. AppArmor is a file and network mandatory access control @@ -318,13 +326,13 @@ Authors: jjohansen@suse.de %package utils +License: GPLv2 ; LGPLv2.1+ Summary: AppArmor User-Level Utilities Useful for Creating AppArmor Profiles Group: Productivity/Security Requires: perl = %{perl_version} -Requires: libapparmor1 = %{version} -Requires: perl-apparmor = %{version} -BuildArch: noarch - +Requires: libapparmor1 = %{version} +Requires: perl-apparmor = %{version} +BuildArch: noarch %description utils This package provides the aa-logprof, aa-genprof, aa-autodep, @@ -339,10 +347,12 @@ Authors: seth.arnold@suse.de %if %{with tomcat} + %package -n tomcat_apparmor +License: GPLv2 ; LGPLv2.1+ Summary: Tomcat 6 plugin for AppArmor change_hat Group: System/Libraries -Requires: libapparmor1 = %{version} tomcat6 +Requires: libapparmor1 = %{version} tomcat6 %description -n tomcat_apparmor tomcat_apparmor - is a plugin for Apache Tomcat version 6 that @@ -357,7 +367,9 @@ Authors: %endif %if %{with pam} + %package -n pam_apparmor +License: GPLv2 ; LGPLv2.1+ Summary: PAM module to for AppArmor change_hat Group: Productivity/Security @@ -375,9 +387,11 @@ Authors: %endif %if %{with dbus} + %package dbus -Summary: Audit dispatcher for sending AppArmor events over DBUS -Group: System/Monitoring +License: GPLv2 ; LGPLv2.1+ +Summary: Audit dispatcher for sending AppArmor events over DBUS +Group: System/Monitoring %description dbus An audit dispatcher for sending AppArmor events over the DBUS system @@ -390,9 +404,11 @@ Authors: %endif %if %{with editor} + %package profile-editor -Summary: AppArmor profile editor -Group: Productivity/Editors/Other +License: GPLv2 ; LGPLv2.1+ +Summary: AppArmor profile editor +Group: Productivity/Editors/Other %description profile-editor A syntax highlighting editor for AppArmor profiles. @@ -404,8 +420,10 @@ Authors: %endif %if %{with gnome} + %package -n apparmorapplet-gnome -Summary: An AppArmor event notification applet for GNOME +License: GPLv2 ; LGPLv2.1+ +Summary: An AppArmor event notification applet for GNOME Group: System/GUI/GNOME %description -n apparmorapplet-gnome @@ -431,6 +449,7 @@ SubDomain. %if %{with gnome} %lang_package -n apparmorapplet-gnome %endif + %prep %setup -q %patch -p1 @@ -674,6 +693,7 @@ fi %{perl_vendorarch}/LibAppArmor.pm %if %{with python} + %files -n python-apparmor %defattr(-,root,root) %{python_sitearch}/LibAppArmor-2.5.1-py2.7.egg-info @@ -681,12 +701,14 @@ fi %endif %if %{with ruby} + %files -n ruby-apparmor %defattr(-,root,root) %{_prefix}/%{rb_sitearch}/* %endif %if %{with pam} + %files -n pam_apparmor %defattr(444,root,root,755) %attr(555,root,root) %{_libdir}/security/pam_apparmor.so @@ -694,6 +716,7 @@ fi %endif %if %{with tomcat} + %files -n tomcat_apparmor %defattr(-,root,root) %{CATALINA_HOME}/lib/%{JAR_FILE} @@ -702,6 +725,7 @@ fi %endif %if %{with apache} + %files -n apache2-mod_apparmor %defattr(-,root,root) %{apache_module_path}/mod_apparmor.so @@ -710,12 +734,14 @@ fi %endif %if %{with dbus} + %files dbus %defattr(0750, root, root) %{_bindir}/apparmor-dbus %endif %if %{with editor} + %files profile-editor %defattr(-, root, root) %{_datadir}/applications/%{name}-profile-editor.desktop @@ -729,6 +755,7 @@ fi %endif %if %{with gnome} + %files -n apparmorapplet-gnome %defattr(-, root, root) %{_libdir}/bonobo/servers/*.server @@ -790,13 +817,17 @@ fi %endif %post -n libapparmor1 -p /sbin/ldconfig + %postun -n libapparmor1 -p /sbin/ldconfig %if %{with tomcat} + %post -n tomcat_apparmor -p /sbin/ldconfig + %postun -n tomcat_apparmor -p /sbin/ldconfig %endif %if %{with pam} + %post -n pam_apparmor pam-config -a --apparmor pam-config --update