Pullup ticket #4047 - requested by tron
net/wireshark: security update

Revisions pulled up:
- net/wireshark/Makefile                                        1.93
- net/wireshark/distinfo                                        1.62

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Thu Jan 31 10:40:38 UTC 2013

   Modified Files:
   	pkgsrc/net/wireshark: Makefile distinfo

   Log Message:
   Update "wireshark" package to version 1.8.5. Changes since 1.8.4:
   - Bug Fixes
     The following vulnerabilities have been fixed.
       o wnpa-sec-2013-01
         Infinite and large loops in the Bluetooth HCI, CSN.1, DCP-ETSI
         DOCSIS CM-STAUS, IEEE 802.3 Slow Protocols, MPLS, R3, RTPS,
         SDP, and SIP dissectors. Reported by Laurent Butti. (Bugs
         8036, 8037, 8038, 8040, 8041, 8042, 8043, 8198, 8199, 8222)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
       o wnpa-sec-2013-02
         The CLNP dissector could crash. Discovered independently by
         Laurent Butti and the Wireshark development team. (Bug 7871)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
       o wnpa-sec-2013-03
         The DTN dissector could crash. (Bug 7945)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
       o wnpa-sec-2013-04
         The MS-MMC dissector (and possibly others) could crash. (Bug
         8112)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
       o wnpa-sec-2013-05
         The DTLS dissector could crash. Discovered by Laurent Butti.
         (Bug 8111)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
       o wnpa-sec-2013-06
         The ROHC dissector could crash. (Bug 7679)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
       o wnpa-sec-2013-07
         The DCP-ETSI dissector could corrupt memory. Discovered by
         Laurent Butti. (Bug 8213)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
       o wnpa-sec-2013-08
         The Wireshark dissection engine could crash. Discovered by
         Laurent Butti. (Bug 8197)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
       o wnpa-sec-2013-09
         The NTLMSSP dissector could overflow a buffer. Discovered by
         Ulf H=E4rnhammar. (Bug X)
         Versions affected: 1.8.0 to 1.8.4, 1.6.0 to 1.6.12.
         GENERIC-MAP-NOMATCH
   - The following bugs have been fixed:
       o SNMPv3 Engine ID registration. (Bug 2426)
       o Wrong decoding of gtp.target identification. (Bug 3974)
       o Reassemble.c leaks memory for GLIB > 2.8. (Bug 4141)
       o Wireshark crashes when starting due to out-of-date plugin left
         behind from earlier installation. (Bug 7401)
       o Failed to dissect TLS handshake packets. (Bug 7435)
       o ISUP dissector problem with empty Generic Number. (Bug 7632)
       o Illegal character is used in temporary capture file name. (Bug
         7877)
       o Lua code crashes wireshark after update to 1.8.3. (Bug 7976)
       o Timestamp info is not saved correctly when writing DOS Sniffer
         files. (Bug 7998)
       o 1.8.3 Wireshark User's Guide version is 1.6. (Bug 8009)
       o Core dumped when the file is closed. (Bug 8022)
       o LPP is misspelled in APDU parameter in
         e-CIDMeasurementInitiation request for LPPA message. (Bug
         8023)
       o Wrong packet bytes are selected for ISUP CUG binary code. (Bug
         8035)
       o Decodes FCoE Group Multicast MAC address as Broadcom MAC
         address. (Bug 8046)
       o The SSL dissector stops decrypting the SSL conversation with
         Malformed Packet:SSL error messages. (Bug 8075)
       o Unable to Save/Apply [Unistim Port] in Preferences. (Bug 8078)
       o Some Information Elements in GTPv2 are not dissected
         correctly. (Bug 8079)
       o Wrong bytes highlighted with "Find Packet...". (Bug 8085)
       o 3GPP ULI AVP. SAI is not correctly decoded. (Bug 8098)
       o Wireshark does not show "Start and End Time" information for
         Cisco Netflow/IPFIX with type 154 to 157. (Bug 8105)
       o GPRS Tunnel Protocoll GTP Version 1 does not decode DAF flag
         in Common Flags IE. (Bug 8193)
       o Wrong parcing of ULI of gtpv2 messages - errors in SAC, RAC &
         ECI. (Bug 8208)
       o Version Number in EtherIP dissector. (Bug 8211)
       o Warn Dissector bug, protocol JXTA. (Bug 8212)
       o Electromagnetic Emission Parser parses field Event Id as
         Entity Id. (Bug 8227)
   - Updated Protocol Support
     ANSI IS-637-A, ASN.1 PER, AX.25, Bluetooth HCI, CLNP, CSN.1,
     DCP-ETSI, DIAMETER, DIS PDU, DOCSIS CM-STATUS, DTLS, DTN, EtherIP,
     Fibre Channel, GPRS, GTP, GTPv2, HomePlug AV, IEEE 802.3 Slow,
     IEEE 802.15.4, ISUP, JXTA, LAPD, LPPa, MPLS, MS-MMC, NAS-EPS,
     NTLMSSP, ROHC, RSL, RTPS, SDP, SIP, SNMP, SSL
   - New and Updated Capture File Support
     DOS Sniffer


   To generate a diff of this commit:
   cvs rdiff -u -r1.92 -r1.93 pkgsrc/net/wireshark/Makefile
   cvs rdiff -u -r1.61 -r1.62 pkgsrc/net/wireshark/distinfo
pullups 4044 and 4047
Pullup ticket #4069 - requested by taca
lang/ruby193-base: security patch

Revisions pulled up:
- lang/ruby193-base/Makefile                                    1.25 via patch
- lang/ruby193-base/PLIST                                       1.7
- lang/ruby193-base/distinfo                                    1.17
- lang/ruby193-base/patches/patch-ext_json_lib_json_add_core.rb 1.1
- lang/ruby193-base/patches/patch-ext_json_lib_json_common.rb   1.1
- lang/ruby193-base/patches/patch-ext_json_lib_json_version.rb  1.1
- lang/ruby193-base/patches/patch-ext_json_parser_parser.c      1.1
- lang/ruby193-base/patches/patch-ext_json_parser_parser.rl     1.1
- lang/ruby193-base/patches/patch-man_erb.1                     1.2
- lang/ruby193-base/patches/patch-man_irb.1                     1.2
- lang/ruby193-base/patches/patch-man_ri.1                      1.2
- lang/ruby193-base/patches/patch-man_ruby.1                    1.2
- lang/ruby193-base/patches/patch-test_json_test__json.rb       1.1
- lang/ruby193-base/patches/patch-test_json_test__json__addition.rb 1.1
- lang/ruby193-base/patches/patch-test_json_test__json__string__matching.rb 1.1

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 13:03:09 UTC 2013

   Modified Files:
   	pkgsrc/lang/ruby193-base: Makefile PLIST distinfo
   	pkgsrc/lang/ruby193-base/patches: patch-man_erb.1 patch-man_irb.1
   	    patch-man_ri.1 patch-man_ruby.1
   Added Files:
   	pkgsrc/lang/ruby193-base/patches: patch-ext_json_lib_json_add_core.rb
   	    patch-ext_json_lib_json_common.rb
   	    patch-ext_json_lib_json_version.rb patch-ext_json_parser_parser.c
   	    patch-ext_json_parser_parser.rl patch-test_json_test__json.rb
   	    patch-test_json_test__json__addition.rb
   	    patch-test_json_test__json__string__matching.rb

   Log Message:
   * Add fix for CVE-2013-0269, json vulnerability.
   * Add comments to patches related to mdoc markup.

   Bump PKGREVISION.
Pullup ticket #4070 - requested by taca
textproc/ruby-json: security update
textproc/ruby-json-pure: security update

