httpdirfs: update to 1.2.4.

This commit is contained in:
icp 2023-02-19 22:23:17 +05:30 committed by Michal Vasilek
parent e7f527543c
commit 3e943c59e0
3 changed files with 20 additions and 49 deletions

View File

@ -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"

View File

@ -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);
}

View File

@ -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
}