public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/
@ 2017-10-30 12:53 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2017-10-30 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     9ffa8736aeb1da843ad06f5514fe068f90263f51
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 30 12:45:18 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 12:52:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ffa8736

sys-apps/apparmor: version bump 2.11.1

This resolves CVE-2017-6507.

Bug: https://bugs.gentoo.org/635888
Package-Manager: Portage-2.3.8, Repoman-2.3.4

 sys-apps/apparmor/Manifest                         |  1 +
 sys-apps/apparmor/apparmor-2.11.1.ebuild           | 60 ++++++++++++++++++++++
 .../files/apparmor-2.11.1-dynamic-link.patch       | 11 ++++
 3 files changed, 72 insertions(+)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index b3f6af57495..5a2383ffc95 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1,2 @@
 DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
+DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e

diff --git a/sys-apps/apparmor/apparmor-2.11.1.ebuild b/sys-apps/apparmor/apparmor-2.11.1.ebuild
new file mode 100644
index 00000000000..ce5c3943dfd
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.11.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="http://apparmor.net/"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+}
+
+src_compile()  {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake DESTDIR="${D}" USE_SYSTEM=1 install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}"/${PN}-init ${PN}
+	rm "${D}"/etc/init.d/boot.apparmor || die
+
+	use doc && dodoc techdoc.pdf
+}

diff --git a/sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch b/sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch
new file mode 100644
index 00000000000..bde21c30e70
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.11.1-dynamic-link.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -87,7 +87,7 @@
+ AAREOBJECT = ${AAREDIR}/libapparmor_re.a
+ AAREOBJECTS = $(AAREOBJECT)
+ AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L. $(LDFLAGS)
+-AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
++AALIB = -Wl,-Bdynamic -lapparmor -Wl,-Bdynamic -lpthread
+ 
+ ifdef USE_SYSTEM
+   # Using the system libapparmor so Makefile dependencies can't be used


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/
@ 2017-11-03 13:59 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2017-11-03 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     5b96d60bb673a66c941bce924f14334ca7e5659e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  3 13:58:57 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov  3 13:59:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b96d60b

sys-apps/apparmor: remove 2.11.0

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 sys-apps/apparmor/Manifest                         |  1 -
 sys-apps/apparmor/apparmor-2.11.0.ebuild           | 59 ----------------------
 .../files/apparmor-2.10-dynamic-link.patch         | 12 -----
 3 files changed, 72 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 5a2383ffc95..a2e9f8fdb80 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
 DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e

diff --git a/sys-apps/apparmor/apparmor-2.11.0.ebuild b/sys-apps/apparmor/apparmor-2.11.0.ebuild
deleted file mode 100644
index 99787fd94be..00000000000
--- a/sys-apps/apparmor/apparmor-2.11.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10-makefile.patch"
-	"${FILESDIR}/${PN}-2.10-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile()  {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}"/${PN}-init ${PN}
-
-	use doc && dodoc techdoc.pdf
-}

