* [PATCH 0/3] Update image libaries (libjpeg, libtiff, libpng)
@ 2016-06-26 9:35 Marcel Lorenz
2016-06-26 9:35 ` [PATCH 1/3] libjpeg: update to 1.4.2 Marcel Lorenz
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Marcel Lorenz @ 2016-06-26 9:35 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 971 bytes --]
The next 3 patches update the image libaries to the last versions
with many security fixes.
They are necessary for apache 2.4.x update and other software (netpbm)
Please merge this patches first.
Marcel Lorenz (3):
libjpeg: update to 1.4.2
libtiff: update to 4.0.6
libpng: update to 1.2.56
config/rootfiles/common/libjpeg | 19 +-
config/rootfiles/common/libjpeg-compat | 33 ++++
config/rootfiles/common/libpng | 13 +-
config/rootfiles/packages/libtiff | 310 ++++++++++++++++++---------------
lfs/libjpeg | 14 +-
lfs/libjpeg-compat | 80 +++++++++
lfs/libpng | 11 +-
lfs/libtiff | 13 +-
make.sh | 1 +
9 files changed, 313 insertions(+), 181 deletions(-)
create mode 100644 config/rootfiles/common/libjpeg-compat
create mode 100644 lfs/libjpeg-compat
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] libjpeg: update to 1.4.2
2016-06-26 9:35 [PATCH 0/3] Update image libaries (libjpeg, libtiff, libpng) Marcel Lorenz
@ 2016-06-26 9:35 ` Marcel Lorenz
2016-06-26 9:35 ` [PATCH 2/3] libtiff: update to 4.0.6 Marcel Lorenz
2016-06-26 9:35 ` [PATCH 3/3] libpng: update to 1.2.56 Marcel Lorenz
2 siblings, 0 replies; 4+ messages in thread
From: Marcel Lorenz @ 2016-06-26 9:35 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 8276 bytes --]
The old libjpeg is renamed to libjpeg-compat
The compat makes the old libs maintainable
The new 1.4.2 is build after the old and all IPFire componentes will
build with the new libary
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/common/libjpeg | 19 ++++++--
config/rootfiles/common/libjpeg-compat | 33 ++++++++++++++
lfs/libjpeg | 14 +++---
lfs/libjpeg-compat | 80 ++++++++++++++++++++++++++++++++++
make.sh | 1 +
5 files changed, 138 insertions(+), 9 deletions(-)
create mode 100644 config/rootfiles/common/libjpeg-compat
create mode 100644 lfs/libjpeg-compat
diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg
index 7ceb697..4df7565 100644
--- a/config/rootfiles/common/libjpeg
+++ b/config/rootfiles/common/libjpeg
@@ -12,13 +12,13 @@
#usr/lib/libjpeg.a
#usr/lib/libjpeg.la
#usr/lib/libjpeg.so
-usr/lib/libjpeg.so.62
-usr/lib/libjpeg.so.62.1.0
+usr/lib/libjpeg.so.8
+usr/lib/libjpeg.so.8.0.2
#usr/lib/libturbojpeg.a
#usr/lib/libturbojpeg.la
#usr/lib/libturbojpeg.so
usr/lib/libturbojpeg.so.0
-usr/lib/libturbojpeg.so.0.0.0
+usr/lib/libturbojpeg.so.0.1.0
#usr/man/man1/cjpeg.1
#usr/man/man1/djpeg.1
#usr/man/man1/jpegtran.1
@@ -31,3 +31,16 @@ usr/lib/libturbojpeg.so.0.0.0
#usr/share/doc/structure.txt
#usr/share/doc/usage.txt
#usr/share/doc/wizard.txt
+#usr/share/man/man1/cjpeg.1
+#usr/share/man/man1/djpeg.1
+#usr/share/man/man1/jpegtran.1
+#usr/share/man/man1/rdjpgcom.1
+#usr/share/man/man1/wrjpgcom.1
+#usr/share/doc/libjpeg-turbo
+#usr/share/doc/libjpeg-turbo/README
+#usr/share/doc/libjpeg-turbo/README-turbo.txt
+#usr/share/doc/libjpeg-turbo/example.c
+#usr/share/doc/libjpeg-turbo/libjpeg.txt
+#usr/share/doc/libjpeg-turbo/structure.txt
+#usr/share/doc/libjpeg-turbo/usage.txt
+#usr/share/doc/libjpeg-turbo/wizard.txt
diff --git a/config/rootfiles/common/libjpeg-compat b/config/rootfiles/common/libjpeg-compat
new file mode 100644
index 0000000..7ceb697
--- /dev/null
+++ b/config/rootfiles/common/libjpeg-compat
@@ -0,0 +1,33 @@
+#usr/bin/cjpeg
+#usr/bin/djpeg
+#usr/bin/jpegtran
+#usr/bin/rdjpgcom
+#usr/bin/tjbench
+#usr/bin/wrjpgcom
+#usr/include/jconfig.h
+#usr/include/jerror.h
+#usr/include/jmorecfg.h
+#usr/include/jpeglib.h
+#usr/include/turbojpeg.h
+#usr/lib/libjpeg.a
+#usr/lib/libjpeg.la
+#usr/lib/libjpeg.so
+usr/lib/libjpeg.so.62
+usr/lib/libjpeg.so.62.1.0
+#usr/lib/libturbojpeg.a
+#usr/lib/libturbojpeg.la
+#usr/lib/libturbojpeg.so
+usr/lib/libturbojpeg.so.0
+usr/lib/libturbojpeg.so.0.0.0
+#usr/man/man1/cjpeg.1
+#usr/man/man1/djpeg.1
+#usr/man/man1/jpegtran.1
+#usr/man/man1/rdjpgcom.1
+#usr/man/man1/wrjpgcom.1
+#usr/share/doc/README
+#usr/share/doc/README-turbo.txt
+#usr/share/doc/example.c
+#usr/share/doc/libjpeg.txt
+#usr/share/doc/structure.txt
+#usr/share/doc/usage.txt
+#usr/share/doc/wizard.txt
diff --git a/lfs/libjpeg b/lfs/libjpeg
index 8b4c077..b9dffac 100644
--- a/lfs/libjpeg
+++ b/lfs/libjpeg
@@ -24,15 +24,12 @@
include Config
-VER = 1.3.1
-
+VER = 1.4.2
THISAPP = libjpeg-turbo-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libjpeg
-PAK_VER = ipfire-beta1
###############################################################################
# Top-level Rules
@@ -42,7 +39,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05
+$(DL_FILE)_MD5 = 86b0d5f7507c2e6c21c00219162c3c44
install : $(TARGET)
@@ -72,9 +69,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --disable-static \
+ --with-jpeg8 \
+ --mandir=/usr/share/man
cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && rm -f /usr/lib/libjpeg.so*
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat
new file mode 100644
index 0000000..8b4c077
--- /dev/null
+++ b/lfs/libjpeg-compat
@@ -0,0 +1,80 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2015 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 1.3.1
+
+THISAPP = libjpeg-turbo-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = libjpeg
+PAK_VER = ipfire-beta1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared
+ cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index ab26500..179b8b0 100755
--- a/make.sh
+++ b/make.sh
@@ -505,6 +505,7 @@ buildipfire() {
ipfiremake libnl-3
ipfiremake libidn
ipfiremake nasm
+ ipfiremake libjpeg-compat
ipfiremake libjpeg
ipfiremake libexif
ipfiremake libpng
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/3] libtiff: update to 4.0.6
2016-06-26 9:35 [PATCH 0/3] Update image libaries (libjpeg, libtiff, libpng) Marcel Lorenz
2016-06-26 9:35 ` [PATCH 1/3] libjpeg: update to 1.4.2 Marcel Lorenz
@ 2016-06-26 9:35 ` Marcel Lorenz
2016-06-26 9:35 ` [PATCH 3/3] libpng: update to 1.2.56 Marcel Lorenz
2 siblings, 0 replies; 4+ messages in thread
From: Marcel Lorenz @ 2016-06-26 9:35 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 18588 bytes --]
http://www.remotesensing.org/libtiff/v4.0.6.html
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/packages/libtiff | 310 ++++++++++++++++++++------------------
lfs/libtiff | 13 +-
2 files changed, 169 insertions(+), 154 deletions(-)
diff --git a/config/rootfiles/packages/libtiff b/config/rootfiles/packages/libtiff
index 12de791..07e74f6 100644
--- a/config/rootfiles/packages/libtiff
+++ b/config/rootfiles/packages/libtiff
@@ -29,153 +29,169 @@ usr/bin/tiffsplit
#usr/lib/libtiff.a
#usr/lib/libtiff.la
usr/lib/libtiff.so
-usr/lib/libtiff.so.3
-usr/lib/libtiff.so.3.9.4
+usr/lib/libtiff.so.5
+usr/lib/libtiff.so.5.2.4
#usr/lib/libtiffxx.a
#usr/lib/libtiffxx.la
usr/lib/libtiffxx.so
-usr/lib/libtiffxx.so.3
-usr/lib/libtiffxx.so.3.9.4
-#usr/share/doc/tiff-3.9.4
-#usr/share/doc/tiff-3.9.4/COPYRIGHT
-#usr/share/doc/tiff-3.9.4/ChangeLog
-#usr/share/doc/tiff-3.9.4/README
-#usr/share/doc/tiff-3.9.4/README.vms
-#usr/share/doc/tiff-3.9.4/RELEASE-DATE
-#usr/share/doc/tiff-3.9.4/TODO
-#usr/share/doc/tiff-3.9.4/VERSION
-#usr/share/doc/tiff-3.9.4/html
-#usr/share/doc/tiff-3.9.4/html/TIFFTechNote2.html
-#usr/share/doc/tiff-3.9.4/html/addingtags.html
-#usr/share/doc/tiff-3.9.4/html/bugs.html
-#usr/share/doc/tiff-3.9.4/html/build.html
-#usr/share/doc/tiff-3.9.4/html/contrib.html
-#usr/share/doc/tiff-3.9.4/html/document.html
-#usr/share/doc/tiff-3.9.4/html/images
-#usr/share/doc/tiff-3.9.4/html/images.html
-#usr/share/doc/tiff-3.9.4/html/images/back.gif
-#usr/share/doc/tiff-3.9.4/html/images/bali.jpg
-#usr/share/doc/tiff-3.9.4/html/images/cat.gif
-#usr/share/doc/tiff-3.9.4/html/images/cover.jpg
-#usr/share/doc/tiff-3.9.4/html/images/cramps.gif
-#usr/share/doc/tiff-3.9.4/html/images/dave.gif
-#usr/share/doc/tiff-3.9.4/html/images/info.gif
-#usr/share/doc/tiff-3.9.4/html/images/jello.jpg
-#usr/share/doc/tiff-3.9.4/html/images/jim.gif
-#usr/share/doc/tiff-3.9.4/html/images/note.gif
-#usr/share/doc/tiff-3.9.4/html/images/oxford.gif
-#usr/share/doc/tiff-3.9.4/html/images/quad.jpg
-#usr/share/doc/tiff-3.9.4/html/images/ring.gif
-#usr/share/doc/tiff-3.9.4/html/images/smallliz.jpg
-#usr/share/doc/tiff-3.9.4/html/images/strike.gif
-#usr/share/doc/tiff-3.9.4/html/images/warning.gif
-#usr/share/doc/tiff-3.9.4/html/index.html
-#usr/share/doc/tiff-3.9.4/html/internals.html
-#usr/share/doc/tiff-3.9.4/html/intro.html
-#usr/share/doc/tiff-3.9.4/html/libtiff.html
-#usr/share/doc/tiff-3.9.4/html/man
-#usr/share/doc/tiff-3.9.4/html/man/TIFFClose.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFDataWidth.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFError.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFFlush.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFGetField.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFOpen.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFPrintDirectory.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFRGBAImage.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadDirectory.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadEncodedStrip.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadEncodedTile.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBAImage.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBAStrip.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBATile.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRawStrip.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRawTile.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadScanline.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFReadTile.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFSetDirectory.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFSetField.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFWarning.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteDirectory.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteEncodedStrip.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteEncodedTile.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteRawStrip.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteRawTile.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteScanline.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteTile.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFbuffer.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFcodec.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFcolor.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFmemory.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFquery.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFsize.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFstrip.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFswab.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/TIFFtile.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/fax2ps.1.html
-#usr/share/doc/tiff-3.9.4/html/man/fax2tiff.1.html
-#usr/share/doc/tiff-3.9.4/html/man/gif2tiff.1.html
-#usr/share/doc/tiff-3.9.4/html/man/index.html
-#usr/share/doc/tiff-3.9.4/html/man/libtiff.3tiff.html
-#usr/share/doc/tiff-3.9.4/html/man/pal2rgb.1.html
-#usr/share/doc/tiff-3.9.4/html/man/ppm2tiff.1.html
-#usr/share/doc/tiff-3.9.4/html/man/ras2tiff.1.html
-#usr/share/doc/tiff-3.9.4/html/man/raw2tiff.1.html
-#usr/share/doc/tiff-3.9.4/html/man/rgb2ycbcr.1.html
-#usr/share/doc/tiff-3.9.4/html/man/sgi2tiff.1.html
-#usr/share/doc/tiff-3.9.4/html/man/thumbnail.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiff2bw.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiff2pdf.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiff2ps.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiff2rgba.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffcmp.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffcp.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffcrop.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffdither.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffdump.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffgt.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffinfo.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffmedian.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffset.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffsplit.1.html
-#usr/share/doc/tiff-3.9.4/html/man/tiffsv.1.html
-#usr/share/doc/tiff-3.9.4/html/misc.html
-#usr/share/doc/tiff-3.9.4/html/support.html
-#usr/share/doc/tiff-3.9.4/html/tools.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta007.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta016.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta018.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta024.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta028.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta029.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta031.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta032.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta033.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta034.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta035.html
-#usr/share/doc/tiff-3.9.4/html/v3.4beta036.html
-#usr/share/doc/tiff-3.9.4/html/v3.5.1.html
-#usr/share/doc/tiff-3.9.4/html/v3.5.2.html
-#usr/share/doc/tiff-3.9.4/html/v3.5.3.html
-#usr/share/doc/tiff-3.9.4/html/v3.5.4.html
-#usr/share/doc/tiff-3.9.4/html/v3.5.5.html
-#usr/share/doc/tiff-3.9.4/html/v3.5.6-beta.html
-#usr/share/doc/tiff-3.9.4/html/v3.5.7.html
-#usr/share/doc/tiff-3.9.4/html/v3.6.0.html
-#usr/share/doc/tiff-3.9.4/html/v3.6.1.html
-#usr/share/doc/tiff-3.9.4/html/v3.7.0.html
-#usr/share/doc/tiff-3.9.4/html/v3.7.0alpha.html
-#usr/share/doc/tiff-3.9.4/html/v3.7.0beta.html
-#usr/share/doc/tiff-3.9.4/html/v3.7.0beta2.html
-#usr/share/doc/tiff-3.9.4/html/v3.7.1.html
-#usr/share/doc/tiff-3.9.4/html/v3.7.2.html
-#usr/share/doc/tiff-3.9.4/html/v3.7.3.html
-#usr/share/doc/tiff-3.9.4/html/v3.7.4.html
-#usr/share/doc/tiff-3.9.4/html/v3.8.0.html
-#usr/share/doc/tiff-3.9.4/html/v3.8.1.html
-#usr/share/doc/tiff-3.9.4/html/v3.8.2.html
-#usr/share/doc/tiff-3.9.4/html/v3.9.0beta.html
-#usr/share/doc/tiff-3.9.4/html/v3.9.1.html
-#usr/share/doc/tiff-3.9.4/html/v3.9.2.html
+usr/lib/libtiffxx.so.5
+usr/lib/libtiffxx.so.5.2.4
+#usr/lib/pkgconfig/libtiff-4.pc
+#usr/share/doc/tiff-4.0.6
+#usr/share/doc/tiff-4.0.6/COPYRIGHT
+#usr/share/doc/tiff-4.0.6/ChangeLog
+#usr/share/doc/tiff-4.0.6/README
+#usr/share/doc/tiff-4.0.6/README.vms
+#usr/share/doc/tiff-4.0.6/RELEASE-DATE
+#usr/share/doc/tiff-4.0.6/TODO
+#usr/share/doc/tiff-4.0.6/VERSION
+#usr/share/doc/tiff-4.0.6/html
+#usr/share/doc/tiff-4.0.6/html/TIFFTechNote2.html
+#usr/share/doc/tiff-4.0.6/html/addingtags.html
+#usr/share/doc/tiff-4.0.6/html/bugs.html
+#usr/share/doc/tiff-4.0.6/html/build.html
+#usr/share/doc/tiff-4.0.6/html/contrib.html
+#usr/share/doc/tiff-4.0.6/html/document.html
+#usr/share/doc/tiff-4.0.6/html/images
+#usr/share/doc/tiff-4.0.6/html/images.html
+#usr/share/doc/tiff-4.0.6/html/images/back.gif
+#usr/share/doc/tiff-4.0.6/html/images/bali.jpg
+#usr/share/doc/tiff-4.0.6/html/images/cat.gif
+#usr/share/doc/tiff-4.0.6/html/images/cover.jpg
+#usr/share/doc/tiff-4.0.6/html/images/cramps.gif
+#usr/share/doc/tiff-4.0.6/html/images/dave.gif
+#usr/share/doc/tiff-4.0.6/html/images/info.gif
+#usr/share/doc/tiff-4.0.6/html/images/jello.jpg
+#usr/share/doc/tiff-4.0.6/html/images/jim.gif
+#usr/share/doc/tiff-4.0.6/html/images/note.gif
+#usr/share/doc/tiff-4.0.6/html/images/oxford.gif
+#usr/share/doc/tiff-4.0.6/html/images/quad.jpg
+#usr/share/doc/tiff-4.0.6/html/images/ring.gif
+#usr/share/doc/tiff-4.0.6/html/images/smallliz.jpg
+#usr/share/doc/tiff-4.0.6/html/images/strike.gif
+#usr/share/doc/tiff-4.0.6/html/images/warning.gif
+#usr/share/doc/tiff-4.0.6/html/index.html
+#usr/share/doc/tiff-4.0.6/html/internals.html
+#usr/share/doc/tiff-4.0.6/html/intro.html
+#usr/share/doc/tiff-4.0.6/html/libtiff.html
+#usr/share/doc/tiff-4.0.6/html/man
+#usr/share/doc/tiff-4.0.6/html/man/TIFFClose.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFDataWidth.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFError.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldDataType.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldName.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldPassCount.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldReadCount.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldTag.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldWriteCount.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFFlush.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFGetField.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFOpen.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFPrintDirectory.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFRGBAImage.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadDirectory.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadEncodedStrip.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadEncodedTile.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRGBAImage.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRGBAStrip.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRGBATile.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRawStrip.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRawTile.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadScanline.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFReadTile.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFSetDirectory.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFSetField.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFWarning.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteDirectory.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteEncodedStrip.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteEncodedTile.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteRawStrip.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteRawTile.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteScanline.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteTile.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFbuffer.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFcodec.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFcolor.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFmemory.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFquery.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFsize.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFstrip.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFswab.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/TIFFtile.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/bmp2tiff.1.html
+#usr/share/doc/tiff-4.0.6/html/man/fax2ps.1.html
+#usr/share/doc/tiff-4.0.6/html/man/fax2tiff.1.html
+#usr/share/doc/tiff-4.0.6/html/man/gif2tiff.1.html
+#usr/share/doc/tiff-4.0.6/html/man/index.html
+#usr/share/doc/tiff-4.0.6/html/man/libtiff.3tiff.html
+#usr/share/doc/tiff-4.0.6/html/man/pal2rgb.1.html
+#usr/share/doc/tiff-4.0.6/html/man/ppm2tiff.1.html
+#usr/share/doc/tiff-4.0.6/html/man/ras2tiff.1.html
+#usr/share/doc/tiff-4.0.6/html/man/raw2tiff.1.html
+#usr/share/doc/tiff-4.0.6/html/man/rgb2ycbcr.1.html
+#usr/share/doc/tiff-4.0.6/html/man/sgi2tiff.1.html
+#usr/share/doc/tiff-4.0.6/html/man/thumbnail.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiff2bw.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiff2pdf.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiff2ps.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiff2rgba.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffcmp.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffcp.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffcrop.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffdither.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffdump.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffgt.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffinfo.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffmedian.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffset.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffsplit.1.html
+#usr/share/doc/tiff-4.0.6/html/man/tiffsv.1.html
+#usr/share/doc/tiff-4.0.6/html/misc.html
+#usr/share/doc/tiff-4.0.6/html/support.html
+#usr/share/doc/tiff-4.0.6/html/tools.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta007.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta016.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta018.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta024.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta028.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta029.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta031.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta032.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta033.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta034.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta035.html
+#usr/share/doc/tiff-4.0.6/html/v3.4beta036.html
+#usr/share/doc/tiff-4.0.6/html/v3.5.1.html
+#usr/share/doc/tiff-4.0.6/html/v3.5.2.html
+#usr/share/doc/tiff-4.0.6/html/v3.5.3.html
+#usr/share/doc/tiff-4.0.6/html/v3.5.4.html
+#usr/share/doc/tiff-4.0.6/html/v3.5.5.html
+#usr/share/doc/tiff-4.0.6/html/v3.5.6-beta.html
+#usr/share/doc/tiff-4.0.6/html/v3.5.7.html
+#usr/share/doc/tiff-4.0.6/html/v3.6.0.html
+#usr/share/doc/tiff-4.0.6/html/v3.6.1.html
+#usr/share/doc/tiff-4.0.6/html/v3.7.0.html
+#usr/share/doc/tiff-4.0.6/html/v3.7.0alpha.html
+#usr/share/doc/tiff-4.0.6/html/v3.7.0beta.html
+#usr/share/doc/tiff-4.0.6/html/v3.7.0beta2.html
+#usr/share/doc/tiff-4.0.6/html/v3.7.1.html
+#usr/share/doc/tiff-4.0.6/html/v3.7.2.html
+#usr/share/doc/tiff-4.0.6/html/v3.7.3.html
+#usr/share/doc/tiff-4.0.6/html/v3.7.4.html
+#usr/share/doc/tiff-4.0.6/html/v3.8.0.html
+#usr/share/doc/tiff-4.0.6/html/v3.8.1.html
+#usr/share/doc/tiff-4.0.6/html/v3.8.2.html
+#usr/share/doc/tiff-4.0.6/html/v3.9.0beta.html
+#usr/share/doc/tiff-4.0.6/html/v3.9.1.html
+#usr/share/doc/tiff-4.0.6/html/v3.9.2.html
+#usr/share/doc/tiff-4.0.6/html/v4.0.0.html
+#usr/share/doc/tiff-4.0.6/html/v4.0.1.html
+#usr/share/doc/tiff-4.0.6/html/v4.0.2.html
+#usr/share/doc/tiff-4.0.6/html/v4.0.3.html
+#usr/share/doc/tiff-4.0.6/html/v4.0.4.html
+#usr/share/doc/tiff-4.0.6/html/v4.0.4beta.html
+#usr/share/doc/tiff-4.0.6/html/v4.0.5.html
+#usr/share/doc/tiff-4.0.6/html/v4.0.6.html
#usr/share/man/man1/bmp2tiff.1
#usr/share/man/man1/fax2ps.1
#usr/share/man/man1/fax2tiff.1
@@ -205,6 +221,12 @@ usr/lib/libtiffxx.so.3.9.4
#usr/share/man/man3/TIFFClose.3tiff
#usr/share/man/man3/TIFFDataWidth.3tiff
#usr/share/man/man3/TIFFError.3tiff
+#usr/share/man/man3/TIFFFieldDataType.3tiff
+#usr/share/man/man3/TIFFFieldName.3tiff
+#usr/share/man/man3/TIFFFieldPassCount.3tiff
+#usr/share/man/man3/TIFFFieldReadCount.3tiff
+#usr/share/man/man3/TIFFFieldTag.3tiff
+#usr/share/man/man3/TIFFFieldWriteCount.3tiff
#usr/share/man/man3/TIFFFlush.3tiff
#usr/share/man/man3/TIFFGetField.3tiff
#usr/share/man/man3/TIFFOpen.3tiff
diff --git a/lfs/libtiff b/lfs/libtiff
index f5e4d57..a15b20f 100644
--- a/lfs/libtiff
+++ b/lfs/libtiff
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,17 +24,13 @@
include Config
-VER = 3.9.4
+VER = 4.0.6
THISAPP = tiff-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libtiff
-PAK_VER = 2
-
-DEPS = ""
###############################################################################
# Top-level Rules
@@ -44,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2006c1bdd12644dbf02956955175afd6
+$(DL_FILE)_MD5 = d1d2e940dea0b5ad435f21f03d96dd72
install : $(TARGET)
@@ -54,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
-dist:
- $(PAK)
-
###############################################################################
# Downloading, checking, md5sum
###############################################################################
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 3/3] libpng: update to 1.2.56
2016-06-26 9:35 [PATCH 0/3] Update image libaries (libjpeg, libtiff, libpng) Marcel Lorenz
2016-06-26 9:35 ` [PATCH 1/3] libjpeg: update to 1.4.2 Marcel Lorenz
2016-06-26 9:35 ` [PATCH 2/3] libtiff: update to 4.0.6 Marcel Lorenz
@ 2016-06-26 9:35 ` Marcel Lorenz
2 siblings, 0 replies; 4+ messages in thread
From: Marcel Lorenz @ 2016-06-26 9:35 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2793 bytes --]
http://www.libpng.org/pub/png/libpng.html
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/common/libpng | 13 ++-----------
lfs/libpng | 11 ++++-------
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/config/rootfiles/common/libpng b/config/rootfiles/common/libpng
index c29eaa7..27e4180 100644
--- a/config/rootfiles/common/libpng
+++ b/config/rootfiles/common/libpng
@@ -1,22 +1,13 @@
-#usr/bin/libpng-config
#usr/bin/libpng12-config
#usr/include/libpng12
#usr/include/libpng12/png.h
#usr/include/libpng12/pngconf.h
-#usr/include/png.h
-#usr/include/pngconf.h
#usr/lib/libpng.a
-#usr/lib/libpng.la
-usr/lib/libpng.so
usr/lib/libpng.so.3
-usr/lib/libpng.so.3.46.0
+usr/lib/libpng.so.3.56.0
#usr/lib/libpng12.a
#usr/lib/libpng12.la
usr/lib/libpng12.so
usr/lib/libpng12.so.0
-usr/lib/libpng12.so.0.46.0
-#usr/lib/pkgconfig/libpng.pc
+usr/lib/libpng12.so.0.56.0
#usr/lib/pkgconfig/libpng12.pc
-#usr/share/man/man3/libpng.3
-#usr/share/man/man3/libpngpf.3
-#usr/share/man/man5/png.5
diff --git a/lfs/libpng b/lfs/libpng
index 7075118..1d61aec 100644
--- a/lfs/libpng
+++ b/lfs/libpng
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -21,13 +21,12 @@
###############################################################################
# Definitions
###############################################################################
-
include Config
-VER = 1.2.46
+VER = 1.2.56
THISAPP = libpng-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +39,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 03ddfc17ad321db93f984581e9415d22
+$(DL_FILE)_MD5 = 868562bd1c58b76ed8703f135a2e439a
install : $(TARGET)
@@ -56,10 +55,8 @@ md5 : $(subst %,%_MD5,$(objects))
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
-
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
-
$(subst %,%_MD5,$(objects)) :
@$(MD5)
--
1.9.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-26 9:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-26 9:35 [PATCH 0/3] Update image libaries (libjpeg, libtiff, libpng) Marcel Lorenz
2016-06-26 9:35 ` [PATCH 1/3] libjpeg: update to 1.4.2 Marcel Lorenz
2016-06-26 9:35 ` [PATCH 2/3] libtiff: update to 4.0.6 Marcel Lorenz
2016-06-26 9:35 ` [PATCH 3/3] libpng: update to 1.2.56 Marcel Lorenz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox