diff options
| author | gahr <gahr@FreeBSD.org> | 2013-02-06 21:37:56 +0800 |
|---|---|---|
| committer | gahr <gahr@FreeBSD.org> | 2013-02-06 21:37:56 +0800 |
| commit | f7060fe306554f7b1cd97582b93b06ebeac1a17e (patch) | |
| tree | 49ed8631f33e08eb9d561ef187ba1a74bbe20499 /www/websh | |
| parent | 49da9842b03049b13a3c2d2dadf55396187325ca (diff) | |
| download | freebsd-ports-gnome-f7060fe306554f7b1cd97582b93b06ebeac1a17e.tar.gz freebsd-ports-gnome-f7060fe306554f7b1cd97582b93b06ebeac1a17e.tar.zst freebsd-ports-gnome-f7060fe306554f7b1cd97582b93b06ebeac1a17e.zip | |
- Fix build with -Werror and clang
Reported upstream as:
https://issues.apache.org/bugzilla/show_bug.cgi?id=54531
Diffstat (limited to 'www/websh')
| -rw-r--r-- | www/websh/files/patch-generic_interpool.c | 11 | ||||
| -rw-r--r-- | www/websh/files/patch-generic_logtosyslog.c | 11 | ||||
| -rw-r--r-- | www/websh/files/patch-generic_url.c | 34 |
3 files changed, 56 insertions, 0 deletions
diff --git a/www/websh/files/patch-generic_interpool.c b/www/websh/files/patch-generic_interpool.c new file mode 100644 index 000000000000..5d3bca0b8218 --- /dev/null +++ b/www/websh/files/patch-generic_interpool.c @@ -0,0 +1,11 @@ +--- ../generic/interpool.c.orig 2013-02-05 13:59:15.000000000 +0100 ++++ ../generic/interpool.c 2013-02-05 14:00:59.000000000 +0100 +@@ -573,7 +573,7 @@ + Tcl_GetStringResult(conf->mainInterp)); + #else /* APACHE2 */ + ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0, +- conf->server, Tcl_GetStringResult(conf->mainInterp)); ++ conf->server, "%s", Tcl_GetStringResult(conf->mainInterp)); + #endif /* APACHE2 */ + return 0; + } diff --git a/www/websh/files/patch-generic_logtosyslog.c b/www/websh/files/patch-generic_logtosyslog.c new file mode 100644 index 000000000000..ce22ec811a8c --- /dev/null +++ b/www/websh/files/patch-generic_logtosyslog.c @@ -0,0 +1,11 @@ +--- ../generic/logtosyslog.c.orig 2013-02-05 13:55:15.000000000 +0100 ++++ ../generic/logtosyslog.c 2013-02-05 13:55:39.000000000 +0100 +@@ -113,7 +113,7 @@ + /* ---------------------------------------------------------------------- + * gonna call syslogName msg + * ------------------------------------------------------------------- */ +- syslog((int) (*logToSyslogData), msg); ++ syslog((int) (*logToSyslogData), "%s", msg); + + return TCL_OK; + } diff --git a/www/websh/files/patch-generic_url.c b/www/websh/files/patch-generic_url.c new file mode 100644 index 000000000000..e65f21969153 --- /dev/null +++ b/www/websh/files/patch-generic_url.c @@ -0,0 +1,34 @@ +--- ../generic/url.c.orig 2013-02-05 13:56:35.000000000 +0100 ++++ ../generic/url.c 2013-02-05 13:58:36.000000000 +0100 +@@ -61,7 +61,10 @@ + PORT, + SCRIPTNAME, + PATHINFO, +- QUERYSTRING ++ QUERYSTRING, ++ URLCFGRESET, ++ URLCFGURLFORMAT, ++ URLCFGEND + }; + + +@@ -362,7 +365,7 @@ + Tcl_Obj *tmp = NULL; + int errCnt = 0; + +- if ((urlData == NULL)) ++ if (urlData == NULL) + return NULL; + + errCnt = 0; +@@ -840,10 +843,6 @@ + { + + +-#define URLCFGRESET (enum urlElement)QUERYSTRING+1 +-#define URLCFGURLFORMAT (enum urlElement)QUERYSTRING+2 +-#define URLCFGEND (enum urlElement)QUERYSTRING+3 +- + UrlData *urlData = NULL; + /* note: this could be dynamic, but 20 is enough ... */ + char *params[20]; |