| Message ID | 20210923122451.41131-1-adolf.belka@ipfire.org |
|---|---|
| State | Accepted |
| Commit | 5f71d0a6bf369719e2456c2ffe34e4ac2b103e94 |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HFZ9s1MPlz3x1J for <patchwork@web04.haj.ipfire.org>; Thu, 23 Sep 2021 12:25:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HFZ9q5l8Mz6mj; Thu, 23 Sep 2021 12:25:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HFZ9q4jQHz2yCr; Thu, 23 Sep 2021 12:25:03 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HFZ9n5mQnz2xSX for <development@lists.ipfire.org>; Thu, 23 Sep 2021 12:25:01 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4HFZ9n01WRzxJ; Thu, 23 Sep 2021 12:25:00 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1632399901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/i7dDqW7XHLalr0o4v8+a1VwgrEYL/cp9Yt66CvPtZk=; b=rywoxmaBSkQta6VRg5aNZAgko5gXJzwjs7zjbIZKetWiPyMDCRi+kNb3TsXZRw1b9a3NqY yfie6BMvLzUdZOBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1632399901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/i7dDqW7XHLalr0o4v8+a1VwgrEYL/cp9Yt66CvPtZk=; b=iHHXqZkNwCT4PqNvzwQTHsq+YLHFc4uobe7OcBkGoZtgwmOiBOqcGUZPWxayOjen+V1vWQ UI2VoKA2AdwcaU4Ky4QlsDsaNri7+emLwzwAcYgR5bM/HxKl4JeXwWsVN1z0OqLAJCXOK9 CMXy4UueWV9DnEgRkcFTGet8RP4KsZv4g5rDLA3evgAh1ON19OIa0kF4ysjnYgQiaM1TXp 4Tr5rIydUpS8p425HwXuQHOJuWO0g0YklfuUg6rhVWuFB6hlhmSXXqeyIiNav+2qOSeR0A 4lyNtb+o3Q9+EEdUZzvY9n29yXvuC1TBS6H6fm+o2iHActjHrI/rGlfEXgHCpA== From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 1/4] gd: Update to version 2.3.3 Date: Thu, 23 Sep 2021 14:24:48 +0200 Message-Id: <20210923122451.41131-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
| Series | [1/4] gd: Update to version 2.3.3 | |
Commit Message
Adolf Belka
Sept. 23, 2021, 12:24 p.m. UTC
- 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(-)
Comments
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 > cd $(DIR_APP) && make $(MAKETUNING) > cd $(DIR_APP) && make install > @rm -rf $(DIR_APP) > -- > 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 >> cd $(DIR_APP) && make $(MAKETUNING) >> cd $(DIR_APP) && make install >> @rm -rf $(DIR_APP) >> -- >> 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 >>> cd $(DIR_APP) && make $(MAKETUNING) >>> cd $(DIR_APP) && make install >>> @rm -rf $(DIR_APP) >>> -- >>> 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 >>>> cd $(DIR_APP) && make $(MAKETUNING) >>>> cd $(DIR_APP) && make install >>>> @rm -rf $(DIR_APP) >>>> -- >>>> 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 >>> cd $(DIR_APP) && make $(MAKETUNING) >>> cd $(DIR_APP) && make install >>> @rm -rf $(DIR_APP) >>> -- >>> 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 >>>>> cd $(DIR_APP) && make $(MAKETUNING) >>>>> cd $(DIR_APP) && make install >>>>> @rm -rf $(DIR_APP) >>>>> -- >>>>> 2.33.0 >>>>> >>>> >>> >> >
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)