From 345c12c1dbcda95a160dd07f4352fd1de2e11a95 Mon Sep 17 00:00:00 2001 From: ale <ale@FreeBSD.org> Date: Tue, 19 Jun 2012 07:44:31 +0000 Subject: Update to 5.4.4 release and switch to OptionsNG. --- archivers/php5-phar/Makefile | 1 - archivers/php5-phar/files/patch-tar.c | 18 ------------------ 2 files changed, 19 deletions(-) delete mode 100644 archivers/php5-phar/files/patch-tar.c (limited to 'archivers/php5-phar') diff --git a/archivers/php5-phar/Makefile b/archivers/php5-phar/Makefile index 668bc01f116c..6587ae6c572e 100644 --- a/archivers/php5-phar/Makefile +++ b/archivers/php5-phar/Makefile @@ -5,7 +5,6 @@ # $FreeBSD$ # -PORTREVISION= 1 CATEGORIES= archivers MASTERDIR= ${.CURDIR}/../../lang/php5 diff --git a/archivers/php5-phar/files/patch-tar.c b/archivers/php5-phar/files/patch-tar.c deleted file mode 100644 index 387a414414f2..000000000000 --- a/archivers/php5-phar/files/patch-tar.c +++ /dev/null @@ -1,18 +0,0 @@ ---- tar.c.orig 2012-06-02 08:29:43.000000000 +0200 -+++ tar.c 2012-06-02 08:31:37.000000000 +0200 -@@ -337,6 +337,15 @@ - last_was_longlink = 1; - /* support the ././@LongLink system for storing long filenames */ - entry.filename_len = entry.uncompressed_filesize; -+ /* Check for overflow - bug 61065 */ -+ if (entry.filename_len == UINT_MAX) { -+ if (error) { -+ spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (invalid entry size)", fname); -+ } -+ php_stream_close(fp); -+ phar_destroy_phar_data(myphar TSRMLS_CC); -+ return FAILURE; -+ } - entry.filename = pemalloc(entry.filename_len+1, myphar->is_persistent); - - read = php_stream_read(fp, entry.filename, entry.filename_len); -- cgit