sys-apps/apparmor: Explicitly state printf format. Thanks to mgorny for the report...

svn path=/sunrise/; revision=12553

diff --git a/sys-apps/apparmor/ChangeLog b/sys-apps/apparmor/ChangeLog
index 366b545d65ac426e6d9d92a9d2b36ae8dd052f90..2eec5b85bd7b149cfa92eb1c2107c4e791a0dce2 100644 (file)
--- a/sys-apps/apparmor/ChangeLog
+++ b/sys-apps/apparmor/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
+  files/apparmor-init:
+  Explicitly state printf format. Thanks to mgorny for the report and fix, and
+  Tommy[D] for the review.
+
   24 Nov 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
   files/apparmor-confd, files/apparmor-init:
   Avoid bashisms in initscript. Thanks to mgorny for the report, and Tommy[D]

diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 3c594cbd8634df49de675b7617c6b78850d52331..443925a5f42a7fb44d3cee7eae8a0bcac834ffa9 100644 (file)
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,7 +1,7 @@
 AUX apparmor-2.6.1-makefile.patch 2556 RMD160 614eab68a68a847325ef43b1d92330d41ef7eb55 SHA1 95efd84a6b675f78d4a8bb982c331a57f8f186b5 SHA256 ff98a5a9e3593e959e578d07b89956476f79a1a0e139f4e12a2ae1e665b02881
 AUX apparmor-confd 324 RMD160 4f06f3491dce4c245332a5ee7f351638b9384bba SHA1 224d0ab3b504ceff522d470311dc5e86b51d83c1 SHA256 f6a6fb9897a492d9f53aad447324f006e5242c3e78f534bc55087bd564c287f0
-AUX apparmor-init 3892 RMD160 714b9533ba76ed25010aea1323132e7a893ee5c7 SHA1 a3271eeecdc223e373f62f3b6f5a86dfaac70746 SHA256 efb8adfc3a192ab429773828276745246da84cd0351a271655faf975c24abaad
+AUX apparmor-init 3902 RMD160 824431971e99b71a197c2069715d08e022fb89ef SHA1 3932106df86ed33bfb396fac6d284eecc567fafa SHA256 aa642aa35d4e861974ba8968397c80230fbd226a6d4d37884d2ca5e8cf7eda54
 DIST apparmor-2.6.1.tar.gz 1612637 RMD160 241f0ba363b7f7c2d7e25cba4f6d7f6eb2c6f3f9 SHA1 c8837b1e0c4bd90858579cb9758af203122889aa SHA256 9cb015d8c1023d7549621d1caeea0cd92a33c48dba0762d75385f9ff7a11e2f4
 EBUILD apparmor-2.6.1.ebuild 1003 RMD160 dfcbd71afb56902dd956fa72d0f6d17d029b3670 SHA1 9b81fd3103a9b5cac044c883c233ed7651183de1 SHA256 cd2ec215bf6b6876074aea94bf2939d9212005add15061d5317e81b0ef19fb15
-MISC ChangeLog 608 RMD160 0f81f098550e8af50437715e32478a860060f401 SHA1 f386264b8b8e44178eb945da0d46da51a2788178 SHA256 a0fd0562fdb4a07e0f33ef3e8447aa8b1755aa1144f8e2a7addecdb08b44852a
+MISC ChangeLog 812 RMD160 dee45491a0cbedb66840f93405d570946cb13ecb SHA1 e788b433603b4ff5ee852610955af07d20349d6e SHA256 4499c1e948881c2329b7e7f95f69a0b52748b8a7b2956969bc34bff1a45d7d10
 MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8

diff --git a/sys-apps/apparmor/files/apparmor-init b/sys-apps/apparmor/files/apparmor-init
index f0e4cc5b290c00cbf739d8e81c4fdcfba6e7e713..0d408eadc96ab7364ffe60a81fabead92e020330 100755 (executable)
--- a/sys-apps/apparmor/files/apparmor-init
+++ b/sys-apps/apparmor/files/apparmor-init
@@ -152,7 +152,7 @@ remove_profiles() {
        PROFILES=$(get_active_profiles)
        for PROFILE in $PROFILES; do
                #use printf instead of echo -n for POSIX compatibility
-               printf "$PROFILE" > "${SECURITYFS}/.remove"
+               printf '%s' "$PROFILE" > "${SECURITYFS}/.remove"
        done
        return 0
 }
@@ -206,7 +206,7 @@ unload_obsolete_profiles() {
 
        for PROFILE in $(comm -2 -3 old new_sorted); do
                #use printf instead of echo -n for POSIX compatibility
-               printf "$PROFILE" > "${SECURITYFS}/.remove"
+               printf '%s' "$PROFILE" > "${SECURITYFS}/.remove"
        done
 
        rm -rf "${TEMPDIR}"