cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to release 1.4.6.

Browse Source 
mkstemp patch no longer needed, as the new mktemp usage is safe.
This commit is contained in:
espie 2000-09-05 13:56:24 +00:00
parent 56009c55ed
commit 57a1b75287
8 changed files with 58 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lang/ruby/Makefile
View File

@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2000/08/16 18:54:48 espie Exp $
# $OpenBSD: Makefile,v 1.6 2000/09/05 13:56:24 espie Exp $
DISTNAME=ruby-1.4.4
VERSION=1.4.6
DISTNAME=ruby-${VERSION}
CATEGORIES = lang
NEED_VERSION= 1.310
MASTER_SITES=ftp://ftp.netlab.co.jp/pub/lang/ruby/ \
@ -11,12 +12,12 @@ MASTER_SITES=ftp://ftp.netlab.co.jp/pub/lang/ruby/ \
MASTER_SITES0=${MASTER_SITES:C,$,doc/,}
BINARCH=${DISTNAME}.tar.gz
MANARCH=ruby-man-1.4.4.tar.gz
MANARCH=ruby-man-${VERSION}.tar.gz
DISTFILES=${BINARCH} ${MANARCH}:0
EXTRACT_ONLY=${BINARCH}
HOMEPAGE=http://www.netlab.co.jp/ruby/
MAINTAINER=espie@cvs.openbsd.org
MAINTAINER= espie@cvs.openbsd.org
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

12
lang/ruby/files/md5
View File

@ -1,6 +1,6 @@
MD5 (ruby-1.4.4.tar.gz) = 066f5270077eac7737426a688354017f
MD5 (ruby-man-1.4.4.tar.gz) = b6cf191fa7a9b527f183a057feeaeeb4
RMD160 (ruby-1.4.4.tar.gz) = 6501f8022582948eb5195b0a1d1e52be101eab1d
RMD160 (ruby-man-1.4.4.tar.gz) = 095e3b5a3ea2083dc125b0e2eb4925f5e5ab86ab
SHA1 (ruby-1.4.4.tar.gz) = 921d3ca6e521191e7724fd009f9a57617f7c8f77
SHA1 (ruby-man-1.4.4.tar.gz) = 6d809953d7ab4cbdcb857731c133eb6adaff16b4
MD5 (ruby-1.4.6.tar.gz) = 3c910657b164749d9b98d7448df17f9a
MD5 (ruby-man-1.4.6.tar.gz) = 8eed63fec14a719df26247fb8384db5e
RMD160 (ruby-1.4.6.tar.gz) = 3045ea078ba89364a6422927a39d71cd3bdb7e88
RMD160 (ruby-man-1.4.6.tar.gz) = 105afe2236d7e16c8fef8e87d1577975b3c635e4
SHA1 (ruby-1.4.6.tar.gz) = 662e21cd2f6bf521a77ab179e11b669738579cc5
SHA1 (ruby-man-1.4.6.tar.gz) = 9ecb0e32d573a090f932fcac5c28f6efcaaa50c0

18
lang/ruby/patches/patch-findtcltk
View File

@ -1,19 +1,19 @@
$OpenBSD: patch-findtcltk,v 1.2 2000/05/18 18:37:59 espie Exp $
--- ext/tcltklib/extconf.rb.orig Sat Oct 30 15:39:17 1999
+++ ext/tcltklib/extconf.rb Tue Dec 14 01:38:33 1999
@@ -21,6 +21,7 @@ def find_tcl(tcllib)
$OpenBSD: patch-findtcltk,v 1.3 2000/09/05 13:56:25 espie Exp $
--- ext/tcltklib/extconf.rb.orig Tue May 30 06:10:31 2000
+++ ext/tcltklib/extconf.rb Tue Sep 5 15:26:21 2000
@@ -23,6 +23,7 @@ def find_tcl(tcllib)
find_library(tcllib, func, *paths)
else
find_library("tcl", func, *paths) or
+ find_library("tcl80", func, *paths) or
+ find_library("tcl83", func, *paths) or
find_library("tcl8.3", func, *paths) or
find_library("tcl8.2", func, *paths) or
find_library("tcl8.0", func, *paths) or
find_library("tcl7.6", func, *paths)
@@ -34,6 +35,7 @@ def find_tk(tklib)
@@ -37,6 +38,7 @@ def find_tk(tklib)
find_library(tklib, func, *paths)
else
find_library("tk", func, *paths) or
+ find_library("tk80", func, *paths) or
+ find_library("tk83", func, *paths) or
find_library("tk8.3", func, *paths) or
find_library("tk8.2", func, *paths) or
find_library("tk8.0", func, *paths) or
find_library("tk4.2", func, *paths)

41
lang/ruby/patches/patch-mkstemp1
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-mkstemp1,v 1.2 2000/05/18 18:37:59 espie Exp $
--- util.c.orig Fri Aug 13 07:45:15 1999
+++ util.c Mon Dec 13 03:14:01 1999
@@ -19,6 +19,7 @@
#define RUBY_NO_INLINE
#include "ruby.h"
+#include <unistd.h>
#ifdef USE_CWGUSI
extern char* mktemp(char*);
#endif
@@ -148,12 +149,29 @@ ruby_mktemp()
if (!dir) dir = check_dir(getenv("TMPDIR"));
if (!dir) dir = "/tmp";
+#ifdef HAVE_MKSTEMP
+ buf = ALLOC_N(char,strlen(dir)+15);
+ sprintf(buf, "%s/rb.XXXXXXXXXX", dir);
+ {
+ int fd;
+
+ fd = mkstemp(buf);
+ if (fd == -1) {
+ free(buf);
+ return NULL;
+ }
+ close(fd);
+ return buf;
+ }
+
+#else
buf = ALLOC_N(char,strlen(dir)+10);
sprintf(buf, "%s/rbXXXXXX", dir);
dir = mktemp(buf);
if (dir == NULL) free(buf);
return dir;
+#endif
}
#if defined(MSDOS) || defined(__CYGWIN32__) || defined(NT)

