September 2016 - crux-commits

ports/compat-32 (3.2): dbus-32: 1.10.8 -> 1.10.10
by crux＠crux.nu 04 Sep '16

04 Sep '16

commit 728ff8df103a6ce526011428267575d6007a6a2a Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sun Sep 4 17:51:56 2016 +1000 dbus-32: 1.10.8 -> 1.10.10 diff --git a/dbus-32/.footprint b/dbus-32/.footprint index e605c9d..dfdfdb7 100644 --- a/dbus-32/.footprint +++ b/dbus-32/.footprint @@ -8,8 +8,8 @@ drwxr-xr-x root/root usr/lib32/dbus/ -rwsr-x--- root/messagebus usr/lib32/dbus/dbus-daemon-launch-helper -rw-r--r-- root/root usr/lib32/libdbus-1.a -rwxr-xr-x root/root usr/lib32/libdbus-1.la -lrwxrwxrwx root/root usr/lib32/libdbus-1.so -> libdbus-1.so.3.14.6 -lrwxrwxrwx root/root usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.14.6 --rwxr-xr-x root/root usr/lib32/libdbus-1.so.3.14.6 +lrwxrwxrwx root/root usr/lib32/libdbus-1.so -> libdbus-1.so.3.14.7 +lrwxrwxrwx root/root usr/lib32/libdbus-1.so.3 -> libdbus-1.so.3.14.7 +-rwxr-xr-x root/root usr/lib32/libdbus-1.so.3.14.7 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/dbus-1.pc diff --git a/dbus-32/.md5sum b/dbus-32/.md5sum index f0fcfd5..778d45a 100644 --- a/dbus-32/.md5sum +++ b/dbus-32/.md5sum @@ -1 +1 @@ -e912e930f249454752512aa7ac864d43 dbus-1.10.8.tar.gz +495676d240eb982921b3ad1343526849 dbus-1.10.10.tar.gz diff --git a/dbus-32/Pkgfile b/dbus-32/Pkgfile index da6dc71..96e715b 100644 --- a/dbus-32/Pkgfile +++ b/dbus-32/Pkgfile @@ -4,7 +4,7 @@ # Depends on: expat-32 dbus name=dbus-32 -version=1.10.8 +version=1.10.10 release=1 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$version.tar.gz)

1 0

ports/opt (3.2): cups-filters: update to 1.11.2
by crux＠crux.nu 03 Sep '16

03 Sep '16

