rpms/namazu/devel namazu-fixinutf8.patch, 1.3, 1.4 namazu.spec, 1.21, 1.22

Akira TAGOH tagoh at fedoraproject.org
Mon Sep 1 10:33:45 UTC 2008 

Author: tagoh

Update of /cvs/pkgs/rpms/namazu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9252

Modified Files:
	namazu-fixinutf8.patch namazu.spec 
Log Message:
* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-5
- Update patch to fix a fuzz issue.

namazu-fixinutf8.patch:

Index: namazu-fixinutf8.patch
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/namazu-fixinutf8.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- namazu-fixinutf8.patch	2 Mar 2006 07:30:38 -0000	1.3
+++ namazu-fixinutf8.patch	1 Sep 2008 10:33:44 -0000	1.4
@@ -1,7 +1,7 @@
-diff -ruN namazu-2.0.15.orig/filter/Makefile.am namazu-2.0.15/filter/Makefile.am
---- namazu-2.0.15.orig/filter/Makefile.am	2004-09-18 14:03:02.000000000 +0900
-+++ namazu-2.0.15/filter/Makefile.am	2006-03-02 16:25:25.000000000 +0900
-@@ -20,6 +20,8 @@
+diff -pruN namazu-2.0.18.orig/filter/Makefile.am namazu-2.0.18/filter/Makefile.am
+--- namazu-2.0.18.orig/filter/Makefile.am	2007-02-23 14:02:22.000000000 +0900
++++ namazu-2.0.18/filter/Makefile.am	2008-09-01 17:38:16.000000000 +0900
+@@ -20,6 +20,8 @@ filter_DATA = bzip2.pl \
  	      hnf.pl \
  	      html.pl \
  	      mailnews.pl \
@@ -10,10 +10,10 @@
  	      man.pl \
  	      mhonarc.pl \
  	      msword.pl \
-diff -ruN namazu-2.0.15.orig/filter/Makefile.in namazu-2.0.15/filter/Makefile.in
---- namazu-2.0.15.orig/filter/Makefile.in	2006-01-29 22:58:27.000000000 +0900
-+++ namazu-2.0.15/filter/Makefile.in	2006-03-02 16:25:55.000000000 +0900
-@@ -151,6 +151,8 @@
+diff -pruN namazu-2.0.18.orig/filter/Makefile.in namazu-2.0.18/filter/Makefile.in
+--- namazu-2.0.18.orig/filter/Makefile.in	2008-03-12 01:11:59.000000000 +0900
++++ namazu-2.0.18/filter/Makefile.in	2008-09-01 17:38:16.000000000 +0900
+@@ -151,6 +151,8 @@ filter_DATA = bzip2.pl \
  	      hnf.pl \
  	      html.pl \
  	      mailnews.pl \
@@ -22,10 +22,10 @@
  	      man.pl \
  	      mhonarc.pl \
  	      msword.pl \
