From: Guillermo Rodriguez <guille.rodriguez@gmail.com>
To: ptxdist@pengutronix.de
Cc: Guillermo Rodriguez <guille.rodriguez@gmail.com>
Subject: [ptxdist] [PATCH] fuse-zip: version bump 0.4.0 -> 0.4.2
Date: Fri, 25 May 2018 13:16:26 +0200 [thread overview]
Message-ID: <1527246986-24439-1-git-send-email-guille.rodriguez@gmail.com> (raw)
Update fuse-zip to 0.4.2, move out of staging.
There has been a recent (Dec 2017) change in licensing in fuse-zip
(from LGPL to GPL). I am updating to the latest version before the
licensing change.
Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
---
...-and-include-to-access-UINT16_MAX-constan.patch | 27 ----------------------
patches/fuse-zip-0.4.0/series | 4 ----
rules/fuse-zip.in | 8 +------
rules/fuse-zip.make | 14 +++++------
4 files changed, 7 insertions(+), 46 deletions(-)
delete mode 100644 patches/fuse-zip-0.4.0/0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch
delete mode 100644 patches/fuse-zip-0.4.0/series
diff --git a/patches/fuse-zip-0.4.0/0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch b/patches/fuse-zip-0.4.0/0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch
deleted file mode 100644
index 81e3a20..0000000
--- a/patches/fuse-zip-0.4.0/0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Alexander Galanin <al@galanin.nnov.ru>
-Date: Sat, 13 Dec 2014 21:29:34 +0300
-Subject: [PATCH] added macro and include to access UINT16_MAX constant (closes
- issue 44)
-
----
- lib/fileNode.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/fileNode.cpp b/lib/fileNode.cpp
-index e2ab19dc9ef0..bee74f0a923b 100644
---- a/lib/fileNode.cpp
-+++ b/lib/fileNode.cpp
-@@ -19,10 +19,13 @@
- // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA //
- ////////////////////////////////////////////////////////////////////////////
-
-+#define __STDC_LIMIT_MACROS
-+
- #include <cerrno>
- #include <climits>
- #include <ctime>
- #include <cstdlib>
-+#include <stdint.h>
- #include <cstring>
- #include <stdexcept>
- #include <syslog.h>
diff --git a/patches/fuse-zip-0.4.0/series b/patches/fuse-zip-0.4.0/series
deleted file mode 100644
index 1cb964d..0000000
--- a/patches/fuse-zip-0.4.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-added-macro-and-include-to-access-UINT16_MAX-constan.patch
-# b6c8f7155ad8797e98366908c4a0b6b9 - git-ptx-patches magic
diff --git a/rules/fuse-zip.in b/rules/fuse-zip.in
index 76aecd4..40d7e38 100644
--- a/rules/fuse-zip.in
+++ b/rules/fuse-zip.in
@@ -1,6 +1,4 @@
-## SECTION=staging
-## old section:
-### SECTION=disk_and_file
+## SECTION=disk_and_file
config FUSE_ZIP
tristate
@@ -16,7 +14,3 @@ config FUSE_ZIP
With fuse-zip you really can work with ZIP archives as real
directories. Unlike KIO or Gnome VFS, it can be used in any
application without modifications.
-
- STAGING: remove in ptxdist-2019.05.0
- Old version that is no longer available for download.
- Should be updated to a new version.
diff --git a/rules/fuse-zip.make b/rules/fuse-zip.make
index 482fe18..8f7fb8c 100644
--- a/rules/fuse-zip.make
+++ b/rules/fuse-zip.make
@@ -1,6 +1,6 @@
# -*-makefile-*-
#
-# Copyright (C) 2014 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
+# Copyright (C) 2018 by Guillermo Rodriguez <guille.rodriguez@gmail.com>
#
# See CREDITS for details about who has contributed to this project.
#
@@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_FUSE_ZIP) += fuse-zip
#
# Paths and names
#
-FUSE_ZIP_VERSION := 0.4.0
-FUSE_ZIP_MD5 := da2d85c5b28ccd153c928f8030e3f729
-FUSE_ZIP := fuse-zip-$(FUSE_ZIP_VERSION)
+FUSE_ZIP_VERSION := 0.4.2
+FUSE_ZIP_MD5 := 673a351e4116d5576a92d62d21208afe
+FUSE_ZIP := fuse-zip-$(FUSE_ZIP_VERSION)
FUSE_ZIP_SUFFIX := tar.gz
-FUSE_ZIP_URL := http://fuse-zip.googlecode.com/files/$(FUSE_ZIP).$(FUSE_ZIP_SUFFIX)
+FUSE_ZIP_URL := https://bitbucket.org/agalanin/fuse-zip/downloads/$(FUSE_ZIP).$(FUSE_ZIP_SUFFIX)
FUSE_ZIP_SOURCE := $(SRCDIR)/$(FUSE_ZIP).$(FUSE_ZIP_SUFFIX)
FUSE_ZIP_DIR := $(BUILDDIR)/$(FUSE_ZIP)
FUSE_ZIP_LICENSE := LGPL
@@ -31,9 +31,7 @@ FUSE_ZIP_LICENSE := LGPL
FUSE_ZIP_CONF_TOOL := NO
FUSE_ZIP_MAKE_ENV := $(CROSS_ENV)
-
-# Makefile ignores DESTDIR
-FUSE_ZIP_INSTALL_OPT := 'INSTALLPREFIX=$(FUSE_ZIP_PKGDIR)/usr' install
+FUSE_ZIP_INSTALL_OPT := 'prefix=/usr' install
# ----------------------------------------------------------------------------
--
1.9.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
reply other threads:[~2018-05-25 11:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1527246986-24439-1-git-send-email-guille.rodriguez@gmail.com \
--to=guille.rodriguez@gmail.com \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox