From 376fde0479e00f7bc9444986e825c2254a277966 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 29 Oct 2014 22:50:47 +0100 Subject: [PATCH] - up to 2.9.0 --- apache-mod_apparmor.spec | 8 +++++--- apparmor-build.patch | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 apparmor-build.patch diff --git a/apache-mod_apparmor.spec b/apache-mod_apparmor.spec index 37b0335..5546af3 100644 --- a/apache-mod_apparmor.spec +++ b/apache-mod_apparmor.spec @@ -3,13 +3,14 @@ Summary: Apache module: AppArmor Summary(pl.UTF-8): Moduł Apache'a: AppArmor Name: apache-mod_%{mod_name} -Version: 2.8.3 +Version: 2.9.0 Release: 1 Epoch: 1 License: LGPL v2.1 Group: Networking/Daemons/HTTP -Source0: http://launchpad.net/apparmor/2.8/%{version}/+download/apparmor-%{version}.tar.gz -# Source0-md5: 43586e5096606e857fef45c49553e468 +Source0: http://launchpad.net/apparmor/2.9/%{version}/+download/apparmor-%{version}.tar.gz +# Source0-md5: daaeb859452f793abfdafd33f88d3e90 +Patch0: apparmor-build.patch URL: http://apparmor.wiki.kernel.org/ BuildRequires: %{apxs} BuildRequires: apache-devel >= 2.0.52-2 @@ -35,6 +36,7 @@ zwanych SubDomain. %prep %setup -q -n apparmor-%{version} +%patch0 -p1 %build %{__make} -C changehat/mod_apparmor mod_%{mod_name}.so \ diff --git a/apparmor-build.patch b/apparmor-build.patch new file mode 100644 index 0000000..faab59c --- /dev/null +++ b/apparmor-build.patch @@ -0,0 +1,14 @@ +--- apparmor-2.9.0/changehat/mod_apparmor/Makefile~ 2014-09-15 20:30:47.000000000 +0200 ++++ apparmor-2.9.0/changehat/mod_apparmor/Makefile 2014-10-29 22:49:19.303255857 +0100 +@@ -57,9 +57,9 @@ + endif # LIBAPPARMOR not set + LDLIBS += $(LIBAPPARMOR) + else +- LIBAPPARMOR_SRC := ../../libraries/libapparmor/ ++ LIBAPPARMOR_SRC := ../../libraries/libapparmor + LIBAPPARMOR_INCLUDE = $(LIBAPPARMOR_SRC)/include +- LIBAPPARMOR_PATH := $(LIBAPPARMOR_SRC)/src/.libs/ ++ LIBAPPARMOR_PATH := $(LIBAPPARMOR_SRC)/src/.libs + ifeq ($(realpath $(LIBAPPARMOR_PATH)/libapparmor.a),) + ERROR_MESSAGE = $(error ${nl}\ + ************************************************************************${nl}\ -- 2.43.0