From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH 1/4] gd: Update to version 2.3.3
Date: Fri, 24 Sep 2021 11:40:18 +0100
Message-ID: <F71C1080-C39E-4035-8AD8-F5E56E2A9CCF@ipfire.org>
In-Reply-To: <13db655a-5d6d-f638-81a6-b3e1ae58b6cb@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4524674185846478610=="
List-Id: <development.lists.ipfire.org>

--===============4524674185846478610==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Thank you for cleaning that up for me :)

-Michael

> On 23 Sep 2021, at 15:56, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> Hi Michael,
>=20
> On 23/09/2021 14:45, Michael Tremer wrote:
>> Hello,
>>> On 23 Sep 2021, at 13:24, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>=20
>>> - 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 p=
ng 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.
>=20
> 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
>>>=20
>>> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> ---
>>> config/rootfiles/common/gd | 13 +++++++------
>>> lfs/gd                     | 15 +++++++++------
>>> 2 files changed, 16 insertions(+), 12 deletions(-)
>>>=20
>>> 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 @@
>>>=20
>>> include Config
>>>=20
>>> -VER        =3D 2.0.33
>>> +VER        =3D 2.3.3
>>>=20
>>> -THISAPP    =3D gd-$(VER)
>>> -DL_FILE    =3D $(THISAPP).tar.gz
>>> +THISAPP    =3D libgd-$(VER)
>>> +DL_FILE    =3D $(THISAPP).tar.xz
>>> DL_FROM    =3D $(URL_IPFIRE)
>>> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
>>> TARGET     =3D $(DIR_INFO)/$(THISAPP)
>>> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
>>>=20
>>> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>>>=20
>>> -$(DL_FILE)_MD5 =3D be0a6d326cd8567e736fbc75df0a5c45
>>> +$(DL_FILE)_MD5 =3D 7a58b54d375eda236414201252a0ee3c
>>>=20
>>> install : $(TARGET)
>>>=20
>>> @@ -69,9 +69,12 @@ $(subst %,%_MD5,$(objects)) :
>>>=20
>>> $(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=3D/usr --disable-nls
>>> +	cd $(DIR_APP) && ./configure \
>>> +			--prefix=3D/usr \
>>> +			--disable-static \
>>> +			--without-tiff
>>> 	cd $(DIR_APP) && make $(MAKETUNING)
>>> 	cd $(DIR_APP) && make install
>>> 	@rm -rf $(DIR_APP)
>>> --=20
>>> 2.33.0
>>>=20


--===============4524674185846478610==--