CVS commit: pkgsrc/print/podofo

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Tue Jan 17 14:01:57 UTC 2023

Modified Files:
        pkgsrc/print/podofo: Makefile PLIST distinfo
Added Files:
        pkgsrc/print/podofo/patches: patch-src_podofo_CMakeLists.txt
            patch-src_podofo_base_PdfMemoryManagement.cpp
            patch-src_podofo_doc_PdfImage.cpp
Removed Files:
        pkgsrc/print/podofo/patches: patch-src_CMakeLists.txt
            patch-src_base_PdfMemoryManagement.cpp patch-src_doc_PdfImage.cpp
            patch-test_TokenizerTest_CMakeLists.txt

Log Message:
Update print/podofo to version 0.9.8
Fixes many CVE.

Note upstream pushed their src/ contents to src/podofo so patches
had to move that didn't otherwise change.

upstream changelog:

  PoDoFo 0.9.8 released - last release on current code base

  May 3rd 2022

  The PoDoFo developers are happy to announce the release of PoDoFo 0.9.8.
  This release contains over 25 patches submitted by various contributors
  (see SVN Log for details). We encourage all users to upgrade to this
  release.

  Also, this will be the final release of PoDoFo based on the current
  codebase.
  After the release we plan to introduce two major changes to PoDoFo
  development.

  First of all, we will lock/close the current SVN trunk and switch PoDoFo
  development to a more modern development platform, where we can leverage
  state of the art development features such as Continuous Integration or
  Pull Requests. The mailing list and webpage will stay on SourceForge
  as well as the issue tracker. Still, we will open a new issue tracker
  for the new development environment and gradually migrate open issues.
  We will share more news on this, once the new development environment
  was set up.

  Secondly and most importantly, we will replace the current codebase
  of PoDoFo with the amazing work Francesco Pretto has done with pdfmm.
  pdfmm is based on PoDoFo but with an improved and reworked API based
  on C++17 which we consider more suitable for future development of PoDoFo.
  After rebasing PoDoFo on pdfmm, we plan to release PoDoFo 1.0.0.

  Please note, PoDoFo 1.0.0 will be API incompatible (binary and in
  source code) with PoDoFo 0.9.8. We expect migration steps to be necessary.
  PoDoFo Tools are currently being ported to pdfmm as a showcase for
  the migration.

  PoDoFo 0.9.7 released

  January 9th 2021

  PoDoFo 0.9.7 was released today, after over 2 year of development
  and with the help of many new contributors.

  As there are so many improvements, patches and fixes that made it
  into this release, we are not able to list them, so please stick with
  the svn log.

  This release also includes a release of podofobrowser which was
  ported to Qt5.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/print/podofo/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/print/podofo/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/print/podofo/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/print/podofo/patches/patch-src_CMakeLists.txt \
    pkgsrc/print/podofo/patches/patch-test_TokenizerTest_CMakeLists.txt
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/print/podofo/patches/patch-src_base_PdfMemoryManagement.cpp
cvs rdiff -u -r1.3 -r0 pkgsrc/print/podofo/patches/patch-src_doc_PdfImage.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/print/podofo/patches/patch-src_podofo_CMakeLists.txt \
    pkgsrc/print/podofo/patches/patch-src_podofo_base_PdfMemoryManagement.cpp \
    pkgsrc/print/podofo/patches/patch-src_podofo_doc_PdfImage.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/print/podofo/Makefile
diff -u pkgsrc/print/podofo/Makefile:1.39 pkgsrc/print/podofo/Makefile:1.40
--- pkgsrc/print/podofo/Makefile:1.39   Tue Jan  3 17:36:31 2023
+++ pkgsrc/print/podofo/Makefile        Tue Jan 17 14:01:57 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2023/01/03 17:36:31 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2023/01/17 14:01:57 spz Exp $
 
-DISTNAME=      podofo-0.9.6
-PKGREVISION=   5
+DISTNAME=      podofo-0.9.8
+#PKGREVISION=  0
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=podofo/}
 

