[107237] trunk/dports/databases/percona

pixilla at macports.org pixilla at macports.org
Sun Jun 23 17:45:36 PDT 2013


Revision: 107237
          https://trac.macports.org/changeset/107237
Author:   pixilla at macports.org
Date:     2013-06-23 17:45:36 -0700 (Sun, 23 Jun 2013)
Log Message:
-----------
databases/percona:
- Update to version 5.5.31-30.3.
- Remove patches fixed upstream.
- Add tcp_wrappers dependency and archcheck.
- Comment embedded-server as it does not currently build.

Modified Paths:
--------------
    trunk/dports/databases/percona/Portfile
    trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff

Removed Paths:
-------------
    trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff
    trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff

Modified: trunk/dports/databases/percona/Portfile
===================================================================
--- trunk/dports/databases/percona/Portfile	2013-06-24 00:40:16 UTC (rev 107236)
+++ trunk/dports/databases/percona/Portfile	2013-06-24 00:45:36 UTC (rev 107237)
@@ -5,8 +5,8 @@
 
 name                percona
 set name_mysql      ${name}
-set version_mysql   5.5.27
-set release         29.0
+set version_mysql   5.5.31
+set release         30.3
 # Please set revision_client and revision_server to 0 if you bump version_mysql or release.
 set revision_client 0
 set revision_server 0
@@ -17,7 +17,7 @@
 maintainers         mac.com:quest openmaintainer
 homepage            http://www.percona.com/
 
-if {$subport == $name} {
+if {${subport} == ${name}} {
 
     PortGroup           archcheck 1.0
     PortGroup           cmake 1.0
@@ -29,8 +29,7 @@
     revision            ${revision_client}
     license             GPL-2
     description         Multithreaded SQL database server
-    long_description    MySQL is an open-source, multi-threaded SQL database with a command \
-                        syntax very similar to mSQL.
+    long_description    Percona is a fork of the MySQL server, a multi-threaded SQL database.
 
     master_sites \
     http://www.percona.com/redir/downloads/Percona-Server-${version_branch}/Percona-Server-${version}/source/:src \
@@ -42,13 +41,10 @@
 
     patch.pre_args      -p1
     patchfiles          patch-cmake-install_layout.cmake.diff
-    # 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
 
     checksums           ${distname}${extract.suffix} \
-                        rmd160  f0247025b7ec4d8e1ec551588e8643aa325f5d9b \
-                        sha256  4ba9e3300d99bfdbf65dd1a00e51da5bddc1582e33a58219b5184075783889ce \
+                        rmd160  9a7190c4690450dfbd2ceeac6589b1b9fa1d036c \
+                        sha256  808fea7fa2a10e61a3767819f4f9275afc8e5a66a7567b7b6d9e3bde2b79fce3
 
     set manual_distfile Percona_Server_${version_manual}_Operations_Manual.pdf
     extract.only        ${distname}${extract.suffix}
@@ -57,13 +53,13 @@
                         rmd160  80261ad2723cad4a02439175bd3120f9657ebecf \
                         sha256  031176de33d1def1a55eae90ef34e867164386929eaaa3e565e8d677025f7329
 
-    depends_lib-append  port:zlib
+    depends_lib-append  port:zlib port:tcp_wrappers
     depends_run-append  port:mysql_select
 
     select.group        mysql
     select.file         ${filespath}/${name_mysql}
 
-    archcheck.files     lib/libz.dylib
+    archcheck.files     lib/libz.dylib lib/libwrap.dylib
 
     post-extract {
         file mkdir ${worksrcpath}/build_macports/macports
@@ -99,7 +95,6 @@
                         -DMYSQL_DATADIR:PATH=${prefix}/var/db/${name_mysql} \
                         -DDEFAULT_CHARSET:STRING=utf8 \
                         -DDEFAULT_COLLATION:STRING=utf8_general_ci \
-                        -DWITH_EMBEDDED_SERVER:BOOL=OFF \
                         -DWITH_ZLIB:STRING=system \
                         -DWITH_UNIT_TESTS:BOOL=ON \
                         -DENABLE_GCOV:BOOL=OFF \
@@ -108,6 +103,10 @@
                         -DWITH_LIBEDIT:BOOL=OFF \
                         -DWITH_LIBWRAP:BOOL=ON \
                         -DWITH_SSL:STRING=no
+# Do not enable embedded-server until percona builds successfully with this option
+#                        -DWITH_EMBEDDED_SERVER:BOOL=ON \
+#    configure.cflags-append \
+#                        -DDBUG_ON
 
     post-build {
         set dirs ${worksrcpath}/build_macports

Modified: trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff	2013-06-24 00:40:16 UTC (rev 107236)
+++ trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff	2013-06-24 00:45:36 UTC (rev 107237)
@@ -1,6 +1,6 @@
---- a/cmake/install_layout.cmake	2012-03-15 07:14:58.000000000 -0700
-+++ b/cmake/install_layout.cmake	2012-03-17 08:44:13.000000000 -0700
-@@ -68,7 +68,7 @@
+--- a/cmake/install_layout.cmake	2013-06-23 08:41:38.000000000 -0700
++++ b/cmake/install_layout.cmake	2013-06-23 08:44:25.000000000 -0700
+@@ -69,7 +69,7 @@
  ENDIF()
  
  SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
@@ -9,7 +9,7 @@
  
  IF(UNIX)
    IF(INSTALL_LAYOUT MATCHES "RPM")
-@@ -86,7 +86,7 @@
+@@ -87,7 +87,7 @@
      SET(CMAKE_INSTALL_PREFIX ${default_prefix}
        CACHE PATH "install prefix" FORCE)
    ENDIF()
@@ -18,7 +18,7 @@
    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -214,6 +214,31 @@
+@@ -222,6 +222,31 @@
  SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
  SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
  

Deleted: trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff
===================================================================
--- trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff	2013-06-24 00:40:16 UTC (rev 107236)
+++ trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-CMakeLists.txt.diff	2013-06-24 00:45:36 UTC (rev 107237)
@@ -1,11 +0,0 @@
---- 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

Deleted: trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff
===================================================================
--- trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff	2013-06-24 00:40:16 UTC (rev 107236)
+++ trunk/dports/databases/percona/files/patch-plugin-percona-pam-for-mysql-src-auth_pam_common.h.diff	2013-06-24 00:45:36 UTC (rev 107237)
@@ -1,14 +0,0 @@
---- 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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130623/6046f5d0/attachment.html>


More information about the macports-changes mailing list