From owner-svn-ports-all@freebsd.org  Fri Sep 22 19:00:42 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B919EE09256;
 Fri, 22 Sep 2017 19:00:42 +0000 (UTC)
 (envelope-from oliver@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8619176FC6;
 Fri, 22 Sep 2017 19:00:42 +0000 (UTC)
 (envelope-from oliver@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8MJ0fwx098256;
 Fri, 22 Sep 2017 19:00:41 GMT (envelope-from oliver@FreeBSD.org)
Received: (from oliver@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MJ0fmI098254;
 Fri, 22 Sep 2017 19:00:41 GMT (envelope-from oliver@FreeBSD.org)
Message-Id: <201709221900.v8MJ0fmI098254@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oliver set sender to
 oliver@FreeBSD.org using -f
From: Oliver Lehmann <oliver@FreeBSD.org>
Date: Fri, 22 Sep 2017 19:00:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450398 - in head/devel/physfs: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: oliver
X-SVN-Commit-Paths: in head/devel/physfs: . files
X-SVN-Commit-Revision: 450398
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 Sep 2017 19:00:42 -0000

Author: oliver
Date: Fri Sep 22 19:00:41 2017
New Revision: 450398
URL: https://svnweb.freebsd.org/changeset/ports/450398

Log:
  Fix bug with copying z_stream objects around in zip archiver
  
  PR:             217526
  Submitted by:   Ryan C. Gordon <icculus@icculus.org>
  Reported by:    Thibault Payet

Added:
  head/devel/physfs/files/
  head/devel/physfs/files/patch-archivers_zip.c   (contents, props changed)
Modified:
  head/devel/physfs/Makefile

Modified: head/devel/physfs/Makefile
==============================================================================
--- head/devel/physfs/Makefile	Fri Sep 22 18:31:56 2017	(r450397)
+++ head/devel/physfs/Makefile	Fri Sep 22 19:00:41 2017	(r450398)
@@ -3,6 +3,7 @@
 
 PORTNAME=	physfs
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://icculus.org/${PORTNAME}/downloads/
 

Added: head/devel/physfs/files/patch-archivers_zip.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/physfs/files/patch-archivers_zip.c	Fri Sep 22 19:00:41 2017	(r450398)
@@ -0,0 +1,12 @@
+--- archivers/zip.c.orig	2017-03-03 22:21:13 UTC
++++ archivers/zip.c
+@@ -327,7 +327,8 @@ static int ZIP_seek(fvoid *opaque, PHYSF
+                 return(0);
+ 
+             inflateEnd(&finfo->stream);
+-            memcpy(&finfo->stream, &str, sizeof (z_stream));
++            inflateCopy(&finfo->stream, &str);
++            inflateEnd(&str);
+             finfo->uncompressed_position = finfo->compressed_position = 0;
+         } /* if */
+