BenTech2 · danielg4 · Jul 11, 2016 · Jul 11, 2016 · Jul 11, 2016 · Jul 13, 2016
diff --git a/Makefile b/Makefile
@@ -1,18 +1,21 @@
 MAIN_CFLAGS :=  -g -Os -Wall $(shell pkg-config fuse --cflags)
-MAIN_CPPFLAGS := -Wall -Wno-unused-function -Wconversion -Wtype-limits -DUSE_AUTH -D_XOPEN_SOURCE=700 -D_ISOC99_SOURCE
-THR_CPPFLAGS := -DUSE_THREAD
+MAIN_CPPFLAGS := -Wall -Wno-unused-function -Wconversion -Wtype-limits -DUSE_AUTH -D_XOPEN_SOURCE=700 -D_ISOC99_SOURCE -D_FILE_OFFSET_BITS=64
+THR_CPPFLAGS := -DUSE_THREAD -pthread
 THR_LDFLAGS := -lpthread
+GNUTLS_VERSION := 2.10
 MAIN_LDFLAGS := $(shell pkg-config fuse --libs | sed -e s/-lrt// -e s/-ldl// -e s/-pthread// -e "s/  / /g")
 variants := -mt
 intermediates =
 
-ifeq ($(shell pkg-config --atleast-version 2.10 gnutls ; echo $$?), 0)
+ifeq ($(shell pkg-config --atleast-version $(GNUTLS_VERSION) gnutls ; echo $$?), 0)
 
     variants += -ssl -ssl-mt
 
     CERT_STORE := /etc/ssl/certs/ca-certificates.crt
     SSL_CPPFLAGS := -DUSE_SSL $(shell pkg-config gnutls --cflags) -DCERT_STORE=\"$(CERT_STORE)\"
     SSL_LDFLAGS := $(shell pkg-config gnutls --libs)
+else
+        $(info GNUTLS version at least $(GNUTLS_VERSION) required for SSL support.)
 endif
 
 binbase = httpfs2

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,23 @@
+httpfs2 (0.1.5+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use source format 3.0 (native).
+  * Fix CPPFLAGS and large file support.
+  * Add patch from Eugene Vorobev to take filename from HTTP header.
+
+ -- Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>  Mon, 28 Feb 2022 21:23:03 -0800
+
+httpfs2 (0.1.5-2) UNRELEASED; urgency=medium
+
+  * New upstream release:
+     - (Closes: #705310) (LP: #1046266)
+     - miscellaneous bug fixes
+       (Closes: #698179, #716022, #729027)
+     - HTTP redirect support
+  * Install multithreaded version.
+
+ -- Michal Suchanek <hramrach@gmail.com>  Fri, 15 Jul 2016 17:16:08 +0200
+
 httpfs2 (0.1.5-1) unstable; urgency=low
 
   * New upstream release:
@@ -8,6 +28,17 @@ httpfs2 (0.1.5-1) unstable; urgency=low
 
  -- Michal Suchanek <hramrach@gmail.com>  Fri, 31 Aug 2012 13:01:28 +0200
 
+httpfs2 (0.1.4-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use source format 3.0 (quilt).  Closes: #651312
+  * Recommend fuse instead of fuse-utils.  Closes: #698179
+  * Add patch from Ubuntu to fix FTBFS with libc 2.22.  Closes: #811890
+  * Add patch from Ubuntu to fix linking with --as-needed.  Closes: #641728
+  * Bump Standards-Version to 3.9.8, no changes needed.
+
+ -- Mattia Rizzolo <mattia@debian.org>  Fri, 10 Mar 2017 13:27:02 +0100
+
 httpfs2 (0.1.4-1) unstable; urgency=low
 
   * New upstream release:

diff --git a/debian/compat b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
@@ -1,19 +1,19 @@
 Source: httpfs2
 Section: web
 Priority: extra
-Maintainer: Michal Suchanek <hramrach@centrum.cz>
+Maintainer: Michal Suchanek <hramrach@gmail.com>
 Build-Depends:
- debhelper (>= 7.0.50~),
+ debhelper (>= 9~), dh-exec,
  asciidoc, xmlto,
  libfuse-dev (>> 2.6), pkg-config,
- libgnutls-dev (>= 2.10~),
-Standards-Version: 3.8.4
+ libgnutls-dev (>= 2.10~) | libgnutls28-dev,
+Standards-Version: 3.9.8
 Homepage: http://sourceforge.net/projects/httpfs/
 
 Package: httpfs2
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: fuse-utils
+Recommends: fuse-utils | fuse (>= 2.9.3~)
 Description: FUSE filesystem for mounting files from http servers
  httpfs2 is a FUSE based filesystem for mounting http or https URLS as files in
  the filesystem. There is no notion of listable directories in http so only a
@@ -22,7 +22,7 @@ Description: FUSE filesystem for mounting files from http servers
 Package: httpfs2-ssl
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: fuse-utils
+Recommends: fuse-utils | fuse (>= 2.9.3~)
 Description: FUSE filesystem for mounting files from http servers (SSL enabled)
  httpfs2 is a FUSE based filesystem for mounting http or https URLS as files in
  the filesystem. There is no notion of listable directories in http so only a

diff --git a/debian/copyright b/debian/copyright
@@ -5,7 +5,7 @@ Download: http://sourceforge.net/projects/httpfs/
 
 Files: *
 Copyright:
- (C) 2008-2012 Michal Suchanek <hramrach@gmail.com>
+ (C) 2008-2012,2016 Michal Suchanek <hramrach@gmail.com>
  (C) 2006 hmb <marionraven@users.sourceforge.net>
  (C) 2001-2007 Miklos Szeredi <miklos@szeredi.hu>
 License: GPL-2+

diff --git a/debian/httpfs2-ssl.install b/debian/httpfs2-ssl.install
@@ -1 +1,2 @@
-httpfs2-ssl	/usr/bin
+#!/usr/bin/dh-exec
+httpfs2-ssl-mt => /usr/bin/httpfs2-ssl
diff --git a/debian/httpfs2.install b/debian/httpfs2.install
@@ -1 +1,2 @@
-httpfs2	/usr/bin
+#!/usr/bin/dh-exec
+httpfs2-mt => /usr/bin/httpfs2
diff --git a/debian/source/format b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/httpfs2.1.txt b/httpfs2.1.txt
@@ -22,26 +22,50 @@ single URL can be mounted. The server must be able to send byte ranges.
 
 OPTIONS
 -------
+
 *-c 'console'*::
-    Attempt to use the file ior device 'console' for output after fork.
+    Attempt to use the file or device 'console' for output after fork.
     The default is '/dev/console'.
 
 *-f*::
     Do not fork, stay in foreground.
 
+*-r 'retries'*::
+    (if 'ECONNRESET' is defined) Retry connecting to server after receiving
+    'ECONNRESET'. Defaults to 8 times which gives about 30s timeout.
+
 *-t 'timeout'*::
     Use different timeout for connections. Default '30's.
 
-*'URL'*::
-    The url should specify the protocol as http or https, and it may specify
-    basic authentication username and password. Currently special characters
-    like whitespace are not handled so the URL cannot contain them.  See a
-    sample URL below:
+SSL OPTIONS
+~~~~~~~~~~~
+Available when SSL support is compiled in.
+
+*-2*::
+    Allow server certificates signed with RSA-MD2 (strongly discouraged)
+
+*-5*::
+    Allow server certificates signed with RSA-MD5 (discouraged)
+
+*-a 'CA file'*::
+    Specify a file to load trusted CA root certificates from.
+    A default location is set at build time.
+
+*-d 'n'*::
+    Set GnuTLS debug level to numeric value n.
+
+*'URL'*
+~~~~~~~
+The url should specify the protocol as http or https, and it may specify basic
+authentication username and password. Currently special characters like
+whitespace are not handled so the URL cannot contain them.  See a sample URL
+below:
 
       http://user:password@server.com/dir/file
 
-*'FUSE-OPTIONS'*::
-    These options are passed to the *FUSE* library. At the very least the mount point should be specified.
+*'FUSE-OPTIONS'*
+~~~~~~~~~~~~~~~~
+These options are passed to the *FUSE* library. At the very least the mount point should be specified.
 
 
 EXIT STATUS