summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka (kensington) <kensington@astralcloak.net>2012-02-05 12:51:51 +0000
committerMichael Palimaka (kensington) <kensington@astralcloak.net>2012-02-05 12:51:51 +0000
commit75e9edc9347ea4c90d72258e81054a80837daf0a (patch)
treefbe8996f1b7bb0a63649283d43cdd92802d68ffe /sys-apps
parentsys-apps/apparmor-utils: Version bump. Respect LINGUAS. Thanks to mgorny, has... (diff)
downloadsunrise-75e9edc9347ea4c90d72258e81054a80837daf0a.tar.gz
sunrise-75e9edc9347ea4c90d72258e81054a80837daf0a.tar.bz2
sunrise-75e9edc9347ea4c90d72258e81054a80837daf0a.zip
sys-apps/apparmor: Remove obsolete patch.
svn path=/sunrise/; revision=12730
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/apparmor/ChangeLog4
-rw-r--r--sys-apps/apparmor/Manifest3
-rw-r--r--sys-apps/apparmor/files/apparmor-2.7.0-makefile.patch32
3 files changed, 5 insertions, 34 deletions
diff --git a/sys-apps/apparmor/ChangeLog b/sys-apps/apparmor/ChangeLog
index f6f91d7c9..cbbef872c 100644
--- a/sys-apps/apparmor/ChangeLog
+++ b/sys-apps/apparmor/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 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>
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 12e512732..45470d06d 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,8 +1,7 @@
-AUX apparmor-2.7.0-makefile.patch 1097 RMD160 d58da71b9e0480872e27925229427ebe27679a16 SHA1 da0be63895c8710c00a0f17dfe1c6810540f2a2d SHA256 eb09bec6245bab5f1431aaf0438ba82edc3051cc030c4f3e980ecd05bc4630e3
AUX apparmor-2.7.2-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.7.2.tar.gz 1403151 RMD160 a51fa3ec0dfa4f3cae77556fa751a414e1bc556b SHA1 0645cc2352f89c41825c59a07dfca9035599d85d SHA256 42deb8cbf4937fac07a48ec8427b90131e92ed2f83b606beee092bdb4fc2a41f
EBUILD apparmor-2.7.2.ebuild 1348 RMD160 8e40b2cad24cf3f93f8641e1f29783eff9f712d2 SHA1 21fd6dafe0b3ce03a5b5156060abf7e531adf1a1 SHA256 6a82137120925278da2720d7cb26b6dd67d393eb42b1e3c714771a5e2aa8cc8f
-MISC ChangeLog 1377 RMD160 b0dc1275dd538a75043da8b9d70ba5ef4b4ebc7a SHA1 2a2441b319000199c4feae17eadc4e694917d671 SHA256 1ea97612df417546b86bdb63390977958974516b8ca5fa25b99bb0c894f15e0d
+MISC ChangeLog 1517 RMD160 9e7e457300fb8fec72f43222fd9e286b296a4614 SHA1 1cfbec45285e8cba7911ba58299378b7e53b27da SHA256 d785662d62d6957df3fd61dae11ee96ce23e156c1ceea651509223000526a6aa
MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8
diff --git a/sys-apps/apparmor/files/apparmor-2.7.0-makefile.patch b/sys-apps/apparmor/files/apparmor-2.7.0-makefile.patch
deleted file mode 100644
index 9575d00c4..000000000
--- a/sys-apps/apparmor/files/apparmor-2.7.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}
-