From 20edd37ba735988b46c28b12734fcf02777954e7 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sep 05 2010 18:48:41 +0000
Subject: Merge branch 'master' into f14/master


---

diff --git a/encfs-1.5-const.patch b/encfs-1.5-const.patch
deleted file mode 100644
index a246912..0000000
--- a/encfs-1.5-const.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru encfs-1.5.orig/encfs/NameIO.cpp encfs-1.5/encfs/NameIO.cpp
---- encfs-1.5.orig/encfs/NameIO.cpp	2009-03-03 14:56:44.000000000 +0000
-+++ encfs-1.5/encfs/NameIO.cpp	2009-03-03 14:57:02.000000000 +0000
-@@ -190,7 +190,7 @@
- 	} else
- 	{
- 	    bool isDotFile = (*path == '.');
--	    char *next = strchr( path, '/' );
-+	    const char *next = strchr( path, '/' );
- 	    int len = next ? next - path : strlen( path );
- 
- 	    // at this point we know that len > 0
diff --git a/encfs-1.6-1.tgz.asc b/encfs-1.6-1.tgz.asc
deleted file mode 100644
index 1e4201a..0000000
--- a/encfs-1.6-1.tgz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
-
-iEYEABECAAYFAkwayhcACgkQWp20Ay6vTYDabwCdGbMv2zjRCDekdajR5PD1kDTk
-D6sAnRYxsSGt1SH+HaxjL2sh52caY6tZ
-=xURK
------END PGP SIGNATURE-----
diff --git a/encfs-1.7.1.tgz b/encfs-1.7.1.tgz
new file mode 100644
index 0000000..f8b7463
Binary files /dev/null and b/encfs-1.7.1.tgz differ
diff --git a/encfs-1.7.1.tgz.asc b/encfs-1.7.1.tgz.asc
new file mode 100644
index 0000000..0daadf2
--- /dev/null
+++ b/encfs-1.7.1.tgz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
+
+iEYEABECAAYFAkx71QAACgkQWp20Ay6vTYBeVACfWC56LZ5m1M9STRQps/Q0yVIP
+crwAn13VjwuvbQkGtk5Kbj0SFnfwRk+Z
+=u1Kx
+-----END PGP SIGNATURE-----
diff --git a/fuse-encfs.spec b/fuse-encfs.spec
index f0abd8f..4a38cab 100644
--- a/fuse-encfs.spec
+++ b/fuse-encfs.spec
@@ -1,12 +1,12 @@
 Name:		fuse-encfs
-Version:	1.6
+Version:	1.7.1
 Release:	1%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
 Url:		http://www.arg0.net/encfs
-Source0:	http://encfs.googlecode.com/files/encfs-%{version}-1.tgz
-Source1:	http://encfs.googlecode.com/files/encfs-%{version}-1.tgz.asc
+Source0:	http://encfs.googlecode.com/files/encfs-%{version}.tgz
+Source1:	http://encfs.googlecode.com/files/encfs-%{version}.tgz.asc
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:	fuse >= 2.6
 Provides:	encfs = %{version}-%{release}
@@ -28,13 +28,13 @@ it does not use NFS.
 
 %build
 %configure --disable-static --with-boost-libdir=%{_libdir}
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
-%{__rm} -f %{buildroot}/%{_libdir}/*.la
-%{__rm} -f %{buildroot}/%{_libdir}/*.so
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/*.so
 %find_lang encfs
 
 %post -p /sbin/ldconfig
@@ -42,7 +42,7 @@ it does not use NFS.
 %postun -p /sbin/ldconfig
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files -f encfs.lang
 %defattr(-, root, root, -)
@@ -52,6 +52,10 @@ it does not use NFS.
 %{_mandir}/man1/*
 
 %changelog
+* Sun Sep  5 2010 Peter Lemenkov <lemenkov@gmail.com> 1.7.1-1
+- Fixed three security flaws (see rhbz #630460)
+- Cleaned up spec-file a little
+
 * Sun Aug 01 2010 Josh Kayse <jokajak@fedoraproject.org> - 1.6.1-1
 - update to 1.6-1
 - remove patch because it's been incorporated
diff --git a/sources b/sources
index e441758..e69de29 100644
--- a/sources
+++ b/sources
@@ -1 +0,0 @@
-db99570557cf432cca088748944fb74a  encfs-1.6-1.tgz