rpms/ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- security fix release.

Browse Source
This commit is contained in:
Akira TAGOH 2006-12-11 04:23:10 +00:00
parent 44c8f2bd54
commit f069eea3e8
3 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -10,3 +10,4 @@ ruby-1.8.4-preview1.tar.gz
ruby-1.8.4-preview2.tar.gz ruby-1.8.4-preview2.tar.gz
ruby-1.8.4.tar.gz ruby-1.8.4.tar.gz
ruby-1.8.5.tar.gz ruby-1.8.5.tar.gz
ruby-1.8.5-p2.tar.gz

65
ruby.spec
View File

@ -1,11 +1,15 @@
%define manver 1.4.6 %define manver 1.4.6
%define rubyxver 1.8 %define rubyxver 1.8
%define rubyver 1.8.5
%define _patchlevel 2
%define dotpatchlevel %{?_patchlevel:.%{_patchlevel}}
%define patchlevel %{?_patchlevel:-p%{_patchlevel}}
%define sitedir %{_libdir}/ruby/site_ruby %define sitedir %{_libdir}/ruby/site_ruby
%define sitedir2 %{_prefix}/lib/ruby/site_ruby %define sitedir2 %{_prefix}/lib/ruby/site_ruby
Name: ruby Name: ruby
Version: 1.8.5 Version: %{rubyver}%{?dotpatchlevel}
Release: 4%{?dist} Release: 1%{?dist}
License: Ruby License/GPL - see COPYING License: Ruby License/GPL - see COPYING
URL: http://www.ruby-lang.org/ URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -14,7 +18,7 @@ BuildRequires: readline readline-devel ncurses ncurses-devel gdbm gdbm-devel gli
BuildRequires: emacs BuildRequires: emacs
%endif %endif
Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{version}.tar.gz Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{rubyver}%{?patchlevel}.tar.gz
##Source1: ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz ##Source1: ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz
Source1: %{name}-man-%{manver}.tar.bz2 Source1: %{name}-man-%{manver}.tar.bz2
Source2: http://www7.tok2.com/home/misc/files/%{name}/%{name}-refm-rdp-1.8.1-ja-html.tar.gz Source2: http://www7.tok2.com/home/misc/files/%{name}/%{name}-refm-rdp-1.8.1-ja-html.tar.gz
@ -27,7 +31,6 @@ Source10: ruby-mode-init.el
Patch1: ruby-1.8.2-deadcode.patch Patch1: ruby-1.8.2-deadcode.patch
Patch2: ruby-1.8.5-hash-memory-leak.patch Patch2: ruby-1.8.5-hash-memory-leak.patch
Patch3: ruby-1.8.5-cgi-CVE-2006-5467.patch
Patch20: ruby-rubyprefix.patch Patch20: ruby-rubyprefix.patch
Patch21: ruby-deprecated-sitelib-search-path.patch Patch21: ruby-deprecated-sitelib-search-path.patch
Patch22: ruby-deprecated-search-path.patch Patch22: ruby-deprecated-search-path.patch
@ -142,10 +145,9 @@ mkdir -p ruby-refm-ja
pushd ruby-refm-ja pushd ruby-refm-ja
tar fxz %{SOURCE2} tar fxz %{SOURCE2}
popd popd
pushd %{name}-%{version} pushd %{name}-%{rubyver}%{?patchlevel}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
%ifarch ppc64 s390x sparc64 x86_64 %ifarch ppc64 s390x sparc64 x86_64
@ -157,7 +159,7 @@ pushd %{name}-%{version}
popd popd
%build %build
pushd %{name}-%{version} pushd %{name}-%{rubyver}%{?patchlevel}
for i in config.sub config.guess; do for i in config.sub config.guess; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
done done
@ -217,14 +219,14 @@ cd tmp-ruby-docs
# for ruby.rpm # for ruby.rpm
mkdir ruby ruby-libs ruby-devel ruby-tcltk ruby-docs irb mkdir ruby ruby-libs ruby-devel ruby-tcltk ruby-docs irb
cd ruby cd ruby
(cd ../../%{name}-%{version} && tar cf - sample) | tar xvf - (cd ../../%{name}-%{rubyver}%{?patchlevel} && tar cf - sample) | tar xvf -
cd .. cd ..
# for ruby-libs # for ruby-libs
cd ruby-libs cd ruby-libs
(cd ../../%{name}-%{version} && tar cf - lib/README*) | tar xvf - (cd ../../%{name}-%{rubyver}%{?patchlevel} && tar cf - lib/README*) | tar xvf -
(cd ../../%{name}-%{version}/doc && tar cf - .) | tar xvf - (cd ../../%{name}-%{rubyver}%{?patchlevel}/doc && tar cf - .) | tar xvf -
(cd ../../%{name}-%{version} && (cd ../../%{name}-%{rubyver}%{?patchlevel} &&
tar cf - `find ext \ tar cf - `find ext \
-mindepth 1 \ -mindepth 1 \
\( -path '*/sample/*' -o -path '*/demo/*' \) -o \ \( -path '*/sample/*' -o -path '*/demo/*' \) -o \
@ -290,12 +292,12 @@ done
cd .. cd ..
# installing binaries ... # installing binaries ...
make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} DESTDIR=$RPM_BUILD_ROOT install make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{rubyver}%{?patchlevel} DESTDIR=$RPM_BUILD_ROOT install
_cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'` _cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'`
# generate ri doc # generate ri doc
rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{rubyver}%{?patchlevel}
LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} RUBYLIB=$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}:$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} make -C $rubybuilddir DESTDIR=$RPM_BUILD_ROOT install-doc LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} RUBYLIB=$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}:$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} make -C $rubybuilddir DESTDIR=$RPM_BUILD_ROOT install-doc
#DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $rubybuilddir -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $rubybuilddir/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $rubybuilddir #DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $rubybuilddir -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $rubybuilddir/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $rubybuilddir
@ -313,7 +315,7 @@ install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/
%ifnarch ppc64 %ifnarch ppc64
# installing ruby-mode # installing ruby-mode
cd %{name}-%{version} cd %{name}-%{rubyver}%{?patchlevel}
cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode
## for ruby-mode ## for ruby-mode
@ -338,7 +340,7 @@ egrep '(\.[ah]|libruby\.so)$' ruby-all.files > ruby-devel.files
# for ruby-tcltk.rpm # for ruby-tcltk.rpm
cp /dev/null ruby-tcltk.files cp /dev/null ruby-tcltk.files
for f in `find %{name}-%{version}/ext/tk/lib -type f; find %{name}-%{version}/.ext -type f -name '*.so'; find %{name}-%{version}/ext/tk -type f -name '*.so'` for f in `find %{name}-%{rubyver}%{?patchlevel}/ext/tk/lib -type f; find %{name}-%{rubyver}%{?patchlevel}/.ext -type f -name '*.so'; find %{name}-%{rubyver}%{?patchlevel}/ext/tk -type f -name '*.so'`
do do
egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || : egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || :
done done
@ -396,27 +398,27 @@ rm -rf tmp-ruby-docs
%files -f ruby.files %files -f ruby.files
%defattr(-, root, root) %defattr(-, root, root)
%doc %{name}-%{version}/README %doc %{name}-%{rubyver}%{?patchlevel}/README
%lang(ja) %doc %{name}-%{version}/README.ja %lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja
%doc %{name}-%{version}/COPYING* %doc %{name}-%{rubyver}%{?patchlevel}/COPYING*
%doc %{name}-%{version}/ChangeLog %doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog
%doc %{name}-%{version}/LEGAL %doc %{name}-%{rubyver}%{?patchlevel}/LEGAL
%doc %{name}-%{version}/ToDo %doc %{name}-%{rubyver}%{?patchlevel}/ToDo
%doc %{name}-%{version}/doc/NEWS %doc %{name}-%{rubyver}%{?patchlevel}/doc/NEWS
%doc tmp-ruby-docs/ruby/* %doc tmp-ruby-docs/ruby/*
%files devel -f ruby-devel.files %files devel -f ruby-devel.files
%defattr(-, root, root) %defattr(-, root, root)
%doc %{name}-%{version}/README.EXT %doc %{name}-%{rubyver}%{?patchlevel}/README.EXT
%lang(ja) %doc %{name}-%{version}/README.EXT.ja %lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.EXT.ja
%files libs -f ruby-libs.files %files libs -f ruby-libs.files
%defattr(-, root, root) %defattr(-, root, root)
%doc %{name}-%{version}/README %doc %{name}-%{rubyver}%{?patchlevel}/README
%lang(ja) %doc %{name}-%{version}/README.ja %lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja
%doc %{name}-%{version}/COPYING* %doc %{name}-%{rubyver}%{?patchlevel}/COPYING*
%doc %{name}-%{version}/ChangeLog %doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog
%doc %{name}-%{version}/LEGAL %doc %{name}-%{rubyver}%{?patchlevel}/LEGAL
%dir %{_libdir}/ruby %dir %{_libdir}/ruby
%dir %{_prefix}/lib/ruby %dir %{_prefix}/lib/ruby
%dir %{_libdir}/ruby/%{rubyxver} %dir %{_libdir}/ruby/%{rubyxver}
@ -456,11 +458,14 @@ rm -rf tmp-ruby-docs
%ifnarch ppc64 %ifnarch ppc64
%files mode -f ruby-mode.files %files mode -f ruby-mode.files
%defattr(-, root, root) %defattr(-, root, root)
%doc %{name}-%{version}/misc/README %doc %{name}-%{rubyver}%{?patchlevel}/misc/README
%dir %{_datadir}/emacs/site-lisp/ruby-mode %dir %{_datadir}/emacs/site-lisp/ruby-mode
%endif %endif
%changelog %changelog
* Mon Dec 11 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.5.2-1
- security fix release.
* Fri Oct 27 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.5-4 * Fri Oct 27 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.5-4
- security fix release. - security fix release.
- ruby-1.8.5-cgi-CVE-2006-5467.patch: fix a CGI multipart parsing bug that - ruby-1.8.5-cgi-CVE-2006-5467.patch: fix a CGI multipart parsing bug that

2
sources
View File

@ -2,4 +2,4 @@
d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz
7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2 7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2
8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2 8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2
3fbb02294a8ca33d4684055adba5ed6f ruby-1.8.5.tar.gz a3517a224716f79b14196adda3e88057 ruby-1.8.5-p2.tar.gz