[archivemount/f14/master] Initial import (#598688).

Niels de Vos devos at fedoraproject.org
Sat Jan 22 14:37:14 UTC 2011


commit 6fec00a009ee2ef805cde5a7dbeaf5cc491d8275
Author: Niels de Vos <niels at nixpanic.net>
Date:   Sat Jan 22 14:37:06 2011 +0000

    Initial import (#598688).

 .gitignore                               |    1 +
 archivemount.spec                        |   66 ++++++++++++++++++++++++++++++
 archivemount_force-single-threaded.patch |   46 +++++++++++++++++++++
 fix-debuginfo.patch                      |   12 +++++
 sources                                  |    1 +
 5 files changed, 126 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..360d3bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/archivemount-0.6.1.tar.gz
diff --git a/archivemount.spec b/archivemount.spec
new file mode 100644
index 0000000..fb5bab2
--- /dev/null
+++ b/archivemount.spec
@@ -0,0 +1,66 @@
+Name:          archivemount
+Version:       0.6.1
+Release:       4%{?dist}
+Summary:       FUSE based filesystem for mounting compressed archives
+
+Group:         System Environment/Libraries
+License:       LGPLv2+
+URL:           http://www.cybernoia.de/software/archivemount/
+Source0:       http://www.cybernoia.de/software/archivemount/%{name}-%{version}.tar.gz
+Patch0:        archivemount_force-single-threaded.patch
+Patch1:        fix-debuginfo.patch
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires:      fuse
+BuildRequires: fuse-devel
+BuildRequires: libarchive-devel
+
+%description
+Archivemount is a piece of glue code between libarchive and FUSE. It can be
+used to mount a (possibly compressed) archive (as in .tar.gz or .tar.bz2)
+and use it like an ordinary filesystem.
+
+%prep
+%setup -q
+%patch0 -p1 -b .single-threaded
+%patch1 -p1 -b .fix-debuginfo
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+rm -f archivemount.1
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc CHANGELOG COPYING README
+%{_mandir}/*/*
+%{_bindir}/archivemount
+
+%changelog
+* Tue Jan 18 2011 Niels de Vos <ndevos at redhat.com> 0.6.1-4
+- fix the -debuginfo package as suggested by Tomas Mraz (BZ#598688 comment #12)
+
+* Fri Jan 14 2011 Niels de Vos <ndevos at redhat.com> 0.6.1-3
+- fix the -debuginfo package (BZ#598688 comment #10)
+
+* Mon Jan 10 2011 Niels de Vos <niels at nixpanic.net> 0.6.1-2
+- force running in single threaded mode (much more stable)
+- fix some points from BZ #598688 comment #7
+
+* Wed Jun 24 2010 Niels de Vos <ndevos at redhat.com> 0.6.1-1
+- upstream fixed licensing in the source to LGPL (v2 or newer)
+- new source does not contain autom4te.cache anymore, no need to 'rm -rf' it
+
+* Tue Jun 15 2010 Niels de Vos <ndevos at redhat.com> 0.6.0-2
+- fix license to GNU Library General Public v2 or newer
+- remove packaged autoconf/automake cache files
+
+* Mon Jun 01 2010 Niels de Vos <ndevos at redhat.com> 0.6.0-1
+- Initial package
diff --git a/archivemount_force-single-threaded.patch b/archivemount_force-single-threaded.patch
new file mode 100644
index 0000000..116ba40
--- /dev/null
+++ b/archivemount_force-single-threaded.patch
@@ -0,0 +1,46 @@
+From 4ef79c9802d923bf90c259881d2dcae8deda66a2 Mon Sep 17 00:00:00 2001
+From: Niels de Vos <niels at nixpanic.net>
+Date: Tue, 9 Nov 2010 10:09:02 +0000
+Subject: [PATCH 1/1] Force running in single-threaded mode
+
+This should prevent any crashes related to multithreading.
+
+Signed-off-by: Niels de Vos <niels at nixpanic.net>
+---
+ archivemount.1.in |    3 +++
+ archivemount.c    |    5 +++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/archivemount.1.in b/archivemount.1.in
+index dca05d2..611bc56 100644
+--- a/archivemount.1.in
++++ b/archivemount.1.in
+@@ -419,6 +419,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ This is beta software and should be treated as such.  Bug reports to the 
+ AUTHORS listed below would be appreciated.
+ 
++archivemount is forced to run a single-thread mode for now. Support for
++stable multithreading is planned in a future release.
++
+ 
+ .SH SEE ALSO
+ 
+diff --git a/archivemount.c b/archivemount.c
+index dde9b5c..1970f09 100644
+--- a/archivemount.c
++++ b/archivemount.c
+@@ -2329,6 +2329,11 @@ main( int argc, char **argv )
+ 	/* Initialize the node tree lock */
+ 	pthread_rwlock_init(&lock, NULL);
+ 
++	/* always use fuse in single-threaded mode
++	 * multithreading is broken with libarchive :-(
++	 */
++	fuse_opt_add_arg( &args, "-s" );
++
+ 	/* now do the real mount */
+ 	fuse_ret = fuse_main( args.argc, args.argv, &ar_oper, NULL );
+ 
+-- 
+1.7.3.4
+
diff --git a/fix-debuginfo.patch b/fix-debuginfo.patch
new file mode 100644
index 0000000..3d18daa
--- /dev/null
+++ b/fix-debuginfo.patch
@@ -0,0 +1,12 @@
+diff -up archivemount-0.6.1/configure.noclear archivemount-0.6.1/configure
+--- archivemount-0.6.1/configure.noclear	2010-06-23 08:36:08.000000000 +0200
++++ archivemount-0.6.1/configure	2011-01-17 11:01:49.000000000 +0100
+@@ -3542,8 +3542,6 @@ ac_config_files="$ac_config_files Makefi
+ RELEASE_DATE="1 November 2008"
+ 
+ 
+-CFLAGS=
+-
+ # Check for libfuse
+ 
+ 
diff --git a/sources b/sources
index e69de29..8ac9a8f 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e591aff17e84beb1962ede825f7078bb  archivemount-0.6.1.tar.gz


More information about the scm-commits mailing list