-diff -ruN namazu-2.0.15.orig/filter/hnf.pl namazu-2.0.15/filter/hnf.pl
---- namazu-2.0.15.orig/filter/hnf.pl	2005-06-06 15:13:35.000000000 +0900
-+++ namazu-2.0.15/filter/hnf.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -72,8 +72,10 @@
+diff -pruN namazu-2.0.18.orig/filter/hnf.pl namazu-2.0.18/filter/hnf.pl
+--- namazu-2.0.18.orig/filter/hnf.pl	2007-05-28 15:46:55.000000000 +0900
++++ namazu-2.0.18/filter/hnf.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -72,8 +72,10 @@ sub filter ($$$$$) {
  
      my $mark = "# ";
      my $end  = "--";
@@ -38,9 +38,9 @@
  
      get_uri($cfile, $fields);
      hnf_filter($contref, $weighted_str, $fields, $headings, $cfile, 
-diff -ruN namazu-2.0.15.orig/filter/langspec.txt namazu-2.0.15/filter/langspec.txt
---- namazu-2.0.15.orig/filter/langspec.txt	1970-01-01 09:00:00.000000000 +0900
-+++ namazu-2.0.15/filter/langspec.txt	2006-03-02 16:25:25.000000000 +0900
+diff -pruN namazu-2.0.18.orig/filter/langspec.txt namazu-2.0.18/filter/langspec.txt
+--- namazu-2.0.18.orig/filter/langspec.txt	1970-01-01 09:00:00.000000000 +0900
++++ namazu-2.0.18/filter/langspec.txt	2008-09-01 17:38:16.000000000 +0900
 @@ -0,0 +1,8 @@
 +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(¡£|¡¥|\.|¡¤|,|¡¢|\@|¡÷|¤Î)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(¤Ç¤¹|¤È¿½¤·¤Þ¤¹|¤È¤â¤¦¤·¤Þ¤¹|¤È¤¤¤¤¤Þ¤¹)(.{0,2})?\s*$)
 +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|·ï̾|º¹½Ð¿Í|Æü»þ))|(^.+(ÊÖ»ö¤Ç¤¹|reply\s*¤Ç¤¹|Û©¤¯|¤¤¤ï¤¯|½ñ¤­¤Þ¤·¤¿|¸À¤¤¤Þ¤·¤¿|ÏäÇ|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)
@@ -50,9 +50,9 @@
 +hnf.pl_filter_2: ¢§
 +gfilter.pl_line_adjust_filter: (¡£|¡¢)$
 +wakati.pl_wakatize_japanese: (.+ )̾»ì
-diff -ruN namazu-2.0.15.orig/filter/langspec.txt.utf8 namazu-2.0.15/filter/langspec.txt.utf8
---- namazu-2.0.15.orig/filter/langspec.txt.utf8	1970-01-01 09:00:00.000000000 +0900
-+++ namazu-2.0.15/filter/langspec.txt.utf8	2006-03-02 16:25:25.000000000 +0900
+diff -pruN namazu-2.0.18.orig/filter/langspec.txt.utf8 namazu-2.0.18/filter/langspec.txt.utf8
+--- namazu-2.0.18.orig/filter/langspec.txt.utf8	1970-01-01 09:00:00.000000000 +0900
++++ namazu-2.0.18/filter/langspec.txt.utf8	2008-09-01 17:38:16.000000000 +0900
 @@ -0,0 +1,8 @@
 +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(。|．|\.|，|,|、|\@|＠|の)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(です|と申します|ともうします|といいます)(.{0,2})?\s*$)
 +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|件名|差出人|日時))|(^.+(返事です|reply\s*です|曰く|いわく|書きました|言いました|話で|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)
@@ -62,10 +62,10 @@
 +hnf.pl_filter_2: â–¼
 +gfilter.pl_line_adjust_filter: (。|、)$
 +wakati.pl_wakatize_japanese: (.+ )名詞
-diff -ruN namazu-2.0.15.orig/filter/mailnews.pl namazu-2.0.15/filter/mailnews.pl
---- namazu-2.0.15.orig/filter/mailnews.pl	2006-01-29 22:26:44.000000000 +0900
-+++ namazu-2.0.15/filter/mailnews.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -246,13 +246,23 @@
+diff -pruN namazu-2.0.18.orig/filter/mailnews.pl namazu-2.0.18/filter/mailnews.pl
+--- namazu-2.0.18.orig/filter/mailnews.pl	2006-04-25 23:14:05.000000000 +0900
++++ namazu-2.0.18/filter/mailnews.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -260,13 +260,23 @@ sub mailnews_citation_filter ($$) {
      $$contref = "";
  
      # Greeting at the beginning (first one or two lines)
@@ -95,7 +95,7 @@
      }
  
      # Isolate citation parts.
-@@ -277,11 +287,22 @@
+@@ -291,11 +301,22 @@ sub mailnews_citation_filter ($$) {
          # Process only first five paragrahs.
  	# And don't handle the paragrah which has five or longer lines.
  	# Hmm, this regex looks very hairly.
@@ -123,10 +123,10 @@
  	}
  	$$contref .= $line. "\n\n";
          $i++;
-diff -ruN namazu-2.0.15.orig/filter/man.pl namazu-2.0.15/filter/man.pl
---- namazu-2.0.15.orig/filter/man.pl	2005-06-06 15:13:35.000000000 +0900
-+++ namazu-2.0.15/filter/man.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -171,17 +171,36 @@
+diff -pruN namazu-2.0.18.orig/filter/man.pl namazu-2.0.18/filter/man.pl
+--- namazu-2.0.18.orig/filter/man.pl	2005-06-06 15:13:35.000000000 +0900
++++ namazu-2.0.18/filter/man.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -171,17 +171,36 @@ sub man_filter ($$$) {
      my $weight = $conf::Weight{'html'}->{'title'};
      $$weighted_str .= "\x7f$weight\x7f$title\x7f/$weight\x7f\n";
  
@@ -172,10 +172,10 @@
      }
  }
  
