openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package apparmor (Revision e56bb27721b40e2792debe0d3d9c9f04)

Currently displaying revision e56bb27721b40e2792debe0d3d9c9f04 , Show latest

--- apparmor.changes.orig
+++ apparmor.changes
@@ -1,10 +1,22 @@
 -------------------------------------------------------------------
+Tue Aug 15 08:32:59 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 4.0 alpha2
+- mark local/* as %ghost so that these dummy files don't get installed
+  (but existing files will be kept)
+
+-------------------------------------------------------------------
 Tue Jul 25 09:28:33 UTC 2023 - David Disseldorp <ddiss@suse.com>
 
 - Add pam_apparmor README, referenced from online cha-apparmor-pam.html
   documentation (bsc#1213472)
 
 -------------------------------------------------------------------
+Sun Jul 16 22:12:40 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
+
+- update to AppArmor 4.0 alpha1
+
+-------------------------------------------------------------------
 Thu Jun 22 11:16:52 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
 
 - update to AppArmor 3.1.6
--- apparmor.spec.orig
+++ apparmor.spec
@@ -53,16 +53,19 @@
 #define JNI_SO libJNIChangeHat.so
 %define JAR_FILE changeHatValve.jar
 
+%define tarversion v4.0.0-alpha2
+%define pyeggversion 4.0.0a2
+
 Name:           apparmor
-Version:        3.1.6
+Version:        4.0.0~alpha2
 Release:        0
 Summary:        AppArmor userlevel parser utility
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Security
 URL:            https://launchpad.net/apparmor
-Source0:        apparmor-%{version}.tar.gz
-Source1:        apparmor-%{version}.tar.gz.asc
-Source2:        %{name}.keyring
+Source0:        apparmor-%{tarversion}.tar.gz
+#Source1:        apparmor-%{version}.tar.gz.asc
+#Source2:        %{name}.keyring
 
 Source5:        update-trans.sh
 Source6:        baselibs.conf
@@ -77,12 +80,14 @@ Patch1:         apparmor-enable-profile-
 Patch2:         apparmor-samba-include-permissions-for-shares.diff
 
 # Ruby 2.0 mkmf prefixes everything with $(DESTDIR), bnc#822277, kkaempf@suse.de
-Patch3:         ruby-2_0-mkmf-destdir.patch
+# [cb 2023-07-16] doesn't change a single bit in the resulting RPMs (tested with 3.1.6)
+	#Patch3:         ruby-2_0-mkmf-destdir.patch
 
 # bug 906858 - confine lessopen.sh (submitted upstream 2014-12-21)
 Patch4:         apparmor-lessopen-profile.patch
 
 # workaround for boo#1119937 / lp#1784499 - allow network access for reading files on NFS (proper solution needs kernel fix)
+# fixed in Kernel 6.0 and later (see comment in https://bugs.launchpad.net/bugs/1784499)
 Patch5:         apparmor-lessopen-nfs-workaround.diff
 
 # make <apache2.d> include in apache extra profile optional to make openQA happy (boo#1178527)
@@ -93,11 +98,14 @@ Patch7:         apparmor-enable-precompi
 
 PreReq:         sed
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
 BuildRequires:  gcc-c++
 BuildRequires:  iproute2
+BuildRequires:  libtool
 BuildRequires:  pcre-devel
 BuildRequires:  pkg-config
 BuildRequires:  python3
@@ -344,16 +352,16 @@ SubDomain.
 %lang_package -n apparmor-parser
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{tarversion}
 
 # very loose profile that doesn't even match the apache2 binary path in openSUSE. Move it away instead of confusing people (boo#872984)
 mv -v profiles/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 profiles/apparmor/profiles/extras/
 
 %patch1
 %patch2
-%patch3 -p1
+	#patch3 -p1
 %patch4
-%patch5
+#patch5  no longer needed
 %patch6
 %if %{with precompiled_cache}
 %patch7
@@ -365,6 +373,7 @@ export SUSE_ASNEEDED=0
 # libapparmor:
 (
   cd ./libraries/libapparmor
+  sh ./autogen.sh
   %configure \
 %if %{with perl}
   --with-perl \
@@ -514,7 +523,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %doc parser/*.[1-9].html
 %doc utils/vim/apparmor.vim.5.html
 %doc common/apparmor.css
-%doc parser/techdoc.pdf
+#%doc parser/techdoc.pdf
 # apparmor.vim is included in the vim package. Ideally it should be in a -devel package, but that's overmuch for one file
 %dir %{_datadir}/apparmor
 %{_datadir}/apparmor/apparmor.vim
@@ -527,6 +536,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %{_bindir}/aa-enabled
 %{_bindir}/aa-exec
 %{_bindir}/aa-features-abi
+%{_sbindir}/aa-load
 %{_sbindir}/aa-status
 %{_sbindir}/apparmor_status
 %{_sbindir}/status
@@ -569,6 +579,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %dir %{_sysconfdir}/apparmor.d/
 %dir %{_sysconfdir}/apparmor.d/abi
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/3.0
+%config(noreplace) %{_sysconfdir}/apparmor.d/abi/4.0
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-outoftree-network
 %config(noreplace) %{_sysconfdir}/apparmor.d/abi/kernel-5.4-vanilla
 %dir %{_sysconfdir}/apparmor.d/abstractions
@@ -593,7 +604,8 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %config(noreplace) %{_sysconfdir}/apparmor.d/samba-rpcd
 %config(noreplace) %{_sysconfdir}/apparmor.d/samba-rpcd-*
 %config(noreplace) %{_sysconfdir}/apparmor.d/zgrep
-%config(noreplace) %{_sysconfdir}/apparmor.d/local/*
+%config(noreplace) %{_sysconfdir}/apparmor.d/local/README
+%ghost %{_sysconfdir}/apparmor.d/local/[a-z]*
 %dir /usr/share/apparmor/
 %if %{with precompiled_cache}
 /usr/share/apparmor/cache/
@@ -675,7 +687,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 
 %files -n python3-apparmor
 %defattr(-,root,root)
-%{python3_sitearch}/LibAppArmor-%{version}-py*.egg-info
+%{python3_sitearch}/LibAppArmor-%{pyeggversion}-py*.egg-info
 %dir %{python3_sitearch}/LibAppArmor
 %dir %{python3_sitearch}/LibAppArmor/__pycache__
 %{python3_sitearch}/LibAppArmor/_LibAppArmor.cpython-*.so
@@ -684,7 +696,7 @@ rm -fv %{buildroot}%{_libdir}/libapparmo
 %{python3_sitearch}/LibAppArmor/__init__.py
 %{python3_sitearch}/LibAppArmor/LibAppArmor.py
 %{python3_sitelib}/apparmor/
-%{python3_sitelib}/apparmor-%{version}-py*.egg-info
+%{python3_sitelib}/apparmor-%{pyeggversion}-py*.egg-info
 %endif
 
 %if %{with ruby}
--- libapparmor.spec.orig
+++ libapparmor.spec
@@ -17,18 +17,23 @@
 #
 
 
+%define tarversion v4.0.0-alpha2
+
 Name:           libapparmor
-Version:        3.1.6
+Version:        4.0.0~alpha2
 Release:        0
 Summary:        Utility library for AppArmor
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://launchpad.net/apparmor
-Source0:        apparmor-%{version}.tar.gz
-Source1:        apparmor-%{version}.tar.gz.asc
+Source0:        apparmor-%{tarversion}.tar.gz
+#Source1:        apparmor-%{version}.tar.gz.asc
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  dejagnu
 BuildRequires:  flex
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -63,11 +68,12 @@ These libraries are needed for developin
 AppArmor API.
 
 %prep
-%setup -q -n apparmor-%{version}
+%setup -q -n apparmor-%{tarversion}
 
 %build
 (
   cd ./libraries/libapparmor
+  sh ./autogen.sh
   %configure \
   --without-perl \
   --without-python \

Places

File project.diff of Package apparmor (Revision e56bb27721b40e2792debe0d3d9c9f04)

Places