sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add a patch for Squid bug #1857 (segfault on certain FTP URLs).

Browse source 
- Bump Portrevision

PR:		ports/107961
Submitted by:	Thomas-Martin Sec <tmseck@netcologne.de>
This commit is contained in:
Martin Wilke 2007-01-22 08:49:50 +00:00
parent df3598a8e4
commit 5859c78c45
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=182965
8 changed files with 104 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/squid/Makefile
View file

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www2.us.squid-cache.org/%SUBDIR%/ \
@ -252,7 +252,7 @@ CONFIGURE_ARGS+= --enable-carp
CONFIGURE_ARGS+= --enable-ssl \
--with-openssl="${OPENSSLBASE}"
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${OPENSSLLIB}
.endif
.if defined(WITH_SQUID_PINGER)
CONFIGURE_ARGS+= --enable-icmp

24
www/squid/files/patch-src-ftp.c Normal file
View file

@ -0,0 +1,24 @@
Patch for Squid bug #1857, obtained from Squid bugzilla 2007-01-15.
--- src/ftp.c.orig Sun Feb 26 00:34:13 2006
+++ src/ftp.c Mon Jan 15 19:46:29 2007
@@ -441,7 +441,7 @@
ftpState->flags.dir_slash ? rfc1738_escape_part(ftpState->old_filepath) : ".");
} else if (ftpState->typecode == 'D') {
const char *path = ftpState->flags.dir_slash ? ftpState->filepath : ".";
- storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", html_quote(path));
+ storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", rfc1738_escape_part(path));
}
storeAppendPrintf(e, "<HR noshade size=\"1px\">\n");
storeAppendPrintf(e, "<ADDRESS>\n");
@@ -689,8 +689,8 @@
snprintf(html, 8192, "%s\n", line);
return html;
}
- if (ftpState->flags.dir_slash)
- snprintf(prefix, sizeof(prefix), "%s/", rfc1738_escape_part(ftpState->dirpath));
+ if (ftpState->flags.dir_slash && ftpState->dirpath && ftpState->typecode != 'D' )
+ snprintf(prefix, 2048, "%s/", rfc1738_escape_part(ftpState->dirpath));
else
prefix[0] = '\0';
/* Handle builtin <dirup> */

4
www/squid25/Makefile
View file

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www2.us.squid-cache.org/%SUBDIR%/ \
@ -252,7 +252,7 @@ CONFIGURE_ARGS+= --enable-carp
CONFIGURE_ARGS+= --enable-ssl \
--with-openssl="${OPENSSLBASE}"
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${OPENSSLLIB}
.endif
.if defined(WITH_SQUID_PINGER)
CONFIGURE_ARGS+= --enable-icmp

24
www/squid25/files/patch-src-ftp.c Normal file
View file

@ -0,0 +1,24 @@
Patch for Squid bug #1857, obtained from Squid bugzilla 2007-01-15.
--- src/ftp.c.orig Sun Feb 26 00:34:13 2006
+++ src/ftp.c Mon Jan 15 19:46:29 2007
@@ -441,7 +441,7 @@
ftpState->flags.dir_slash ? rfc1738_escape_part(ftpState->old_filepath) : ".");
} else if (ftpState->typecode == 'D') {
const char *path = ftpState->flags.dir_slash ? ftpState->filepath : ".";
- storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", html_quote(path));
+ storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", rfc1738_escape_part(path));
}
storeAppendPrintf(e, "<HR noshade size=\"1px\">\n");
storeAppendPrintf(e, "<ADDRESS>\n");
@@ -689,8 +689,8 @@
snprintf(html, 8192, "%s\n", line);
return html;
}
- if (ftpState->flags.dir_slash)
- snprintf(prefix, sizeof(prefix), "%s/", rfc1738_escape_part(ftpState->dirpath));
+ if (ftpState->flags.dir_slash && ftpState->dirpath && ftpState->typecode != 'D' )
+ snprintf(prefix, 2048, "%s/", rfc1738_escape_part(ftpState->dirpath));
else
prefix[0] = '\0';
/* Handle builtin <dirup> */

4
www/squid30/Makefile
View file

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www2.us.squid-cache.org/%SUBDIR%/ \
@ -252,7 +252,7 @@ CONFIGURE_ARGS+= --enable-carp
CONFIGURE_ARGS+= --enable-ssl \
--with-openssl="${OPENSSLBASE}"
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${OPENSSLLIB}
.endif
.if defined(WITH_SQUID_PINGER)
CONFIGURE_ARGS+= --enable-icmp

24
www/squid30/files/patch-src-ftp.c Normal file
View file

@ -0,0 +1,24 @@
Patch for Squid bug #1857, obtained from Squid bugzilla 2007-01-15.
--- src/ftp.c.orig Sun Feb 26 00:34:13 2006
+++ src/ftp.c Mon Jan 15 19:46:29 2007
@@ -441,7 +441,7 @@
ftpState->flags.dir_slash ? rfc1738_escape_part(ftpState->old_filepath) : ".");
} else if (ftpState->typecode == 'D') {
const char *path = ftpState->flags.dir_slash ? ftpState->filepath : ".";
- storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", html_quote(path));
+ storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", rfc1738_escape_part(path));
}
storeAppendPrintf(e, "<HR noshade size=\"1px\">\n");
storeAppendPrintf(e, "<ADDRESS>\n");
@@ -689,8 +689,8 @@
snprintf(html, 8192, "%s\n", line);
return html;
}
- if (ftpState->flags.dir_slash)
- snprintf(prefix, sizeof(prefix), "%s/", rfc1738_escape_part(ftpState->dirpath));
+ if (ftpState->flags.dir_slash && ftpState->dirpath && ftpState->typecode != 'D' )
+ snprintf(prefix, 2048, "%s/", rfc1738_escape_part(ftpState->dirpath));
else
prefix[0] = '\0';
/* Handle builtin <dirup> */

4
www/squid31/Makefile
View file

@ -73,7 +73,7 @@
PORTNAME= squid
PORTVERSION= 2.5.14
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/%SUBDIR%/ \
http://www2.us.squid-cache.org/%SUBDIR%/ \
@ -252,7 +252,7 @@ CONFIGURE_ARGS+= --enable-carp
CONFIGURE_ARGS+= --enable-ssl \
--with-openssl="${OPENSSLBASE}"
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -L${OPENSSLLIB}
.endif
.if defined(WITH_SQUID_PINGER)
CONFIGURE_ARGS+= --enable-icmp

24
www/squid31/files/patch-src-ftp.c Normal file
View file

@ -0,0 +1,24 @@
Patch for Squid bug #1857, obtained from Squid bugzilla 2007-01-15.
--- src/ftp.c.orig Sun Feb 26 00:34:13 2006
+++ src/ftp.c Mon Jan 15 19:46:29 2007
@@ -441,7 +441,7 @@
ftpState->flags.dir_slash ? rfc1738_escape_part(ftpState->old_filepath) : ".");
} else if (ftpState->typecode == 'D') {
const char *path = ftpState->flags.dir_slash ? ftpState->filepath : ".";
- storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", html_quote(path));
+ storeAppendPrintf(e, "<A HREF=\"%s/\">[As extended directory]</A>\n", rfc1738_escape_part(path));
}
storeAppendPrintf(e, "<HR noshade size=\"1px\">\n");
storeAppendPrintf(e, "<ADDRESS>\n");
@@ -689,8 +689,8 @@
snprintf(html, 8192, "%s\n", line);
return html;
}
- if (ftpState->flags.dir_slash)
- snprintf(prefix, sizeof(prefix), "%s/", rfc1738_escape_part(ftpState->dirpath));
+ if (ftpState->flags.dir_slash && ftpState->dirpath && ftpState->typecode != 'D' )
+ snprintf(prefix, 2048, "%s/", rfc1738_escape_part(ftpState->dirpath));
else
prefix[0] = '\0';
/* Handle builtin <dirup> */