Revisions pulled up:
- textproc/ruby-json-pure/Makefile                              1.20-1.21
- textproc/ruby-json-pure/distinfo                              1.19-1.20
- textproc/ruby-json/Makefile                                   1.23-1.24
- textproc/ruby-json/distinfo                                   1.19-1.20

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb 11 02:43:26 UTC 2013

   Modified Files:
   	pkgsrc/textproc/ruby-json: Makefile distinfo
   	pkgsrc/textproc/ruby-json-pure: Makefile distinfo

   Log Message:
   Update ruby-json and ruby-json-pure to 1.7.6.

   2012-11-29 (1.7.6)
     * Add GeneratorState#merge alias for JRuby, fix state accessor methods. Thx to
      jvshahid@github.
     * Increase hash likeness of state objects.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 13:13:08 UTC 2013

   Modified Files:
   	pkgsrc/textproc/ruby-json: Makefile distinfo
   	pkgsrc/textproc/ruby-json-pure: Makefile distinfo

   Log Message:
   Update ruby-json and ruby-json-pure to 1.7.7.

   2013-02-04 (1.7.7)
     * Security fix for JSON create_additions default value and
       JSON::GenericObject. It should not be possible to create additions unless
       explicitely requested by setting the create_additions argument to true or
       using the JSON.load/dump interface. If JSON::GenericObject is supposed to
       be automatically deserialised, this has to be explicitely enabled by
       setting
         JSON::GenericObject.json_createble = true
       as well.
     * Remove useless assert in fbuffer implementation.
     * Apply patch attached to https://github.com/flori/json/issues#issue/155
       provided by John Shahid <jvshahid@gmail.com>, Thx!
     * Add license information to rubygems spec data, reported by Jordi Massaguer
       Pla <jmassaguerpla@suse.de>.
     * Improve documentation, thx to Zachary Scott <zachary@zacharyscott.net>.
Pullup tickets #4069 and #4070.
Pullup ticket #4071 - requested by taca
databases/ruby-activerecord31: security update
devel/ruby-activemodel31: security update
devel/ruby-activesupport31: security update
devel/ruby-railties31: security update
mail/ruby-actionmailer31: security update
www/ruby-actionpack31: security update
www/ruby-activeresource31: security update
www/ruby-rails31: security update

