Re: FreeType-2.6.1 !!header files layout changed again!!

[Christian Weisgerber]

On 2015-10-15, Christian Weisgerber  wrote:

> Known fallout so far: all Mozilla ports.

David has fixed this and there has been no further fallout.
The FreeType update can go ahead.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: FreeType-2.6.1 !!header files layout changed again!!

[David Coppa]

On Tue, 13 Oct 2015, Christian Weisgerber wrote:

> David Coppa:
> 
> > New freetype version, new header file layout :( :(
> > [...]
> > Obviously, I'm expecting some fallouts from a bulk build with this...
> 
> The only initial fallout from this is devel/xulrunner/24.
> 
> However, without xulrunner ~750 further packages aren't built, so
> we need a fix for xulrunner before we can see what the overall
> breakage is.

diff below.

Cheers!
David

Index: Makefile
===
RCS file: /cvs/ports/devel/xulrunner/24/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile24 Sep 2015 20:19:15 -  1.23
+++ Makefile14 Oct 2015 07:25:24 -
@@ -7,8 +7,8 @@ MOZILLA_PROJECT =   xulrunner
 MOZILLA_DIST = firefox
 PKGSPEC-devel =xulrunner-devel->=24.0,<31.0
 PKGSPEC-main = xulrunner->=24.0,<31.0
-REVISION-main =5
-REVISION-devel =   5
+REVISION-main =6
+REVISION-devel =   6
 
 SO_VERSION =   0.0
 MOZILLA_LIBS = mozgnome mozalloc xul
Index: patches/patch-config_system-headers
===
RCS file: /cvs/ports/devel/xulrunner/24/patches/patch-config_system-headers,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-config_system-headers
--- patches/patch-config_system-headers 30 Jun 2015 07:08:28 -  1.4
+++ patches/patch-config_system-headers 14 Oct 2015 07:25:24 -
@@ -1,15 +1,15 @@
 $OpenBSD: patch-config_system-headers,v 1.4 2015/06/30 07:08:28 dcoppa Exp $
 
-Fix building with freetype-2.6 or later
-https://hg.mozilla.org/mozilla-central/rev/afd840d66e6a
+Fix building with freetype-2.6.1
+https://hg.mozilla.org/mozilla-central/rev/af40750720b5
 
 --- config/system-headers.orig Mon Jun 29 16:25:46 2015
 +++ config/system-headers  Mon Jun 29 16:28:26 2015
-@@ -415,6 +415,7 @@ freetype/ftbitmap.h
- freetype/ftxf86.h
- freetype.h
- ftcache.h
-+ftfntfmt.h
- ftglyph.h
- ftsynth.h
- ftoutln.h
+@@ -402,6 +402,7 @@ frame/log.h
+ frame/req.h
+ freetype/freetype.h
+ freetype/ftcache.h
++freetype/ftfntfmt.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
+ freetype/ftoutln.h
Index: patches/patch-js_src_config_system-headers
===
RCS file: 
/cvs/ports/devel/xulrunner/24/patches/patch-js_src_config_system-headers,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-js_src_config_system-headers
--- patches/patch-js_src_config_system-headers  30 Jun 2015 07:08:28 -  
1.4
+++ patches/patch-js_src_config_system-headers  14 Oct 2015 07:25:24 -
@@ -1,15 +1,15 @@
 $OpenBSD: patch-js_src_config_system-headers,v 1.4 2015/06/30 07:08:28 dcoppa 
Exp $
 
-Fix building with freetype-2.6 or later
-https://hg.mozilla.org/mozilla-central/rev/afd840d66e6a
+Fix building with freetype-2.6.1
+https://hg.mozilla.org/mozilla-central/rev/af40750720b5
 
 --- js/src/config/system-headers.orig  Mon Jun 29 16:35:12 2015
 +++ js/src/config/system-headers   Mon Jun 29 16:35:14 2015
-@@ -415,6 +415,7 @@ freetype/ftbitmap.h
- freetype/ftxf86.h
- freetype.h
- ftcache.h
-+ftfntfmt.h
- ftglyph.h
- ftsynth.h
- ftoutln.h
+@@ -402,6 +402,7 @@ frame/log.h
+ frame/req.h
+ freetype/freetype.h
+ freetype/ftcache.h
++freetype/ftfntfmt.h
+ freetype/ftglyph.h
+ freetype/ftsynth.h
+ freetype/ftoutln.h

Re: FreeType-2.6.1 !!header files layout changed again!!

[Christian Weisgerber]

David Coppa:

> New freetype version, new header file layout :( :(
> [...]
> Obviously, I'm expecting some fallouts from a bulk build with this...

The only initial fallout from this is devel/xulrunner/24.

However, without xulrunner ~750 further packages aren't built, so
we need a fix for xulrunner before we can see what the overall
breakage is.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: FreeType-2.6.1 !!header files layout changed again!!

[Matthieu Herrb]

On Wed, Oct 07, 2015 at 06:12:24AM -0600, David Coppa wrote:
> 
> Hi!
> 
> New freetype version, new header file layout :( :(
> 
> Now, all header files except 'ft2build.h' are (again) into
> /usr/X11R6/include/freetype2/freetype/.
> 
> Luckily, no ABI changes this time.
>
As far as I'm concerned (ie waiting for ports build results) ok
matthieu@.

Running this on a couple of machines without visible problems.
-- 
Matthieu Herrb


signature.asc
Description: PGP signature

Re: FreeType-2.6.1 !!header files layout changed again!!

[David Coppa]

On Wed, Oct 7, 2015 at 2:12 PM, David Coppa  wrote:
>
> Hi!
>
> New freetype version, new header file layout :( :(
>
> Now, all header files except 'ft2build.h' are (again) into
> /usr/X11R6/include/freetype2/freetype/.
>
> Luckily, no ABI changes this time.
>
> So, to apply the patches:
>
>
> $ cd /usr/src/
> $ patch -NE -i /path/to/mtree.diff
>
> -> as root <-
> # cat /usr/src/etc/mtree/BSD.x11.dist > /etc/mtree/BSD.x11.dist
> # rm -rf /usr/X11R6/include/freetype2
>
> $ cd /usr/xenocara/
> $ make bootstrap
> $ cd /usr/xenocara/lib/freetype
> $ mkdir -p include/freetype/config
> $ mkdir -p include/freetype/internal/services
> $ patch -NEp0 -i /path/to/freetype-2.6.1.diff
> $ make depend
> $ make clean ; make
>
> -> as root <-
> # cd /usr/xenocara/lib/freetype ; make install
>
>
>
> Obviously, I'm expecting some fallouts from a bulk build with this...
>
> Cheers,
> David

This update is also security related, addressing some CVEs:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9745

http://seclists.org/bugtraq/2015/Oct/41

http://www.openwall.com/lists/oss-security/2015/09/11/4

Ciao!
David

Re: FreeType-2.6.1 !!header files layout changed again!!

[Stuart Henderson]

On 2015/10/07 14:40, David Coppa wrote:
> On Wed, Oct 7, 2015 at 2:12 PM, David Coppa  wrote:
> >
> > Hi!
> >
> > New freetype version, new header file layout :( :(
> >
> > Now, all header files except 'ft2build.h' are (again) into
> > /usr/X11R6/include/freetype2/freetype/.
> >
> > Luckily, no ABI changes this time.
> >
> > So, to apply the patches:
> >
> >
> > $ cd /usr/src/
> > $ patch -NE -i /path/to/mtree.diff
> >
> > -> as root <-
> > # cat /usr/src/etc/mtree/BSD.x11.dist > /etc/mtree/BSD.x11.dist
> > # rm -rf /usr/X11R6/include/freetype2
> >
> > $ cd /usr/xenocara/
> > $ make bootstrap
> > $ cd /usr/xenocara/lib/freetype
> > $ mkdir -p include/freetype/config
> > $ mkdir -p include/freetype/internal/services
> > $ patch -NEp0 -i /path/to/freetype-2.6.1.diff
> > $ make depend
> > $ make clean ; make
> >
> > -> as root <-
> > # cd /usr/xenocara/lib/freetype ; make install
> >
> >
> >
> > Obviously, I'm expecting some fallouts from a bulk build with this...
> >
> > Cheers,
> > David
> 
> This update is also security related, addressing some CVEs:
> 
> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9745
> 
> http://seclists.org/bugtraq/2015/Oct/41
> 
> http://www.openwall.com/lists/oss-security/2015/09/11/4
> 
> Ciao!
> David

*grmbl* somebody slap them, please

Maybe backport the security fixes first? It'll need doing anyway if they
are to go into -stable..

Re: FreeType-2.6.1 !!header files layout changed again!!

[David Coppa]

On Wed, Oct 7, 2015 at 3:01 PM, Stuart Henderson  wrote:
> On 2015/10/07 14:40, David Coppa wrote:
>> On Wed, Oct 7, 2015 at 2:12 PM, David Coppa  wrote:
>> >
>> > Hi!
>> >
>> > New freetype version, new header file layout :( :(
>> >
>> > Now, all header files except 'ft2build.h' are (again) into
>> > /usr/X11R6/include/freetype2/freetype/.
>> >
>> > Luckily, no ABI changes this time.
>> >
>> > So, to apply the patches:
>> >
>> >
>> > $ cd /usr/src/
>> > $ patch -NE -i /path/to/mtree.diff
>> >
>> > -> as root <-
>> > # cat /usr/src/etc/mtree/BSD.x11.dist > /etc/mtree/BSD.x11.dist
>> > # rm -rf /usr/X11R6/include/freetype2
>> >
>> > $ cd /usr/xenocara/
>> > $ make bootstrap
>> > $ cd /usr/xenocara/lib/freetype
>> > $ mkdir -p include/freetype/config
>> > $ mkdir -p include/freetype/internal/services
>> > $ patch -NEp0 -i /path/to/freetype-2.6.1.diff
>> > $ make depend
>> > $ make clean ; make
>> >
>> > -> as root <-
>> > # cd /usr/xenocara/lib/freetype ; make install
>> >
>> >
>> >
>> > Obviously, I'm expecting some fallouts from a bulk build with this...
>> >
>> > Cheers,
>> > David
>>
>> This update is also security related, addressing some CVEs:
>>
>> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9745
>>
>> http://seclists.org/bugtraq/2015/Oct/41
>>
>> http://www.openwall.com/lists/oss-security/2015/09/11/4
>>
>> Ciao!
>> David
>
> *grmbl* somebody slap them, please
>
> Maybe backport the security fixes first? It'll need doing anyway if they
> are to go into -stable..

Ehm... Nevermind, these security bugs were already fixed in freetype-2.6.0.

Sorry for the noise!

Btw, this is the changelog for freetype-2.6.1:

http://sourceforge.net/projects/freetype/files/freetype2/2.6.1/

The request for a bulk build with freetype-2.6.1 is still valid :)

ciao
David

Re: FreeType-2.6.1 !!header files layout changed again!!

[David Coppa]

On Wed, Oct 7, 2015 at 3:01 PM, Stuart Henderson  wrote:
> On 2015/10/07 14:40, David Coppa wrote:
>> On Wed, Oct 7, 2015 at 2:12 PM, David Coppa  wrote:
>> >
>> > Hi!
>> >
>> > New freetype version, new header file layout :( :(
>> >
>> > Now, all header files except 'ft2build.h' are (again) into
>> > /usr/X11R6/include/freetype2/freetype/.
>> >
>> > Luckily, no ABI changes this time.
>> >
>> > So, to apply the patches:
>> >
>> >
>> > $ cd /usr/src/
>> > $ patch -NE -i /path/to/mtree.diff
>> >
>> > -> as root <-
>> > # cat /usr/src/etc/mtree/BSD.x11.dist > /etc/mtree/BSD.x11.dist
>> > # rm -rf /usr/X11R6/include/freetype2
>> >
>> > $ cd /usr/xenocara/
>> > $ make bootstrap
>> > $ cd /usr/xenocara/lib/freetype
>> > $ mkdir -p include/freetype/config
>> > $ mkdir -p include/freetype/internal/services
>> > $ patch -NEp0 -i /path/to/freetype-2.6.1.diff
>> > $ make depend
>> > $ make clean ; make
>> >
>> > -> as root <-
>> > # cd /usr/xenocara/lib/freetype ; make install
>> >
>> >
>> >
>> > Obviously, I'm expecting some fallouts from a bulk build with this...
>> >
>> > Cheers,
>> > David
>>
>> This update is also security related, addressing some CVEs:
>>
>> https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2014-9745
>>
>> http://seclists.org/bugtraq/2015/Oct/41
>>
>> http://www.openwall.com/lists/oss-security/2015/09/11/4
>>
>> Ciao!
>> David
>
> *grmbl* somebody slap them, please
>
> Maybe backport the security fixes first? It'll need doing anyway if they
> are to go into -stable..

I'm going to have a look in a minute...