[PULL] XQuartz update for ATS allowance of our Sparkle feed and updated menu bar height logic

2015-10-14 Thread Jeremy Huddleston Sequoia
The following changes since commit 880d4e78b1823bcc0e66e68270af1a475f097bb5:

  xwayland: Set physical screen size to something (2015-10-07 10:39:17 -0400)

are available in the git repository at:

  git://people.freedesktop.org/~jeremyhu/xserver 

for you to fetch changes up to 4513f924a7065edbd267cf96837af94ce5a58a6f:

  XQuartz: Fix how we calculate the height of the OSX menu bar (2015-10-13 
14:19:05 -0700)


Jeremy Huddleston Sequoia (2):
  XQuartz: Relax App Transport Security for communicating with the update 
server
  XQuartz: Remove InfoPlist.strings

Ken Thomases (1):
  XQuartz: Fix how we calculate the height of the OSX menu bar

 hw/xquartz/X11Application.m  |  12 ++--
 hw/xquartz/bundle/Info.plist.cpp |  13 
+
 hw/xquartz/bundle/Makefile.am|  30 
--
 hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings| Bin 274 -> 0 
bytes
 hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings  | Bin 276 -> 0 
bytes
 hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings   | Bin 276 -> 0 
bytes
 hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings   | Bin 276 -> 0 
bytes
 hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings  | Bin 278 -> 0 
bytes
 hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings | Bin 272 -> 0 
bytes
 hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings  | Bin 276 -> 0 
bytes
 hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings   | Bin 276 -> 0 
bytes
 hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings   | Bin 276 -> 0 
bytes
 hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings   | Bin 272 -> 0 
bytes
 hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings   | Bin 276 -> 0 
bytes
 hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings   | Bin 274 -> 0 
bytes
 hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings   | Bin 274 -> 0 
bytes
 hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings   | Bin 298 -> 0 
bytes
 hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings   | Bin 286 -> 0 
bytes
 hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings   | Bin 278 -> 0 
bytes
 hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings   | Bin 266 -> 0 
bytes
 hw/xquartz/bundle/Resources/no.lproj/InfoPlist.strings   | Bin 276 -> 0 
bytes
 hw/xquartz/bundle/Resources/pl.lproj/InfoPlist.strings   | Bin 274 -> 0 
bytes
 hw/xquartz/bundle/Resources/pt.lproj/InfoPlist.strings   | Bin 274 -> 0 
bytes
 hw/xquartz/bundle/Resources/pt_PT.lproj/InfoPlist.strings| Bin 274 -> 0 
bytes
 hw/xquartz/bundle/Resources/ro.lproj/InfoPlist.strings   | Bin 280 -> 0 
bytes
 hw/xquartz/bundle/Resources/ru.lproj/InfoPlist.strings   | Bin 274 -> 0 
bytes
 hw/xquartz/bundle/Resources/sk.lproj/InfoPlist.strings   | Bin 274 -> 0 
bytes
 hw/xquartz/bundle/Resources/sv.lproj/InfoPlist.strings   | Bin 260 -> 0 
bytes
 hw/xquartz/bundle/Resources/th.lproj/InfoPlist.strings   | Bin 270 -> 0 
bytes
 hw/xquartz/bundle/Resources/tr.lproj/InfoPlist.strings   | Bin 272 -> 0 
bytes
 hw/xquartz/bundle/Resources/uk.lproj/InfoPlist.strings   | Bin 264 -> 0 
bytes
 hw/xquartz/bundle/Resources/zh_CN.lproj/InfoPlist.strings| Bin 260 -> 0 
bytes
 hw/xquartz/bundle/Resources/zh_TW.lproj/InfoPlist.strings| Bin 264 -> 0 
bytes
 hw/xquartz/bundle/mk_bundke.sh   |   2 +-
 34 files changed, 24 insertions(+), 33 deletions(-)
 delete mode 100644 hw/xquartz/bundle/Resources/Dutch.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/English.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/French.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/German.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/Italian.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/Japanese.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/Spanish.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/ar.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/ca.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/cs.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/da.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/el.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/fi.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/he.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/hr.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/hu.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/ko.lproj/InfoPlist.strings
 delete mode 100644 hw/xquartz/bundle/Resources/no.lproj/In

Re: [PULL] XQuartz update for ATS allowance of our Sparkle feed and updated menu bar height logic

2015-10-14 Thread Adam Jackson
On Wed, 2015-10-14 at 00:40 -0700, Jeremy Huddleston Sequoia wrote:

>   XQuartz: Relax App Transport Security for communicating with the update 
> server

I'm not sure I'm a fan of this change?  ATS looks to be new in 10.11,
so this might not be a change in behavior in a strict sense, but the
SSL cert for www.macosforge.org seems to be valid for
xquartz.macosforge.org and xquartz-dl.macosforge.org so I'm not sure
why you'd need to turn it off.  What's the story here?

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PULL] XQuartz update for ATS allowance of our Sparkle feed and updated menu bar height logic

2015-10-14 Thread Jeremy Huddleston Sequoia

> On Oct 14, 2015, at 06:32, Adam Jackson  wrote:
> 
> On Wed, 2015-10-14 at 00:40 -0700, Jeremy Huddleston Sequoia wrote:
> 
>>  XQuartz: Relax App Transport Security for communicating with the update 
>> server
> 
> I'm not sure I'm a fan of this change?  ATS looks to be new in 10.11,
> so this might not be a change in behavior in a strict sense, but the
> SSL cert for www.macosforge.org seems to be valid for
> xquartz.macosforge.org and xquartz-dl.macosforge.org so I'm not sure
> why you'd need to turn it off.  What's the story here?

We don't really care about the security of the transport itself.  No 
confidential data is sent from the user's machine during the update process.  
Sparkle validates the downloaded update was signed by my sparkle key, and the 
installer verifies that the contained package was installed by my app developer 
key.

The main reason I don't just leave it alone and update the URL is that our wiki 
and years of instructions have left users having set this manually:
defaults write org.macosforge.xquartz.X11 SUFeedURL 
http://xquartz.macosforge.org/downloads/sparkle/beta.xml

We could have some logic at startup to notice that and update it for them, but 
the easier path was to just relax ATS since we don't really benefit from it 
anyways.

smime.p7s
Description: S/MIME cryptographic signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Re: [PULL] XQuartz update for ATS allowance of our Sparkle feed and updated menu bar height logic

2015-10-14 Thread Adam Jackson
On Wed, 2015-10-14 at 08:45 -0700, Jeremy Huddleston Sequoia wrote:

> > I'm not sure I'm a fan of this change?  ATS looks to be new in 10.11,
> > so this might not be a change in behavior in a strict sense, but the
> > SSL cert for www.macosforge.org seems to be valid for
> > xquartz.macosforge.org and xquartz-dl.macosforge.org so I'm not sure
> > why you'd need to turn it off.  What's the story here?
> 
> We don't really care about the security of the transport itself.  No
> confidential data is sent from the user's machine during the update
> process.  Sparkle validates the downloaded update was signed by my
> sparkle key, and the installer verifies that the contained package
> was installed by my app developer key.

That sounds fine, was just concerned that you could end up with a
subverted binary getting installed, but the signature process sounds
like it's assurance enough.  Thanks for the explanation.

Merged:

To ssh://git.freedesktop.org/git/xorg/xserver
   880d4e7..4513f92  master -> master

- ajax
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel