From f1019b499d0e56b4879c80d283665e2128562e91d6ac45a406d9c9869f61b91d Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danilo.spinella@suse.com>
Date: Mon, 23 Oct 2023 13:21:23 +0000
Subject: [PATCH] Accepting request 1119646 from
 home:michals:branches:devel:tools:scm

- Add rule for /etc/gitconfig in gitweb.cgi apparmor profile (bsc#1216501).

- gitweb.cgi AppArmor profile
  - make the profile a named profile
  - add local/ include to make custom additions easier

OBS-URL: https://build.opensuse.org/request/show/1119646
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/git?expand=0&rev=624
---
 git.changes                  | 12 ++++++++++++
 usr.share.git-web.gitweb.cgi |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/git.changes b/git.changes
index 5b7c1ee..e1a41de 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 23 12:42:40 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
+
+- Add rule for /etc/gitconfig in gitweb.cgi apparmor profile (bsc#1216501).
+
+-------------------------------------------------------------------
+Mon Oct 23 12:34:06 UTC 2023 - Christian Boltz <suse-beta@cboltz.de>
+
+- gitweb.cgi AppArmor profile
+  - make the profile a named profile
+  - add local/ include to make custom additions easier
+
 -------------------------------------------------------------------
 Fri Sep 22 15:13:11 UTC 2023 - Michal Suchanek <msuchanek@suse.com>
 
diff --git a/usr.share.git-web.gitweb.cgi b/usr.share.git-web.gitweb.cgi
index f7b052d..b733bd2 100644
--- a/usr.share.git-web.gitweb.cgi
+++ b/usr.share.git-web.gitweb.cgi
@@ -1,13 +1,13 @@
-# Last Modified: Fri Apr 14 14:11:09 2019
 #include <tunables/global>
 
-/usr/share/gitweb/gitweb.cgi {
+profile gitweb.cgi /usr/share/gitweb/gitweb.cgi {
   #include <abstractions/base>
   #include <abstractions/bash>
   #include <abstractions/nameservice>
   #include <abstractions/perl>
   #include <abstractions/private-files-strict>
 
+  /etc/gitconfig r,
   /{usr/,}bin/bash rix,
   /{usr/,}bin/tar rix,
   /usr/bin/gzip rix,
@@ -29,4 +29,7 @@
   owner /**/ r,
   owner /**/.git/** r,
   owner @{HOME}/.gitconfig r,
+
+  # Site-specific additions and overrides. See local/README for details.
+  include if exists <local/usr.share.git-web.gitweb.cgi>
 }