* [PR PATCH] httpdirfs: update to 1.2.4.
@ 2023-02-19 19:09 icp1994
2023-02-19 19:42 ` [PR PATCH] [Updated] " icp1994
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: icp1994 @ 2023-02-19 19:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There is a new pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages httpdirfs
https://github.com/void-linux/void-packages/pull/42352
httpdirfs: update to 1.2.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/42352.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-httpdirfs-42352.patch --]
[-- Type: text/x-diff, Size: 4107 bytes --]
From 403d0b82f6721aab5212ebf52ca7923e0f718116 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 19 Feb 2023 22:23:17 +0530
Subject: [PATCH] httpdirfs: update to 1.2.4.
---
srcpkgs/httpdirfs/patches/fix-coding.patch | 30 ----------------------
srcpkgs/httpdirfs/patches/musl.patch | 17 +++++-------
srcpkgs/httpdirfs/template | 28 ++++++++++++++------
3 files changed, 26 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/httpdirfs/patches/fix-coding.patch
diff --git a/srcpkgs/httpdirfs/patches/fix-coding.patch b/srcpkgs/httpdirfs/patches/fix-coding.patch
deleted file mode 100644
index da80471f23c8..000000000000
--- a/srcpkgs/httpdirfs/patches/fix-coding.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/main.c src/main.c
-index 154f052..b44463c 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -290,10 +290,10 @@ static void print_help(char *program_name, int long_help)
-
- static void print_version()
- {
-- fprintf(stderr, "HTTPDirFS version " VERSION "\n");
-+ fprintf(stderr, "HTTPDirFS version: VERSION");
- /* --------- Print off SSL engine version --------- */
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-- fprintf(stderr, "libcurl SSL engine: %s\n", data->ssl_version);
-+ fprintf(stderr, "\nlibcurl SSL engine: %s\n", data->ssl_version);
- }
-
- static void print_long_help()
-diff --git src/util.h src/util.h
-index d7c7c15..4ae9ce8 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -24,7 +24,7 @@
- /**
- * \brief the default user agent string
- */
--#define DEFAULT_USER_AGENT "HTTPDirFS-" VERSION
-+#define DEFAULT_USER_AGENT "HTTPDirFS-VERSION"
-
-
-
diff --git a/srcpkgs/httpdirfs/patches/musl.patch b/srcpkgs/httpdirfs/patches/musl.patch
index d9cce2e8c3ab..a2a95b3d8f9a 100644
--- a/srcpkgs/httpdirfs/patches/musl.patch
+++ b/srcpkgs/httpdirfs/patches/musl.patch
@@ -1,23 +1,19 @@
-diff --git src/util.c src/util.c
-index f2141bd..10e1549 100644
--- a/src/util.c
+++ b/src/util.c
-@@ -2,8 +2,9 @@
-
- #include <openssl/md5.h>
+@@ -7,7 +7,9 @@
#include <uuid/uuid.h>
--
+
+ #include <errno.h>
+#ifdef __GLIBC__
#include <execinfo.h>
+#endif
- #include <unistd.h>
#include <stdlib.h>
#include <string.h>
-@@ -147,13 +148,15 @@ void exit_failure(void)
- {
+ #include <unistd.h>
+@@ -79,12 +81,15 @@
int nptrs;
void *buffer[BT_BUF_SIZE];
--
+
+#ifdef __GLIBC__
nptrs = backtrace(buffer, BT_BUF_SIZE);
+#endif
@@ -30,4 +26,3 @@ index f2141bd..10e1549 100644
+#endif
exit(EXIT_FAILURE);
}
-
diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 224b3ffd959e..5ae501772b1c 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,21 +1,33 @@
# Template file for 'httpdirfs'
pkgname=httpdirfs
-version=1.2.0
-revision=5
+version=1.2.4
+revision=1
build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config help2man"
makedepends="libcurl-devel fuse-devel gumbo-parser-devel
libuuid-devel expat-devel"
short_desc="Mount HTTP directory listings, with a permanent cache"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://github.com/fangfufu/httpdirfs"
-distfiles="https://github.com/fangfufu/httpdirfs/archive/${version}.tar.gz"
-checksum=05be4d83434eaea002f550b77aed6c05ff135927662d53a6e2b224e766a50a9a
+changelog="https://raw.githubusercontent.com/fangfufu/httpdirfs/master/CHANGELOG.md"
+distfiles="https://github.com/fangfufu/httpdirfs/archive/refs/tags/${version}.tar.gz"
+checksum=c55b1020af76c6303e441c4529726396ca14e001941791df4046daa6a5a34877
CFLAGS="-D_FILE_OFFSET_BITS=64"
-# Hack to output version
-pre_build() {
- vsed -e "/HTTPDirFS/s|VERSION|${version}|" -i src/main.c
- vsed -e "s|VERSION|${version}|" -i src/util.h
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+ makedepends+=" libsanitizer-devel"
+fi
+
+pre_configure() {
+ vsed -e "s,^VERSION\s\+=.*,VERSION = ${version}," -i Makefile
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ vsed -e "s,-fsanitize=undefined,," -i Makefile
+ fi
+}
+
+post_build() {
+ make man
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] httpdirfs: update to 1.2.4.
2023-02-19 19:09 [PR PATCH] httpdirfs: update to 1.2.4 icp1994
@ 2023-02-19 19:42 ` icp1994
2023-02-19 19:46 ` icp1994
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: icp1994 @ 2023-02-19 19:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages httpdirfs
https://github.com/void-linux/void-packages/pull/42352
httpdirfs: update to 1.2.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/42352.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-httpdirfs-42352.patch --]
[-- Type: text/x-diff, Size: 4107 bytes --]
From dba243f0cd060fbdd7014b3fbd99ed6dc4a27b1c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 19 Feb 2023 22:23:17 +0530
Subject: [PATCH] httpdirfs: update to 1.2.4.
---
srcpkgs/httpdirfs/patches/fix-coding.patch | 30 ----------------------
srcpkgs/httpdirfs/patches/musl.patch | 17 +++++-------
srcpkgs/httpdirfs/template | 28 ++++++++++++++------
3 files changed, 26 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/httpdirfs/patches/fix-coding.patch
diff --git a/srcpkgs/httpdirfs/patches/fix-coding.patch b/srcpkgs/httpdirfs/patches/fix-coding.patch
deleted file mode 100644
index da80471f23c8..000000000000
--- a/srcpkgs/httpdirfs/patches/fix-coding.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/main.c src/main.c
-index 154f052..b44463c 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -290,10 +290,10 @@ static void print_help(char *program_name, int long_help)
-
- static void print_version()
- {
-- fprintf(stderr, "HTTPDirFS version " VERSION "\n");
-+ fprintf(stderr, "HTTPDirFS version: VERSION");
- /* --------- Print off SSL engine version --------- */
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-- fprintf(stderr, "libcurl SSL engine: %s\n", data->ssl_version);
-+ fprintf(stderr, "\nlibcurl SSL engine: %s\n", data->ssl_version);
- }
-
- static void print_long_help()
-diff --git src/util.h src/util.h
-index d7c7c15..4ae9ce8 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -24,7 +24,7 @@
- /**
- * \brief the default user agent string
- */
--#define DEFAULT_USER_AGENT "HTTPDirFS-" VERSION
-+#define DEFAULT_USER_AGENT "HTTPDirFS-VERSION"
-
-
-
diff --git a/srcpkgs/httpdirfs/patches/musl.patch b/srcpkgs/httpdirfs/patches/musl.patch
index d9cce2e8c3ab..a2a95b3d8f9a 100644
--- a/srcpkgs/httpdirfs/patches/musl.patch
+++ b/srcpkgs/httpdirfs/patches/musl.patch
@@ -1,23 +1,19 @@
-diff --git src/util.c src/util.c
-index f2141bd..10e1549 100644
--- a/src/util.c
+++ b/src/util.c
-@@ -2,8 +2,9 @@
-
- #include <openssl/md5.h>
+@@ -7,7 +7,9 @@
#include <uuid/uuid.h>
--
+
+ #include <errno.h>
+#ifdef __GLIBC__
#include <execinfo.h>
+#endif
- #include <unistd.h>
#include <stdlib.h>
#include <string.h>
-@@ -147,13 +148,15 @@ void exit_failure(void)
- {
+ #include <unistd.h>
+@@ -79,12 +81,15 @@
int nptrs;
void *buffer[BT_BUF_SIZE];
--
+
+#ifdef __GLIBC__
nptrs = backtrace(buffer, BT_BUF_SIZE);
+#endif
@@ -30,4 +26,3 @@ index f2141bd..10e1549 100644
+#endif
exit(EXIT_FAILURE);
}
-
diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 224b3ffd959e..5ae501772b1c 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,21 +1,33 @@
# Template file for 'httpdirfs'
pkgname=httpdirfs
-version=1.2.0
-revision=5
+version=1.2.4
+revision=1
build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config help2man"
makedepends="libcurl-devel fuse-devel gumbo-parser-devel
libuuid-devel expat-devel"
short_desc="Mount HTTP directory listings, with a permanent cache"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://github.com/fangfufu/httpdirfs"
-distfiles="https://github.com/fangfufu/httpdirfs/archive/${version}.tar.gz"
-checksum=05be4d83434eaea002f550b77aed6c05ff135927662d53a6e2b224e766a50a9a
+changelog="https://raw.githubusercontent.com/fangfufu/httpdirfs/master/CHANGELOG.md"
+distfiles="https://github.com/fangfufu/httpdirfs/archive/refs/tags/${version}.tar.gz"
+checksum=c55b1020af76c6303e441c4529726396ca14e001941791df4046daa6a5a34877
CFLAGS="-D_FILE_OFFSET_BITS=64"
-# Hack to output version
-pre_build() {
- vsed -e "/HTTPDirFS/s|VERSION|${version}|" -i src/main.c
- vsed -e "s|VERSION|${version}|" -i src/util.h
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+ makedepends+=" libsanitizer-devel"
+fi
+
+pre_configure() {
+ vsed -e "s,^VERSION\s\+=.*,VERSION = ${version}," -i Makefile
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ vsed -e "s,-fsanitize=undefined,," -i Makefile
+ fi
+}
+
+post_build() {
+ make man
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: httpdirfs: update to 1.2.4.
2023-02-19 19:09 [PR PATCH] httpdirfs: update to 1.2.4 icp1994
2023-02-19 19:42 ` [PR PATCH] [Updated] " icp1994
@ 2023-02-19 19:46 ` icp1994
2023-02-23 20:04 ` [PR PATCH] [Updated] " icp1994
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: icp1994 @ 2023-02-19 19:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 188 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/42352#issuecomment-1436075903
Comment:
Any ideas of what might be causing the errors?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] httpdirfs: update to 1.2.4.
2023-02-19 19:09 [PR PATCH] httpdirfs: update to 1.2.4 icp1994
2023-02-19 19:42 ` [PR PATCH] [Updated] " icp1994
2023-02-19 19:46 ` icp1994
@ 2023-02-23 20:04 ` icp1994
2023-02-23 20:09 ` icp1994
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: icp1994 @ 2023-02-23 20:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages httpdirfs
https://github.com/void-linux/void-packages/pull/42352
httpdirfs: update to 1.2.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/42352.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-httpdirfs-42352.patch --]
[-- Type: text/x-diff, Size: 4107 bytes --]
From 2ac238f5bc3ec1fe27c9c9481cecd017c27a581b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 19 Feb 2023 22:23:17 +0530
Subject: [PATCH] httpdirfs: update to 1.2.4.
---
srcpkgs/httpdirfs/patches/fix-coding.patch | 30 ----------------------
srcpkgs/httpdirfs/patches/musl.patch | 17 +++++-------
srcpkgs/httpdirfs/template | 28 ++++++++++++++------
3 files changed, 26 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/httpdirfs/patches/fix-coding.patch
diff --git a/srcpkgs/httpdirfs/patches/fix-coding.patch b/srcpkgs/httpdirfs/patches/fix-coding.patch
deleted file mode 100644
index da80471f23c8..000000000000
--- a/srcpkgs/httpdirfs/patches/fix-coding.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/main.c src/main.c
-index 154f052..b44463c 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -290,10 +290,10 @@ static void print_help(char *program_name, int long_help)
-
- static void print_version()
- {
-- fprintf(stderr, "HTTPDirFS version " VERSION "\n");
-+ fprintf(stderr, "HTTPDirFS version: VERSION");
- /* --------- Print off SSL engine version --------- */
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-- fprintf(stderr, "libcurl SSL engine: %s\n", data->ssl_version);
-+ fprintf(stderr, "\nlibcurl SSL engine: %s\n", data->ssl_version);
- }
-
- static void print_long_help()
-diff --git src/util.h src/util.h
-index d7c7c15..4ae9ce8 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -24,7 +24,7 @@
- /**
- * \brief the default user agent string
- */
--#define DEFAULT_USER_AGENT "HTTPDirFS-" VERSION
-+#define DEFAULT_USER_AGENT "HTTPDirFS-VERSION"
-
-
-
diff --git a/srcpkgs/httpdirfs/patches/musl.patch b/srcpkgs/httpdirfs/patches/musl.patch
index d9cce2e8c3ab..a2a95b3d8f9a 100644
--- a/srcpkgs/httpdirfs/patches/musl.patch
+++ b/srcpkgs/httpdirfs/patches/musl.patch
@@ -1,23 +1,19 @@
-diff --git src/util.c src/util.c
-index f2141bd..10e1549 100644
--- a/src/util.c
+++ b/src/util.c
-@@ -2,8 +2,9 @@
-
- #include <openssl/md5.h>
+@@ -7,7 +7,9 @@
#include <uuid/uuid.h>
--
+
+ #include <errno.h>
+#ifdef __GLIBC__
#include <execinfo.h>
+#endif
- #include <unistd.h>
#include <stdlib.h>
#include <string.h>
-@@ -147,13 +148,15 @@ void exit_failure(void)
- {
+ #include <unistd.h>
+@@ -79,12 +81,15 @@
int nptrs;
void *buffer[BT_BUF_SIZE];
--
+
+#ifdef __GLIBC__
nptrs = backtrace(buffer, BT_BUF_SIZE);
+#endif
@@ -30,4 +26,3 @@ index f2141bd..10e1549 100644
+#endif
exit(EXIT_FAILURE);
}
-
diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 224b3ffd959e..5ae501772b1c 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,21 +1,33 @@
# Template file for 'httpdirfs'
pkgname=httpdirfs
-version=1.2.0
-revision=5
+version=1.2.4
+revision=1
build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config help2man"
makedepends="libcurl-devel fuse-devel gumbo-parser-devel
libuuid-devel expat-devel"
short_desc="Mount HTTP directory listings, with a permanent cache"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://github.com/fangfufu/httpdirfs"
-distfiles="https://github.com/fangfufu/httpdirfs/archive/${version}.tar.gz"
-checksum=05be4d83434eaea002f550b77aed6c05ff135927662d53a6e2b224e766a50a9a
+changelog="https://raw.githubusercontent.com/fangfufu/httpdirfs/master/CHANGELOG.md"
+distfiles="https://github.com/fangfufu/httpdirfs/archive/refs/tags/${version}.tar.gz"
+checksum=c55b1020af76c6303e441c4529726396ca14e001941791df4046daa6a5a34877
CFLAGS="-D_FILE_OFFSET_BITS=64"
-# Hack to output version
-pre_build() {
- vsed -e "/HTTPDirFS/s|VERSION|${version}|" -i src/main.c
- vsed -e "s|VERSION|${version}|" -i src/util.h
+if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
+ makedepends+=" libsanitizer-devel"
+fi
+
+pre_configure() {
+ vsed -e "s,^VERSION\s\+=.*,VERSION = ${version}," -i Makefile
+ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ vsed -e "s,-fsanitize=undefined,," -i Makefile
+ fi
+}
+
+post_build() {
+ make man
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] httpdirfs: update to 1.2.4.
2023-02-19 19:09 [PR PATCH] httpdirfs: update to 1.2.4 icp1994
` (2 preceding siblings ...)
2023-02-23 20:04 ` [PR PATCH] [Updated] " icp1994
@ 2023-02-23 20:09 ` icp1994
2023-02-23 20:12 ` icp1994
2023-03-06 19:58 ` [PR PATCH] [Merged]: " paper42
5 siblings, 0 replies; 7+ messages in thread
From: icp1994 @ 2023-02-23 20:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages httpdirfs
https://github.com/void-linux/void-packages/pull/42352
httpdirfs: update to 1.2.4.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/42352.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-httpdirfs-42352.patch --]
[-- Type: text/x-diff, Size: 3966 bytes --]
From 509ca9a35ee6abfc8ea14d1b3617fe4fedb32c8c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Sun, 19 Feb 2023 22:23:17 +0530
Subject: [PATCH] httpdirfs: update to 1.2.4.
---
srcpkgs/httpdirfs/patches/fix-coding.patch | 30 ----------------------
srcpkgs/httpdirfs/patches/musl.patch | 17 +++++-------
srcpkgs/httpdirfs/template | 22 ++++++++++------
3 files changed, 20 insertions(+), 49 deletions(-)
delete mode 100644 srcpkgs/httpdirfs/patches/fix-coding.patch
diff --git a/srcpkgs/httpdirfs/patches/fix-coding.patch b/srcpkgs/httpdirfs/patches/fix-coding.patch
deleted file mode 100644
index da80471f23c8..000000000000
--- a/srcpkgs/httpdirfs/patches/fix-coding.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git src/main.c src/main.c
-index 154f052..b44463c 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -290,10 +290,10 @@ static void print_help(char *program_name, int long_help)
-
- static void print_version()
- {
-- fprintf(stderr, "HTTPDirFS version " VERSION "\n");
-+ fprintf(stderr, "HTTPDirFS version: VERSION");
- /* --------- Print off SSL engine version --------- */
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
-- fprintf(stderr, "libcurl SSL engine: %s\n", data->ssl_version);
-+ fprintf(stderr, "\nlibcurl SSL engine: %s\n", data->ssl_version);
- }
-
- static void print_long_help()
-diff --git src/util.h src/util.h
-index d7c7c15..4ae9ce8 100644
---- a/src/util.h
-+++ b/src/util.h
-@@ -24,7 +24,7 @@
- /**
- * \brief the default user agent string
- */
--#define DEFAULT_USER_AGENT "HTTPDirFS-" VERSION
-+#define DEFAULT_USER_AGENT "HTTPDirFS-VERSION"
-
-
-
diff --git a/srcpkgs/httpdirfs/patches/musl.patch b/srcpkgs/httpdirfs/patches/musl.patch
index d9cce2e8c3ab..a2a95b3d8f9a 100644
--- a/srcpkgs/httpdirfs/patches/musl.patch
+++ b/srcpkgs/httpdirfs/patches/musl.patch
@@ -1,23 +1,19 @@
-diff --git src/util.c src/util.c
-index f2141bd..10e1549 100644
--- a/src/util.c
+++ b/src/util.c
-@@ -2,8 +2,9 @@
-
- #include <openssl/md5.h>
+@@ -7,7 +7,9 @@
#include <uuid/uuid.h>
--
+
+ #include <errno.h>
+#ifdef __GLIBC__
#include <execinfo.h>
+#endif
- #include <unistd.h>
#include <stdlib.h>
#include <string.h>
-@@ -147,13 +148,15 @@ void exit_failure(void)
- {
+ #include <unistd.h>
+@@ -79,12 +81,15 @@
int nptrs;
void *buffer[BT_BUF_SIZE];
--
+
+#ifdef __GLIBC__
nptrs = backtrace(buffer, BT_BUF_SIZE);
+#endif
@@ -30,4 +26,3 @@ index f2141bd..10e1549 100644
+#endif
exit(EXIT_FAILURE);
}
-
diff --git a/srcpkgs/httpdirfs/template b/srcpkgs/httpdirfs/template
index 224b3ffd959e..4aaab3d36adb 100644
--- a/srcpkgs/httpdirfs/template
+++ b/srcpkgs/httpdirfs/template
@@ -1,21 +1,27 @@
# Template file for 'httpdirfs'
pkgname=httpdirfs
-version=1.2.0
-revision=5
+version=1.2.4
+revision=1
build_style=gnu-makefile
+make_use_env=yes
+hostmakedepends="pkg-config help2man"
makedepends="libcurl-devel fuse-devel gumbo-parser-devel
libuuid-devel expat-devel"
short_desc="Mount HTTP directory listings, with a permanent cache"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://github.com/fangfufu/httpdirfs"
-distfiles="https://github.com/fangfufu/httpdirfs/archive/${version}.tar.gz"
-checksum=05be4d83434eaea002f550b77aed6c05ff135927662d53a6e2b224e766a50a9a
+changelog="https://raw.githubusercontent.com/fangfufu/httpdirfs/master/CHANGELOG.md"
+distfiles="https://github.com/fangfufu/httpdirfs/archive/refs/tags/${version}.tar.gz"
+checksum=c55b1020af76c6303e441c4529726396ca14e001941791df4046daa6a5a34877
CFLAGS="-D_FILE_OFFSET_BITS=64"
-# Hack to output version
-pre_build() {
- vsed -e "/HTTPDirFS/s|VERSION|${version}|" -i src/main.c
- vsed -e "s|VERSION|${version}|" -i src/util.h
+pre_configure() {
+ vsed -e "s,^VERSION\s\+=.*,VERSION = ${version}," -i Makefile
+ vsed -e "s,-fsanitize=undefined,," -i Makefile
+}
+
+post_build() {
+ make man
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: httpdirfs: update to 1.2.4.
2023-02-19 19:09 [PR PATCH] httpdirfs: update to 1.2.4 icp1994
` (3 preceding siblings ...)
2023-02-23 20:09 ` icp1994
@ 2023-02-23 20:12 ` icp1994
2023-03-06 19:58 ` [PR PATCH] [Merged]: " paper42
5 siblings, 0 replies; 7+ messages in thread
From: icp1994 @ 2023-02-23 20:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 333 bytes --]
New comment by icp1994 on void-packages repository
https://github.com/void-linux/void-packages/pull/42352#issuecomment-1436075903
Comment:
Any ideas of what might be causing the errors?
edit: removing dependency on `libsanitizer-devel` unconditionally seems to have fixed the two failing arches in CI so I'm keeping it that way
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: httpdirfs: update to 1.2.4.
2023-02-19 19:09 [PR PATCH] httpdirfs: update to 1.2.4 icp1994
` (4 preceding siblings ...)
2023-02-23 20:12 ` icp1994
@ 2023-03-06 19:58 ` paper42
5 siblings, 0 replies; 7+ messages in thread
From: paper42 @ 2023-03-06 19:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 323 bytes --]
There's a merged pull request on the void-packages repository
httpdirfs: update to 1.2.4.
https://github.com/void-linux/void-packages/pull/42352
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-03-06 19:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-19 19:09 [PR PATCH] httpdirfs: update to 1.2.4 icp1994
2023-02-19 19:42 ` [PR PATCH] [Updated] " icp1994
2023-02-19 19:46 ` icp1994
2023-02-23 20:04 ` [PR PATCH] [Updated] " icp1994
2023-02-23 20:09 ` icp1994
2023-02-23 20:12 ` icp1994
2023-03-06 19:58 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).