Date: Fri, 6 Jul 2018 18:05:51 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r474029 - in branches/2018Q3/devel/zziplib: . files Message-ID: <201807061805.w66I5prm029139@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Fri Jul 6 18:05:50 2018 New Revision: 474029 URL: https://svnweb.freebsd.org/changeset/ports/474029 Log: MFH: r474027 r474028 - Update to 0.13.68 - Security fixes for: - CVE-2017-5974 - CVE-2017-5975 - CVE-2017-5976 - CVE-2017-5979 - CVE-2017-5980 - CVE-2017-5981 - CVE-2017-5977 - CVE-2018-6381 - CVE-2018-6484 - CVE-2018-6540 - CVE-2018-6541 - CVE-2018-6542 - CVE-2018-6869 - CVE-2018-7725 - CVE-2018-7726 - CVE-2018-7727 PR: 226491 Submitted by: maintainer - Added/RM missing patches Approved by: ports-secteam Added: branches/2018Q3/devel/zziplib/files/patch-docs_dbk2man.py - copied unchanged from r474028, head/devel/zziplib/files/patch-docs_dbk2man.py Deleted: branches/2018Q3/devel/zziplib/files/patch-docs_Makefile.in Modified: branches/2018Q3/devel/zziplib/Makefile branches/2018Q3/devel/zziplib/distinfo branches/2018Q3/devel/zziplib/files/patch-configure branches/2018Q3/devel/zziplib/files/patch-zzip_Makefile.in branches/2018Q3/devel/zziplib/pkg-descr branches/2018Q3/devel/zziplib/pkg-plist Directory Properties: branches/2018Q3/ (props changed) Modified: branches/2018Q3/devel/zziplib/Makefile ============================================================================== --- branches/2018Q3/devel/zziplib/Makefile Fri Jul 6 18:00:37 2018 (r474028) +++ branches/2018Q3/devel/zziplib/Makefile Fri Jul 6 18:05:50 2018 (r474029) @@ -2,31 +2,35 @@ # $FreeBSD$ PORTNAME= zziplib -PORTVERSION= 0.13.62 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 0.13.69 CATEGORIES= devel -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}13/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Library to provide transparent read access to zipped files LICENSE= LGPL21 MPL11 LICENSE_COMB= dual +LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LIB +LICENSE_FILE_MPL11= ${WRKSRC}/docs/COPYING.MPL BUILD_DEPENDS= zip:archivers/zip -USES= libtool pathfix pkgconfig python:2.7,build tar:bzip2 -GNU_CONFIGURE= yes -CONFIGURE_ENV= ac_cv_path_XMLTO=":" +USES= libtool pathfix pkgconfig python:2.7,build shebangfix +USE_GITHUB= yes +GH_ACCOUNT= gdraheim +GH_PROJECT= zziplib USE_LDCONFIG= yes +SHEBANG_FILES= docs/*.py + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --srcdir=${WRKSRC} INSTALL_TARGET= install-strip TEST_TARGET= check - PORTSCOUT= limit:^0\. OPTIONS_DEFINE= SDL OPTIONS_SUB= yes - SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= sdl Modified: branches/2018Q3/devel/zziplib/distinfo ============================================================================== --- branches/2018Q3/devel/zziplib/distinfo Fri Jul 6 18:00:37 2018 (r474028) +++ branches/2018Q3/devel/zziplib/distinfo Fri Jul 6 18:05:50 2018 (r474029) @@ -1,2 +1,3 @@ -SHA256 (zziplib-0.13.62.tar.bz2) = a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b -SIZE (zziplib-0.13.62.tar.bz2) = 685770 +TIMESTAMP = 1521293451 +SHA256 (gdraheim-zziplib-v0.13.69_GH0.tar.gz) = 846246d7cdeee405d8d21e2922c6e97f55f24ecbe3b6dcf5778073a88f120544 +SIZE (gdraheim-zziplib-v0.13.69_GH0.tar.gz) = 1132204 Modified: branches/2018Q3/devel/zziplib/files/patch-configure ============================================================================== --- branches/2018Q3/devel/zziplib/files/patch-configure Fri Jul 6 18:00:37 2018 (r474028) +++ branches/2018Q3/devel/zziplib/files/patch-configure Fri Jul 6 18:05:50 2018 (r474029) @@ -1,6 +1,6 @@ ---- configure.orig 2012-03-11 23:21:53.000000000 +0900 -+++ configure 2012-03-12 17:46:25.000000000 +0900 -@@ -11452,7 +11452,7 @@ +--- configure.orig 2018-03-15 22:54:37 UTC ++++ configure +@@ -13077,7 +13077,7 @@ $as_echo_n "checking out linker version if test "_$MICRO_VERSION" = "_" ; then MICRO_VERSION="0" ; fi if test "_$MINOR_VERSION" = "_" ; then MINOR_VERSION="$MAJOR_VERSION" ; MAJOR_VERSION="0" ; fi MINOR_VERSION=`echo "$MINOR_VERSION" | sed -e 's/[^0-9].*//'` @@ -9,7 +9,7 @@ VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION" { $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5 $as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; } -@@ -13733,12 +13733,12 @@ +@@ -15430,12 +15430,12 @@ case "$host_os" in mingw*) ;; *) if test ".$can_build_shared" != ".no" ; then ZZIPLIB_LDFLAGS="-export-dynamic" Copied: branches/2018Q3/devel/zziplib/files/patch-docs_dbk2man.py (from r474028, head/devel/zziplib/files/patch-docs_dbk2man.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q3/devel/zziplib/files/patch-docs_dbk2man.py Fri Jul 6 18:05:50 2018 (r474029, copy of r474028, head/devel/zziplib/files/patch-docs_dbk2man.py) @@ -0,0 +1,47 @@ +--- docs/dbk2man.py.orig 2018-03-16 11:55:55 UTC ++++ docs/dbk2man.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python2.7 ++#! /usr/bin/python + """ Converts an xml-file with docbook elements into troff manual pages. + The conversion uses etree expecting <refentry> elements in the input. + The output goes to a multiple files in manX/* subdirectories. +@@ -223,22 +223,23 @@ def refentry2man(refentry, subdirectory + if found is not None: manvolnum = found.text + written = 0 + section = refentry.find("refnamediv") +- for refname in section.findall("refname"): +- if not refentrytitle: +- refentrytitle = refname.text +- manpage = refname.text +- filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum) +- if manpage != refentrytitle: +- manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum) +- writefile(filename, manpagetext) +- else: +- manpagetext = text ++ if section is not None: ++ for refname in section.findall("refname"): ++ if not refentrytitle: ++ refentrytitle = refname.text ++ manpage = refname.text ++ filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum) ++ if manpage != refentrytitle: ++ manpagetext = ".so %s.%s\n" % (refentrytitle, manvolnum) ++ writefile(filename, manpagetext) ++ else: ++ manpagetext = text ++ writefile(filename, manpagetext) ++ written += 1 ++ if not written: ++ manpage = refentrytitle ++ filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum) + writefile(filename, manpagetext) +- written += 1 +- if not written: +- manpage = refentrytitle +- filename = "%s/man%s/%s.%s" % (subdirectory, manvolnum, manpage, manvolnum) +- writefile(filename, manpagetext) + + def writefile(filename, manpagetext): + dirname = os.path.dirname(filename) Modified: branches/2018Q3/devel/zziplib/files/patch-zzip_Makefile.in ============================================================================== --- branches/2018Q3/devel/zziplib/files/patch-zzip_Makefile.in Fri Jul 6 18:00:37 2018 (r474028) +++ branches/2018Q3/devel/zziplib/files/patch-zzip_Makefile.in Fri Jul 6 18:05:50 2018 (r474029) @@ -1,6 +1,6 @@ ---- zzip/Makefile.in.orig 2010-05-20 16:46:22.000000000 +0200 -+++ zzip/Makefile.in 2010-05-20 16:47:02.000000000 +0200 -@@ -694,7 +694,6 @@ +--- zzip/Makefile.in.orig 2018-03-16 11:43:07 UTC ++++ zzip/Makefile.in +@@ -826,7 +826,6 @@ install-dvi-am: install-exec-am: install-libLTLIBRARIES @$(NORMAL_INSTALL) Modified: branches/2018Q3/devel/zziplib/pkg-descr ============================================================================== --- branches/2018Q3/devel/zziplib/pkg-descr Fri Jul 6 18:00:37 2018 (r474028) +++ branches/2018Q3/devel/zziplib/pkg-descr Fri Jul 6 18:05:50 2018 (r474029) @@ -3,4 +3,4 @@ It is based solely on free algorithms provided by zlib transparently access files being either real files or zipped files with the same file path argument. -WWW: http://zziplib.sourceforge.net/ +WWW: https://github.com/gdraheim/zziplib Modified: branches/2018Q3/devel/zziplib/pkg-plist ============================================================================== --- branches/2018Q3/devel/zziplib/pkg-plist Fri Jul 6 18:00:37 2018 (r474028) +++ branches/2018Q3/devel/zziplib/pkg-plist Fri Jul 6 18:05:50 2018 (r474029) @@ -1,10 +1,8 @@ bin/unzip-mem bin/unzzip -bin/unzzipcat -bin/unzzipcat-mem -bin/unzzipcat-seeko -bin/unzzipdir -bin/unzzipdir-mem +bin/unzzip-big +bin/unzzip-mem +bin/unzzip-mix bin/zzcat bin/zzdir bin/zzxorcat @@ -37,19 +35,19 @@ include/zziplib.h lib/libzzip.a lib/libzzip.so lib/libzzip.so.13 -lib/libzzip.so.13.0.62 +lib/libzzip.so.13.0.69 lib/libzzipfseeko.a lib/libzzipfseeko.so lib/libzzipfseeko.so.13 -lib/libzzipfseeko.so.13.0.62 +lib/libzzipfseeko.so.13.0.69 lib/libzzipmmapped.a lib/libzzipmmapped.so lib/libzzipmmapped.so.13 -lib/libzzipmmapped.so.13.0.62 +lib/libzzipmmapped.so.13.0.69 lib/libzzipwrap.a lib/libzzipwrap.so lib/libzzipwrap.so.13 -lib/libzzipwrap.so.13.0.62 +lib/libzzipwrap.so.13.0.69 %%SDL%%libdata/pkgconfig/SDL_rwops_zzip.pc libdata/pkgconfig/zzip-zlib-config.pc libdata/pkgconfig/zzipfseeko.pc @@ -64,7 +62,6 @@ man/man3/zzip_closedir.3.gz man/man3/zzip_compr_str.3.gz man/man3/zzip_dir_alloc.3.gz man/man3/zzip_dir_alloc_ext_io.3.gz -man/man3/zzip_dir_close.3.gz man/man3/zzip_dir_fdopen.3.gz man/man3/zzip_dir_fdopen_ext_io.3.gz man/man3/zzip_dir_free.3.gz @@ -116,6 +113,7 @@ man/man3/zzip_file_open.3.gz man/man3/zzip_file_read.3.gz man/man3/zzip_file_real.3.gz man/man3/zzip_file_stat.3.gz +man/man3/zzip_filesize.3.gz man/man3/zzip_fopen.3.gz man/man3/zzip_fread.3.gz man/man3/zzip_freopen.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807061805.w66I5prm029139>