<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[94599] trunk/dports/databases/percona</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/94599">94599</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2012-06-24 15:44:01 -0700 (Sun, 24 Jun 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>databases/percona:
- Upgrade to version 5.5.24 release 26.0.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesperconaPortfile">trunk/dports/databases/percona/Portfile</a></li>
<li><a href="#trunkdportsdatabasesperconafilespercona">trunk/dports/databases/percona/files/percona</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesperconafilesmacportsdefaultcnf">trunk/dports/databases/percona/files/macports-default.cnf</a></li>
<li><a href="#trunkdportsdatabasesperconafilesmycnf">trunk/dports/databases/percona/files/my.cnf</a></li>
<li><a href="#trunkdportsdatabasesperconafilespatchpluginperconapamformysqlCMakeListstxtdiff">trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsdatabasesperconafilespatchpluginperconapamformysqlsrcauth_pam_commonhdiff">trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesperconafilespatchstorageinnobasebufbuf0bufcdiff">trunk/dports/databases/percona/files/patch-storage-innobase-buf-buf0buf.c.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasesperconaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/percona/Portfile (94598 => 94599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/Portfile  2012-06-24 21:00:12 UTC (rev 94598)
+++ trunk/dports/databases/percona/Portfile     2012-06-24 22:44:01 UTC (rev 94599)
</span><span class="lines">@@ -5,8 +5,11 @@
</span><span class="cx"> 
</span><span class="cx"> name                percona
</span><span class="cx"> set name_mysql      ${name}
</span><del>-set version_mysql   5.5.23
-set release         25.3
</del><ins>+set version_mysql   5.5.24
+set release         26.0
+# Please set revision_client and revision_server to 0 if you bump version_mysql or release.
+set revision_client 0
+set revision_server 0
</ins><span class="cx"> version             ${version_mysql}-${release}
</span><span class="cx"> categories          databases
</span><span class="cx"> platforms           darwin
</span><span class="lines">@@ -21,6 +24,7 @@
</span><span class="cx"> 
</span><span class="cx">     set branch          [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> 
</span><ins>+    revision            ${revision_client}
</ins><span class="cx">     license             GPL-2
</span><span class="cx">     description         Multithreaded SQL database server
</span><span class="cx">     long_description    MySQL is an open-source, multi-threaded SQL database with a command \
</span><span class="lines">@@ -37,46 +41,66 @@
</span><span class="cx">     patchfiles          patch-cmake-install_layout.cmake.diff
</span><span class="cx">     # http://bugs.mysql.com/bug.php?id=65050
</span><span class="cx">     patchfiles-append   patch-configure.cmake.diff
</span><del>-    # https://bugs.launchpad.net/percona-server/+bug/997496
-    patchfiles-append   patch-storage-innobase-buf-buf0buf.c.diff
</del><ins>+    # https://code.launchpad.net/~stewart/percona-pam-for-mysql/bug1012488
+    patchfiles-append   patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff \
+                        patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff
</ins><span class="cx"> 
</span><del>-    checksums           rmd160  7e2cedb0e4ecc87389a506eb16d34fee30890b75 \
-                        sha256  4173c39a06a45d399725e334d716716b871f4b43b90dad9faf3afbeb61acb00e
</del><ins>+    checksums           rmd160  16d4c9958b002f45673e64c1bc5d798ccc21b319 \
+                        sha256  5b54738099156b44d387142a875ff529895406a75652ebb4654cabd3597f1f56
</ins><span class="cx"> 
</span><span class="cx">     depends_lib-append  port:zlib \
</span><del>-                        port:readline \
</del><span class="cx">                         port:cmake
</span><del>-    depends_run         port:mysql_select
</del><ins>+    depends_run-append  port:mysql_select
</ins><span class="cx"> 
</span><span class="cx">     select.group        mysql
</span><del>-    select.file         ${filespath}/${name}
</del><ins>+    select.file         ${filespath}/${name_mysql}
</ins><span class="cx"> 
</span><del>-    archcheck.files     lib/libz.dylib \
-                        lib/libreadline.dylib
</del><ins>+    archcheck.files     lib/libz.dylib
</ins><span class="cx"> 
</span><ins>+    post-extract {
+        file mkdir ${worksrcpath}/build_macports/macports
+        copy ${filespath}/macports-default.cnf \
+            ${filespath}/my.cnf \
+            ${worksrcpath}/build_macports/macports/
+    }
+
</ins><span class="cx">     post-patch {
</span><del>-        reinplace "s|@NAME@|${name}|g" ${worksrcpath}/cmake/install_layout.cmake
</del><ins>+        reinplace "s|@NAME@|${name_mysql}|g" \
+            ${worksrcpath}/cmake/install_layout.cmake
+        reinplace "s|@NAME@|${name_mysql}|g" \
+            ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${worksrcpath}/build_macports/macports/my.cnf
+        reinplace "s|@PREFIX@|${prefix}|g" \
+            ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${worksrcpath}/build_macports/macports/my.cnf
</ins><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    configure.cmd       cmake ..
+    configure.dir       ${worksrcpath}/build_macports
+    build.dir           ${worksrcpath}/build_macports
+
</ins><span class="cx">     configure.args-delete \
</span><span class="cx">                         -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span class="cx">     configure.args-append \
</span><del>-                        -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name}/mysql \
-                        -DINSTALL_LAYOUT=MACPORTS \
-                        -DSYSCONFDIR:PATH=${prefix}/etc/${name} \
-                        -DMYSQL_UNIX_ADDR:PATH=${prefix}/var/run/${name}/mysqld.sock \
-                        -DMYSQL_DATADIR:PATH=${prefix}/var/db/${name} \
</del><ins>+                        -DCMAKE_INSTALL_NAME_DIR:STRING=${prefix}/lib/${name_mysql}/mysql \
+                        -DINSTALL_LAYOUT:STRING=MACPORTS \
+                        -DSYSCONFDIR:PATH=${prefix}/etc/${name_mysql} \
+                        -DMYSQL_UNIX_ADDR:PATH=${prefix}/var/run/${name_mysql}/mysqld.sock \
+                        -DMYSQL_DATADIR:PATH=${prefix}/var/db/${name_mysql} \
</ins><span class="cx">                         -DDEFAULT_CHARSET:STRING=utf8 \
</span><span class="cx">                         -DDEFAULT_COLLATION:STRING=utf8_general_ci \
</span><span class="cx">                         -DWITH_EMBEDDED_SERVER:BOOL=OFF \
</span><del>-                        -DWITH_READLINE:BOOL=ON \
</del><span class="cx">                         -DWITH_ZLIB:STRING=system \
</span><del>-                        -DWITH_UNIT_TESTS:BOOL=OFF \
</del><ins>+                        -DWITH_UNIT_TESTS:BOOL=ON \
</ins><span class="cx">                         -DENABLE_GCOV:BOOL=OFF \
</span><del>-                        -DENABLE_DTRACE:BOOL=OFF
</del><ins>+                        -DENABLE_DTRACE:BOOL=OFF \
+                        -DWITH_READLINE:BOOL=ON \
+                        -DWITH_LIBEDIT:BOOL=OFF \
+                        -DWITH_LIBWRAP:BOOL=ON \
+                        -DWITH_SSL:STRING=no
</ins><span class="cx"> 
</span><span class="cx">     post-build {
</span><del>-        set dirs ${worksrcpath}
</del><ins>+        set dirs ${worksrcpath}/build_macports
</ins><span class="cx">         foreach dir ${dirs} {
</span><span class="cx">             reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span class="cx">                 ${dir}/scripts/mysql_config \
</span><span class="lines">@@ -84,43 +108,77 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    pre-destroot {
-        xinstall -m 755 -d ${destroot}${prefix}/etc/${name}
-        destroot.keepdirs-append ${destroot}${prefix}/etc/${name}
-    }
-
</del><span class="cx">     post-destroot {
</span><span class="cx">         # proc portdestroot::destroot_finish fails to find and compress our man pages
</span><span class="cx">         # so borrow the compress command and run on our files now.
</span><span class="cx">         set manpath "${destroot}${prefix}/share/man"
</span><span class="cx">         set gzip [findBinary gzip ${portutil::autoconf::gzip_path}]
</span><del>-        foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name}/man\[1-9\]/*] {
</del><ins>+        foreach manpage [glob -type f ${destroot}${prefix}/share/man/${name_mysql}/man\[1-9\]/*] {
</ins><span class="cx">             # Fix paths in manpages
</span><del>-            reinplace "s|/etc/|${prefix}/etc/${name}/|g" ${manpage}
</del><ins>+            reinplace "s|/etc/|${prefix}/etc/${name_mysql}/|g" ${manpage}
</ins><span class="cx">             # Compress all manpages with gzip
</span><span class="cx">             system "$gzip -9vf ${manpage}"
</span><span class="cx">         }
</span><del>-        foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name}/support-files/my-*.cnf] {
</del><ins>+        foreach samp_conffile [glob -type f ${destroot}${prefix}/share/${name_mysql}/support-files/my-*.cnf] {
</ins><span class="cx">             # Fix paths in sample configuration files
</span><del>-            reinplace "s|/etc/my.cnf|${prefix}/etc/${name}/my.cnf|g" ${samp_conffile}
</del><ins>+            reinplace "s|/etc/my.cnf|${prefix}/etc/${name_mysql}/my.cnf|g" ${samp_conffile}
</ins><span class="cx">         }
</span><ins>+        xinstall -m 755 -o root -d \
+            ${destroot}${prefix}/etc/${name_mysql}
+        copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
+            ${destroot}${prefix}/etc/${name_mysql}/
+        xinstall -m 755 -o root -d \
+            ${destroot}${prefix}/share/${name_mysql}/support-files/macports
+        copy ${worksrcpath}/build_macports/macports/my.cnf \
+            ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     post-install {
</span><del>-        if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name}/org.macports.${name}-server.plist]} {
-            ui_msg "The ${name} client has been installed."
-            ui_msg "To install the ${name} server, install the ${name}-server port."
</del><ins>+        if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${name_mysql}/org.macports.${name_mysql}-server.plist]} {
+            ui_msg "The ${name_mysql} client has been installed."
+            ui_msg "To install the ${name_mysql} server, install the ${name_mysql}-server port."
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    pre-activate {
+        if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
+            && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
+            && [vercmp [lindex $vers 1] 5.5.24-26.0] < 0 } {
+        
+            set deactivate_proc registry_deactivate_composite
+            if {[info commands registry_deactivate_composite] == {}} {
+                set deactivate_proc registry_deactivate
+            }
+            $deactivate_proc ${name_mysql}-server "" [list ports_nodepcheck 1]
+        }
+    }
+
+    post-activate {
+        if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
+            copy ${destroot}${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
+                ${prefix}/etc/${name_mysql}/
+        }
+    }
+
</ins><span class="cx">     variant openssl description {Enable OpenSSL support} {
</span><span class="cx"> 
</span><del>-        license-append          OpenSSL SSLeay
</del><span class="cx">         depends_lib-append      port:openssl
</span><del>-        configure.args-append   -DWITH_SSL:STRING=ON
</del><ins>+        configure.args-delete   -DWITH_SSL:STRING=no
+        configure.args-append   -DWITH_SSL:STRING=system
</ins><span class="cx">         archcheck.files-append  lib/libssl.dylib
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    variant system_readline description {Use system readline instead of bundled readline} {
+    
+        # Add readline support.
+        # "-DWITH_READLINE:BOOL=OFF" has the peculiar meaning "do not use the bundled copy
+        # of readline but use the system's (i.e. MacPorts') copy of readline"
+        depends_lib-append      port:readline
+        configure.args-delete   -DWITH_READLINE:BOOL=ON
+        configure.args-append   -DWITH_READLINE:BOOL=OFF
+        archcheck.files-append  lib/libreadline.dylib
+    }
+
</ins><span class="cx">     livecheck.type          regex
</span><span class="cx">     livecheck.url           http://www.percona.com/downloads/Percona-Server-${branch}/
</span><span class="cx">     livecheck.version       ${version_mysql}-${release}
</span><span class="lines">@@ -129,7 +187,7 @@
</span><span class="cx"> 
</span><span class="cx"> subport ${name_mysql}-server {
</span><span class="cx"> 
</span><del>-    revision            1
</del><ins>+    revision            ${revision_server}
</ins><span class="cx">     license             BSD
</span><span class="cx">     description         Run ${name_mysql} as server
</span><span class="cx">     long_description    ${description}
</span><span class="lines">@@ -154,7 +212,8 @@
</span><span class="cx">     build {}
</span><span class="cx"> 
</span><span class="cx">     destroot {
</span><del>-        xinstall -m 755 -o root -d ${destroot}${prefix}/var/run
</del><ins>+        xinstall -m 755 -o root -d \
+            ${destroot}${prefix}/var/run
</ins><span class="cx">         xinstall -m 755 -o ${mysqluser} -g ${mysqluser} -d \
</span><span class="cx">             ${destroot}${prefix}/etc/${name_mysql} \
</span><span class="cx">             ${destroot}${prefix}/var/db/${name_mysql} \
</span><span class="lines">@@ -164,34 +223,12 @@
</span><span class="cx">             ${destroot}${prefix}/var/db/${name_mysql} \
</span><span class="cx">             ${destroot}${prefix}/var/log/${name_mysql} \
</span><span class="cx">             ${destroot}${prefix}/var/run/${name_mysql}
</span><del>-        set fp [open "${destroot}${prefix}/etc/${name_mysql}/macports-default.cnf" "w"]
-        puts $fp "# WARNING! ANY CHANGES TO THIS FILE WILL BE LOST ON UNINSTALL/UPGRADES!"
-        puts $fp "# Make your changes to ${prefix}/etc/${name_mysql}/my.cnf"
-        puts $fp "# YOU HAVE BEEN WARNED!"
-        puts $fp ""
-        puts $fp "# MacPorts default options"
-        puts $fp "\[mysqld\]"
-        puts $fp "# skip-networking so multple mysql server ports can be loaded"
-        puts $fp "# without each competing for port 3306."
-        puts $fp "# One can always put the servers on different ports and"
-        puts $fp "# remove or comment this option."
-        puts $fp "skip-networking"
-        close $fp
</del><span class="cx">     }
</span><span class="cx"> 
</span><del>-    post-activate {
-        if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
-            set fp [open "${prefix}/etc/${name_mysql}/my.cnf" "w"]
-            puts $fp "# Use default MacPorts settings"
-            puts $fp "!include ${prefix}/etc/${name_mysql}/macports-default.cnf"
-            close $fp
-        }
-    }
-
</del><span class="cx">     notes "
</span><span class="cx"> If this is a new install you might want to run:
</span><span class="cx"> 
</span><del>-\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/scripts/mysql_install_db
</del><ins>+\$ sudo -u ${mysqluser} ${prefix}/lib/${name_mysql}/bin/mysql_install_db
</ins><span class="cx"> "
</span><span class="cx"> 
</span><span class="cx">     livecheck.type          none
</span></span></pre></div>
<a id="trunkdportsdatabasesperconafilesmacportsdefaultcnf"></a>
<div class="addfile"><h4>Added: trunk/dports/databases/percona/files/macports-default.cnf (0 => 94599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/files/macports-default.cnf                                (rev 0)
+++ trunk/dports/databases/percona/files/macports-default.cnf   2012-06-24 22:44:01 UTC (rev 94599)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+# WARNING! ANY CHANGES TO THIS FILE WILL BE LOST ON UNINSTALL/UPGRADES!
+# Make your changes to @PREFIX@/etc/@NAME@/my.cnf
+# YOU HAVE BEEN WARNED!
+
+# MacPorts default options
+[mysqld]
+# skip-networking so multple mysql server ports can be loaded
+# without each competing for port 3306.
+# One can always put the servers on different ports and
+# remove or comment this option.
+skip-networking
</ins></span></pre></div>
<a id="trunkdportsdatabasesperconafilesmycnf"></a>
<div class="addfile"><h4>Added: trunk/dports/databases/percona/files/my.cnf (0 => 94599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/files/my.cnf                              (rev 0)
+++ trunk/dports/databases/percona/files/my.cnf 2012-06-24 22:44:01 UTC (rev 94599)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+# Use default MacPorts settings
+!include @PREFIX@/etc/@NAME@/macports-default.cnf
</ins></span></pre></div>
<a id="trunkdportsdatabasesperconafilespatchpluginperconapamformysqlCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff (0 => 94599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff                              (rev 0)
+++ trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff 2012-06-24 22:44:01 UTC (rev 94599)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- a/plugin/percona-pam-for-mysql/CMakeLists.txt      2012-06-24 11:50:56.000000000 -0700
++++ b/plugin/percona-pam-for-mysql/CMakeLists.txt      2012-06-24 13:48:30.000000000 -0700
+@@ -17,6 +17,8 @@
+ CHECK_LIBRARY_EXISTS(pam pam_authenticate "" HAVE_PAM) 
+ CHECK_SYMBOL_EXISTS(getpwnam_r "pwd.h" HAVE_GETPWNAM_R)
+ CHECK_SYMBOL_EXISTS(getgrgid_r "grp.h" HAVE_GETGRGID_R)
++CHECK_INCLUDE_FILES (security/pam_misc.h HAVE_SECURITY_PAM_MISC_H)
++CHECK_INCLUDE_FILES (security/openpam.h HAVE_SECURITY_OPENPAM_H)
+ IF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
+   SET(AUTH_PAM_COMMON_SOURCES 
+     src/auth_pam_common.c src/lib_auth_pam_client.c src/lib_auth_pam_client.h
</ins></span></pre></div>
<a id="trunkdportsdatabasesperconafilespatchpluginperconapamformysqlsrcauth_pam_commonhdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff (0 => 94599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff                               (rev 0)
+++ trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff  2012-06-24 22:44:01 UTC (rev 94599)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- a/plugin/percona-pam-for-mysql/src/auth_pam_common.h       2012-06-24 11:50:56.000000000 -0700
++++ b/plugin/percona-pam-for-mysql/src/auth_pam_common.h       2012-06-24 13:47:31.000000000 -0700
+@@ -31,7 +31,11 @@

+ #include <security/pam_appl.h>
+ #include <security/pam_modules.h>
++#if HAVE_SECURITY_PAM_MISC_H
+ #include <security/pam_misc.h>
++#elif HAVE_SECURITY_OPENPAM_H
++#include <security/openpam.h>
++#endif

+ #include <mysql/plugin.h>
+ #include <mysql/plugin_auth.h>
</ins></span></pre></div>
<a id="trunkdportsdatabasesperconafilespatchstorageinnobasebufbuf0bufcdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/databases/percona/files/patch-storage-innobase-buf-buf0buf.c.diff (94598 => 94599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/files/patch-storage-innobase-buf-buf0buf.c.diff   2012-06-24 21:00:12 UTC (rev 94598)
+++ trunk/dports/databases/percona/files/patch-storage-innobase-buf-buf0buf.c.diff      2012-06-24 22:44:01 UTC (rev 94599)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>-=== modified file 'Percona-Server/storage/innobase/buf/buf0buf.c'
---- Percona-Server/storage/innobase/buf/buf0buf.c      2012-05-02 07:37:27 +0000
-+++ Percona-Server/storage/innobase/buf/buf0buf.c      2012-05-10 08:22:32 +0000
-@@ -57,7 +57,9 @@
- /* prototypes for new functions added to ha_innodb.cc */
- trx_t* innobase_get_trx();

--inline void _increment_page_get_statistics(buf_block_t* block, trx_t* trx)
-+static inline
-+void
-+_increment_page_get_statistics(buf_block_t* block, trx_t* trx)
- {
-       ulint           block_hash;
-       ulint           block_hash_byte;
-
</del></span></pre></div>
<a id="trunkdportsdatabasesperconafilespercona"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/percona/files/percona (94598 => 94599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/files/percona     2012-06-24 21:00:12 UTC (rev 94598)
+++ trunk/dports/databases/percona/files/percona        2012-06-24 22:44:01 UTC (rev 94599)
</span><span class="lines">@@ -17,8 +17,8 @@
</span><span class="cx"> lib/percona/bin/mysql_convert_table_format
</span><span class="cx"> lib/percona/bin/mysql_find_rows
</span><span class="cx"> lib/percona/bin/mysql_fix_extensions
</span><ins>+-
</ins><span class="cx"> lib/percona/bin/mysql_install_db
</span><del>--
</del><span class="cx"> lib/percona/bin/mysql_plugin
</span><span class="cx"> lib/percona/bin/mysql_secure_installation
</span><span class="cx"> lib/percona/bin/mysql_setpermission
</span><span class="lines">@@ -32,16 +32,38 @@
</span><span class="cx"> lib/percona/bin/mysqlbinlog
</span><span class="cx"> lib/percona/bin/mysqlbug
</span><span class="cx"> lib/percona/bin/mysqlcheck
</span><ins>+lib/percona/bin/mysqld
</ins><span class="cx"> lib/percona/bin/mysqld_multi
</span><span class="cx"> lib/percona/bin/mysqld_safe
</span><span class="cx"> lib/percona/bin/mysqldump
</span><span class="cx"> lib/percona/bin/mysqldumpslow
</span><span class="cx"> lib/percona/bin/mysqlhotcopy
</span><span class="cx"> lib/percona/bin/mysqlimport
</span><ins>+-
</ins><span class="cx"> lib/percona/bin/mysqlshow
</span><span class="cx"> lib/percona/bin/mysqlslap
</span><span class="cx"> lib/percona/bin/mysqltest
</span><span class="cx"> -
</span><ins>+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
</ins><span class="cx"> lib/percona/bin/perror
</span><span class="cx"> lib/percona/bin/replace
</span><span class="cx"> lib/percona/bin/resolve_stack_dump
</span><span class="lines">@@ -65,6 +87,7 @@
</span><span class="cx"> share/man/percona/man1/mysql_convert_table_format.1.gz
</span><span class="cx"> share/man/percona/man1/mysql_find_rows.1.gz
</span><span class="cx"> share/man/percona/man1/mysql_fix_extensions.1.gz
</span><ins>+-
</ins><span class="cx"> share/man/percona/man1/mysql_install_db.1.gz
</span><span class="cx"> share/man/percona/man1/mysql_plugin.1.gz
</span><span class="cx"> share/man/percona/man1/mysql_secure_installation.1.gz
</span><span class="lines">@@ -89,8 +112,30 @@
</span><span class="cx"> share/man/percona/man1/mysqlslap.1.gz
</span><span class="cx"> share/man/percona/man1/mysqltest.1.gz
</span><span class="cx"> share/man/percona/man1/mysqltest_embedded.1.gz
</span><ins>+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
</ins><span class="cx"> share/man/percona/man1/perror.1.gz
</span><span class="cx"> share/man/percona/man1/replace.1.gz
</span><span class="cx"> share/man/percona/man1/resolve_stack_dump.1.gz
</span><span class="cx"> share/man/percona/man1/resolveip.1.gz
</span><span class="cx"> share/man/percona/man8/mysqld.8.gz
</span><ins>+-
+-
+-
+-
</ins></span></pre>
</div>
</div>

</body>
</html>