- rebuild with libidn2 2.1.0

[packages/wget.git] / user.xdg.origin.url.patch

diff --git a/user.xdg.origin.url.patch b/user.xdg.origin.url.patch
index 4d1296afa61e1e2e8396bcd61c7dee44f8de7765..0cacc5bd0330acb7c3cbf20c83fdcf290a35e7e7 100644 (file)
--- a/user.xdg.origin.url.patch
+++ b/user.xdg.origin.url.patch
@@ -1,3 +1,6 @@
+in upstream now:
+http://git.savannah.gnu.org/cgit/wget.git/commit/?id=a933bdd31eee9c956a3b5cc142f004ef1fa94cb3
+
 From 2c968b81d9d9c4025379242b5f560aab441e1430 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity@gmail.com>
 Date: Sat, 7 Dec 2013 20:45:00 +0200
@@ -44,7 +47,7 @@ index df63e1c..b41d5ac 100644
  #include <unistd.h>
  #include <errno.h>
  #include <assert.h>
-+#include <attr/xattr.h>
++#include <sys/xattr.h>
  
  #include "utils.h"
  #include "url.h"
@@ -91,3 +94,23 @@ index b1c46c1..72234e9 100644
 2.3.3
 
 
+commit 8a15b84d4be480514c650db1a34cbb2122d6590d
+Author: Mantas Mikulėnas <grawity@gmail.com>
+Date:   Tue Jun 30 14:56:59 2015 +0300
+
+    Ignore 'Operation not permitted' when writing to /dev/null
+
+diff --git a/src/url.c b/src/url.c
+index 30cb86f..cff8683 100644
+--- a/src/url.c
++++ b/src/url.c
+@@ -2242,7 +2242,7 @@ set_xa (const struct url *origin, int fd)
+   res = fsetxattr(fd, XA_ORIGIN, url, strlen(url), 0);
+   if (res != 0)
+     {
+-      if (errno == ENOTSUP)
++      if (errno == ENOTSUP || errno == EPERM)
+         res = 0;
+       else
+         logprintf (LOG_NOTQUIET, "fsetxattr: %s\n", strerror (errno));
+