<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2011-12-29 17:45:06 +0900 (Thu, 29 Dec 2011)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f">3213fb4420e2e47ad10843d7eacd2d40eaa4050f</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Merge</dt>
<dd style="margin-left: 8.5em">
<ul>
<li>Merged ca83269: Merge branch 'master' of github.com:mroonga/mroonga</li>
</ul>
</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Log</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em">[debian] fix apparmor config path.</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#diff-0">packages/debian/mysql-server-mroonga.postinst</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: packages/debian/mysql-server-mroonga.postinst (+2 -2)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L14">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L15">15</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L16">16</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L17">17</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L18">18</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L19">19</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L20">20</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L21">21</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L32">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L33">33</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L34">34</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L35">35</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L36">36</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0L39">39</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R14">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R15">15</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R16">16</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R17">17</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R18">18</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R19">19</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R20">20</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R21">21</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R32">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R33">33</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R34">34</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R35">35</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R36">36</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R37">37</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R38">38</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mroonga/commit/3213fb4420e2e47ad10843d7eacd2d40eaa4050f#L0R39">39</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -15,7 +15,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">install_apparmor() {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mysql_apparmor_profile_name=usr.sbin.mysqld</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mysql_apparmor_profile=/etc/apparmor.d/${mysql_apparmor_profile_name}</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> mysql_local_apparmor_profile=/etc/apparmor.d/local/${mysql_apparmor_profile_name}</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- apparmor_profile_name=mysql-server-groonga</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ apparmor_profile_name=mysql-server-mroonga</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> include_profile="#include <abstractions/${apparmor_profile_name}>"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> local_apparmor_profile=/etc/apparmor.d/local/${apparmor_profile_name}</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if test -f "${mysql_local_apparmor_profile}"; then</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -33,7 +33,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">install_apparmor() {</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> cat <<EOF >> "${mysql_abstraction_apparmor_profile}"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # ${apparmor_profile_name}: START</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-# Added by mysql-server-groonga.</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+# Added by mysql-server-mroonga.</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ${mysql_plugin_dir}/ r,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ${mysql_plugin_dir}/*.so* mr,</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ${include_profile}</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>