summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2013-12-04 04:39:37 +1100
committerMichael Palimaka <kensington@gentoo.org>2013-12-04 04:39:37 +1100
commit763a7c90c70c0486e8eb8416946be4b69e61131a (patch)
tree4c5624b1f5cdfb4c91ebb3559295479809aa9b58 /sys-apps
parentsys-apps/apparmor-utils: in portage. (diff)
downloadsunrise-763a7c90c70c0486e8eb8416946be4b69e61131a.tar.gz
sunrise-763a7c90c70c0486e8eb8416946be4b69e61131a.tar.bz2
sunrise-763a7c90c70c0486e8eb8416946be4b69e61131a.zip
sys-apps/apparmor: in portage.
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/apparmor/ChangeLog45
-rw-r--r--sys-apps/apparmor/Manifest7
-rw-r--r--sys-apps/apparmor/apparmor-2.8.0.ebuild61
-rw-r--r--sys-apps/apparmor/files/apparmor-2.8.0-makefile.patch32
-rw-r--r--sys-apps/apparmor/files/apparmor-confd13
-rw-r--r--sys-apps/apparmor/files/apparmor-init215
-rw-r--r--sys-apps/apparmor/metadata.xml5
7 files changed, 0 insertions, 378 deletions
diff --git a/sys-apps/apparmor/ChangeLog b/sys-apps/apparmor/ChangeLog
deleted file mode 100644
index cc5f92076..000000000
--- a/sys-apps/apparmor/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-# ChangeLog for sys-apps/apparmor
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*apparmor-2.8.0 (11 Jun 2012)
-
- 11 Jun 2012; Michael Palimaka <kensington@gentoo.org> -apparmor-2.7.2.ebuild,
- -files/apparmor-2.7.2-makefile.patch, +apparmor-2.8.0.ebuild,
- +files/apparmor-2.8.0-makefile.patch:
- Version bump.
-
- 05 Feb 2012; Michael Palimaka (kensington) <kensington@astralcloak.net>
- -files/apparmor-2.7.0-makefile.patch:
- Remove obsolete patch.
-
-*apparmor-2.7.2 (05 Feb 2012)
-
- 05 Feb 2012; Michael Palimaka (kensington) <kensington@astralcloak.net>
- -apparmor-2.7.0.ebuild, +apparmor-2.7.2.ebuild,
- +files/apparmor-2.7.2-makefile.patch:
- Version bump. Respect LINGUAS. Thanks to mgorny, hasufull, and Tommy[D] for
- review.
-
-*apparmor-2.7.0 (18 Dec 2011)
-
- 18 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
- -apparmor-2.6.1.ebuild, -files/apparmor-2.6.1-makefile.patch,
- +apparmor-2.7.0.ebuild, +files/apparmor-2.7.0-makefile.patch:
- Version bump. Thanks to Tommy[D] for review.
-
- 03 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
- files/apparmor-init:
- Explicitly state printf format. Thanks to mgorny for the report and fix, and
- Tommy[D] for the review.
-
- 24 Nov 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
- files/apparmor-confd, files/apparmor-init:
- Avoid bashisms in initscript. Thanks to mgorny for the report, and Tommy[D]
- for the review.
-
- 13 Nov 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
- +apparmor-2.6.1.ebuild, +files/apparmor-2.6.1-makefile.patch,
- +files/apparmor-confd, +files/apparmor-init, +metadata.xml:
- New Ebuild for bug #118779. Thanks to floppym & hwoarang for feedback.
-
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
deleted file mode 100644
index e79bc7191..000000000
--- a/sys-apps/apparmor/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX apparmor-2.8.0-makefile.patch 1097 RMD160 d58da71b9e0480872e27925229427ebe27679a16 SHA1 da0be63895c8710c00a0f17dfe1c6810540f2a2d SHA256 eb09bec6245bab5f1431aaf0438ba82edc3051cc030c4f3e980ecd05bc4630e3
-AUX apparmor-confd 324 RMD160 4f06f3491dce4c245332a5ee7f351638b9384bba SHA1 224d0ab3b504ceff522d470311dc5e86b51d83c1 SHA256 f6a6fb9897a492d9f53aad447324f006e5242c3e78f534bc55087bd564c287f0
-AUX apparmor-init 3902 RMD160 824431971e99b71a197c2069715d08e022fb89ef SHA1 3932106df86ed33bfb396fac6d284eecc567fafa SHA256 aa642aa35d4e861974ba8968397c80230fbd226a6d4d37884d2ca5e8cf7eda54
-DIST apparmor-2.8.0.tar.gz 1462560 RMD160 3cb2a6a81bd254d09ade83737dd2e97e1daea600 SHA1 7a49a5fc2a46f6844bad74a83c9cfe93b8b32125 SHA256 03e2e91fac17694635d25d7482e46db69320cd844590740073cf5fdfdd5379c6
-EBUILD apparmor-2.8.0.ebuild 1348 RMD160 8e40b2cad24cf3f93f8641e1f29783eff9f712d2 SHA1 21fd6dafe0b3ce03a5b5156060abf7e531adf1a1 SHA256 6a82137120925278da2720d7cb26b6dd67d393eb42b1e3c714771a5e2aa8cc8f
-MISC ChangeLog 1749 RMD160 9207e9e40408f013924ed3e6559e4ad280556969 SHA1 9c7445a43f22b1db6c0bc29a7ee8041bb20935c7 SHA256 23f4aebee2e208bacec29a267e205b82513d564d53bb9658c95268e0a9521e7e
-MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8
diff --git a/sys-apps/apparmor/apparmor-2.8.0.ebuild b/sys-apps/apparmor/apparmor-2.8.0.ebuild
deleted file mode 100644
index 8fdfc4545..000000000
--- a/sys-apps/apparmor/apparmor-2.8.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils toolchain-funcs versionator
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-LANGS="af ar bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl
- gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt pt_BR ro ru si
- sk sl sr sv ta th tr uk vi wa xh zh_CN zh_TW zu"
-
-for X in ${LANGS} ; do
- IUSE+=" linguas_${X}"
-done
-unset X
-
-DEPEND="dev-lang/perl
- sys-devel/bison
- sys-devel/flex
- doc? ( dev-tex/latex2html )"
-RDEPEND=""
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
-
- local lang
- for lang in ${LANGS}; do
- if ! use linguas_${lang}; then
- rm po/${lang}.po || die "failed to remove nls"
- fi
- done
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" arch manpages
- use doc && emake pdf
-}
-
-src_install() {
- emake DESTDIR="${D}" arch manpages install
-
- dodir /etc/apparmor.d
-
- newinitd "${FILESDIR}"/${PN}-init ${PN}
- newconfd "${FILESDIR}"/${PN}-confd ${PN}
-
- dodoc README
- use doc && dodoc techdoc.pdf
-}
diff --git a/sys-apps/apparmor/files/apparmor-2.8.0-makefile.patch b/sys-apps/apparmor/files/apparmor-2.8.0-makefile.patch
deleted file mode 100644
index 9575d00c4..000000000
--- a/sys-apps/apparmor/files/apparmor-2.8.0-makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -31,7 +31,7 @@
- CONFDIR=/etc/apparmor
- INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
- LOCALEDIR=/usr/share/locale
--MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 apparmor.vim.5
-+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8
-
- YACC := /usr/bin/bison
- YFLAGS := -d
-@@ -152,7 +152,7 @@
- ln -s `$(CXX) -print-file-name=libstdc++.a`
-
- apparmor_parser: $(OBJECTS) $(AAREOBJECTS)
-- $(CXX) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
-+ $(CXX) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
- ${LEXLIB} $(AAREOBJECTS) $(AARE_LDFLAGS)
-
- parser_yacc.c parser_yacc.h: parser_yacc.y parser.h
-@@ -284,11 +284,7 @@
- .PHONY: install-indep
- install-indep:
- install -m 755 -d $(INSTALL_CONFDIR)
-- install -m 644 subdomain.conf $(INSTALL_CONFDIR)
- install -m 644 parser.conf $(INSTALL_CONFDIR)
-- install -m 755 -d ${DESTDIR}/var/lib/apparmor
-- install -m 755 -d $(APPARMOR_BIN_PREFIX)
-- install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
- $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
- $(MAKE) install_manpages DESTDIR=${DESTDIR}
-
diff --git a/sys-apps/apparmor/files/apparmor-confd b/sys-apps/apparmor/files/apparmor-confd
deleted file mode 100644
index 1490ca728..000000000
--- a/sys-apps/apparmor/files/apparmor-confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# config file for /etc/init.d/apparmor
-
-# Location of parser
-PARSER=/sbin/apparmor_parser
-
-# Directory in which profiles are stored
-# Note, subdirectories can be ignored by placing
-# an empty ".ignore" file within
-PROFILE_DIR=/etc/apparmor.d/
-
-# Where securityfs is/will be mounted
-SECURITYFS=/sys/kernel/security/apparmor
-
diff --git a/sys-apps/apparmor/files/apparmor-init b/sys-apps/apparmor/files/apparmor-init
deleted file mode 100644
index 0d408eadc..000000000
--- a/sys-apps/apparmor/files/apparmor-init
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-extra_started_commands="reload"
-
-start() {
- ebegin "Starting ${SVCNAME}"
- eindent
-
- if ! check_config || ! remove_profiles || ! load_profiles load ; then
- eend 1
- return 1
- fi
-
- eoutdent
- eend 0
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
-
- if ! check_config ; then
- eend 1
- return 1
- fi
-
- eindent
- ebegin "Removing profiles"
- remove_profiles
- eoutdent
- rc=$?
- eend $rc
- return $rc
-}
-
-reload() {
- ebegin "Reloading ${SVCNAME} profiles"
-
- if ! ( check_config && load_profiles reload && unload_obsolete_profiles ); then
- eend 1
- return 1
- fi
-
- eend 0
- return 0
-}
-
-check_config() {
-
- if [ -z "$PARSER" -o -z "$PROFILE_DIR" -o -z "$SECURITYFS" ]; then
- eerror "/etc/conf.d/${SVCNAME} has missing variables"
- return 1
- fi
-
- if ! is_securityfs_mounted ; then
- if ! mount_securityfs ; then
- eerror "Failed to mount securityfs"
- return 1
- fi
- fi
-
- if ! is_apparmor_present ; then
- modprobe -q apparmor
- if ! is_apparmor_present ; then
- eerror "${SVCNAME} kernel support is not present"
- return 1
- fi
- fi
-
- if ! check_apparmor_compat ; then
- eerror "${SVCNAME} compatibility is not present in the kernel"
- return 1
- fi
-}
-
-get_profile_files() {
- ARGS=""
- IGNORES="$( find ${PROFILE_DIR} -name .ignore )"
- LENGTH=$( echo "$IGNORES" | wc -l )
-
- I=1;
- for IGNORE in $IGNORES; do
- ARGS="${ARGS} -path $( dirname ${IGNORE} ) -prune"
- if [ $LENGTH -gt 1 -a $I -lt $LENGTH ]; then
- ARGS="${ARGS} -o"
- fi
- I=$(($I+1))
- done
-
- if [ -z "$ARGS" ]; then
- PROFILES="find /etc/apparmor.d"
- else
- PROFILES="find /etc/apparmor.d "$ARGS" -o -type f -print"
- fi
-
- echo $( $PROFILES )
-}
-
-get_active_profiles() {
- PROFILES=`sed -e "s/ (\(enforce\|complain\))//" "${SECURITYFS}/profiles"`
- echo $PROFILES
-}
-
-load_profiles() {
-
- case "$1" in
- load)
- PARSER_ARGS="--add"
- MESSAGE="Loading ${SVCNAME} profiles"
- ;;
- reload)
- PARSER_ARGS="--replace"
- MESSAGE="Reloading ${SVCNAME} profiles"
- ;;
- *)
- eerror "Invalid load_profile argument"
- exit 1
- ;;
- esac
-
- if [ ! -x "${PARSER}" ]; then
- eerror "Could not find apparmor_parser"
- return 1
- fi
-
- if [ ! -d "${PROFILE_DIR}" -o -z "$(ls $PROFILE_DIR 2> /dev/null)" ]; then
- ewarn "No profiles found"
- return 0
- fi
-
- PROFILES="$(get_profile_files)"
-
- for PROFILE in $PROFILES; do
- $PARSER $PARSER_ARGS $PROFILE
- if [ $? -ne 0 ]; then
- if [ "${PARSER_ARGS}" = "replace" ]; then
- ewarn "Error loading '${PROFILE}', continuing"
- else
- eerror "Error loading '${PROFILE}', aborting"
- remove_profiles
- return 1
- fi
- fi
- done
-
- return 0
-}
-
-remove_profiles() {
- PROFILES=$(get_active_profiles)
- for PROFILE in $PROFILES; do
- #use printf instead of echo -n for POSIX compatibility
- printf '%s' "$PROFILE" > "${SECURITYFS}/.remove"
- done
- return 0
-}
-
-is_securityfs_mounted() {
- grep -q securityfs /proc/filesystems && grep -q securityfs /proc/mounts
- return $?
-}
-
-mount_securityfs() {
- if [ grep -q securityfs /proc/filesystems ]; then
- mount -t securityfs securityfs "${SECURITYFS}"
- return $?
- else
- return 1
- fi
-}
-
-is_apparmor_present() {
- grep -q "^apparmor" /proc/modules
- [ $? -ne 0 -a -d /sys/module/apparmor ]
- return $?
-}
-
-check_apparmor_compat() {
- if [ -f "${SECURITYFS}/profiles" ]; then
- return 0
- else
- return 1
- fi
-}
-
-unload_obsolete_profiles() {
-
- TEMPDIR=$(umask 0077 && mktemp -d)
-
- if [ ! -d "${TEMPDIR}" ]; then
- eerror "Failed to create temporary directory"
- return 1
- fi
-
- cd $TEMPDIR
-
- echo $(get_active_profiles) | tr ' ' '\n' | sort > old
-
- for PROFILE in $(get_profile_files); do
- echo $(${PARSER} -N "$PROFILE") >> new
- done
-
- sort new > new_sorted
-
- for PROFILE in $(comm -2 -3 old new_sorted); do
- #use printf instead of echo -n for POSIX compatibility
- printf '%s' "$PROFILE" > "${SECURITYFS}/.remove"
- done
-
- rm -rf "${TEMPDIR}"
-
- return 0
-}
diff --git a/sys-apps/apparmor/metadata.xml b/sys-apps/apparmor/metadata.xml
deleted file mode 100644
index f9d4a986f..000000000
--- a/sys-apps/apparmor/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
-</pkgmetadata>