Index: pkgsrc/print/podofo/PLIST
diff -u pkgsrc/print/podofo/PLIST:1.5 pkgsrc/print/podofo/PLIST:1.6
--- pkgsrc/print/podofo/PLIST:1.5       Sat Feb 11 22:27:00 2017
+++ pkgsrc/print/podofo/PLIST   Tue Jan 17 14:01:57 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/02/11 22:27:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2023/01/17 14:01:57 spz Exp $
 bin/podofobox
 bin/podofocolor
 bin/podofocountpages
@@ -10,6 +10,7 @@ bin/podofoimgextract
 bin/podofoimpose
 bin/podofoincrementalupdates
 bin/podofomerge
+bin/podofonooc
 bin/podofopages
 bin/podofopdfinfo
 bin/podofosign
@@ -49,6 +50,7 @@ include/podofo/base/PdfObject.h
 include/podofo/base/PdfObjectStreamParserObject.h
 include/podofo/base/PdfOutputDevice.h
 include/podofo/base/PdfOutputStream.h
+include/podofo/base/PdfOwnedDataType.h
 include/podofo/base/PdfParser.h
 include/podofo/base/PdfParserObject.h
 include/podofo/base/PdfRect.h
@@ -126,7 +128,7 @@ include/podofo/podofo.h
 lib/libpodofo.a
 lib/libpodofo.so
 lib/libpodofo.so.${PKGVERSION}
-lib/pkgconfig/libpodofo-0.pc
+lib/pkgconfig/libpodofo.pc
 man/man1/podofobox.1
 man/man1/podofocolor.1
 man/man1/podofocountpages.1

Index: pkgsrc/print/podofo/distinfo
diff -u pkgsrc/print/podofo/distinfo:1.23 pkgsrc/print/podofo/distinfo:1.24
--- pkgsrc/print/podofo/distinfo:1.23   Tue Oct 26 11:12:13 2021
+++ pkgsrc/print/podofo/distinfo        Tue Jan 17 14:01:57 2023
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 11:12:13 nia Exp $
+$NetBSD: distinfo,v 1.24 2023/01/17 14:01:57 spz Exp $
 
-BLAKE2s (podofo-0.9.6.tar.gz) = 4d56bd684ef53114d2b5a0c23fccf55aeedf930d25d3c88c08803e2e75edd92d
-SHA512 (podofo-0.9.6.tar.gz) = 35c1a457758768bdadc93632385f6b9214824fead279f1b85420443fb2135837cefca9ced476df0d47066f060e9150e12fcd40f60fa1606b177da433feb20130
-Size (podofo-0.9.6.tar.gz) = 995898 bytes
+BLAKE2s (podofo-0.9.8.tar.gz) = 16c57b22a80fa29abbd4cf34895efc9cd4e549ac4590234363652a60d48ec50c
+SHA512 (podofo-0.9.8.tar.gz) = b220322114450f1656c73d325f5172bc4cec0b1913e98b4eb2455f8ed7394bcaa47438d41003c9678937ef44d411e135431ddd6784f83d3663337d471baa02b1
+Size (podofo-0.9.8.tar.gz) = 1012918 bytes
 SHA1 (patch-CMakeLists.txt) = cb576aaf2e6ebe875818aefbba8d83c4ddbae7e4
 SHA1 (patch-cmake_modules_FindFREETYPE.cmake) = 755d6d7ad73dea490479b90299728129bb1b0795
-SHA1 (patch-src_CMakeLists.txt) = eb44b1ba06a850340a7fb2de42ac982336cb04cd
-SHA1 (patch-src_base_PdfMemoryManagement.cpp) = 9303daf1e471106d9d22e42230db650dba5f1006
-SHA1 (patch-src_doc_PdfImage.cpp) = 844250a772d40ba3ea2322ea623990b87b27c664
+SHA1 (patch-src_podofo_CMakeLists.txt) = 9a75d0ce18f331b02bcd74a2935d36e0de701266
+SHA1 (patch-src_podofo_base_PdfMemoryManagement.cpp) = ad5772c41f401b1a31caa37c4f05209f31899c87
+SHA1 (patch-src_podofo_doc_PdfImage.cpp) = e9ff858a56e14b6b19d2e9c5f043d9d905d998b3
 SHA1 (patch-test_CMakeLists.txt) = 846871dac995ff80544ad9096574eddd776e324f
