From freaky@voi.aagh.net  Fri Nov 14 19:37:06 2008
Return-Path: <freaky@voi.aagh.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3516F106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Nov 2008 19:37:06 +0000 (UTC)
	(envelope-from freaky@voi.aagh.net)
Received: from spork.qfe3.net (spork.qfe3.net [212.13.207.101])
	by mx1.freebsd.org (Postfix) with ESMTP id DF1668FC0A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 14 Nov 2008 19:37:05 +0000 (UTC)
	(envelope-from freaky@voi.aagh.net)
Received: from [81.104.123.28] (helo=voi.aagh.net)
	by spork.qfe3.net with esmtp (Exim 4.66 (FreeBSD))
	(envelope-from <freaky@voi.aagh.net>)
	id 1L14EP-0004Bb-EC
	for FreeBSD-gnats-submit@freebsd.org; Fri, 14 Nov 2008 19:21:25 +0000
Received: from freaky by voi.aagh.net with local (Exim 4.69 (FreeBSD))
	(envelope-from <freaky@voi.aagh.net>)
	id 1L14EP-000Q0U-5F
	for FreeBSD-gnats-submit@freebsd.org; Fri, 14 Nov 2008 19:21:25 +0000
Message-Id: <E1L14EP-000Q0U-5F@voi.aagh.net>
Date: Fri, 14 Nov 2008 19:21:25 +0000
From: Thomas Hurst <tom@hur.st>
Sender: Thomas Hurst <freaky@voi.aagh.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] graphics/optipng: update to 0.6.2, take maintainership
X-Send-Pr-Version: 3.113
X-GNATS-Notify: freaky@aagh.net

>Number:         128877
>Category:       ports
>Synopsis:       [PATCH] graphics/optipng: update to 0.6.2, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 14 19:40:02 UTC 2008
>Closed-Date:    Mon Jan 19 20:47:12 UTC 2009
>Last-Modified:  Mon Jan 19 20:50:03 UTC 2009
>Originator:     Thomas Hurst
>Release:        FreeBSD 7.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD voi.nightsdawn.sf 7.0-STABLE FreeBSD 7.0-STABLE #0: Sun Jul 13 21:32:30 BST 2008
>Description:
- Update to 0.6.2
- Add support for using the bundled patched zlib and libpng, both off by default.
- Update my email address.

Added file(s):
- files/patch-configure
- files/patch-lib-libpng-scripts-makefile.std
- files/patch-lib-zlib-Makefile.in
- files/patch-src-scripts-unix.mak.in

Removed file(s):
- files/patch-src__scripts__unix-secure.mak

Port maintainer (freaky@aagh.net) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- optipng-0.6.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/optipng/Makefile /usr/home/freaky/work/ports/graphics/optipng/Makefile
--- /usr/ports/graphics/optipng/Makefile	2006-08-25 20:20:42.000000000 +0100
+++ /usr/home/freaky/work/ports/graphics/optipng/Makefile	2008-11-14 19:16:49.000000000 +0000
@@ -6,22 +6,38 @@
 #
 
 PORTNAME=	optipng
-PORTVERSION=	0.5.4
+PORTVERSION=	0.6.2
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
-MAINTAINER=	freaky@aagh.net
+MAINTAINER=	tom@hur.st
 COMMENT=	An optimizer for PNG files
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+OPTIONS=	BUNDLED_LIBPNG	"Use bundled libpng"	off \
+		BUNDLED_ZLIB	"Use bundled zlib"	off
+
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS=	#
+.ifndef(WITH_BUNDLED_LIBPNG)
+CONFIGURE_ARGS+=	--with-system-libpng
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+.endif
+
+.ifndef(WITH_BUNDLED_ZLIB)
+CONFIGURE_ARGS+=	--with-system-zlib
+.endif
 
 BUILD_WRKSRC=	${WRKSRC}/src
-MAKEFILE=	scripts/unix-secure.mak
+MAKEFILE=	scripts/unix.mak
 ALL_TARGET=	${PORTNAME}
 PLIST_FILES=	bin/optipng
 MAN1=		optipng.1
-PORTDOCS=	CAVEAT.txt HISTORY.txt TODO.txt USAGE.txt \
-		design.html features.html guide.html thanks.html
+PORTDOCS=	caveat.txt history.txt manual.html manual.pdf manual.txt \
+		png_optimization_guide.html thanks.html todo.txt
+
+do-configure:
+	(cd ${WRKSRC} && ./configure ${CONFIGURE_ARGS})
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/
@@ -33,4 +49,4 @@
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/optipng/distinfo /usr/home/freaky/work/ports/graphics/optipng/distinfo
--- /usr/ports/graphics/optipng/distinfo	2006-08-25 20:20:43.000000000 +0100
+++ /usr/home/freaky/work/ports/graphics/optipng/distinfo	2008-11-14 17:38:53.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (optipng-0.5.4.tar.gz) = 8d989971e674a06b55e17fc5b70c41aa
-SHA256 (optipng-0.5.4.tar.gz) = 3074f7ebac74683c12b805d58f836400cbec51355fad13f47d46775792ad35ab
-SIZE (optipng-0.5.4.tar.gz) = 1094572
+MD5 (optipng-0.6.2.tar.gz) = 08b6195bb5895a7fe167fab16dcdf6d5
+SHA256 (optipng-0.6.2.tar.gz) = 84312506ea0c683a4e7675b3c8278067222762520016cc61e53c2b0e679120ca
+SIZE (optipng-0.6.2.tar.gz) = 1052509
diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-configure /usr/home/freaky/work/ports/graphics/optipng/files/patch-configure
--- /usr/ports/graphics/optipng/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-configure	2008-11-14 18:58:59.000000000 +0000
@@ -0,0 +1,11 @@
+--- configure.orig	2008-07-21 03:32:00.000000000 +0100
++++ configure	2008-11-14 18:58:23.000000000 +0000
+@@ -49,7 +49,7 @@
+ then
+     sed -e "$zlib_inc_del" -e "$libpng_inc_del" \
+         -e "$zlib_lib_del" -e "$libpng_lib_del" \
+-        -e "$zlib_sys_ins" -e "$libpng_sys_ins" \
++        -e "$libpng_sys_ins" -e "$zlib_sys_ins" \
+         src/scripts/unix.mak.in > src/scripts/unix.mak
+     sed -e "$zlib_inc_del" -e "$libpng_inc_del" \
+         -e "$zlib_lib_del" -e "$libpng_lib_del" \
diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std /usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std
--- /usr/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std	2008-11-14 18:16:25.000000000 +0000
@@ -0,0 +1,25 @@
+--- lib/libpng/scripts/makefile.std.orig	2006-03-06 17:06:28.000000000 +0000
++++ lib/libpng/scripts/makefile.std	2008-11-14 18:00:09.000000000 +0000
+@@ -24,12 +24,16 @@
+ ZLIBLIB=../zlib
+ ZLIBINC=../zlib
+ 
+-CC=cc
+-AR_RC=ar rc
+-MKDIR_P=mkdir
+-LN_SF=ln -sf
+-RANLIB=ranlib
+-RM_F=rm -f
++CC?=cc
++AR?=ar
++AR_RC=${AR} rc
++MKDIR?=mkdir
++MKDIR_P=${MKDIR}
++LN?=ln
++LN_SF=${LN} -sf
++RANLIB?=ranlib
++RM?=rm
++RM_F=${RM} -f
+ 
+ CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
+ LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in /usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in
--- /usr/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-lib-zlib-Makefile.in	2008-11-14 18:16:55.000000000 +0000
@@ -0,0 +1,37 @@
+--- lib/zlib/Makefile.in.orig	2005-07-18 03:25:21.000000000 +0100
++++ lib/zlib/Makefile.in	2008-11-14 18:07:42.000000000 +0000
+@@ -16,9 +16,9 @@
+ # To install in $HOME instead of /usr/local, use:
+ #    make install prefix=$HOME
+ 
+-CC=cc
++CC?=cc
+ 
+-CFLAGS=-O
++CFLAGS?=-O
+ #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+ #CFLAGS=-g -DDEBUG
+ #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+@@ -33,9 +33,10 @@
+ SHAREDLIBV=libz.so.1.2.3
+ SHAREDLIBM=libz.so.1
+ 
+-AR=ar rc
+-RANLIB=ranlib
+-TAR=tar
++AR?=ar
++ARFLAGS?=rc
++RANLIB?=ranlib
++TAR?=tar
+ SHELL=/bin/sh
+ EXE=
+ 
+@@ -68,7 +69,7 @@
+ 	fi
+ 
+ libz.a: $(OBJS) $(OBJA)
+-	$(AR) $@ $(OBJS) $(OBJA)
++	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
+ 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
+ 
+ match.o: match.S
diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in /usr/home/freaky/work/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in
--- /usr/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-src-scripts-unix.mak.in	2008-11-14 18:59:49.000000000 +0000
@@ -0,0 +1,33 @@
+--- src/scripts/unix.mak.in.orig	2008-09-03 23:56:00.000000000 +0100
++++ src/scripts/unix.mak.in	2008-11-14 18:29:12.000000000 +0000
+@@ -4,16 +4,16 @@
+ # Usage: make -f scripts/unix.mak
+ 
+ 
+-prefix=/usr/local
++prefix=${PREFIX}
+ exec_prefix=$(prefix)
+ bindir=$(exec_prefix)/bin
+ mandir=$(prefix)/man
+ man1dir=$(mandir)/man1
+ 
+-CC = cc
+-LD = $(CC)
+-CFLAGS  = -O
+-LDFLAGS = -s
++CC ?= cc
++LD = $(CC)
++CFLAGS  ?= -O
++LDFLAGS += -s -L${LOCALBASE}/lib
+ 
+ OPTIPNG = optipng
+ ZLIB    = libz.a
+@@ -28,7 +28,7 @@
+ BACKDIR = ../../src
+ 
+ OBJS = optipng.o opngoptim.o opngreduc.o cbitset.o osys.o strutil.o
+-INCS = -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR)
++INCS = -I$(ZDIR) -I$(PNGDIR) -I$(PNGXDIR) -I${LOCALBASE}/include
+ LIBS = $(PNGXDIR)/$(PNGXLIB) $(PNGDIR)/$(PNGLIB) $(ZDIR)/$(ZLIB)
+ SYSLIBS =
+ 
diff -ruN --exclude=CVS /usr/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak /usr/home/freaky/work/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak
--- /usr/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak	2006-08-25 20:20:43.000000000 +0100
+++ /usr/home/freaky/work/ports/graphics/optipng/files/patch-src__scripts__unix-secure.mak	1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
---- ./src/scripts/unix-secure.mak.orig	Fri Aug 11 19:08:00 2006
-+++ ./src/scripts/unix-secure.mak	Sat Aug 12 10:56:39 2006
-@@ -12,17 +12,14 @@
- # Usage: make -f scripts/unix-secure.mak
- 
- 
--prefix=/usr/local
-+prefix=${PREFIX}
- exec_prefix=${prefix}
- bindir=${exec_prefix}/bin
--mandir=${prefix}/man
--man1dir=${mandir}/man1
-+man1dir=${MAN1PREFIX}/man/man1
- 
--CC = cc
--LD = $(CC)
--MAKE = make
--CFLAGS  = -O
--LDFLAGS = -s
-+CFLAGS  ?= -O
-+LDFLAGS += -s -L${LOCALBASE}/lib
-+CFLAGS  += -I${LOCALBASE}/include
- 
- OPTIPNG  = optipng
- PNGXLIB  = pngxtern.a
-@@ -35,7 +32,7 @@
- 
- 
- $(OPTIPNG): $(OBJS) $(LIBS)
--	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
-+	$(CC) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
- 
- 
- .c.o:
diff -ruN --exclude=CVS /usr/ports/graphics/optipng/pkg-descr /usr/home/freaky/work/ports/graphics/optipng/pkg-descr
--- /usr/ports/graphics/optipng/pkg-descr	2006-08-09 11:19:16.000000000 +0100
+++ /usr/home/freaky/work/ports/graphics/optipng/pkg-descr	2008-11-14 19:11:51.000000000 +0000
@@ -11,4 +11,4 @@
 WWW: http://optipng.sourceforge.net/
 
 - Thomas Hurst
