Merge branch 'pkgsrc_2013Q3' into joyent/feature/sngl/2013Q3
Pullup ticket #4245 - requested by joerg
devel/bmake: build fix

Revisions pulled up:
- devel/bmake/files/util.c                                      1.12

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Mon Oct 14 23:19:10 UTC 2013

   Modified Files:
   	pkgsrc/devel/bmake/files: util.c

   Log Message:
   Workaround for bad Linux headers.
Pullup ticket #4246 - requested by joerg
lang/python27: build fix

Revisions pulled up:
- lang/python27/Makefile                                        1.30

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Tue Oct 15 20:46:41 UTC 2013

   Modified Files:
   	pkgsrc/lang/python27: Makefile

   Log Message:
   PowerPC64 is a 64bit platform.
Pullup tickets #4245 #4246.
Pullup ticket #4247 - requested by bsiegert
lang/gawk: build fix

Revisions pulled up:
- lang/gawk/Makefile                                            1.57
- lang/gawk/PLIST                                               1.20
- lang/gawk/distinfo                                            1.25
- lang/gawk/patches/patch-extension_configure                   1.1

---
   Module Name:    pkgsrc
   Committed By:   bsiegert
   Date:           Sat Oct 19 19:47:39 UTC 2013

   Modified Files:
           pkgsrc/lang/gawk: Makefile PLIST distinfo
   Added Files:
           pkgsrc/lang/gawk/patches: patch-extension_configure

   Log Message:
   Fix build on MirBSD.

   The gawk developers added code to skip building the extensions on MirBSD
   but inserted a syntax error. Also skip the extensions in the PLIST on MirBSD.
Pullup ticket #4247.
Pullup ticket #4249 - requested by taca
mail/roundcube: security update

Revisions pulled up:
- mail/roundcube/Makefile                                       1.60
- mail/roundcube/distinfo                                       1.34
- mail/roundcube/patches/patch-aa                               1.11

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Oct 22 03:21:45 UTC 2013

   Modified Files:
   	pkgsrc/mail/roundcube: Makefile distinfo
   	pkgsrc/mail/roundcube/patches: patch-aa

   Log Message:
   Update roundcube to 0.9.5.  This release contains fix for CVE-2013-6172.

   RELEASE 0.9.5
   -------------
   - Fix failing vCard import when email address field contains spaces (#1489386)
   - Fix default spell-check configuration after Google suspended their spell service
   - Fix vulnerability in handling _session argument of utils/save-prefs (#1489382)
   - Fix iframe onload for upload errors handling (#1489379)
   - Fix address matching in Return-Path header on identity selection (#1489374)
   - Fix text wrapping issue with long unwrappable lines (#1489371)
   - Fixed mispelling: occured -> occurred (#1489366)
   - Fixed issues where HTML comments inside style tag would hang Internet Explorer
   - Fix setting domain in virtualmin password driver (#1489332)
   - Hide Delivery Status Notification option when smtp_server is unset (#1489336)
   - Display full attachment name using title attribute when name is too long to display (#1489320)
   - Fix attachment icon issue when rare font/language is used (#1489326)
   - Fix expanded thread root message styling after refreshing messages list (#1489327)
   - Fix issue where From address was removed from Cc and Bcc fields when editing a draft (#1489319)
   - Fix error_reporting directive check (#1489323)
   - Fix de_DE localization of "About" label in Help plugin (#1489325)
Pullup ticket #4248 - requested by taca
databases/ruby-activerecord32: security update
devel/ruby-activemodel32: security update
devel/ruby-activesupport32: security update
devel/ruby-railties32: security update
mail/ruby-actionmailer32: security update
www/ruby-actionpack32: security update
www/ruby-activeresource32: security update
www/ruby-rails32: security update

Revisions pulled up:
- databases/ruby-activerecord32/distinfo                        1.13
- devel/ruby-activemodel32/distinfo                             1.13
- devel/ruby-activesupport32/distinfo                           1.13
- devel/ruby-railties32/distinfo                                1.13
- lang/ruby/rails.mk                                            1.45
- mail/ruby-actionmailer32/distinfo                             1.13
- www/ruby-actionpack32/distinfo                                1.13
- www/ruby-activeresource32/distinfo                            1.13
- www/ruby-rails32/distinfo                                     1.13

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:22:42 UTC 2013

   Modified Files:
   	pkgsrc/lang/ruby: rails.mk

   Log Message:
   Start update of Ruby on Rails 3.2.15.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:24:38 UTC 2013

   Modified Files:
   	pkgsrc/devel/ruby-activesupport32: distinfo

   Log Message:
   Update ruby-activesupport32 to 3.2.15.

   ## Rails 3.2.15 (Oct 16, 2013) ##

   * Fix ActiveSupport::Cache::FileStore#cleanup to no longer rely on missing
     each_key method.

       *Murray Steele*

   * Add respond_to_missing? for TaggedLogging which is best practice when
     overriding method_missing. This permits wrapping TaggedLogging by another
     log abstraction such as em-logger.

       *Wolfram Arnold*

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:26:02 UTC 2013

   Modified Files:
   	pkgsrc/devel/ruby-activemodel32: distinfo

   Log Message:
   Update ruby-activemodel32 to

   ## Rails 3.2.15 (Oct 16, 2013) ##

   *   No changes.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:27:20 UTC 2013

   Modified Files:
   	pkgsrc/www/ruby-actionpack32: distinfo

   Log Message:
   Update ruby-actionpack32 to 3.2.15.

   ## Rails 3.2.15 (Oct 16, 2013) ##

   * Fix `ActionDispatch::RemoteIp::GetIp#calculate_ip` to only check for
     spoofing attacks if both `HTTP_CLIENT_IP` and `HTTP_X_FORWARDED_FOR` are
     set.

     Fixes #12410
     Backports #10844

     *Tamir Duberstein*

   * Fix the assert_recognizes test method so that it works when there are
     constraints on the querystring.

     Issue/Pull Request #9368
     Backport #5219

     *Brian Hahn*

   * Fix to render partial by context(#11605).

     *Kassio Borges*

   * Fix `ActionDispatch::Assertions::ResponseAssertions#assert_redirected_to`
     does not show user-supplied message.

     Issue: when `assert_redirected_to` fails due to the response redirect not
     matching the expected redirect the user-supplied message (second parameter)
     is not shown. This message is only shown if the response is not a redirect.

     *Alexey Chernenkov*

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:30:05 UTC 2013

   Modified Files:
   	pkgsrc/databases/ruby-activerecord32: distinfo

   Log Message:
   Update ruby-activerecord32 to 3.2.15.

   ## Rails 3.2.15 (Oct 16, 2013) ##

   * When calling the method .find_or_initialize_by_* from a collection_proxy it
     should set the inverse_of relation even when the entry was found on the db.

       *arthurnn*

   * Callbacks on has_many should access the in memory parent if a inverse_of is
     set.

       *arthurnn*

   * Fix `FinderMethods#last` unscoped primary key.

       Fixes #11917.

       *Eugene Kalenkovich*

   * Load fixtures from linked folders.

       *Kassio Borges*

   * When using optimistic locking, `update` was not passing the column to
    `quote_value` to allow the connection adapter to properly determine how to
     quote the value. This was affecting certain databases that use specific
     colmn types.

       Fixes: #6763

       *Alfred Wong*

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:31:00 UTC 2013

   Modified Files:
   	pkgsrc/www/ruby-activeresource32: distinfo

   Log Message:
   Update ruby-activeresource32 to 3.2.15.

   ## Rails 3.2.15 (Oct 16, 2013) ##

   * No changes.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:33:16 UTC 2013

   Modified Files:
   	pkgsrc/mail/ruby-actionmailer32: distinfo

   Log Message:
   Update ruby-actionmailer32 to 3.2.15.

   CHANGELOG.md says "No changes." but it fixes possible dos vulnerability.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:34:47 UTC 2013

   Modified Files:
   	pkgsrc/devel/ruby-railties32: distinfo

   Log Message:
   Update ruby-railties32 to 3.2.15.

   CHANGELOG.md says "No changes." but really it contains a few bug fixes.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Oct 18 15:38:03 UTC 2013

   Modified Files:
   	pkgsrc/www/ruby-rails32: distinfo

   Log Message:
   Update ruby-rails32 to 3.2.15.

   This is a bug fix release and also contains one security fix.
Pullup tickets #4248 and #4249.
Update joyent
Pullup ticket #4251 - requested by tron
net/wireshark: security update

Revisions pulled up:
- net/wireshark/Makefile                                        1.111
- net/wireshark/distinfo                                        1.70

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sat Nov  2 10:30:00 UTC 2013

   Modified Files:
   	pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update "wireshark" package to version 1.10.3. Changes since 1.10.2:
   - Bug Fixes
     The following vulnerabilities have been fixed.
       * wnpa-sec-2013-61
         The IEEE 802.15.4 dissector could crash. (Bug 9139)
         Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10
         CVE-2013-6336
       * wnpa-sec-2013-62
         The NBAP dissector could crash. Discovered by Laurent
         Butti. (Bug 9168)
         Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10
         CVE-2013-6337
       * wnpa-sec-2013-63
         The SIP dissector could crash. (Bug 9228)
         Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10
         CVE-2013-6338
       * wnpa-sec-2013-64
         The OpenWire dissector could go into a large loop.
         Discovered by Murali. (Bug 9248)
         Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10
         CVE-2013-6339
       * wnpa-sec-2013-65
         The TCP dissector could crash. (Bug 9263)
         Versions affected: 1.10.0 to 1.10.2, 1.8.0 to 1.8.10
         CVE-2013-6340
   - The following bugs have been fixed:
       * new_packet_list: EAP-TLS reassemble does not happen when
         NEW_PACKET_LIST is toggled. (Bug 5349)
       * TLS decryption fails with XMPP start_tls. (Bug 8871)
       * Wrong Interpretation of GTS starting slot. (Bug 8946)
       * "Follow TCP Stream" shows only the first HTTP req+res.
         (Bug 9044)
       * The value of SEND_TO_UE in the DIAMETER Gx dictionary for
         Packet-Filter-Usage AVP is 0 instead of 1. (Bug 9126)
       * Crash then try to delete the same entry (length range)
         twice. (Bug 9129)
       * Crash if wrong "packet lengths range" entered. (Bug
         9130)
       * Bssgp =3D> SGSN-INVOKE-TRACE use the wrong function...
         (Bug 9157)
       * Minor correction to dissection of DLR frames in Ethernet/IP
         dissector. (Bug 9186)
       * WebSphere MQ V7 Bug Fix 8322 TSHM_EBCDIC. (Bug 9198)
       * EDNS0 "Higher bits in extended RCODE" incorrectly decoded
         in packet-dns.c. (Bug 9199)
       * Files with pcap-ng Simple Packet Blocks can't be read.
         (Bug 9200)
       * Bug in RTP dissector if RTP extension is present. (Bug
         9204)
       * Improve "eHRPD Indicator" NVSE dissection in 3GPP2 A11
         Registration Request. (Bug 9206)
       * "make debian-package" fails, missing wsicon32.xpm. (Bug
         9209)
       * Fix typo in MODCOD list of DVB-S2 dissector. (Bug 9218)
       * Ring buffer crash when tshark gets too far behind dumpcap.
         (Bug 9258)
       * PTP Dissector Wrongfully Reports Malformed Packet. (Bug
         9262)
       * Wireshark lua dissector unable to load for
         media_type=3Dapplication/octet-stream. (Bug 9296)
       * Wireshark crash when dissecting packet with NTLMSSP.
         (Bug 9299)
       * Padding in uint64 field in DCERPC protocol wrongly
         reported. (Bug 9300)
       * DCERPC data_blobs are not correctly dissected when NDR64
         encoding is used. (Bug 9301)
       * Multiple PDUs in the same DCERPC packet are not correctly
         decrypted. (Bug 9302)
       * The tshark summary line doesn't display the frame number or
         displays it sporadically. (Bug 9317)
       * Bluetooth: SDP improvements and minor fixes. (Bug 9327)
       * Duplicate IRC header field abbreviation breaks filter
         (example: irc.response.command). (Bug 9360)
   - Updated Protocol Support
     3GPP2 A11, Bluetooth SDP, BSSGP, DCERPC, DCERPC NDR, DCERPC NT,
     DIAMETER, DNS, DVB-S2, Ethernet, EtherNet/IP, H.225, IEEE
     802.15.4, IRC, NBAP, NTLMSSP, OpenWire, PTP, RTP, SIP, TCP,
     WiMax, and XMPP


   To generate a diff of this commit:
   cvs rdiff -u -r1.110 -r1.111 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/wireshark/distinfo
pullup 4251
Merge branch 'pkgsrc_2013Q3' into joyent/feature/gccruntime/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/miscfix/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/multiarch/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/pbulkmulti/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/smf/2013Q3
Merge branch 'pkgsrc_2013Q3' into joyent/feature/sngl/2013Q3
Merge branch 'joyent/feature/gccruntime/2013Q3' into joyent/release/2013Q3
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3