head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.32
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.30
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.28
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.26
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.24
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.22
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.20
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.18
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.16
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.14
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.12
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.10
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.8
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.6
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.4
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.2
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2006.09.07.15.40.01;	author taca;	state dead;
branches;
next	1.1;

1.1
date	2006.08.02.07.02.44;	author taca;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.08.02.07.02.44;	author salo;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.08.02.13.59.02;	author salo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update Ruby to 1.8.5 (+ ruby-1-8 branch on 2006-09-07).

pkgsrc changes:

* Add RUBY_DYNAMIC_DIRS which cause generating dynamic PLIST entries.
* Move using buildlinks to rubyversion.mk.
* Merge converters/ruby-iconv to ruby18-base.

Ruby changes:

* too may, see ChangeLog file or
  http://eigenclass.org/hiki.rb?ruby+1.8.5+changelog
@
text
@$NetBSD: patch-cp,v 1.1 2006/08/02 07:02:44 taca Exp $

--- re.c.orig	2005-12-13 12:27:51.000000000 +0900
+++ re.c
@@@@ -1332,6 +1332,9 @@@@ rb_reg_initialize(obj, s, len, options)
 {
     struct RRegexp *re = RREGEXP(obj);
 
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
+    rb_check_frozen(obj);
     if (re->ptr) re_free_pattern(re->ptr);
     if (re->str) free(re->str);
     re->ptr = 0;
@


1.1
log
@Add three patches accidently left on my work area.

- Add two miscellaneous patches for openssl and yaml libraries.
  They were left from last year, sigh.
- Add one more part for CVE-2006-3694.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-cp was added on branch pkgsrc-2006Q2 on 2006-08-02 07:02:44 +0000
@
text
@d1 14
@


1.1.2.2
log
@Pullup ticket 1771 - requested by taca
security fixes for ruby18-base

Revisions pulled up:
- pkgsrc/lang/ruby18-base/Makefile		1.23
- pkgsrc/lang/ruby18-base/distinfo		1.13
- pkgsrc/lang/ruby18-base/patches/patch-ag	1.1
- pkgsrc/lang/ruby18-base/patches/patch-ah	1.1
- pkgsrc/lang/ruby18-base/patches/patch-cp	1.1

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Wed Aug  2 07:02:44 UTC 2006

   Modified Files:
   	pkgsrc/lang/ruby18-base: Makefile distinfo
   Added Files:
   	pkgsrc/lang/ruby18-base/patches: patch-ag patch-ah patch-cp

   Log Message:
   Add three patches accidently left on my work area.

   - Add two miscellaneous patches for openssl and yaml libraries.
     They were left from last year, sigh.
   - Add one more part for CVE-2006-3694.

   Bump PKGREVISION.
@
text
@a0 14
$NetBSD: patch-cp,v 1.1.2.1 2006/08/02 13:59:02 salo Exp $

--- re.c.orig	2005-12-13 12:27:51.000000000 +0900
+++ re.c
@@@@ -1332,6 +1332,9 @@@@ rb_reg_initialize(obj, s, len, options)
 {
     struct RRegexp *re = RREGEXP(obj);
 
+    if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+	rb_raise(rb_eSecurityError, "Insecure: can't modify regexp");
+    rb_check_frozen(obj);
     if (re->ptr) re_free_pattern(re->ptr);
     if (re->str) free(re->str);
     re->ptr = 0;
@