Merge branch 'pkgsrc_2013Q4' into joyent/feature/pbulkmulti/2013Q4
Merge branch 'pkgsrc_2013Q4' into joyent/feature/smf/2013Q4
Pullup ticket #4287 - requested by wiz
x11/libXfont: security patch

Revisions pulled up:
- x11/libXfont/Makefile                                         1.29
- x11/libXfont/distinfo                                         1.20
- x11/libXfont/patches/patch-src_bitmap_bdfread.c               1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Jan  7 07:39:49 UTC 2014

   Modified Files:
   	pkgsrc/x11/libXfont: Makefile distinfo
   Added Files:
   	pkgsrc/x11/libXfont/patches: patch-src_bitmap_bdfread.c

   Log Message:
   CVE-2013-6462:
   A BDF font file containing a longer than expected string could
   overflow the buffer on the stack.  Testing in X servers built with
   Stack Protector resulted in an immediate crash when reading a
   user-provided specially crafted font.

   Bump PKGREVISION.
Pullup ticket #4288 - requested by wiz
graphics/graphviz: security patch

Revisions pulled up:
- graphics/graphviz/Makefile                                    1.134
- graphics/graphviz/distinfo                                    1.48
- graphics/graphviz/patches/patch-lib_cgraph_scan.l             1.1

---
   Module Name:	pkgsrc
   Committed By:	wiz
   Date:		Tue Jan  7 15:15:18 UTC 2014

   Modified Files:
   	pkgsrc/graphics/graphviz: Makefile distinfo
   Added Files:
   	pkgsrc/graphics/graphviz/patches: patch-lib_cgraph_scan.l

   Log Message:
   Security fix from upstream for a buffer overflow in the parser
   error handler.  Bump PKGREVISION.
Pullup tickets #4287 and #4288.
Make sure unwanted mkdir is not recorded with full path in rbconfig.rb, fixes packages built with pbulk.
Pullup ticket #4289 - requested by hauke
sysutils/radmind: bug fix patch

Revisions pulled up:
- sysutils/radmind/Makefile                                     1.33-1.34
- sysutils/radmind/distinfo                                     1.19
- sysutils/radmind/patches/patch-Makefile.in                    1.1
- sysutils/radmind/patches/patch-aa                             deleted
- sysutils/radmind/patches/patch-ab                             deleted
- sysutils/radmind/patches/patch-ac                             deleted
- sysutils/radmind/patches/patch-ae                             deleted
- sysutils/radmind/patches/patch-command.c                      1.1
- sysutils/radmind/patches/patch-command.h                      1.1
- sysutils/radmind/patches/patch-config.h.in                    1.1
- sysutils/radmind/patches/patch-configure                      1.1
- sysutils/radmind/patches/patch-configure.ac                   1.1
- sysutils/radmind/patches/patch-ktcheck.c                      1.1
- sysutils/radmind/patches/patch-largefile.h                    1.1
- sysutils/radmind/patches/patch-lcksum.c                       1.1
- sysutils/radmind/patches/patch-libsnet_snet.c                 1.1
- sysutils/radmind/patches/patch-ra.sh                          1.1
- sysutils/radmind/patches/patch-retr.c                         1.1
- sysutils/radmind/patches/patch-transcript.c                   1.1
- sysutils/radmind/patches/patch-update.c                       1.1

---
   Module Name:    pkgsrc
   Committed By:   hauke
   Date:           Wed Jan  8 11:54:04 UTC 2014

   Modified Files:
           pkgsrc/sysutils/radmind: Makefile distinfo
   Added Files:
           pkgsrc/sysutils/radmind/patches: patch-Makefile.in
   patch-command.c
               patch-command.h patch-config.h.in patch-configure
               patch-configure.ac patch-ktcheck.c patch-largefile.h
   patch-lcksum.c
               patch-libsnet_snet.c patch-ra.sh patch-retr.c
   patch-transcript.c
               patch-update.c
   Removed Files:
           pkgsrc/sysutils/radmind/patches: patch-aa patch-ab patch-ac
   patch-ae

   Log Message:
   Back-port and complete the fixes from radmind HEAD to support 64 bit
   time_t on NetBSD 6+.

   The configure patch had to be generated with autoconf downgraded to 2.61 -
   leave it to autohell to ruin your day...

   While we are here, shake, rattle & roll the patches.

   The resulting gyrations finally fix PR pkg/46555

---
   Module Name:    pkgsrc
   Committed By:   hauke
   Date:           Wed Jan  8 12:11:40 UTC 2014

   Modified Files:
           pkgsrc/sysutils/radmind: Makefile

   Log Message:
   The package's build system does not ensure libsnet is built before
   linking to it, so mark unsafe for parallel makes.
Pullup ticket #4289.
Pullup ticket #4291 - requested by fhajny
lang/ruby200-base: bug fix patch

Revisions pulled up:
- lang/ruby200-base/Makefile                                    1.6
- lang/ruby200-base/distinfo                                    1.9
- lang/ruby200-base/patches/patch-lib_rubygems_installer.rb     1.3

---
   Module Name:	pkgsrc
   Committed By:	fhajny
   Date:		Wed Jan  8 11:31:19 UTC 2014

   Modified Files:
   	pkgsrc/lang/ruby200-base: Makefile distinfo
   	pkgsrc/lang/ruby200-base/patches: patch-lib_rubygems_installer.rb

   Log Message:
   Fix patch so that 'gem install' actually works outside pkgsrc.
   Bump PKGREVISION.
Pullup ticket #4291.
Pullup ticket #4290 - requested by tron
net/cacti: security update

Revisions pulled up:
- net/cacti/Makefile                                            1.21
- net/cacti/PLIST                                               1.4
- net/cacti/distinfo                                            1.4
- net/cacti/patches/patch-host.php                              1.1
- net/cacti/patches/patch-install_index.php                     1.2
- net/cacti/patches/patch-lib_api_device.php                    1.1

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Wed Jan  8 20:51:28 UTC 2014

   Modified Files:
   	pkgsrc/net/cacti: Makefile PLIST distinfo
   	pkgsrc/net/cacti/patches: patch-install_index.php
   Added Files:
   	pkgsrc/net/cacti/patches: patch-host.php patch-lib_api_device.php

   Log Message:
   Update the "cacti" package to version 0.8.8b. Changes since 0.8.8a:
   - bug: Fixed issue with custom data source information being lost when
          saved from edit
   - bug: Repopulate the poller cache on new installations
   - bug: Fix issue with poller not escaping the script query path correctly
   - bug: Allow snmpv3 priv proto none
   - bug: Fix issue where host activate may flush the entire poller item
          cache
   -security: SQL injection and shell escaping issues

   Also add the fix for the security vulnerability reported in SA54531
   taken from the SVN repository.


   To generate a diff of this commit:
   cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/cacti/Makefile
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/cacti/PLIST pkgsrc/net/cacti/distinfo
   cvs rdiff -u -r0 -r1.1 pkgsrc/net/cacti/patches/patch-host.php \
       pkgsrc/net/cacti/patches/patch-lib_api_device.php
   cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/cacti/patches/patch-install_index.php
pullup 4290
Pullup ticket #4293 - requested by tron
security/openssl: security update

Revisions pulled up:
- security/openssl/Makefile                                     1.183
- security/openssl/distinfo                                     1.101
- security/openssl/patches/patch-doc_crypto_X509__STORE__CTX__get__error.pod deleted
- security/openssl/patches/patch-doc_ssl_SSL__CTX__set__client__CA__list.pod 1.2
- security/openssl/patches/patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod 1.2
- security/openssl/patches/patch-doc_ssl_SSL__accept.pod        1.2
- security/openssl/patches/patch-doc_ssl_SSL__connect.pod       1.2
- security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod 1.2
- security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod      1.2

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Fri Jan 10 14:32:42 UTC 2014

   Modified Files:
   	pkgsrc/security/openssl: Makefile distinfo
   	pkgsrc/security/openssl/patches:
   	    patch-doc_ssl_SSL__CTX__set__client__CA__list.pod
   	    patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod
   	    patch-doc_ssl_SSL__accept.pod patch-doc_ssl_SSL__connect.pod
   	    patch-doc_ssl_SSL__do__handshake.pod
   	    patch-doc_ssl_SSL__shutdown.pod
   Removed Files:
   	pkgsrc/security/openssl/patches:
   	    patch-doc_crypto_X509__STORE__CTX__get__error.pod

   Log Message:
   Update "openssl" package to version 1.0.1f. Changes since 1.0.1e:
   - Fix for TLS record tampering bug. A carefully crafted invalid
     handshake could crash OpenSSL with a NULL pointer exception.
     Thanks to Anton Johansson for reporting this issues.
     (CVE-2013-4353)
   - Keep original DTLS digest and encryption contexts in retransmission
     structures so we can use the previous session parameters if they need
     to be resent. (CVE-2013-6450)
     [Steve Henson]
   - Add option SSL_OP_SAFARI_ECDHE_ECDSA_BUG (part of SSL_OP_ALL) which
     avoids preferring ECDHE-ECDSA ciphers when the client appears to be
     Safari on OS X.  Safari on OS X 10.8..10.8.3 advertises support for
     several ECDHE-ECDSA ciphers, but fails to negotiate them.  The bug
     is fixed in OS X 10.8.4, but Apple have ruled out both hot fixing
     10.8..10.8.3 and forcing users to upgrade to 10.8.4 or newer.
     [Rob Stradling, Adam Langley]


   To generate a diff of this commit:
   cvs rdiff -u -r1.182 -r1.183 pkgsrc/security/openssl/Makefile
   cvs rdiff -u -r1.100 -r1.101 pkgsrc/security/openssl/distinfo
   cvs rdiff -u -r1.1 -r0 \
       pkgsrc/security/openssl/patches/patch-doc_crypto_X509__STORE__CTX__get__error.pod
   cvs rdiff -u -r1.1 -r1.2 \
       pkgsrc/security/openssl/patches/patch-doc_ssl_SSL__CTX__set__client__CA__list.pod \
       pkgsrc/security/openssl/patches/patch-doc_ssl_SSL__CTX__use__psk__identity__hint.pod \
       pkgsrc/security/openssl/patches/patch-doc_ssl_SSL__accept.pod \
       pkgsrc/security/openssl/patches/patch-doc_ssl_SSL__connect.pod \
       pkgsrc/security/openssl/patches/patch-doc_ssl_SSL__do__handshake.pod \
       pkgsrc/security/openssl/patches/patch-doc_ssl_SSL__shutdown.pod
pullup 4293
Merge branch 'pkgsrc_2013Q4' into joyent/feature/gccruntime/2013Q4
Merge branch 'pkgsrc_2013Q4' into joyent/feature/miscfix/2013Q4
Merge branch 'pkgsrc_2013Q4' into joyent/feature/multiarch/2013Q4
Fix merge botch.
Merge branch 'pkgsrc_2013Q4' into joyent/feature/pbulkmulti/2013Q4
Merge branch 'pkgsrc_2013Q4' into joyent/feature/smf/2013Q4