- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021) - Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs didn't work so all required changes are part of this patch series - Update rootfile - Dependencies checked from library so bump. Nothing found. - Changelog is too large to include here. For full details see https://github.com/libgd/libgd/releases
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/gd | 13 +++++++------ lfs/gd | 15 +++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd index 09366b717..434102084 100644 --- a/config/rootfiles/common/gd +++ b/config/rootfiles/common/gd @@ -4,15 +4,15 @@ #usr/bin/gd2togif #usr/bin/gd2topng #usr/bin/gdcmpgif -#usr/bin/gdlib-config #usr/bin/gdparttopng #usr/bin/gdtopng #usr/bin/giftogd2 #usr/bin/pngtogd #usr/bin/pngtogd2 #usr/bin/webpng -#usr/include/entities.h #usr/include/gd.h +#usr/include/gd_color_map.h +#usr/include/gd_errors.h #usr/include/gd_io.h #usr/include/gdcache.h #usr/include/gdfontg.h @@ -21,8 +21,9 @@ #usr/include/gdfonts.h #usr/include/gdfontt.h #usr/include/gdfx.h -#usr/lib/libgd.a +#usr/include/gdpp.h #usr/lib/libgd.la -usr/lib/libgd.so -usr/lib/libgd.so.2 -usr/lib/libgd.so.2.0.0 +#usr/lib/libgd.so +usr/lib/libgd.so.3 +usr/lib/libgd.so.3.0.11 +#usr/lib/pkgconfig/gdlib.pc diff --git a/lfs/gd b/lfs/gd index 134d2fccd..d4a593fbf 100644 --- a/lfs/gd +++ b/lfs/gd @@ -24,10 +24,10 @@
include Config
-VER = 2.0.33 +VER = 2.3.3
-THISAPP = gd-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = libgd-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45 +$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
install : $(TARGET)
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --disable-static \ + --without-tiff cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP)
- Update from 2.35 (2006) to 2.73 (2020) - Update of rootfile - Updated version of perl-GD required ExtUtils-PkgConfig for build. Seperate patch to build that is part of this series - Changelog 2.73 * allow --options override the libgd options. Not recommended. See GH #33 and RT #130045 2.72 * fix CVE 2019-6977 colorMatch for older unpatched libgd versions. This is a severe security problem, an exploitable heap-overflow. See https://nvd.nist.gov/vuln/detail/CVE-2019-6977 2.71 * skip Test::Fork on freebsd (GH #25) 2.70 * fixes for hardened CCFLAGS with -Werror (RT #128167) 2.69 * little spelling error, GH #29 Xavier Guimard 2.68 * fix GD::Polygon->clear, RT #124463 Michael Cain 2.67 * fix thread-safety for GD::Simple %COLORS (#26 melak) * fix arc start-angle docs, RT #123277 Andrew G Gray * improve setBrush docs, RT #123194 Andrew G Gray * improve StringFT docs, RT #123193 * replace MacOSX by darwin, and not by Mac OS X/macOS as suggested in PR #24 * add GD::Image->_file method as suggested in RT #60488 by Kevin Ryde, also the helper GD::supportsFileType 2.66 * throw proper error on newFrom* with not-existing file * add t/transp.t from RT #40525 * Improve RT #54366 multiple gd.h warning * better doc for GD::Simple->arc * fix ANIMGIF with libgd 2.3.0-dev 2.65 * fix --gdlib_config_path to accept an argument (fperrad) 2.64 * Update doc for LIBGD_VERSION() * Fix 5.6.2, which does not have float in its typemap 2.63 * renamed VERSION() to LIBGD_VERSION(), RT #121307. It was treated magically by "use GD 2.18" 2.62 * fixed wrong <5.14 code generated with ExtUtils::Constants RT #121297. Don't generate const-xs.inc, only when missing. * add -liconv on hpux also (our pkgconfig parser cannot handle it) 2.61 * add CONFIGURE_REQUIRES META * add --gdlib_config_path * add Image Filters: scatter, pixelate, negate, grayscale, brightness, contrast, color, selectiveBlur, edgeDetectQuick, gaussianBlur, emboss, meanRemoval, smooth, copyGaussianBlurred * add palette methods: createPaletteFromTrueColor, neuQuant (but discouraged), colorMatch. * add interpolation methods: copyScale, copyRotateInterpolated, interpolationMethod. * add double GD::VERSION * add all gd.h constants 2.60 * add missing methods newFromWBMP, newFromXbm, (RT #68784) and some missing docs * Add --lib_fontconfig_path, --fcgi options * rewrote most of the XS code * cleanup Makefile.PL #20 2.59 * error on failing libgd calls * fix colorClosestAlpha, colorAllocateAlpha * add missing documentation 2.58 * fix VERSION_STRING for 2.0.x * honor --lib_gd_path specific gdlib-config * Loosen the comparison tests with GDIMAGETYPE ne gd2 * Improve gdlib-config parsing (PR #17), esp. with 2.0.34 2.57 * fix Jpeg magic number detection RT #26146 * fix RGB - HSV roundtrips: RT #120572 by J2N-FORGET * fix -print-search-dirs errors RT #106265 * co-maint to rurban * add hv_fetchs, CI smokers * add GD::VERSION_STRING api 2.56_03 * add alpha method * improve option handling * fix meta data 2.56_02 * fix feature extraction >= 2.2 [RT #119459] 2.56_01 * rm Build.PL, fix permissions, fix for missing gdlib-config 2.56 * Fix Makefile.PL so that it works again. 2.55 * Great simplification of regression framework ought to fix make test problems. * Replace ExtUtils::MakeMaker script with Module::Build system (just in time for Module::Build to be deprecated). * Remove archaic qd.pl (for creating QuickDraw picts) from distribution. 2.54 Patch from yurly@unet.net to fix image corruption in rotate180 when image height is odd. 2.53 Points to Gabor Szabo's GD::Simple tutorial, and fix link to repository. 2.52 Fix regression tests to run on Ubuntu 12.04 64bit. 2.51 Fix misleading warning message about location of gd.h file. 2.50 Fix gdUseFontConfig so that it can be called as a class method. 2.49 Add GitHub information to README. 2.48 Fix compile crash on windows and strawberry (https://rt.cpan.org/Public/Bug/Display.html?id=67990). 2.47 Fix compilation on older perl's without the Newxz macros. 2.46 Added a basic "use" test for GD::Simple 2.45 Clarified the GD license. There is now a formal LICENSE file in the package. 2.44 GD::Group now installed properly. Quenched compiler warning caused by Newxs() calls. 2.43 Added "transparent" color to GD::Simple. Fixed Makefile so that GD/Image.pm depends both on GD/Image.pm.PLS and .config.cache 2.42 Fixed magic number detection to autodetect certain missed jpeg files (thanks to Mike Walker) 2.41 Added backend support for grouping features in GD::SVG module. 2.40 ** Do not use - contains a bug ** 2.39 Makefile.PL will refuse to run if the proper version of libgd is unavailable. 2.38 Fixed bizarre warning about /usr/include/gd.h != /usr/include/gd.h. 2.37 GD/Image.pm did not bring in croak() properly, meaning that incorrect error messages are printed out when any of the newFromXXX() calls are made. 2.36 Instructions on using gdAntiAliased with palette images.
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/perl-GD | 4 ++-- lfs/perl-GD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/rootfiles/common/perl-GD b/config/rootfiles/common/perl-GD index 465d84ce5..eedb8ac4c 100644 --- a/config/rootfiles/common/perl-GD +++ b/config/rootfiles/common/perl-GD @@ -1,18 +1,18 @@ #usr/bin/bdf2gdfont.pl #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD.pm +usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Group.pm usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Image.pm usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Polygon.pm usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Polyline.pm usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/GD/Simple.pm #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD #usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD/.packlist -#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD/GD.bs usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD/GD.so usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/GD/autosplit.ix -usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/qd.pl #usr/share/man/man1/bdf2gdfont.pl.1 #usr/share/man/man3/GD.3 +#usr/share/man/man3/GD::Group.3 #usr/share/man/man3/GD::Image.3 #usr/share/man/man3/GD::Polygon.3 #usr/share/man/man3/GD::Polyline.3 diff --git a/lfs/perl-GD b/lfs/perl-GD index 0a97c18fa..3df5b18c3 100644 --- a/lfs/perl-GD +++ b/lfs/perl-GD @@ -24,7 +24,7 @@
include Config
-VER = 2.35 +VER = 2.73
THISAPP = GD-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = dfc3e16e85a17aab7ee1029fbe307fca +$(DL_FILE)_MD5 = c2bf1ca56d15e33d2432e4d8ba5aeadf
install : $(TARGET)
- ExtUtils-PkgConfig is required when building perl-GD - lfs and rootfile created - All rootfile entries commented out as only required for building of perl-GD - added to make.sh file just before perl-GD
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/ExtUtils-PkgConfig | 6 ++ lfs/ExtUtils-PkgConfig | 77 ++++++++++++++++++++++ make.sh | 1 + 3 files changed, 84 insertions(+) create mode 100644 config/rootfiles/common/ExtUtils-PkgConfig create mode 100644 lfs/ExtUtils-PkgConfig
diff --git a/config/rootfiles/common/ExtUtils-PkgConfig b/config/rootfiles/common/ExtUtils-PkgConfig new file mode 100644 index 000000000..6cd28fbac --- /dev/null +++ b/config/rootfiles/common/ExtUtils-PkgConfig @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.32.1/ExtUtils +#usr/lib/perl5/site_perl/5.32.1/ExtUtils/PkgConfig.pm +#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/ExtUtils +#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/ExtUtils/PkgConfig +#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/ExtUtils/PkgConfig/.packlist +#usr/share/man/man3/ExtUtils::PkgConfig.3 diff --git a/lfs/ExtUtils-PkgConfig b/lfs/ExtUtils-PkgConfig new file mode 100644 index 000000000..f35868a83 --- /dev/null +++ b/lfs/ExtUtils-PkgConfig @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 IPFire Team info@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 # +# 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.16 + +THISAPP = ExtUtils-PkgConfig-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b86318f2b6ac6af3ee985299e1e38fe5 + +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) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 8b97b24df..12861365e 100755 --- a/make.sh +++ b/make.sh @@ -1284,6 +1284,7 @@ buildipfire() { lfsmake2 ntfs-3g lfsmake2 ethtool lfsmake2 fcron + lfsmake2 ExtUtils-PkgConfig lfsmake2 perl-GD lfsmake2 GD-Graph lfsmake2 GD-TextUtil
- Update from 1.4308 (2006) to 1.54 (2016 - latest version) - Update of rootfile not required - Changelog 1.54 21 Nov 2016 - Disable two Y axes alignment when any y[12]_{min,max}_value is defined RT#62665 1.53 08 Jul 2016 - Fix 'Illegal division by zero' when x_min_value and x_max_value are defined and x_tick_number set to 'auto' RT#73185 Thanks to Bob Rogers, https://github.com/ruz/GDGraph/pull/12 1.52 28 Jan 2016 - y1_min_range and y2_min_range instead of min_range_1 and min_range_2, niether were documented before. - Update documentation in regards to all *_min_range options available. 1.51 27 Dec 2015 - fix shadows rendering on cumulative bar charts thanks to https://github.com/Tordek see https://github.com/ruz/GDGraph/pull/4 1.50 27 Dec 2015 - run samples as part of test suite to make sure no sample crashes thanks to https://github.com/tynovsky - properly define test requirements using newer MakeMaker 1.49 11 Mar 2015 - fix to Z-axis color filling in 3D pie charts (Debian Bug #489184) - bump ExtUtils::MakeMaker dependency - tiny improvement in the code of the samples 1.48 02 Aug 2013 - no code changes, just release enginering cleanup - adjust MANIFEST.SKIP file so MANIFEST can be generated once again - ship sample58.pl file, so `make samples` stop failing - mention the current and past maintainers in META files as authors - use newer CPAN::Meta and ExtUtils::MakeMaker, older versions generated META files without runtime prerequisites 1.47 28 Jun 2013 - experimental hide_overlapping_values option for bar graphs 1.46 26 Jun 2013 - This release is based on old work by Martien that was sitting in his repo - x_last_label_skip option - new samples and tweaks to old 1.45 21 Jun 2013 - read DISTRIBUTION STATUS in perldoc GD::Graph - no code changes since 1.44 1.44 25 Apr 2007 - Patched bugs 21610, 20792, 20802, 23755 and 22932 - Updated POD to clarify current maintenance status, and encourage bug reporting via RT (and to point out some external help resources)
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- lfs/GD-Graph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lfs/GD-Graph b/lfs/GD-Graph index 044344df1..2ad306af7 100644 --- a/lfs/GD-Graph +++ b/lfs/GD-Graph @@ -24,7 +24,7 @@
include Config
-VER = 1.4308 +VER = 1.54
THISAPP = GDGraph-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fcdd34d5e09ae917b5d264887734b3b1 +$(DL_FILE)_MD5 = 38c6a188519e6272e9b2b722b315c3d8
install : $(TARGET)
Hello,
On 23 Sep 2021, at 13:24, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021)
- Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs didn't work so all required changes are part of this patch series
We no longer have PNG graphs. At least not from rrdtool.
Is this vnstat maybe?
-Michael
- Update rootfile
- Dependencies checked from library so bump. Nothing found.
- Changelog is too large to include here. For full details see https://github.com/libgd/libgd/releases
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/gd | 13 +++++++------ lfs/gd | 15 +++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd index 09366b717..434102084 100644 --- a/config/rootfiles/common/gd +++ b/config/rootfiles/common/gd @@ -4,15 +4,15 @@ #usr/bin/gd2togif #usr/bin/gd2topng #usr/bin/gdcmpgif -#usr/bin/gdlib-config #usr/bin/gdparttopng #usr/bin/gdtopng #usr/bin/giftogd2 #usr/bin/pngtogd #usr/bin/pngtogd2 #usr/bin/webpng -#usr/include/entities.h #usr/include/gd.h +#usr/include/gd_color_map.h +#usr/include/gd_errors.h #usr/include/gd_io.h #usr/include/gdcache.h #usr/include/gdfontg.h @@ -21,8 +21,9 @@ #usr/include/gdfonts.h #usr/include/gdfontt.h #usr/include/gdfx.h -#usr/lib/libgd.a +#usr/include/gdpp.h #usr/lib/libgd.la -usr/lib/libgd.so -usr/lib/libgd.so.2 -usr/lib/libgd.so.2.0.0 +#usr/lib/libgd.so +usr/lib/libgd.so.3 +usr/lib/libgd.so.3.0.11 +#usr/lib/pkgconfig/gdlib.pc diff --git a/lfs/gd b/lfs/gd index 134d2fccd..d4a593fbf 100644 --- a/lfs/gd +++ b/lfs/gd @@ -24,10 +24,10 @@
include Config
-VER = 2.0.33 +VER = 2.3.3
-THISAPP = gd-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = libgd-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45 +$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
install : $(TARGET)
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && ./configure \
--prefix=/usr \--disable-static \--without-tiff-- 2.33.0
Hi Michael,
On 23/09/2021 14:45, Michael Tremer wrote:
Hello,
On 23 Sep 2021, at 13:24, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021)
- Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs didn't work so all required changes are part of this patch series
We no longer have PNG graphs. At least not from rrdtool.
Is this vnstat maybe?
They are still used for the pie charts in the logs section. firewalllogip.dat - line 400 firewalllogport.dat - line 400 firewalllogcountry.dat - line 427.
Regards, Adolf.
-Michael
- Update rootfile
- Dependencies checked from library so bump. Nothing found.
- Changelog is too large to include here. For full details see https://github.com/libgd/libgd/releases
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/gd | 13 +++++++------ lfs/gd | 15 +++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd index 09366b717..434102084 100644 --- a/config/rootfiles/common/gd +++ b/config/rootfiles/common/gd @@ -4,15 +4,15 @@ #usr/bin/gd2togif #usr/bin/gd2topng #usr/bin/gdcmpgif -#usr/bin/gdlib-config #usr/bin/gdparttopng #usr/bin/gdtopng #usr/bin/giftogd2 #usr/bin/pngtogd #usr/bin/pngtogd2 #usr/bin/webpng -#usr/include/entities.h #usr/include/gd.h +#usr/include/gd_color_map.h +#usr/include/gd_errors.h #usr/include/gd_io.h #usr/include/gdcache.h #usr/include/gdfontg.h @@ -21,8 +21,9 @@ #usr/include/gdfonts.h #usr/include/gdfontt.h #usr/include/gdfx.h -#usr/lib/libgd.a +#usr/include/gdpp.h #usr/lib/libgd.la -usr/lib/libgd.so -usr/lib/libgd.so.2 -usr/lib/libgd.so.2.0.0 +#usr/lib/libgd.so +usr/lib/libgd.so.3 +usr/lib/libgd.so.3.0.11 +#usr/lib/pkgconfig/gdlib.pc diff --git a/lfs/gd b/lfs/gd index 134d2fccd..d4a593fbf 100644 --- a/lfs/gd +++ b/lfs/gd @@ -24,10 +24,10 @@
include Config
-VER = 2.0.33 +VER = 2.3.3
-THISAPP = gd-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = libgd-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45 +$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
install : $(TARGET)
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && ./configure \
--prefix=/usr \--disable-static \--without-tiff-- 2.33.0
Hi,
On 23.09.2021 16:56, Adolf Belka wrote:
Hi Michael,
On 23/09/2021 14:45, Michael Tremer wrote:
Hello,
On 23 Sep 2021, at 13:24, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021)
- Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs didn't work so all required changes are part of this patch series
We no longer have PNG graphs. At least not from rrdtool.
Is this vnstat maybe?
I tried to update 'vnstat' to "2.8" a few days ago - and yes, I think this is also needed for 'vnstat'.
Best, Matthias
They are still used for the pie charts in the logs section. firewalllogip.dat - line 400 firewalllogport.dat - line 400 firewalllogcountry.dat - line 427.
Regards, Adolf.
-Michael
- Update rootfile
- Dependencies checked from library so bump. Nothing found.
- Changelog is too large to include here. For full details see https://github.com/libgd/libgd/releases
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/gd | 13 +++++++------ lfs/gd | 15 +++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd index 09366b717..434102084 100644 --- a/config/rootfiles/common/gd +++ b/config/rootfiles/common/gd @@ -4,15 +4,15 @@ #usr/bin/gd2togif #usr/bin/gd2topng #usr/bin/gdcmpgif -#usr/bin/gdlib-config #usr/bin/gdparttopng #usr/bin/gdtopng #usr/bin/giftogd2 #usr/bin/pngtogd #usr/bin/pngtogd2 #usr/bin/webpng -#usr/include/entities.h #usr/include/gd.h +#usr/include/gd_color_map.h +#usr/include/gd_errors.h #usr/include/gd_io.h #usr/include/gdcache.h #usr/include/gdfontg.h @@ -21,8 +21,9 @@ #usr/include/gdfonts.h #usr/include/gdfontt.h #usr/include/gdfx.h -#usr/lib/libgd.a +#usr/include/gdpp.h #usr/lib/libgd.la -usr/lib/libgd.so -usr/lib/libgd.so.2 -usr/lib/libgd.so.2.0.0 +#usr/lib/libgd.so +usr/lib/libgd.so.3 +usr/lib/libgd.so.3.0.11 +#usr/lib/pkgconfig/gdlib.pc diff --git a/lfs/gd b/lfs/gd index 134d2fccd..d4a593fbf 100644 --- a/lfs/gd +++ b/lfs/gd @@ -24,10 +24,10 @@
include Config
-VER = 2.0.33 +VER = 2.3.3
-THISAPP = gd-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = libgd-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45 +$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
install : $(TARGET)
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && ./configure \
--prefix=/usr \--disable-static \--without-tiff-- 2.33.0
Hi,
I made a quick check: updating to 'vnstat 2.8' needs the 'lib(gd)...' updates from Adolf. Building 'vnstat' now works. Thanks... ;-)
I'll doublecheck with a clean build, but first test was ok.
Best, Matthias
On 23.09.2021 18:03, Matthias Fischer wrote:
Hi,
On 23.09.2021 16:56, Adolf Belka wrote:
Hi Michael,
On 23/09/2021 14:45, Michael Tremer wrote:
Hello,
On 23 Sep 2021, at 13:24, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021)
- Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs didn't work so all required changes are part of this patch series
We no longer have PNG graphs. At least not from rrdtool.
Is this vnstat maybe?
I tried to update 'vnstat' to "2.8" a few days ago - and yes, I think this is also needed for 'vnstat'.
Best, Matthias
They are still used for the pie charts in the logs section. firewalllogip.dat - line 400 firewalllogport.dat - line 400 firewalllogcountry.dat - line 427.
Regards, Adolf.
-Michael
- Update rootfile
- Dependencies checked from library so bump. Nothing found.
- Changelog is too large to include here. For full details see https://github.com/libgd/libgd/releases
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/gd | 13 +++++++------ lfs/gd | 15 +++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd index 09366b717..434102084 100644 --- a/config/rootfiles/common/gd +++ b/config/rootfiles/common/gd @@ -4,15 +4,15 @@ #usr/bin/gd2togif #usr/bin/gd2topng #usr/bin/gdcmpgif -#usr/bin/gdlib-config #usr/bin/gdparttopng #usr/bin/gdtopng #usr/bin/giftogd2 #usr/bin/pngtogd #usr/bin/pngtogd2 #usr/bin/webpng -#usr/include/entities.h #usr/include/gd.h +#usr/include/gd_color_map.h +#usr/include/gd_errors.h #usr/include/gd_io.h #usr/include/gdcache.h #usr/include/gdfontg.h @@ -21,8 +21,9 @@ #usr/include/gdfonts.h #usr/include/gdfontt.h #usr/include/gdfx.h -#usr/lib/libgd.a +#usr/include/gdpp.h #usr/lib/libgd.la -usr/lib/libgd.so -usr/lib/libgd.so.2 -usr/lib/libgd.so.2.0.0 +#usr/lib/libgd.so +usr/lib/libgd.so.3 +usr/lib/libgd.so.3.0.11 +#usr/lib/pkgconfig/gdlib.pc diff --git a/lfs/gd b/lfs/gd index 134d2fccd..d4a593fbf 100644 --- a/lfs/gd +++ b/lfs/gd @@ -24,10 +24,10 @@
include Config
-VER = 2.0.33 +VER = 2.3.3
-THISAPP = gd-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = libgd-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45 +$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
install : $(TARGET)
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && ./configure \
--prefix=/usr \--disable-static \--without-tiff-- 2.33.0
Hi Matthias,
On 23/09/2021 18:52, Matthias Fischer wrote:
Hi,
I made a quick check: updating to 'vnstat 2.8' needs the 'lib(gd)...' updates from Adolf. Building 'vnstat' now works. Thanks... ;-)
I'm glad that the gd update helped you.
I'll doublecheck with a clean build, but first test was ok.
Fingers crossed that it stays working.
Regards, Adolf.
Best, Matthias
On 23.09.2021 18:03, Matthias Fischer wrote:
Hi,
On 23.09.2021 16:56, Adolf Belka wrote:
Hi Michael,
On 23/09/2021 14:45, Michael Tremer wrote:
Hello,
On 23 Sep 2021, at 13:24, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021)
- Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs didn't work so all required changes are part of this patch series
We no longer have PNG graphs. At least not from rrdtool.
Is this vnstat maybe?
I tried to update 'vnstat' to "2.8" a few days ago - and yes, I think this is also needed for 'vnstat'.
Best, Matthias
They are still used for the pie charts in the logs section. firewalllogip.dat - line 400 firewalllogport.dat - line 400 firewalllogcountry.dat - line 427.
Regards, Adolf.
-Michael
- Update rootfile
- Dependencies checked from library so bump. Nothing found.
- Changelog is too large to include here. For full details see https://github.com/libgd/libgd/releases
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/gd | 13 +++++++------ lfs/gd | 15 +++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd index 09366b717..434102084 100644 --- a/config/rootfiles/common/gd +++ b/config/rootfiles/common/gd @@ -4,15 +4,15 @@ #usr/bin/gd2togif #usr/bin/gd2topng #usr/bin/gdcmpgif -#usr/bin/gdlib-config #usr/bin/gdparttopng #usr/bin/gdtopng #usr/bin/giftogd2 #usr/bin/pngtogd #usr/bin/pngtogd2 #usr/bin/webpng -#usr/include/entities.h #usr/include/gd.h +#usr/include/gd_color_map.h +#usr/include/gd_errors.h #usr/include/gd_io.h #usr/include/gdcache.h #usr/include/gdfontg.h @@ -21,8 +21,9 @@ #usr/include/gdfonts.h #usr/include/gdfontt.h #usr/include/gdfx.h -#usr/lib/libgd.a +#usr/include/gdpp.h #usr/lib/libgd.la -usr/lib/libgd.so -usr/lib/libgd.so.2 -usr/lib/libgd.so.2.0.0 +#usr/lib/libgd.so +usr/lib/libgd.so.3 +usr/lib/libgd.so.3.0.11 +#usr/lib/pkgconfig/gdlib.pc diff --git a/lfs/gd b/lfs/gd index 134d2fccd..d4a593fbf 100644 --- a/lfs/gd +++ b/lfs/gd @@ -24,10 +24,10 @@
include Config
-VER = 2.0.33 +VER = 2.3.3
-THISAPP = gd-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = libgd-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45 +$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
install : $(TARGET)
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && ./configure \
--prefix=/usr \--disable-static \--without-tiff-- 2.33.0
Thank you for cleaning that up for me :)
-Michael
On 23 Sep 2021, at 15:56, Adolf Belka adolf.belka@ipfire.org wrote:
Hi Michael,
On 23/09/2021 14:45, Michael Tremer wrote:
Hello,
On 23 Sep 2021, at 13:24, Adolf Belka adolf.belka@ipfire.org wrote:
- Update from 2.0.33 (2006) to 2.3.3 (Sep 2021)
- Updating gd requires GD-Graph and perl-GD to be updated otherwise the png graphs didn't work so all required changes are part of this patch series
We no longer have PNG graphs. At least not from rrdtool. Is this vnstat maybe?
They are still used for the pie charts in the logs section. firewalllogip.dat - line 400 firewalllogport.dat - line 400 firewalllogcountry.dat - line 427.
Regards, Adolf.
-Michael
- Update rootfile
- Dependencies checked from library so bump. Nothing found.
- Changelog is too large to include here. For full details see https://github.com/libgd/libgd/releases
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
config/rootfiles/common/gd | 13 +++++++------ lfs/gd | 15 +++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/config/rootfiles/common/gd b/config/rootfiles/common/gd index 09366b717..434102084 100644 --- a/config/rootfiles/common/gd +++ b/config/rootfiles/common/gd @@ -4,15 +4,15 @@ #usr/bin/gd2togif #usr/bin/gd2topng #usr/bin/gdcmpgif -#usr/bin/gdlib-config #usr/bin/gdparttopng #usr/bin/gdtopng #usr/bin/giftogd2 #usr/bin/pngtogd #usr/bin/pngtogd2 #usr/bin/webpng -#usr/include/entities.h #usr/include/gd.h +#usr/include/gd_color_map.h +#usr/include/gd_errors.h #usr/include/gd_io.h #usr/include/gdcache.h #usr/include/gdfontg.h @@ -21,8 +21,9 @@ #usr/include/gdfonts.h #usr/include/gdfontt.h #usr/include/gdfx.h -#usr/lib/libgd.a +#usr/include/gdpp.h #usr/lib/libgd.la -usr/lib/libgd.so -usr/lib/libgd.so.2 -usr/lib/libgd.so.2.0.0 +#usr/lib/libgd.so +usr/lib/libgd.so.3 +usr/lib/libgd.so.3.0.11 +#usr/lib/pkgconfig/gdlib.pc diff --git a/lfs/gd b/lfs/gd index 134d2fccd..d4a593fbf 100644 --- a/lfs/gd +++ b/lfs/gd @@ -24,10 +24,10 @@
include Config
-VER = 2.0.33 +VER = 2.3.3
-THISAPP = gd-$(VER) -DL_FILE = $(THISAPP).tar.gz +THISAPP = libgd-$(VER) +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = be0a6d326cd8567e736fbc75df0a5c45 +$(DL_FILE)_MD5 = 7a58b54d375eda236414201252a0ee3c
install : $(TARGET)
@@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
- cd $(DIR_APP) && ./configure \
--prefix=/usr \--disable-static \--without-tiff-- 2.33.0
-
Adolf Belka -
Matthias Fischer -
Michael Tremer