- <freaky@aagh.net>
+ <tom@hur.st>
--- optipng-0.6.2.patch ends here ---

>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Fri Nov 14 19:40:16 UTC 2008 
Class-Changed-Why:  
Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128877 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Fri Nov 14 19:40:22 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128877 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: freaky@aagh.net
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/128877: [PATCH] graphics/optipng: update to 0.6.2, take maintainership
Date: Fri, 14 Nov 2008 19:40:18 UT

 Maintainer of graphics/optipng,
 
 Please note that PR ports/128877 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/128877
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Nov 14 19:51:34 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128877 

From: Thomas Hurst <freaky@aagh.net>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/128877: [PATCH] graphics/optipng: update to 0.6.2, take
	maintainership
Date: Sun, 16 Nov 2008 23:04:51 +0000

 I approve, submitter is the maintainer.  I forgot to fix the subject,
 and I guess using from: this email would have been good, meh.
 
 -- 
 Thomas 'Freaky' Hurst
     http://hur.st/

From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
To: bug-followup@freebsd.org
Cc: tom@hur.st
Subject: ports/128877: [PATCH] graphics/optipng: update to 0.6.2, take
	maintainership
Date: Sun, 23 Nov 2008 00:02:48 +0300

 --NJSRbAqOy4NeGDns
 Content-Type: text/plain; charset=koi8-r
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Good day.
 
 I happened to make the same update to 0.6.2 (had found that PR already
 exists only after I finished my work), but I did it in a slightly
 different way: it involves less patch files.  May be my work will be
 useful:
 --- 0001-Update-graphics-optipng-to-the-latest-version-0.6.2.patch begins h=
 ere ---
 =46rom cf234c0e04727d4ecea3fbe06b214ee312645157 Mon Sep 17 00:00:00 2001
 =46rom: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
 Date: Sat, 22 Nov 2008 23:15:07 +0300
 Subject: [PATCH] Update graphics/optipng to the latest version, 0.6.2, and =
 fix CVE-2008-5101
 
 There is already ports/128877 that updates the port to 0.6.2, but this
 patch is smaller, because instead of patching Makefiles it extensively
 manipulates make's command-line options.
 
 See: http://optipng.sourceforge.net/
 See: http://secunia.com/advisories/32651
 
 Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
 ---
  graphics/optipng/Makefile                          |   50 ++++++++++++++--=
 ---
  graphics/optipng/distinfo                          |    6 +-
  .../optipng/files/patch-lib::zlib::Makefile.in     |   11 ++++
  .../files/patch-src__scripts__unix-secure.mak      |   34 -------------
  graphics/optipng/pkg-descr                         |    2 +-
  5 files changed, 52 insertions(+), 51 deletions(-)
  create mode 100644 graphics/optipng/files/patch-lib::zlib::Makefile.in
  delete mode 100644 graphics/optipng/files/patch-src__scripts__unix-secure.=
 mak
 
 diff --git a/graphics/optipng/Makefile b/graphics/optipng/Makefile
 index 0bfae22..16668c9 100644
 --- a/graphics/optipng/Makefile
 +++ b/graphics/optipng/Makefile
 @@ -6,26 +6,50 @@
  #
 =20
  PORTNAME=3D	optipng
 -PORTVERSION=3D	0.5.4
 +PORTVERSION=3D	0.6.2
  CATEGORIES=3D	graphics
  MASTER_SITES=3D	SF
 =20
 -MAINTAINER=3D	freaky@aagh.net
 +MAINTAINER=3D	tom@hur.st
  COMMENT=3D	An optimizer for PNG files
 =20
 -LIB_DEPENDS=3D	png.5:${PORTSDIR}/graphics/png
 +OPTIONS=3D	BUNDLED_LIBPNG  "Use bundled libpng"    off \
 +		BUNDLED_ZLIB    "Use bundled zlib"      off
 +
 +.include <bsd.port.pre.mk>
 +
 +HAS_CONFIGURE=3D	yes
 +CONFIGURE_ARGS=3D
 +MAKE_ARGS=3D	prefix=3D"" \
 +		DESTDIR=3D"${PREFIX}" \
 +		CC=3D"${CC}" \
 +		AR=3D"${AR}" \
 +		AR_RC=3D"${AR} rc" \
 +		ARFLAGS=3D"rc" \
 +		RANLIB=3D"${RANLIB}" \
 +		TAR=3D"${TAR}" \
 +		MKDIR_P=3D"${MKDIR}" \
 +		LN=3D"${LN}" \
 +		LN_SF=3D"${LN} -sf" \
 +		RM=3D"${RM}" \
 +		RM_F=3D"${RM} -f"
 +
 +.ifndef WITH_BUNDLED_LIBPNG
 +CONFIGURE_ARGS+=3D	-with-system-libpng
 +LIB_DEPENDS+=3D	png.5:${PORTSDIR}/graphics/png
 +MAKE_ARGS+=3D	CFLAGS=3D"-O -I${LOCALBASE}/include" \
 +		LDFLAGS=3D"-s -L${LOCALBASE}/lib"
 +.endif
 +
 +.ifndef WITH_BUNDLED_ZLIB
 +CONFIGURE_ARGS=3D	-with-system-zlib
 +.endif
 =20
 -BUILD_WRKSRC=3D	${WRKSRC}/src
 -MAKEFILE=3D	scripts/unix-secure.mak
 -ALL_TARGET=3D	${PORTNAME}
  PLIST_FILES=3D	bin/optipng
  MAN1=3D		optipng.1
 -PORTDOCS=3D	CAVEAT.txt HISTORY.txt TODO.txt USAGE.txt \
 -		design.html features.html guide.html thanks.html
 -
 -do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/src/optipng ${PREFIX}/bin/
 -	${INSTALL_MAN} ${WRKSRC}/man/optipng.1 ${MAN1PREFIX}/man/man1/
 +PORTDOCS=3D	caveat.txt history.txt \
 +		manual.html manual.pdf manual.txt \
 +		png_optimization_guide.html thanks.html todo.txt
 =20
  post-install:
  .ifndef NOPORTDOCS
 @@ -33,4 +57,4 @@ post-install:
  	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
  .endif
 =20
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 diff --git a/graphics/optipng/distinfo b/graphics/optipng/distinfo
 index 855d4a3..8fae05c 100644
 --- a/graphics/optipng/distinfo
 +++ b/graphics/optipng/distinfo
 @@ -1,3 +1,3 @@
 -MD5 (optipng-0.5.4.tar.gz) =3D 8d989971e674a06b55e17fc5b70c41aa
 -SHA256 (optipng-0.5.4.tar.gz) =3D 3074f7ebac74683c12b805d58f836400cbec5135=
 5fad13f47d46775792ad35ab
 -SIZE (optipng-0.5.4.tar.gz) =3D 1094572
 +MD5 (optipng-0.6.2.tar.gz) =3D 08b6195bb5895a7fe167fab16dcdf6d5
 +SHA256 (optipng-0.6.2.tar.gz) =3D 84312506ea0c683a4e7675b3c827806722276252=
 0016cc61e53c2b0e679120ca
 +SIZE (optipng-0.6.2.tar.gz) =3D 1052509
 diff --git a/graphics/optipng/files/patch-lib::zlib::Makefile.in b/graphics=
 /optipng/files/patch-lib::zlib::Makefile.in
 new file mode 100644
 index 0000000..d5c3527
 --- /dev/null
 +++ b/graphics/optipng/files/patch-lib::zlib::Makefile.in
 @@ -0,0 +1,11 @@
 +--- lib/zlib/Makefile.in.orig	2008-11-22 23:45:08.000000000 +0300
 ++++ lib/zlib/Makefile.in	2008-11-22 23:46:12.000000000 +0300
 +@@ -68,7 +68,7 @@
 + 	fi
 +=20
 + libz.a: $(OBJS) $(OBJA)
 +-	$(AR) $@ $(OBJS) $(OBJA)
 ++	$(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA)
 + 	-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
 +=20
 + match.o: match.S
 diff --git a/graphics/optipng/files/patch-src__scripts__unix-secure.mak b/g=
 raphics/optipng/files/patch-src__scripts__unix-secure.mak
 deleted file mode 100644
 index ba0debf..0000000
 --- a/graphics/optipng/files/patch-src__scripts__unix-secure.mak
 +++ /dev/null
 @@ -1,34 +0,0 @@
 ---- ./src/scripts/unix-secure.mak.orig	Fri Aug 11 19:08:00 2006
 -+++ ./src/scripts/unix-secure.mak	Sat Aug 12 10:56:39 2006
 -@@ -12,17 +12,14 @@
 - # Usage: make -f scripts/unix-secure.mak
 -=20
 -=20
 --prefix=3D/usr/local
 -+prefix=3D${PREFIX}
 - exec_prefix=3D${prefix}
 - bindir=3D${exec_prefix}/bin
 --mandir=3D${prefix}/man
 --man1dir=3D${mandir}/man1
 -+man1dir=3D${MAN1PREFIX}/man/man1
 -=20
 --CC =3D cc
 --LD =3D $(CC)
 --MAKE =3D make
 --CFLAGS  =3D -O
 --LDFLAGS =3D -s
 -+CFLAGS  ?=3D -O
 -+LDFLAGS +=3D -s -L${LOCALBASE}/lib
 -+CFLAGS  +=3D -I${LOCALBASE}/include
 -=20
 - OPTIPNG  =3D optipng
 - PNGXLIB  =3D pngxtern.a
 -@@ -35,7 +32,7 @@
 -=20
 -=20
 - $(OPTIPNG): $(OBJS) $(LIBS)
 --	$(LD) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
 -+	$(CC) -o $(OPTIPNG) $(LDFLAGS) $(OBJS) $(LIBS) -lpng -lz
 -=20
 -=20
 - .c.o:
 diff --git a/graphics/optipng/pkg-descr b/graphics/optipng/pkg-descr
 index 4b91f9a..e544300 100644
 --- a/graphics/optipng/pkg-descr
 +++ b/graphics/optipng/pkg-descr
 @@ -11,4 +11,4 @@ trial, and a wider search space.
  WWW: http://optipng.sourceforge.net/
 =20
  - Thomas Hurst
 - <freaky@aagh.net>
 + <tom@hur.st>
 --=20
 1.6.0.4
 
 --- 0001-Update-graphics-optipng-to-the-latest-version-0.6.2.patch ends her=
 e ---
 --=20
 Eygene
  _                ___       _.--.   #
  \`.|\..----...-'`   `-._.-'_.-'`   #  Remember that it is hard
  /  ' `         ,       __.--'      #  to read the on-line manual  =20
  )/' _/     \   `-_,   /            #  while single-stepping the kernel.
  `-'" `"\_  ,_.-;_.-\_ ',  fsc/as   #
      _.-'_./   {_.'   ; /           #    -- FreeBSD Developers handbook=20
     {_.-``-'         {_/            #
 
 --NJSRbAqOy4NeGDns
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (FreeBSD)
 
 iEYEARECAAYFAkkoc3gACgkQthUKNsbL7Yhd3gCgnhMvz6gftRgiAaiknMBijRYf
 pewAnijdckjygdMsKqjTyQxQzXwy9BQh
 =qk0A
 -----END PGP SIGNATURE-----
 
 --NJSRbAqOy4NeGDns--

From: Thomas Hurst <tom@hur.st>
To: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
Cc: bug-followup@freebsd.org
Subject: Re: ports/128877: [PATCH] graphics/optipng: update to 0.6.2, take
	maintainership
Date: Thu, 4 Dec 2008 14:17:40 +0000

 --HcAYCG3uE/tztfnV
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 * Eygene Ryabinkin (rea-fbsd@codelabs.ru) wrote:
 
 > Good day.
 >=20
 > I happened to make the same update to 0.6.2 (had found that PR already
 > exists only after I finished my work), but I did it in a slightly
 > different way: it involves less patch files.  May be my work will be
 > useful:
 
 This looks good, but it doesn't appear to respect BUNDLED_{LIBPNG,ZLIB};
 the bundled ones get built and linked unconditionally.
 
 I should get a chance to look at it properly over the weekend unless you
 have any insights.
 
 --=20
 Thomas 'Freaky' Hurst
     http://hur.st/
 
 --HcAYCG3uE/tztfnV
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (FreeBSD)
 
 iEYEARECAAYFAkk35oQACgkQNBBHZ542MwRduwCdHfth1/+a/x1+muOT/I/wv5JD
 i0MAn1Eu/LCBZsiI9n5tw5Lnya6lEDBr
 =1C4b
 -----END PGP SIGNATURE-----
 
 --HcAYCG3uE/tztfnV--
State-Changed-From-To: feedback->open 
State-Changed-By: miwi 
State-Changed-When: Mon Jan 12 15:44:43 UTC 2009 
State-Changed-Why:  
. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128877 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Mon Jan 12 15:44:57 UTC 2009 
State-Changed-Why:  
any news here?. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128877 
Responsible-Changed-From-To: miwi->wxs 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Mon Jan 19 19:14:21 UTC 2009 
Responsible-Changed-Why:  
you need also this one for the cve 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128877 
State-Changed-From-To: feedback->closed 
State-Changed-By: wxs 
State-Changed-When: Mon Jan 19 20:47:11 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128877 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/128877: commit references a PR
Date: Mon, 19 Jan 2009 20:44:34 +0000 (UTC)

 wxs         2009-01-19 20:44:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/optipng     Makefile distinfo pkg-descr 
   Added files:
     graphics/optipng/files patch-configure 
                            patch-lib-libpng-scripts-makefile.std 
                            patch-lib-zlib-Makefile.in 
                            patch-src-scripts-unix.mak.in 
   Log:
   - Update to 0.6.2
   - Add OPTIONS for bundled libpng and zlib (both off by default)
   - Update maintainer address
   
   PR:             ports/128877
   Submitted by:   Thomas Hurst <tom@hur.st> (maintainer)
   Security:       http://www.vuxml.org/freebsd/2bc960c4-e665-11dd-afcd-00e0815b8da8.html
   
   Revision  Changes    Path
   1.5       +23 -7     ports/graphics/optipng/Makefile
   1.7       +3 -3      ports/graphics/optipng/distinfo
   1.1       +11 -0     ports/graphics/optipng/files/patch-configure (new)
   1.1       +25 -0     ports/graphics/optipng/files/patch-lib-libpng-scripts-makefile.std (new)
   1.1       +37 -0     ports/graphics/optipng/files/patch-lib-zlib-Makefile.in (new)
   1.1       +33 -0     ports/graphics/optipng/files/patch-src-scripts-unix.mak.in (new)
   1.3       +1 -1      ports/graphics/optipng/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
