This commit is contained in:
parent
d5d4ef27be
commit
73320ba6cd
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4ac0d0271324c54525210f775e5fcc9a37e3d8a10b96d68cdfeeb361c6f64a63
|
||||
size 3920921
|
@ -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 <<EOS
|
||||
CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
|
||||
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
|
||||
CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
|
||||
+ CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
|
||||
+ CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(vendorarch)"
|
||||
+ if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
|
||||
+ CONFIG["sitearch"] = CONFIG["vendorarch"]
|
||||
+ CONFIG["sitedir"] = CONFIG["vendordir"]
|
||||
+ CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
|
||||
+ CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
|
||||
+ end
|
||||
CONFIG["topdir"] = File.dirname(__FILE__)
|
||||
MAKEFILE_CONFIG = {}
|
||||
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
|
||||
Index: lib/mkmf.rb
|
||||
===================================================================
|
||||
--- lib/mkmf.rb.orig 2007-08-22 04:24:49.000000000 +0200
|
||||
+++ lib/mkmf.rb 2007-12-06 18:22:56.758960916 +0100
|
||||
@@ -51,6 +51,9 @@ $archdir = CONFIG["archdir"]
|
||||
$sitedir = CONFIG["sitedir"]
|
||||
$sitelibdir = CONFIG["sitelibdir"]
|
||||
$sitearchdir = CONFIG["sitearchdir"]
|
||||
+$vendordir = CONFIG["vendordir"]
|
||||
+$vendorlibdir = CONFIG["vendorlibdir"]
|
||||
+$vendorarchdir = CONFIG["vendorarchdir"]
|
||||
|
||||
$mswin = /mswin/ =~ RUBY_PLATFORM
|
||||
$bccwin = /bccwin/ =~ RUBY_PLATFORM
|
||||
@@ -1097,6 +1100,7 @@ RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTA
|
||||
RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
|
||||
arch = #{CONFIG['arch']}
|
||||
sitearch = #{CONFIG['sitearch']}
|
||||
+vendorarch = #{CONFIG['vendorarch']}
|
||||
ruby_version = #{Config::CONFIG['ruby_version']}
|
||||
ruby = #{$ruby}
|
||||
RUBY = $(ruby#{sep})
|
||||
Index: ruby.c
|
||||
===================================================================
|
||||
--- ruby.c.orig 2007-09-16 21:52:55.000000000 +0200
|
||||
+++ ruby.c 2007-12-06 18:24:23.784218798 +0100
|
||||
@@ -322,6 +322,13 @@ ruby_init_loadpath()
|
||||
incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
|
||||
incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
|
||||
|
||||
+ incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
|
||||
+#ifdef RUBY_VENDOR_THIN_ARCHLIB
|
||||
+ incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB));
|
||||
+#endif
|
||||
+ incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB));
|
||||
+ incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB));
|
||||
+
|
||||
incpush(RUBY_RELATIVE(RUBY_LIB));
|
||||
#ifdef RUBY_THIN_ARCHLIB
|
||||
incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
|
@ -1,8 +1,8 @@
|
||||
Index: gc.c
|
||||
===================================================================
|
||||
--- gc.c.orig
|
||||
+++ gc.c
|
||||
@@ -425,7 +425,7 @@ unsigned int _stacksize = 262144;
|
||||
--- gc.c.orig 2008-07-07 08:17:24.000000000 +0200
|
||||
+++ gc.c 2008-07-22 17:51:19.058845598 +0200
|
||||
@@ -480,7 +480,7 @@ unsigned int _stacksize = 262144;
|
||||
# define STACK_LEVEL_MAX (_stacksize - 4096)
|
||||
# undef HAVE_GETRLIMIT
|
||||
#elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
|
||||
@ -11,7 +11,7 @@ Index: gc.c
|
||||
#else
|
||||
# define STACK_LEVEL_MAX 655300
|
||||
#endif
|
||||
@@ -485,7 +485,7 @@ stack_grow_direction(addr)
|
||||
@@ -539,7 +539,7 @@ stack_grow_direction(addr)
|
||||
(ret) = (STACK_LENGTH > 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*));
|
||||
|
@ -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*)
|
@ -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
|
@ -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
|
3
ruby-1.8.7-p72.tar.bz2
Normal file
3
ruby-1.8.7-p72.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:52b731d41b1656e8ef317da38fe0d32c4dcac8ea373456254af88c945df83ca9
|
||||
size 4127458
|
16
ruby-1.8.7-p72_vendor_specific.patch
Normal file
16
ruby-1.8.7-p72_vendor_specific.patch
Normal file
@ -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 <<EOS
|
||||
CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
|
||||
CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
|
||||
CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)"
|
||||
+ if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
|
||||
+ CONFIG["sitedir"] = CONFIG["vendordir"]
|
||||
+ CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
|
||||
+ CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
|
||||
+ end
|
||||
CONFIG["topdir"] = File.dirname(__FILE__)
|
||||
MAKEFILE_CONFIG = {}
|
||||
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
|
13
ruby-1.8.7.p22_lib64.patch
Normal file
13
ruby-1.8.7.p22_lib64.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
--- configure.in.orig 2008-06-15 12:28:47.000000000 +0200
|
||||
+++ configure.in 2008-06-21 04:19:24.713590544 +0200
|
||||
@@ -1366,7 +1366,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
|
31
ruby-1.8.7.p22_tcltk-multilib.patch
Normal file
31
ruby-1.8.7.p22_tcltk-multilib.patch
Normal file
@ -0,0 +1,31 @@
|
||||
Index: ext/tk/extconf.rb
|
||||
===================================================================
|
||||
--- ext/tk/extconf.rb.orig 2008-04-09 16:15:24.000000000 +0200
|
||||
+++ ext/tk/extconf.rb 2008-06-21 04:29:14.717425749 +0200
|
||||
@@ -95,7 +95,7 @@ def check_tcltk_version(version)
|
||||
end
|
||||
|
||||
def find_tcl(tcllib, stubs, version, *opt_paths)
|
||||
- default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
|
||||
+ default_paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
|
||||
default_paths << "/Tcl/lib" # default for ActiveTcl
|
||||
|
||||
if (paths = opt_paths.compact).empty?
|
||||
@@ -138,7 +138,7 @@ def find_tcl(tcllib, stubs, version, *op
|
||||
end
|
||||
|
||||
def find_tk(tklib, stubs, version, *opt_paths)
|
||||
- default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
|
||||
+ default_paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
|
||||
default_paths << "/Tcl/lib" # default for ActiveTcl
|
||||
|
||||
if (paths = opt_paths.compact).empty?
|
||||
@@ -182,7 +182,7 @@ end
|
||||
|
||||
def find_X11(*opt_paths)
|
||||
default_paths =
|
||||
- [ "/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" ]
|
||||
paths = opt_paths.compact.concat(default_paths)
|
||||
st = find_library("X11", "XOpenDisplay", *paths)
|
||||
unless st
|
19
ruby.changes
19
ruby.changes
@ -1,3 +1,22 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Sep 6 06:56:56 CEST 2008 - mrueckert@suse.de
|
||||
|
||||
- update to 1.8.7p72
|
||||
vendor_ruby support now officially included
|
||||
for all the changes since 1.8.6 see
|
||||
/usr/share/doc/packages/ruby/NEWS
|
||||
- dropped ruby-1.8.6_openssl_verify_host.patch
|
||||
included in update
|
||||
- updated patch for new release:
|
||||
old name: ruby-1.8.6.p36_lib64.patch
|
||||
new name: ruby-1.8.7.p22_lib64.patch
|
||||
- updated patch for new release:
|
||||
old name: ruby-1.8.6.p36_tcltk-multilib.patch
|
||||
new name: ruby-1.8.7.p22_tcltk-multilib.patch
|
||||
- dropped ruby-1.8.6.p111_vendor_ruby.patch
|
||||
only one chunk survived as ruby-1.8.7-p72_vendor_specific.patch
|
||||
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 16 15:06:51 CEST 2008 - mrueckert@suse.de
|
||||
|
||||
|
46
ruby.spec
46
ruby.spec
@ -1,10 +1,17 @@
|
||||
#
|
||||
# spec file for package ruby (Version 1.8.6.p114)
|
||||
# spec file for package ruby (Version 1.8.7.p72)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
@ -12,11 +19,11 @@
|
||||
|
||||
|
||||
Name: ruby
|
||||
Version: 1.8.6.p114
|
||||
Version: 1.8.7.p72
|
||||
Release: 1
|
||||
#
|
||||
%define pkg_version 1.8.6
|
||||
%define patch_level p114
|
||||
%define pkg_version 1.8.7
|
||||
%define patch_level p72
|
||||
%define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//')
|
||||
#
|
||||
License: GPL v2 or later
|
||||
@ -48,15 +55,14 @@ Source: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{pkg_version}-%{patch_lev
|
||||
Source1: irb.1
|
||||
Source2: ruby-doc-bundle.tar.bz2
|
||||
Patch0: ruby-1.8.6.p36_gc.patch
|
||||
Patch1: ruby-1.8.6.p36_lib64.patch
|
||||
Patch2: ruby-1.8.6.p36_tcltk-multilib.patch
|
||||
Patch1: ruby-1.8.7.p22_lib64.patch
|
||||
Patch2: ruby-1.8.7.p22_tcltk-multilib.patch
|
||||
Patch3: ruby-1.8.6.p36_socket_ipv6.patch
|
||||
Patch5: ruby_1.8.6.p36_date_remove_privat.patch
|
||||
Patch6: ruby-pedantic-headers.diff
|
||||
Patch7: ruby-1.8.7-p72_vendor_specific.patch
|
||||
# vendor ruby files taken from:
|
||||
# http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/
|
||||
Patch6: ruby-pedantic-headers.diff
|
||||
Patch7: ruby-1.8.6_openssl_verify_host.patch
|
||||
Patch100: ruby-1.8.6.p111_vendor_ruby.patch
|
||||
Source3: site-specific.rb
|
||||
Source4: vendor-specific.rb
|
||||
#
|
||||
@ -229,7 +235,6 @@ Authors:
|
||||
%patch5
|
||||
%patch6
|
||||
%patch7
|
||||
%patch100
|
||||
%if 0%{?with_bleak_house}
|
||||
for patch in valgrind configure gc ; do
|
||||
patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch
|
||||
@ -336,6 +341,7 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
|
||||
%if 0%{?use_fdupes}
|
||||
%fdupes %{buildroot}
|
||||
%endif
|
||||
chmod -v a-x %{buildroot}%{_libdir}/ruby/%{rb_ver}/%{rb_arch}/*.h
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
@ -436,6 +442,7 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
|
||||
%{_libdir}/%{name}/%{rb_ver}/runit/
|
||||
%{_libdir}/%{name}/%{rb_ver}/scanf.rb
|
||||
%{_libdir}/%{name}/%{rb_ver}/set.rb
|
||||
%{_libdir}/%{name}/%{rb_ver}/securerandom.rb
|
||||
%{_libdir}/%{name}/%{rb_ver}/sha1.rb
|
||||
%{_libdir}/%{name}/%{rb_ver}/shell*
|
||||
%{_libdir}/%{name}/%{rb_ver}/singleton.rb
|
||||
@ -511,6 +518,21 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
|
||||
%doc %{_docdir}/%{name}/examples
|
||||
|
||||
%changelog
|
||||
* Sat Sep 06 2008 mrueckert@suse.de
|
||||
- update to 1.8.7p72
|
||||
vendor_ruby support now officially included
|
||||
for all the changes since 1.8.6 see
|
||||
/usr/share/doc/packages/ruby/NEWS
|
||||
- dropped ruby-1.8.6_openssl_verify_host.patch
|
||||
included in update
|
||||
- updated patch for new release:
|
||||
old name: ruby-1.8.6.p36_lib64.patch
|
||||
new name: ruby-1.8.7.p22_lib64.patch
|
||||
- updated patch for new release:
|
||||
old name: ruby-1.8.6.p36_tcltk-multilib.patch
|
||||
new name: ruby-1.8.7.p22_tcltk-multilib.patch
|
||||
- dropped ruby-1.8.6.p111_vendor_ruby.patch
|
||||
only one chunk survived as ruby-1.8.7-p72_vendor_specific.patch
|
||||
* Fri May 16 2008 mrueckert@suse.de
|
||||
- update to 1.8.6.p114
|
||||
bugfix release
|
||||
|
Loading…
x
Reference in New Issue
Block a user