diff options
| author |   George Kranis <gkranis@users.noreply.github.com> | 2016-01-10 11:42:58 +0200 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2016-01-13 03:10:49 +1100 |
| commit | 8113436e8e6f4167597ac66716da07fb5caac4fd (patch) | |
| tree | cb4aac9165abb95e0531399e867a8887108a4440 /sys-apps/apparmor/files | |
| parent | sys-libs/libapparmor: install missing __init__.py (diff) | |
| download | gentoo-8113436e8e6f4167597ac66716da07fb5caac4fd.tar.gz gentoo-8113436e8e6f4167597ac66716da07fb5caac4fd.tar.bz2 gentoo-8113436e8e6f4167597ac66716da07fb5caac4fd.zip | |
sys-apps/apparmor: Bump to 2.10, fix dynamic linking with libapparmor
Diffstat (limited to 'sys-apps/apparmor/files')
| -rw-r--r-- | sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch | 12 | ||||
| -rw-r--r-- | sys-apps/apparmor/files/apparmor-2.10-makefile.patch | 25 |
2 files changed, 37 insertions, 0 deletions
diff --git a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch b/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch new file mode 100644 index 000000000000..24263d0892b2 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch @@ -0,0 +1,12 @@ +--- 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 + diff --git a/sys-apps/apparmor/files/apparmor-2.10-makefile.patch b/sys-apps/apparmor/files/apparmor-2.10-makefile.patch new file mode 100644 index 000000000000..397534aa7331 --- /dev/null +++ b/sys-apps/apparmor/files/apparmor-2.10-makefile.patch @@ -0,0 +1,25 @@ +--- 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} + |