From dev-return-8195-apmail-apr-dev-archive=apr.apache.org@apr.apache.org Thu Oct 10 23:12:03 2002 Return-Path: Delivered-To: apmail-apr-dev-archive@apr.apache.org Received: (qmail 99890 invoked by uid 500); 10 Oct 2002 23:12:02 -0000 Mailing-List: contact dev-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Delivered-To: mailing list dev@apr.apache.org Received: (qmail 99879 invoked from network); 10 Oct 2002 23:12:01 -0000 Message-Id: <5.1.0.14.2.20021010180521.02a46cd0@pop3.rowe-clan.net> X-Sender: admin%rowe-clan.net@pop3.rowe-clan.net X-Mailer: QUALCOMM Windows Eudora Version 5.1 Date: Thu, 10 Oct 2002 18:11:34 -0500 To: dev@apr.apache.org From: "William A. Rowe, Jr." Subject: Re: cvs commit: apr/file_io/unix filestat.c In-Reply-To: <5.1.0.14.2.20021007133115.03029720@pop3.rowe-clan.net> References: <20020922192642.85704.qmail@icarus.apache.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=====================_2037406==_" X-OriginalArrivalTime: 10 Oct 2002 23:11:52.0156 (UTC) FILETIME=[6B01B9C0:01C270B2] X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N --=====================_2037406==_ Content-Type: text/plain; charset="us-ascii" I lie. This patch didn't change a thing. The latest HP/UX security patches cause detection of dlopen(), while older builds only have shl support. This causes nightmares for bin builds on HPUX11. It seems we should check shl prior to dlopen(), since shl would be the defacto standard on HPUX or platforms that implement it, no? Attached is the patch for consideration... I'll apply on Monday if noone yells loudly. Bill At 01:31 PM 10/7/2002, William A. Rowe, Jr. wrote: >This patch borked DSO_USE_SHL detection for HP/UX. > >Ideas? > >Bill > >At 02:26 PM 9/22/2002, brianp@apache.org wrote: >>brianp 2002/09/22 12:26:42 >> >> Modified: . CHANGES configure.in >> build apr_hints.m4 >> file_io/unix filestat.c >> Log: >> Added support for SCO OpenServer 5 >> Submitted by: Kean Johnston >> Reviewed by: Brian Pane >> 1.483 +6 -4 apr/configure.in >> >> Index: configure.in >> =================================================================== >> RCS file: /home/cvs/apr/configure.in,v >> retrieving revision 1.482 >> retrieving revision 1.483 >> diff -u -r1.482 -r1.483 >> --- configure.in 20 Sep 2002 10:42:37 -0000 1.482 >> +++ configure.in 22 Sep 2002 19:26:41 -0000 1.483 >> @@ -1173,7 +1173,9 @@ >> >> APR_CHECK_SIZEOF_EXTENDED([#include ], pid_t, 8) >> >> -if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_int"; then >> +if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then >> + pid_t_fmt='#define APR_PID_T_FMT "hd"' >> +elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_int"; then >> pid_t_fmt='#define APR_PID_T_FMT "d"' >> elif test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_long"; then >> pid_t_fmt='#define APR_PID_T_FMT "ld"' >> @@ -1265,11 +1267,11 @@ >> [ >> AC_CHECK_FUNCS(NSLinkModule, [ tempdso="dyld" ], [ tempdso="no" ]) >> if test "$tempdso" = "no"; then >> - AC_CHECK_LIB(dl, dlopen, [ tempdso="dlfcn" APR_ADDTO(LIBS,-ldl) ], >> - tempdso="no") >> + AC_CHECK_FUNCS(dlopen, [ tempdso="dlfcn" ], [ tempdso="no" ]) >> fi >> if test "$tempdso" = "no"; then >> - AC_CHECK_FUNCS(dlopen, [ tempdso="dlfcn" ], [ tempdso="no" ]) >> + AC_CHECK_LIB(dl, dlopen, [ tempdso="dlfcn" APR_ADDTO(LIBS,-ldl) ], >> + tempdso="no") >> fi >> if test "$tempdso" = "no"; then >> AC_CHECK_LIB(root, load_image, tempdso="yes", tempdso="no") >> >> >> >> 1.44 +3 -3 apr/build/apr_hints.m4 >> >> Index: apr_hints.m4 >> =================================================================== >> RCS file: /home/cvs/apr/build/apr_hints.m4,v >> retrieving revision 1.43 >> retrieving revision 1.44 >> diff -u -r1.43 -r1.44 >> --- apr_hints.m4 9 May 2002 23:27:20 -0000 1.43 >> +++ apr_hints.m4 22 Sep 2002 19:26:41 -0000 1.44 >> @@ -173,14 +173,14 @@ >> APR_ADDTO(LDFLAGS, [-posix]) >> APR_ADDTO(LIBS, [-linet]) >> ;; >> - *-sco3*) >> + *-sco3.2v[234]*) >> APR_ADDTO(CPPFLAGS, [-DSCO -D_REENTRANT]) >> APR_ADDTO(CFLAGS, [-Oacgiltz]) >> APR_ADDTO(LIBS, [-lPW -lmalloc _i]) >> ;; >> - *-sco5*) >> + *-sco3.2v5*) >> APR_ADDTO(CPPFLAGS, [-DSCO5 -D_REENTRANT]) >> - APR_ADDTO(LIBS, [-lmalloc -lprot -ltinfo -lx]) >> + APR_ADDTO(LIBS, [-lprot]) >> ;; >> *-sco_sv*|*-SCO_SV*) >> APR_ADDTO(CPPFLAGS, [-DSCO -D_REENTRANT]) >> >> >> >> 1.57 +1 -1 apr/file_io/unix/filestat.c >> >> Index: filestat.c >> =================================================================== >> RCS file: /home/cvs/apr/file_io/unix/filestat.c,v >> retrieving revision 1.56 >> retrieving revision 1.57 >> diff -u -r1.56 -r1.57 >> --- filestat.c 1 Jul 2002 14:04:58 -0000 1.56 >> +++ filestat.c 22 Sep 2002 19:26:41 -0000 1.57 >> @@ -74,7 +74,7 @@ >> type = APR_PIPE; >> if (S_ISLNK(mode)) >> type = APR_LNK; >> -#ifndef BEOS >> +#if !defined(BEOS) && defined(S_ISSOCK) >> if (S_ISSOCK(mode)) >> type = APR_SOCK; >> #endif --=====================_2037406==_ Content-Type: text/plain; charset="us-ascii" Index: configure.in =================================================================== RCS file: /home/cvs/apr/configure.in,v retrieving revision 1.484 diff -u -r1.484 configure.in --- configure.in 3 Oct 2002 15:31:49 -0000 1.484 +++ configure.in 10 Oct 2002 23:09:42 -0000 @@ -1267,6 +1267,10 @@ [ AC_CHECK_FUNCS(NSLinkModule, [ tempdso="dyld" ], [ tempdso="no" ]) if test "$tempdso" = "no"; then + AC_CHECK_LIB(dld, shl_load, [ tempdso="shl" APR_ADDTO(LIBS,-ldld) ], + tempdso="no") + fi + if test "$tempdso" = "no"; then AC_CHECK_FUNCS(dlopen, [ tempdso="dlfcn" ], [ tempdso="no" ]) fi if test "$tempdso" = "no"; then @@ -1275,10 +1279,6 @@ fi if test "$tempdso" = "no"; then AC_CHECK_LIB(root, load_image, tempdso="yes", tempdso="no") - fi - if test "$tempdso" = "no"; then - AC_CHECK_LIB(dld, shl_load, [ tempdso="shl" APR_ADDTO(LIBS,-ldld) ], - tempdso="no") fi if test "$tempdso" = "no"; then case $host in --=====================_2037406==_--