Opened 12 years ago
Last modified 11 years ago
#37172 closed defect
mysql55 should link against MacPorts libwrap instead of host version — at Initial Version
Reported by: | jeremyhu (Jeremy Huddleston Sequoia) | Owned by: | pixilla (Bradley Giesbrecht) |
---|---|---|---|
Priority: | Normal | Milestone: | |
Component: | ports | Version: | 2.1.2 |
Keywords: | Cc: | ryandesign (Ryan Carsten Schmidt), jeremyhu (Jeremy Huddleston Sequoia) | |
Port: | mysql5 mysql51 mysql55 |
Description
mysql55-5.5.28_1.darwin_11.x86_64.tbz2 from http://packages.macports.org/mysql55
/opt/local/bin $ otool -L /opt/local/lib/mysql55/bin/mysqld /opt/local/lib/mysql55/bin/mysqld: /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices (compatibility version 1.0.0, current version 53.0.0) /opt/local/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.7) /usr/lib/libwrap.7.dylib (compatibility version 7.0.0, current version 7.6.0) /usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 52.0.0) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 159.1.0)
It should be using /opt/local/lib/libwrap.7.dylib from port:tcp_wrappers
Proposed changes:
~/src/macports/dports/databases $ svn diff Index: mysql5/Portfile =================================================================== --- mysql5/Portfile (revision 100113) +++ mysql5/Portfile (working copy) @@ -6,7 +6,7 @@ name mysql5 version 5.1.66 # Please set revision_client and revision_server to 0 if you bump version. -set revision_client 1 +set revision_client 2 set revision_server 1 set branch [join [lrange [split ${version} .] 0 1] .] homepage http://www.mysql.com/ @@ -61,11 +61,13 @@ conflicts mysql5-devel mysql4 depends_lib \ port:zlib \ - port:openssl - + port:openssl \ + port:tcp_wrappers + archcheck.files lib/libz.dylib \ - lib/libssl.dylib - + lib/libssl.dylib \ + lib/libwrap.dylib + patch.pre_args -p1 patchfiles patch-Makefile.in.diff \ patch-scripts-mysql_secure_installation.sh.diff Index: mysql5-devel/Portfile =================================================================== --- mysql5-devel/Portfile (revision 100113) +++ mysql5-devel/Portfile (working copy) @@ -10,7 +10,7 @@ name mysql5-devel conflicts mysql5 mysql4 version 5.5.2-m2 -revision 1 +revision 2 set branch [join [lrange [split ${version} .] 0 1] .] homepage http://www.mysql.com/ categories databases @@ -42,10 +42,12 @@ depends_lib \ port:zlib \ - port:openssl + port:openssl \ + port:tcp_wrappers archcheck.files lib/libz.dylib \ - lib/libssl.dylib + lib/libssl.dylib \ + lib/libwrap.dylib set major_version [strsed ${version} {s/\..*$//}] set mysql mysql${major_version} Index: mysql51/Portfile =================================================================== --- mysql51/Portfile (revision 100113) +++ mysql51/Portfile (working copy) @@ -7,7 +7,7 @@ set name_mysql ${name} version 5.1.66 # Please set revision_client and revision_server to 0 if you bump version. -set revision_client 0 +set revision_client 1 set revision_server 0 categories databases platforms darwin @@ -54,13 +54,13 @@ checksums rmd160 27e7faea4d0ec1ea183eb70b7b29b7e8a864aa53 \ sha256 eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907 - depends_lib port:zlib + depends_lib port:zlib port:tcp_wrappers depends_run 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 Index: mysql55/Portfile =================================================================== --- mysql55/Portfile (revision 100113) +++ mysql55/Portfile (working copy) @@ -7,7 +7,7 @@ set name_mysql ${name} version 5.5.28 # Please set revision_client and revision_server to 0 if you bump version. -set revision_client 1 +set revision_client 2 set revision_server 0 categories databases platforms darwin @@ -46,13 +46,13 @@ checksums rmd160 dbd2a75a2b55e54f5216d0ea1376b97fd7a107de \ sha256 f9b2491f1ddd99842a8e75c21958368bebe59c47e84bec778baa915e255cc78f - 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
Note: See
TracTickets for help on using
tickets.