[pkg-apparmor] [apparmor-profiles-extra] 01/02: Drop ntpd profile and tunable: they are shipped by the ntp package starting with 1:4.2.8p7+dfsg-1 (Closes: #768415, #799084).

Sat Apr 30 11:01:10 UTC 2016

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch master
in repository apparmor-profiles-extra.

commit 237e8f5d2cca1e5f2e14f7407174414c489fbed1
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Apr 30 10:47:33 2016 +0000

    Drop ntpd profile and tunable: they are shipped by the ntp package starting with 1:4.2.8p7+dfsg-1 (Closes: #768415, #799084).
---
 debian/README.Debian   |  4 +--
 debian/copyright       | 22 --------------
 profiles/tunables/ntpd | 15 ----------
 profiles/usr.sbin.ntpd | 80 --------------------------------------------------
 4 files changed, 1 insertion(+), 120 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 33181b1..7780427 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -7,8 +7,6 @@ Included profiles
   as of revision 146.
 - irssi: taken from the apparmor-profiles repository at revision 132.
   Still up-to-date as of revision 146.
-- ntpd: taken from Ubuntu's ntp 1:4.2.8p4+dfsg-3ubuntu4.
-  Still up-to-date as of 4.7.4-1ubuntu1.
 - Pidgin: taken from the apparmor-profiles repository at revision 153,
   modified with the changes submitted upstream via
   https://code.launchpad.net/~intrigeri/apparmor-profiles/pidgin-vs-gstreamer-1.6/+merge/277499
@@ -24,4 +22,4 @@ apparmor-profiles repository
 
 https://code.launchpad.net/~apparmor-dev/apparmor-profiles/master
 
- -- intrigeri <intrigeri at debian.org>, Thu, 28 Apr 2016 11:21:02 +0200
+ -- intrigeri <intrigeri at debian.org>, Sat, 30 Apr 2016 12:46:46 +0200
diff --git a/debian/copyright b/debian/copyright
index 266590f..9d2c812 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,11 +25,6 @@ Files: profiles/usr.sbin.tcpdump
 Copyright: 2008-2014 AppArmor developers <apparmor at lists.ubuntu.com>
 License: GPL-2+
 
-Files: profiles/usr.sbin.ntpd profiles/tunables/ntpd
-Copyright: 2002-2005 Novell/SUSE
-           2009-2012 Canonical Ltd.
-License: GPL-2
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -47,20 +42,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License can be found in `/usr/share/common-licenses/GPL-2'.
-
-License: GPL-2
- This program is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License as
- published by the Free Software Foundation.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
- On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/profiles/tunables/ntpd b/profiles/tunables/ntpd
deleted file mode 100644
index 1fc2d8f..0000000
--- a/profiles/tunables/ntpd
+++ /dev/null
@@ -1,15 +0,0 @@
-# vim:syntax=apparmor
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2002-2005 Novell/SUSE
-#    Copyright (C) 2011 Canonical, Ltd.
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-
-#Add your ntpd devices here eg. if you have a DCF clock
-# @{NTPD_DEVICE}="/dev/ttyS1"
-@{NTPD_DEVICE}="/dev/null"
diff --git a/profiles/usr.sbin.ntpd b/profiles/usr.sbin.ntpd
deleted file mode 100644
index aec86fb..0000000
--- a/profiles/usr.sbin.ntpd
+++ /dev/null
@@ -1,80 +0,0 @@
-# vim:syntax=apparmor
-# Updated for Ubuntu by: Jamie Strandboge <jamie at canonical.com>
-# ------------------------------------------------------------------
-#
-#    Copyright (C) 2002-2005 Novell/SUSE
-#    Copyright (C) 2009-2012 Canonical Ltd.
-#
-#    This program is free software; you can redistribute it and/or
-#    modify it under the terms of version 2 of the GNU General Public
-#    License published by the Free Software Foundation.
-#
-# ------------------------------------------------------------------
-
-#include <tunables/global>
-#include <tunables/ntpd>
-/usr/sbin/ntpd {
-  #include <abstractions/base>
-  #include <abstractions/nameservice>
-  #include <abstractions/user-tmp>
-
-  capability ipc_lock,
-  capability net_bind_service,
-  capability setgid,
-  capability setuid,
-  capability sys_chroot,
-  capability sys_resource,
-  capability sys_time,
-  capability sys_nice,
-
-  # ntp uses AF_INET, AF_INET6 and AF_UNSPEC
-  network dgram,
-  network stream,
-
-  @{PROC}/net/if_inet6 r,
-  @{PROC}/*/net/if_inet6 r,
-  @{NTPD_DEVICE} rw,
-
-  /{,s}bin/      r,
-  /usr/{,s}bin/  r,
-  /usr/sbin/ntpd rmix,
-
-  /etc/ntp.conf r,
-  /etc/ntp.conf.dhcp r,
-  /etc/ntpd.conf r,
-  /etc/ntpd.conf.tmp r,
-  /var/lib/ntp/ntp.conf.dhcp r,
-
-  /etc/ntp.keys r,
-  /etc/ntp/** r,
-
-  /etc/ntp.drift rwl,
-  /etc/ntp.drift.TEMP rwl,
-  /etc/ntp/drift* rwl,
-  /var/lib/ntp/*drift rw,
-  /var/lib/ntp/*drift.TEMP rw,
-
-  /var/log/ntp w,
-  /var/log/ntp.log w,
-  /var/log/ntpd w,
-  /var/log/ntpstats/clockstats* rwl,
-  /var/log/ntpstats/loopstats*  rwl,
-  /var/log/ntpstats/peerstats*  rwl,
-  /var/log/ntpstats/protostats* rwl,
-  /var/log/ntpstats/rawstats*   rwl,
-  /var/log/ntpstats/sysstats*   rwl,
-
-  /{,var/}run/ntpd.pid w,
-
-  # samba4 ntp signing socket
-  /{,var/}run/samba/ntp_signd/socket rw,
-
-  # For use with clocks that report via shared memory (e.g. gpsd),
-  # you may need to give ntpd access to all of shared memory, though
-  # this can be considered dangerous. See https://launchpad.net/bugs/722815
-  # for details. To enable, add this to local/usr.sbin.ntpd:
-  #     capability ipc_owner,
-
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/usr.sbin.ntpd>
-}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/apparmor-profiles-extra.git

