Re: mysql_waitpid: broken symbolic link to '/usr/local/bin/mariadb-waitpid'

On Mon, Sep 28, 2020 at 02:01:00PM +0000, Mikolaj Kucharski wrote:
> Hi,
>
> I've noticed that I have mysql_waitpid installed which is broken
> symlink to mariadb-waitpid.
>
> I think that symlink should be moved to -server package. I come up with
> following diff, which I'm still building and didn't test it yet.

New version after feedback from sthen@

Something is not right with conflict lines. Is this PEBCAK or
pkg_add bug?

This is on a machine without prior mariadb-client, mariadb-server or
mariadb-tests package installed. Those packages are NOT installed.

OpenBSD 6.8 (GENERIC.MP) #94: Tue Sep 29 00:13:21 MDT 2020
deraadt@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

# env PKG_PATH=https://cdn.openbsd.org/%m \
TRUSTED_PKG_PATH=/root/mariadb \
pkg_add -Dsnap -i mariadb-client mariadb-server mariadb-tests
quirks-3.439 signed on 2020-09-30T05:15:47Z
mariadb-client-10.5.5p0v1: ok
mariadb-server-10.5.5p0v1:p5-Clone-0.41p0: ok
mariadb-server-10.5.5p0v1:p5-Math-Base-Convert-0.11p0: ok
mariadb-server-10.5.5p0v1:p5-Params-Util-1.07p2: ok
mariadb-server-10.5.5p0v1:p5-Module-Runtime-0.016p0: ok
mariadb-server-10.5.5p0v1:p5-SQL-Statement-1.412p0: ok
mariadb-server-10.5.5p0v1:p5-Net-Daemon-0.48p1: ok
mariadb-server-10.5.5p0v1:p5-PlRPC-0.2020p0: ok
mariadb-server-10.5.5p0v1:p5-FreezeThaw-0.5001p0: ok
mariadb-server-10.5.5p0v1:p5-MLDBM-2.05p0: ok
mariadb-server-10.5.5p0v1:p5-DBI-1.641: ok
mariadb-server-10.5.5p0v1:p5-DBD-MariaDB-1.21p2: ok
mariadb-server-10.5.5p0v1:snappy-1.1.8: ok
Can't install mariadb-server-10.5.5p0v1 because of conflicts (mariadb-client-10.5.5p0v1)
mariadb-tests-10.5.5v1: ok
--- mariadb-server-10.5.5p0v1 -------------------
Can't install mariadb-server-10.5.5p0v1: conflicts
Couldn't install mariadb-server-10.5.5p0v1

# env PKG_PATH=https://cdn.openbsd.org/%m \
TRUSTED_PKG_PATH=/root/mariadb \
pkg_info -Dsnap -f mariadb-client mariadb-server mariadb-tests | \
grep -E '^(Information|@conflict)'
Information for inst:mariadb-client-10.5.5p0v1
@conflict mariadb-server-<=10.4.12v1
@conflict mytop-*
Information for file:/root/mariadb/mariadb-server-10.5.5p0v1.tgz
@conflict mariadb-client-<=10.5.5v1
Information for inst:mariadb-tests-10.5.5v1
# _

# ls -lhA /root/mariadb/
total 168160
-rw-r--r-- 1 root wheel 10.3M Sep 29 10:35 mariadb-client-10.5.5p0v1.tgz
-rw-r--r-- 1 root wheel 42.5M Sep 29 10:36 mariadb-server-10.5.5p0v1.tgz
-rw-r--r-- 1 root wheel 29.2M Sep 29 10:36 mariadb-tests-10.5.5v1.tgz


Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.96
diff -u -p -u -r1.96 Makefile
--- Makefile 12 Aug 2020 14:43:54 -0000 1.96
+++ Makefile 30 Sep 2020 20:02:46 -0000
@@ -9,6 +9,8 @@ DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
PKGNAME-tests= mariadb-tests-${VERSION}
+REVISION-main = 0
+REVISION-server = 0
EPOCH= 1

CATEGORIES= databases
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-main,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST-main
--- pkg/PLIST-main 26 Jun 2020 08:46:42 -0000 1.21
+++ pkg/PLIST-main 30 Sep 2020 20:02:46 -0000
@@ -23,7 +23,6 @@ bin/msql2mysql
bin/mysql
bin/mysql_config
bin/mysql_find_rows
-bin/mysql_waitpid
bin/mysqlaccess
bin/mysqladmin
bin/mysqlbinlog
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-server,v
retrieving revision 1.35
diff -u -p -u -r1.35 PLIST-server
--- pkg/PLIST-server 12 Aug 2020 14:43:54 -0000 1.35
+++ pkg/PLIST-server 30 Sep 2020 20:02:47 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-server,v 1.35 2020/08/12 14:43:54 sthen Exp $
-@conflict mariadb-client-<=10.4.12v1
+@conflict mariadb-client-<=10.5.5v1
@newgroup _mysql:502
@newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/mysqld
@@ -36,6 +36,7 @@ bin/mysql_secure_installation
bin/mysql_setpermission
bin/mysql_tzinfo_to_sql
bin/mysql_upgrade
+bin/mysql_waitpid
bin/mysqld_multi
bin/mysqld_safe
bin/mysqld_safe_helper

--
Regards,
Mikolaj