1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00

Upgrade to the latest 0.10.1 version.

This commit is contained in:
Mikhail Teterin 2001-06-02 13:42:09 +00:00
parent 551a15f1e3
commit 9af76baced
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=43429
6 changed files with 66 additions and 7 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= mod_dtcl
PORTVERSION= 0.8.12
PORTVERSION= 0.10.1
CATEGORIES= www tcl83
MASTER_SITES= http://tcl.apache.org/mod_dtcl/download/
@ -23,7 +23,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/libmod_dtcl.so.1* \
${PREFIX}/libexec/apache/mod_dtcl.so
${PREFIX}/sbin/apxs -e -A -n dtcl ${PREFIX}/libexec/apache/mod_dtcl.so
${MKDIR} ${PREFIX}/share/mod_dtcl
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/doc/mod_dtcl
${INSTALL_DATA} ${WRKSRC}/docs/*.?tml ${WRKSRC}/docs/*.gif \

View File

@ -1 +1 @@
MD5 (mod_dtcl-0.8.12.tar.gz) = ee71c3a6e2b60554fb22b988ab2a5cc1
MD5 (mod_dtcl-0.10.1.tar.gz) = 3e9575f3044e43158ed9c7e71dc240fb

View File

@ -9,9 +9,7 @@ DTCL_VERSION!= cat ${.CURDIR}/VERSION
CC!= ${PREFIX}/sbin/apxs -q CC
CFLAGS!= ${PREFIX}/sbin/apxs -q CFLAGS CFLAGS_SHLIB
CFLAGS+= -Wall -DSTATUS -DNO_DBM_REWRITEMAP ${INCLUDES}
CFLAGS+= -DDEBUG_SCRIPT_DIR="\"${PREFIX}/share/mod_dtcl/\""
CFLAGS+= -DDTCL_VERSION="\"${DTCL_VERSION}\""
CFLAGS+= ${INCLUDES} -DDTCL_VERSION="\"${DTCL_VERSION}\""
LIB= mod_dtcl
SHLIB_MAJOR=1
@ -24,6 +22,9 @@ NOPROFILE= True # to avoid building profiled library
INTERNALLIB= True # to avoid building a static version
SRCS= mod_dtcl.c
SRCS+= apache_cookie.c apache_multipart_buffer.c apache_request.c \
tcl_commands.c
NOMAN= True # don't bother with the man-page here, let the port handle it
all: ${SHLIB_NAME}

View File

@ -0,0 +1,10 @@
--- mod_dtcl.c Tue May 1 11:56:01 2001
+++ mod_dtcl.c Fri Jun 1 20:29:10 2001
@@ -792 +792,6 @@
- chan = Tcl_MakeFileChannel((ClientData *)fileno(upload->fp), TCL_READABLE);
+ union {
+ ClientData handle;
+ int fd;
+ } handle;
+ handle.fd = fileno(upload->fp);
+ chan = Tcl_MakeFileChannel(handle.handle, TCL_READABLE);

View File

@ -0,0 +1,50 @@
--- apache_request.c Mon Mar 19 12:36:42 2001
+++ apache_request.c Fri Jun 1 20:36:57 2001
@@ -328,20 +328,34 @@
request_rec *r = req->r;
FILE *fp;
- char prefix[] = "apreq";
- char *name;
- int fd, tries = 100;
-
- while (--tries > 0) {
- if ( (name = tempnam(req->temp_dir, prefix)) == NULL ) continue;
- fd = ap_popenf(r->pool, name, O_CREAT|O_EXCL|O_RDWR, 0600);
- if ( fd >= 0 )
- break; /* success */
- else
+#define PREFIX "apreq"
+ char *name = NULL;
+ int fd = -1;
+ char *dirs[5], **dir;
+
+ dirs[0] = getenv("TMPDIR"); dirs[1] = req->temp_dir;
+ dirs[2] = P_tmpdir; dirs[3] = "/tmp"; dirs[4] = NULL;
+
+ /*
+ * Look for the non-NULL directory. The order
+ * above is dictated by the tempnam(3) spec
+ */
+ for (dir = dirs; *dir == NULL; dir++) /* Nothing */;
+
+ /* Now, try to create the temporary file in on of the directories: */
+ for (fd = -1; fd == -1 && *dir; dir++) {
+ name = malloc(strlen(*dir) + sizeof PREFIX + 8);
+ if (!name) {
+ ap_log_rerror(REQ_ERROR, "[libapreq] could not allocate memory");
+ return(NULL);
+ }
+ sprintf(name, "%s/%s.XXXXXX", *dir, PREFIX);
+ fd = mkstemp(name);
+ if (fd == -1)
free(name);
}
-
- if ( tries == 0 || (fp = ap_pfdopen(r->pool, fd, "w+") ) == NULL ) {
+
+ if ( fd == -1 || (fp = ap_pfdopen(r->pool, fd, "w+") ) == NULL ) {
ap_log_rerror(REQ_ERROR,
- "[libapreq] could not open temp file '%s'", name);
+ "[libapreq] could not open temp file '%s'", name);
if ( fd >= 0 ) { remove(name); free(name); }
return NULL;

View File

@ -1,7 +1,6 @@
libexec/apache/mod_dtcl.so
@exec %D/sbin/apxs -e -A -n dtcl %D/%F
@unexec %D/sbin/apxs -e -A -n dtcl %D/%F
@dirrm share/mod_dtcl
%%PORTDOCS%%share/doc/mod_dtcl/asf_logo.gif
%%PORTDOCS%%share/doc/mod_dtcl/documentation.html
%%PORTDOCS%%share/doc/mod_dtcl/dtcl.gif