-SHA1 (patch-test_TokenizerTest_CMakeLists.txt) = 588f0f26aa5c8d6a1d1e6119680b9ee7416781d6

Added files:

Index: pkgsrc/print/podofo/patches/patch-src_podofo_CMakeLists.txt
diff -u /dev/null pkgsrc/print/podofo/patches/patch-src_podofo_CMakeLists.txt:1.1
--- /dev/null   Tue Jan 17 14:01:57 2023
+++ pkgsrc/print/podofo/patches/patch-src_podofo_CMakeLists.txt Tue Jan 17 14:01:57 2023
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_podofo_CMakeLists.txt,v 1.1 2023/01/17 14:01:57 spz Exp $
+
+Inherit CMake requirement from the main CMakeLists.txt.
+
+--- src/podofo/CMakeLists.txt.orig     2018-03-11 11:42:20.000000000 +0000
++++ src/podofo/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+ 
+ IF(NOT PODOFO_MAIN_CMAKELISTS_READ)
+   MESSAGE(FATAL_ERROR "Run cmake on the CMakeLists.txt in the project root, not the one in the 'src' directory. You will need to delete CMakeCache.txt from the current directory.")
Index: pkgsrc/print/podofo/patches/patch-src_podofo_base_PdfMemoryManagement.cpp
diff -u /dev/null pkgsrc/print/podofo/patches/patch-src_podofo_base_PdfMemoryManagement.cpp:1.1
--- /dev/null   Tue Jan 17 14:01:57 2023
+++ pkgsrc/print/podofo/patches/patch-src_podofo_base_PdfMemoryManagement.cpp   Tue Jan 17 14:01:57 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_podofo_base_PdfMemoryManagement.cpp,v 1.1 2023/01/17 14:01:57 spz Exp $
+
+Make sure SIZE_MAX is defined.
+
+--- src/podofo/base/PdfMemoryManagement.cpp.orig       2017-01-29 12:26:55.000000000 +0000
++++ src/podofo/base/PdfMemoryManagement.cpp
+@@ -31,6 +31,9 @@
+  *   files in the program, then also delete it here.                       *
+  ***************************************************************************/
+ 
++#define __STDC_LIMIT_MACROS 1
++#include <stdint.h>
++
+ #include "PdfMemoryManagement.h"
+ #include "PdfDefines.h"
+ #include "PdfDefinesPrivate.h"
Index: pkgsrc/print/podofo/patches/patch-src_podofo_doc_PdfImage.cpp
diff -u /dev/null pkgsrc/print/podofo/patches/patch-src_podofo_doc_PdfImage.cpp:1.1
--- /dev/null   Tue Jan 17 14:01:57 2023
+++ pkgsrc/print/podofo/patches/patch-src_podofo_doc_PdfImage.cpp       Tue Jan 17 14:01:57 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_podofo_doc_PdfImage.cpp,v 1.1 2023/01/17 14:01:57 spz Exp $
+
+Recognize TIFF images with alpha channel when using the photometric
+colour tag.
+
+--- src/podofo/doc/PdfImage.cpp.orig   2016-05-15 19:06:35.000000000 +0000
++++ src/podofo/doc/PdfImage.cpp
+@@ -589,7 +589,7 @@ void PdfImage::LoadFromTiffHandle(void* 
+             break;
+             
+         case PHOTOMETRIC_RGB:
+-            if ( bitsPixel != 24 )
++            if ( bitsPixel != 24 && bitsPixel != 32 )
+             {
+                 TIFFClose(hInTiffHandle);
+                 PODOFO_RAISE_ERROR( ePdfError_UnsupportedImageFormat );