packages: cvsspam/cvsspam.spec, cvsspam/ruby19.patch (NEW) - ruby19 fix on ...

[glen]

Author: glen                         Date: Wed Apr  7 15:28:43 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ruby19 fix on users file encoding reading

---- Files affected:
packages/cvsspam:
   cvsspam.spec (1.44 -> 1.45) , ruby19.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cvsspam/cvsspam.spec
diff -u packages/cvsspam/cvsspam.spec:1.44 packages/cvsspam/cvsspam.spec:1.45
--- packages/cvsspam/cvsspam.spec:1.44	Tue Mar  2 15:00:47 2010
+++ packages/cvsspam/cvsspam.spec	Wed Apr  7 17:28:38 2010
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	CVSspam - wysyłanie różnic po wykonaniu zmiany w repozytorium CVS
 Name:		cvsspam
 Version:	0.2.12
-Release:	12
+Release:	13
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.badgers-in-foil.co.uk/projects/cvsspam/releases/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-textdiff.patch
 Patch1:		%{name}-tracfunc.patch
+Patch2:		ruby19.patch
 URL:		http://www.badgers-in-foil.co.uk/projects/cvsspam/
 BuildRequires:	rpmbuild(macros) >= 1.277
 Requires:	cvs-client
@@ -41,6 +42,7 @@
 %patch100 -p0
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,6 +87,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2010/04/07 15:28:38  glen
+- ruby19 fix on users file encoding reading
+
 Revision 1.44  2010/03/02 14:00:47  glen
 - recover tracsub patch, rel 12
 

================================================================
Index: packages/cvsspam/ruby19.patch
diff -u /dev/null packages/cvsspam/ruby19.patch:1.1
--- /dev/null	Wed Apr  7 17:28:44 2010
+++ packages/cvsspam/ruby19.patch	Wed Apr  7 17:28:38 2010
@@ -0,0 +1,19 @@
+--- cvsspam-0.2.12/cvsspam.rb~	2010-04-07 18:25:49.252489451 +0300
++++ cvsspam-0.2.12/cvsspam.rb	2010-04-07 18:27:22.000000000 +0300
+@@ -169,7 +171,7 @@
+ 
+   # test to see of the given string contains non-ASCII characters
+   def requires_rfc2047?(word)
+-    (word =~ /[\177-\377]/) != nil
++    (word.force_encoding('ASCII-8BIT') =~ /[\177-\377]/) != nil
+   end
+ end
+ 
+@@ -2242,6 +2244,7 @@
+   if File.exists?($users_file)
+     File.open($users_file) do |io|
+       io.each_line do |line|
++        line.force_encoding($users_file_charset)
+         if line =~ /^([^:]+)\s*:\s*(['"]?)([^\n\r]+)(\2)/
+           if email.address == $1
+             return EmailAddress.new($3, $users_file_charset)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cvsspam/cvsspam.spec?r1=1.44&r2=1.45&f=u