head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.38 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.36 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.34 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.32 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.30 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.28 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.26 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.24 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.22 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.20 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.18 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.16 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.14 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.12 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.10 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.8 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.6 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.4 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.2 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.2.0.2 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.1.1.1.0.4 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.2 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2005.11.03.06.28.28; author taca; state dead; branches; next 1.2; 1.2 date 2005.09.18.13.36.30; author taca; state Exp; branches; next 1.1; 1.1 date 2005.03.06.16.36.08; author taca; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2005.03.06.16.36.08; author taca; state Exp; branches 1.1.1.1.4.1; next ; 1.1.1.1.4.1 date 2005.09.22.16.56.47; author salo; state Exp; branches; next ; desc @@ 1.3 log @Remove ruby16-base package. It's time to say good-bye. @ text @$NetBSD: patch-aa,v 1.2 2005/09/18 13:36:30 taca Exp $ --- configure.in.orig 2002-11-13 18:59:18.000000000 +0000 +++ configure.in @@@@ -264,6 +264,8 @@@@ os2_emx*) LIBS="-lm $LIBS" ac_cv_lib_dir_opendir=no;; msdosdjgpp*) LIBS="-lm $LIBS" ac_cv_func_getpgrp_void=yes;; +interix3*) LIBS="-lm $LIBS" + ac_cv_func_getpgrp_void=yes;; freebsd*) LIBS="-lm $LIBS" AC_CACHE_CHECK([whether -lxpg4 has to be linked], rb_cv_lib_xpg4_needed, @@@@ -300,6 +302,9 @@@@ freebsd*) LIBS="-lm $LIBS" fi fi ;; +dragonfly*) LIBS="-lm $LIBS" + MAINLIBS="-pthread $MAINLIBS" + ;; linux*) LIBS="-lm $LIBS" case "$target_cpu" in alpha*) @@@@ -324,7 +329,8 @@@@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ - syscall.h pwd.h a.out.h utime.h memory.h direct.h sys/resource.h) + syscall.h pwd.h a.out.h utime.h memory.h direct.h sys/resource.h\ + pthread.h ucontext.h) dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_UID_T @@@@ -456,6 +462,49 @@@@ else AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt) fi +if test "$enable_pthread" = "yes"; then + AC_CHECK_LIB(pthread, pthread_kill, + rb_with_pthread=yes, rb_with_pthread=no) + if test "$rb_with_pthread" = "yes"; then + LIBS="-lpthread $LIBS" + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) + AC_DEFINE(HAVE_LIBPTHREAD) + else + AC_CHECK_LIB(pthreads, pthread_kill, + rb_with_pthread=yes, rb_with_pthread=no) + if test "$rb_with_pthread" = "yes"; then + LIBS="-lpthreads $LIBS" + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) + AC_DEFINE(HAVE_LIBPTHREAD) + else + AC_CHECK_LIB(c, pthread_kill, + rb_with_pthread=yes, rb_with_pthread=no) + if test "$rb_with_pthread" = "yes"; then + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) + AC_DEFINE(HAVE_LIBPTHREAD) + else + AC_CHECK_LIB(c_r, pthread_kill, + rb_with_pthread=yes, rb_with_pthread=no) + if test "$rb_with_pthread" = "yes"; then + AC_DEFINE(_REENTRANT) + AC_DEFINE(_THREAD_SAFE) + AC_DEFINE(HAVE_LIBPTHREAD) + MAINLIBS="-pthread $MAINLIBS" + else + AC_MSG_WARN('Don\'t know how to find pthread library on your system -- thread support disabled') + fi + fi + fi + fi + AC_CHECK_FUNC(nanosleep) + if test "$ac_cv_func_nanosleep" = "no"; then + AC_CHECK_LIB(rt, nanosleep, AC_DEFINE(HAVE_NANOSLEEP)) + fi +fi + dnl default value for $KANJI DEFAULT_KCODE="KCODE_NONE" @@@@ -549,6 +598,7 @@@@ if test "$with_dln_a_out" != yes; then cygwin*) ;; mingw*) ;; netbsd*) CCDLFLAGS=-fPIC;; + interix3*) ;; *) CCDLFLAGS=-fPIC;; esac else @@@@ -563,7 +613,7 @@@@ if test "$with_dln_a_out" != yes; then case "$target_os" in hpux*) DLDFLAGS="-E" - LDSHARED='ld -b' + LDSHARED="ld -b $LDSHARED" LDFLAGS="-Wl,-E" rb_cv_dlopen=yes;; solaris*) if test "$GCC" = yes; then @@@@ -578,7 +628,8 @@@@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes;; sunos*) LDSHARED='ld -assert nodefinitions' rb_cv_dlopen=yes;; - irix*) LDSHARED='ld -shared' + irix*) LDSHARED='ld -shared -L${X11BASE}/lib${ABI}' + LDFLAGS="-L${X11BASE}/lib${ABI} ${LDFLAGS}" rb_cv_dlopen=yes;; sysv4*) LDSHARED='ld -G' rb_cv_dlopen=yes;; @@@@ -589,6 +640,12 @@@@ if test "$with_dln_a_out" != yes; then osf*) LDSHARED="$CC -shared" rb_cv_dlopen=yes ;; linux*) LDSHARED="$CC -shared" + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -Wl,-export-dynamic" + DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' + LIBPATHFLAG=' -L%1$-s' + RPATHFLAG=' -Wl,-R%1$-s' + fi rb_cv_dlopen=yes ;; freebsd*) LDSHARED="$CC -shared" if test "$rb_cv_binary_elf" = yes; then @@@@ -598,11 +655,22 @@@@ if test "$with_dln_a_out" != yes; then test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes ;; - netbsd*) LDSHARED='${CC} -shared' + dragonfly*|netbsd*) + LDSHARED='${CC} -shared' if test "$rb_cv_binary_elf" = yes; then LDFLAGS="-Wl,-export-dynamic" + DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' + LIBPATHFLAG=' -L%1$-s' + RPATHFLAG=' -Wl,-R%1$-s' fi rb_cv_dlopen=yes ;; + interix3*) LDSHARED='${CC} -shared' + LDFLAGS="-Wl,-E" + # use special random-slot linkage in 0x[56]XXXXXXX + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' + LIBPATHFLAG=' -L%1$-s' + RPATHFLAG=' -Wl,-R%1$-s' + rb_cv_dlopen=yes ;; openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" rb_cv_dlopen=yes ;; bsdi3*) case "$CC" in @@@@ -858,6 +926,7 @@@@ if test "$enable_shared" = 'yes'; then ;; linux*) LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' + LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)' LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so' ;; freebsd*) @@@@ -868,7 +937,7 @@@@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES='' fi ;; - netbsd*) + dragonfly*|netbsd*) SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)' @@@@ -879,6 +948,14 @@@@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES="" fi ;; + interix3*) + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + # link explicitly to 0x48000000 + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' + LIBRUBYARG='-Wl,-R -Wl,${prefix}/lib -L${prefix}/lib -L. -l$(RUBY_INSTALL_NAME)' + LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_INSTALL_NAME).so' + ;; openbsd*) SOLIBS='$(LIBS)' ;; @@@@ -1071,6 +1148,10 @@@@ if test "$search_path" != ""; then AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path") fi +AC_ARG_ENABLE(pthread, + [--enable-pthread use pthread library.], + [enable_pthread=$enableval], [enable_pthread=no]) + if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then echo "config.h unchanged" else @ 1.2 log @Adding DrafonFly BSD support provided by Joerg Sonnenberger. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2005/01/21 16:36:41 tv Exp $ d3 1 a3 1 --- configure.in.orig 2002-11-13 13:59:18.000000000 -0500 d14 11 a24 1 @@@@ -324,7 +326,8 @@@@ AC_HEADER_STDC d34 1 a34 1 @@@@ -456,6 +459,49 @@@@ else d84 1 a84 1 @@@@ -549,6 +595,7 @@@@ if test "$with_dln_a_out" != yes; then d92 1 a92 1 @@@@ -563,7 +610,7 @@@@ if test "$with_dln_a_out" != yes; then d101 1 a101 1 @@@@ -578,7 +625,8 @@@@ if test "$with_dln_a_out" != yes; then d111 1 a111 1 @@@@ -589,6 +637,12 @@@@ if test "$with_dln_a_out" != yes; then d124 7 a130 2 @@@@ -601,8 +655,18 @@@@ if test "$with_dln_a_out" != yes; then netbsd*) LDSHARED='${CC} -shared' d148 1 a148 1 @@@@ -858,6 +922,7 @@@@ if test "$enable_shared" = 'yes'; then d156 10 a165 1 @@@@ -879,6 +944,14 @@@@ if test "$enable_shared" = 'yes'; then d180 1 a180 1 @@@@ -1071,6 +1144,10 @@@@ if test "$search_path" != ""; then @ 1.1.1.1 log @Importing ruby16-base package. This is minimum ruby 1.6.8 based on current ruby16 and ruby16 package will be meta pacakge later. @ text @@ 1.1.1.1.4.1 log @Pullup ticket 771 - requested by Takahiro Kambe security and portability fixes for ruby16-base Revisions pulled up: - pkgsrc/lang/ruby16-base/Makefile 1.4, 1.5 - pkgsrc/lang/ruby16-base/distinfo 1.2, 1.3 - pkgsrc/lang/ruby16-base/patches/patch-aa 1.2 - pkgsrc/lang/ruby16-base/patches/patch-ab 1.2 - pkgsrc/lang/ruby16-base/patches/patch-al 1.1 Module Name: pkgsrc Committed By: taca Date: Sun Sep 18 13:36:30 UTC 2005 Modified Files: pkgsrc/lang/ruby16-base: Makefile distinfo pkgsrc/lang/ruby16-base/patches: patch-aa patch-ab Added Files: pkgsrc/lang/ruby16-base/patches: patch-al Log Message: Adding DrafonFly BSD support provided by Joerg Sonnenberger. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: taca Date: Wed Sep 21 14:04:55 UTC 2005 Modified Files: pkgsrc/lang/ruby16-base: Makefile distinfo Log Message: Add a patch for fix the security problem which allows an arbitrary code to run bypassing the safe level check. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2005/09/18 13:36:30 taca Exp $ d3 1 a3 1 --- configure.in.orig 2002-11-13 18:59:18.000000000 +0000 d14 1 a14 11 @@@@ -300,6 +302,9 @@@@ freebsd*) LIBS="-lm $LIBS" fi fi ;; +dragonfly*) LIBS="-lm $LIBS" + MAINLIBS="-pthread $MAINLIBS" + ;; linux*) LIBS="-lm $LIBS" case "$target_cpu" in alpha*) @@@@ -324,7 +329,8 @@@@ AC_HEADER_STDC d24 1 a24 1 @@@@ -456,6 +462,49 @@@@ else d74 1 a74 1 @@@@ -549,6 +598,7 @@@@ if test "$with_dln_a_out" != yes; then d82 1 a82 1 @@@@ -563,7 +613,7 @@@@ if test "$with_dln_a_out" != yes; then d91 1 a91 1 @@@@ -578,7 +628,8 @@@@ if test "$with_dln_a_out" != yes; then d101 1 a101 1 @@@@ -589,6 +640,12 @@@@ if test "$with_dln_a_out" != yes; then d114 2 a115 7 @@@@ -598,11 +655,22 @@@@ if test "$with_dln_a_out" != yes; then test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes ;; - netbsd*) LDSHARED='${CC} -shared' + dragonfly*|netbsd*) + LDSHARED='${CC} -shared' d133 1 a133 1 @@@@ -858,6 +926,7 @@@@ if test "$enable_shared" = 'yes'; then d141 1 a141 10 @@@@ -868,7 +937,7 @@@@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES='' fi ;; - netbsd*) + dragonfly*|netbsd*) SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)' @@@@ -879,6 +948,14 @@@@ if test "$enable_shared" = 'yes'; then d156 1 a156 1 @@@@ -1071,6 +1148,10 @@@@ if test "$search_path" != ""; then @