Pullup ticket #4032 - requested by tron
pkgtools/x11-links: avoid spurious warnings for MacOS

Revisions pulled up:
- pkgtools/x11-links/xorg-version.mk                            1.3

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Jan 23 15:25:05 UTC 2013

   Modified Files:
   	pkgsrc/pkgtools/x11-links: xorg-version.mk

   Log Message:
   Remove code which tries to use "Xquartz" to find out the X.org version
   (presumably only under Mac OS X Mountain Lion). "Xquarty" simply doesn't
   print out anything if you run it with "-version".

   This avoids a lot of warning messages from "bmake" while building packages
   that use X11.


   To generate a diff of this commit:
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/xorg-version.mk
Pullup ticket #4035 - requested by tron
mk/bsd.prefs.mk: build fix for MacOS

Revisions pulled up:
- mk/bsd.prefs.mk                                               1.330

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Jan 23 17:02:24 UTC 2013

   Modified Files:
   	pkgsrc/mk: bsd.prefs.mk

   Log Message:
   X11 (from the Xquartz distribution) gets installed under "/opt/X11" under
   Mac OS X Mountain Lion. "/usr/X11" is only a symbolic link. Use the correct
   path because buidlink3 will otherwise filter out "-I/opt/X11/include" which
   causes build failures of e.g. the "cairo" package.


   To generate a diff of this commit:
   cvs rdiff -u -r1.329 -r1.330 pkgsrc/mk/bsd.prefs.mk
Pullup ticket #4037 - requested by obache
emulators/suse121_freetype2: security update

Revisions pulled up:
- emulators/suse121_freetype2/Makefile                          1.3
- emulators/suse121_freetype2/distinfo                          1.3

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Thu Jan 24 10:21:59 UTC 2013

   Modified Files:
   	pkgsrc/emulators/suse121_freetype2: Makefile distinfo

   Log Message:
   Update libfreetype6 rpm to 2.4.7-9.1 for CVE-2012-5668 and CVE-2012-5669.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/suse121_freetype2/Makefile \
        pkgsrc/emulators/suse121_freetype2/distinfo
Pullup ticket #4038 - requested by obache
emulators/suse121_qt4: security update

Revisions pulled up:
- emulators/suse121_qt4/Makefile                                1.2
- emulators/suse121_qt4/distinfo                                1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Thu Jan 24 10:28:53 UTC 2013

   Modified Files:
   	pkgsrc/emulators/suse121_qt4: Makefile distinfo

   Log Message:
   Update libqt4 RPMs to 4.7.4-19.13.1 for CVE-2012-4929 and CVE-2012-5624.

   Bump PKGREVISION.


   To generate a diff of this commit:
   cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/emulators/suse121_qt4/Makefile \
        pkgsrc/emulators/suse121_qt4/distinfo
Pullup ticket #4039 - requested by tron
mk/checksum/checksum.mk: build fix for MacOS

Revisions pulled up:
- mk/checksum/checksum.mk                                       1.17

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Thu Jan 24 11:20:56 UTC 2013

   Modified Files:
   	pkgsrc/mk/checksum: checksum.mk

   Log Message:
   Force using the C locale while checking or generating patch file checksums.
   Mac OS X Mountain Lion's "sed" will otherwise reject some patch files
   (e.g. "pkgsrc/devel/libcfg+/patches/patch-ab") because of broken
   UTF-8 encoding.

   It would probably be better not to use the bundled "sed" under
   Mac OS X Mountain Lion at all. But it seems that this is not
   supported by "pkgsrc" at the moment.


   To generate a diff of this commit:
   cvs rdiff -u -r1.16 -r1.17 pkgsrc/mk/checksum/checksum.mk
pullups 4032, 4035, 4037, 4038 and 4039
Pullup ticket #4040 - requested by wiz
security/gnupg: bug fix patch

Revisions pulled up:
- security/gnupg/Makefile                                       1.116-1.117
- security/gnupg/distinfo                                       1.58-1.60
- security/gnupg/options.mk                                     1.16
- security/gnupg/patches/patch-cipher_idea.c                    1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Jan  7 12:26:56 UTC 2013

   Modified Files:
   	pkgsrc/security/gnupg: distinfo options.mk

   Log Message:
   Remove idea option -- included in standard distfile now.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Jan  7 21:47:01 UTC 2013

   Modified Files:
   	pkgsrc/security/gnupg: distinfo

   Log Message:
   Remove a superfluous line (hi tron!)

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Jan  7 21:47:32 UTC 2013

   Modified Files:
   	pkgsrc/security/gnupg: Makefile

   Log Message:
   Remove obsolete line. Noted by tez.

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Mon Jan  7 21:53:53 UTC 2013

   Modified Files:
   	pkgsrc/security/gnupg: Makefile distinfo
   Added Files:
   	pkgsrc/security/gnupg/patches: patch-cipher_idea.c

   Log Message:
   Fix idea on big-endian hosts.
   >From http://bugs.g10code.com/gnupg/issue1461

   Reported by tez.

   Bump PKGREVISION.
Pullup ticket #4040.
Pullup ticket #4041 - requested by tron
multimedia/libvpx: MacOS fix

Revisions pulled up:
- multimedia/libvpx/distinfo                                    1.16
- multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh    1.1

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Thu Jan 24 10:22:08 UTC 2013

   Modified Files:
   	pkgsrc/multimedia/libvpx: distinfo
   Added Files:
   	pkgsrc/multimedia/libvpx/patches: patch-build_make_gen_asm_deps.sh

   Log Message:
   Add patch taken from "homebrew" project to fix the build with new version
   of Xcode under Mac OS X.


   To generate a diff of this commit:
   cvs rdiff -u -r1.15 -r1.16 pkgsrc/multimedia/libvpx/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/multimedia/libvpx/patches/patch-build_make_gen_asm_deps.sh
Pullup ticket #4042 - requested by morr
www/wordpress: security update

Revisions pulled up:
- www/wordpress/Makefile                                        1.30
- www/wordpress/PLIST                                           1.14
- www/wordpress/distinfo                                        1.24

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	morr
   Date:		Sun Jan 27 07:51:37 UTC 2013
   Modified Files:
   	pkgsrc/www/wordpress: Makefile PLIST distinfo
   Log Message:
   This maintenance release addresses 37 bugs with version 3.5, including:
   * Editor: Prevent certain HTML elements from being unexpectedly removed or
   modified in rare cases.
   * Media: Fix a collection of minor workflow and compatibility issues in the new
   media manager.
   * Networks: Suggest proper rewrite rules when creating a new network.
   * Prevent scheduled posts from being stripped of certain HTML, such as video
   embeds, when they are published.
   * Work around some misconfigurations that may have caused some JavaScript in
   the WordPress admin area to fail.
   * Suppress some warnings that could occur when a plugin misused the database or
   user APIs.
   Additionally: Version 3.5.1 fixes a few security issues:
   * Server-side request forgery (SSRF) and remote port scanning via pingbacks.
   Fixed by the WordPress security team.
   * Cross-site scripting (XSS) via shortcodes and post content. Discovered by Jon
   Cave of the WordPress security team.
   * Cross-site scripting (XSS) in the external library Plupload. Plupload 1.5.5
   was released to address this issue.
   To generate a diff of this commit:
   cvs rdiff -u -r1.29 -r1.30 pkgsrc/www/wordpress/Makefile
   cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/wordpress/PLIST
   cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/wordpress/distinfo
pullups 4041 and 4042
Merge branch 'pkgsrc_2012Q4' into joyent/feature/sngl/2012Q4