rpms/oniguruma/F-11 oniguruma-5.9.2-onig_new-returns-NULL-reg.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 oniguruma.spec, 1.4, 1.5 sources, 1.3, 1.4

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/oniguruma/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17320/F-11

Modified Files:
	.cvsignore oniguruma.spec sources 
Added Files:
	oniguruma-5.9.2-onig_new-returns-NULL-reg.patch 
Log Message:
* Fri Jan 15 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 5.9.2-1
- 5.9.2


oniguruma-5.9.2-onig_new-returns-NULL-reg.patch:
 regcomp.c |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

--- NEW FILE oniguruma-5.9.2-onig_new-returns-NULL-reg.patch ---
--- 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;
 }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oniguruma/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	26 Dec 2007 17:38:39 -0000	1.3
+++ .cvsignore	14 Jan 2010 20:24:05 -0000	1.4
@@ -1 +1 @@
-onig-5.9.1.tar.gz
+onig-5.9.2.tar.gz


Index: oniguruma.spec
===================================================================
RCS file: /cvs/extras/rpms/oniguruma/F-11/oniguruma.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- oniguruma.spec	24 Feb 2009 04:00:48 -0000	1.4
+++ oniguruma.spec	14 Jan 2010 20:24:06 -0000	1.5
@@ -1,12 +1,16 @@
 Name:		oniguruma
-Version:	5.9.1
-Release:	2%{?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 at libdir@||' onig-config.in
 
 for f in \
@@ -97,6 +102,12 @@ find $RPM_BUILD_ROOT -name '*.la' \
 %{_includedir}/onig*.h
 
 %changelog
+* Fri Jan 15 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 5.9.2-1
+- 5.9.2
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 5.9.1-3
+- F-12: Mass rebuild
+
 * Tue Feb 24 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 5.9.1-2
 - F-11: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oniguruma/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	26 Dec 2007 17:38:39 -0000	1.3
+++ sources	14 Jan 2010 20:24:06 -0000	1.4
@@ -1 +1 @@
-5ce5f9bba5e83f0ea6ec24e1ac77091c  onig-5.9.1.tar.gz
+0f4ad1b100a5f9a91623e04111707b84  onig-5.9.2.tar.gz