[gentoo-commits] proj/ruby-scripts:master commit in: patchsets/patches-1.8.7_p370/

[Hans de Graaff]

commit:     a6af831967019f2cb61e103493683d37a8343fae
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sat Jul  7 06:56:29 2012 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Jul  7 06:56:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-scripts.git;a=commit;h=a6af8319

Add patchset for ruby 1.8.7_p370

---
 patchsets/patches-1.8.7_p370/001_memory_leak.patch |   59 ++++++++++++++++++++
 .../003_mkmf-parallel-install.patch                |   16 +++++
 patchsets/patches-1.8.7_p370/004_berkdb-5.0.patch  |   13 ++++
 .../patches-1.8.7_p370/007_no-undefined-ext.patch  |   13 ++++
 patchsets/patches-1.8.7_p370/015-as-dir.patch      |   13 ++++
 patchsets/patches-1.8.7_p370/series                |    5 ++
 6 files changed, 119 insertions(+), 0 deletions(-)

diff --git a/patchsets/patches-1.8.7_p370/001_memory_leak.patch b/patchsets/patches-1.8.7_p370/001_memory_leak.patch
new file mode 100644
index 0000000..98edae0
--- /dev/null
+++ b/patchsets/patches-1.8.7_p370/001_memory_leak.patch
@@ -0,0 +1,59 @@
+Index: ruby-1.8.7-p299/ext/dl/handle.c
+===================================================================
+--- ruby-1.8.7-p299.orig/ext/dl/handle.c
++++ ruby-1.8.7-p299/ext/dl/handle.c
+@@ -10,9 +10,12 @@ VALUE rb_cDLHandle;
+ void
+ dlhandle_free(struct dl_handle *dlhandle)
+ {
++  if (!dlhandle)
++    return;
+   if (dlhandle->ptr && dlhandle->open && dlhandle->enable_close) {
+     dlclose(dlhandle->ptr);
+   }
++  dlfree(dlhandle);
+ }
+ 
+ VALUE
+Index: ruby-1.8.7-p299/ext/dl/ptr.c
+===================================================================
+--- ruby-1.8.7-p299.orig/ext/dl/ptr.c
++++ ruby-1.8.7-p299/ext/dl/ptr.c
+@@ -45,6 +45,8 @@ rb_dlmem_aref(void *ptr)
+ void
+ dlptr_free(struct ptr_data *data)
+ {
++  if (!data)
++    return;
+   if (data->ptr) {
+     DEBUG_CODE({
+       printf("dlptr_free(): removing the pointer `0x%x' from the MemorySpace\n",
+@@ -61,6 +63,7 @@ dlptr_free(struct ptr_data *data)
+   if (data->stype) dlfree(data->stype);
+   if (data->ssize) dlfree(data->ssize);
+   if (data->ids) dlfree(data->ids);
++  dlfree(data);
+ }
+ 
+ void
+Index: ruby-1.8.7-p299/ext/dl/sym.c
+===================================================================
+--- ruby-1.8.7-p299.orig/ext/dl/sym.c
++++ ruby-1.8.7-p299/ext/dl/sym.c
+@@ -57,6 +57,8 @@ char2type(int ch)
+ void
+ dlsym_free(struct sym_data *data)
+ {
++  if(!data)
++    return;
+   if( data->name ){
+     DEBUG_CODE({
+       printf("dlsym_free(): free(data->name:%s)\n",data->name);
+@@ -69,6 +71,7 @@ dlsym_free(struct sym_data *data)
+     });
+     free(data->type);
+   }
++  dlfree(data);
+ }
+ 
+ VALUE

diff --git a/patchsets/patches-1.8.7_p370/003_mkmf-parallel-install.patch b/patchsets/patches-1.8.7_p370/003_mkmf-parallel-install.patch
new file mode 100644
index 0000000..9ecdc9b
--- /dev/null
+++ b/patchsets/patches-1.8.7_p370/003_mkmf-parallel-install.patch
@@ -0,0 +1,16 @@
+ Patch for bug 239101 by Matsuu Takuto, via Redmine issue 1337 (yes, really).
+ Backported for 1.8.* by Alex Legler.
+
+Index: ruby-1.8.7-p299/lib/mkmf.rb
+===================================================================
+--- ruby-1.8.7-p299.orig/lib/mkmf.rb
++++ ruby-1.8.7-p299/lib/mkmf.rb
+@@ -1523,7 +1523,7 @@ static:		$(STATIC_LIB)#{$extout ? " inst
+     dest = "#{dir}/#{f}"
+     mfile.puts dir, "install-so: #{dest}"
+     unless $extout
+-      mfile.print "#{dest}: #{f}\n"
++      mfile.print "#{dest}: #{dir} #{f}\n"
+       if (sep = config_string('BUILD_FILE_SEPARATOR'))
+         f.gsub!("/", sep)
+         dir.gsub!("/", sep)

diff --git a/patchsets/patches-1.8.7_p370/004_berkdb-5.0.patch b/patchsets/patches-1.8.7_p370/004_berkdb-5.0.patch
new file mode 100644
index 0000000..2516cd3
--- /dev/null
+++ b/patchsets/patches-1.8.7_p370/004_berkdb-5.0.patch
@@ -0,0 +1,13 @@
+Index: ruby-1.8.7-p299/ext/dbm/extconf.rb
+===================================================================
+--- ruby-1.8.7-p299.orig/ext/dbm/extconf.rb
++++ ruby-1.8.7-p299/ext/dbm/extconf.rb
+@@ -26,7 +26,7 @@ def headers.db_check(db)
+   case db
+   when /^db2?$/
+     db_prefix = "__db_n"
+-    hsearch = "-DDB_DBM_HSEARCH "
++    hsearch = "-DDB_DBM_HSEARCH -DHAVE_DBM "
+   when "gdbm"
+     have_gdbm = true
+   when "gdbm_compat"

diff --git a/patchsets/patches-1.8.7_p370/007_no-undefined-ext.patch b/patchsets/patches-1.8.7_p370/007_no-undefined-ext.patch
new file mode 100644
index 0000000..41a7ddb
--- /dev/null
+++ b/patchsets/patches-1.8.7_p370/007_no-undefined-ext.patch
@@ -0,0 +1,13 @@
+Index: ruby-1.8.7-p299/configure.in
+===================================================================
+--- ruby-1.8.7-p299.orig/configure.in
++++ ruby-1.8.7-p299/configure.in
+@@ -1223,7 +1223,7 @@ if test "$with_dln_a_out" != yes; then
+ 	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
+ 			: ${LDSHARED='${CC} -shared'}
+ 			if test "$rb_cv_binary_elf" = yes; then
+-			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
++			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic -Wl,--no-undefined"
+ 			fi
+ 			rb_cv_dlopen=yes ;;
+ 	interix*) 	: ${LDSHARED="$CC -shared"}

diff --git a/patchsets/patches-1.8.7_p370/015-as-dir.patch b/patchsets/patches-1.8.7_p370/015-as-dir.patch
new file mode 100644
index 0000000..8b86e60
--- /dev/null
+++ b/patchsets/patches-1.8.7_p370/015-as-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index 0c9db02..b44625a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -243,7 +243,7 @@ AC_MINIX
+ 
+ AC_SUBST(RM, ['rm -f'])
+ AC_SUBST(CP, ['cp'])
+-if $as_mkdir_p; then
++if eval $as_mkdir_p; then
+   AC_SUBST(MAKEDIRS, ['mkdir -p'])
+ else
+   AC_SUBST(MAKEDIRS, ['install -d'])

diff --git a/patchsets/patches-1.8.7_p370/series b/patchsets/patches-1.8.7_p370/series
new file mode 100644
index 0000000..f454c2f
--- /dev/null
+++ b/patchsets/patches-1.8.7_p370/series
@@ -0,0 +1,5 @@
+001_memory_leak.patch
+003_mkmf-parallel-install.patch
+004_berkdb-5.0.patch
+007_no-undefined-ext.patch
+015-as-dir.patch