pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/rvault rvault: curl fix was incorrect



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eaee8acc075b
branches:  trunk
changeset: 390609:eaee8acc075b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Dec 24 00:10:26 2022 +0000

description:
rvault: curl fix was incorrect

Doesn't build for me for fuse reasons, so testing is hard. Let's
remove -Werror, we don't want that in pkgsrc anyway.

diffstat:

 security/rvault/Makefile                       |   4 +++-
 security/rvault/distinfo                       |   3 +--
 security/rvault/patches/patch-core_http__req.c |  16 ----------------
 3 files changed, 4 insertions(+), 19 deletions(-)

diffs (50 lines):

diff -r ac4218a85d10 -r eaee8acc075b security/rvault/Makefile
--- a/security/rvault/Makefile  Fri Dec 23 21:44:20 2022 +0000
+++ b/security/rvault/Makefile  Sat Dec 24 00:10:26 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/10/26 10:31:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/12/24 00:10:26 wiz Exp $
 
 DISTNAME=      rvault-0.3
 PKGREVISION=   7
@@ -21,6 +21,8 @@
 MAKE_ENV+=     BINDIR=${PREFIX}/bin
 MAKE_ENV+=     MANDIR=${PREFIX}/${PKGMANDIR}
 
+BUILDLINK_TRANSFORM+=  rm:-Werror
+
 .include "../../security/scrypt/buildlink3.mk"
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff -r ac4218a85d10 -r eaee8acc075b security/rvault/distinfo
--- a/security/rvault/distinfo  Fri Dec 23 21:44:20 2022 +0000
+++ b/security/rvault/distinfo  Sat Dec 24 00:10:26 2022 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2022/12/23 12:42:09 wiz Exp $
+$NetBSD: distinfo,v 1.9 2022/12/24 00:10:26 wiz Exp $
 
 BLAKE2s (rvault-0.3.tar.gz) = 4ff52e5edf6156c4c9cc0046f02ef8845e9678a2c4719c64a1f7e83a040bd1b6
 SHA512 (rvault-0.3.tar.gz) = 0687d14cf646adccb3c09a3d5a16e771ef9b046bd4e596a487413e83e06709b27a62c2f08a9a23d47f6253cadc1fb7cbe53262455faa6628d5b23d8539f12271
 Size (rvault-0.3.tar.gz) = 76921 bytes
 SHA1 (patch-core_cli.c) = 8214fe7f75273a0d434751b600d89d70f735a24c
-SHA1 (patch-core_http__req.c) = fbdcb674c577a21a36713fe9868294539e8b229c
diff -r ac4218a85d10 -r eaee8acc075b security/rvault/patches/patch-core_http__req.c
--- a/security/rvault/patches/patch-core_http__req.c    Fri Dec 23 21:44:20 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-core_http__req.c,v 1.2 2022/12/23 12:42:09 wiz Exp $
-
-core/http_req.c:55:2: error: 'CURLOPT_PROTOCOLS' is deprecated: since 7.85.0. Use CURLOPT_PROTOCOLS_STR
-https://github.com/rmind/rvault/pull/64
-
---- core/http_req.c.orig       2020-04-22 16:11:18.000000000 +0000
-+++ core/http_req.c
-@@ -52,7 +52,7 @@ http_request(const char *url, http_req_t
-       if ((curl = curl_easy_init()) == NULL) {
-               return -1;
-       }
--      curl_easy_setopt(curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS);
-+      curl_easy_setopt(curl, CURLOPT_PROTOCOLS_STR, CURLPROTO_HTTPS);
-       if ((res = curl_easy_setopt(curl, CURLOPT_URL, url)) != CURLE_OK) {
-               app_log(LOG_ERR, "http without TLS is not allowed");
-               goto out;



Home | Main Index | Thread Index | Old Index