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

Update to 0.6.3

Browse Source 
New custom patches:
- fix regress target in Makefile
- fix capsicum sandbox in fcgi mode
This commit is contained in:
Baptiste Daroussin 2015-07-19 12:35:21 +00:00
parent 660380cfd6
commit b58f226086
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=392502
7 changed files with 30 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/kcgi/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kcgi
PORTVERSION= 0.6.2
PORTREVISION= 1
PORTVERSION= 0.6.3
CATEGORIES= www devel
MASTER_SITES= http://kristaps.bsd.lv/kcgi/snapshots/

4
www/kcgi/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kcgi-0.6.2.tgz) = a1e5104c521f6528afd544c20e2c35e176916085659a878ae99eb59dc119534d
SIZE (kcgi-0.6.2.tgz) = 97487
SHA256 (kcgi-0.6.3.tgz) = db71973c11cdda5c2dec01ee906af59743422440a4c5a17797285a78dfdf98c6
SIZE (kcgi-0.6.3.tgz) = 97541

9
www/kcgi/files/patch-Makefile Normal file
View File

@ -0,0 +1,9 @@
--- Makefile.orig 2015-07-18 20:23:31 UTC
+++ Makefile
@@ -1,5 +1,5 @@
.SUFFIXES: .3 .3.html .8 .8.html .dot .svg .gnuplot .png .xml .html
-
+.PHONY: regress
# Comment if you don't need statically linked.
# This is only for the sample program!
#STATIC = -static

12
www/kcgi/files/patch-child.c
View File

@ -1,12 +0,0 @@
--- child.c.orig 2015-07-16 22:52:47 UTC
+++ child.c
@@ -17,9 +17,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#ifdef __linux__
#include <arpa/inet.h>
-#endif
#include <assert.h>
#include <ctype.h>

12
www/kcgi/files/patch-kcgiregress.c
View File

@ -1,12 +0,0 @@
--- kcgiregress.c.orig 2015-07-17 06:16:43 UTC
+++ kcgiregress.c
@@ -197,9 +197,6 @@ dochild_cgi(kcgi_regress_server child, v
setenv(headbuf, val, 1);
}
- if (NULL == head)
- goto out;
-
if (-1 != in)
close(in);
if (-1 != s)

20
www/kcgi/files/patch-output.c
View File

@ -1,20 +0,0 @@
--- output.c.orig 2015-07-16 22:52:47 UTC
+++ output.c
@@ -17,9 +17,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#ifdef __linux__
#include <arpa/inet.h>
-#endif
#include <assert.h>
#include <stdarg.h>
@@ -27,6 +25,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#ifdef HAVE_ZLIB
#include <zlib.h>
#endif

18
www/kcgi/files/patch-sandbox-capsicum.c Normal file
View File

@ -0,0 +1,18 @@
--- sandbox-capsicum.c.orig 2015-07-18 20:23:31 UTC
+++ sandbox-capsicum.c
@@ -39,10 +39,13 @@ ksandbox_capsicum_init_child(void *arg,
cap_rights_init(&rights);
- if (cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS)
+ cap_rights_init(&rights, CAP_READ|CAP_FSTAT);
+ /* Test for EBADF because STDIN_FILENO can be close in fcgi */
+ if (cap_rights_limit(STDIN_FILENO, &rights) < 0 && errno != ENOSYS &&
+ errno != EBADF)
XWARN("cap_rights_limit: STDIN_FILENO");
- cap_rights_init(&rights, CAP_WRITE);
+ cap_rights_init(&rights, CAP_WRITE|CAP_FSTAT);
if (cap_rights_limit(STDOUT_FILENO, &rights) < 0 && errno != ENOSYS)
XWARN("cap_rights_limit: STDOUT_FILENO");
if (cap_rights_limit(STDERR_FILENO, &rights) < 0 && errno != ENOSYS)