From 6468e77902ae3e773d8ff5ae244f2f482a1e5768 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Thu, 14 Jan 2010 20:24:06 +0000
Subject: [PATCH] - 5.9.2

---
 .cvsignore                                    |  2 +-
 ...ruma-5.9.2-onig_new-returns-NULL-reg.patch | 31 +++++++++++++++++++
 oniguruma.spec                                | 12 +++++--
 sources                                       |  2 +-
 4 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 oniguruma-5.9.2-onig_new-returns-NULL-reg.patch

diff --git a/.cvsignore b/.cvsignore
index b5cc929..02f3492 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-onig-5.9.1.tar.gz
+onig-5.9.2.tar.gz
diff --git a/oniguruma-5.9.2-onig_new-returns-NULL-reg.patch b/oniguruma-5.9.2-onig_new-returns-NULL-reg.patch
new file mode 100644
index 0000000..349929a
--- /dev/null
+++ b/oniguruma-5.9.2-onig_new-returns-NULL-reg.patch
@@ -0,0 +1,31 @@
+--- onig-5.9.2/regcomp.c.debug	2010-01-05 23:13:38.000000000 +0900
++++ onig-5.9.2/regcomp.c	2010-01-15 03:58:15.000000000 +0900
+@@ -5536,19 +5536,22 @@
+ 	  OnigErrorInfo* einfo)
+ {
+   int r;
++  regex_t *regg;
+ 
+-  *reg = (regex_t* )xmalloc(sizeof(regex_t));
+-  if (IS_NULL(*reg)) return ONIGERR_MEMORY;
++  regg = (regex_t* )xmalloc(sizeof(regex_t));
++  if (IS_NULL(regg)) return ONIGERR_MEMORY;
+ 
+-  r = onig_reg_init(*reg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
++  r = onig_reg_init(regg, option, ONIGENC_CASE_FOLD_DEFAULT, enc, syntax);
+   if (r) goto err;
+ 
+-  r = onig_compile(*reg, pattern, pattern_end, einfo);
++  r = onig_compile(regg, pattern, pattern_end, einfo);
+   if (r) {
+   err:
+-    onig_free(*reg);
+-    *reg = NULL;
++    onig_free(regg);
++    regg = NULL;
+   }
++
++  *reg = regg;
+   return r;
+ }
+ 
diff --git a/oniguruma.spec b/oniguruma.spec
index 46aa7d8..996595a 100644
--- a/oniguruma.spec
+++ b/oniguruma.spec
@@ -1,12 +1,16 @@
 Name:		oniguruma
-Version:	5.9.1
-Release:	3%{?dist}
+Version:	5.9.2
+Release:	1%{?dist}
 Summary:	Regular expressions library
 
 Group:		System Environment/Libraries
 License:	BSD
 URL:		http://www.geocities.jp/kosako3/oniguruma/
 Source0:	http://www.geocities.jp/kosako3/oniguruma/archive/onig-%{version}.tar.gz
+# FIXME
+# Don't know exactly why, however without Patch0 onig_new returns
+# NULL reg variable
+Patch0:		oniguruma-5.9.2-onig_new-returns-NULL-reg.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby >= 1.8
@@ -31,6 +35,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n onig-%{version}
+%patch0 -p1 -b .nullreg
 %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in
 
 for f in \
@@ -97,6 +102,9 @@ find $RPM_BUILD_ROOT -name '*.la' \
 %{_includedir}/onig*.h
 
 %changelog
+* Fri Jan 15 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 5.9.2-1
+- 5.9.2
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 5.9.1-3
 - F-12: Mass rebuild
 
diff --git a/sources b/sources
index d80d8ad..f3913b7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ce5f9bba5e83f0ea6ec24e1ac77091c  onig-5.9.1.tar.gz
+0f4ad1b100a5f9a91623e04111707b84  onig-5.9.2.tar.gz