diff options
| author |   Andrew Clemons | 2022-03-08 12:11:11 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2022-03-09 11:21:07 +0100 |
| commit | 8e26a77a3a0c1e35ac4d450e5e32b7eda006d697 (patch) | |
| tree | 19eae9391319bf3ae3c5d0e7197816c180debdba | |
| parent | f1b876368c6f59e53289bc92f55b44e057173b00 (diff) | |
| download | slackbuilds-8e26a77a3a0c1e35ac4d450e5e32b7eda006d697.tar.gz | |
network/varnish: Fix build on 15.0.
Apply patch from upstream master.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | network/varnish/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch | 23 | ||||
| -rw-r--r-- | network/varnish/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch | 33 | ||||
| -rw-r--r-- | network/varnish/varnish.SlackBuild | 2 |
3 files changed, 58 insertions, 0 deletions
diff --git a/network/varnish/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch b/network/varnish/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch new file mode 100644 index 0000000000..a1cc4e65dd --- /dev/null +++ b/network/varnish/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch @@ -0,0 +1,23 @@ +From 0051cbe3b9cc24586e0ad99cff72041c6df944b8 Mon Sep 17 00:00:00 2001 +From: Poul-Henning Kamp <phk@FreeBSD.org> +Date: Thu, 15 Oct 2020 07:35:04 +0000 +Subject: [PATCH] Import from VTest: Don't use explicit buffer size with no + buffer + +--- + bin/varnishtest/vtc_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c +index 1deea4ab78..3c3887450c 100644 +--- a/bin/varnishtest/vtc_main.c ++++ b/bin/varnishtest/vtc_main.c +@@ -698,7 +698,7 @@ main(int argc, char * const *argv) + else + tmppath = strdup("/tmp"); + +- cwd = getcwd(NULL, PATH_MAX); ++ cwd = getcwd(NULL, 0); + extmacro_def("pwd", "%s", cwd); + + vmod_path = NULL; diff --git a/network/varnish/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch b/network/varnish/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch new file mode 100644 index 0000000000..fabb9aacb6 --- /dev/null +++ b/network/varnish/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch @@ -0,0 +1,33 @@ +From f04d7df6e6d5b350740e01d24749a3930390b7a0 Mon Sep 17 00:00:00 2001 +From: Nils Goroll <nils.goroll@uplex.de> +Date: Thu, 15 Oct 2020 12:01:35 +0200 +Subject: [PATCH] vtest: put cwd on the stack + +0051cbe3b9cc24586e0ad99cff72041c6df944b8 did not work on +solaris-descendents, the man page clearly states that the size argument +also determines the buffer to be malloc()ed for a NULL buffer argument. +--- + bin/varnishtest/vtc_main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c +index 3c3887450c..1b322f8dea 100644 +--- a/bin/varnishtest/vtc_main.c ++++ b/bin/varnishtest/vtc_main.c +@@ -686,6 +686,7 @@ main(int argc, char * const *argv) + int use_cleaner = 0; + uintmax_t bufsiz; + const char *p; ++ char buf[PATH_MAX]; + + argv0 = strrchr(argv[0], '/'); + if (argv0 == NULL) +@@ -698,7 +699,7 @@ main(int argc, char * const *argv) + else + tmppath = strdup("/tmp"); + +- cwd = getcwd(NULL, 0); ++ cwd = getcwd(buf, sizeof buf); + extmacro_def("pwd", "%s", cwd); + + vmod_path = NULL; diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild index 9d5e3e8d67..7e0a44740c 100644 --- a/network/varnish/varnish.SlackBuild +++ b/network/varnish/varnish.SlackBuild @@ -55,6 +55,8 @@ cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tgz cd $PRGNAM-$VERSION +patch -p1 -i $CWD/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch +patch -p1 -i $CWD/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ |