diff --git a/ruby-1.8.6-p114.tar.bz2 b/ruby-1.8.6-p114.tar.bz2 deleted file mode 100644 index 29420ae..0000000 --- a/ruby-1.8.6-p114.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ac0d0271324c54525210f775e5fcc9a37e3d8a10b96d68cdfeeb361c6f64a63 -size 3920921 diff --git a/ruby-1.8.6.p111_vendor_ruby.patch b/ruby-1.8.6.p111_vendor_ruby.patch deleted file mode 100644 index ec6d956..0000000 --- a/ruby-1.8.6.p111_vendor_ruby.patch +++ /dev/null @@ -1,163 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2007-12-06 18:22:54.000000000 +0100 -+++ configure.in 2007-12-06 18:22:56.666955357 +0100 -@@ -1575,9 +1575,28 @@ AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB - AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}") - AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}") - -+AC_ARG_WITH(vendordir, -+ [ --with-vendordir=DIR vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]], -+ [vendordir=$withval], -+ [vendordir='${libdir}/ruby/vendor_ruby']) -+VENDOR_DIR="`eval \"echo ${vendordir}\"`" -+case "$target_os" in -+ cygwin*|mingw*|*djgpp*|os2_emx*) -+ RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" || -+ RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";; -+ *) -+ RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";; -+esac -+RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}" -+ -+AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}") -+AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}") -+ - AC_SUBST(arch)dnl - AC_SUBST(sitearch)dnl -+AC_SUBST(vendorarch)dnl - AC_SUBST(sitedir)dnl -+AC_SUBST(vendordir)dnl - - configure_args=$ac_configure_args - AC_SUBST(configure_args)dnl -@@ -1590,6 +1609,8 @@ if test "$fat_binary" != no ; then - - AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB, - "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}") -+ AC_DEFINE_UNQUOTED(RUBY_VENDOR_THIN_ARCHLIB, -+ "${RUBY_VENDOR_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}") - AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}") - else - arch="${target_cpu}-${target_os}" -@@ -1597,12 +1618,15 @@ else - fi - - case "$target_os" in -- mingw*) sitearch="i386-$rb_cv_msvcrt" ;; -- *) sitearch="${arch}" ;; -+ mingw*) sitearch="i386-$rb_cv_msvcrt" -+ vendorarch="i386-$rb_cv_msvcrt" ;; -+ *) sitearch="${arch}" -+ vendorarch="${arch}" ;; - esac - - AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}") - AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}") -+AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${RUBY_VENDOR_LIB_PATH2}/${vendorarch}") - - AC_ARG_WITH(search-path, - [ --with-search-path=DIR specify the additional search path], -Index: instruby.rb -=================================================================== ---- instruby.rb.orig 2007-02-13 00:01:19.000000000 +0100 -+++ instruby.rb 2007-12-06 18:22:56.670955599 +0100 -@@ -162,6 +162,8 @@ rubylibdir = CONFIG["rubylibdir"] - archlibdir = CONFIG["archdir"] - sitelibdir = CONFIG["sitelibdir"] - sitearchlibdir = CONFIG["sitearchdir"] -+vendorlibdir = CONFIG["vendorlibdir"] -+vendorarchlibdir = CONFIG["vendorarchdir"] - mandir = File.join(CONFIG["mandir"], "man") - configure_args = Shellwords.shellwords(CONFIG["configure_args"]) - enable_shared = CONFIG["ENABLE_SHARED"] == 'yes' -@@ -202,7 +204,7 @@ if $extout - extout = "#$extout" - install?(:ext, :arch, :'ext-arch') do - puts "installing extension objects" -- makedirs [archlibdir, sitearchlibdir] -+ makedirs [archlibdir, sitearchlibdir, vendorarchlibdir] - if noinst = CONFIG["no_install_files"] and noinst.empty? - noinst = nil - end -@@ -210,7 +212,7 @@ if $extout - end - install?(:ext, :comm, :'ext-comm') do - puts "installing extension scripts" -- makedirs [rubylibdir, sitelibdir] -+ makedirs [rubylibdir, sitelibdir, vendorlibdir] - install_recursive("#{extout}/common", rubylibdir) - end - end -Index: Makefile.in -=================================================================== ---- Makefile.in.orig 2007-02-13 00:01:19.000000000 +0100 -+++ Makefile.in 2007-12-06 18:22:56.702957532 +0100 -@@ -24,6 +24,8 @@ datadir = @datadir@ - arch = @arch@ - sitearch = @sitearch@ - sitedir = @sitedir@ -+vendorarch = @vendorarch@ -+vendordir = @vendordir@ - - TESTUI = console - TESTS = -Index: mkconfig.rb -=================================================================== ---- mkconfig.rb.orig 2007-02-28 20:10:44.000000000 +0100 -+++ mkconfig.rb 2007-12-06 18:22:56.726958982 +0100 -@@ -143,6 +143,14 @@ print < STACK_LEVEL_MAX + GC_WATER_MARK);\ } while (0) @@ -22,14 +22,14 @@ Index: gc.c { Index: intern.h =================================================================== ---- intern.h.orig -+++ intern.h -@@ -238,7 +238,7 @@ VALUE rb_file_directory_p _((VALUE,VALUE +--- intern.h.orig 2008-07-07 05:29:28.000000000 +0200 ++++ intern.h 2008-07-22 17:51:44.220378414 +0200 +@@ -251,7 +251,7 @@ VALUE rb_file_directory_p _((VALUE,VALUE /* gc.c */ NORETURN(void rb_memerror __((void))); int ruby_stack_check _((void)); -int ruby_stack_length _((VALUE**)); +long ruby_stack_length _((VALUE**)); + int rb_during_gc _((void)); char *rb_source_filename _((const char*)); void rb_gc_mark_locations _((VALUE*, VALUE*)); - void rb_mark_tbl _((struct st_table*)); diff --git a/ruby-1.8.6.p36_lib64.patch b/ruby-1.8.6.p36_lib64.patch deleted file mode 100644 index 011f59e..0000000 --- a/ruby-1.8.6.p36_lib64.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in.orig -+++ configure.in -@@ -1235,7 +1235,7 @@ rb_cv_missing_fconvert=yes, rb_cv_missin - if test "$rb_cv_missing_fconvert" = yes; then - AC_DEFINE(MISSING_FCONVERT) - fi -- AC_LIBOBJ([x68.o]) -+ AC_LIBOBJ([x68]) - CFLAGS="$CFLAGS -fansi-only" - XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144" - EXEEXT=.x -@@ -1548,7 +1548,7 @@ case "$target_os" in - RUBY_LIB_PREFIX="/lib/ruby" - ;; - *) -- RUBY_LIB_PREFIX="${prefix}/lib/ruby" -+ RUBY_LIB_PREFIX="${libdir}/ruby" - ;; - esac - RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}" -@@ -1556,7 +1556,7 @@ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJO - AC_ARG_WITH(sitedir, - [ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]], - [sitedir=$withval], -- [sitedir='${prefix}/lib/ruby/site_ruby']) -+ [sitedir='${libdir}/ruby/site_ruby']) - SITE_DIR=`eval echo \\"${sitedir}\\"` - case "$target_os" in - cygwin*|mingw*|*djgpp*|os2-emx*) diff --git a/ruby-1.8.6.p36_tcltk-multilib.patch b/ruby-1.8.6.p36_tcltk-multilib.patch deleted file mode 100644 index 5a8ecdf..0000000 --- a/ruby-1.8.6.p36_tcltk-multilib.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: ext/tk/extconf.rb -=================================================================== ---- ext/tk/extconf.rb.orig -+++ ext/tk/extconf.rb -@@ -50,7 +50,7 @@ stubs = enable_config("tcltk_stubs") || - use_X = with_config("X11", (! is_win32)) - - def find_tcl(tcllib, stubs) -- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] -+ paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] - if stubs - func = "Tcl_InitStubs" - lib = "tclstub" -@@ -276,8 +276,10 @@ end - if tcltk_framework || - (have_header("tcl.h") && have_header("tk.h") && - ( !use_X || find_library("X11", "XOpenDisplay", -- "/usr/X11/lib", "/usr/lib/X11", -- "/usr/X11R6/lib", "/usr/openwin/lib")) && -+ "/usr/X11/lib64", "/usr/X11/lib", -+ "/usr/lib64/X11", "/usr/lib/X11", -+ "/usr/X11R6/lib64", "/usr/X11R6/lib", -+ "/usr/openwin/lib64", "/usr/openwin/lib")) && - find_tcl(tcllib, stubs) && - find_tk(tklib, stubs)) - $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs diff --git a/ruby-1.8.6_openssl_verify_host.patch b/ruby-1.8.6_openssl_verify_host.patch deleted file mode 100644 index 0babe4e..0000000 --- a/ruby-1.8.6_openssl_verify_host.patch +++ /dev/null @@ -1,54 +0,0 @@ -Index: ext/openssl/lib/net/telnets.rb -=================================================================== ---- ext/openssl/lib/net/telnets.rb.orig 2007-02-13 00:01:19.000000000 +0100 -+++ ext/openssl/lib/net/telnets.rb 2007-12-06 22:26:24.002456350 +0100 -@@ -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 - '' -Index: ext/openssl/lib/net/ftptls.rb -=================================================================== ---- ext/openssl/lib/net/ftptls.rb.orig 2007-02-13 00:01:19.000000000 +0100 -+++ ext/openssl/lib/net/ftptls.rb 2007-12-06 22:26:24.030458051 +0100 -@@ -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 -Index: lib/net/imap.rb -=================================================================== ---- lib/net/imap.rb.orig 2007-08-22 01:28:09.000000000 +0200 -+++ lib/net/imap.rb 2007-12-06 22:26:24.110462912 +0100 -@@ -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 --git a/ruby-1.8.7-p72.tar.bz2 b/ruby-1.8.7-p72.tar.bz2 new file mode 100644 index 0000000..9044fff --- /dev/null +++ b/ruby-1.8.7-p72.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52b731d41b1656e8ef317da38fe0d32c4dcac8ea373456254af88c945df83ca9 +size 4127458 diff --git a/ruby-1.8.7-p72_vendor_specific.patch b/ruby-1.8.7-p72_vendor_specific.patch new file mode 100644 index 0000000..70c6b1f --- /dev/null +++ b/ruby-1.8.7-p72_vendor_specific.patch @@ -0,0 +1,16 @@ +Index: mkconfig.rb +=================================================================== +--- mkconfig.rb.orig 2008-06-06 12:39:57.000000000 +0200 ++++ mkconfig.rb 2008-09-05 19:16:10.832214101 +0200 +@@ -147,6 +147,11 @@ print <