Revisions pulled up:
- databases/ruby-activerecord31/distinfo                        1.9
- devel/ruby-activemodel31/distinfo                             1.9
- devel/ruby-activesupport31/distinfo                           1.10
- devel/ruby-railties31/Makefile                                1.6
- devel/ruby-railties31/distinfo                                1.9
- lang/ruby/rails.mk                                            1.39
- mail/ruby-actionmailer31/distinfo                             1.9
- www/ruby-actionpack31/distinfo                                1.10
- www/ruby-activeresource31/distinfo                            1.9
- www/ruby-rails31/distinfo                                     1.9

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:16:07 UTC 2013

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

   Log Message:
   Start update of Ruby on Rails 3.1.11.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:17:07 UTC 2013

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

   Log Message:
   Update ruby-activesupport31 to 3.1.11.

   ## Rails 3.1.11 (unreleased) ##

   * Allow `multi_json` version `>= 1.3`, relaxing back to semantic versioning
     2.0.0 (revert of #5861)
     Backport of #5896

     *Alex Riedler*

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:18:08 UTC 2013

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

   Log Message:
   Update ruby-activemodel31 to 3.1.11.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:19:10 UTC 2013

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

   Log Message:
   Update ruby-activeresource31 to 3.1.11.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:21:05 UTC 2013

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

   Log Message:
   Update ruby-activerecord31 to 3.1.11.

   ## Rails 3.1.11 (unreleased) ##

   *   Quote numeric values being compared to non-numeric columns. Otherwise,
       in some database, the string column values will be coerced to a numeric
       allowing 0, 0.0 or false to match any string starting with a non-digit.

       Example:

           App.where(apikey: 0) # => SELECT * FROM users WHERE apikey = '0'

       *Dylan Smith*

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:22:03 UTC 2013

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

   Log Message:
   Update ruby-actionpack31 to 3.1.11.

   ## Rails 3.1.11 (unreleased)

   * Fixed JSON params parsing regression for non-object JSON content.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:22:43 UTC 2013

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

   Log Message:
   Update ruby-actionmailer331 to 3.1.11.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:23:36 UTC 2013

   Modified Files:
   	pkgsrc/devel/ruby-railties31: Makefile distinfo

   Log Message:
   Update ruby-railties31 to 3.1.11.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:24:13 UTC 2013

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

   Log Message:
   Update of ruby-rails31 to 3.1.11.

   Change of version only.
Pullup ticket #4072 - 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.10
- devel/ruby-activemodel32/distinfo                             1.10
- devel/ruby-activesupport32/distinfo                           1.10
- devel/ruby-railties32/Makefile                                1.4
- devel/ruby-railties32/distinfo                                1.10
- lang/ruby/rails.mk                                            1.40
- mail/ruby-actionmailer32/distinfo                             1.10
- www/ruby-actionpack32/distinfo                                1.10
- www/ruby-activeresource32/distinfo                            1.10
- www/ruby-rails32/distinfo                                     1.10

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:28:10 UTC 2013

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

   Log Message:
   Start update of Ruby on Rails 3.2.12.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:28:59 UTC 2013

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

   Log Message:
   Update ruby-activesupport32 to 3.2.12.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:29:48 UTC 2013

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

   Log Message:
   Update ruby-activemodel32 to 3.2.12.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:30:48 UTC 2013

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

   Log Message:
   Update ruby-activeresource32 to 3.2.12.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:31:19 UTC 2013

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

   Log Message:
   Update ruby-activerecord32 to 3.2.12.

   ## Rails 3.2.12 (unreleased) ##

   *   Quote numeric values being compared to non-numeric columns. Otherwise,
       in some database, the string column values will be coerced to a numeric
       allowing 0, 0.0 or false to match any string starting with a non-digit.

       Example:

           App.where(apikey: 0) # => SELECT * FROM users WHERE apikey = '0'

       *Dylan Smith*

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:31:52 UTC 2013

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

   Log Message:
   Update ruby-actionpack32 to 3.2.12.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:32:32 UTC 2013

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

   Log Message:
   Update of ruby-actionmailer32 to 3.2.12.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:33:08 UTC 2013

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

   Log Message:
   Update ruby-railties32 to 3.2.12.

   Change of version only.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 14:33:42 UTC 2013

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

   Log Message:
   Update ruby-rails32 to 3.2.12.

   Change of version only.
Pullup ticket #4073 - requested by taca
databases/ruby-activerecord3: security patch
devel/ruby-activemodel: security patch

Revisions pulled up:
- databases/ruby-activerecord3/Makefile                         1.9
- databases/ruby-activerecord3/distinfo                         1.19-1.20
- databases/ruby-activerecord3/patches/patch-lib_active__record_attribute__methods_write.rb 1.1-1.2
- devel/ruby-activemodel/Makefile                               1.12
- devel/ruby-activemodel/distinfo                               1.19-1.20
- devel/ruby-activemodel/patches/patch-lib_active__model_attribute__methods.rb 1.1-1.2

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 13:23:20 UTC 2013

   Modified Files:
   	pkgsrc/databases/ruby-activerecord3: Makefile distinfo
   Added Files:
   	pkgsrc/databases/ruby-activerecord3/patches:
   	    patch-lib_active__record_attribute__methods_write.rb

   Log Message:
   Add fix for Fix for CVE-2013-0277.

   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Feb 13 14:08:07 UTC 2013

   Modified Files:
   	pkgsrc/databases/ruby-activerecord3: distinfo
   	pkgsrc/databases/ruby-activerecord3/patches:
   	    patch-lib_active__record_attribute__methods_write.rb

   Log Message:
   Correct comment in a patch file.

   This change dosen't fix CVE-2013-0276 but give workaround for it.

   No PKGREVISION bump.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Tue Feb 12 15:30:42 UTC 2013

   Modified Files:
   	pkgsrc/devel/ruby-activemodel: Makefile distinfo
   Added Files:
   	pkgsrc/devel/ruby-activemodel/patches:
   	    patch-lib_active__model_attribute__methods.rb

   Log Message:
   Add fix for CVE-2013-0276.

   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Wed Feb 13 14:07:31 UTC 2013

   Modified Files:
   	pkgsrc/devel/ruby-activemodel: distinfo
   	pkgsrc/devel/ruby-activemodel/patches:
   	    patch-lib_active__model_attribute__methods.rb

   Log Message:
   Correct comment in a patch file.

   This change dosen't fix CVE-2013-0276 but give workaround for it.

   No PKGREVISION bump.
Pullup ticket #4074 - requested by drochner
security/gnutls: security update

Revisions pulled up:
- security/gnutls/Makefile                                      1.123-1.124
- security/gnutls/distinfo                                      1.92

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Tue Jan 15 11:29:21 UTC 2013

   Modified Files:
           pkgsrc/security/gnutls: Makefile

   Log Message:
   wants to use pkg-config

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Tue Feb 12 13:16:25 UTC 2013

   Modified Files:
           pkgsrc/security/gnutls: Makefile distinfo

   Log Message:
   update to 3.0.28
   changes: bugfixes

   This prevents the recent TLS CBC padding timing attack (CVE-2013-1619).
Pullup tickets #4071, #4072, #4073 and #4074.
Pullup ticket #4075 - requested by ryoon
devel/jenkins: security update

Revisions pulled up:
- devel/jenkins/Makefile                                        1.12
- devel/jenkins/PLIST                                           1.9
- devel/jenkins/distinfo                                        1.10

---
   Module Name:	pkgsrc
   Committed By:	ryoon
   Date:		Tue Feb 19 18:21:41 UTC 2013

   Modified Files:
   	pkgsrc/devel/jenkins: Makefile PLIST distinfo

   Log Message:
   Update to 1.480.3

   * Fix https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2013-02-16

   Changelog:
   What's new in 1.480.3 (2013/02/15)

       "Remember me on this computer" does not work, cookie is not accepted in new session (issue 16278)
       Slow/hung web UI in 1.483+ (stuck in parseURI) (issue 16474)
       Failure to delete old config files during rekeying on Windows (issue 16319)
       NoClassDefFoundError on Base64 when launching an headless slave with -jnlpCredential option (issue 9679)
       Loading asynchPeople calls (synch) People constructor (issue 16397)
       Jenkins briefly displays build queue and then it disappears until the page is reloaded (issue 15335)
       View.hasPeople too slow to use in sidepanel.jelly (issue 16244)
       XSS (SECURITY-46)
       File parameter causing data lost after Jenkins restart (issue 13536)
Pullup ticket #4075.
Pullup ticket #4076 - requested by obache
print/acroread9: security update

Revisions pulled up:
- print/acroread9/Makefile                                      1.9
- print/acroread9/distinfo                                      1.8

---
   Module Name:	pkgsrc
   Committed By:	obache
   Date:		Sat Feb 23 12:56:16 UTC 2013

   Modified Files:
   	pkgsrc/print/acroread9: Makefile distinfo

   Log Message:
   Update acroread9 to 9.5.4 for APSA13-02.
Pullup ticket #4077 - requested by markd
net/netatalk: build fix

Revisions pulled up:
- net/netatalk/distinfo                                         1.48
- net/netatalk/patches/patch-etc_uams_uams_gss.c                1.1

---
   Module Name:	pkgsrc
   Committed By:	markd
   Date:		Fri Feb 22 22:41:32 UTC 2013

   Modified Files:
   	pkgsrc/net/netatalk: distinfo
   Added Files:
   	pkgsrc/net/netatalk/patches: patch-etc_uams_uams_gss.c

   Log Message:
   Dont override the value of GSS_C_NT_HOSTBASED_SERVICE that recent
   Heimdal's set.
Pullup tickets #4076 and #4077.
Pullup ticket #4078 - requested by taca
www/drupal7: security update

Revisions pulled up:
- www/drupal7/Makefile                                          1.17
- www/drupal7/distinfo                                          1.11

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Feb 21 12:59:19 UTC 2013

   Modified Files:
   	pkgsrc/www/drupal7: Makefile distinfo

   Log Message:
   Update drupal7 to 7.20.

   Drupal 7.20, 2013-02-20
   -----------------------
   - Fixed security issues (denial of service). See SA-CORE-2013-002.
Pullup ticket #4079 - requested by taca
www/geeklog: security update

Revisions pulled up:
- www/geeklog/Makefile                                          1.37
- www/geeklog/distinfo                                          1.21

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Feb 21 13:01:24 UTC 2013

   Modified Files:
   	pkgsrc/www/geeklog: Makefile distinfo

   Log Message:
   Update geeklog to 1.8.2.1 (Geeklog 1.8.2sr1).

   Geeklog History/Changes:

   Feb 19, 2013 (1.8.2sr1)
   ------------

   This release addresses the following security issues:
   - High-Tech Bridge Security Research Lab reported an XSS in the calendar_type
     parameter in the Calendar plugin (HTB23143).
   - Trustwave Spiderlabs reported XSS in the install script, the Configuration,
     as well as in the Admin interfaces for the Polls plugin and the Topic editor
     (TWSL2013-001).

   Not security-related:
   - Fixed Twitter OAuth login by switching to version 1.1 of the Twitter API
     (feature request #0001506).
Pullup ticket #4080 - requested by taca
lang/ruby193-base: security update

Revisions pulled up:
- lang/ruby/rubyversion.mk                                      1.95
- lang/ruby193-base/Makefile                                    1.26
- lang/ruby193-base/distinfo                                    1.18
- lang/ruby193-base/patches/patch-ext_json_lib_json_add_core.rb deleted
- lang/ruby193-base/patches/patch-ext_json_lib_json_common.rb   deleted
- lang/ruby193-base/patches/patch-ext_json_lib_json_version.rb  deleted
- lang/ruby193-base/patches/patch-ext_json_parser_parser.c      deleted
- lang/ruby193-base/patches/patch-ext_json_parser_parser.rl     deleted
- lang/ruby193-base/patches/patch-test_json_test__json.rb       deleted
- lang/ruby193-base/patches/patch-test_json_test__json__addition.rb deleted
- lang/ruby193-base/patches/patch-test_json_test__json__string__matching.rb deleted

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Feb 22 16:20:48 UTC 2013

   Modified Files:
   	pkgsrc/lang/ruby: rubyversion.mk
   	pkgsrc/lang/ruby193-base: Makefile distinfo
   Removed Files:
   	pkgsrc/lang/ruby193-base/patches: patch-ext_json_lib_json_add_core.rb
   	    patch-ext_json_lib_json_common.rb
   	    patch-ext_json_lib_json_version.rb patch-ext_json_parser_parser.c
   	    patch-ext_json_parser_parser.rl patch-test_json_test__json.rb
   	    patch-test_json_test__json__addition.rb
   	    patch-test_json_test__json__string__matching.rb

   Log Message:
   Update ruby193-base package (and related) to 1.9.3-p392.
   Security problem of CVE-2013-0269 was already handled but REXML security
   problem is fixed by this package.

   Now Ruby 1.9.3-p392 is released. I apologize for updating too frequently.

   This release includes security fixes about bundled JSON and REXML.

   * Denial of Service and Unsafe Object Creation Vulnerability in JSON
     (CVE-2013-0269)
   * Entity expansion DoS vulnerability in REXML (XML bomb)

   And some small bugfixes are also included.
Pullup tickets #4078, #4079 and #4080.
Merge branch 'pkgsrc_2012Q4' into joyent/release/2012Q4