From: Dominic Fandrey on
On 28/03/2010 15:38, Ion-Mihai Tetcu wrote:
> We do _NOT_ recommend updating ports until this commits are all done,
> and the problems are fixed, except if you want to help testing / fixing.

A small fix for graphics/php5-gd. It builds without the patch, but
doesn't work without it.

diff -Nur php5-gd.orig/files/patch-ext-gd-libgd-gd_png.c php5-gd/files/patch-ext-gd-libgd-gd_png.c
--- php5-gd.orig/files/patch-ext-gd-libgd-gd_png.c 1970-01-01 01:00:00.000000000 +0100
+++ php5-gd/files/patch-ext-gd-libgd-gd_png.c 2010-03-29 09:38:38.000000000 +0200
@@ -0,0 +1,11 @@
+--- libgd/gd_png.c.orig 2010-03-29 09:33:02.000000000 +0200
++++ libgd/gd_png.c 2010-03-29 09:35:15.000000000 +0200
+@@ -139,7 +139,7 @@
+ return NULL;
+ }
+
+- if (!png_check_sig (sig, 8)) { /* bad signature */
++ if (png_sig_cmp (sig, 0, 8) != 0) { /* bad signature */
+ return NULL;
+ }
+
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Rene Ladan on
2010/3/29 Garrett Cooper <yanefbsd(a)gmail.com>:
> On Sun, Mar 28, 2010 at 7:17 PM, Aristedes Maniatis <ari(a)ish.com.au> wrote:
>> On 29/03/10 1:15 PM, Garrett Cooper wrote:
>>>
>>> portmaster -r png-
>>
>> Is that correct? I haven't seen that notation before (although I might just
>> have missed it in the docs).
>>
>> I would have used
>>
>>  portmaster -r graphics/png
>
>    And yes, the directions are still wrong; it should be:
>
> portmaster -r 'png-*'
>
>    Similarly since this was just a copy-paste of the jpeg
> instructions, those ones are wrong as well.

Given that the PORTREVISION of all dependent ports are bumped, a simple
'portupgrade -a' or 'portmaster -a' should suffice. Or am I missing something?

Rene
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Garrett Cooper on
On Mon, Mar 29, 2010 at 12:52 AM, Rene Ladan <r.c.ladan(a)gmail.com> wrote:
> 2010/3/29 Garrett Cooper <yanefbsd(a)gmail.com>:
>> On Sun, Mar 28, 2010 at 7:17 PM, Aristedes Maniatis <ari(a)ish.com.au> wrote:
>>> On 29/03/10 1:15 PM, Garrett Cooper wrote:
>>>>
>>>> portmaster -r png-
>>>
>>> Is that correct? I haven't seen that notation before (although I might just
>>> have missed it in the docs).
>>>
>>> I would have used
>>>
>>>  portmaster -r graphics/png
>>
>>    And yes, the directions are still wrong; it should be:
>>
>> portmaster -r 'png-*'
>>
>>    Similarly since this was just a copy-paste of the jpeg
>> instructions, those ones are wrong as well.
>
> Given that the PORTREVISION of all dependent ports are bumped, a simple
> 'portupgrade -a' or 'portmaster -a' should suffice. Or am I missing something?

You're absolutely correct, but I think that these directions were
written with the intent that they would be simple one-off directions
for upgrading just graphics/png dependent libs.
HTH,
-Garrett
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Dominic Fandrey on
On 28/03/2010 15:38, Ion-Mihai Tetcu wrote:
> We do _NOT_ recommend updating ports until this commits are all done,
> and the problems are fixed, except if you want to help testing / fixing.

Fix for graphics/evas-loader-png.

diff -Nur evas-loader-png.orig/files/patch-src-modules-loaders-png-evas_image_load_png.c evas-loader-png/files/patch-src-modules-loaders-png-evas_image_load_png.c
--- evas-loader-png.orig/files/patch-src-modules-loaders-png-evas_image_load_png.c 1970-01-01 01:00:00.000000000 +0100
+++ evas-loader-png/files/patch-src-modules-loaders-png-evas_image_load_png.c 2010-03-29 09:54:23.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/modules/loaders/png/evas_image_load_png.c.orig 2010-03-29 09:51:19.000000000 +0200
++++ src/modules/loaders/png/evas_image_load_png.c 2010-03-29 09:52:29.000000000 +0200
+@@ -44,7 +44,7 @@
+ fclose(f);
+ return 0;
+ }
+- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
++ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK) != 0)
+ {
+ fclose(f);
+ return 0;
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"

From: Dominic Fandrey on
On 29/03/2010 09:58, Dominic Fandrey wrote:
> On 28/03/2010 15:38, Ion-Mihai Tetcu wrote:
>> We do _NOT_ recommend updating ports until this commits are all done,
>> and the problems are fixed, except if you want to help testing / fixing.
>
> Fix for graphics/evas-loader-png.

Sorry, wrong patch. This is the one:

diff -Nur evas-loader-png.orig/files/patch-src-modules-loaders-png-evas_image_load_png.c evas-loader-png/files/patch-src-modules-loaders-png-evas_image_load_png.c
--- evas-loader-png.orig/files/patch-src-modules-loaders-png-evas_image_load_png.c 1970-01-01 01:00:00.000000000 +0100
+++ evas-loader-png/files/patch-src-modules-loaders-png-evas_image_load_png.c 2010-03-29 10:01:37.000000000 +0200
@@ -0,0 +1,20 @@
+--- src/modules/loaders/png/evas_image_load_png.c.orig 2007-10-28 11:35:13.000000000 +0100
++++ src/modules/loaders/png/evas_image_load_png.c 2010-03-29 10:01:31.000000000 +0200
+@@ -44,7 +44,7 @@
+ fclose(f);
+ return 0;
+ }
+- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
++ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK) != 0)
+ {
+ fclose(f);
+ return 0;
+@@ -121,7 +121,7 @@
+
+ /* if we havent read the header before, set the header data */
+ fread(buf, 1, PNG_BYTES_TO_CHECK, f);
+- if (!png_check_sig(buf, PNG_BYTES_TO_CHECK))
++ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK) != 0)
+ {
+ fclose(f);
+ return 0;
_______________________________________________
freebsd-ports(a)freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscribe(a)freebsd.org"