commit 767d7e45a6d37be25351d1ff3de112e049dad0fd Author: Juergen Daubert <jue(a)jue.li> Date: Sat Sep 3 18:17:37 2016 +0200 cups-filters: update to 1.11.2 diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum index 66baa62..73057bd 100644 --- a/cups-filters/.md5sum +++ b/cups-filters/.md5sum @@ -1,2 +1,2 @@ 7540a6989be0042429f41770b1cdf215 cups-browsed -1c2397093639aa728e4ba866bbdc440c cups-filters-1.11.1.tar.xz +019d2161df59da33d93b294d934bc14b cups-filters-1.11.2.tar.xz diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile index f3fdb63..295bcc1 100644 --- a/cups-filters/Pkgfile +++ b/cups-filters/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cups ghostscript poppler qpdf name=cups-filters -version=1.11.1 +version=1.11.2 release=1 source=(http://www.openprinting.org/download/$name/$name-$version.tar.xz cups-browsed)

1 0

ports/opt (3.2): hpcups: update to 3.16.8
by crux＠crux.nu 03 Sep '16

03 Sep '16

commit da5c3befdff0fbbd2819e13b5bfc784ea62e19f3 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Sep 3 18:17:00 2016 +0200 hpcups: update to 3.16.8 diff --git a/hpcups/.md5sum b/hpcups/.md5sum index fcf759a..cca660a 100644 --- a/hpcups/.md5sum +++ b/hpcups/.md5sum @@ -1 +1 @@ -d4982fd71549f45856b5ad76e1ae8809 hplip-3.16.7.tar.gz +3e62c8ce740a4b40e1bf9ab1440f3ad5 hplip-3.16.8.tar.gz diff --git a/hpcups/Pkgfile b/hpcups/Pkgfile index bacfde7..5c84a12 100644 --- a/hpcups/Pkgfile +++ b/hpcups/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cups name=hpcups -version=3.16.7 +version=3.16.8 release=1 source=(http://downloads.sourceforge.net/project/hplip/hplip/$version/hplip… @@ -20,5 +20,5 @@ build () { make make DESTDIR=$PKG install - rm -r $PKG/usr/share/{hplip,doc} $PKG/usr/bin + rm -r $PKG/usr/share/doc }

1 0

ports/opt (3.2): nano: update to 2.7.0
by crux＠crux.nu 03 Sep '16

03 Sep '16

commit 699b220729263de22546ec6feb93eb41a3381e8e Author: Juergen Daubert <jue(a)jue.li> Date: Sat Sep 3 18:16:13 2016 +0200 nano: update to 2.7.0 diff --git a/nano/.md5sum b/nano/.md5sum index c79c27c..84ae8aa 100644 --- a/nano/.md5sum +++ b/nano/.md5sum @@ -1 +1 @@ -b82fe6f019f9bc8e069c5c021096e280 nano-2.6.3.tar.xz +1f9e8e97002b318ec6cd0f5364c5d343 nano-2.7.0.tar.xz diff --git a/nano/Pkgfile b/nano/Pkgfile index 2043e72..371f726 100644 --- a/nano/Pkgfile +++ b/nano/Pkgfile @@ -5,9 +5,9 @@ # Depends on: file ncurses name=nano -version=2.6.3 +version=2.7.0 release=1 -source=(http://www.nano-editor.org/dist/v2.6/$name-$version.tar.xz) +source=(http://www.nano-editor.org/dist/v2.7/$name-$version.tar.xz) build(){ cd $name-$version

1 0

ports/contrib (3.2): cython: update footprint
by crux＠crux.nu 03 Sep '16

03 Sep '16

commit f694acbe67182c054ad6fc04888bf6fde9ea3c52 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Sep 3 12:50:37 2016 +1000 cython: update footprint diff --git a/cython/.footprint b/cython/.footprint index 303b16a..0e460b9 100644 --- a/cython/.footprint +++ b/cython/.footprint @@ -6,13 +6,13 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python2.7/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/ -drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython-0.21.2-py2.7.egg-info/ --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.21.2-py2.7.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.21.2-py2.7.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.21.2-py2.7.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.21.2-py2.7.egg-info/entry_points.txt --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.21.2-py2.7.egg-info/not-zip-safe --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.21.2-py2.7.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython-0.24.1-py2.7.egg-info/ +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.24.1-py2.7.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.24.1-py2.7.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.24.1-py2.7.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.24.1-py2.7.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.24.1-py2.7.egg-info/not-zip-safe +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython-0.24.1-py2.7.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Build/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Build/BuildExecutable.py @@ -114,6 +114,12 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Compiler/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestBuffer.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestBuffer.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestCmdLine.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestCmdLine.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestFlowControl.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestFlowControl.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestGrammar.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestGrammar.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestMemView.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestMemView.pyc -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/TestParseTreeTransforms.py @@ -150,6 +156,8 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Compiler/Tests/ -rwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Compiler/Visitor.so -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Compiler/__init__.pyc +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Coverage.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Coverage.pyc drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Debugger/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Debugger/Cygdb.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Debugger/Cygdb.pyc @@ -280,8 +288,11 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/ -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/cast.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/complex.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/deque.pxd +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/iterator.pxd +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/limits.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/list.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/map.pxd +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/memory.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/pair.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/queue.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/libcpp/set.pxd @@ -297,13 +308,17 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Includes/numpy/ -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/openmp.pxd drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/ -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/__init__.pxd +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/dlfcn.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/fcntl.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/ioctl.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/mman.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/resource.pxd +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/select.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/signal.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/stat.pxd +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/stdio.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/stdlib.pxd +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/strings.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/time.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/types.pxd -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Includes/posix/unistd.pxd @@ -370,8 +385,12 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Tests/ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Utility/ -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/Buffer.c -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/Builtins.c +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/CConvert.pyx +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/CMath.c -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/Capsule.c -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/CommonTypes.c +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/Coroutine.c +-rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/CpdefEnums.pyx -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/CppConvert.pyx -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/CppSupport.cpp -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/CythonFunction.c @@ -379,7 +398,6 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Utility/ -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/Exceptions.c -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/ExtensionTypes.c -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/FunctionArguments.c --rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/Generator.c -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/ImportExport.c -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/MemoryView.pyx -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/MemoryView_C.c @@ -394,7 +412,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/Cython/Utility/ -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/TestCythonScope.pyx -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/TestUtilityLoader.c -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/TypeConversion.c --rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/__init__.py (EMPTY) +-rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/__init__.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/__init__.pyc -rw-rw-r-- root/root usr/lib/python2.7/site-packages/Cython/Utility/arrayarray.h -rw-r--r-- root/root usr/lib/python2.7/site-packages/Cython/Utils.py

1 0

ports/opt (3.2): libpng: updated apng patch
by crux＠crux.nu 01 Sep '16

01 Sep '16

commit d88011e36af0a97284be03faf2816a800966d275 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Thu Sep 1 18:05:51 2016 +0200 libpng: updated apng patch diff --git a/libpng/.md5sum b/libpng/.md5sum index 26d5a9f..d8d0210 100644 --- a/libpng/.md5sum +++ b/libpng/.md5sum @@ -1,2 +1,2 @@ 0cb72ef57a576bfed1b6cb4b5a09b554 libpng-1.6.25.tar.xz -c49ff77efebb8ab3dd8c10469e162d94 libpng-apng.patch +312fa4f13c14fded81ab6e9c5cb0055b libpng-apng.patch diff --git a/libpng/Pkgfile b/libpng/Pkgfile index 64d9763..eaf25c6 100644 --- a/libpng/Pkgfile +++ b/libpng/Pkgfile @@ -11,7 +11,7 @@ source=(http://download.sourceforge.net/$name/$name-$version.tar.xz \ build() { cd $name-$version - patch -p1 -i $SRC/$name-apng.patch + patch -p0 -i $SRC/$name-apng.patch ./configure --prefix=/usr make diff --git a/libpng/libpng-apng.patch b/libpng/libpng-apng.patch index 74d0cad..1794853 100644 --- a/libpng/libpng-apng.patch +++ b/libpng/libpng-apng.patch @@ -1,147 +1,129 @@ -diff -Naru libpng-1.6.23.org/png.h libpng-1.6.23/png.h ---- libpng-1.6.23.org/png.h 2016-06-09 22:23:09.753041866 +0900 -+++ libpng-1.6.23/png.h 2016-06-09 22:23:39.282106366 +0900 -@@ -366,6 +366,10 @@ - # include "pnglibconf.h" - #endif +Index: LICENSE +=================================================================== +--- LICENSE ++++ LICENSE +@@ -8,6 +8,12 @@ + If you modify libpng you may insert additional notices immediately following + this sentence. -+#define PNG_APNG_SUPPORTED -+#define PNG_READ_APNG_SUPPORTED -+#define PNG_WRITE_APNG_SUPPORTED ++This modified version of libpng code adds animated PNG support and is ++released under the libpng license described below. The modifications are ++Copyright (c) 2006-2007 Andrew Smith, Copyright (c) 2008-2016 Max Stepin, ++and are delimited by "#ifdef PNG_APNG_SUPPORTED / #endif" directives ++surrounding them in the modified libpng source files. + - #ifndef PNG_VERSION_INFO_ONLY - /* Machine specific configuration. */ - # include "pngconf.h" -@@ -461,6 +465,17 @@ - * See pngconf.h for base types that vary by machine/system - */ + This code is released under the libpng license. -+#ifdef PNG_APNG_SUPPORTED -+/* dispose_op flags from inside fcTL */ -+#define PNG_DISPOSE_OP_NONE 0x00 -+#define PNG_DISPOSE_OP_BACKGROUND 0x01 -+#define PNG_DISPOSE_OP_PREVIOUS 0x02 -+ -+/* blend_op flags from inside fcTL */ -+#define PNG_BLEND_OP_SOURCE 0x00 -+#define PNG_BLEND_OP_OVER 0x01 -+#endif /* PNG_APNG_SUPPORTED */ -+ - /* This triggers a compiler error in png.c, if png.c and png.h - * do not agree upon the version number. - */ -@@ -781,6 +796,10 @@ - #define PNG_INFO_sPLT 0x2000U /* ESR, 1.0.6 */ - #define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */ - #define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */ -+#ifdef PNG_APNG_SUPPORTED -+#define PNG_INFO_acTL 0x10000 -+#define PNG_INFO_fcTL 0x20000 + libpng versions 1.0.7, July 1, 2000 through 1.6.25, September 1, 2016 are +Index: pngread.c +=================================================================== +--- pngread.c ++++ pngread.c +@@ -161,6 +161,9 @@ + + else if (chunk_name == png_IDAT) + { ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_have_info(png_ptr, info_ptr); +#endif + png_ptr->idat_size = length; + break; + } +@@ -250,6 +253,17 @@ + png_handle_iTXt(png_ptr, info_ptr, length); + #endif - /* This is used for the transformation routines, as some of them - * change these values for the row. It also should enable using -@@ -818,6 +837,10 @@ - #ifdef PNG_PROGRESSIVE_READ_SUPPORTED - typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop)); - typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop)); -+#ifdef PNG_APNG_SUPPORTED -+typedef PNG_CALLBACK(void, *png_progressive_frame_ptr, (png_structp, -+ png_uint_32)); ++#ifdef PNG_READ_APNG_SUPPORTED ++ else if (chunk_name == png_acTL) ++ png_handle_acTL(png_ptr, info_ptr, length); ++ ++ else if (chunk_name == png_fcTL) ++ png_handle_fcTL(png_ptr, info_ptr, length); ++ ++ else if (chunk_name == png_fdAT) ++ png_handle_fdAT(png_ptr, info_ptr, length); +#endif ++ + else + png_handle_unknown(png_ptr, info_ptr, length, + PNG_HANDLE_CHUNK_AS_DEFAULT); +@@ -257,6 +271,72 @@ + } + #endif /* SEQUENTIAL_READ */ - /* The following callback receives png_uint_32 row_number, int pass for the - * png_bytep data of the row. When transforming an interlaced image the -@@ -3236,6 +3259,74 @@ - /******************************************************************************* - * END OF HARDWARE AND SOFTWARE OPTIONS - ******************************************************************************/ -+#ifdef PNG_APNG_SUPPORTED -+PNG_EXPORT(246, png_uint_32, png_get_acTL, (png_structp png_ptr, -+ png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays)); ++#ifdef PNG_READ_APNG_SUPPORTED ++void PNGAPI ++png_read_frame_head(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */ + -+PNG_EXPORT(247, png_uint_32, png_set_acTL, (png_structp png_ptr, -+ png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays)); ++ png_debug(0, "Reading frame head"); + -+PNG_EXPORT(248, png_uint_32, png_get_num_frames, (png_structp png_ptr, -+ png_infop info_ptr)); ++ if ((png_ptr->mode & PNG_HAVE_acTL) == 0) ++ png_error(png_ptr, "attempt to png_read_frame_head() but " ++ "no acTL present"); + -+PNG_EXPORT(249, png_uint_32, png_get_num_plays, (png_structp png_ptr, -+ png_infop info_ptr)); ++ /* do nothing for the main IDAT */ ++ if (png_ptr->num_frames_read == 0) ++ return; + -+PNG_EXPORT(250, png_uint_32, png_get_next_frame_fcTL, -+ (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, -+ png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, -+ png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op, -+ png_byte *blend_op)); ++ png_read_reset(png_ptr); ++ png_ptr->flags &= ~PNG_FLAG_ROW_INIT; ++ png_ptr->mode &= ~PNG_HAVE_fcTL; + -+PNG_EXPORT(251, png_uint_32, png_set_next_frame_fcTL, -+ (png_structp png_ptr, png_infop info_ptr, png_uint_32 width, -+ png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, -+ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, -+ png_byte blend_op)); ++ have_chunk_after_DAT = 0; ++ for (;;) ++ { ++ png_uint_32 length = png_read_chunk_header(png_ptr); + -+PNG_EXPORT(252, png_uint_32, png_get_next_frame_width, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(253, png_uint_32, png_get_next_frame_height, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(254, png_uint_32, png_get_next_frame_x_offset, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(255, png_uint_32, png_get_next_frame_y_offset, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_num, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(257, png_uint_16, png_get_next_frame_delay_den, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(258, png_byte, png_get_next_frame_dispose_op, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(259, png_byte, png_get_next_frame_blend_op, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(260, png_byte, png_get_first_frame_is_hidden, -+ (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(261, png_uint_32, png_set_first_frame_is_hidden, -+ (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); ++ if (png_ptr->chunk_name == png_IDAT) ++ { ++ /* discard trailing IDATs for the first frame */ ++ if (have_chunk_after_DAT != 0 || png_ptr->num_frames_read > 1) ++ png_error(png_ptr, "png_read_frame_head(): out of place IDAT"); ++ png_crc_finish(png_ptr, length); ++ } + -+#ifdef PNG_READ_APNG_SUPPORTED -+PNG_EXPORT(262, void, png_read_frame_head, (png_structp png_ptr, -+ png_infop info_ptr)); -+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+PNG_EXPORT(263, void, png_set_progressive_frame_fn, (png_structp png_ptr, -+ png_progressive_frame_ptr frame_info_fn, -+ png_progressive_frame_ptr frame_end_fn)); -+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ -+#endif /* PNG_READ_APNG_SUPPORTED */ ++ else if (png_ptr->chunk_name == png_fcTL) ++ { ++ png_handle_fcTL(png_ptr, info_ptr, length); ++ have_chunk_after_DAT = 1; ++ } + -+#ifdef PNG_WRITE_APNG_SUPPORTED -+PNG_EXPORT(264, void, png_write_frame_head, (png_structp png_ptr, -+ png_infop info_ptr, png_bytepp row_pointers, -+ png_uint_32 width, png_uint_32 height, -+ png_uint_32 x_offset, png_uint_32 y_offset, -+ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, -+ png_byte blend_op)); ++ else if (png_ptr->chunk_name == png_fdAT) ++ { ++ png_ensure_sequence_number(png_ptr, length); + -+PNG_EXPORT(265, void, png_write_frame_tail, (png_structp png_ptr, -+ png_infop info_ptr)); -+#endif /* PNG_WRITE_APNG_SUPPORTED */ -+#endif /* PNG_APNG_SUPPORTED */ - - /* Maintainer: Put new public prototypes here ^, in libpng.3, in project - * defs, and in scripts/symbols.def. -@@ -3245,7 +3336,11 @@ - * one to use is one more than this.) - */ - #ifdef PNG_EXPORT_LAST_ORDINAL -+#ifdef PNG_APNG_SUPPORTED -+ PNG_EXPORT_LAST_ORDINAL(265); -+#else - PNG_EXPORT_LAST_ORDINAL(245); -+#endif /* PNG_APNG_SUPPORTED */ - #endif - - #ifdef __cplusplus -diff -Naru libpng-1.6.23.org/pngget.c libpng-1.6.23/pngget.c ---- libpng-1.6.23.org/pngget.c 2016-06-09 22:21:54.199319849 +0900 -+++ libpng-1.6.23/pngget.c 2016-06-09 22:23:39.230104491 +0900 ++ /* discard trailing fdATs for frames other than the first */ ++ if (have_chunk_after_DAT == 0 && png_ptr->num_frames_read > 1) ++ png_crc_finish(png_ptr, length - 4); ++ else if(png_ptr->mode & PNG_HAVE_fcTL) ++ { ++ png_ptr->idat_size = length - 4; ++ png_ptr->mode |= PNG_HAVE_IDAT; ++ ++ break; ++ } ++ else ++ png_error(png_ptr, "png_read_frame_head(): out of place fdAT"); ++ } ++ else ++ { ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ png_crc_finish(png_ptr, length); ++ } ++ } ++} ++#endif /* READ_APNG */ ++ + /* Optional call to update the users info_ptr structure */ + void PNGAPI + png_read_update_info(png_structrp png_ptr, png_inforp info_ptr) +Index: pngget.c +=================================================================== +--- pngget.c ++++ pngget.c @@ -1216,4 +1216,166 @@ # endif #endif @@ -154,7 +136,7 @@ diff -Naru libpng-1.6.23.org/pngget.c libpng-1.6.23/pngget.c + png_debug1(1, "in %s retrieval function", "acTL"); + + if (png_ptr != NULL && info_ptr != NULL && -+ (info_ptr->valid & PNG_INFO_acTL) && ++ (info_ptr->valid & PNG_INFO_acTL) != 0 && + num_frames != NULL && num_plays != NULL) + { + *num_frames = info_ptr->num_frames; @@ -195,7 +177,7 @@ diff -Naru libpng-1.6.23.org/pngget.c libpng-1.6.23/pngget.c + png_debug1(1, "in %s retrieval function", "fcTL"); + + if (png_ptr != NULL && info_ptr != NULL && -+ (info_ptr->valid & PNG_INFO_fcTL) && ++ (info_ptr->valid & PNG_INFO_fcTL) != 0 && + width != NULL && height != NULL && + x_offset != NULL && y_offset != NULL && + delay_num != NULL && delay_den != NULL && @@ -307,352 +289,268 @@ diff -Naru libpng-1.6.23.org/pngget.c libpng-1.6.23/pngget.c + + return 0; +} -+#endif /* PNG_APNG_SUPPORTED */ ++#endif /* APNG */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.23.org/pnginfo.h libpng-1.6.23/pnginfo.h ---- libpng-1.6.23.org/pnginfo.h 2016-06-09 22:21:54.200319885 +0900 -+++ libpng-1.6.23/pnginfo.h 2016-06-09 22:23:39.230104491 +0900 -@@ -255,5 +255,18 @@ - png_bytepp row_pointers; /* the image bits */ +Index: png.c +=================================================================== +--- png.c ++++ png.c +@@ -775,17 +775,21 @@ + #else + # ifdef __STDC__ + return PNG_STRING_NEWLINE \ +- "libpng version 1.6.25 - September 1, 2016" PNG_STRING_NEWLINE \ ++ "libpng version 1.6.25+apng - September 1, 2016" PNG_STRING_NEWLINE \ + "Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson" \ + PNG_STRING_NEWLINE \ + "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ + "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ +- PNG_STRING_NEWLINE; ++ PNG_STRING_NEWLINE \ ++ "Portions Copyright (c) 2006-2007 Andrew Smith" PNG_STRING_NEWLINE \ ++ "Portions Copyright (c) 2008-2016 Max Stepin" PNG_STRING_NEWLINE ; + # else +- return "libpng version 1.6.25 - September 1, 2016\ ++ return "libpng version 1.6.25+apng - September 1, 2016\ + Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\ + Copyright (c) 1996-1997 Andreas Dilger\ +- Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; ++ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\ ++ Portions Copyright (c) 2006-2007 Andrew Smith\ ++ Portions Copyright (c) 2008-2016 Max Stepin"; + # endif #endif + } +Index: png.h +=================================================================== +--- png.h ++++ png.h +@@ -23,6 +23,12 @@ + * If you modify libpng you may insert additional notices immediately following + * this sentence. + * ++ * This modified version of libpng code adds animated PNG support and is ++ * released under the libpng license described below. The modifications are ++ * Copyright (c) 2006-2007 Andrew Smith, Copyright (c) 2008-2016 Max Stepin, ++ * and are delimited by "#ifdef PNG_APNG_SUPPORTED / #endif" directives ++ * surrounding them in the modified libpng source files. ++ * + * This code is released under the libpng license. + * + * Some files in the "contrib" directory and some configure-generated +@@ -314,8 +320,9 @@ + */ -+#ifdef PNG_APNG_SUPPORTED -+ png_uint_32 num_frames; /* including default image */ -+ png_uint_32 num_plays; -+ png_uint_32 next_frame_width; -+ png_uint_32 next_frame_height; -+ png_uint_32 next_frame_x_offset; -+ png_uint_32 next_frame_y_offset; -+ png_uint_16 next_frame_delay_num; -+ png_uint_16 next_frame_delay_den; -+ png_byte next_frame_dispose_op; -+ png_byte next_frame_blend_op; -+#endif -+ - }; - #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c ---- libpng-1.6.23.org/pngpread.c 2016-06-09 22:23:09.754041902 +0900 -+++ libpng-1.6.23/pngpread.c 2016-06-09 22:23:39.230104491 +0900 -@@ -194,6 +194,106 @@ + /* Version information for png.h - this should match the version in png.c */ +-#define PNG_LIBPNG_VER_STRING "1.6.25" +-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.25 - September 1, 2016\n" ++#define PNG_LIBPNG_VER_STRING "1.6.25+apng" ++#define PNG_HEADER_VERSION_STRING \ ++ " libpng version 1.6.25+apng - September 1, 2016\n" - chunk_name = png_ptr->chunk_name; + #define PNG_LIBPNG_VER_SONUM 16 + #define PNG_LIBPNG_VER_DLLNUM 16 +@@ -366,6 +373,10 @@ + # include "pnglibconf.h" + #endif -+#ifdef PNG_READ_APNG_SUPPORTED -+ if (png_ptr->num_frames_read > 0 && -+ png_ptr->num_frames_read < info_ptr->num_frames) -+ { -+ if (chunk_name == png_IDAT) -+ { -+ /* Discard trailing IDATs for the first frame */ -+ if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1) -+ png_error(png_ptr, "out of place IDAT"); -+ -+ if (png_ptr->push_length + 4 > png_ptr->buffer_size) -+ { -+ png_push_save_buffer(png_ptr); -+ return; -+ } -+ -+ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; -+ return; -+ } -+ else if (chunk_name == png_fdAT) -+ { -+ if (png_ptr->buffer_size < 4) -+ { -+ png_push_save_buffer(png_ptr); -+ return; -+ } -+ -+ png_ensure_sequence_number(png_ptr, 4); ++#define PNG_APNG_SUPPORTED ++#define PNG_READ_APNG_SUPPORTED ++#define PNG_WRITE_APNG_SUPPORTED + -+ if (!(png_ptr->mode & PNG_HAVE_fcTL)) -+ { -+ /* Discard trailing fdATs for frames other than the first */ -+ if (png_ptr->num_frames_read < 2) -+ png_error(png_ptr, "out of place fdAT"); + #ifndef PNG_VERSION_INFO_ONLY + /* Machine specific configuration. */ + # include "pngconf.h" +@@ -461,6 +472,17 @@ + * See pngconf.h for base types that vary by machine/system + */ + ++#ifdef PNG_APNG_SUPPORTED ++/* dispose_op flags from inside fcTL */ ++#define PNG_DISPOSE_OP_NONE 0x00 ++#define PNG_DISPOSE_OP_BACKGROUND 0x01 ++#define PNG_DISPOSE_OP_PREVIOUS 0x02 + -+ if (png_ptr->push_length + 4 > png_ptr->buffer_size) -+ { -+ png_push_save_buffer(png_ptr); -+ return; -+ } ++/* blend_op flags from inside fcTL */ ++#define PNG_BLEND_OP_SOURCE 0x00 ++#define PNG_BLEND_OP_OVER 0x01 ++#endif /* APNG */ + -+ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; -+ return; -+ } -+ -+ else -+ { -+ /* frame data follows */ -+ png_ptr->idat_size = png_ptr->push_length - 4; -+ png_ptr->mode |= PNG_HAVE_IDAT; -+ png_ptr->process_mode = PNG_READ_IDAT_MODE; -+ -+ return; -+ } -+ } -+ -+ else if (chunk_name == png_fcTL) -+ { -+ if (png_ptr->push_length + 4 > png_ptr->buffer_size) -+ { -+ png_push_save_buffer(png_ptr); -+ return; -+ } -+ -+ png_read_reset(png_ptr); -+ png_ptr->mode &= ~PNG_HAVE_fcTL; -+ -+ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); -+ -+ if (!(png_ptr->mode & PNG_HAVE_fcTL)) -+ png_error(png_ptr, "missing required fcTL chunk"); + /* This triggers a compiler error in png.c, if png.c and png.h + * do not agree upon the version number. + */ +@@ -781,6 +803,10 @@ + #define PNG_INFO_sPLT 0x2000U /* ESR, 1.0.6 */ + #define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */ + #define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */ ++#ifdef PNG_APNG_SUPPORTED ++#define PNG_INFO_acTL 0x10000U ++#define PNG_INFO_fcTL 0x20000U ++#endif + + /* This is used for the transformation routines, as some of them + * change these values for the row. It also should enable using +@@ -818,6 +844,10 @@ + #ifdef PNG_PROGRESSIVE_READ_SUPPORTED + typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop)); + typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop)); ++#ifdef PNG_APNG_SUPPORTED ++typedef PNG_CALLBACK(void, *png_progressive_frame_ptr, (png_structp, ++ png_uint_32)); ++#endif + + /* The following callback receives png_uint_32 row_number, int pass for the + * png_bytep data of the row. When transforming an interlaced image the +@@ -3246,6 +3276,75 @@ + * END OF HARDWARE AND SOFTWARE OPTIONS + ******************************************************************************/ + ++#ifdef PNG_APNG_SUPPORTED ++PNG_EXPORT(246, png_uint_32, png_get_acTL, (png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays)); + -+ png_read_reinit(png_ptr, info_ptr); -+ png_progressive_read_reset(png_ptr); ++PNG_EXPORT(247, png_uint_32, png_set_acTL, (png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays)); + -+ if (png_ptr->frame_info_fn != NULL) -+ (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read); ++PNG_EXPORT(248, png_uint_32, png_get_num_frames, (png_structp png_ptr, ++ png_infop info_ptr)); + -+ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++PNG_EXPORT(249, png_uint_32, png_get_num_plays, (png_structp png_ptr, ++ png_infop info_ptr)); + -+ return; -+ } ++PNG_EXPORT(250, png_uint_32, png_get_next_frame_fcTL, ++ (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, ++ png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset, ++ png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op, ++ png_byte *blend_op)); + -+ else -+ { -+ if (png_ptr->push_length + 4 > png_ptr->buffer_size) -+ { -+ png_push_save_buffer(png_ptr); -+ return; -+ } -+ png_warning(png_ptr, "Skipped (ignored) a chunk " -+ "between APNG chunks"); -+ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; -+ return; -+ } ++PNG_EXPORT(251, png_uint_32, png_set_next_frame_fcTL, ++ (png_structp png_ptr, png_infop info_ptr, png_uint_32 width, ++ png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op)); + -+ return; -+ } -+#endif /* PNG_READ_APNG_SUPPORTED */ ++PNG_EXPORT(252, png_uint_32, png_get_next_frame_width, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(253, png_uint_32, png_get_next_frame_height, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(254, png_uint_32, png_get_next_frame_x_offset, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(255, png_uint_32, png_get_next_frame_y_offset, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_num, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(257, png_uint_16, png_get_next_frame_delay_den, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(258, png_byte, png_get_next_frame_dispose_op, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(259, png_byte, png_get_next_frame_blend_op, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(260, png_byte, png_get_first_frame_is_hidden, ++ (png_structp png_ptr, png_infop info_ptr)); ++PNG_EXPORT(261, png_uint_32, png_set_first_frame_is_hidden, ++ (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); + - if (chunk_name == png_IDAT) - { - if ((png_ptr->mode & PNG_AFTER_IDAT) != 0) -@@ -260,6 +360,9 @@ - - else if (chunk_name == png_IDAT) - { -+#ifdef PNG_READ_APNG_SUPPORTED -+ png_have_info(png_ptr, info_ptr); -+#endif - png_ptr->idat_size = png_ptr->push_length; - png_ptr->process_mode = PNG_READ_IDAT_MODE; - png_push_have_info(png_ptr, info_ptr); -@@ -405,6 +508,30 @@ - png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); - } - #endif +#ifdef PNG_READ_APNG_SUPPORTED -+ else if (chunk_name == png_acTL) -+ { -+ if (png_ptr->push_length + 4 > png_ptr->buffer_size) -+ { -+ png_push_save_buffer(png_ptr); -+ return; -+ } -+ -+ png_handle_acTL(png_ptr, info_ptr, png_ptr->push_length); -+ } ++PNG_EXPORT(262, void, png_read_frame_head, (png_structp png_ptr, ++ png_infop info_ptr)); ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++PNG_EXPORT(263, void, png_set_progressive_frame_fn, (png_structp png_ptr, ++ png_progressive_frame_ptr frame_info_fn, ++ png_progressive_frame_ptr frame_end_fn)); ++#endif /* PROGRESSIVE_READ */ ++#endif /* READ_APNG */ + -+ else if (chunk_name == png_fcTL) -+ { -+ if (png_ptr->push_length + 4 > png_ptr->buffer_size) -+ { -+ png_push_save_buffer(png_ptr); -+ return; -+ } ++#ifdef PNG_WRITE_APNG_SUPPORTED ++PNG_EXPORT(264, void, png_write_frame_head, (png_structp png_ptr, ++ png_infop info_ptr, png_bytepp row_pointers, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op)); + -+ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); -+ } ++PNG_EXPORT(265, void, png_write_frame_tail, (png_structp png_ptr, ++ png_infop info_ptr)); ++#endif /* WRITE_APNG */ ++#endif /* APNG */ + -+#endif /* PNG_READ_APNG_SUPPORTED */ - - else - { -@@ -538,7 +665,11 @@ - png_byte chunk_tag[4]; - - /* TODO: this code can be commoned up with the same code in push_read */ -+#ifdef PNG_READ_APNG_SUPPORTED -+ PNG_PUSH_SAVE_BUFFER_IF_LT(12) + /* Maintainer: Put new public prototypes here ^, in libpng.3, in project + * defs, and in scripts/symbols.def. + */ +@@ -3254,7 +3353,11 @@ + * one to use is one more than this.) + */ + #ifdef PNG_EXPORT_LAST_ORDINAL ++#ifdef PNG_APNG_SUPPORTED ++ PNG_EXPORT_LAST_ORDINAL(265); +#else - PNG_PUSH_SAVE_BUFFER_IF_LT(8) -+#endif - png_push_fill_buffer(png_ptr, chunk_length, 4); - png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length); - png_reset_crc(png_ptr); -@@ -546,17 +677,64 @@ - png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); - png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; + PNG_EXPORT_LAST_ORDINAL(245); ++#endif /* APNG */ + #endif -+#ifdef PNG_READ_APNG_SUPPORTED -+ if (png_ptr->chunk_name != png_fdAT && png_ptr->num_frames_read > 0) -+ { -+ if (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) -+ { -+ png_ptr->process_mode = PNG_READ_CHUNK_MODE; -+ if (png_ptr->frame_end_fn != NULL) -+ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); -+ png_ptr->num_frames_read++; -+ return; -+ } -+ else -+ { -+ if (png_ptr->chunk_name == png_IEND) -+ png_error(png_ptr, "Not enough image data"); -+ if (png_ptr->push_length + 4 > png_ptr->buffer_size) -+ { -+ png_push_save_buffer(png_ptr); -+ return; -+ } -+ png_warning(png_ptr, "Skipping (ignoring) a chunk between " -+ "APNG chunks"); -+ png_crc_finish(png_ptr, png_ptr->push_length); -+ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; -+ return; -+ } -+ } -+ else -+#endif -+#ifdef PNG_READ_APNG_SUPPORTED -+ if (png_ptr->chunk_name != png_IDAT && png_ptr->num_frames_read == 0) -+#else - if (png_ptr->chunk_name != png_IDAT) + #ifdef __cplusplus +Index: pngpriv.h +=================================================================== +--- pngpriv.h ++++ pngpriv.h +@@ -566,6 +566,10 @@ + #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ + /* 0x4000 (unused) */ + #define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */ ++#ifdef PNG_APNG_SUPPORTED ++#define PNG_HAVE_acTL 0x10000 ++#define PNG_HAVE_fcTL 0x20000 +#endif - { - png_ptr->process_mode = PNG_READ_CHUNK_MODE; - - if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0) - png_error(png_ptr, "Not enough compressed data"); -+#ifdef PNG_READ_APNG_SUPPORTED -+ if (png_ptr->frame_end_fn != NULL) -+ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); -+ png_ptr->num_frames_read++; -+#endif -+ - return; - } + /* Flags for the transformations the PNG library does on the image data */ + #define PNG_BGR 0x0001 +@@ -783,6 +787,16 @@ + #define png_tRNS PNG_U32(116, 82, 78, 83) + #define png_zTXt PNG_U32(122, 84, 88, 116) - png_ptr->idat_size = png_ptr->push_length; ++#ifdef PNG_APNG_SUPPORTED ++#define png_acTL PNG_U32( 97, 99, 84, 76) ++#define png_fcTL PNG_U32(102, 99, 84, 76) ++#define png_fdAT PNG_U32(102, 100, 65, 84) + -+#ifdef PNG_READ_APNG_SUPPORTED -+ if (png_ptr->num_frames_read > 0) -+ { -+ png_ensure_sequence_number(png_ptr, 4); -+ png_ptr->idat_size -= 4; -+ } ++/* For png_struct.apng_flags: */ ++#define PNG_FIRST_FRAME_HIDDEN 0x0001 ++#define PNG_APNG_APP 0x0002 +#endif - } ++ + /* The following will work on (signed char*) strings, whereas the get_uint_32 + * macro will fail on top-bit-set values because of the sign extension. + */ +@@ -1489,6 +1503,49 @@ - if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0) -@@ -630,6 +808,15 @@ - if (!(buffer_length > 0) || buffer == NULL) - png_error(png_ptr, "No IDAT data (internal error)"); + #endif /* PROGRESSIVE_READ */ ++#ifdef PNG_APNG_SUPPORTED ++PNG_INTERNAL_FUNCTION(void,png_ensure_fcTL_is_valid,(png_structp png_ptr, ++ png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, ++ png_byte dispose_op, png_byte blend_op),PNG_EMPTY); ++ +#ifdef PNG_READ_APNG_SUPPORTED -+ /* If the app is not APNG-aware, decode only the first frame */ -+ if (!(png_ptr->apng_flags & PNG_APNG_APP) && png_ptr->num_frames_read > 0) -+ { -+ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; -+ return; -+ } -+#endif -+ - /* This routine must process all the data it has been given - * before returning, calling the row callback as required to - * handle the uncompressed results. -@@ -1079,6 +1266,18 @@ - png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); - } - -+#ifdef PNG_READ_APNG_SUPPORTED -+void PNGAPI -+png_set_progressive_frame_fn(png_structp png_ptr, -+ png_progressive_frame_ptr frame_info_fn, -+ png_progressive_frame_ptr frame_end_fn) -+{ -+ png_ptr->frame_info_fn = frame_info_fn; -+ png_ptr->frame_end_fn = frame_end_fn; -+ png_ptr->apng_flags |= PNG_APNG_APP; -+} -+#endif -+ - png_voidp PNGAPI - png_get_progressive_ptr(png_const_structrp png_ptr) - { -diff -Naru libpng-1.6.23.org/pngpriv.h libpng-1.6.23/pngpriv.h ---- libpng-1.6.23.org/pngpriv.h 2016-06-09 22:23:09.754041902 +0900 -+++ libpng-1.6.23/pngpriv.h 2016-06-09 22:23:39.245105032 +0900 -@@ -537,6 +537,10 @@ - #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */ - /* 0x4000 (unused) */ - #define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */ -+#ifdef PNG_APNG_SUPPORTED -+#define PNG_HAVE_acTL 0x10000 -+#define PNG_HAVE_fcTL 0x20000 -+#endif - - /* Flags for the transformations the PNG library does on the image data */ - #define PNG_BGR 0x0001 -@@ -754,6 +758,16 @@ - #define png_tRNS PNG_U32(116, 82, 78, 83) - #define png_zTXt PNG_U32(122, 84, 88, 116) - -+#ifdef PNG_APNG_SUPPORTED -+#define png_acTL PNG_U32( 97, 99, 84, 76) -+#define png_fcTL PNG_U32(102, 99, 84, 76) -+#define png_fdAT PNG_U32(102, 100, 65, 84) -+ -+/* For png_struct.apng_flags: */ -+#define PNG_FIRST_FRAME_HIDDEN 0x0001 -+#define PNG_APNG_APP 0x0002 -+#endif -+ - /* The following will work on (signed char*) strings, whereas the get_uint_32 - * macro will fail on top-bit-set values because of the sign extension. - */ -@@ -1461,6 +1475,47 @@ - */ - #endif - -+#ifdef PNG_APNG_SUPPORTED -+PNG_INTERNAL_FUNCTION(void,png_ensure_fcTL_is_valid,(png_structp png_ptr, -+ png_uint_32 width, png_uint_32 height, -+ png_uint_32 x_offset, png_uint_32 y_offset, -+ png_uint_16 delay_num, png_uint_16 delay_den, -+ png_byte dispose_op, png_byte blend_op), PNG_EMPTY); -+ -+#ifdef PNG_READ_APNG_SUPPORTED -+PNG_INTERNAL_FUNCTION(void,png_handle_acTL,(png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length),PNG_EMPTY); -+PNG_INTERNAL_FUNCTION(void,png_handle_fcTL,(png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length),PNG_EMPTY); -+PNG_INTERNAL_FUNCTION(void,png_handle_fdAT,(png_structp png_ptr, png_infop info_ptr, -+ png_uint_32 length),PNG_EMPTY); -+PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structp png_ptr, png_infop info_ptr),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_handle_acTL,(png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_handle_fcTL,(png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_handle_fdAT,(png_structp png_ptr, ++ png_infop info_ptr, png_uint_32 length),PNG_EMPTY); ++PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structp png_ptr, ++ png_infop info_ptr),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_ensure_sequence_number,(png_structp png_ptr, + png_uint_32 length),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_reset,(png_structp png_ptr),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_read_reinit,(png_structp png_ptr, + png_infop info_ptr),PNG_EMPTY); +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structp png_ptr),PNG_EMPTY); -+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ -+#endif /* PNG_READ_APNG_SUPPORTED */ ++PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structp png_ptr), ++ PNG_EMPTY); ++#endif /* PROGRESSIVE_READ */ ++#endif /* READ_APNG */ + +#ifdef PNG_WRITE_APNG_SUPPORTED +PNG_INTERNAL_FUNCTION(void,png_write_acTL,(png_structp png_ptr, @@ -667,453 +565,375 @@ diff -Naru libpng-1.6.23.org/pngpriv.h libpng-1.6.23/pngpriv.h +PNG_INTERNAL_FUNCTION(void,png_write_reset,(png_structp png_ptr),PNG_EMPTY); +PNG_INTERNAL_FUNCTION(void,png_write_reinit,(png_structp png_ptr, + png_infop info_ptr, png_uint_32 width, png_uint_32 height),PNG_EMPTY); -+#endif /* PNG_WRITE_APNG_SUPPORTED */ -+#endif /* PNG_APNG_SUPPORTED */ -+ - /* Added at libpng version 1.4.0 */ - #ifdef PNG_COLORSPACE_SUPPORTED - /* These internal functions are for maintaining the colorspace structure within -diff -Naru libpng-1.6.23.org/pngread.c libpng-1.6.23/pngread.c ---- libpng-1.6.23.org/pngread.c 2016-06-09 22:23:09.755041938 +0900 -+++ libpng-1.6.23/pngread.c 2016-06-09 22:23:39.247105104 +0900 -@@ -161,6 +161,9 @@ ++#endif /* WRITE_APNG */ ++#endif /* APNG */ ++ + /* Added at libpng version 1.6.0 */ + #ifdef PNG_GAMMA_SUPPORTED + PNG_INTERNAL_FUNCTION(void,png_colorspace_set_gamma,(png_const_structrp png_ptr, +Index: pnginfo.h +=================================================================== +--- pnginfo.h ++++ pnginfo.h +@@ -255,5 +255,18 @@ + png_bytepp row_pointers; /* the image bits */ + #endif - else if (chunk_name == png_IDAT) - { -+#ifdef PNG_READ_APNG_SUPPORTED -+ png_have_info(png_ptr, info_ptr); ++#ifdef PNG_APNG_SUPPORTED ++ png_uint_32 num_frames; /* including default image */ ++ png_uint_32 num_plays; ++ png_uint_32 next_frame_width; ++ png_uint_32 next_frame_height; ++ png_uint_32 next_frame_x_offset; ++ png_uint_32 next_frame_y_offset; ++ png_uint_16 next_frame_delay_num; ++ png_uint_16 next_frame_delay_den; ++ png_byte next_frame_dispose_op; ++ png_byte next_frame_blend_op; +#endif - png_ptr->idat_size = length; - break; - } -@@ -250,6 +253,17 @@ - png_handle_iTXt(png_ptr, info_ptr, length); ++ + }; + #endif /* PNGINFO_H */ +Index: pngstruct.h +=================================================================== +--- pngstruct.h ++++ pngstruct.h +@@ -403,6 +403,27 @@ + png_byte filter_type; #endif -+#ifdef PNG_READ_APNG_SUPPORTED -+ else if (chunk_name == png_acTL) -+ png_handle_acTL(png_ptr, info_ptr, length); ++#ifdef PNG_APNG_SUPPORTED ++ png_uint_32 apng_flags; ++ png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */ ++ png_uint_32 first_frame_width; ++ png_uint_32 first_frame_height; + -+ else if (chunk_name == png_fcTL) -+ png_handle_fcTL(png_ptr, info_ptr, length); ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_uint_32 num_frames_read; /* incremented after all image data of */ ++ /* a frame is read */ ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++ png_progressive_frame_ptr frame_info_fn; /* frame info read callback */ ++ png_progressive_frame_ptr frame_end_fn; /* frame data read callback */ ++#endif ++#endif + -+ else if (chunk_name == png_fdAT) -+ png_handle_fdAT(png_ptr, info_ptr, length); ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ png_uint_32 num_frames_to_write; ++ png_uint_32 num_frames_written; +#endif ++#endif /* APNG */ + - else - png_handle_unknown(png_ptr, info_ptr, length, - PNG_HANDLE_CHUNK_AS_DEFAULT); -@@ -257,6 +271,72 @@ - } - #endif /* SEQUENTIAL_READ */ + /* New members added in libpng-1.2.0 */ -+#ifdef PNG_READ_APNG_SUPPORTED -+void PNGAPI -+png_read_frame_head(png_structp png_ptr, png_infop info_ptr) -+{ -+ png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */ -+ -+ png_debug(0, "Reading frame head"); -+ -+ if (!(png_ptr->mode & PNG_HAVE_acTL)) -+ png_error(png_ptr, "attempt to png_read_frame_head() but " -+ "no acTL present"); -+ -+ /* do nothing for the main IDAT */ -+ if (png_ptr->num_frames_read == 0) -+ return; -+ -+ png_read_reset(png_ptr); -+ png_ptr->flags &= ~PNG_FLAG_ROW_INIT; -+ png_ptr->mode &= ~PNG_HAVE_fcTL; -+ -+ have_chunk_after_DAT = 0; -+ for (;;) -+ { -+ png_uint_32 length = png_read_chunk_header(png_ptr); -+ -+ if (png_ptr->chunk_name == png_IDAT) -+ { -+ /* discard trailing IDATs for the first frame */ -+ if (have_chunk_after_DAT || png_ptr->num_frames_read > 1) -+ png_error(png_ptr, "png_read_frame_head(): out of place IDAT"); -+ png_crc_finish(png_ptr, length); -+ } -+ -+ else if (png_ptr->chunk_name == png_fcTL) -+ { -+ png_handle_fcTL(png_ptr, info_ptr, length); -+ have_chunk_after_DAT = 1; -+ } -+ -+ else if (png_ptr->chunk_name == png_fdAT) -+ { -+ png_ensure_sequence_number(png_ptr, length); -+ -+ /* discard trailing fdATs for frames other than the first */ -+ if (!have_chunk_after_DAT && png_ptr->num_frames_read > 1) -+ png_crc_finish(png_ptr, length - 4); -+ else if(png_ptr->mode & PNG_HAVE_fcTL) -+ { -+ png_ptr->idat_size = length - 4; -+ png_ptr->mode |= PNG_HAVE_IDAT; -+ -+ break; -+ } -+ else -+ png_error(png_ptr, "png_read_frame_head(): out of place fdAT"); -+ } -+ else -+ { -+ png_warning(png_ptr, "Skipped (ignored) a chunk " -+ "between APNG chunks"); -+ png_crc_finish(png_ptr, length); -+ } -+ } -+} -+#endif /* PNG_READ_APNG_SUPPORTED */ -+ - /* Optional call to update the users info_ptr structure */ - void PNGAPI - png_read_update_info(png_structrp png_ptr, png_inforp info_ptr) -diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c ---- libpng-1.6.23.org/pngrutil.c 2016-06-09 22:21:54.210320245 +0900 -+++ libpng-1.6.23/pngrutil.c 2016-06-09 22:23:39.249105176 +0900 -@@ -855,6 +855,11 @@ - filter_type = buf[11]; - interlace_type = buf[12]; + /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */ +Index: pngwrite.c +=================================================================== +--- pngwrite.c ++++ pngwrite.c +@@ -128,6 +128,10 @@ + * the application continues writing the PNG. So check the 'invalid' + * flag here too. + */ ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ if ((info_ptr->valid & PNG_INFO_acTL) != 0) ++ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays); ++#endif + #ifdef PNG_GAMMA_SUPPORTED + # ifdef PNG_WRITE_gAMA_SUPPORTED + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 && +@@ -360,6 +364,11 @@ + if ((png_ptr->mode & PNG_HAVE_IDAT) == 0) + png_error(png_ptr, "No IDATs written into file"); -+#ifdef PNG_READ_APNG_SUPPORTED -+ png_ptr->first_frame_width = width; -+ png_ptr->first_frame_height = height; ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ if (png_ptr->num_frames_written != png_ptr->num_frames_to_write) ++ png_error(png_ptr, "Not enough frames written"); +#endif + - /* Set internal variables */ - png_ptr->width = width; - png_ptr->height = height; -@@ -2755,6 +2760,179 @@ + #ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED + if (png_ptr->num_palette_max > png_ptr->num_palette) + png_benign_error(png_ptr, "Wrote palette index exceeding num_palette"); +@@ -2380,4 +2389,42 @@ } - #endif - -+#ifdef PNG_READ_APNG_SUPPORTED -+void /* PRIVATE */ -+png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) -+{ -+ png_byte data[8]; -+ png_uint_32 num_frames; -+ png_uint_32 num_plays; -+ png_uint_32 didSet; -+ -+ png_debug(1, "in png_handle_acTL"); -+ -+ if (!(png_ptr->mode & PNG_HAVE_IHDR)) -+ { -+ png_error(png_ptr, "Missing IHDR before acTL"); -+ } -+ else if (png_ptr->mode & PNG_HAVE_IDAT) -+ { -+ png_warning(png_ptr, "Invalid acTL after IDAT skipped"); -+ png_crc_finish(png_ptr, length); -+ return; -+ } -+ else if (png_ptr->mode & PNG_HAVE_acTL) -+ { -+ png_warning(png_ptr, "Duplicate acTL skipped"); -+ png_crc_finish(png_ptr, length); -+ return; -+ } -+ else if (length != 8) -+ { -+ png_warning(png_ptr, "acTL with invalid length skipped"); -+ png_crc_finish(png_ptr, length); -+ return; -+ } -+ -+ png_crc_read(png_ptr, data, 8); -+ png_crc_finish(png_ptr, 0); + #endif /* SIMPLIFIED_WRITE_STDIO */ + #endif /* SIMPLIFIED_WRITE */ + -+ num_frames = png_get_uint_31(png_ptr, data); -+ num_plays = png_get_uint_31(png_ptr, data + 4); -+ -+ /* the set function will do error checking on num_frames */ -+ didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays); -+ if(didSet) -+ png_ptr->mode |= PNG_HAVE_acTL; -+} -+ -+void /* PRIVATE */ -+png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) -+{ -+ png_byte data[22]; -+ png_uint_32 width; -+ png_uint_32 height; -+ png_uint_32 x_offset; -+ png_uint_32 y_offset; -+ png_uint_16 delay_num; -+ png_uint_16 delay_den; -+ png_byte dispose_op; -+ png_byte blend_op; -+ -+ png_debug(1, "in png_handle_fcTL"); -+ -+ png_ensure_sequence_number(png_ptr, length); -+ -+ if (!(png_ptr->mode & PNG_HAVE_IHDR)) -+ { -+ png_error(png_ptr, "Missing IHDR before fcTL"); -+ } -+ else if (png_ptr->mode & PNG_HAVE_IDAT) -+ { -+ /* for any frames other then the first this message may be misleading, -+ * but correct. PNG_HAVE_IDAT is unset before the frame head is read -+ * i can't think of a better message */ -+ png_warning(png_ptr, "Invalid fcTL after IDAT skipped"); -+ png_crc_finish(png_ptr, length-4); -+ return; -+ } -+ else if (png_ptr->mode & PNG_HAVE_fcTL) -+ { -+ png_warning(png_ptr, "Duplicate fcTL within one frame skipped"); -+ png_crc_finish(png_ptr, length-4); -+ return; -+ } -+ else if (length != 26) -+ { -+ png_warning(png_ptr, "fcTL with invalid length skipped"); -+ png_crc_finish(png_ptr, length-4); -+ return; -+ } -+ -+ png_crc_read(png_ptr, data, 22); -+ png_crc_finish(png_ptr, 0); -+ -+ width = png_get_uint_31(png_ptr, data); -+ height = png_get_uint_31(png_ptr, data + 4); -+ x_offset = png_get_uint_31(png_ptr, data + 8); -+ y_offset = png_get_uint_31(png_ptr, data + 12); -+ delay_num = png_get_uint_16(data + 16); -+ delay_den = png_get_uint_16(data + 18); -+ dispose_op = data[20]; -+ blend_op = data[21]; -+ -+ if (png_ptr->num_frames_read == 0 && (x_offset != 0 || y_offset != 0)) -+ { -+ png_warning(png_ptr, "fcTL for the first frame must have zero offset"); -+ return; -+ } -+ -+ if (info_ptr != NULL) -+ { -+ if (png_ptr->num_frames_read == 0 && -+ (width != info_ptr->width || height != info_ptr->height)) -+ { -+ png_warning(png_ptr, "size in first frame's fcTL must match " -+ "the size in IHDR"); -+ return; -+ } ++#ifdef PNG_WRITE_APNG_SUPPORTED ++void PNGAPI ++png_write_frame_head(png_structp png_ptr, png_infop info_ptr, ++ png_bytepp row_pointers, png_uint_32 width, png_uint_32 height, ++ png_uint_32 x_offset, png_uint_32 y_offset, ++ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, ++ png_byte blend_op) ++{ ++ png_debug(1, "in png_write_frame_head"); + -+ /* The set function will do more error checking */ -+ png_set_next_frame_fcTL(png_ptr, info_ptr, width, height, -+ x_offset, y_offset, delay_num, delay_den, -+ dispose_op, blend_op); ++ /* there is a chance this has been set after png_write_info was called, ++ * so it would be set but not written. is there a way to be sure? */ ++ if ((info_ptr->valid & PNG_INFO_acTL) == 0) ++ png_error(png_ptr, "png_write_frame_head(): acTL not set"); + -+ png_read_reinit(png_ptr, info_ptr); ++ png_write_reset(png_ptr); + -+ png_ptr->mode |= PNG_HAVE_fcTL; -+ } -+} ++ png_write_reinit(png_ptr, info_ptr, width, height); + -+void /* PRIVATE */ -+png_have_info(png_structp png_ptr, png_infop info_ptr) -+{ -+ if((info_ptr->valid & PNG_INFO_acTL) && !(info_ptr->valid & PNG_INFO_fcTL)) -+ { -+ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; -+ info_ptr->num_frames++; -+ } ++ if ((png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) == 0 || ++ png_ptr->num_frames_written != 0) ++ png_write_fcTL(png_ptr, width, height, x_offset, y_offset, ++ delay_num, delay_den, dispose_op, blend_op); ++ ++ PNG_UNUSED(row_pointers) +} + -+void /* PRIVATE */ -+png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++void PNGAPI ++png_write_frame_tail(png_structp png_ptr, png_infop info_ptr) +{ -+ png_ensure_sequence_number(png_ptr, length); ++ png_debug(1, "in png_write_frame_tail"); ++ ++ png_ptr->num_frames_written++; + -+ /* This function is only called from png_read_end(), png_read_info(), -+ * and png_push_read_chunk() which means that: -+ * - the user doesn't want to read this frame -+ * - or this is an out-of-place fdAT -+ * in either case it is safe to ignore the chunk with a warning */ -+ png_warning(png_ptr, "ignoring fdAT chunk"); -+ png_crc_finish(png_ptr, length - 4); + PNG_UNUSED(info_ptr) +} ++#endif /* WRITE_APNG */ + #endif /* WRITE */ +Index: pngpread.c +=================================================================== +--- pngpread.c ++++ pngpread.c +@@ -194,6 +194,89 @@ + + chunk_name = png_ptr->chunk_name; + ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->num_frames_read > 0 && ++ png_ptr->num_frames_read < info_ptr->num_frames) ++ { ++ if (chunk_name == png_IDAT) ++ { ++ /* Discard trailing IDATs for the first frame */ ++ if ((png_ptr->mode & PNG_HAVE_fcTL) != 0 || ++ png_ptr->num_frames_read > 1) ++ png_error(png_ptr, "out of place IDAT"); + -+void /* PRIVATE */ -+png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length) -+{ -+ png_byte data[4]; -+ png_uint_32 sequence_number; ++ PNG_PUSH_SAVE_BUFFER_IF_FULL ++ png_crc_finish(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ } + -+ if (length < 4) -+ png_error(png_ptr, "invalid fcTL or fdAT chunk found"); ++ else if (chunk_name == png_fdAT) ++ { ++ PNG_PUSH_SAVE_BUFFER_IF_LT(4) ++ png_ensure_sequence_number(png_ptr, 4); + -+ png_crc_read(png_ptr, data, 4); -+ sequence_number = png_get_uint_31(png_ptr, data); ++ if ((png_ptr->mode & PNG_HAVE_fcTL) == 0) ++ { ++ /* Discard trailing fdATs for frames other than the first */ ++ if (png_ptr->num_frames_read < 2) ++ png_error(png_ptr, "out of place fdAT"); + -+ if (sequence_number != png_ptr->next_seq_num) -+ png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence " -+ "number found"); ++ PNG_PUSH_SAVE_BUFFER_IF_FULL ++ png_crc_finish(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ } + -+ png_ptr->next_seq_num++; -+} -+#endif /* PNG_READ_APNG_SUPPORTED */ ++ else ++ { ++ /* frame data follows */ ++ png_ptr->idat_size = png_ptr->push_length - 4; ++ png_ptr->mode |= PNG_HAVE_IDAT; ++ png_ptr->process_mode = PNG_READ_IDAT_MODE; ++ } ++ } + - #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED - /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ - static int -@@ -4013,7 +4191,38 @@ - { - uInt avail_in; - png_bytep buffer; -+#ifdef PNG_READ_APNG_SUPPORTED -+ png_uint_32 bytes_to_skip = 0; ++ else if (chunk_name == png_fcTL) ++ { ++ PNG_PUSH_SAVE_BUFFER_IF_FULL ++ png_read_reset(png_ptr); ++ png_ptr->mode &= ~PNG_HAVE_fcTL; + -+ while (png_ptr->idat_size == 0 || bytes_to_skip != 0) -+ { -+ png_crc_finish(png_ptr, bytes_to_skip); -+ bytes_to_skip = 0; ++ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); + -+ png_ptr->idat_size = png_read_chunk_header(png_ptr); -+ if (png_ptr->num_frames_read == 0) -+ { -+ if (png_ptr->chunk_name != png_IDAT) -+ png_error(png_ptr, "Not enough image data"); -+ } -+ else -+ { -+ if (png_ptr->chunk_name == png_IEND) -+ png_error(png_ptr, "Not enough image data"); -+ if (png_ptr->chunk_name != png_fdAT) -+ { -+ png_warning(png_ptr, "Skipped (ignored) a chunk " -+ "between APNG chunks"); -+ bytes_to_skip = png_ptr->idat_size; -+ continue; -+ } ++ if ((png_ptr->mode & PNG_HAVE_fcTL) == 0) ++ png_error(png_ptr, "missing required fcTL chunk"); ++ ++ png_read_reinit(png_ptr, info_ptr); ++ png_progressive_read_reset(png_ptr); ++ ++ if (png_ptr->frame_info_fn != NULL) ++ (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read); ++ ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ } ++ ++ else if (chunk_name == png_IEND) ++ { ++ PNG_PUSH_SAVE_BUFFER_IF_FULL ++ png_warning(png_ptr, "Number of actual frames fewer than expected"); ++ png_crc_finish(png_ptr, png_ptr->push_length); ++ png_ptr->process_mode = PNG_READ_DONE_MODE; ++ png_push_have_end(png_ptr, info_ptr); ++ } ++ ++ else ++ { ++ PNG_PUSH_SAVE_BUFFER_IF_FULL ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ png_crc_finish(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ } ++ ++ return; ++ } ++#endif /* READ_APNG */ ++ + if (chunk_name == png_IDAT) + { + if ((png_ptr->mode & PNG_AFTER_IDAT) != 0) +@@ -260,6 +343,9 @@ -+ png_ensure_sequence_number(png_ptr, png_ptr->idat_size); + else if (chunk_name == png_IDAT) + { ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_have_info(png_ptr, info_ptr); ++#endif + png_ptr->idat_size = png_ptr->push_length; + png_ptr->process_mode = PNG_READ_IDAT_MODE; + png_push_have_info(png_ptr, info_ptr); +@@ -406,6 +492,20 @@ + } + #endif + ++#ifdef PNG_READ_APNG_SUPPORTED ++ else if (chunk_name == png_acTL) ++ { ++ PNG_PUSH_SAVE_BUFFER_IF_FULL ++ png_handle_acTL(png_ptr, info_ptr, png_ptr->push_length); ++ } + -+ png_ptr->idat_size -= 4; -+ } -+ } ++ else if (chunk_name == png_fcTL) ++ { ++ PNG_PUSH_SAVE_BUFFER_IF_FULL ++ png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length); ++ } ++ ++#endif /* READ_APNG */ + else + { + PNG_PUSH_SAVE_BUFFER_IF_FULL +@@ -538,7 +638,11 @@ + png_byte chunk_tag[4]; + + /* TODO: this code can be commoned up with the same code in push_read */ ++#ifdef PNG_READ_APNG_SUPPORTED ++ PNG_PUSH_SAVE_BUFFER_IF_LT(12) +#else - while (png_ptr->idat_size == 0) - { - png_crc_finish(png_ptr, 0); -@@ -4025,7 +4234,7 @@ - if (png_ptr->chunk_name != png_IDAT) - png_error(png_ptr, "Not enough image data"); - } -- -+#endif /* PNG_READ_APNG_SUPPORTED */ - avail_in = png_ptr->IDAT_read_size; + PNG_PUSH_SAVE_BUFFER_IF_LT(8) ++#endif + png_push_fill_buffer(png_ptr, chunk_length, 4); + png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length); + png_reset_crc(png_ptr); +@@ -546,17 +650,60 @@ + png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); + png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; + ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->chunk_name != png_fdAT && png_ptr->num_frames_read > 0) ++ { ++ if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) != 0) ++ { ++ png_ptr->process_mode = PNG_READ_CHUNK_MODE; ++ if (png_ptr->frame_end_fn != NULL) ++ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); ++ png_ptr->num_frames_read++; ++ return; ++ } ++ else ++ { ++ if (png_ptr->chunk_name == png_IEND) ++ png_error(png_ptr, "Not enough image data"); ++ PNG_PUSH_SAVE_BUFFER_IF_FULL ++ png_warning(png_ptr, "Skipping (ignoring) a chunk between " ++ "APNG chunks"); ++ png_crc_finish(png_ptr, png_ptr->push_length); ++ png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; ++ return; ++ } ++ } ++ else ++#endif ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->chunk_name != png_IDAT && png_ptr->num_frames_read == 0) ++#else + if (png_ptr->chunk_name != png_IDAT) ++#endif + { + png_ptr->process_mode = PNG_READ_CHUNK_MODE; - if (avail_in > png_ptr->idat_size) -@@ -4088,6 +4297,9 @@ + if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0) + png_error(png_ptr, "Not enough compressed data"); - png_ptr->mode |= PNG_AFTER_IDAT; - png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; +#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->frame_end_fn != NULL) ++ (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read); + png_ptr->num_frames_read++; +#endif - - if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) - png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4526,4 +4738,80 @@ - - png_ptr->flags |= PNG_FLAG_ROW_INIT; - } + + return; + } + + png_ptr->idat_size = png_ptr->push_length; ++ ++#ifdef PNG_READ_APNG_SUPPORTED ++ if (png_ptr->num_frames_read > 0) ++ { ++ png_ensure_sequence_number(png_ptr, 4); ++ png_ptr->idat_size -= 4; ++ } ++#endif + } + + if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0) +@@ -630,6 +777,16 @@ + if (!(buffer_length > 0) || buffer == NULL) + png_error(png_ptr, "No IDAT data (internal error)"); + ++#ifdef PNG_READ_APNG_SUPPORTED ++ /* If the app is not APNG-aware, decode only the first frame */ ++ if ((png_ptr->apng_flags & PNG_APNG_APP) == 0 && ++ png_ptr->num_frames_read > 0) ++ { ++ png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; ++ return; ++ } ++#endif ++ + /* This routine must process all the data it has been given + * before returning, calling the row callback as required to + * handle the uncompressed results. +@@ -1079,6 +1236,18 @@ + png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); + } + +#ifdef PNG_READ_APNG_SUPPORTED -+/* This function is to be called after the main IDAT set has been read and -+ * before a new IDAT is read. It resets some parts of png_ptr -+ * to make them usable by the read functions again */ -+void /* PRIVATE */ -+png_read_reset(png_structp png_ptr) -+{ -+ png_ptr->mode &= ~PNG_HAVE_IDAT; -+ png_ptr->mode &= ~PNG_AFTER_IDAT; -+ png_ptr->row_number = 0; -+ png_ptr->pass = 0; -+} -+ -+void /* PRIVATE */ -+png_read_reinit(png_structp png_ptr, png_infop info_ptr) ++void PNGAPI ++png_set_progressive_frame_fn(png_structp png_ptr, ++ png_progressive_frame_ptr frame_info_fn, ++ png_progressive_frame_ptr frame_end_fn) +{ -+ png_ptr->width = info_ptr->next_frame_width; -+ png_ptr->height = info_ptr->next_frame_height; -+ png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width); -+ png_ptr->info_rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, -+ png_ptr->width); -+ if (png_ptr->prev_row) -+ memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1); ++ png_ptr->frame_info_fn = frame_info_fn; ++ png_ptr->frame_end_fn = frame_end_fn; ++ png_ptr->apng_flags |= PNG_APNG_APP; +} ++#endif + -+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+/* same as png_read_reset() but for the progressive reader */ -+void /* PRIVATE */ -+png_progressive_read_reset(png_structp png_ptr) -+{ -+#ifdef PNG_READ_INTERLACING_SUPPORTED -+ /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ -+ -+ /* Start of interlace block */ -+ const int png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; -+ -+ /* Offset to next interlace block */ -+ const int png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; -+ -+ /* Start of interlace block in the y direction */ -+ const int png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; -+ -+ /* Offset to next interlace block in the y direction */ -+ const int png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; -+ -+ if (png_ptr->interlaced) -+ { -+ if (!(png_ptr->transformations & PNG_INTERLACE)) -+ png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 - -+ png_pass_ystart[0]) / png_pass_yinc[0]; -+ else -+ png_ptr->num_rows = png_ptr->height; -+ -+ png_ptr->iwidth = (png_ptr->width + -+ png_pass_inc[png_ptr->pass] - 1 - -+ png_pass_start[png_ptr->pass]) / -+ png_pass_inc[png_ptr->pass]; -+ } -+ else -+#endif /* PNG_READ_INTERLACING_SUPPORTED */ -+ { -+ png_ptr->num_rows = png_ptr->height; -+ png_ptr->iwidth = png_ptr->width; -+ } -+ png_ptr->flags &= ~PNG_FLAG_ZSTREAM_ENDED; -+ if (inflateReset(&(png_ptr->zstream)) != Z_OK) -+ png_error(png_ptr, "inflateReset failed"); -+ png_ptr->zstream.avail_in = 0; -+ png_ptr->zstream.next_in = 0; -+ png_ptr->zstream.next_out = png_ptr->row_buf; -+ png_ptr->zstream.avail_out = (uInt)PNG_ROWBYTES(png_ptr->pixel_depth, -+ png_ptr->iwidth) + 1; -+} -+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ -+#endif /* PNG_READ_APNG_SUPPORTED */ - #endif /* READ */ -diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c ---- libpng-1.6.23.org/pngset.c 2016-06-09 22:23:09.756041974 +0900 -+++ libpng-1.6.23/pngset.c 2016-06-09 22:23:39.249105176 +0900 + png_voidp PNGAPI + png_get_progressive_ptr(png_const_structrp png_ptr) + { +Index: pngset.c +=================================================================== +--- pngset.c ++++ pngset.c @@ -241,6 +241,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); @@ -1126,7 +946,7 @@ diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c } #ifdef PNG_oFFs_SUPPORTED -@@ -1096,6 +1101,147 @@ +@@ -1096,6 +1101,146 @@ } #endif /* sPLT */ @@ -1159,8 +979,7 @@ diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c + if (num_plays > PNG_UINT_31_MAX) + { + png_warning(png_ptr, -+ "Ignoring attempt to set acTL with num_plays " -+ "> 2^31-1"); ++ "Ignoring attempt to set acTL with num_plays > 2^31-1"); + return (0); + } + @@ -1195,8 +1014,8 @@ diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c + + if (blend_op == PNG_BLEND_OP_OVER) + { -+ if (!(png_ptr->color_type & PNG_COLOR_MASK_ALPHA) && -+ !(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))) ++ if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0 && ++ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) == 0) + { + png_warning(png_ptr, "PNG_BLEND_OP_OVER is meaningless " + "and wasteful for opaque images, ignored"); @@ -1225,17 +1044,17 @@ diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c + png_uint_16 delay_num, png_uint_16 delay_den, + png_byte dispose_op, png_byte blend_op) +{ -+ if (width > PNG_UINT_31_MAX) -+ png_error(png_ptr, "invalid width in fcTL (> 2^31-1)"); -+ if (height > PNG_UINT_31_MAX) -+ png_error(png_ptr, "invalid height in fcTL (> 2^31-1)"); ++ if (width == 0 || width > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid width in fcTL (0 or > 2^31-1)"); ++ if (height == 0 || height > PNG_UINT_31_MAX) ++ png_error(png_ptr, "invalid height in fcTL (0 or > 2^31-1)"); + if (x_offset > PNG_UINT_31_MAX) + png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)"); + if (y_offset > PNG_UINT_31_MAX) + png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)"); + if (width + x_offset > png_ptr->first_frame_width || + height + y_offset > png_ptr->first_frame_height) -+ png_error(png_ptr, "dimensions of a frame are greater than" ++ png_error(png_ptr, "dimensions of a frame are greater than " + "the ones in IHDR"); + + if (dispose_op != PNG_DISPOSE_OP_NONE && @@ -1247,285 +1066,372 @@ diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c + blend_op != PNG_BLEND_OP_OVER) + png_error(png_ptr, "invalid blend_op in fcTL"); + -+ PNG_UNUSED(delay_num) -+ PNG_UNUSED(delay_den) ++ PNG_UNUSED(delay_num) ++ PNG_UNUSED(delay_den) ++} ++ ++png_uint_32 PNGAPI ++png_set_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr, ++ png_byte is_hidden) ++{ ++ png_debug(1, "in png_first_frame_is_hidden()"); ++ ++ if (png_ptr == NULL) ++ return 0; ++ ++ if (is_hidden != 0) ++ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; ++ else ++ png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN; ++ ++ PNG_UNUSED(info_ptr) ++ ++ return 1; ++} ++#endif /* APNG */ ++ + #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED + static png_byte + check_location(png_const_structrp png_ptr, int location) +Index: pngrutil.c +=================================================================== +--- pngrutil.c ++++ pngrutil.c +@@ -857,6 +857,11 @@ + filter_type = buf[11]; + interlace_type = buf[12]; + ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_ptr->first_frame_width = width; ++ png_ptr->first_frame_height = height; ++#endif ++ + /* Set internal variables */ + png_ptr->width = width; + png_ptr->height = height; +@@ -2757,6 +2762,180 @@ + } + #endif + ++#ifdef PNG_READ_APNG_SUPPORTED ++void /* PRIVATE */ ++png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_byte data[8]; ++ png_uint_32 num_frames; ++ png_uint_32 num_plays; ++ png_uint_32 didSet; ++ ++ png_debug(1, "in png_handle_acTL"); ++ ++ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) ++ { ++ png_error(png_ptr, "Missing IHDR before acTL"); ++ } ++ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) ++ { ++ png_warning(png_ptr, "Invalid acTL after IDAT skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ else if ((png_ptr->mode & PNG_HAVE_acTL) != 0) ++ { ++ png_warning(png_ptr, "Duplicate acTL skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ else if (length != 8) ++ { ++ png_warning(png_ptr, "acTL with invalid length skipped"); ++ png_crc_finish(png_ptr, length); ++ return; ++ } ++ ++ png_crc_read(png_ptr, data, 8); ++ png_crc_finish(png_ptr, 0); ++ ++ num_frames = png_get_uint_31(png_ptr, data); ++ num_plays = png_get_uint_31(png_ptr, data + 4); ++ ++ /* the set function will do error checking on num_frames */ ++ didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays); ++ if (didSet != 0) ++ png_ptr->mode |= PNG_HAVE_acTL; ++} ++ ++void /* PRIVATE */ ++png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_byte data[22]; ++ png_uint_32 width; ++ png_uint_32 height; ++ png_uint_32 x_offset; ++ png_uint_32 y_offset; ++ png_uint_16 delay_num; ++ png_uint_16 delay_den; ++ png_byte dispose_op; ++ png_byte blend_op; ++ ++ png_debug(1, "in png_handle_fcTL"); ++ ++ png_ensure_sequence_number(png_ptr, length); ++ ++ if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) ++ { ++ png_error(png_ptr, "Missing IHDR before fcTL"); ++ } ++ else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) ++ { ++ /* for any frames other then the first this message may be misleading, ++ * but correct. PNG_HAVE_IDAT is unset before the frame head is read ++ * i can't think of a better message */ ++ png_warning(png_ptr, "Invalid fcTL after IDAT skipped"); ++ png_crc_finish(png_ptr, length-4); ++ return; ++ } ++ else if ((png_ptr->mode & PNG_HAVE_fcTL) != 0) ++ { ++ png_warning(png_ptr, "Duplicate fcTL within one frame skipped"); ++ png_crc_finish(png_ptr, length-4); ++ return; ++ } ++ else if (length != 26) ++ { ++ png_warning(png_ptr, "fcTL with invalid length skipped"); ++ png_crc_finish(png_ptr, length-4); ++ return; ++ } ++ ++ png_crc_read(png_ptr, data, 22); ++ png_crc_finish(png_ptr, 0); ++ ++ width = png_get_uint_31(png_ptr, data); ++ height = png_get_uint_31(png_ptr, data + 4); ++ x_offset = png_get_uint_31(png_ptr, data + 8); ++ y_offset = png_get_uint_31(png_ptr, data + 12); ++ delay_num = png_get_uint_16(data + 16); ++ delay_den = png_get_uint_16(data + 18); ++ dispose_op = data[20]; ++ blend_op = data[21]; ++ ++ if (png_ptr->num_frames_read == 0 && (x_offset != 0 || y_offset != 0)) ++ { ++ png_warning(png_ptr, "fcTL for the first frame must have zero offset"); ++ return; ++ } ++ ++ if (info_ptr != NULL) ++ { ++ if (png_ptr->num_frames_read == 0 && ++ (width != info_ptr->width || height != info_ptr->height)) ++ { ++ png_warning(png_ptr, "size in first frame's fcTL must match " ++ "the size in IHDR"); ++ return; ++ } ++ ++ /* The set function will do more error checking */ ++ png_set_next_frame_fcTL(png_ptr, info_ptr, width, height, ++ x_offset, y_offset, delay_num, delay_den, ++ dispose_op, blend_op); ++ ++ png_read_reinit(png_ptr, info_ptr); ++ ++ png_ptr->mode |= PNG_HAVE_fcTL; ++ } ++} ++ ++void /* PRIVATE */ ++png_have_info(png_structp png_ptr, png_infop info_ptr) ++{ ++ if ((info_ptr->valid & PNG_INFO_acTL) != 0 && ++ (info_ptr->valid & PNG_INFO_fcTL) == 0) ++ { ++ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; ++ info_ptr->num_frames++; ++ } ++} ++ ++void /* PRIVATE */ ++png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) ++{ ++ png_ensure_sequence_number(png_ptr, length); ++ ++ /* This function is only called from png_read_end(), png_read_info(), ++ * and png_push_read_chunk() which means that: ++ * - the user doesn't want to read this frame ++ * - or this is an out-of-place fdAT ++ * in either case it is safe to ignore the chunk with a warning */ ++ png_warning(png_ptr, "ignoring fdAT chunk"); ++ png_crc_finish(png_ptr, length - 4); ++ PNG_UNUSED(info_ptr) +} + -+png_uint_32 PNGAPI -+png_set_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr, -+ png_byte is_hidden) ++void /* PRIVATE */ ++png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length) +{ -+ png_debug(1, "in png_first_frame_is_hidden()"); ++ png_byte data[4]; ++ png_uint_32 sequence_number; + -+ if (png_ptr == NULL) -+ return 0; ++ if (length < 4) ++ png_error(png_ptr, "invalid fcTL or fdAT chunk found"); + -+ if (is_hidden) -+ png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN; -+ else -+ png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN; ++ png_crc_read(png_ptr, data, 4); ++ sequence_number = png_get_uint_31(png_ptr, data); + -+ PNG_UNUSED(info_ptr) ++ if (sequence_number != png_ptr->next_seq_num) ++ png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence " ++ "number found"); + -+ return 1; ++ png_ptr->next_seq_num++; +} -+#endif /* PNG_APNG_SUPPORTED */ ++#endif /* READ_APNG */ + - #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED - static png_byte - check_location(png_const_structrp png_ptr, int location) -diff -Naru libpng-1.6.23.org/pngstruct.h libpng-1.6.23/pngstruct.h ---- libpng-1.6.23.org/pngstruct.h 2016-06-09 22:21:54.210320245 +0900 -+++ libpng-1.6.23/pngstruct.h 2016-06-09 22:23:39.250105212 +0900 -@@ -403,6 +403,27 @@ - png_byte filter_type; - #endif + #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED + /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ + static int +@@ -4016,6 +4195,38 @@ + uInt avail_in; + png_bytep buffer; -+#ifdef PNG_APNG_SUPPORTED -+ png_uint_32 apng_flags; -+ png_uint_32 next_seq_num; /* next fcTL/fdAT chunk sequence number */ -+ png_uint_32 first_frame_width; -+ png_uint_32 first_frame_height; -+ +#ifdef PNG_READ_APNG_SUPPORTED -+ png_uint_32 num_frames_read; /* incremented after all image data of */ -+ /* a frame is read */ -+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+ png_progressive_frame_ptr frame_info_fn; /* frame info read callback */ -+ png_progressive_frame_ptr frame_end_fn; /* frame data read callback */ -+#endif -+#endif -+ -+#ifdef PNG_WRITE_APNG_SUPPORTED -+ png_uint_32 num_frames_to_write; -+ png_uint_32 num_frames_written; -+#endif -+#endif /* PNG_APNG_SUPPORTED */ -+ - /* New members added in libpng-1.2.0 */ - - /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */ -diff -Naru libpng-1.6.23.org/pngtest.c libpng-1.6.23/pngtest.c ---- libpng-1.6.23.org/pngtest.c 2016-06-09 22:23:09.756041974 +0900 -+++ libpng-1.6.23/pngtest.c 2016-06-09 22:23:39.250105212 +0900 -@@ -883,6 +883,10 @@ - volatile int num_passes; - int pass; - int bit_depth, color_type; -+#ifdef PNG_APNG_SUPPORTED -+ png_uint_32 num_frames; -+ png_uint_32 num_plays; -+#endif - - row_buf = NULL; - error_parameters.file_name = inname; -@@ -1356,6 +1360,22 @@ - } - } - #endif -+ -+#ifdef PNG_APNG_SUPPORTED -+ if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL)) -+ { -+ if (png_get_acTL(read_ptr, read_info_ptr, &num_frames, &num_plays)) -+ { -+ png_byte is_hidden; -+ pngtest_debug2("Handling acTL chunks (frames %ld, plays %ld)", -+ num_frames, num_plays); -+ png_set_acTL(write_ptr, write_info_ptr, num_frames, num_plays); -+ is_hidden = png_get_first_frame_is_hidden(read_ptr, read_info_ptr); -+ png_set_first_frame_is_hidden(write_ptr, write_info_ptr, is_hidden); -+ } -+ } -+#endif ++ png_uint_32 bytes_to_skip = 0; + - #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED - { - png_unknown_chunkp unknowns; -@@ -1427,6 +1447,110 @@ - t_misc += (t_stop - t_start); - t_start = t_stop; - #endif -+#ifdef PNG_APNG_SUPPORTED -+ if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL)) -+ { -+ png_uint_32 frame; -+ for (frame = 0; frame < num_frames; frame++) -+ { -+ png_uint_32 frame_width; -+ png_uint_32 frame_height; -+ png_uint_32 x_offset; -+ png_uint_32 y_offset; -+ png_uint_16 delay_num; -+ png_uint_16 delay_den; -+ png_byte dispose_op; -+ png_byte blend_op; -+ png_read_frame_head(read_ptr, read_info_ptr); -+ if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_fcTL)) -+ { -+ png_get_next_frame_fcTL(read_ptr, read_info_ptr, -+ &frame_width, &frame_height, -+ &x_offset, &y_offset, -+ &delay_num, &delay_den, -+ &dispose_op, &blend_op); -+ } -+ else -+ { -+ frame_width = width; -+ frame_height = height; -+ x_offset = 0; -+ y_offset = 0; -+ delay_num = 1; -+ delay_den = 1; -+ dispose_op = PNG_DISPOSE_OP_NONE; -+ blend_op = PNG_BLEND_OP_SOURCE; -+ } -+#ifdef PNG_WRITE_APNG_SUPPORTED -+ png_write_frame_head(write_ptr, write_info_ptr, (png_bytepp)&row_buf, -+ frame_width, frame_height, -+ x_offset, y_offset, -+ delay_num, delay_den, -+ dispose_op, blend_op); -+#endif -+ for (pass = 0; pass < num_passes; pass++) ++ while (png_ptr->idat_size == 0 || bytes_to_skip != 0) + { -+# ifdef calc_pass_height -+ png_uint_32 pass_height; ++ png_crc_finish(png_ptr, bytes_to_skip); ++ bytes_to_skip = 0; + -+ if (num_passes == 7) /* interlaced */ ++ png_ptr->idat_size = png_read_chunk_header(png_ptr); ++ if (png_ptr->num_frames_read == 0) ++ { ++ if (png_ptr->chunk_name != png_IDAT) ++ png_error(png_ptr, "Not enough image data"); ++ } ++ else ++ { ++ if (png_ptr->chunk_name == png_IEND) ++ png_error(png_ptr, "Not enough image data"); ++ if (png_ptr->chunk_name != png_fdAT) + { -+ if (PNG_PASS_COLS(frame_width, pass) > 0) -+ pass_height = PNG_PASS_ROWS(frame_height, pass); -+ -+ else -+ pass_height = 0; ++ png_warning(png_ptr, "Skipped (ignored) a chunk " ++ "between APNG chunks"); ++ bytes_to_skip = png_ptr->idat_size; ++ continue; + } + -+ else /* not interlaced */ -+ pass_height = frame_height; -+# else -+# define pass_height frame_height -+# endif -+ -+ pngtest_debug1("Writing row data for pass %d", pass); -+ for (y = 0; y < pass_height; y++) -+ { -+#ifndef SINGLE_ROWBUF_ALLOC -+ pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y); -+ -+ row_buf = (png_bytep)png_malloc(read_ptr, -+ png_get_rowbytes(read_ptr, read_info_ptr)); -+ -+ pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf, -+ (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr)); -+ -+#endif /* !SINGLE_ROWBUF_ALLOC */ -+ png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1); -+ -+#ifdef PNG_WRITE_SUPPORTED -+#ifdef PNGTEST_TIMING -+ t_stop = (float)clock(); -+ t_decode += (t_stop - t_start); -+ t_start = t_stop; -+#endif -+ png_write_rows(write_ptr, (png_bytepp)&row_buf, 1); -+#ifdef PNGTEST_TIMING -+ t_stop = (float)clock(); -+ t_encode += (t_stop - t_start); -+ t_start = t_stop; -+#endif -+#endif /* PNG_WRITE_SUPPORTED */ ++ png_ensure_sequence_number(png_ptr, png_ptr->idat_size); + -+#ifndef SINGLE_ROWBUF_ALLOC -+ pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y); -+ png_free(read_ptr, row_buf); -+ row_buf = NULL; -+#endif /* !SINGLE_ROWBUF_ALLOC */ ++ png_ptr->idat_size -= 4; + } + } -+#ifdef PNG_WRITE_APNG_SUPPORTED -+ png_write_frame_tail(write_ptr, write_info_ptr); -+#endif -+ } -+ } -+ else -+#endif - for (pass = 0; pass < num_passes; pass++) - { - # ifdef calc_pass_height -diff -Naru libpng-1.6.23.org/pngwrite.c libpng-1.6.23/pngwrite.c ---- libpng-1.6.23.org/pngwrite.c 2016-06-09 22:21:54.212320317 +0900 -+++ libpng-1.6.23/pngwrite.c 2016-06-09 22:23:39.251105248 +0900 -@@ -128,6 +128,10 @@ - * the application continues writing the PNG. So check the 'invalid' - * flag here too. - */ -+#ifdef PNG_WRITE_APNG_SUPPORTED -+ if (info_ptr->valid & PNG_INFO_acTL) -+ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays); -+#endif - #ifdef PNG_GAMMA_SUPPORTED - # ifdef PNG_WRITE_gAMA_SUPPORTED - if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 && -@@ -365,6 +369,11 @@ - png_benign_error(png_ptr, "Wrote palette index exceeding num_palette"); - #endif ++#else + while (png_ptr->idat_size == 0) + { + png_crc_finish(png_ptr, 0); +@@ -4027,6 +4238,7 @@ + if (png_ptr->chunk_name != png_IDAT) + png_error(png_ptr, "Not enough image data"); + } ++#endif /* READ_APNG */ -+#ifdef PNG_WRITE_APNG_SUPPORTED -+ if (png_ptr->num_frames_written != png_ptr->num_frames_to_write) -+ png_error(png_ptr, "Not enough frames written"); + avail_in = png_ptr->IDAT_read_size; + +@@ -4090,6 +4302,9 @@ + + png_ptr->mode |= PNG_AFTER_IDAT; + png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; ++#ifdef PNG_READ_APNG_SUPPORTED ++ png_ptr->num_frames_read++; +#endif -+ - /* See if user wants us to write information chunks */ - if (info_ptr != NULL) - { -@@ -1450,6 +1459,43 @@ - } - #endif -+#ifdef PNG_WRITE_APNG_SUPPORTED -+void PNGAPI -+png_write_frame_head(png_structp png_ptr, png_infop info_ptr, -+ png_bytepp row_pointers, png_uint_32 width, png_uint_32 height, -+ png_uint_32 x_offset, png_uint_32 y_offset, -+ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op, -+ png_byte blend_op) + if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) + png_chunk_benign_error(png_ptr, "Extra compressed data"); +@@ -4528,4 +4743,80 @@ + + png_ptr->flags |= PNG_FLAG_ROW_INIT; + } ++ ++#ifdef PNG_READ_APNG_SUPPORTED ++/* This function is to be called after the main IDAT set has been read and ++ * before a new IDAT is read. It resets some parts of png_ptr ++ * to make them usable by the read functions again */ ++void /* PRIVATE */ ++png_read_reset(png_structp png_ptr) +{ -+ png_debug(1, "in png_write_frame_head"); ++ png_ptr->mode &= ~PNG_HAVE_IDAT; ++ png_ptr->mode &= ~PNG_AFTER_IDAT; ++ png_ptr->row_number = 0; ++ png_ptr->pass = 0; ++} + -+ /* there is a chance this has been set after png_write_info was called, -+ * so it would be set but not written. is there a way to be sure? */ -+ if (!(info_ptr->valid & PNG_INFO_acTL)) -+ png_error(png_ptr, "png_write_frame_head(): acTL not set"); ++void /* PRIVATE */ ++png_read_reinit(png_structp png_ptr, png_infop info_ptr) ++{ ++ png_ptr->width = info_ptr->next_frame_width; ++ png_ptr->height = info_ptr->next_frame_height; ++ png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width); ++ png_ptr->info_rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, ++ png_ptr->width); ++ if (png_ptr->prev_row != NULL) ++ memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1); ++} + -+ png_write_reset(png_ptr); ++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED ++/* same as png_read_reset() but for the progressive reader */ ++void /* PRIVATE */ ++png_progressive_read_reset(png_structp png_ptr) ++{ ++#ifdef PNG_READ_INTERLACING_SUPPORTED ++ /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ + -+ png_write_reinit(png_ptr, info_ptr, width, height); ++ /* Start of interlace block */ ++ static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; + -+ if ( !(png_ptr->num_frames_written == 0 && -+ (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ) ) -+ png_write_fcTL(png_ptr, width, height, x_offset, y_offset, -+ delay_num, delay_den, dispose_op, blend_op); ++ /* Offset to next interlace block */ ++ static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; + -+ PNG_UNUSED(row_pointers) -+} ++ /* Start of interlace block in the y direction */ ++ static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; + -+void PNGAPI -+png_write_frame_tail(png_structp png_ptr, png_infop info_ptr) -+{ -+ png_debug(1, "in png_write_frame_tail"); ++ /* Offset to next interlace block in the y direction */ ++ static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; + -+ png_ptr->num_frames_written++; ++ if (png_ptr->interlaced != 0) ++ { ++ if ((png_ptr->transformations & PNG_INTERLACE) == 0) ++ png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 - ++ png_pass_ystart[0]) / png_pass_yinc[0]; ++ else ++ png_ptr->num_rows = png_ptr->height; + -+ PNG_UNUSED(info_ptr) ++ png_ptr->iwidth = (png_ptr->width + ++ png_pass_inc[png_ptr->pass] - 1 - ++ png_pass_start[png_ptr->pass]) / ++ png_pass_inc[png_ptr->pass]; ++ } ++ else ++#endif /* READ_INTERLACING */ ++ { ++ png_ptr->num_rows = png_ptr->height; ++ png_ptr->iwidth = png_ptr->width; ++ } ++ png_ptr->flags &= ~PNG_FLAG_ZSTREAM_ENDED; ++ if (inflateReset(&(png_ptr->zstream)) != Z_OK) ++ png_error(png_ptr, "inflateReset failed"); ++ png_ptr->zstream.avail_in = 0; ++ png_ptr->zstream.next_in = 0; ++ png_ptr->zstream.next_out = png_ptr->row_buf; ++ png_ptr->zstream.avail_out = (uInt)PNG_ROWBYTES(png_ptr->pixel_depth, ++ png_ptr->iwidth) + 1; +} -+#endif /* PNG_WRITE_APNG_SUPPORTED */ - - #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED - /* Initialize the write structure - general purpose utility. */ -diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c ---- libpng-1.6.23.org/pngwutil.c 2016-06-09 22:21:54.213320353 +0900 -+++ libpng-1.6.23/pngwutil.c 2016-06-09 22:23:39.251105248 +0900 ++#endif /* PROGRESSIVE_READ */ ++#endif /* READ_APNG */ + #endif /* READ */ +Index: pngwutil.c +=================================================================== +--- pngwutil.c ++++ pngwutil.c @@ -817,6 +817,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1538,38 +1444,39 @@ diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c if ((png_ptr->do_filter) == PNG_NO_FILTERS) { if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || -@@ -998,7 +1003,14 @@ +@@ -998,7 +1003,15 @@ optimize_cmf(data, png_image_size(png_ptr)); #endif -+# ifdef PNG_WRITE_APNG_SUPPORTED -+ if (png_ptr->num_frames_written == 0) -+# endif ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ if (png_ptr->num_frames_written == 0) ++#endif png_write_complete_chunk(png_ptr, png_IDAT, data, size); -+# ifdef PNG_WRITE_APNG_SUPPORTED -+ else -+ png_write_fdAT(png_ptr, data, size); -+# endif /* PNG_WRITE_APNG_SUPPORTED */ ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ else ++ png_write_fdAT(png_ptr, data, size); ++#endif /* WRITE_APNG */ ++ png_ptr->mode |= PNG_HAVE_IDAT; png_ptr->zstream.next_out = data; -@@ -1044,7 +1056,15 @@ +@@ -1044,7 +1057,15 @@ optimize_cmf(data, png_image_size(png_ptr)); #endif -+# ifdef PNG_WRITE_APNG_SUPPORTED -+ if (png_ptr->num_frames_written == 0) -+# endif ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ if (png_ptr->num_frames_written == 0) ++#endif png_write_complete_chunk(png_ptr, png_IDAT, data, size); -+# ifdef PNG_WRITE_APNG_SUPPORTED -+ else -+ png_write_fdAT(png_ptr, data, size); -+# endif /* PNG_WRITE_APNG_SUPPORTED */ ++#ifdef PNG_WRITE_APNG_SUPPORTED ++ else ++ png_write_fdAT(png_ptr, data, size); ++#endif /* WRITE_APNG */ + png_ptr->zstream.avail_out = 0; png_ptr->zstream.next_out = NULL; png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; -@@ -1857,6 +1877,82 @@ +@@ -1858,6 +1879,82 @@ } #endif @@ -1584,7 +1491,7 @@ diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c + + png_ptr->num_frames_to_write = num_frames; + -+ if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ++ if ((png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) != 0) + num_frames--; + + png_save_uint_32(buf, num_frames); @@ -1647,12 +1554,12 @@ diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c + + png_ptr->next_seq_num++; +} -+#endif /* PNG_WRITE_APNG_SUPPORTED */ ++#endif /* WRITE_APNG */ + /* Initializes the row writing capability of libpng */ void /* PRIVATE */ png_write_start_row(png_structrp png_ptr) -@@ -2622,4 +2718,39 @@ +@@ -2752,4 +2849,39 @@ } #endif /* WRITE_FLUSH */ } @@ -1677,7 +1584,7 @@ diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c + "don't match the ones in IHDR"); + if (width > png_ptr->first_frame_width || + height > png_ptr->first_frame_height) -+ png_error(png_ptr, "width and/or height for a frame greater than" ++ png_error(png_ptr, "width and/or height for a frame greater than " + "the ones in IHDR"); + + png_set_IHDR(png_ptr, info_ptr, width, height, @@ -1690,11 +1597,12 @@ diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c + png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width); + png_ptr->usr_width = png_ptr->width; +} -+#endif /* PNG_WRITE_APNG_SUPPORTED */ ++#endif /* WRITE_APNG */ #endif /* WRITE */ -diff -Naru libpng-1.6.23.org/scripts/symbols.def libpng-1.6.23/scripts/symbols.def ---- libpng-1.6.23.org/scripts/symbols.def 2016-06-09 22:23:09.757042011 +0900 -+++ libpng-1.6.23/scripts/symbols.def 2016-06-09 22:23:39.251105248 +0900 +Index: scripts/symbols.def +=================================================================== +--- scripts/symbols.def ++++ scripts/symbols.def @@ -250,3 +250,23 @@ png_get_palette_max @243 png_set_option @244

1 0

ports/opt (3.2): libpng: updated to 1.6.25
by crux＠crux.nu 01 Sep '16

01 Sep '16

commit f69b9254e2eff2aa1bcaf924b0cd8cd88aacd23d Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Thu Sep 1 18:02:07 2016 +0200 libpng: updated to 1.6.25 diff --git a/libpng/.footprint b/libpng/.footprint index 841f5e5..d77aec3 100644 --- a/libpng/.footprint +++ b/libpng/.footprint @@ -3,7 +3,6 @@ drwxr-xr-x root/root usr/bin/ lrwxrwxrwx root/root usr/bin/libpng-config -> libpng16-config -rwxr-xr-x root/root usr/bin/libpng16-config -rwxr-xr-x root/root usr/bin/png-fix-itxt --rwxr-xr-x root/root usr/bin/pngcp -rwxr-xr-x root/root usr/bin/pngfix drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/libpng16/ @@ -19,9 +18,9 @@ lrwxrwxrwx root/root usr/lib/libpng.la -> libpng16.la lrwxrwxrwx root/root usr/lib/libpng.so -> libpng16.so -rw-r--r-- root/root usr/lib/libpng16.a -rwxr-xr-x root/root usr/lib/libpng16.la -lrwxrwxrwx root/root usr/lib/libpng16.so -> libpng16.so.16.24.0 -lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.24.0 --rwxr-xr-x root/root usr/lib/libpng16.so.16.24.0 +lrwxrwxrwx root/root usr/lib/libpng16.so -> libpng16.so.16.25.0 +lrwxrwxrwx root/root usr/lib/libpng16.so.16 -> libpng16.so.16.25.0 +-rwxr-xr-x root/root usr/lib/libpng16.so.16.25.0 drwxr-xr-x root/root usr/lib/pkgconfig/ lrwxrwxrwx root/root usr/lib/pkgconfig/libpng.pc -> libpng16.pc -rw-r--r-- root/root usr/lib/pkgconfig/libpng16.pc diff --git a/libpng/.md5sum b/libpng/.md5sum index a0b9e32..26d5a9f 100644 --- a/libpng/.md5sum +++ b/libpng/.md5sum @@ -1,2 +1,2 @@ -ffcdbd549814787fa8010c372e35ff25 libpng-1.6.24.tar.xz +0cb72ef57a576bfed1b6cb4b5a09b554 libpng-1.6.25.tar.xz c49ff77efebb8ab3dd8c10469e162d94 libpng-apng.patch diff --git a/libpng/Pkgfile b/libpng/Pkgfile index f2d44b1..64d9763 100644 --- a/libpng/Pkgfile +++ b/libpng/Pkgfile @@ -4,7 +4,7 @@ # Depends on: zlib name=libpng -version=1.6.24 +version=1.6.25 release=1 source=(http://download.sourceforge.net/$name/$name-$version.tar.xz \ $name-apng.patch)

1 0

ports/opt (3.2): Merge branch '3.2' of git://crux.nu/ports/opt into 3.2
by crux＠crux.nu 01 Sep '16

01 Sep '16

commit 61675d2b201c5fd68103563d85666dc5c04f780c Merge: 977baf7 09d7b69 Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve> Date: Thu Sep 1 12:25:47 2016 +0900 Merge branch '3.2' of git://crux.nu/ports/opt into 3.2

1 0

ports/opt (3.2): [notify] samba: 4.2.1 -> 4.2.14, changed init scripts to ssd, updated, man path
by crux＠crux.nu 01 Sep '16

01 Sep '16

commit 977baf71008fd9c3dc6d87e030bb85091c6224af Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve> Date: Thu Sep 1 12:17:24 2016 +0900 [notify] samba: 4.2.1 -> 4.2.14, changed init scripts to ssd, updated, man path Fixes CVE-2016-2119 Client side SMB2/3 required signing can be downgraded Summary: A man in the middle attack can disable client signing over SMB2/3, even if enforced by configuration parameters. Details: https://www.samba.org/samba/security/CVE-2016-2119.html diff --git a/samba/.footprint b/samba/.footprint index 5762b68..32a1e7d 100644 --- a/samba/.footprint +++ b/samba/.footprint @@ -595,6 +595,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/bare.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/dnsserver.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/misc.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/raw_protocol.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/registry.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/rpc_talloc.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/rpcecho.py @@ -606,7 +607,7 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/samba/tests/dcerpc/ -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/docs.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/dsdb.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/gensec.py --rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/getopt.py +-rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/get_opt.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/hostconfig.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/libsmb_samba_internal.py -rw-r--r-- root/root usr/lib/python2.7/site-packages/samba/tests/messaging.py @@ -774,6 +775,7 @@ drwxr-xr-x root/root usr/lib/samba/vfs/ -rwxr-xr-x root/root usr/lib/samba/vfs/shadow_copy.so -rwxr-xr-x root/root usr/lib/samba/vfs/shadow_copy2.so -rwxr-xr-x root/root usr/lib/samba/vfs/smb_traffic_analyzer.so +-rwxr-xr-x root/root usr/lib/samba/vfs/snapper.so -rwxr-xr-x root/root usr/lib/samba/vfs/streams_depot.so -rwxr-xr-x root/root usr/lib/samba/vfs/streams_xattr.so -rwxr-xr-x root/root usr/lib/samba/vfs/syncops.so @@ -781,116 +783,117 @@ drwxr-xr-x root/root usr/lib/samba/vfs/ -rwxr-xr-x root/root usr/lib/samba/vfs/worm.so -rwxr-xr-x root/root usr/lib/samba/vfs/xattr_tdb.so -rwxr-xr-x root/root usr/lib/winbind_krb5_locator.so -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/dbwrap_tool.1.gz --rw-r--r-- root/root usr/man/man1/findsmb.1.gz --rw-r--r-- root/root usr/man/man1/log2pcap.1.gz --rw-r--r-- root/root usr/man/man1/nmblookup.1.gz --rw-r--r-- root/root usr/man/man1/ntlm_auth.1.gz --rw-r--r-- root/root usr/man/man1/pidl.1pm.gz --rw-r--r-- root/root usr/man/man1/profiles.1.gz --rw-r--r-- root/root usr/man/man1/rpcclient.1.gz --rw-r--r-- root/root usr/man/man1/sharesec.1.gz --rw-r--r-- root/root usr/man/man1/smbcacls.1.gz --rw-r--r-- root/root usr/man/man1/smbclient.1.gz --rw-r--r-- root/root usr/man/man1/smbcontrol.1.gz --rw-r--r-- root/root usr/man/man1/smbcquotas.1.gz --rw-r--r-- root/root usr/man/man1/smbget.1.gz --rw-r--r-- root/root usr/man/man1/smbstatus.1.gz --rw-r--r-- root/root usr/man/man1/smbtar.1.gz --rw-r--r-- root/root usr/man/man1/smbtree.1.gz --rw-r--r-- root/root usr/man/man1/testparm.1.gz --rw-r--r-- root/root usr/man/man1/vfstest.1.gz --rw-r--r-- root/root usr/man/man1/wbinfo.1.gz -drwxr-xr-x root/root usr/man/man3/ --rw-r--r-- root/root usr/man/man3/Parse::Pidl::Dump.3pm.gz --rw-r--r-- root/root usr/man/man3/Parse::Pidl::NDR.3pm.gz --rw-r--r-- root/root usr/man/man3/Parse::Pidl::Util.3pm.gz --rw-r--r-- root/root usr/man/man3/Parse::Pidl::Wireshark::Conformance.3pm.gz --rw-r--r-- root/root usr/man/man3/Parse::Pidl::Wireshark::NDR.3pm.gz -drwxr-xr-x root/root usr/man/man5/ --rw-r--r-- root/root usr/man/man5/lmhosts.5.gz --rw-r--r-- root/root usr/man/man5/pam_winbind.conf.5.gz --rw-r--r-- root/root usr/man/man5/smb.conf.5.gz --rw-r--r-- root/root usr/man/man5/smbgetrc.5.gz --rw-r--r-- root/root usr/man/man5/smbpasswd.5.gz -drwxr-xr-x root/root usr/man/man7/ --rw-r--r-- root/root usr/man/man7/libsmbclient.7.gz --rw-r--r-- root/root usr/man/man7/samba.7.gz --rw-r--r-- root/root usr/man/man7/winbind_krb5_locator.7.gz -drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/eventlogadm.8.gz --rw-r--r-- root/root usr/man/man8/idmap_ad.8.gz --rw-r--r-- root/root usr/man/man8/idmap_autorid.8.gz --rw-r--r-- root/root usr/man/man8/idmap_hash.8.gz --rw-r--r-- root/root usr/man/man8/idmap_ldap.8.gz --rw-r--r-- root/root usr/man/man8/idmap_nss.8.gz --rw-r--r-- root/root usr/man/man8/idmap_rfc2307.8.gz --rw-r--r-- root/root usr/man/man8/idmap_rid.8.gz --rw-r--r-- root/root usr/man/man8/idmap_tdb.8.gz --rw-r--r-- root/root usr/man/man8/idmap_tdb2.8.gz --rw-r--r-- root/root usr/man/man8/net.8.gz --rw-r--r-- root/root usr/man/man8/nmbd.8.gz --rw-r--r-- root/root usr/man/man8/pam_winbind.8.gz --rw-r--r-- root/root usr/man/man8/pdbedit.8.gz --rw-r--r-- root/root usr/man/man8/samba-regedit.8.gz --rw-r--r-- root/root usr/man/man8/samba-tool.8.gz --rw-r--r-- root/root usr/man/man8/samba.8.gz --rw-r--r-- root/root usr/man/man8/smbd.8.gz --rw-r--r-- root/root usr/man/man8/smbpasswd.8.gz --rw-r--r-- root/root usr/man/man8/smbspool.8.gz --rw-r--r-- root/root usr/man/man8/smbta-util.8.gz --rw-r--r-- root/root usr/man/man8/vfs_acl_tdb.8.gz --rw-r--r-- root/root usr/man/man8/vfs_acl_xattr.8.gz --rw-r--r-- root/root usr/man/man8/vfs_aio_fork.8.gz --rw-r--r-- root/root usr/man/man8/vfs_aio_linux.8.gz --rw-r--r-- root/root usr/man/man8/vfs_aio_pthread.8.gz --rw-r--r-- root/root usr/man/man8/vfs_audit.8.gz --rw-r--r-- root/root usr/man/man8/vfs_btrfs.8.gz --rw-r--r-- root/root usr/man/man8/vfs_cacheprime.8.gz --rw-r--r-- root/root usr/man/man8/vfs_cap.8.gz --rw-r--r-- root/root usr/man/man8/vfs_catia.8.gz --rw-r--r-- root/root usr/man/man8/vfs_ceph.8.gz --rw-r--r-- root/root usr/man/man8/vfs_commit.8.gz --rw-r--r-- root/root usr/man/man8/vfs_crossrename.8.gz --rw-r--r-- root/root usr/man/man8/vfs_default_quota.8.gz --rw-r--r-- root/root usr/man/man8/vfs_dirsort.8.gz --rw-r--r-- root/root usr/man/man8/vfs_extd_audit.8.gz --rw-r--r-- root/root usr/man/man8/vfs_fake_perms.8.gz --rw-r--r-- root/root usr/man/man8/vfs_fileid.8.gz --rw-r--r-- root/root usr/man/man8/vfs_fruit.8.gz --rw-r--r-- root/root usr/man/man8/vfs_full_audit.8.gz --rw-r--r-- root/root usr/man/man8/vfs_glusterfs.8.gz --rw-r--r-- root/root usr/man/man8/vfs_gpfs.8.gz --rw-r--r-- root/root usr/man/man8/vfs_linux_xfs_sgid.8.gz --rw-r--r-- root/root usr/man/man8/vfs_media_harmony.8.gz --rw-r--r-- root/root usr/man/man8/vfs_netatalk.8.gz --rw-r--r-- root/root usr/man/man8/vfs_notify_fam.8.gz --rw-r--r-- root/root usr/man/man8/vfs_prealloc.8.gz --rw-r--r-- root/root usr/man/man8/vfs_preopen.8.gz --rw-r--r-- root/root usr/man/man8/vfs_readahead.8.gz --rw-r--r-- root/root usr/man/man8/vfs_readonly.8.gz --rw-r--r-- root/root usr/man/man8/vfs_recycle.8.gz --rw-r--r-- root/root usr/man/man8/vfs_scannedonly.8.gz --rw-r--r-- root/root usr/man/man8/vfs_shadow_copy.8.gz --rw-r--r-- root/root usr/man/man8/vfs_shadow_copy2.8.gz --rw-r--r-- root/root usr/man/man8/vfs_smb_traffic_analyzer.8.gz --rw-r--r-- root/root usr/man/man8/vfs_snapper.8.gz --rw-r--r-- root/root usr/man/man8/vfs_streams_depot.8.gz --rw-r--r-- root/root usr/man/man8/vfs_streams_xattr.8.gz --rw-r--r-- root/root usr/man/man8/vfs_syncops.8.gz --rw-r--r-- root/root usr/man/man8/vfs_time_audit.8.gz --rw-r--r-- root/root usr/man/man8/vfs_tsmsm.8.gz --rw-r--r-- root/root usr/man/man8/vfs_worm.8.gz --rw-r--r-- root/root usr/man/man8/vfs_xattr_tdb.8.gz --rw-r--r-- root/root usr/man/man8/vfs_zfsacl.8.gz --rw-r--r-- root/root usr/man/man8/winbindd.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/nmbd -rwxr-xr-x root/root usr/sbin/smbd -rwxr-xr-x root/root usr/sbin/winbindd drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/dbwrap_tool.1.gz +-rw-r--r-- root/root usr/share/man/man1/findsmb.1.gz +-rw-r--r-- root/root usr/share/man/man1/log2pcap.1.gz +-rw-r--r-- root/root usr/share/man/man1/nmblookup.1.gz +-rw-r--r-- root/root usr/share/man/man1/ntlm_auth.1.gz +-rw-r--r-- root/root usr/share/man/man1/pidl.1pm.gz +-rw-r--r-- root/root usr/share/man/man1/profiles.1.gz +-rw-r--r-- root/root usr/share/man/man1/rpcclient.1.gz +-rw-r--r-- root/root usr/share/man/man1/sharesec.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbcacls.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbclient.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbcontrol.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbcquotas.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbget.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbstatus.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbtar.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbtree.1.gz +-rw-r--r-- root/root usr/share/man/man1/testparm.1.gz +-rw-r--r-- root/root usr/share/man/man1/vfstest.1.gz +-rw-r--r-- root/root usr/share/man/man1/wbinfo.1.gz +drwxr-xr-x root/root usr/share/man/man3/ +-rw-r--r-- root/root usr/share/man/man3/Parse::Pidl::Dump.3pm.gz +-rw-r--r-- root/root usr/share/man/man3/Parse::Pidl::NDR.3pm.gz +-rw-r--r-- root/root usr/share/man/man3/Parse::Pidl::Util.3pm.gz +-rw-r--r-- root/root usr/share/man/man3/Parse::Pidl::Wireshark::Conformance.3pm.gz +-rw-r--r-- root/root usr/share/man/man3/Parse::Pidl::Wireshark::NDR.3pm.gz +drwxr-xr-x root/root usr/share/man/man5/ +-rw-r--r-- root/root usr/share/man/man5/lmhosts.5.gz +-rw-r--r-- root/root usr/share/man/man5/pam_winbind.conf.5.gz +-rw-r--r-- root/root usr/share/man/man5/smb.conf.5.gz +-rw-r--r-- root/root usr/share/man/man5/smbgetrc.5.gz +-rw-r--r-- root/root usr/share/man/man5/smbpasswd.5.gz +drwxr-xr-x root/root usr/share/man/man7/ +-rw-r--r-- root/root usr/share/man/man7/libsmbclient.7.gz +-rw-r--r-- root/root usr/share/man/man7/samba.7.gz +-rw-r--r-- root/root usr/share/man/man7/winbind_krb5_locator.7.gz +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/eventlogadm.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_ad.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_autorid.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_hash.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_ldap.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_nss.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_rfc2307.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_rid.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_tdb.8.gz +-rw-r--r-- root/root usr/share/man/man8/idmap_tdb2.8.gz +-rw-r--r-- root/root usr/share/man/man8/net.8.gz +-rw-r--r-- root/root usr/share/man/man8/nmbd.8.gz +-rw-r--r-- root/root usr/share/man/man8/pam_winbind.8.gz +-rw-r--r-- root/root usr/share/man/man8/pdbedit.8.gz +-rw-r--r-- root/root usr/share/man/man8/samba-regedit.8.gz +-rw-r--r-- root/root usr/share/man/man8/samba-tool.8.gz +-rw-r--r-- root/root usr/share/man/man8/samba.8.gz +-rw-r--r-- root/root usr/share/man/man8/smbd.8.gz +-rw-r--r-- root/root usr/share/man/man8/smbpasswd.8.gz +-rw-r--r-- root/root usr/share/man/man8/smbspool.8.gz +-rw-r--r-- root/root usr/share/man/man8/smbspool_krb5_wrapper.8.gz +-rw-r--r-- root/root usr/share/man/man8/smbta-util.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_acl_tdb.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_acl_xattr.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_aio_fork.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_aio_linux.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_aio_pthread.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_audit.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_btrfs.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_cacheprime.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_cap.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_catia.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_ceph.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_commit.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_crossrename.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_default_quota.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_dirsort.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_extd_audit.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_fake_perms.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_fileid.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_fruit.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_full_audit.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_glusterfs.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_gpfs.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_linux_xfs_sgid.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_media_harmony.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_netatalk.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_notify_fam.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_prealloc.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_preopen.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_readahead.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_readonly.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_recycle.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_scannedonly.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_shadow_copy.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_shadow_copy2.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_smb_traffic_analyzer.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_snapper.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_streams_depot.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_streams_xattr.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_syncops.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_time_audit.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_tsmsm.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_worm.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_xattr_tdb.8.gz +-rw-r--r-- root/root usr/share/man/man8/vfs_zfsacl.8.gz +-rw-r--r-- root/root usr/share/man/man8/winbindd.8.gz drwxr-xr-x root/root usr/share/samba/ drwxr-xr-x root/root usr/share/samba/codepages/ -rw-r--r-- root/root usr/share/samba/codepages/lowcase.dat diff --git a/samba/.md5sum b/samba/.md5sum index b0ddc31..306bb3b 100644 --- a/samba/.md5sum +++ b/samba/.md5sum @@ -1,7 +1,6 @@ -e19e48b72077085b3e91b40382ccf4fa nmbd.rc +f3c85f6f57f662f2373001506cd50a8a nmbd.rc 1a33242498a7494e2b8128b27eece764 samba-4.2.1-krb5.patch -614b4c7b9bbc70cff4cb56956f565741 samba-4.2.1.tar.gz +bea34f5dcd055a73cee3e69218fb545c samba-4.2.14.tar.gz 84266d28273c12045e18ea34c504c296 samba.rc -14f80643ec7508794f5dfc5598daa667 smbd.rc -c3ee08e140a10ba919833cb120fa8c5f v2-0001-s4-lib-tls-use-gnutls_priority_set_direct.patch -3449060f819db4be400399ca5d0708f5 winbindd.rc +41ae232d0511d3246d4a362296c8115a smbd.rc +c6eabe25403afa2500ec47f71eb1bba6 winbindd.rc diff --git a/samba/Pkgfile b/samba/Pkgfile index c0e4885..e2f22a7 100644 --- a/samba/Pkgfile +++ b/samba/Pkgfile @@ -6,11 +6,10 @@ # Optional: cups name=samba -version=4.2.1 +version=4.2.14 release=4 source=( http://www.samba.org/samba/ftp/stable/$name-$version.tar.gz -v2-0001-s4-lib-tls-use-gnutls_priority_set_direct.patch samba-4.2.1-krb5.patch samba.rc nmbd.rc @@ -25,18 +24,13 @@ build () { # https://bugzilla.samba.org/show_bug.cgi?id=11165 patch -p1 -i $SRC/samba-4.2.1-krb5.patch - # fix for gnutls-3.4.0 removal of gnutls_certificate_type_set_priority() - # https://bugzilla.samba.org/show_bug.cgi?id=8780 - patch -p1 -i $SRC/v2-0001-s4-lib-tls-use-gnutls_priority_set_direct.patch - # we should define vendorlib in our perl port - sed -ri 's/(vendor)(arch|lib|prefix)/site\2/' buildtools/wafsamba/samba_perl.py + sed -ri 's:(vendor)(arch|lib|prefix):site\2:' buildtools/wafsamba/samba_perl.py ./configure \ --enable-fhs \ --prefix=/usr \ --localstatedir=/var \ - --mandir=/usr/man \ --sysconfdir=/etc \ --with-privatedir=/etc/samba/private \ --bundled-libraries=NONE \ @@ -47,7 +41,7 @@ build () { # man pages for i in docs/manpages/*; do - install -D -m 644 $i $PKG/usr/man/man${i##*.}/${i##*/} + install -D -m 644 $i $PKG/usr/share/man/man${i##*.}/${i##*/} done # cleanup diff --git a/samba/nmbd.rc b/samba/nmbd.rc index dd63a07..85a43e9 100755 --- a/samba/nmbd.rc +++ b/samba/nmbd.rc @@ -1,76 +1,36 @@ -#!/bin/bash +#!/bin/sh + +PATH="/sbin:/usr/sbin:/bin:/usr/bin" NAME="nmbd" USER="root" RUNDIR="/var/run/samba" -PIDFILE="" -STARTCMD="/usr/sbin/nmbd" -STOPCMD="/usr/bin/smbcontrol $NAME shutdown" -STOPTIMEOUT="300" - -function getpid() { - if [ -z "$PIDFILE" ]; then - pid="$(pgrep -xfn "$STARTCMD")" - else - if [ -f "$PIDFILE" ]; then - pid=$(< $PIDFILE) - if [ ! -d /proc/"$pid" ]; then - echo "$NAME: removing stale pidfile $PIDFILE" >&2 - rm -f "$PIDFILE" - unset pid - fi - fi - fi - echo "$pid" -} +PIDFILE="$RUNDIR/$NAME.pid" +PROG="/usr/sbin/$NAME" case $1 in start) - pid=$(getpid) install -d -m 755 -o $USER $RUNDIR || exit 1 - if [ -n "$pid" ]; then - echo "$NAME already running with pid $pid" >&2 - exit 1 - fi - eval "$STARTCMD" + start-stop-daemon --start --pidfile $PIDFILE --exec $PROG -- $ARGS ;; stop) - pid=$(getpid) - if [ -n "$pid" ]; then - if [ -n "$STOPCMD" ]; then - eval "$STOPCMD" - else - kill "$pid" - fi - t=$(printf '%(%s)T' -1) - tend=$((t+STOPTIMEOUT)) - while [ -d /proc/$pid -a $t -lt $tend ]; do - sleep 0.5 - t=$(printf '%(%s)T' -1) - done - if [ -d /proc/"$pid" ]; then - echo "$NAME still running with pid $pid" >&2 - else - [ -n "$PIDFILE" ] && rm -f "$PIDFILE" - fi - else - echo "$NAME is not running" >&2 - fi - ;; -reload) - /usr/bin/smbcontrol $NAME reload-config + start-stop-daemon --stop --retry 30 --pidfile $PIDFILE ;; restart) $0 stop $0 start ;; status) - pid=$(getpid) - if [ -n "$pid" ]; then - echo "$NAME is running with pid $pid" - else - echo "$NAME is not running" - fi + start-stop-daemon --status --pidfile $PIDFILE + case $? in + 0) echo "$PROG running with pid: $(cat $PIDFILE)" ;; + 1) echo "$PROG not running, stale pidfile: $PIDFILE" ;; + 3) echo "$PROG not running" ;; + 4) echo "Unable to determine program status" ;; + esac + ;; +reload) + smbcontrol $NAME reload-config ;; *) echo "usage: $0 [start|stop|restart|reload|status]" diff --git a/samba/smbd.rc b/samba/smbd.rc index 0c22f3c..f93c6cc 100755 --- a/samba/smbd.rc +++ b/samba/smbd.rc @@ -1,76 +1,36 @@ -#!/bin/bash +#!/bin/sh + +PATH="/sbin:/usr/sbin:/bin:/usr/bin" NAME="smbd" USER="root" RUNDIR="/var/run/samba" -PIDFILE="" -STARTCMD="/usr/sbin/smbd" -STOPCMD="/usr/bin/smbcontrol $NAME shutdown" -STOPTIMEOUT="300" - -function getpid() { - if [ -z "$PIDFILE" ]; then - pid="$(pgrep -xfn "$STARTCMD")" - else - if [ -f "$PIDFILE" ]; then - pid=$(< $PIDFILE) - if [ ! -d /proc/"$pid" ]; then - echo "$NAME: removing stale pidfile $PIDFILE" >&2 - rm -f "$PIDFILE" - unset pid - fi - fi - fi - echo "$pid" -} +PIDFILE="$RUNDIR/$NAME.pid" +PROG="/usr/sbin/$NAME" case $1 in start) - pid=$(getpid) install -d -m 755 -o $USER $RUNDIR || exit 1 - if [ -n "$pid" ]; then - echo "$NAME already running with pid $pid" >&2 - exit 1 - fi - eval "$STARTCMD" + start-stop-daemon --start --pidfile $PIDFILE --exec $PROG -- $ARGS ;; stop) - pid=$(getpid) - if [ -n "$pid" ]; then - if [ -n "$STOPCMD" ]; then - eval "$STOPCMD" - else - kill "$pid" - fi - t=$(printf '%(%s)T' -1) - tend=$((t+STOPTIMEOUT)) - while [ -d /proc/$pid -a $t -lt $tend ]; do - sleep 0.5 - t=$(printf '%(%s)T' -1) - done - if [ -d /proc/"$pid" ]; then - echo "$NAME still running with pid $pid" >&2 - else - [ -n "$PIDFILE" ] && rm -f "$PIDFILE" - fi - else - echo "$NAME is not running" >&2 - fi - ;; -reload) - /usr/bin/smbcontrol $NAME reload-config + start-stop-daemon --stop --retry 30 --pidfile $PIDFILE ;; restart) $0 stop $0 start ;; status) - pid=$(getpid) - if [ -n "$pid" ]; then - echo "$NAME is running with pid $pid" - else - echo "$NAME is not running" - fi + start-stop-daemon --status --pidfile $PIDFILE + case $? in + 0) echo "$PROG running with pid: $(cat $PIDFILE)" ;; + 1) echo "$PROG not running, stale pidfile: $PIDFILE" ;; + 3) echo "$PROG not running" ;; + 4) echo "Unable to determine program status" ;; + esac + ;; +reload) + smbcontrol $NAME reload-config ;; *) echo "usage: $0 [start|stop|restart|reload|status]" diff --git a/samba/v2-0001-s4-lib-tls-use-gnutls_priority_set_direct.patch b/samba/v2-0001-s4-lib-tls-use-gnutls_priority_set_direct.patch deleted file mode 100644 index f61e0a9..0000000 --- a/samba/v2-0001-s4-lib-tls-use-gnutls_priority_set_direct.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 17f386f2a9462efe4d4cbf58e55d164923e11af5 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evangelos(a)foutrelis.com> -Date: Mon, 13 Apr 2015 23:11:14 +0300 -Subject: [PATCH v2] s4:lib/tls: use gnutls_priority_set_direct() - -gnutls_certificate_type_set_priority() was removed in GnuTLS 3.4.0. ---- - source4/lib/tls/tls.c | 3 +-- - source4/lib/tls/tls_tstream.c | 7 +------ - 2 files changed, 2 insertions(+), 8 deletions(-) - -diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c -index b9182ad..2fe4ff7 100644 ---- a/source4/lib/tls/tls.c -+++ b/source4/lib/tls/tls.c -@@ -572,7 +572,6 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx, - { - struct tls_context *tls; - int ret = 0; -- const int cert_type_priority[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; - struct socket_context *new_sock; - NTSTATUS nt_status; - -@@ -598,7 +597,7 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx, - gnutls_certificate_set_x509_trust_file(tls->xcred, ca_path, GNUTLS_X509_FMT_PEM); - TLSCHECK(gnutls_init(&tls->session, GNUTLS_CLIENT)); - TLSCHECK(gnutls_set_default_priority(tls->session)); -- gnutls_certificate_type_set_priority(tls->session, cert_type_priority); -+ gnutls_priority_set_direct(tls->session, "NORMAL:+CTYPE-OPENPGP", NULL); - TLSCHECK(gnutls_credentials_set(tls->session, GNUTLS_CRD_CERTIFICATE, tls->xcred)); - - talloc_set_destructor(tls, tls_destructor); -diff --git a/source4/lib/tls/tls_tstream.c b/source4/lib/tls/tls_tstream.c -index f19f5c5..5b2329b 100644 ---- a/source4/lib/tls/tls_tstream.c -+++ b/source4/lib/tls/tls_tstream.c -@@ -967,11 +967,6 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx, - #if ENABLE_GNUTLS - struct tstream_tls *tlss; - int ret; -- static const int cert_type_priority[] = { -- GNUTLS_CRT_X509, -- GNUTLS_CRT_OPENPGP, -- 0 -- }; - #endif /* ENABLE_GNUTLS */ - - req = tevent_req_create(mem_ctx, &state, -@@ -1014,7 +1009,7 @@ struct tevent_req *_tstream_tls_connect_send(TALLOC_CTX *mem_ctx, - return tevent_req_post(req, ev); - } - -- gnutls_certificate_type_set_priority(tlss->tls_session, cert_type_priority); -+ gnutls_priority_set_direct(tlss->tls_session, "NORMAL:+CTYPE-OPENPGP", NULL); - - ret = gnutls_credentials_set(tlss->tls_session, - GNUTLS_CRD_CERTIFICATE, --- -2.3.5 - diff --git a/samba/winbindd.rc b/samba/winbindd.rc index 4bcfa49..1861d67 100755 --- a/samba/winbindd.rc +++ b/samba/winbindd.rc @@ -1,76 +1,36 @@ -#!/bin/bash +#!/bin/sh + +PATH="/sbin:/usr/sbin:/bin:/usr/bin" NAME="winbindd" USER="root" RUNDIR="/var/run/samba" -PIDFILE="" -STARTCMD="/usr/sbin/winbindd" -STOPCMD="/usr/bin/smbcontrol $NAME shutdown" -STOPTIMEOUT="300" - -function getpid() { - if [ -z "$PIDFILE" ]; then - pid="$(pgrep -xfn "$STARTCMD")" - else - if [ -f "$PIDFILE" ]; then - pid=$(< $PIDFILE) - if [ ! -d /proc/"$pid" ]; then - echo "$NAME: removing stale pidfile $PIDFILE" >&2 - rm -f "$PIDFILE" - unset pid - fi - fi - fi - echo "$pid" -} +PIDFILE="$RUNDIR/$NAME.pid" +PROG="/usr/sbin/$NAME" case $1 in start) - pid=$(getpid) install -d -m 755 -o $USER $RUNDIR || exit 1 - if [ -n "$pid" ]; then - echo "$NAME already running with pid $pid" >&2 - exit 1 - fi - eval "$STARTCMD" + start-stop-daemon --start --pidfile $PIDFILE --exec $PROG -- $ARGS ;; stop) - pid=$(getpid) - if [ -n "$pid" ]; then - if [ -n "$STOPCMD" ]; then - eval "$STOPCMD" - else - kill "$pid" - fi - t=$(printf '%(%s)T' -1) - tend=$((t+STOPTIMEOUT)) - while [ -d /proc/$pid -a $t -lt $tend ]; do - sleep 0.5 - t=$(printf '%(%s)T' -1) - done - if [ -d /proc/"$pid" ]; then - echo "$NAME still running with pid $pid" >&2 - else - [ -n "$PIDFILE" ] && rm -f "$PIDFILE" - fi - else - echo "$NAME is not running" >&2 - fi - ;; -reload) - /usr/bin/smbcontrol $NAME reload-config + start-stop-daemon --stop --retry 30 --pidfile $PIDFILE ;; restart) $0 stop $0 start ;; status) - pid=$(getpid) - if [ -n "$pid" ]; then - echo "$NAME is running with pid $pid" - else - echo "$NAME is not running" - fi + start-stop-daemon --status --pidfile $PIDFILE + case $? in + 0) echo "$PROG running with pid: $(cat $PIDFILE)" ;; + 1) echo "$PROG not running, stale pidfile: $PIDFILE" ;; + 3) echo "$PROG not running" ;; + 4) echo "Unable to determine program status" ;; + esac + ;; +reload) + smbcontrol $NAME reload-config ;; *) echo "usage: $0 [start|stop|restart|reload|status]"

1 0

ports/opt (3.2): socket_wrapper: 1.1.3 -> 1.1.7, updated man path
by crux＠crux.nu 01 Sep '16

01 Sep '16

commit b2f6ba03435fd4baf9826f398708dd8ec0b02221 Author: Alan Mizrahi <alan+crux(a)mizrahi.com.ve> Date: Thu Sep 1 12:14:41 2016 +0900 socket_wrapper: 1.1.3 -> 1.1.7, updated man path diff --git a/socket_wrapper/.footprint b/socket_wrapper/.footprint index a884113..9299a71 100644 --- a/socket_wrapper/.footprint +++ b/socket_wrapper/.footprint @@ -5,10 +5,11 @@ drwxr-xr-x root/root usr/lib/cmake/socket_wrapper/ -rw-r--r-- root/root usr/lib/cmake/socket_wrapper/socket_wrapper-config-version.cmake -rw-r--r-- root/root usr/lib/cmake/socket_wrapper/socket_wrapper-config.cmake lrwxrwxrwx root/root usr/lib/libsocket_wrapper.so -> libsocket_wrapper.so.0 -lrwxrwxrwx root/root usr/lib/libsocket_wrapper.so.0 -> libsocket_wrapper.so.0.1.3 --rwxr-xr-x root/root usr/lib/libsocket_wrapper.so.0.1.3 +lrwxrwxrwx root/root usr/lib/libsocket_wrapper.so.0 -> libsocket_wrapper.so.0.1.7 +-rwxr-xr-x root/root usr/lib/libsocket_wrapper.so.0.1.7 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/socket_wrapper.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/socket_wrapper.1.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/socket_wrapper.1.gz diff --git a/socket_wrapper/.md5sum b/socket_wrapper/.md5sum index 4a0a4b5..7dc191d 100644 --- a/socket_wrapper/.md5sum +++ b/socket_wrapper/.md5sum @@ -1 +1 @@ -c97b558f7c7dd17154c2c19d49897de2 socket_wrapper-1.1.3.tar.gz +695d9e0096c8fc5b66535f72a268598a socket_wrapper-1.1.7.tar.gz diff --git a/socket_wrapper/Pkgfile b/socket_wrapper/Pkgfile index 32517c0..a738295 100644 --- a/socket_wrapper/Pkgfile +++ b/socket_wrapper/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake name=socket_wrapper -version=1.1.3 +version=1.1.7 release=1 source=(https://ftp.samba.org/pub/cwrap/$name-$version.tar.gz) @@ -14,8 +14,7 @@ build() { cmake ../$name-$version \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DMAN_INSTALL_DIR=/usr/man + -DCMAKE_INSTALL_PREFIX=/usr make make DESTDIR=$PKG install

1 0