On 04/22/11 19:02, Christian Weisgerber wrote:
> It's declared static, i.e., only a local symbol. It is not visible
> to users of the library.
>
Ok, thanks, updated diff without bump.
Cheers
Giovanni
? tiffcp.core
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/tiff/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- Makefile 23 Mar 2011 08:08:50 -0000 1.59
+++ Makefile 26 Apr 2011 10:16:40 -0000
@@ -2,8 +2,7 @@
COMMENT= tools and library routines for working with TIFF images
-DISTNAME= tiff-3.9.4
-REVISION= 1
+DISTNAME= tiff-3.9.5
SHARED_LIBS= tiff 38.3 # 39.4
SHARED_LIBS+= tiffxx 39.3 # 39.4
CATEGORIES= graphics
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/tiff/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo 30 Jun 2010 17:10:07 -0000 1.10
+++ distinfo 26 Apr 2011 10:16:40 -0000
@@ -1,5 +1,5 @@
-MD5 (tiff-3.9.4.tar.gz) = IAbBvdEmRNvwKVaVUXWv1g==
-RMD160 (tiff-3.9.4.tar.gz) = Pgp0tilCl8FvuYOtaAVqHfu9sd4=
-SHA1 (tiff-3.9.4.tar.gz) = pOMtVa+7yr0DkanImZXo6KGZYd4=
-SHA256 (tiff-3.9.4.tar.gz) = Z7dtB1+3T3yzLn5LIXcBZ0dV/mzuD0Y7JZp1P85pHaY=
-SIZE (tiff-3.9.4.tar.gz) = 1436968
+MD5 (tiff-3.9.5.tar.gz) = j8fOO04dDMijGTNpZ4FQhA==
+RMD160 (tiff-3.9.5.tar.gz) = xndCv2ubEMoHAOac5XUAfUDE+Jw=
+SHA1 (tiff-3.9.5.tar.gz) = 9AqrIPsvYJtcvBFxxAtmoUReN3M=
+SHA256 (tiff-3.9.5.tar.gz) = 7PLjBYJpjbxh0mkgO70ecBoaUPsmyH1wnhDYlmm62zM=
+SIZE (tiff-3.9.5.tar.gz) = 1455502
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 30 Jun 2010 17:10:07 -0000 1.4
+++ patches/patch-Makefile_in 26 Apr 2011 10:16:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.4 2010/06/30 17:10:07 naddy Exp $
---- Makefile.in.orig Tue Jun 15 20:58:54 2010
-+++ Makefile.in Sat Jun 26 23:53:39 2010
-@@ -329,8 +329,8 @@ EXTRA_DIST = \
+--- Makefile.in.orig Sat Apr 9 22:00:49 2011
++++ Makefile.in Thu Apr 21 15:35:54 2011
+@@ -326,8 +326,8 @@ EXTRA_DIST = \
configure.com \
nmake.opt
Index: patches/patch-html_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-html_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-html_Makefile_in
--- patches/patch-html_Makefile_in 30 Jun 2010 17:10:07 -0000 1.4
+++ patches/patch-html_Makefile_in 26 Apr 2011 10:16:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-html_Makefile_in,v 1.4 2010/06/30 17:10:07 naddy Exp $
---- html/Makefile.in.orig Sun Oct 11 17:50:51 2009
-+++ html/Makefile.in Sun Oct 11 17:52:01 2009
-@@ -261,7 +261,7 @@ build_vendor = @build_vendor@
+--- html/Makefile.in.orig Sat Apr 9 22:00:48 2011
++++ html/Makefile.in Thu Apr 21 15:35:54 2011
+@@ -262,7 +262,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
Index: patches/patch-html_images_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-html_images_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-html_images_Makefile_in
--- patches/patch-html_images_Makefile_in 30 Jun 2010 17:10:07 -0000
1.4
+++ patches/patch-html_images_Makefile_in 26 Apr 2011 10:16:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-html_images_Makefile_in,v 1.4 2010/06/30 17:10:07 naddy Exp $
---- html/images/Makefile.in.orig Sun Oct 11 17:52:04 2009
-+++ html/images/Makefile.in Sun Oct 11 17:52:14 2009
-@@ -219,7 +219,7 @@ build_vendor = @build_vendor@
+--- html/images/Makefile.in.orig Sat Apr 9 22:00:48 2011
++++ html/images/Makefile.in Thu Apr 21 15:35:54 2011
+@@ -220,7 +220,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
Index: patches/patch-html_man_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-html_man_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-html_man_Makefile_in
--- patches/patch-html_man_Makefile_in 30 Jun 2010 17:10:07 -0000 1.4
+++ patches/patch-html_man_Makefile_in 26 Apr 2011 10:16:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-html_man_Makefile_in,v 1.4 2010/06/30 17:10:07 naddy Exp $
---- html/man/Makefile.in.orig Sun Oct 11 17:52:20 2009
-+++ html/man/Makefile.in Sun Oct 11 17:52:32 2009
-@@ -219,7 +219,7 @@ build_vendor = @build_vendor@
+--- html/man/Makefile.in.orig Sat Apr 9 22:00:48 2011
++++ html/man/Makefile.in Thu Apr 21 15:35:54 2011
+@@ -220,7 +220,7 @@ build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
Index: patches/patch-libtiff_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-libtiff_Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-libtiff_Makefile_in
--- patches/patch-libtiff_Makefile_in 30 Jun 2010 17:10:07 -0000 1.9
+++ patches/patch-libtiff_Makefile_in 26 Apr 2011 10:16:40 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-libtiff_Makefile_in,v 1.
* Avoid picking up an old libtiff in ${LOCALBASE}.
* Do not record inter-library dependencies.
---- libtiff/Makefile.in.orig Tue Jun 15 20:58:54 2010
-+++ libtiff/Makefile.in Sun Jun 27 05:25:54 2010
-@@ -231,10 +231,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- libtiff/Makefile.in.orig Sat Apr 9 22:00:48 2011
++++ libtiff/Makefile.in Thu Apr 21 15:35:54 2011
+@@ -230,10 +230,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
Index: patches/patch-libtiff_tif_dirinfo_c
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-libtiff_tif_dirinfo_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-libtiff_tif_dirinfo_c
--- patches/patch-libtiff_tif_dirinfo_c 30 Jun 2010 17:10:08 -0000 1.4
+++ patches/patch-libtiff_tif_dirinfo_c 26 Apr 2011 10:16:40 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libtiff_tif_dirinfo_c,v 1.4 2010/06/30 17:10:08 naddy Exp $
---- libtiff/tif_dirinfo.c.orig Sun Jun 27 01:01:31 2010
-+++ libtiff/tif_dirinfo.c Sun Jun 27 01:01:51 2010
-@@ -873,7 +873,7 @@ _TIFFCreateAnonFieldInfo(TIFF *tif, ttag_t tag, TIFFDa
+--- libtiff/tif_dirinfo.c.orig Thu Jul 8 18:17:59 2010
++++ libtiff/tif_dirinfo.c Thu Apr 21 15:35:54 2011
+@@ -869,7 +869,7 @@ _TIFFCreateAnonFieldInfo(TIFF *tif, ttag_t tag, TIFFDa
* note that this name is a special sign to TIFFClose() and
* _TIFFSetupFieldInfo() to free the field
*/
Index: patches/patch-libtiff_tif_fax3_h
===================================================================
RCS file: patches/patch-libtiff_tif_fax3_h
diff -N patches/patch-libtiff_tif_fax3_h
--- patches/patch-libtiff_tif_fax3_h 19 Mar 2011 18:41:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-libtiff_tif_fax3_h,v 1.1 2011/03/19 18:41:05 jasper Exp $
-
-Security fix for CVE-2011-0192: buffer overflow in Fax4Decode.
-
-Patch from Apple via Debian.
-
---- libtiff/tif_fax3.h.orig Tue Jun 8 20:50:42 2010
-+++ libtiff/tif_fax3.h Sat Mar 19 19:33:12 2011
-@@ -478,6 +478,10 @@ done1d:
\
- break; \
- case S_VL: \
- CHECK_b1; \
-+ if (b1 <= (int) (a0 + TabEnt->Param)) { \
-+ unexpected("VL", a0); \
-+ goto eol2d; \
-+ } \
- SETVALUE(b1 - a0 - TabEnt->Param); \
- b1 -= *--pb; \
- break; \
Index: patches/patch-libtiff_tif_thunder_c
===================================================================
RCS file: patches/patch-libtiff_tif_thunder_c
diff -N patches/patch-libtiff_tif_thunder_c
--- patches/patch-libtiff_tif_thunder_c 23 Mar 2011 08:08:50 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-$OpenBSD: patch-libtiff_tif_thunder_c,v 1.3 2011/03/23 08:08:50 jasper Exp $
-
-Security fix for CVE-2011-1167, libtiff heap-based buffer overflow
-
-Patch from maptools bugzilla: http://bugzilla.maptools.org/show_bug.cgi?id=2300
-
---- libtiff/tif_thunder.c.orig Tue Jun 8 20:50:43 2010
-+++ libtiff/tif_thunder.c Wed Mar 23 08:58:31 2011
-@@ -55,15 +55,34 @@
- static const int twobitdeltas[4] = { 0, 1, 0, -1 };
- static const int threebitdeltas[8] = { 0, 1, 2, 3, 0, -3, -2, -1 };
-
--#define SETPIXEL(op, v) { \
-- lastpixel = (v) & 0xf; \
-- if (npixels++ & 1) \
-- *op++ |= lastpixel; \
-- else \
-+#define SETPIXEL(op, v) { \
-+ lastpixel = (v) & 0xf; \
-+ if ( npixels < maxpixels ) \
-+ { \
-+ if (npixels++ & 1) \
-+ *op++ |= lastpixel; \
-+ else \
- op[0] = (tidataval_t) (lastpixel << 4); \
-+ } \
- }
-
- static int
-+ThunderSetupDecode(TIFF* tif)
-+{
-+ static const char module[] = "ThunderSetupDecode";
-+
-+ if( tif->tif_dir.td_bitspersample != 4 )
-+ {
-+ TIFFErrorExt(tif->tif_clientdata, module,
-+ "Wrong bitspersample value (%d), Thunder decoder
only supports 4bits per sample.",
-+ (int) tif->tif_dir.td_bitspersample );
-+ return 0;
-+ }
-+
-+ return (1);
-+}
-+
-+static int
- ThunderDecode(TIFF* tif, tidata_t op, tsize_t maxpixels)
- {
- register unsigned char *bp;
-@@ -149,6 +168,7 @@ int
- TIFFInitThunderScan(TIFF* tif, int scheme)
- {
- (void) scheme;
-+ tif->tif_setupdecode = ThunderSetupDecode;
- tif->tif_decoderow = ThunderDecodeRow;
- tif->tif_decodestrip = ThunderDecodeRow;
- return (1);
Index: patches/patch-man_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-man_Makefile_in,v
retrieving revision 1.8
diff -u -p -r1.8 patch-man_Makefile_in
--- patches/patch-man_Makefile_in 30 Jun 2010 17:10:08 -0000 1.8
+++ patches/patch-man_Makefile_in 26 Apr 2011 10:16:40 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-man_Makefile_in,v 1.8 20
Replace .3tiff man page suffix with standard .3
---- man/Makefile.in.orig Tue Jun 15 20:58:54 2010
-+++ man/Makefile.in Sat Jun 26 23:53:39 2010
-@@ -406,7 +406,7 @@ install-man3: $(dist_man3_MANS)
+--- man/Makefile.in.orig Sat Apr 9 22:00:49 2011
++++ man/Makefile.in Thu Apr 21 15:35:54 2011
+@@ -403,7 +403,7 @@ install-man3: $(dist_man3_MANS)
if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; echo "$$p"; \
done | \
Index: patches/patch-test_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-test_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-test_Makefile_in
--- patches/patch-test_Makefile_in 30 Jun 2010 17:10:08 -0000 1.1
+++ patches/patch-test_Makefile_in 26 Apr 2011 10:16:40 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-test_Makefile_in,v 1.1 2
Avoid picking up an old libtiff in ${LOCALBASE}.
---- test/Makefile.in.orig Sun Jun 27 20:39:16 2010
-+++ test/Makefile.in Sun Jun 27 20:39:35 2010
-@@ -252,10 +252,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- test/Makefile.in.orig Sat Apr 9 22:00:49 2011
++++ test/Makefile.in Thu Apr 21 15:35:54 2011
+@@ -251,10 +251,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
Index: patches/patch-tools_Makefile_in
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-tools_Makefile_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-tools_Makefile_in
--- patches/patch-tools_Makefile_in 30 Jun 2010 17:10:08 -0000 1.7
+++ patches/patch-tools_Makefile_in 26 Apr 2011 10:16:40 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-tools_Makefile_in,v 1.7
Avoid picking up an old libtiff in ${LOCALBASE}.
---- tools/Makefile.in.orig Tue Jun 15 20:58:54 2010
-+++ tools/Makefile.in Sun Jun 27 05:21:10 2010
-@@ -266,10 +266,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+--- tools/Makefile.in.orig Sat Apr 9 22:00:49 2011
++++ tools/Makefile.in Thu Apr 21 15:35:54 2011
+@@ -265,10 +265,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
Index: patches/patch-tools_fax2ps_c
===================================================================
RCS file: patches/patch-tools_fax2ps_c
diff -N patches/patch-tools_fax2ps_c
--- patches/patch-tools_fax2ps_c 30 Jun 2010 17:10:08 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-tools_fax2ps_c,v 1.6 2010/06/30 17:10:08 naddy Exp $
---- tools/fax2ps.c.orig Thu Apr 20 14:36:23 2006
-+++ tools/fax2ps.c Sun Oct 11 15:42:29 2009
-@@ -377,11 +377,12 @@ main(int argc, char** argv)
- int n;
- FILE* fd;
- char buf[16*1024];
-+ char temp[22];
-
-- fd = tmpfile();
-+ strlcpy(temp, "/tmp/fax2psXXXXXXXXXX", sizeof(temp));
-+ fd = fdopen(mkstemp(temp), "w+");
- if (fd == NULL) {
-- fprintf(stderr, "Could not create temporary file, exiting.\n");
-- fclose(fd);
-+ fprintf(stderr, "Could not create temporary file \"%s\".\n", temp);
- exit(-2);
- }
- #if defined(HAVE_SETMODE) && defined(O_BINARY)
Index: patches/patch-tools_tiff2pdf_c
===================================================================
RCS file: /cvs/ports/graphics/tiff/patches/patch-tools_tiff2pdf_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-tools_tiff2pdf_c
--- patches/patch-tools_tiff2pdf_c 30 Jun 2010 17:10:08 -0000 1.3
+++ patches/patch-tools_tiff2pdf_c 26 Apr 2011 10:16:40 -0000
@@ -1,52 +1,7 @@
$OpenBSD: patch-tools_tiff2pdf_c,v 1.3 2010/06/30 17:10:08 naddy Exp $
---- tools/tiff2pdf.c.orig Sun Jun 13 22:51:44 2010
-+++ tools/tiff2pdf.c Sat Jun 26 23:53:39 2010
-@@ -661,7 +661,7 @@ int main(int argc, char** argv){
- _TIFFmalloc(strlen(optarg) + 1);
- if(t2p->pdf_creator==NULL){
- TIFFError(TIFF2PDF_MODULE,
-- "Can't allocate %u bytes of memory for main",
-+ "Can't allocate %lu bytes of memory for main",
- strlen(optarg) + 1);
- goto fail;
- }
-@@ -674,7 +674,7 @@ int main(int argc, char** argv){
- if(t2p->pdf_author==NULL){
- TIFFError(
- TIFF2PDF_MODULE,
-- "Can't allocate %u bytes of memory for main",
-+ "Can't allocate %lu bytes of memory for main",
- strlen(optarg) + 1);
- goto fail;
- }
-@@ -687,7 +687,7 @@ int main(int argc, char** argv){
- if(t2p->pdf_title==NULL){
- TIFFError(
- TIFF2PDF_MODULE,
-- "Can't allocate %u bytes of memory for main",
-+ "Can't allocate %lu bytes of memory for main",
- strlen(optarg) + 1);
- goto fail;
- }
-@@ -700,7 +700,7 @@ int main(int argc, char** argv){
- if(t2p->pdf_subject==NULL){
- TIFFError(
- TIFF2PDF_MODULE,
-- "Can't allocate %u bytes of memory for main",
-+ "Can't allocate %lu bytes of memory for main",
- strlen(optarg)+1);
- goto fail;
- }
-@@ -713,7 +713,7 @@ int main(int argc, char** argv){
- if(t2p->pdf_keywords==NULL){
- TIFFError(
- TIFF2PDF_MODULE,
-- "Can't allocate %u bytes of memory for main",
-+ "Can't allocate %lu bytes of memory for main",
- strlen(optarg) + 1);
- goto fail;
- }
-@@ -929,7 +929,7 @@ T2P* t2p_init(){
+--- tools/tiff2pdf.c.orig Tue Dec 14 02:45:51 2010
++++ tools/tiff2pdf.c Thu Apr 21 15:35:54 2011
+@@ -895,7 +895,7 @@ T2P* t2p_init()
if(t2p==NULL){
TIFFError(
TIFF2PDF_MODULE,
@@ -55,7 +10,7 @@ $OpenBSD: patch-tools_tiff2pdf_c,v 1.3 2
sizeof(T2P));
return( (T2P*) NULL );
}
-@@ -1063,7 +1063,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+@@ -1008,7 +1008,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
if(t2p->tiff_pages==NULL){
TIFFError(
TIFF2PDF_MODULE,
@@ -64,7 +19,7 @@ $OpenBSD: patch-tools_tiff2pdf_c,v 1.3 2
directorycount * sizeof(T2P_PAGE),
TIFFFileName(input));
t2p->t2p_error = T2P_ERR_ERROR;
-@@ -1074,7 +1074,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+@@ -1019,7 +1019,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
if(t2p->tiff_tiles==NULL){
TIFFError(
TIFF2PDF_MODULE,
@@ -73,7 +28,7 @@ $OpenBSD: patch-tools_tiff2pdf_c,v 1.3 2
directorycount * sizeof(T2P_TILES),
TIFFFileName(input));
t2p->t2p_error = T2P_ERR_ERROR;
-@@ -1206,7 +1206,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
+@@ -1151,7 +1151,7 @@ void t2p_read_tiff_init(T2P* t2p, TIFF* input){
if( t2p->tiff_tiles[i].tiles_tiles == NULL){
TIFFError(
TIFF2PDF_MODULE,
@@ -82,7 +37,7 @@ $OpenBSD: patch-tools_tiff2pdf_c,v 1.3 2
t2p->tiff_tiles[i].tiles_tilecount *
sizeof(T2P_TILE),
TIFFFileName(input));
t2p->t2p_error = T2P_ERR_ERROR;
-@@ -5246,7 +5246,7 @@ tsize_t t2p_write_pdf(T2P* t2p, TIFF* input, TIFF* out
+@@ -5143,7 +5143,7 @@ tsize_t t2p_write_pdf(T2P* t2p, TIFF* input, TIFF* out
if(t2p->pdf_xrefoffsets==NULL){
TIFFError(
TIFF2PDF_MODULE,