12
lang/ruby/patches/patch-mkstemp2
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mkstemp2,v 1.2 2000/05/18 18:37:59 espie Exp $
--- configure.in.orig Tue Apr 11 18:13:32 2000
+++ configure.in Thu May 18 18:44:08 2000
@@ -183,7 +183,7 @@ AC_CHECK_FUNCS(fmod killpg drand48 rando
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([],

4
lang/ruby/pkg/PFRAG.shared
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/04 13:47:56 espie Exp $
@comment $OpenBSD: PFRAG.shared,v 1.3 2000/09/05 13:56:25 espie Exp $
lib/libruby.so
lib/libruby.so.1.4.4
lib/libruby.so.1.4.6
DYNLIBDIR(%B)
lib/ruby/${REV}/${SUB}/curses.so
lib/ruby/${REV}/${SUB}/dbm.so

68
lang/ruby/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2000/07/04 13:47:56 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2000/09/05 13:56:25 espie Exp $
bin/ruby
@exec mkdir -p %D/lib/ruby/site_ruby/${REV}/${SUB}
lib/ruby/${REV}/English.rb
@ -103,55 +103,55 @@ lib/ruby/${REV}/tracer.rb
lib/ruby/${REV}/weakref.rb
%%SHARED%%
man/man1/ruby.1
share/doc/ruby/NilClass.html
share/doc/ruby/Exception.html
share/doc/ruby/Errno.html
share/doc/ruby/classes.html
share/doc/ruby/Array.html
share/doc/ruby/Bignum.html
share/doc/ruby/Numeric.html
share/doc/ruby/Time.html
share/doc/ruby/ENV.html
share/doc/ruby/function.html
share/doc/ruby/Hash.html
share/doc/ruby/options.html
share/doc/ruby/Kernel.html
share/doc/ruby/Enum.html
share/doc/ruby/index.html
share/doc/ruby/Class.html
share/doc/ruby/Compar.html
share/doc/ruby/Float.html
share/doc/ruby/FileTest.html
share/doc/ruby/Data.html
share/doc/ruby/Dir.html
share/doc/ruby/ENV.html
share/doc/ruby/Enum.html
share/doc/ruby/Errno.html
share/doc/ruby/Exception.html
share/doc/ruby/File.html
share/doc/ruby/FileTest.html
share/doc/ruby/Fixnum.html
share/doc/ruby/Float.html
share/doc/ruby/GC.html
share/doc/ruby/Hash.html
share/doc/ruby/IO.html
share/doc/ruby/Integer.html
share/doc/ruby/Object.html
share/doc/ruby/ObSpace.html
share/doc/ruby/Range.html
share/doc/ruby/Regexp.html
share/doc/ruby/dbm.html
share/doc/ruby/glossary.html
share/doc/ruby/preface.html
share/doc/ruby/socket.html
share/doc/ruby/syntax.html
share/doc/ruby/variable.html
share/doc/ruby/yacc.html
share/doc/ruby/Array.html
share/doc/ruby/Dir.html
share/doc/ruby/Data.html
share/doc/ruby/GC.html
share/doc/ruby/Module.html
share/doc/ruby/Kernel.html
share/doc/ruby/Marshal.html
share/doc/ruby/Match.html
share/doc/ruby/Math.html
share/doc/ruby/Module.html
share/doc/ruby/NilClass.html
share/doc/ruby/Numeric.html
share/doc/ruby/ObSpace.html
share/doc/ruby/Object.html
share/doc/ruby/Prec.html
share/doc/ruby/Proc.html
share/doc/ruby/Process.html
share/doc/ruby/Prec.html
share/doc/ruby/Struct.html
share/doc/ruby/Range.html
share/doc/ruby/Regexp.html
share/doc/ruby/String.html
share/doc/ruby/Struct.html
share/doc/ruby/Time.html
share/doc/ruby/bundle.html
share/doc/ruby/classes.html
share/doc/ruby/dbm.html
share/doc/ruby/function.html
share/doc/ruby/glossary.html
share/doc/ruby/index.html
share/doc/ruby/kconv.html
share/doc/ruby/options.html
share/doc/ruby/preface.html
share/doc/ruby/socket.html
share/doc/ruby/syntax.html
share/doc/ruby/thread.html
share/doc/ruby/variable.html
share/doc/ruby/yacc.html
@dirrm share/doc/ruby
@dirrm lib/ruby/site_ruby
@dirrm lib/ruby/site_ruby/${REV}/${SUB}

7
lang/ruby/pkg/SECURITY
View File

@ -1,6 +1,3 @@
$OpenBSD: SECURITY,v 1.1.1.1 2000/03/28 13:16:02 espie Exp $
$OpenBSD: SECURITY,v 1.2 2000/09/05 13:56:25 espie Exp $
One use of mktemp replaced with mkstemp.
Would need a thorough audit to be trusted. Seems to have
a tainting mechanism similar to perl.
Use of mktemp is now safe, since it goes thru open(..., O_EXCL) later.