wget: move hsts file out of home directory.

fixes #460.
This commit is contained in:
Adrien Destugues
2016-02-14 12:03:16 +01:00
parent 17aaf0e340
commit 49bc3abea9
2 changed files with 48 additions and 5 deletions

View File

@@ -1,4 +1,4 @@
From 51397febfa301d6a04a0405db997df15768ec110 Mon Sep 17 00:00:00 2001
From 83963691192c71c9306b5af56509fc921763f468 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 May 2014 15:38:37 +0000
Subject: apply wget-1.14.patch
@@ -92,10 +92,10 @@ index 785a570..3ef63cd 100644
struct url;
--
2.2.2
2.7.0
From 9204da59c1b70c5c3ffdc6e1db7de45007b6eff0 Mon Sep 17 00:00:00 2001
From 90e705554fff2aae61e556bb985bc96cfc0a73fc Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 May 2014 15:47:24 +0000
Subject: apply and augment wget-1.14-build-fixes.patch
@@ -116,5 +116,47 @@ index 5222851..4e5a5c2 100644
#endif
--
2.2.2
2.7.0
From 9e8233ced955d796f2807085529550a048f64397 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 14 Feb 2016 11:05:10 +0100
Subject: Move wget-hsts out of home directory.
diff --git a/src/main.c b/src/main.c
index 4641008..f60cac9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -78,6 +78,10 @@ as that of the covered work. */
# include "vms.h"
#endif /* __VMS */
+#ifdef __HAIKU__
+#include "FindDirectory.h"
+#endif
+
#ifndef PATH_SEPARATOR
# define PATH_SEPARATOR '/'
#endif
@@ -154,6 +158,16 @@ get_hsts_database (void)
if (opt.hsts_file)
return xstrdup (opt.hsts_file);
+#ifdef __HAIKU__
+ {
+ char buffer[256];
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer)) == B_OK) {
+ home = aprintf("%s/wget-hsts", buffer);
+ return home;
+ }
+ }
+#endif
+
home = home_dir ();
if (home)
{
--
2.7.0

View File

@@ -9,7 +9,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/wget/wget-$portVersion.tar.gz"
CHECKSUM_SHA256="029fbb93bdc1c0c5a7507b6076a6ec2f8d34204a85aa87e5b2f61a9405b290f5"
LICENSE="GNU GPL v3"
COPYRIGHT="1996-2014 Free Software Foundation"
REVISION="1"
REVISION="2"
ARCHITECTURES="x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
@@ -23,6 +23,7 @@ REQUIRES="
lib:libcrypto$secondaryArchSuffix
lib:libssl$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libintl$secondaryArchSuffix
"
BUILD_REQUIRES="