From 6879b1363a8ef5ca9e6236f19bb6e5d00dcc71c0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 09:37:42 +0000 Subject: [PATCH 01/11] Initialize branch F-7 for ruby --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From af3cac47ab7e9eea5ec630dd1b559df39889677d Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 20 Jun 2007 13:19:22 +0000 Subject: [PATCH 02/11] - New upstream release. - Fix Etc::getgrgid to get the correct gid as requested. (#236647) --- .cvsignore | 1 + ruby.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2de721d..2239a68 100644 --- a/.cvsignore +++ b/.cvsignore @@ -13,3 +13,4 @@ ruby-1.8.5.tar.gz ruby-1.8.5-p2.tar.gz ruby-1.8.5-p12.tar.gz ruby-1.8.6.tar.bz2 +ruby-1.8.6-p36.tar.bz2 diff --git a/ruby.spec b/ruby.spec index 155dd9d..72c5a4b 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,7 +1,7 @@ %define manver 1.4.6 %define rubyxver 1.8 %define rubyver 1.8.6 -#%%define _patchlevel 12 +%define _patchlevel 36 %define dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %define patchlevel %{?_patchlevel:-p%{_patchlevel}} %define sitedir %{_libdir}/ruby/site_ruby @@ -11,7 +11,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Ruby License/GPL - see COPYING URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -469,6 +469,10 @@ rm -rf tmp-ruby-docs %endif %changelog +* Thu Jul 20 2007 Akira TAGOH - 1.8.6.36-1 +- New upstream release. + - Fix Etc::getgrgid to get the correct gid as requested. (#236647) + * Wed Mar 28 2007 Akira TAGOH - 1.8.6-2 - Fix search path breakage. (#234029) diff --git a/sources b/sources index 6037925..96dd4cd 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz 7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2 8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2 -e558a0e00ae318d43bf6ff9af452bad2 ruby-1.8.6.tar.bz2 +eb7f25818cb6993839b38d1f21bd4ea1 ruby-1.8.6-p36.tar.bz2 From 92b1e7511ff5779190c24c789023aa8540821b5d Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 20 Jun 2007 14:19:36 +0000 Subject: [PATCH 03/11] doh. typo --- ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 72c5a4b..c7e0767 100644 --- a/ruby.spec +++ b/ruby.spec @@ -469,7 +469,7 @@ rm -rf tmp-ruby-docs %endif %changelog -* Thu Jul 20 2007 Akira TAGOH - 1.8.6.36-1 +* Wed Jul 20 2007 Akira TAGOH - 1.8.6.36-1 - New upstream release. - Fix Etc::getgrgid to get the correct gid as requested. (#236647) From d1003a04b7b70cba7ff1245f728c2b2059dd88c9 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 20 Jun 2007 14:21:04 +0000 Subject: [PATCH 04/11] *** empty log message *** --- ruby.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby.spec b/ruby.spec index c7e0767..bc87254 100644 --- a/ruby.spec +++ b/ruby.spec @@ -11,7 +11,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Ruby License/GPL - see COPYING URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -469,7 +469,7 @@ rm -rf tmp-ruby-docs %endif %changelog -* Wed Jul 20 2007 Akira TAGOH - 1.8.6.36-1 +* Wed Jul 20 2007 Akira TAGOH - 1.8.6.36-2 - New upstream release. - Fix Etc::getgrgid to get the correct gid as requested. (#236647) From 723b61b84f6e450708148360c11ee32a0c40bf7e Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 25 Jun 2007 03:49:13 +0000 Subject: [PATCH 05/11] - ruby-r12567.patch: backport patch from upstream svn to get rid of the unnecessary declarations. (#245446) --- ruby-r12567.patch | 30 ++++++++++++++++++++++++++++++ ruby.spec | 8 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 ruby-r12567.patch diff --git a/ruby-r12567.patch b/ruby-r12567.patch new file mode 100644 index 0000000..0a15fc9 --- /dev/null +++ b/ruby-r12567.patch @@ -0,0 +1,30 @@ +Mon Jun 18 11:29:49 2007 Nobuyoshi Nakada + + * intern.h, ext/thread/thread.c: moved prototype of rb_thread_status() + to get rid of error in C++. [ruby-list:43615] + +Index: intern.h +=================================================================== +--- intern.h (リビジョン 12566) ++++ intern.h (リビジョン 12567) +@@ -204,7 +204,6 @@ + void rb_thread_polling _((void)); + void rb_thread_sleep _((int)); + void rb_thread_sleep_forever _((void)); +-enum rb_thread_status rb_thread_status _((VALUE)); + VALUE rb_thread_stop _((void)); + VALUE rb_thread_wakeup _((VALUE)); + VALUE rb_thread_wakeup_alive _((VALUE)); +Index: ext/thread/thread.c +=================================================================== +--- ext/thread/thread.c (リビジョン 12566) ++++ ext/thread/thread.c (リビジョン 12567) +@@ -14,6 +14,8 @@ + #include + #include + ++enum rb_thread_status rb_thread_status _((VALUE)); ++ + static VALUE rb_cMutex; + static VALUE rb_cConditionVariable; + static VALUE rb_cQueue; diff --git a/ruby.spec b/ruby.spec index bc87254..56aaa09 100644 --- a/ruby.spec +++ b/ruby.spec @@ -11,7 +11,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 2%{?dist} +Release: 3%{?dist} License: Ruby License/GPL - see COPYING URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +36,7 @@ Patch20: ruby-rubyprefix.patch Patch21: ruby-deprecated-sitelib-search-path.patch Patch22: ruby-deprecated-search-path.patch Patch23: ruby-multilib.patch +Patch24: ruby-r12567.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -152,6 +153,7 @@ pushd %{name}-%{rubyver}%{?patchlevel} %patch22 -p1 %patch23 -p1 %endif +%patch24 -p0 popd %build @@ -469,6 +471,10 @@ rm -rf tmp-ruby-docs %endif %changelog +* Mon Jul 25 2007 Akira TAGOH - 1.8.6.36-3 +- ruby-r12567.patch: backport patch from upstream svn to get rid of + the unnecessary declarations. (#245446) + * Wed Jul 20 2007 Akira TAGOH - 1.8.6.36-2 - New upstream release. - Fix Etc::getgrgid to get the correct gid as requested. (#236647) From 1bc9eed0b551de877546a18cdfd411f6771d79cd Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 4 Oct 2007 14:09:49 +0000 Subject: [PATCH 06/11] - New upstream release. - ruby-r12567.patch: removed. - ruby-1.8.6-CVE-2007-5162.patch: security fix for Net::HTTP that is insufficient verification of SSL certificate. (#313791) --- .cvsignore | 1 + ruby-1.8.6-CVE-2007-5162.patch | 99 +++++++++++++++++++++++ ruby-deprecated-search-path.patch | 20 ++--- ruby-deprecated-sitelib-search-path.patch | 12 +-- ruby-r12567.patch | 30 ------- ruby.spec | 16 ++-- sources | 2 +- 7 files changed, 128 insertions(+), 52 deletions(-) create mode 100644 ruby-1.8.6-CVE-2007-5162.patch delete mode 100644 ruby-r12567.patch diff --git a/.cvsignore b/.cvsignore index 2239a68..99e711a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -14,3 +14,4 @@ ruby-1.8.5-p2.tar.gz ruby-1.8.5-p12.tar.gz ruby-1.8.6.tar.bz2 ruby-1.8.6-p36.tar.bz2 +ruby-1.8.6-p110.tar.bz2 diff --git a/ruby-1.8.6-CVE-2007-5162.patch b/ruby-1.8.6-CVE-2007-5162.patch new file mode 100644 index 0000000..d4e4d68 --- /dev/null +++ b/ruby-1.8.6-CVE-2007-5162.patch @@ -0,0 +1,99 @@ +diff -ruN ruby-1.8.6-p110.orig/ext/openssl/lib/openssl/ssl.rb ruby-1.8.6-p110/ext/openssl/lib/openssl/ssl.rb +--- ruby-1.8.6-p110.orig/ext/openssl/lib/openssl/ssl.rb 2007-02-13 08:01:19.000000000 +0900 ++++ ruby-1.8.6-p110/ext/openssl/lib/openssl/ssl.rb 2007-10-04 22:38:48.000000000 +0900 +@@ -88,7 +88,7 @@ + end + } + end +- raise SSLError, "hostname not match" ++ raise SSLError, "hostname not match with the server certificate" + end + end + +diff -ruN ruby-1.8.6-p110.orig/lib/net/http.rb ruby-1.8.6-p110/lib/net/http.rb +--- ruby-1.8.6-p110.orig/lib/net/http.rb 2007-02-13 08:01:19.000000000 +0900 ++++ ruby-1.8.6-p110/lib/net/http.rb 2007-10-04 22:41:34.000000000 +0900 +@@ -470,6 +470,7 @@ + @debug_output = nil + @use_ssl = false + @ssl_context = nil ++ @enable_post_connection_check = true + end + + def inspect +@@ -526,6 +527,9 @@ + false # redefined in net/https + end + ++ # specify enabling SSL server certificate and hostname checking. ++ attr_accessor :enable_post_connection_check ++ + # Opens TCP connection and HTTP session. + # + # When this method is called with block, gives a HTTP object +@@ -584,6 +588,14 @@ + HTTPResponse.read_new(@socket).value + end + s.connect ++ if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE ++ begin ++ s.post_connection_check(@address) ++ rescue OpenSSL::SSL::SSLError => ex ++ raise ex if @enable_post_connection_check ++ warn ex.message ++ end ++ end + end + on_connect + end +diff -ruN ruby-1.8.6-p110.orig/lib/open-uri.rb ruby-1.8.6-p110/lib/open-uri.rb +--- ruby-1.8.6-p110.orig/lib/open-uri.rb 2007-02-13 08:01:19.000000000 +0900 ++++ ruby-1.8.6-p110/lib/open-uri.rb 2007-10-04 22:42:18.000000000 +0900 +@@ -229,6 +229,7 @@ + if target.class == URI::HTTPS + require 'net/https' + http.use_ssl = true ++ http.enable_post_connection_check = true + http.verify_mode = OpenSSL::SSL::VERIFY_PEER + store = OpenSSL::X509::Store.new + store.set_default_paths +@@ -240,16 +241,6 @@ + + resp = nil + http.start { +- if target.class == URI::HTTPS +- # xxx: information hiding violation +- sock = http.instance_variable_get(:@socket) +- if sock.respond_to?(:io) +- sock = sock.io # 1.9 +- else +- sock = sock.instance_variable_get(:@socket) # 1.8 +- end +- sock.post_connection_check(target_host) +- end + req = Net::HTTP::Get.new(request_uri, header) + if options.include? :http_basic_authentication + user, pass = options[:http_basic_authentication] +diff -ruN ruby-1.8.6-p110.orig/version.h ruby-1.8.6-p110/version.h +--- ruby-1.8.6-p110.orig/version.h 2007-09-23 09:01:50.000000000 +0900 ++++ ruby-1.8.6-p110/version.h 2007-10-04 22:42:37.000000000 +0900 +@@ -1,15 +1,15 @@ + #define RUBY_VERSION "1.8.6" +-#define RUBY_RELEASE_DATE "2007-09-23" ++#define RUBY_RELEASE_DATE "2007-09-24" + #define RUBY_VERSION_CODE 186 +-#define RUBY_RELEASE_CODE 20070923 +-#define RUBY_PATCHLEVEL 110 ++#define RUBY_RELEASE_CODE 20070924 ++#define RUBY_PATCHLEVEL 111 + + #define RUBY_VERSION_MAJOR 1 + #define RUBY_VERSION_MINOR 8 + #define RUBY_VERSION_TEENY 6 + #define RUBY_RELEASE_YEAR 2007 + #define RUBY_RELEASE_MONTH 9 +-#define RUBY_RELEASE_DAY 23 ++#define RUBY_RELEASE_DAY 24 + + #ifdef RUBY_EXTERN + RUBY_EXTERN const char ruby_version[]; diff --git a/ruby-deprecated-search-path.patch b/ruby-deprecated-search-path.patch index 3b937b2..aead58e 100644 --- a/ruby-deprecated-search-path.patch +++ b/ruby-deprecated-search-path.patch @@ -24,28 +24,28 @@ diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c @@ -292,11 +292,17 @@ #endif - ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2)); + incpush(RUBY_RELATIVE(RUBY_SITE_LIB2)); +#ifdef RUBY_DEPRECATED_SITE_LIB -+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB2)); ++ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB2)); +#endif #ifdef RUBY_SITE_THIN_ARCHLIB - ruby_incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB)); #endif - ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB)); - ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB)); + incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_SITE_LIB)); +#ifdef RUBY_DEPRECATED_SITE_LIB -+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB)); ++ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB)); +#endif #ifdef RUBY_DEPRECATED_OLD_SITE_LIB2 - ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2)); + incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2)); #endif @@ -308,6 +314,9 @@ #endif - ruby_incpush(RUBY_RELATIVE(RUBY_LIB)); + incpush(RUBY_RELATIVE(RUBY_LIB)); +#ifdef RUBY_DEPRECATED_LIB -+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_LIB)); ++ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_LIB)); +#endif #ifdef RUBY_THIN_ARCHLIB - ruby_incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB)); #endif diff --git a/ruby-deprecated-sitelib-search-path.patch b/ruby-deprecated-sitelib-search-path.patch index ce5f2ab..5711727 100644 --- a/ruby-deprecated-sitelib-search-path.patch +++ b/ruby-deprecated-sitelib-search-path.patch @@ -23,17 +23,17 @@ diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c +++ ruby-1.8.4/ruby.c 2006-06-07 15:56:14.000000000 +0900 @@ -297,6 +297,15 @@ #endif - ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB)); - ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB)); + incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_SITE_LIB)); +#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2 -+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2)); ++ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2)); +#endif +#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB -+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB)); ++ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB)); +#endif +#ifdef RUBY_DEPRECATED_OLD_SITE_LIB -+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB)); ++ incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB)); +#endif - ruby_incpush(RUBY_RELATIVE(RUBY_LIB)); + incpush(RUBY_RELATIVE(RUBY_LIB)); #ifdef RUBY_THIN_ARCHLIB diff --git a/ruby-r12567.patch b/ruby-r12567.patch deleted file mode 100644 index 0a15fc9..0000000 --- a/ruby-r12567.patch +++ /dev/null @@ -1,30 +0,0 @@ -Mon Jun 18 11:29:49 2007 Nobuyoshi Nakada - - * intern.h, ext/thread/thread.c: moved prototype of rb_thread_status() - to get rid of error in C++. [ruby-list:43615] - -Index: intern.h -=================================================================== ---- intern.h (リビジョン 12566) -+++ intern.h (リビジョン 12567) -@@ -204,7 +204,6 @@ - void rb_thread_polling _((void)); - void rb_thread_sleep _((int)); - void rb_thread_sleep_forever _((void)); --enum rb_thread_status rb_thread_status _((VALUE)); - VALUE rb_thread_stop _((void)); - VALUE rb_thread_wakeup _((VALUE)); - VALUE rb_thread_wakeup_alive _((VALUE)); -Index: ext/thread/thread.c -=================================================================== ---- ext/thread/thread.c (リビジョン 12566) -+++ ext/thread/thread.c (リビジョン 12567) -@@ -14,6 +14,8 @@ - #include - #include - -+enum rb_thread_status rb_thread_status _((VALUE)); -+ - static VALUE rb_cMutex; - static VALUE rb_cConditionVariable; - static VALUE rb_cQueue; diff --git a/ruby.spec b/ruby.spec index 56aaa09..bcb94a6 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,7 +1,7 @@ %define manver 1.4.6 %define rubyxver 1.8 %define rubyver 1.8.6 -%define _patchlevel 36 +%define _patchlevel 110 %define dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %define patchlevel %{?_patchlevel:-p%{_patchlevel}} %define sitedir %{_libdir}/ruby/site_ruby @@ -11,8 +11,8 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 3%{?dist} -License: Ruby License/GPL - see COPYING +Release: 1%{?dist} +License: Ruby or GPL+ URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc @@ -36,7 +36,7 @@ Patch20: ruby-rubyprefix.patch Patch21: ruby-deprecated-sitelib-search-path.patch Patch22: ruby-deprecated-search-path.patch Patch23: ruby-multilib.patch -Patch24: ruby-r12567.patch +Patch24: ruby-1.8.6-CVE-2007-5162.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -153,7 +153,7 @@ pushd %{name}-%{rubyver}%{?patchlevel} %patch22 -p1 %patch23 -p1 %endif -%patch24 -p0 +%patch24 -p1 popd %build @@ -471,6 +471,12 @@ rm -rf tmp-ruby-docs %endif %changelog +* Thu Oct 4 2007 Akira TAGOH - 1.8.6.110-1 +- New upstream release. + - ruby-r12567.patch: removed. +- ruby-1.8.6-CVE-2007-5162.patch: security fix for Net::HTTP that is + insufficient verification of SSL certificate. (#313791) + * Mon Jul 25 2007 Akira TAGOH - 1.8.6.36-3 - ruby-r12567.patch: backport patch from upstream svn to get rid of the unnecessary declarations. (#245446) diff --git a/sources b/sources index 96dd4cd..2e7c5e8 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz 7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2 8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2 -eb7f25818cb6993839b38d1f21bd4ea1 ruby-1.8.6-p36.tar.bz2 +39cbf0cc610e636983cb3311bef3f2d0 ruby-1.8.6-p110.tar.bz2 From aea82d76687a4cd8367cdfff4dd16861bb348105 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 15 Oct 2007 11:55:29 +0000 Subject: [PATCH 07/11] - Enable pthread support for ppc too. (#201452) - Fix unexpected dependencies appears in ruby-libs. (#253325) --- ruby.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruby.spec b/ruby.spec index bcb94a6..b1d5f1a 100644 --- a/ruby.spec +++ b/ruby.spec @@ -11,7 +11,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 1%{?dist} +Release: 2%{?dist} License: Ruby or GPL+ URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -175,11 +175,7 @@ export CFLAGS --with-bundled-rmd160 \ --enable-shared \ --enable-ipv6 \ -%ifarch ppc - --disable-pthread \ -%else --enable-pthread \ -%endif --with-lookup-order-hack=INET \ --disable-rpath \ --with-ruby-prefix=%{_prefix}/lib @@ -471,6 +467,10 @@ rm -rf tmp-ruby-docs %endif %changelog +* Mon Oct 15 2007 Akira TAGOH - 1.8.6.110-2 +- Enable pthread support for ppc too. (#201452) +- Fix unexpected dependencies appears in ruby-libs. (#253325) + * Thu Oct 4 2007 Akira TAGOH - 1.8.6.110-1 - New upstream release. - ruby-r12567.patch: removed. From 6e38a4a662617f1d2192a14d75bb64fcfa1d72e9 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 29 Oct 2007 13:08:37 +0000 Subject: [PATCH 08/11] - New upstream release. - ruby-1.8.6.111-CVE-2007-5162.patch: Update a bit with backporting the changes at trunk to enable the fix without any modifications on the users' scripts. Note that Net::HTTP#enable_post_connection_check isn't available anymore. If you want to disable this post-check, you should give OpenSSL::SSL::VERIFY_NONE to Net::HTTP#verify_mode= instead of. --- .cvsignore | 1 + ruby-1.8.6-CVE-2007-5162.patch | 99 ------------------------------ ruby-1.8.6.111-CVE-2007-5162.patch | 97 +++++++++++++++++++++++++++++ ruby.spec | 28 ++++++--- sources | 2 +- 5 files changed, 118 insertions(+), 109 deletions(-) delete mode 100644 ruby-1.8.6-CVE-2007-5162.patch create mode 100644 ruby-1.8.6.111-CVE-2007-5162.patch diff --git a/.cvsignore b/.cvsignore index 99e711a..f855092 100644 --- a/.cvsignore +++ b/.cvsignore @@ -15,3 +15,4 @@ ruby-1.8.5-p12.tar.gz ruby-1.8.6.tar.bz2 ruby-1.8.6-p36.tar.bz2 ruby-1.8.6-p110.tar.bz2 +ruby-1.8.6-p111.tar.bz2 diff --git a/ruby-1.8.6-CVE-2007-5162.patch b/ruby-1.8.6-CVE-2007-5162.patch deleted file mode 100644 index d4e4d68..0000000 --- a/ruby-1.8.6-CVE-2007-5162.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -ruN ruby-1.8.6-p110.orig/ext/openssl/lib/openssl/ssl.rb ruby-1.8.6-p110/ext/openssl/lib/openssl/ssl.rb ---- ruby-1.8.6-p110.orig/ext/openssl/lib/openssl/ssl.rb 2007-02-13 08:01:19.000000000 +0900 -+++ ruby-1.8.6-p110/ext/openssl/lib/openssl/ssl.rb 2007-10-04 22:38:48.000000000 +0900 -@@ -88,7 +88,7 @@ - end - } - end -- raise SSLError, "hostname not match" -+ raise SSLError, "hostname not match with the server certificate" - end - end - -diff -ruN ruby-1.8.6-p110.orig/lib/net/http.rb ruby-1.8.6-p110/lib/net/http.rb ---- ruby-1.8.6-p110.orig/lib/net/http.rb 2007-02-13 08:01:19.000000000 +0900 -+++ ruby-1.8.6-p110/lib/net/http.rb 2007-10-04 22:41:34.000000000 +0900 -@@ -470,6 +470,7 @@ - @debug_output = nil - @use_ssl = false - @ssl_context = nil -+ @enable_post_connection_check = true - end - - def inspect -@@ -526,6 +527,9 @@ - false # redefined in net/https - end - -+ # specify enabling SSL server certificate and hostname checking. -+ attr_accessor :enable_post_connection_check -+ - # Opens TCP connection and HTTP session. - # - # When this method is called with block, gives a HTTP object -@@ -584,6 +588,14 @@ - HTTPResponse.read_new(@socket).value - end - s.connect -+ if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE -+ begin -+ s.post_connection_check(@address) -+ rescue OpenSSL::SSL::SSLError => ex -+ raise ex if @enable_post_connection_check -+ warn ex.message -+ end -+ end - end - on_connect - end -diff -ruN ruby-1.8.6-p110.orig/lib/open-uri.rb ruby-1.8.6-p110/lib/open-uri.rb ---- ruby-1.8.6-p110.orig/lib/open-uri.rb 2007-02-13 08:01:19.000000000 +0900 -+++ ruby-1.8.6-p110/lib/open-uri.rb 2007-10-04 22:42:18.000000000 +0900 -@@ -229,6 +229,7 @@ - if target.class == URI::HTTPS - require 'net/https' - http.use_ssl = true -+ http.enable_post_connection_check = true - http.verify_mode = OpenSSL::SSL::VERIFY_PEER - store = OpenSSL::X509::Store.new - store.set_default_paths -@@ -240,16 +241,6 @@ - - resp = nil - http.start { -- if target.class == URI::HTTPS -- # xxx: information hiding violation -- sock = http.instance_variable_get(:@socket) -- if sock.respond_to?(:io) -- sock = sock.io # 1.9 -- else -- sock = sock.instance_variable_get(:@socket) # 1.8 -- end -- sock.post_connection_check(target_host) -- end - req = Net::HTTP::Get.new(request_uri, header) - if options.include? :http_basic_authentication - user, pass = options[:http_basic_authentication] -diff -ruN ruby-1.8.6-p110.orig/version.h ruby-1.8.6-p110/version.h ---- ruby-1.8.6-p110.orig/version.h 2007-09-23 09:01:50.000000000 +0900 -+++ ruby-1.8.6-p110/version.h 2007-10-04 22:42:37.000000000 +0900 -@@ -1,15 +1,15 @@ - #define RUBY_VERSION "1.8.6" --#define RUBY_RELEASE_DATE "2007-09-23" -+#define RUBY_RELEASE_DATE "2007-09-24" - #define RUBY_VERSION_CODE 186 --#define RUBY_RELEASE_CODE 20070923 --#define RUBY_PATCHLEVEL 110 -+#define RUBY_RELEASE_CODE 20070924 -+#define RUBY_PATCHLEVEL 111 - - #define RUBY_VERSION_MAJOR 1 - #define RUBY_VERSION_MINOR 8 - #define RUBY_VERSION_TEENY 6 - #define RUBY_RELEASE_YEAR 2007 - #define RUBY_RELEASE_MONTH 9 --#define RUBY_RELEASE_DAY 23 -+#define RUBY_RELEASE_DAY 24 - - #ifdef RUBY_EXTERN - RUBY_EXTERN const char ruby_version[]; diff --git a/ruby-1.8.6.111-CVE-2007-5162.patch b/ruby-1.8.6.111-CVE-2007-5162.patch new file mode 100644 index 0000000..5ed628d --- /dev/null +++ b/ruby-1.8.6.111-CVE-2007-5162.patch @@ -0,0 +1,97 @@ +diff -pruN ruby-1.8.6-p111.orig/ext/openssl/lib/net/ftptls.rb ruby-1.8.6-p111/ext/openssl/lib/net/ftptls.rb +--- ruby-1.8.6-p111.orig/ext/openssl/lib/net/ftptls.rb 2007-02-13 08:01:19.000000000 +0900 ++++ ruby-1.8.6-p111/ext/openssl/lib/net/ftptls.rb 2007-10-29 21:10:24.000000000 +0900 +@@ -29,13 +29,23 @@ require 'net/ftp' + + module Net + class FTPTLS < FTP ++ def connect(host, port=FTP_PORT) ++ @hostname = host ++ super ++ end ++ + def login(user = "anonymous", passwd = nil, acct = nil) ++ store = OpenSSL::X509::Store.new ++ store.set_default_paths + ctx = OpenSSL::SSL::SSLContext.new('SSLv23') ++ ctx.cert_store = store ++ ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER + ctx.key = nil + ctx.cert = nil + voidcmd("AUTH TLS") + @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx) + @sock.connect ++ @sock.post_connection_check(@hostname) + super(user, passwd, acct) + voidcmd("PBSZ 0") + end +diff -pruN ruby-1.8.6-p111.orig/ext/openssl/lib/net/telnets.rb ruby-1.8.6-p111/ext/openssl/lib/net/telnets.rb +--- ruby-1.8.6-p111.orig/ext/openssl/lib/net/telnets.rb 2007-02-13 08:01:19.000000000 +0900 ++++ ruby-1.8.6-p111/ext/openssl/lib/net/telnets.rb 2007-10-29 21:13:03.000000000 +0900 +@@ -134,6 +134,9 @@ module Net + @sock.verify_callback = @options['VerifyCallback'] + @sock.verify_depth = @options['VerifyDepth'] + @sock.connect ++ if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE ++ @sock.post_connection_check(@options['Host']) ++ end + @ssl = true + end + '' +diff -pruN ruby-1.8.6-p111.orig/lib/net/http.rb ruby-1.8.6-p111/lib/net/http.rb +--- ruby-1.8.6-p111.orig/lib/net/http.rb 2007-09-24 17:12:24.000000000 +0900 ++++ ruby-1.8.6-p111/lib/net/http.rb 2007-10-29 21:12:12.000000000 +0900 +@@ -470,7 +470,6 @@ module Net #:nodoc: + @debug_output = nil + @use_ssl = false + @ssl_context = nil +- @enable_post_connection_check = false + end + + def inspect +@@ -527,9 +526,6 @@ module Net #:nodoc: + false # redefined in net/https + end + +- # specify enabling SSL server certificate and hostname checking. +- attr_accessor :enable_post_connection_check +- + # Opens TCP connection and HTTP session. + # + # When this method is called with block, gives a HTTP object +@@ -589,12 +585,7 @@ module Net #:nodoc: + end + s.connect + if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE +- begin +- s.post_connection_check(@address) +- rescue OpenSSL::SSL::SSLError => ex +- raise ex if @enable_post_connection_check +- warn ex.message +- end ++ s.post_connection_check(@address) + end + end + on_connect +diff -pruN ruby-1.8.6-p111.orig/lib/net/imap.rb ruby-1.8.6-p111/lib/net/imap.rb +--- ruby-1.8.6-p111.orig/lib/net/imap.rb 2007-08-22 08:28:09.000000000 +0900 ++++ ruby-1.8.6-p111/lib/net/imap.rb 2007-10-29 21:14:38.000000000 +0900 +@@ -900,6 +900,7 @@ module Net + end + @sock = SSLSocket.new(@sock, context) + @sock.connect # start ssl session. ++ @sock.post_connection_check(@host) if verify + else + @usessl = false + end +diff -pruN ruby-1.8.6-p111.orig/lib/open-uri.rb ruby-1.8.6-p111/lib/open-uri.rb +--- ruby-1.8.6-p111.orig/lib/open-uri.rb 2007-09-24 17:12:24.000000000 +0900 ++++ ruby-1.8.6-p111/lib/open-uri.rb 2007-10-29 21:16:03.000000000 +0900 +@@ -229,7 +229,6 @@ module OpenURI + if target.class == URI::HTTPS + require 'net/https' + http.use_ssl = true +- http.enable_post_connection_check = true + http.verify_mode = OpenSSL::SSL::VERIFY_PEER + store = OpenSSL::X509::Store.new + store.set_default_paths diff --git a/ruby.spec b/ruby.spec index b1d5f1a..f9e8ae8 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,7 +1,7 @@ %define manver 1.4.6 %define rubyxver 1.8 %define rubyver 1.8.6 -%define _patchlevel 110 +%define _patchlevel 111 %define dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %define patchlevel %{?_patchlevel:-p%{_patchlevel}} %define sitedir %{_libdir}/ruby/site_ruby @@ -11,7 +11,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 2%{?dist} +Release: 1%{?dist} License: Ruby or GPL+ URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,7 +36,7 @@ Patch20: ruby-rubyprefix.patch Patch21: ruby-deprecated-sitelib-search-path.patch Patch22: ruby-deprecated-search-path.patch Patch23: ruby-multilib.patch -Patch24: ruby-1.8.6-CVE-2007-5162.patch +Patch24: ruby-1.8.6.111-CVE-2007-5162.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -180,10 +180,6 @@ export CFLAGS --disable-rpath \ --with-ruby-prefix=%{_prefix}/lib -%ifarch ppc -cp Makefile Makefile.orig -sed -e 's/^EXTMK_ARGS[[:space:]].*=\(.*\) --$/EXTMK_ARGS=\1 --disable-tcl-thread --/' Makefile.orig > Makefile -%endif make RUBY_INSTALL_NAME=ruby %{?_smp_mflags} %ifarch ia64 # Miscompilation? Buggy code? @@ -467,15 +463,29 @@ rm -rf tmp-ruby-docs %endif %changelog +* Mon Oct 29 2007 Akira TAGOH - 1.8.6.111-1 +- New upstream release. +- ruby-1.8.6.111-CVE-2007-5162.patch: Update a bit with backporting the changes + at trunk to enable the fix without any modifications on the users' scripts. + Note that Net::HTTP#enable_post_connection_check isn't available anymore. + If you want to disable this post-check, you should give OpenSSL::SSL::VERIFY_NONE + to Net::HTTP#verify_mode= instead of. + * Mon Oct 15 2007 Akira TAGOH - 1.8.6.110-2 - Enable pthread support for ppc too. (#201452) - Fix unexpected dependencies appears in ruby-libs. (#253325) -* Thu Oct 4 2007 Akira TAGOH - 1.8.6.110-1 +* Wed Oct 10 2007 Akira TAGOH - 1.8.6.110-1 - New upstream release. - ruby-r12567.patch: removed. - ruby-1.8.6-CVE-2007-5162.patch: security fix for Net::HTTP that is - insufficient verification of SSL certificate. (#313791) + insufficient verification of SSL certificate. + +* Thu Aug 23 2007 Akira TAGOH - 1.8.6.36-4 +- Rebuild + +* Fri Aug 10 2007 Akira TAGOH +- Update License tag. * Mon Jul 25 2007 Akira TAGOH - 1.8.6.36-3 - ruby-r12567.patch: backport patch from upstream svn to get rid of diff --git a/sources b/sources index 2e7c5e8..840df49 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz 7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2 8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2 -39cbf0cc610e636983cb3311bef3f2d0 ruby-1.8.6-p110.tar.bz2 +e1d38b7d4f1be55726d6927a3395ce3b ruby-1.8.6-p111.tar.bz2 From 560624320bd5e23dab00832dd5e9482c5b192462 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 10 Mar 2008 07:42:02 +0000 Subject: [PATCH 09/11] - Security fix for CVE-2008-1145. - Improve a spec file. (#226381) - Correct License tag. - Fix a timestamp issue. - Own a arch-specific directory. --- ruby.spec | 418 +++++++++++++++++++++++++++++++++--------------------- sources | 6 +- 2 files changed, 256 insertions(+), 168 deletions(-) diff --git a/ruby.spec b/ruby.spec index f9e8ae8..4d0e325 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,18 +1,19 @@ -%define manver 1.4.6 %define rubyxver 1.8 %define rubyver 1.8.6 -%define _patchlevel 111 +%define _patchlevel 114 %define dotpatchlevel %{?_patchlevel:.%{_patchlevel}} %define patchlevel %{?_patchlevel:-p%{_patchlevel}} +%define arcver %{rubyver}%{?patchlevel} %define sitedir %{_libdir}/ruby/site_ruby # This is required to ensure that noarch files puts under /usr/lib/... for # multilib because ruby library is installed under /usr/{lib,lib64}/ruby anyway. %define sitedir2 %{_prefix}/lib/ruby/site_ruby +%define _normalized_cpu %(echo `echo %{_target_cpu} | sed 's/^ppc/powerpc/'`) Name: ruby Version: %{rubyver}%{?dotpatchlevel} Release: 1%{?dist} -License: Ruby or GPL+ +License: Ruby or GPLv2 URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl-devel tk-devel libX11-devel autoconf gcc unzip openssl-devel db4-devel byacc @@ -20,15 +21,13 @@ BuildRequires: readline readline-devel ncurses ncurses-devel gdbm gdbm-devel gli BuildRequires: emacs %endif -Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{rubyver}%{?patchlevel}.tar.bz2 -##Source1: ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz -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 -##Source3: ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-990927.tar.gz -Source3: rubyfaq-990927.tar.bz2 -##Source4: ftp://ftp.ruby-lang.org/pub/%{name}/doc/rubyfaq-jp-990927.tar.gz -Source4: rubyfaq-jp-990927.tar.bz2 -Source5: irb.1 +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 +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 Source10: ruby-mode-init.el Patch1: ruby-deadcode.patch @@ -37,6 +36,7 @@ Patch21: ruby-deprecated-sitelib-search-path.patch Patch22: ruby-deprecated-search-path.patch Patch23: ruby-multilib.patch Patch24: ruby-1.8.6.111-CVE-2007-5162.patch +Patch25: ruby-1.8.6.111-gcc43.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -64,6 +64,7 @@ This package includes the libruby, necessary to run Ruby. Summary: A Ruby development environment Group: Development/Languages Requires: %{name}-libs = %{version}-%{release} +Provides: %{name}-libs-static = %{version}-%{release} %description devel Header files and libraries for building a extension library for the @@ -94,7 +95,8 @@ from the terminal. %package rdoc Summary: A tool to generate documentation from Ruby source files Group: Development/Languages -Requires: %{name} = %{version}-%{release} +## ruby-irb requires ruby +#Requires: %{name} = %{version}-%{release} Requires: %{name}-irb = %{version}-%{release} Provides: rdoc = %{version}-%{release} Obsoletes: rdoc <= %{version}-%{release} @@ -127,7 +129,8 @@ Emacs Lisp ruby-mode for the object-oriented scripting language Ruby. %package ri Summary: Ruby interactive reference Group: Documentation -Requires: %{name} = %{version}-%{release} +## ruby-irb requires ruby, which ruby-rdoc requires +#Requires: %{name} = %{version}-%{release} Requires: %{name}-rdoc = %{version}-%{release} Provides: ri = %{version}-%{release} Obsoletes: ri <= %{version}-%{release} @@ -140,12 +143,12 @@ along with a list of the methods the class or module implements. %prep -%setup -q -c -a 1 -a 3 -a 4 +%setup -q -c -a 2 -a 3 mkdir -p ruby-refm-ja pushd ruby-refm-ja -tar fxz %{SOURCE2} +tar fxz %{SOURCE1} popd -pushd %{name}-%{rubyver}%{?patchlevel} +pushd %{name}-%{arcver} %patch1 -p1 %patch20 -p1 %patch21 -p1 @@ -154,10 +157,11 @@ pushd %{name}-%{rubyver}%{?patchlevel} %patch23 -p1 %endif %patch24 -p1 +%patch25 -p1 popd %build -pushd %{name}-%{rubyver}%{?patchlevel} +pushd %{name}-%{arcver} for i in config.sub config.guess; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . done @@ -180,7 +184,7 @@ export CFLAGS --disable-rpath \ --with-ruby-prefix=%{_prefix}/lib -make RUBY_INSTALL_NAME=ruby %{?_smp_mflags} +make RUBY_INSTALL_NAME=ruby %{?_smp_mflags} COPY="cp -p" %{?_smp_mflags} %ifarch ia64 # Miscompilation? Buggy code? rm -f parse.o @@ -190,7 +194,7 @@ make OPT=-O0 RUBY_INSTALL_NAME=ruby %{?_smp_mflags} popd %check -pushd %{name}-%{rubyver}%{?patchlevel} +pushd %{name}-%{arcver} %ifnarch ppc64 make test %endif @@ -200,32 +204,31 @@ popd rm -rf $RPM_BUILD_ROOT %ifnarch ppc64 -%{__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%{_libdir}/xemacs/xemacs-packages/lisp/ruby-mode -#%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xemacs/xemacs-packages/lisp/site-start.d +mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode +mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d %endif # installing documents and exapmles... +rm -rf tmp-ruby-docs mkdir tmp-ruby-docs cd tmp-ruby-docs # for ruby.rpm mkdir ruby ruby-libs ruby-devel ruby-tcltk ruby-docs irb cd ruby -(cd ../../%{name}-%{rubyver}%{?patchlevel} && tar cf - sample) | tar xvf - +(cd ../../%{name}-%{arcver} && tar cf - sample) | tar xvf - cd .. # for ruby-libs cd ruby-libs -(cd ../../%{name}-%{rubyver}%{?patchlevel} && tar cf - lib/README*) | tar xvf - -(cd ../../%{name}-%{rubyver}%{?patchlevel}/doc && tar cf - .) | tar xvf - -(cd ../../%{name}-%{rubyver}%{?patchlevel} && +(cd ../../%{name}-%{arcver} && tar cf - lib/README*) | tar xf - +(cd ../../%{name}-%{arcver}/doc && tar cf - .) | tar xf - +(cd ../../%{name}-%{arcver} && tar cf - `find ext \ -mindepth 1 \ \( -path '*/sample/*' -o -path '*/demo/*' \) -o \ \( -name '*.rb' -not -path '*/lib/*' -not -name extconf.rb \) -o \ - \( -name 'README*' -o -name '*.txt*' -o -name 'MANUAL*' \)`) | tar xvf - + \( -name 'README*' -o -name '*.txt*' -o -name 'MANUAL*' \)`) | tar xf - cd .. # for irb @@ -244,7 +247,7 @@ cd ruby-tcltk for target in tcltklib tk do (cd ../ruby-libs && - tar cf - `find . -path "*/$target/*"`) | tar xvf - + tar cf - `find . -path "*/$target/*"`) | tar xf - (cd ../ruby-libs && rm -rf `find . -name "$target" -type d`) done @@ -252,11 +255,10 @@ cd .. # for ruby-docs cd ruby-docs -mkdir doc-en refm-ja faq-en faq-ja -(cd ../../ruby-man-`echo %{manver} | sed -e 's/\.[0-9]*$//'` && tar cf - .) | (cd doc-en && tar xvf -) -(cd ../../ruby-refm-ja && tar cf - .) | (cd refm-ja && tar xvf -) -(cd ../../rubyfaq && tar cf - .) | (cd faq-en && tar xvf -) -(cd ../../rubyfaq-jp && tar cf - .) | (cd faq-ja && tar xvf -) +mkdir refm-ja faq-en faq-ja +(cd ../../ruby-refm-ja && tar cf - .) | (cd refm-ja && tar xf -) +(cd ../../rubyfaq && tar cf - .) | (cd faq-en && tar xf -) +(cd ../../rubyfaq-jp && tar cf - .) | (cd faq-ja && tar xf -) (cd faq-ja && for f in rubyfaq-jp*.html @@ -265,15 +267,12 @@ mkdir doc-en refm-ja faq-en faq-ja < $f > `echo $f | sed -e's/-jp//'` rm -f $f; \ done) -# make sure that all doc files are the world-readable -find -type f | xargs chmod 0644 - cd .. # fixing `#!' paths for f in `find . -type f` do - sed -e 's,^#![ ]*\([^ ]*\)/\(ruby\|with\|perl\|env\),#!/usr/bin/\2,' < $f > $f.n + sed -e 's,^#![ ]*\([^ ]*\)/\(ruby\|wish\|perl\|env\),#!/usr/bin/\2,' < $f > $f.n if ! cmp $f $f.n then mv -f $f.n $f @@ -282,35 +281,39 @@ do fi done +# make sure that all doc files are the world-readable +find -type f | xargs chmod 0644 + +# convert to utf-8 +for i in `find -type f`; do + 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 +done + # done cd .. # installing binaries ... -make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{rubyver}%{?patchlevel} DESTDIR=$RPM_BUILD_ROOT install - -_cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'` +make -C $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{arcver} DESTDIR=$RPM_BUILD_ROOT install # generate ri doc -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 -#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 +rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{arcver} +rm -rf %{name}-%{arcver}/.ext/rdoc +LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} RUBYLIB=$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}:$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/%{_normalized_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}/%{_normalized_cpu}-%{_target_os}/ -I $rubybuilddir/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $rubybuilddir -%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver} -%{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os} - -%ifarch ppc64 s390x sparc64 x86_64 -# correct archdir -#mv $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os}/* $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -#rmdir $RPM_BUILD_ROOT%{_prefix}/lib/ruby/%{rubyxver}/$_cpu-%{_target_os} -%endif +mkdir -p $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver} +mkdir -p $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/%{_normalized_cpu}-%{_target_os} # XXX: installing irb -install -m 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/ +install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/ %ifnarch ppc64 # installing ruby-mode -cd %{name}-%{rubyver}%{?patchlevel} -cp misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode +cd %{name}-%{arcver} +cp -p misc/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode ## for ruby-mode pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ruby-mode @@ -320,149 +323,234 @@ EOF emacs --no-site-file -q -batch -l path.el -f batch-byte-compile *.el rm -f path.el* popd -install -m 644 %{SOURCE10} \ +install -p -m 644 %{SOURCE10} \ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d cd .. %endif -# listing all files in ruby-all.files -(find $RPM_BUILD_ROOT -type f -o -type l) | - sort | uniq | sed -e "s,^$RPM_BUILD_ROOT,," \ - -e "s,\(/man/man./.*\)$,\1*," > ruby-all.files -egrep '(\.[ah]|libruby\.so)$' ruby-all.files > ruby-devel.files - -_rubytmpfile=`mktemp -t %{name}-%{version}-%{release}-tmp-%(%{__id_u -n}).XXXXXXXXXX` -# for ruby-tcltk.rpm -cp /dev/null ruby-tcltk.files -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 - egrep "tcl|tk" ruby-all.files | grep "/`basename $f`$" >> ruby-tcltk.files || : +# remove shebang +for i in $RPM_BUILD_ROOT%{_prefix}/lib/ruby/1.8/{abbrev,generator,irb/{cmd/subirb,ext/save-history},matrix,rdoc/{markup/sample/rdoc2latex,parsers/parse_rb},set,tsort}.rb; do + sed -i -e '/^#!.*/,1D' $i done -sort ruby-tcltk.files | uniq - $_rubytmpfile && mv $_rubytmpfile ruby-tcltk.files - -# for irb.rpm -fgrep 'irb' ruby-all.files > irb.files - -# for ri -cp /dev/null ri.files -fgrep '%{_datadir}/ri' ruby-all.files >> ri.files -fgrep '%{_bindir}/ri' ruby-all.files >> ri.files - -# for rdoc -cp /dev/null rdoc.files -fgrep rdoc ruby-all.files >> rdoc.files - -# for ruby-libs -cp /dev/null ruby-libs.files -(fgrep '%{_prefix}/lib' ruby-all.files; - fgrep -h '%{_prefix}/lib' ruby-devel.files ruby-tcltk.files irb.files ri.files rdoc.files) | egrep -v "elc?$" | \ - sort | uniq -u > ruby-libs.files - -%ifnarch ppc64 -# for ruby-mode -cp /dev/null ruby-mode.files -fgrep '.el' ruby-all.files >> ruby-mode.files -%else -touch ruby-mode.files -%endif - -# for ruby.rpm -sort ruby-all.files \ - ruby-libs.files ruby-devel.files ruby-tcltk.files irb.files ruby-mode.files ri.files rdoc.files | - uniq -u > ruby.files - -# for arch-dependent dir -rbconfig=`find $RPM_BUILD_ROOT -name rbconfig.rb` -export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} -arch=`$RPM_BUILD_ROOT%{_bindir}/ruby -r $rbconfig -e 'printf ("%s\n", Config::CONFIG["arch"])'` -cat <<__EOF__ >> ruby-libs.files -%%dir %%{_libdir}/ruby/%%{rubyxver}/$arch -%%dir %%{_libdir}/ruby/%%{rubyxver}/$arch/digest -__EOF__ %clean rm -rf $RPM_BUILD_ROOT -rm -f *.files rm -rf tmp-ruby-docs %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%files -f ruby.files -%defattr(-, root, root) -%doc %{name}-%{rubyver}%{?patchlevel}/COPYING* -%doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog -%doc %{name}-%{rubyver}%{?patchlevel}/GPL -%doc %{name}-%{rubyver}%{?patchlevel}/LEGAL -%doc %{name}-%{rubyver}%{?patchlevel}/LGPL -%doc %{name}-%{rubyver}%{?patchlevel}/NEWS -%doc %{name}-%{rubyver}%{?patchlevel}/README -%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja -%doc %{name}-%{rubyver}%{?patchlevel}/ToDo -%doc %{name}-%{rubyver}%{?patchlevel}/doc/ChangeLog-1.8.0 -%doc %{name}-%{rubyver}%{?patchlevel}/doc/NEWS-1.8.0 +%files +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%doc %{name}-%{arcver}/LEGAL +%doc %{name}-%{arcver}/LGPL +%doc %{name}-%{arcver}/NEWS +%doc %{name}-%{arcver}/README +%lang(ja) %doc %{name}-%{arcver}/README.ja +%doc %{name}-%{arcver}/ToDo +%doc %{name}-%{arcver}/doc/ChangeLog-1.8.0 +%doc %{name}-%{arcver}/doc/NEWS-1.8.0 %doc tmp-ruby-docs/ruby/* +%{_bindir}/ruby +%{_bindir}/erb +%{_bindir}/testrb +%{_mandir}/man1/ruby.1* -%files devel -f ruby-devel.files -%defattr(-, root, root) -%doc %{name}-%{rubyver}%{?patchlevel}/README.EXT -%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.EXT.ja +%files devel +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%doc %{name}-%{arcver}/LEGAL +%doc %{name}-%{arcver}/LGPL +%doc %{name}-%{arcver}/README.EXT +%lang(ja) %doc %{name}-%{arcver}/README.EXT.ja +%{_libdir}/libruby.so +%{_libdir}/libruby-static.a +%{_libdir}/ruby/%{rubyxver}/*/*.h -%files libs -f ruby-libs.files -%defattr(-, root, root) -%doc %{name}-%{rubyver}%{?patchlevel}/README -%lang(ja) %doc %{name}-%{rubyver}%{?patchlevel}/README.ja -%doc %{name}-%{rubyver}%{?patchlevel}/COPYING* -%doc %{name}-%{rubyver}%{?patchlevel}/ChangeLog -%doc %{name}-%{rubyver}%{?patchlevel}/GPL -%doc %{name}-%{rubyver}%{?patchlevel}/LEGAL -%doc %{name}-%{rubyver}%{?patchlevel}/LGPL -%dir %{_libdir}/ruby +%files libs +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/README +%lang(ja) %doc %{name}-%{arcver}/README.ja +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%doc %{name}-%{arcver}/LEGAL +%doc %{name}-%{arcver}/LGPL %dir %{_prefix}/lib/ruby -%dir %{_libdir}/ruby/%{rubyxver} %dir %{_prefix}/lib/ruby/%{rubyxver} -%dir %{_prefix}/lib/ruby/%{rubyxver}/cgi -%dir %{_prefix}/lib/ruby/%{rubyxver}/net -%dir %{_prefix}/lib/ruby/%{rubyxver}/shell -%dir %{_prefix}/lib/ruby/%{rubyxver}/uri -%{sitedir} -%{sitedir2} - -%files tcltk -f ruby-tcltk.files -%defattr(-, root, root) -%doc tmp-ruby-docs/ruby-tcltk/ext/* - -%files rdoc -f rdoc.files -%defattr(-, root, root) +%ifnarch ppc64 s390x sparc64 x86_64 +%dir %{_prefix}/lib/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os} +%endif +%ifarch ppc64 s390x sparc64 x86_64 %dir %{_libdir}/ruby %dir %{_libdir}/ruby/%{rubyxver} +%dir %{_libdir}/ruby/%{rubyxver}/%{_normalized_cpu}-%{_target_os} +%{sitedir} +%endif +%{sitedir2} +## the following files should goes into ruby-tcltk package. +%exclude %{_prefix}/lib/ruby/%{rubyxver}/*tk.rb +%exclude %{_prefix}/lib/ruby/%{rubyxver}/tcltk.rb +%exclude %{_prefix}/lib/ruby/%{rubyxver}/tk +%exclude %{_prefix}/lib/ruby/%{rubyxver}/tk*.rb +%exclude %{_prefix}/lib/ruby/%{rubyxver}/tkextlib +%exclude %{_libdir}/ruby/%{rubyxver}/*/tcltklib.so +%exclude %{_libdir}/ruby/%{rubyxver}/*/tkutil.so +## the following files should goes into ruby-rdoc package. +%exclude %{_prefix}/lib/ruby/%{rubyxver}/rdoc +## the following files should goes into ruby-irb package. +%exclude %{_prefix}/lib/ruby/%{rubyxver}/irb.rb +%exclude %{_prefix}/lib/ruby/%{rubyxver}/irb +## files in ruby-libs from here +%{_prefix}/lib/ruby/%{rubyxver}/*.rb +%{_prefix}/lib/ruby/%{rubyxver}/bigdecimal +%{_prefix}/lib/ruby/%{rubyxver}/cgi +%{_prefix}/lib/ruby/%{rubyxver}/date +%{_prefix}/lib/ruby/%{rubyxver}/digest +%{_prefix}/lib/ruby/%{rubyxver}/dl +%{_prefix}/lib/ruby/%{rubyxver}/drb +%{_prefix}/lib/ruby/%{rubyxver}/io +%{_prefix}/lib/ruby/%{rubyxver}/net +%{_prefix}/lib/ruby/%{rubyxver}/openssl +%{_prefix}/lib/ruby/%{rubyxver}/optparse +%{_prefix}/lib/ruby/%{rubyxver}/racc +%{_prefix}/lib/ruby/%{rubyxver}/rexml +%{_prefix}/lib/ruby/%{rubyxver}/rinda +%{_prefix}/lib/ruby/%{rubyxver}/rss +%{_prefix}/lib/ruby/%{rubyxver}/runit +%{_prefix}/lib/ruby/%{rubyxver}/shell +%{_prefix}/lib/ruby/%{rubyxver}/soap +%{_prefix}/lib/ruby/%{rubyxver}/test +%{_prefix}/lib/ruby/%{rubyxver}/uri +%{_prefix}/lib/ruby/%{rubyxver}/webrick +%{_prefix}/lib/ruby/%{rubyxver}/wsdl +%{_prefix}/lib/ruby/%{rubyxver}/xmlrpc +%{_prefix}/lib/ruby/%{rubyxver}/xsd +%{_prefix}/lib/ruby/%{rubyxver}/yaml +%{_libdir}/libruby.so.* +%{_libdir}/ruby/%{rubyxver}/*/*.so +%{_libdir}/ruby/%{rubyxver}/*/digest +%{_libdir}/ruby/%{rubyxver}/*/io +%{_libdir}/ruby/%{rubyxver}/*/racc +%{_libdir}/ruby/%{rubyxver}/*/rbconfig.rb -%files irb -f irb.files -%defattr(-, root, root) +%files tcltk +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%doc %{name}-%{arcver}/LEGAL +%doc %{name}-%{arcver}/LGPL +%doc tmp-ruby-docs/ruby-tcltk/ext/* +%{_prefix}/lib/ruby/%{rubyxver}/*-tk.rb +%{_prefix}/lib/ruby/%{rubyxver}/tcltk.rb +%{_prefix}/lib/ruby/%{rubyxver}/tk +%{_prefix}/lib/ruby/%{rubyxver}/tk*.rb +%{_prefix}/lib/ruby/%{rubyxver}/tkextlib +%{_libdir}/ruby/%{rubyxver}/*/tcltklib.so +%{_libdir}/ruby/%{rubyxver}/*/tkutil.so + +%files rdoc +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%doc %{name}-%{arcver}/LEGAL +%doc %{name}-%{arcver}/LGPL +%{_bindir}/rdoc +%{_prefix}/lib/ruby/%{rubyxver}/rdoc + +%files irb +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%doc %{name}-%{arcver}/LEGAL +%doc %{name}-%{arcver}/LGPL %doc tmp-ruby-docs/irb/* -%dir %{_prefix}/lib/ruby/%{rubyxver}/irb -%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc -%dir %{_prefix}/lib/ruby/%{rubyxver}/irb/lc/ja +%{_bindir}/irb +%{_prefix}/lib/ruby/%{rubyxver}/irb.rb +%{_prefix}/lib/ruby/%{rubyxver}/irb +%{_mandir}/man1/irb.1* -%files ri -f ri.files -%defattr(-, root, root) -%dir %{_datadir}/ri +%files ri +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%doc %{name}-%{arcver}/LEGAL +%doc %{name}-%{arcver}/LGPL +%{_bindir}/ri +%{_datadir}/ri %files docs -%defattr(-, root, root) +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%doc %{name}-%{arcver}/LEGAL +%doc %{name}-%{arcver}/LGPL %doc tmp-ruby-docs/ruby-docs/* %doc tmp-ruby-docs/ruby-libs/* %ifnarch ppc64 -%files mode -f ruby-mode.files -%defattr(-, root, root) -%doc %{name}-%{rubyver}%{?patchlevel}/misc/README -%dir %{_datadir}/emacs/site-lisp/ruby-mode +%files mode +%defattr(-, root, root, -) +%doc %{name}-%{arcver}/COPYING* +%doc %{name}-%{arcver}/ChangeLog +%doc %{name}-%{arcver}/GPL +%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 %endif %changelog +* Tue Mar 4 2008 Akira TAGOH - 1.8.6.114-1 +- Security fix for CVE-2008-1145. +- Improve a spec file. (#226381) + - Correct License tag. + - Fix a timestamp issue. + - Own a arch-specific directory. + +* Tue Feb 19 2008 Fedora Release Engineering - 1.8.6.111-9 +- Autorebuild for GCC 4.3 + +* Tue Feb 19 2008 Akira TAGOH - 1.8.6.111-8 +- Rebuild for gcc-4.3. + +* Tue Jan 15 2008 Akira TAGOH - 1.8.6.111-7 +- Revert the change of libruby-static.a. (#428384) + +* Fri Jan 11 2008 Akira TAGOH - 1.8.6.111-6 +- Fix an unnecessary replacement for shebang. (#426835) + +* Fri Jan 4 2008 Akira TAGOH - 1.8.6.111-5 +- Rebuild. + +* Fri Dec 28 2007 Akira TAGOH - 1.8.6.111-4 +- Clean up again. + +* Fri Dec 21 2007 Akira TAGOH - 1.8.6.111-3 +- Clean up the spec file. +- Remove ruby-man-1.4.6 stuff. this is entirely the out-dated document. + this could be replaced by ri. +- Disable the static library building. + +* Tue Dec 04 2007 Release Engineering - 1.8.6.111-2 + - Rebuild for openssl bump + +* Wed Oct 31 2007 Akira TAGOH +- Fix the dead link. + * Mon Oct 29 2007 Akira TAGOH - 1.8.6.111-1 - New upstream release. - ruby-1.8.6.111-CVE-2007-5162.patch: Update a bit with backporting the changes diff --git a/sources b/sources index 840df49..dff6ae6 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ 8336b859400795ec51d05878c1a658b7 ruby-man-1.4.6.tar.bz2 d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz -7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2 -8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2 -e1d38b7d4f1be55726d6927a3395ce3b ruby-1.8.6-p111.tar.bz2 +634c25b14e19925d10af3720d72e8741 rubyfaq-990927.tar.gz +4fcec898f51d8371cc42d0a013940469 rubyfaq-jp-990927.tar.gz +b4d0c74497f684814bcfbb41b7384a71 ruby-1.8.6-p114.tar.bz2 From c6bb48676e17ba641f13539ec33da450f5b19def Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 10 Mar 2008 07:42:46 +0000 Subject: [PATCH 10/11] *** empty log message *** --- ruby-1.8.6.111-gcc43.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 ruby-1.8.6.111-gcc43.patch diff --git a/ruby-1.8.6.111-gcc43.patch b/ruby-1.8.6.111-gcc43.patch new file mode 100644 index 0000000..9e1b297 --- /dev/null +++ b/ruby-1.8.6.111-gcc43.patch @@ -0,0 +1,16 @@ +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* From 19866628cac7021c71cfb8b89cdaf17349059f20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 11:43:48 +0000 Subject: [PATCH 11/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 6 ------ branch | 1 - 3 files changed, 7 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index a48d560..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: ruby -# $Id$ -NAME := ruby -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7