svn commit: r510754 - in head: biology/recombine math/prng/files

[Cy Schubert]

In message <201909020500.x8250h7L057164 at repo.freebsd.org>, Cy Schubert 
writes:
> Author: cy
> Date: Mon Sep  2 05:00:43 2019
> New Revision: 510754
> URL: https://svnweb.freebsd.org/changeset/ports/510754
>
> Log:
>   Fix after gets(3) retirement using gets_s(3).
>   
>   Bump PORTREVISION as this is a security issue too.
>   
>   PR:		222796
>   MFH:		2019Q3
>
> Added:
>   head/math/prng/files/patch-examples_pairs.c   (contents, props changed)
> Modified:
>   head/biology/recombine/Makefile   (contents, props changed)
>
> Modified: head/biology/recombine/Makefile
> =============================================================================
> =
> --- head/biology/recombine/Makefile	Mon Sep  2 05:00:38 2019	(r51075
> 3)
> +++ head/biology/recombine/Makefile	Mon Sep  2 05:00:43 2019	(r51075
> 4)
> @@ -3,7 +3,7 @@
>  
>  PORTNAME=	recombine
>  PORTVERSION=	1.41
> -PORTREVISION=	1
> +PORTREVISION=	2
>  CATEGORIES=	biology
>  MASTER_SITES=	http://evolution.gs.washington.edu/lamarc/recombine/
>  DISTNAME=	${PORTNAME}${PORTVERSION}.src.doc
>
> Added: head/math/prng/files/patch-examples_pairs.c
> =============================================================================
> =
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/math/prng/files/patch-examples_pairs.c	Mon Sep  2 05:00:43 201
> 9	(r510754)
> @@ -0,0 +1,10 @@
> +--- examples/pairs.c.orig	2000-10-17 08:39:02.000000000 -0700
> ++++ examples/pairs.c	2019-09-01 21:02:29.348451000 -0700
> +@@ -53,6 +53,7 @@
> + #include <stdlib.h>
> + #include <string.h>
> + #include "prng.h"
> ++#define gets(_a) gets_s(_a, sizeof(_a))
> + 
> + struct prng_struct *generator;
> + char outfile[200] = "pairs.out";
>


This was not supposed to happen. A git svn dcommit failed due to merge 
conflicts and after a number of git rebases it's still not correct I will 
bump the PORTREVISION of math /prng but no sense reversing the biology 
recombine PORTREVISION bump.

This is a huge problem with git. It's not the first time I've had rebase 
problems.


-- 
Cheers,
Cy Schubert <Cy.Schubert at cschubert.com>
FreeBSD UNIX:  <cy at FreeBSD.org>   Web:  http://www.FreeBSD.org

	The need of the many outweighs the greed of the few.