diff options
Diffstat (limited to 'lang/ruby14-base/patches')
-rw-r--r-- | lang/ruby14-base/patches/patch-aa | 86 | ||||
-rw-r--r-- | lang/ruby14-base/patches/patch-ac | 10 | ||||
-rw-r--r-- | lang/ruby14-base/patches/patch-ad | 34 | ||||
-rw-r--r-- | lang/ruby14-base/patches/patch-ae | 52 | ||||
-rw-r--r-- | lang/ruby14-base/patches/patch-af | 22 | ||||
-rw-r--r-- | lang/ruby14-base/patches/patch-ag | 16 | ||||
-rw-r--r-- | lang/ruby14-base/patches/patch-ah | 41 | ||||
-rw-r--r-- | lang/ruby14-base/patches/patch-ai | 13 | ||||
-rw-r--r-- | lang/ruby14-base/patches/patch-aj | 13 |
9 files changed, 287 insertions, 0 deletions
diff --git a/lang/ruby14-base/patches/patch-aa b/lang/ruby14-base/patches/patch-aa new file mode 100644 index 00000000000..9cfebcecf0c --- /dev/null +++ b/lang/ruby14-base/patches/patch-aa @@ -0,0 +1,86 @@ +$NetBSD: patch-aa,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- configure.in.orig Sat Jul 29 00:52:49 2000 ++++ configure.in +@@ -26,6 +26,8 @@ + fi + + AC_CANONICAL_HOST ++AC_CANONICAL_TARGET ++AC_CANONICAL_BUILD + + dnl checks for fat-binary + fat_binary=no +@@ -198,7 +200,7 @@ + truncate chsize times utimes fcntl lockf setitimer\ + setruid seteuid setreuid setrgid setegid setregid\ + getpgrp setpgrp getpgid setpgid getgroups getpriority\ +- dlopen sigprocmask sigaction _setjmp setsid) ++ dlopen sigprocmask sigaction _setjmp setsid mkstemp) + AC_STRUCT_TIMEZONE + if test "$ac_cv_func_strftime" = no; then + AC_TRY_LINK([], +@@ -412,12 +414,7 @@ + human*) ;; + bsdi*) ;; + cygwin*) ;; +- netbsd*) CCDLFLAGS=-fpic +- case "$host_cpu" in +- mips*) CCDLFLAGS=-fPIC ;; +- sparc) CCDLFLAGS=-fPIC ;; +- *) ;; +- esac ;; ++ netbsd*) CCDLFLAGS=-fPIC;; + *) CCDLFLAGS=-fPIC;; + esac + else +@@ -462,10 +459,8 @@ + test "$GCC" = yes && `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null || LDSHARED="ld -Bshareable" + fi + rb_cv_dlopen=yes ;; +- netbsd*) LDSHARED="ld -shared" +- if test "$rb_cv_binary_elf" = yes; then +- LDFLAGS="-export-dynamic" +- fi ++ netbsd*) LDSHARED='${CC} -shared' ++ LDFLAGS="" + rb_cv_dlopen=yes ;; + openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" + rb_cv_dlopen=yes ;; +@@ -716,11 +711,14 @@ + fi + ;; + netbsd*) +- LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' ++ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' ++ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)' + if test "$rb_cv_binary_elf" = yes; then # ELF platforms +- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' +- else +- LIBRUBY_ALIASES= # a.out platforms ++ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_INSTALL_NAME).so' ++ LIBRUBYARG='-Wl,--rpath -Wl,${prefix}/lib -L${prefix}/lib -L. -l$(RUBY_INSTALL_NAME) -Wl,--rpath -Wl,${X11BASE}/lib -L${X11BASE}/lib' ++ else # a.out platforms ++ LIBRUBY_ALIASES="" ++ LIBRUBYARG='-Wl,-R${prefix}/lib -L${prefix}/lib -L. -l$(RUBY_INSTALL_NAME) -Wl,-R${X11BASE}/lib -L${X11BASE}/lib' + fi + ;; + solaris*) +@@ -758,6 +756,9 @@ + fi + + case "$host_os" in ++ netbsd*) ++ CFLAGS="$CFLAGS -pipe" ++ ;; + nextstep*) + CFLAGS="$CFLAGS -pipe" + ;; +@@ -774,6 +775,7 @@ + ;; + esac + ++AC_SUBST(X11BASE) + AC_SUBST(LIBRUBY_LDSHARED) + AC_SUBST(LIBRUBY_DLDFLAGS) + AC_SUBST(RUBY_INSTALL_NAME) diff --git a/lang/ruby14-base/patches/patch-ac b/lang/ruby14-base/patches/patch-ac new file mode 100644 index 00000000000..0aac890973f --- /dev/null +++ b/lang/ruby14-base/patches/patch-ac @@ -0,0 +1,10 @@ +$NetBSD: patch-ac,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- ext/socket/extconf.rb.orig Thu Jun 1 15:26:18 2000 ++++ ext/socket/extconf.rb +@@ -1,5 +1,4 @@ + require 'mkmf' +-$LDFLAGS += " -L/usr/local/lib" if File.directory?("/usr/local/lib") + $CFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len" + + case RUBY_PLATFORM diff --git a/lang/ruby14-base/patches/patch-ad b/lang/ruby14-base/patches/patch-ad new file mode 100644 index 00000000000..1cc0a34c762 --- /dev/null +++ b/lang/ruby14-base/patches/patch-ad @@ -0,0 +1,34 @@ +$NetBSD: patch-ad,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- instruby.rb.orig Mon Jun 5 12:55:33 2000 ++++ instruby.rb +@@ -69,11 +69,11 @@ + next unless /\.rb$/ =~ f + dir = rubylibdir+"/"+File.dirname(f[4..-1]) + File.makedirs dir, true unless File.directory? dir +- File.install f, dir, 0644, true ++ File.install f, dir, 0444, true + end + + for f in Dir["*.h"] +- File.install f, archlibdir, 0644, true ++ File.install f, archlibdir, 0444, true + end + if RUBY_PLATFORM =~ /mswin32/ + File.makedirs archlibdir + "/win32", true +@@ -82,11 +82,11 @@ + File.install wdir+'/rubymw.lib', archlibdir, 0644, true + end + end +-File.install wdir+'/'+CONFIG['LIBRUBY_A'], archlibdir, 0644, true ++File.install wdir+'/'+CONFIG['LIBRUBY_A'], archlibdir, 0444, true + + File.makedirs mandir, true +-File.install "ruby.1", mandir, 0644, true ++File.install "ruby.1", "#{mandir}/#{ruby_install_name}.1", 0444, true + Dir.chdir wdir +-File.install "config.h", archlibdir, 0644, true +-File.install "rbconfig.rb", archlibdir, 0644, true ++File.install "config.h", archlibdir, 0444, true ++File.install "rbconfig.rb", archlibdir, 0444, true + # vi:set sw=2: diff --git a/lang/ruby14-base/patches/patch-ae b/lang/ruby14-base/patches/patch-ae new file mode 100644 index 00000000000..595c3150aba --- /dev/null +++ b/lang/ruby14-base/patches/patch-ae @@ -0,0 +1,52 @@ +$NetBSD: patch-ae,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- lib/cgi-lib.rb.orig Tue Oct 12 18:11:29 1999 ++++ lib/cgi-lib.rb +@@ -121,30 +121,40 @@ + RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ] + + # make rfc1123 date string +- def rfc1123_date(time) ++ def CGI.rfc1123_date(time) + t = time.clone.gmtime + return format("%s, %.2d %s %d %.2d:%.2d:%.2d GMT", + RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year, + t.hour, t.min, t.sec) + end ++ def rfc1123_date(time) ++ CGI.rfc1123_date(time) ++ end + + # escape url encode +- def escape(str) ++ def CGI.escape(str) + str.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) } + end ++ def escape(str) ++ CGI.escape(str) ++ end + + # unescape url encoded +- def unescape(str) ++ def CGI.unescape(str) + str.gsub(/\+/, ' ').gsub(/%([0-9a-fA-F]{2})/){ [$1.hex].pack("c") } + end ++ def unescape(str) ++ CGI.unescape(str) ++ end + + # escape HTML +- def escapeHTML(str) ++ def CGI.escapeHTML(str) + str.gsub(/&/, "&").gsub(/\"/, """).gsub(/>/, ">").gsub(/</, "<") + end +- +- module_function :escape, :unescape, :escapeHTML, :rfc1123_date +- ++ def escapeHTML(str) ++ CGI.escapeHTML(str) ++ end ++ + # offline mode. read name=value pairs on standard input. + def read_from_cmdline + require "shellwords.rb" diff --git a/lang/ruby14-base/patches/patch-af b/lang/ruby14-base/patches/patch-af new file mode 100644 index 00000000000..4202a557d0d --- /dev/null +++ b/lang/ruby14-base/patches/patch-af @@ -0,0 +1,22 @@ +$NetBSD: patch-af,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- lib/mkmf.rb.orig Tue Jun 20 01:23:36 2000 ++++ lib/mkmf.rb +@@ -316,6 +316,8 @@ + end + + def create_makefile(target) ++ save_libs = $libs.dup if not $libs.nil? ++ save_libpath = $LIBPATH.dup if not $LIBPATH.nil? + print "creating Makefile\n" + system "rm -f conftest*" + STDOUT.flush +@@ -446,6 +448,8 @@ + dfile.close + end + mfile.close ++ $libs = save_libs ++ $LIBPATH = save_libpath + + if RUBY_PLATFORM =~ /beos/ + if RUBY_PLATFORM =~ /^powerpc/ then diff --git a/lang/ruby14-base/patches/patch-ag b/lang/ruby14-base/patches/patch-ag new file mode 100644 index 00000000000..28b5acd3858 --- /dev/null +++ b/lang/ruby14-base/patches/patch-ag @@ -0,0 +1,16 @@ +$NetBSD: patch-ag,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- ruby.c.orig Mon Jul 31 18:20:15 2000 ++++ ruby.c +@@ -345,9 +345,8 @@ + } + if (!e_fp) { + int fd; +- e_tmpname = ruby_mktemp(); +- if (!e_tmpname) rb_fatal("Can't mktemp"); +- fd = open(e_tmpname, O_CREAT|O_EXCL|O_RDWR, 0600); ++ e_tmpname = ruby_mktemp(&fd); ++ if (!e_tmpname) rb_fatal("Can't alloc memory"); + if (fd < 0) { + rb_fatal("Cannot open temporary file: %s", e_tmpname); + } diff --git a/lang/ruby14-base/patches/patch-ah b/lang/ruby14-base/patches/patch-ah new file mode 100644 index 00000000000..9f08268b0c7 --- /dev/null +++ b/lang/ruby14-base/patches/patch-ah @@ -0,0 +1,41 @@ +$NetBSD: patch-ah,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- util.c.orig Mon Jan 17 17:24:14 2000 ++++ util.c +@@ -139,7 +139,8 @@ + } + + char * +-ruby_mktemp() ++ruby_mktemp(fd) ++ int *fd; + { + char *dir; + char *buf; +@@ -149,11 +150,22 @@ + if (!dir) dir = "/tmp"; + + buf = ALLOC_N(char,strlen(dir)+10); +- sprintf(buf, "%s/rbXXXXXX", dir); +- dir = mktemp(buf); +- if (dir == NULL) free(buf); ++ *fd = -1; ++ if (buf != NULL) { ++ sprintf(buf, "%s/rbXXXXXX", dir); ++#ifdef HAVE_MKSTEMP ++ *fd = mkstemp(buf); ++#else ++ dir = mktemp(buf); ++ if (dir != NULL) ++ *fd = open(dir, O_CREAT|O_EXCL|O_RDWR, 0600); ++ if (*fd < 0 || dir == NULL) { ++ free(buf); ++ } ++#endif ++ } + +- return dir; ++ return buf; + } + + #if defined(MSDOS) || defined(__CYGWIN32__) || defined(NT) diff --git a/lang/ruby14-base/patches/patch-ai b/lang/ruby14-base/patches/patch-ai new file mode 100644 index 00000000000..3abf6c0dd5c --- /dev/null +++ b/lang/ruby14-base/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- util.h.orig Mon Jan 17 17:24:15 2000 ++++ util.h +@@ -35,7 +35,7 @@ + #define add_suffix ruby_add_suffix + #endif + +-char *ruby_mktemp _((void)); ++char *ruby_mktemp _((int *)); + + void ruby_qsort _((void*, int, int, int (*)())); + #define qsort(b,n,s,c) ruby_qsort(b,n,s,c) diff --git a/lang/ruby14-base/patches/patch-aj b/lang/ruby14-base/patches/patch-aj new file mode 100644 index 00000000000..c4286e27e53 --- /dev/null +++ b/lang/ruby14-base/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.1.1.1 2001/06/30 08:25:48 taca Exp $ + +--- ext/extmk.rb.in.orig Tue Jun 20 01:23:36 2000 ++++ ext/extmk.rb.in +@@ -143,7 +143,7 @@ + mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)/%s\n", f + end + for f in path +- mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f ++ mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0444, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f + end + end + |