Bug 243283

Created attachment 210648 [details]
libdrm2.4.100

Remove files that should have been deleted

Comment 2 Jan Beich 2020-01-12 02:41:23 UTC

Comment on attachment 210648 [details]
libdrm2.4.100

Alternative version: https://github.com/myfreeweb/freebsd-ports-dank/commit/90125516c6c7

> -PORTEPOCH=	1
> +PORTEPOCH=	2

Why?

>  #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
[...]
>  #else
> -    struct stat sbuf;
> -    char buf[PATH_MAX + 1];
> +    stat_t sbuf;
> +    char buf[DRM_NODE_NAME_MAX];
>      const char *dev_name = drmGetDeviceName(type);
>      unsigned int maj, min;
>      int n;
>  
> +    if (!dev_name)
> +        return NULL;
> +
>      if (fstat(fd, &sbuf))
>          return NULL;
>  
>      maj = major(sbuf.st_rdev);
>      min = minor(sbuf.st_rdev);
>  
>      if (!drmNodeIsDRM(maj, min) || !S_ISCHR(sbuf.st_mode))
>          return NULL;
>  
>      if (!dev_name)
>          return NULL;

Looks bogus:
- POSIX fstat() writes |struct stat| into the 2nd argument
- dev_name is already tested against NULL a few lines later
- buf[DRM_NODE_NAME_MAX] maybe too small to fit dev_name + DRM_DIR_NAME

Created attachment 210672 [details]
libdrm2.4.100

Do not bump PORTEPOCH, slightly adjust the patch

PORTEPOCH was bumped by me as a hack for `pkg upgrade` on my host, sorry about that

Build info is available at https://gitlab.com/swills/freebsd-ports/pipelines/112439877

Comment 5 Emmanuel Vadot 2020-06-02 09:42:24 UTC

I've just commited 2.4.102 in r537533.