diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2003-09-23 14:34:18 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2003-09-23 14:34:18 +0000 |
| commit | 7b468b28fa8f19bfdc64fa1cae273ac859087814 (patch) | |
| tree | 286b5b14aaa6d712e696a7921af3413abc133395 /databases | |
| parent | fix PLIST problem (diff) | |
Update to MySQL 4.0.15 to fix the password denial-of-service problem.
Check for OVERWRITE_DB="no" in addition to just the test for its presence.
PR: 56703
Submitted by: maintainer
Approved by: security-officer (nectar)
Notes
Notes:
svn path=/head/; revision=89122
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql40-server/Makefile | 12 | ||||
| -rw-r--r-- | databases/mysql40-server/distinfo | 2 | ||||
| -rw-r--r-- | databases/mysql40-server/pkg-plist | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index 9687cc572fc8..2dfd1012607f 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= mysql -PORTVERSION= 4.0.14 +PORTVERSION= 4.0.15 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ftp://mysql.secsup.org/pub/software/mysql/Downloads/MySQL-4.0/ \ @@ -124,8 +124,8 @@ pre-fetch: @${ECHO} "" post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_server_dirs@ scripts support-files|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|install: install-am|install:|g" ${WRKSRC}/include/Makefile.in .if defined(WITH_OPENSSL) && defined(BUILD_STATIC) pre-configure: @@ -135,10 +135,10 @@ pre-configure: post-install: .if !defined(PACKAGE_BUILDING) -.if exists(${DB_DIR}) && defined(OVERWRITE_DB) +.if exists(${DB_DIR}) && defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no" @${RM} -r ${DB_DIR}/mysql ${DB_DIR}/test 2>/dev/null || true .endif -.if !exists(${DB_DIR}) || defined(OVERWRITE_DB) +.if !exists(${DB_DIR}) || (defined(OVERWRITE_DB) && ${OVERWRITE_DB:L} != "no") .if defined(SKIP_DNS_CHECK) ${PREFIX}/bin/mysql_install_db --force .else @@ -171,7 +171,7 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/mysql CONFIGURE_ARGS+=--without-server post-patch: - @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e "s|SUBDIRS =|SUBDIRS = include @sql_client_dirs@ tests man|g" ${WRKSRC}/Makefile.in post-install: @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/mysql-client.sh > ${PREFIX}/etc/rc.d/000.mysql-client.sh diff --git a/databases/mysql40-server/distinfo b/databases/mysql40-server/distinfo index 5c73273cc613..f0d133ef44a7 100644 --- a/databases/mysql40-server/distinfo +++ b/databases/mysql40-server/distinfo @@ -1 +1 @@ -MD5 (mysql-4.0.14.tar.gz) = 9764f09c89692345d3b7800ab014f822 +MD5 (mysql-4.0.15.tar.gz) = a6ce917730e8778ef7c9e1f7b5053b2d diff --git a/databases/mysql40-server/pkg-plist b/databases/mysql40-server/pkg-plist index ac121c4a738c..cd9cf4ec6885 100644 --- a/databases/mysql40-server/pkg-plist +++ b/databases/mysql40-server/pkg-plist @@ -1,6 +1,7 @@ bin/comp_err bin/isamchk bin/isamlog +bin/make_win_src_distribution bin/msql2mysql bin/my_print_defaults bin/myisamchk |