From 36a3d96a30563e30f9c3310d427813127a17db96 Mon Sep 17 00:00:00 2001 From: Jeroen van Meeuwen Date: May 31 2009 08:39:25 +0000 Subject: 1.8.6.368-1 --- diff --git a/.cvsignore b/.cvsignore index ca8d1fe..2c638ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -ruby-1.8.6-p287.tar.bz2 -ruby-refm-rdp-1.8.1-ja-html.tar.gz rubyfaq-990927.tar.gz rubyfaq-jp-990927.tar.gz +ruby-1.8.6-p368.tar.bz2 +ruby-refm-rdp-1.8.2-ja-html.tar.gz diff --git a/import.log b/import.log index b1b423b..834df7a 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ ruby-1_8_6_287-7_fc11:F-10:ruby-1.8.6.287-7.fc11.src.rpm:1237351889 +ruby-1_8_6_368-1_fc11:F-10:ruby-1.8.6.368-1.fc11.src.rpm:1243759146 diff --git a/ruby-1.8.6-p287-remove-ssl-rand-range.patch b/ruby-1.8.6-p287-remove-ssl-rand-range.patch index 75bef4e..705f3d3 100644 --- a/ruby-1.8.6-p287-remove-ssl-rand-range.patch +++ b/ruby-1.8.6-p287-remove-ssl-rand-range.patch @@ -98,16 +98,3 @@ diff -ur ruby-1.8.6-p287.orig/ext/openssl/openssl_missing.c ruby-1.8.6-p287/ext/ if (key) { i = strlen(key); i = (i > num) ? num : i; -diff -ur ruby-1.8.6-p287.orig/ext/openssl/openssl_missing.h ruby-1.8.6-p287/ext/openssl/openssl_missing.h ---- ruby-1.8.6-p287.orig/ext/openssl/openssl_missing.h 2008-08-04 06:43:34.000000000 +0200 -+++ ruby-1.8.6-p287/ext/openssl/openssl_missing.h 2009-03-15 05:33:56.000000000 +0100 -@@ -120,8 +120,6 @@ - int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx); - int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); - int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx); --int BN_rand_range(BIGNUM *r, BIGNUM *range); --int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range); - char *CONF_get1_default_config_file(void); - int PEM_def_callback(char *buf, int num, int w, void *key); - -Only in ruby-1.8.6-p287/ext/openssl: .openssl_missing.h.swp diff --git a/ruby-1.8.6.111-gcc43.patch b/ruby-1.8.6.111-gcc43.patch deleted file mode 100644 index 9e1b297..0000000 --- a/ruby-1.8.6.111-gcc43.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -pruN ruby-1.8.6-p111.orig/ext/socket/socket.c ruby-1.8.6-p111/ext/socket/socket.c ---- ruby-1.8.6-p111.orig/ext/socket/socket.c 2007-05-23 00:08:43.000000000 +0900 -+++ ruby-1.8.6-p111/ext/socket/socket.c 2008-02-19 11:24:22.000000000 +0900 -@@ -893,10 +893,10 @@ port_str(port, pbuf, len) - } - - #ifndef NI_MAXHOST --# define 1025 -+# define NI_MAXHOST 1025 - #endif - #ifndef NI_MAXSERV --# define 32 -+# define NI_MAXSERV 32 - #endif - - static struct addrinfo* diff --git a/ruby.spec b/ruby.spec index bd7e080..c0e342f 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %define rubyxver 1.8 %define rubyver 1.8.6 -%define _patchlevel 287 +%define _patchlevel 368 %define dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %define patchlevel %{?_patchlevel:-p%{_patchlevel}} %define arcver %{rubyver}%{?patchlevel} @@ -10,9 +10,13 @@ %define sitedir2 %{_prefix}/lib/ruby/site_ruby %define _normalized_cpu %(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/' | sed -e 's|i.86|i386|'`) +# emacs sitelisp directory +%{!?_emacs_sitelispdir: %global _emacs_sitelispdir %{_datadir}/emacs/site-lisp} +%{!?_emacs_sitestartdir: %global _emacs_sitestartdir %{_datadir}/emacs/site-lisp/site-start.d} + Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 7%{?dist} +Release: 1%{?dist} License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +26,8 @@ BuildRequires: emacs Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{rubyxver}/%{name}-%{arcver}.tar.bz2 ## Dead link ##Source1: http://www7.tok2.com/home/misc/files/%{name}/%{name}-refm-rdp-1.8.1-ja-html.tar.gz -Source1: %{name}-refm-rdp-1.8.1-ja-html.tar.gz +#Source1: %{name}-refm-rdp-1.8.1-ja-html.tar.gz +Source1: http://elbereth-hp.hp.infoseek.co.jp/files/ruby/refm/old/2005/%{name}-refm-rdp-1.8.2-ja-html.tar.gz Source2: ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-990927.tar.gz Source3: ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-jp-990927.tar.gz Source4: irb.1 @@ -33,7 +38,8 @@ Patch20: ruby-rubyprefix.patch Patch21: ruby-deprecated-sitelib-search-path.patch Patch22: ruby-deprecated-search-path.patch Patch23: ruby-multilib.patch -Patch25: ruby-1.8.6.111-gcc43.patch +# Needed in 1.8.6-p287, no longer needed in 1.8.6-p368? +#Patch25: ruby-1.8.6.111-gcc43.patch Patch26: ruby-1.8.6-rexml-CVE-2008-3790.patch Patch27: ruby-1.8.6-p287-CVE-2008-5189.patch Patch28: ruby-1.8.6-p287-remove-ssl-rand-range.patch @@ -53,6 +59,9 @@ straight-forward, and extensible. %package libs Summary: Libraries necessary to run Ruby Group: Development/Libraries +# ext/bigdecimal/bigdecimal.{c,h} are under (GPL+ or Artistic) which +# are used for bigdecimal.so +License: (Ruby or GPLv2) and (GPL+ or Artistic) Provides: ruby(abi) = %{rubyxver} Provides: libruby = %{version}-%{release} Obsoletes: libruby <= %{version}-%{release} @@ -75,6 +84,8 @@ Ruby or an application embedded Ruby. %package tcltk Summary: Tcl/Tk interface for scripting language Ruby Group: Development/Languages +# Many files under ext/tk/sample/ are under TCL +License: (Ruby or GPLv2) and TCL Requires: %{name}-libs = %{version}-%{release} %description tcltk @@ -96,6 +107,8 @@ from the terminal. %package rdoc Summary: A tool to generate documentation from Ruby source files Group: Development/Languages +# generators/template/html/html.rb is under CC-BY +License: (GPLv2 or Ruby) and CC-BY ## ruby-irb requires ruby #Requires: %{name} = %{version}-%{release} Requires: %{name}-irb = %{version}-%{release} @@ -155,8 +168,8 @@ pushd %{name}-%{arcver} %patch22 -p1 %patch23 -p1 %endif -%patch25 -p1 -%patch26 -p1 +#%patch25 -p1 +#%patch26 -p1 %patch27 -p0 %patch28 -p1 %patch29 -p1 @@ -197,7 +210,9 @@ popd %check pushd %{name}-%{arcver} -%ifnarch ppc64 +%ifarch ppc64 +make test || : +%else make test %endif popd @@ -205,8 +220,8 @@ popd %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode -mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d +mkdir -p $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ruby-mode +mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir} # installing documents and exapmles... rm -rf tmp-ruby-docs @@ -286,10 +301,15 @@ find -type f | xargs chmod 0644 # convert to utf-8 for i in `find -type f ! -name "*.gif"`; do - sh -c "iconv -f utf-8 -t utf-8 $i > /dev/null 2>&1 || (iconv -f euc-jp -t utf-8 $i > $i.new && mv $i.new $i || exit 1) - if [ $? != 0 ]; then - iconv -f iso8859-1 -t utf-8 $i > $.new && mv $i.new $i || exit 1 - fi" + status=0 + iconv -f utf-8 -t utf-8 $i >/dev/null || { iconv -f euc-jp -t utf-8 $i > $i.new && mv $i.new $i || status=1 ; } + if [ $status = 0 ]; then + if dirname $i | grep -q refm-ja ; then + sed -i -e '/encoding/s|EUC-JP|UTF-8|' -e '/charset/s|EUC-JP|UTF-8|' $i + fi + else + iconv -f iso8859-1 -t utf-8 $i > $.new && mv $i.new $i || rm -f $i.new + fi done # done @@ -312,10 +332,10 @@ install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/ # installing ruby-mode cd %{name}-%{arcver} -cp -p misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode +cp -p misc/*.el $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ruby-mode ## for ruby-mode -pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode +pushd $RPM_BUILD_ROOT%{_emacs_sitelispdir}/ruby-mode cat < path.el (setq load-path (cons "." load-path) byte-compile-warnings nil) EOF @@ -323,7 +343,7 @@ emacs --no-site-file -q -batch -l path.el -f batch-byte-compile *.el rm -f path.el* popd install -p -m 644 %{SOURCE10} \ - $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d + $RPM_BUILD_ROOT%{_emacs_sitestartdir} cd .. @@ -336,7 +356,6 @@ find $RPM_BUILD_ROOT/ -name "*.so" -exec chmod 755 {} \; %clean rm -rf $RPM_BUILD_ROOT -rm -rf tmp-ruby-docs %post libs -p /sbin/ldconfig @@ -508,16 +527,22 @@ rm -rf tmp-ruby-docs %doc %{name}-%{arcver}/LEGAL %doc %{name}-%{arcver}/LGPL %doc %{name}-%{arcver}/misc/README -%{_datadir}/emacs/site-lisp/ruby-mode -%{_datadir}/emacs/site-lisp/site-start.d/ruby-mode-init.el +%{_emacs_sitelispdir}/ruby-mode +%{_emacs_sitestartdir}/ruby-mode-init.el %changelog +* Sun May 31 2009 Jeroen van Meeuwen - 1.8.6.368-1 +- New upstream release (p368) + +* Sat Apr 11 2009 Mamoru Tasaka - 1.8.6.287-8 +- Merge Review fix (#226381) + * Wed Mar 18 2009 Jeroen van Meeuwen - 1.8.6.287-7 - Fix regression in CVE-2008-3790 (#485383) * Mon Mar 16 2009 Mamoru Tasaka - 1.8.6.287-6 - Again use -O2 optimization level -- i586 should search i386-linux directory +- i586 should search i386-linux directory (on <= F-11) * Thu Mar 05 2009 Jeroen van Meeuwen - 1.8.6.287-5 - Rebuild for gcc4.4 diff --git a/sources b/sources index 6c9de9d..5ff4260 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -80b5f3db12531d36e6c81fac6d05dda9 ruby-1.8.6-p287.tar.bz2 -d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz 634c25b14e19925d10af3720d72e8741 rubyfaq-990927.tar.gz 4fcec898f51d8371cc42d0a013940469 rubyfaq-jp-990927.tar.gz +623447c6d8c973193aae565a5538ccfc ruby-1.8.6-p368.tar.bz2 +b6dd396f513efeb7864685c840f9643a ruby-refm-rdp-1.8.2-ja-html.tar.gz