-diff -ruN namazu-2.0.15.orig/pl/gfilter.pl namazu-2.0.15/pl/gfilter.pl
---- namazu-2.0.15.orig/pl/gfilter.pl	2004-11-01 21:56:44.000000000 +0900
-+++ namazu-2.0.15/pl/gfilter.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -92,13 +92,14 @@
+diff -pruN namazu-2.0.18.orig/pl/gfilter.pl namazu-2.0.18/pl/gfilter.pl
+--- namazu-2.0.18.orig/pl/gfilter.pl	2006-04-16 21:48:49.000000000 +0900
++++ namazu-2.0.18/pl/gfilter.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -93,13 +93,14 @@ sub line_adjust_filter ($) {
      return undef unless defined($$text);
  
      my @tmp = split(/\n/, $$text);
@@ -191,11 +191,11 @@
  	$line =~ s/([a-z])-\n/$1/;  # for hyphenation.
      }
      $$text = join('', @tmp);
-diff -ruN namazu-2.0.15.orig/pl/util.pl namazu-2.0.15/pl/util.pl
---- namazu-2.0.15.orig/pl/util.pl	2006-03-02 16:24:57.000000000 +0900
-+++ namazu-2.0.15/pl/util.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -562,4 +562,36 @@
-     }
+diff -pruN namazu-2.0.18.orig/pl/util.pl namazu-2.0.18/pl/util.pl
+--- namazu-2.0.18.orig/pl/util.pl	2008-09-01 17:37:56.000000000 +0900
++++ namazu-2.0.18/pl/util.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -582,4 +582,36 @@ sub canopen($)
+     return 1;
  }
  
 +sub read_langspec_char_from_file ($$) {
@@ -231,10 +231,10 @@
 +}
 +
  1;
-diff -ruN namazu-2.0.15.orig/pl/wakati.pl namazu-2.0.15/pl/wakati.pl
---- namazu-2.0.15.orig/pl/wakati.pl	2006-01-23 18:18:24.000000000 +0900
-+++ namazu-2.0.15/pl/wakati.pl	2006-03-02 16:25:25.000000000 +0900
-@@ -53,8 +53,10 @@
+diff -pruN namazu-2.0.18.orig/pl/wakati.pl namazu-2.0.18/pl/wakati.pl
+--- namazu-2.0.18.orig/pl/wakati.pl	2006-03-11 01:25:32.000000000 +0900
++++ namazu-2.0.18/pl/wakati.pl	2008-09-01 17:38:16.000000000 +0900
+@@ -53,8 +53,10 @@ sub wakatize_japanese ($) {
      # Collect only noun words when -m option is specified.
      if ($var::Opt{'noun'}) {
  	$$content = "";


Index: namazu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/namazu/devel/namazu.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- namazu.spec	4 Jul 2008 08:33:57 -0000	1.21
+++ namazu.spec	1 Sep 2008 10:33:44 -0000	1.22
@@ -4,7 +4,7 @@
 
 Name:		namazu
 Version:	2.0.18
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPLv2+
 URL:		http://www.namazu.org/
 BuildRequires:	perl >= 5.6.0, perl(NKF) >= 1.70, perl(Text::Kakasi) >= 1.00
@@ -161,6 +161,9 @@
 
 
 %changelog
+* Mon Sep  1 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-5
+- Update patch to fix a fuzz issue.
+
 * Fri Jul  4 2008 Akira TAGOH <tagoh at redhat.com> - 2.0.18-4
 - Add nkf, kakasi and mecab to BR. (#449186)

More information about the fedora-extras-commits mailing list