From ad842371532e719408e9ae931c79a8e45cb3994d Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Tue, 12 Jun 2012 03:55:23 +1000 Subject: sys-apps/apparmor: Version bump. --- sys-apps/apparmor/ChangeLog | 7 +++ sys-apps/apparmor/Manifest | 8 +-- sys-apps/apparmor/apparmor-2.7.2.ebuild | 61 ---------------------- sys-apps/apparmor/apparmor-2.8.0.ebuild | 61 ++++++++++++++++++++++ .../apparmor/files/apparmor-2.7.2-makefile.patch | 32 ------------ .../apparmor/files/apparmor-2.8.0-makefile.patch | 32 ++++++++++++ 6 files changed, 104 insertions(+), 97 deletions(-) delete mode 100644 sys-apps/apparmor/apparmor-2.7.2.ebuild create mode 100644 sys-apps/apparmor/apparmor-2.8.0.ebuild delete mode 100644 sys-apps/apparmor/files/apparmor-2.7.2-makefile.patch create mode 100644 sys-apps/apparmor/files/apparmor-2.8.0-makefile.patch (limited to 'sys-apps') diff --git a/sys-apps/apparmor/ChangeLog b/sys-apps/apparmor/ChangeLog index cbbef872c..cc5f92076 100644 --- a/sys-apps/apparmor/ChangeLog +++ b/sys-apps/apparmor/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*apparmor-2.8.0 (11 Jun 2012) + + 11 Jun 2012; Michael Palimaka -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) -files/apparmor-2.7.0-makefile.patch: Remove obsolete patch. diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest index 45470d06d..e79bc7191 100644 --- a/sys-apps/apparmor/Manifest +++ b/sys-apps/apparmor/Manifest @@ -1,7 +1,7 @@ -AUX apparmor-2.7.2-makefile.patch 1097 RMD160 d58da71b9e0480872e27925229427ebe27679a16 SHA1 da0be63895c8710c00a0f17dfe1c6810540f2a2d SHA256 eb09bec6245bab5f1431aaf0438ba82edc3051cc030c4f3e980ecd05bc4630e3 +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.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 1517 RMD160 9e7e457300fb8fec72f43222fd9e286b296a4614 SHA1 1cfbec45285e8cba7911ba58299378b7e53b27da SHA256 d785662d62d6957df3fd61dae11ee96ce23e156c1ceea651509223000526a6aa +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.7.2.ebuild b/sys-apps/apparmor/apparmor-2.7.2.ebuild deleted file mode 100644 index 8fdfc4545..000000000 --- a/sys-apps/apparmor/apparmor-2.7.2.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/apparmor-2.8.0.ebuild b/sys-apps/apparmor/apparmor-2.8.0.ebuild new file mode 100644 index 000000000..8fdfc4545 --- /dev/null +++ b/sys-apps/apparmor/apparmor-2.8.0.ebuild @@ -0,0 +1,61 @@ +# 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.7.2-makefile.patch b/sys-apps/apparmor/files/apparmor-2.7.2-makefile.patch deleted file mode 100644 index 9575d00c4..000000000 --- a/sys-apps/apparmor/files/apparmor-2.7.2-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-2.8.0-makefile.patch b/sys-apps/apparmor/files/apparmor-2.8.0-makefile.patch new file mode 100644 index 000000000..9575d00c4 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-2.8.0-makefile.patch @@ -0,0 +1,32 @@ +--- 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} + -- cgit v1.2.3-65-gdbad