Date: Wed, 18 Nov 2015 10:51:14 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401861 - in head: . Mk databases databases/mariadb-client databases/mariadb-scripts databases/mariadb-server databases/mytop Message-ID: <201511181051.tAIApEj4080003@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Wed Nov 18 10:51:14 2015 New Revision: 401861 URL: https://svnweb.freebsd.org/changeset/ports/401861 Log: databases/mariadb-client,scripts,server: Remove - MariaDB is based on the vulnerable MySQL 5.1 version - No new versions since 2013 - Simplify Mk/bsd.databases.mk Reviewed by: koobs (mentor), feld Approved by: koobs (mentor) Differential Revision: https://reviews.freebsd.org/D4099 Deleted: head/databases/mariadb-client/ head/databases/mariadb-scripts/ head/databases/mariadb-server/ Modified: head/MOVED head/Mk/bsd.database.mk head/databases/Makefile head/databases/mytop/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Wed Nov 18 10:47:26 2015 (r401860) +++ head/MOVED Wed Nov 18 10:51:14 2015 (r401861) @@ -7938,3 +7938,6 @@ deskutils/steadyflow||2015-11-13|Has exp net/py-smb|net/py-pysmb|2015-11-14|Renamed to match upstream naming devel/py-asn1-modules|devel/py-pyasn1-modules|2015-11-14|Renamed to match upstream naming devel/py-experimental.cssselect||2015-11-15|The only consumer of this port switched to www/py-cssselect +databases/mariadb-client||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead +databases/mariadb-server||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead +databases/mariadb-scripts||2015-11-18|Vulnerable, no updates expected, use mariadb55 or mariadb100 instead Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Wed Nov 18 10:47:26 2015 (r401860) +++ head/Mk/bsd.database.mk Wed Nov 18 10:51:14 2015 (r401861) @@ -101,7 +101,6 @@ WARNING+= "DEFAULT_MYSQL_VER is defined, DEFAULT_MYSQL_VER?= ${MYSQL_DEFAULT:S/.//} # MySQL client version currently supported. MYSQL51_LIBVER= 16 -MYSQL53m_LIBVER= 16 MYSQL55_LIBVER= 18 MYSQL55m_LIBVER= 18 MYSQL55p_LIBVER= 18 @@ -145,26 +144,17 @@ IGNORE= cannot install: MySQL versions .endif .endif -.if (${MYSQL_VER} == "53m") -_MYSQL_CLIENT= databases/mariadb-client -_MYSQL_SERVER= databases/mariadb-server -.elif (${MYSQL_VER} == "55m") -_MYSQL_CLIENT= databases/mariadb55-client -_MYSQL_SERVER= databases/mariadb55-server -.elif (${MYSQL_VER} == "100m") -_MYSQL_CLIENT= databases/mariadb100-client -_MYSQL_SERVER= databases/mariadb100-server -.elif (${MYSQL_VER} == "55p") -_MYSQL_CLIENT= databases/percona55-client -_MYSQL_SERVER= databases/percona55-server -.elif (${MYSQL_VER} == "56p") -_MYSQL_CLIENT= databases/percona56-client -_MYSQL_SERVER= databases/percona56-server +.if (${MYSQL_VER:C/[0-9]*//} == "m") +_MYSQL_FLAVOUR= mariadb +.elif (${MYSQL_VER:C/[0-9]*//} == "p") +_MYSQL_FLAVOUR= percona .else -_MYSQL_CLIENT= databases/mysql${MYSQL_VER}-client -_MYSQL_SERVER= databases/mysql${MYSQL_VER}-server +_MYSQL_FLAVOUR= mysql .endif +_MYSQL_CLIENT= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-client +_MYSQL_SERVER= databases/${_MYSQL_FLAVOUR}${MYSQL_VER:C/[mp]//}-server + # And now we are checking if we can use it .if defined(MYSQL${MYSQL_VER}_LIBVER) .if defined(IGNORE_WITH_MYSQL) Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Wed Nov 18 10:47:26 2015 (r401860) +++ head/databases/Makefile Wed Nov 18 10:51:14 2015 (r401861) @@ -180,9 +180,6 @@ SUBDIR += luasql-postgres SUBDIR += luasql-sqlite3 SUBDIR += mantis - SUBDIR += mariadb-client - SUBDIR += mariadb-scripts - SUBDIR += mariadb-server SUBDIR += mariadb100-client SUBDIR += mariadb100-server SUBDIR += mariadb55-client Modified: head/databases/mytop/Makefile ============================================================================== --- head/databases/mytop/Makefile Wed Nov 18 10:47:26 2015 (r401860) +++ head/databases/mytop/Makefile Wed Nov 18 10:51:14 2015 (r401861) @@ -19,7 +19,6 @@ GH_ACCOUNT= jzawodn GH_TAGNAME= 437f2ef NO_ARCH= yes -CONFLICTS= mariadb-scripts-[0-9]* USES+= perl5 USE_PERL5= configure
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511181051.tAIApEj4080003>