diff --git a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch b/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
deleted file mode 100644
index 24263d0892b..00000000000
--- a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -87,7 +87,7 @@
- AAREOBJECT = ${AAREDIR}/libapparmor_re.a
- AAREOBJECTS = $(AAREOBJECT)
- AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L.
--AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
-+AALIB = -Wl,-Bdynamic -lapparmor -Wl,-Bdynamic -lpthread
- 
- ifdef USE_SYSTEM
-   # Using the system libapparmor so Makefile dependencies can't be used
-


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/
@ 2017-12-07  9:49 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2017-12-07  9:49 UTC (permalink / raw
  To: gentoo-commits

commit:     01417d76965fc9cb35171e72694562c71da537c5
Author:     Reuben D'Netto <rdnetto <AT> gmail <DOT> com>
AuthorDate: Wed Dec  6 11:12:46 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 09:49:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01417d76

sys-apps/apparmor: Added systemd unit.

Closes: https://bugs.gentoo.org/555388
Closes: https://github.com/gentoo/gentoo/pull/6466

 sys-apps/apparmor/Manifest                  |  2 +-
 sys-apps/apparmor/apparmor-2.11.1-r2.ebuild | 64 +++++++++++++++++++++++++++++
 sys-apps/apparmor/files/apparmor.service    | 14 +++++++
 sys-apps/apparmor/files/apparmor_load.sh    |  2 +
 sys-apps/apparmor/files/apparmor_unload.sh  |  2 +
 5 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index a2e9f8fdb80..fa2e8344639 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1 +1 @@
-DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
+DIST apparmor-2.11.1.tar.gz 5017646 BLAKE2B ee0176c87b2800eb562c136ff324f08e444c412117c4593ff97c4b0e4c63db2aea0721c6ed38f3c733e3c95024165f329e520acf838c4798a8285b8dedf0d51e SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c

diff --git a/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
new file mode 100644
index 00000000000..1d78904b577
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.11.1-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd toolchain-funcs versionator
+
+MY_PV="$(get_version_component_range 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="http://apparmor.net/"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+}
+
+src_compile()  {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
+}

diff --git a/sys-apps/apparmor/files/apparmor.service b/sys-apps/apparmor/files/apparmor.service
new file mode 100644
index 00000000000..89f14fed4b7
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=AppArmor profiles
+DefaultDependencies=no
+After=local-fs.target
+Before=sysinit.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/share/apparmor/apparmor_load.sh
+ExecStop=/usr/share/apparmor/apparmor_unload.sh
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target

diff --git a/sys-apps/apparmor/files/apparmor_load.sh b/sys-apps/apparmor/files/apparmor_load.sh
new file mode 100755
index 00000000000..e6fe6b68431
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor_load.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -r {} +

diff --git a/sys-apps/apparmor/files/apparmor_unload.sh b/sys-apps/apparmor/files/apparmor_unload.sh
new file mode 100755
index 00000000000..19e598bb84c
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor_unload.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+find "/etc/apparmor.d/" -maxdepth 1 -type f -exec apparmor_parser -R {} \;


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/
@ 2018-11-25 10:32 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2018-11-25 10:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d17bd7b6d3871a0ab6a9af8d42bc1a222d1c50b7
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 10:31:51 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 10:32:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d17bd7b6

sys-apps/apparmor: backport patch from upstream fixing syntax error

Closes: https://bugs.gentoo.org/671426
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>

 sys-apps/apparmor/apparmor-2.13.1-r1.ebuild        | 65 ++++++++++++++++++++++
 .../apparmor/files/apparmor-2.13.1-syntax.patch    | 29 ++++++++++
 2 files changed, 94 insertions(+)

diff --git a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild b/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild
new file mode 100644
index 00000000000..b14dc3e4420
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.13.1-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+	"${FILESDIR}/${P}-syntax.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+}
+
+src_compile()  {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
+}

diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch b/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch
new file mode 100644
index 00000000000..b09d7800dec
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch
@@ -0,0 +1,29 @@
+From 3bf11cee3eceacb7f3ec177fb676ba36f373d369 Mon Sep 17 00:00:00 2001
+From: Christian Boltz <apparmor@cboltz.de>
+Date: Sun, 14 Oct 2018 18:10:46 +0200
+Subject: [PATCH] Fix syntax error in rc.apparmor.functions
+
+This bug was introduced in
+- https://gitlab.com/apparmor/apparmor/merge_requests/230
+- commit c974dd0d071149213892f03de0869b860705bda0 (master)
+- commit 9987a7ec9c0fc7fd9ac6831152dc77fb477fd04a (2.13 branch)
+---
+ parser/rc.apparmor.functions | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions
+index 516edf11..9edded52 100644
+--- a/rc.apparmor.functions
++++ b/rc.apparmor.functions
+@@ -128,7 +128,7 @@ skip_profile() {
+ 		return 2
+ 	fi
+ 	if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then
+-		return 2 ;;
++		return 2
+ 	fi
+ 
+ 	return 0
+-- 
+2.18.1
+


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/
@ 2019-03-07 11:03 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2019-03-07 11:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7cb99f95b6efeb2bea7575699ff1cb1e77481483
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  7 11:02:25 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar  7 11:03:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb99f95

sys-apps/apparmor: remove 2.12.0 and 2.13.1-r0

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>

 sys-apps/apparmor/Manifest                         |  1 -
 sys-apps/apparmor/apparmor-2.12.0.ebuild           | 64 ----------------------
 sys-apps/apparmor/apparmor-2.13.1.ebuild           | 64 ----------------------
 .../apparmor/files/apparmor-2.10-makefile.patch    | 25 ---------
 4 files changed, 154 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 1556178a53f..af8cbc892af 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.12.tar.gz 7258450 BLAKE2B c1d4e01d836c5f567ddb7c5ecf36dde6efccf1e59ae219824129fd5c92162a3fed7ebdc492f181ae132b07db068660078a9631543d40fd20ab0b44cd4c646d4c SHA512 d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a
 DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7

diff --git a/sys-apps/apparmor/apparmor-2.12.0.ebuild b/sys-apps/apparmor/apparmor-2.12.0.ebuild
deleted file mode 100644
index 03c5bca122b..00000000000
--- a/sys-apps/apparmor/apparmor-2.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${MY_PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile()  {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}

diff --git a/sys-apps/apparmor/apparmor-2.13.1.ebuild b/sys-apps/apparmor/apparmor-2.13.1.ebuild
deleted file mode 100644
index fad630e257f..00000000000
--- a/sys-apps/apparmor/apparmor-2.13.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.13.1-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile()  {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}

diff --git a/sys-apps/apparmor/files/apparmor-2.10-makefile.patch b/sys-apps/apparmor/files/apparmor-2.10-makefile.patch
deleted file mode 100644
index 397534aa733..00000000000
--- a/sys-apps/apparmor/files/apparmor-2.10-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile
-+++ b/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
-+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8
- 
- YACC	:= /usr/bin/bison
- YFLAGS	:= -d
-@@ -284,11 +284,9 @@
- .PHONY: install-indep
- install-indep:
- 	install -m 755 -d $(INSTALL_CONFDIR)
--	install -m 644 subdomain.conf $(INSTALL_CONFDIR)
-+	install -m 755 -d ${DESTDIR}/usr/libexec
- 	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)
-+	install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec
- 	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
- 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
- 


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/
@ 2019-12-02  9:29 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2019-12-02  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     728e24213ef6aabb47c60592bb07095e0b2cedf7
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  2 09:27:54 2019 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Dec  2 09:28:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=728e2421

sys-apps/apparmor: remove 2.13.1

Package-Manager: Portage-2.3.76, Repoman-2.3.18
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>

 sys-apps/apparmor/Manifest                         |  1 -
 sys-apps/apparmor/apparmor-2.13.1-r1.ebuild        | 65 ----------------------
 .../apparmor/files/apparmor-2.13.1-syntax.patch    | 29 ----------
 3 files changed, 95 deletions(-)

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index f99a118d76e..696ceaa4e8e 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1 @@
-DIST apparmor-2.13.1.tar.gz 7367615 BLAKE2B 34a5f42b32bd4790f1075b76dfa17dd5b5cedfde7074eb0c57a3982a47e7b4dd2570bc056a4f4a8064c6a126a4727829cf5dcc04a4912f009338206faa887017 SHA512 e4b9788ecc0b59285f17d5e87669f507bf849c15d0ac3833e8d1d6aa2ece7add15814c75f257cea9d71a709c1af4990d8b76773e59fd42dbf5cfa2de0f9495a7
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141

diff --git a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild b/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild
deleted file mode 100644
index b14dc3e4420..00000000000
--- a/sys-apps/apparmor/apparmor-2.13.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.13.1-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-	"${FILESDIR}/${P}-syntax.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile()  {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}

diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch b/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch
deleted file mode 100644
index b09d7800dec..00000000000
--- a/sys-apps/apparmor/files/apparmor-2.13.1-syntax.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3bf11cee3eceacb7f3ec177fb676ba36f373d369 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Sun, 14 Oct 2018 18:10:46 +0200
-Subject: [PATCH] Fix syntax error in rc.apparmor.functions
-
-This bug was introduced in
-- https://gitlab.com/apparmor/apparmor/merge_requests/230
-- commit c974dd0d071149213892f03de0869b860705bda0 (master)
-- commit 9987a7ec9c0fc7fd9ac6831152dc77fb477fd04a (2.13 branch)
----
- parser/rc.apparmor.functions | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions
-index 516edf11..9edded52 100644
---- a/rc.apparmor.functions
-+++ b/rc.apparmor.functions
-@@ -128,7 +128,7 @@ skip_profile() {
- 		return 2
- 	fi
- 	if echo "${profile}" | egrep -q '^.+\.new-[0-9\.]+_[0-9]+$'; then
--		return 2 ;;
-+		return 2
- 	fi
- 
- 	return 0
--- 
-2.18.1
-


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/
@ 2025-02-10  2:39 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2025-02-10  2:39 UTC (permalink / raw
  To: gentoo-commits

commit:     06b744e3a820e7b3e8391e2fd06f50493bb01ec0
Author:     Ao Luo <myloveyuxuan <AT> gmail <DOT> com>
AuthorDate: Tue Mar 12 05:40:07 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 02:38:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b744e3

sys-apps/apparmor: Fix hardcoded paths for loading apparmor functions

Closes: https://bugs.gentoo.org/895302
Signed-off-by: Ao Luo <myloveyuxuan <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35698
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...armor-3.1.4.ebuild => apparmor-3.1.4-r2.ebuild} |  1 +
 .../files/apparmor-3.1.4-fix-hardcoded-path.patch  | 34 ++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/sys-apps/apparmor/apparmor-3.1.4.ebuild b/sys-apps/apparmor/apparmor-3.1.4-r2.ebuild
similarity index 97%
rename from sys-apps/apparmor/apparmor-3.1.4.ebuild
rename to sys-apps/apparmor/apparmor-3.1.4-r2.ebuild
index 141029aefee8..2e87cb1c0fdf 100644
--- a/sys-apps/apparmor/apparmor-3.1.4.ebuild
+++ b/sys-apps/apparmor/apparmor-3.1.4-r2.ebuild
@@ -36,6 +36,7 @@ S=${WORKDIR}/apparmor-${PV}/parser
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.5-makefile.patch"
 	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+	"${FILESDIR}/${PN}-3.1.4-fix-hardcoded-path.patch"
 )
 
 src_prepare() {

diff --git a/sys-apps/apparmor/files/apparmor-3.1.4-fix-hardcoded-path.patch b/sys-apps/apparmor/files/apparmor-3.1.4-fix-hardcoded-path.patch
new file mode 100644
index 000000000000..6e7c83d766e4
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-3.1.4-fix-hardcoded-path.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/895302
+--- a/apparmor.systemd
++++ b/apparmor.systemd
+@@ -15,7 +15,7 @@
+ #    along with this program; if not, contact Novell, Inc.
+ # ----------------------------------------------------------------------
+ 
+-APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions
++APPARMOR_FUNCTIONS=/usr/libexec/rc.apparmor.functions
+ 
+ aa_action()
+ {
+--- a/profile-load
++++ b/profile-load
+@@ -21,7 +21,7 @@
+ 
+ [ -z "$1" ]                  && exit 1 # require a profile name
+ 
+-. /lib/apparmor/rc.apparmor.functions
++. /usr/libexec/rc.apparmor.functions
+ 
+ # do not load in a container
+ if [ -x /usr/bin/systemd-detect-virt ] && \
+--- a/rc.apparmor.slackware
++++ b/rc.apparmor.slackware
+@@ -18,7 +18,7 @@
+ # rc.apparmor by Steve Beattie
+ #
+ # /etc/rc.d/rc.apparmor
+-APPARMOR_FUNCTIONS=/lib/apparmor/rc.apparmor.functions
++APPARMOR_FUNCTIONS=/usr/libexec/rc.apparmor.functions
+ 
+ aa_action() {
+ 	STRING=$1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2025-02-10  2:39 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-25 10:32 [gentoo-commits] repo/gentoo:master commit in: sys-apps/apparmor/, sys-apps/apparmor/files/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2025-02-10  2:39 Sam James
2019-12-02  9:29 Michael Palimaka
2019-03-07 11:03 Michael Palimaka
2017-12-07  9:49 Michael Palimaka
2017-11-03 13:59 Michael Palimaka
2017-10-30 12:53 Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox