Attachment #200590 for bug #234477

View | Details | Raw Unified | Return to bug 234477
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	physfs
PORTVERSION=	3.0.1
PORTREVISION=	1
CATEGORIES=	devel
MASTER_SITES=	http://icculus.org/${PORTNAME}/downloads/



CONFLICTS_INSTALL=	physfs-devel-[0-9]*

USES=		cmake readline tar:bzip2
USE_LDCONFIG=	yes

post-patch:
	@${REINPLACE_CMD} -e \
		's|CHECK_INCLUDE_FILE(sys/ucred.h HAVE_UCRED_H|& "-include sys/param.h"|g' \
		${WRKSRC}/CMakeLists.txt

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (physfs-2.0.3.tar.bz2) = ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69	1	TIMESTAMP = 1535226407
2	SIZE (physfs-2.0.3.tar.bz2) = 560628	2	SHA256 (physfs-3.0.1.tar.bz2) = b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1
		3	SIZE (physfs-3.0.1.tar.bz2) = 194638




--- 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 */
 

Lines 1-6 Link Here

(-)pkg-plist (-1 / +2 lines)
1	bin/test_physfs	1	bin/test_physfs
2	include/physfs.h	2	include/physfs.h
3	lib/libphysfs.so.1	3	lib/libphysfs.so.1
4	lib/libphysfs.so.2.0.3	4	lib/libphysfs.so.3.0.1
5	lib/libphysfs.a	5	lib/libphysfs.a
6	lib/libphysfs.so	6	lib/libphysfs.so
		7	libdata/pkgconfig/physfs.pc

Return to bug 234477

Lines 2-9 Link Here

(-)Makefile (-8 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= physfs	4	PORTNAME= physfs
5	PORTVERSION= 2.0.3	5	PORTVERSION= 3.0.1
6	PORTREVISION= 1
7	CATEGORIES= devel	6	CATEGORIES= devel
8	MASTER_SITES= http://icculus.org/${PORTNAME}/downloads/	7	MASTER_SITES= http://icculus.org/${PORTNAME}/downloads/
9		8
Lines 12-23 Link Here
12		11
13	CONFLICTS_INSTALL= physfs-devel-[0-9]*	12	CONFLICTS_INSTALL= physfs-devel-[0-9]*
14		13
15	USES= cmake tar:bzip2	14	USES= cmake readline tar:bzip2
16	USE_LDCONFIG= yes	15	USE_LDCONFIG= yes
17		16
18	post-patch:
19	@${REINPLACE_CMD} -e \
20	's\|CHECK_INCLUDE_FILE(sys/ucred.h HAVE_UCRED_H\|& "-include sys/param.h"\|g' \
21	${WRKSRC}/CMakeLists.txt
22
23	.include <bsd.port.mk>	17	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)files/patch-archivers_zip.c (-12 lines)
1	--- archivers/zip.c.orig 2017-03-03 22:21:13 UTC
2	+++ archivers/zip.c
3	@@ -327,7 +327,8 @@ static int ZIP_seek(fvoid *opaque, PHYSF
4	return(0);
5
6	inflateEnd(&finfo->stream);
7	- memcpy(&finfo->stream, &str, sizeof (z_stream));
8	+ inflateCopy(&finfo->stream, &str);
9	+ inflateEnd(&str);
10	finfo->uncompressed_position = finfo->compressed_position = 0;
11	} /* if */
12