rpms/fuse-encfs/devel fuse-encfs.spec, 1.14, 1.15 encfs--gcc43-fix.diff, 1.2, 1.3

[Alex Lancaster (alexlan)]

Author: alexlan

Update of /cvs/pkgs/rpms/fuse-encfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24672

Modified Files:
	fuse-encfs.spec encfs--gcc43-fix.diff 
Log Message:
* Fri Mar 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.1.1-5
- Update patch for building with GCC 4.3 (use <cstring> throughout)



Index: fuse-encfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/devel/fuse-encfs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fuse-encfs.spec	25 Mar 2008 19:29:39 -0000	1.14
+++ fuse-encfs.spec	28 Mar 2008 10:44:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name:		fuse-encfs
 Version:	1.4.1.1
-Release:	4.1%{?dist}
+Release:	5%{?dist}
 Summary:	Encrypted pass-thru filesystem in userspace
 License:	GPLv3+
 Group:		System Environment/Kernel
@@ -26,7 +26,7 @@
 
 %prep
 %setup -q -n encfs-%{version}
-%patch0 -b .gcc43
+%patch0 -p1 -b .gcc43
 
 %build
 %configure --disable-static
@@ -55,6 +55,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Mar 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.4.1.1-5
+- Update patch for building with GCC 4.3 (use <cstring> throughout)
+
 * Tue Mar 25 2008 Peter Lemenkov <lemenkov at gmail.com> 1.4.1.1-4.1
 - Another attempt to fix GCC 4.3 builds
 

encfs--gcc43-fix.diff:

Index: encfs--gcc43-fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/fuse-encfs/devel/encfs--gcc43-fix.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- encfs--gcc43-fix.diff	25 Mar 2008 19:29:39 -0000	1.2
+++ encfs--gcc43-fix.diff	28 Mar 2008 10:44:27 -0000	1.3
@@ -1,5 +1,6 @@
---- encfs/ConfigVar.cpp~	2008-01-06 01:39:12.000000000 +0300
-+++ encfs/ConfigVar.cpp	2008-03-25 21:54:28.000000000 +0300
+diff -u -r encfs-1.4.1.1/encfs/ConfigVar.cpp encfs-1.4.1.1.mod/encfs/ConfigVar.cpp
+--- encfs-1.4.1.1/encfs/ConfigVar.cpp	2008-01-05 15:39:12.000000000 -0700
++++ encfs-1.4.1.1.mod/encfs/ConfigVar.cpp	2008-03-28 03:28:06.000000000 -0700
 @@ -17,6 +17,7 @@
  
  #include "ConfigVar.h"
@@ -8,8 +9,32 @@
  
  using namespace rlog;
  
---- encfs/NameIO.cpp~	2008-01-06 01:39:12.000000000 +0300
-+++ encfs/NameIO.cpp	2008-03-25 22:25:57.000000000 +0300
+diff -u -r encfs-1.4.1.1/encfs/DirNode.cpp encfs-1.4.1.1.mod/encfs/DirNode.cpp
+--- encfs-1.4.1.1/encfs/DirNode.cpp	2008-01-16 00:28:17.000000000 -0700
++++ encfs-1.4.1.1.mod/encfs/DirNode.cpp	2008-03-28 03:29:54.000000000 -0700
+@@ -38,6 +38,7 @@
+ #include <rlog/Error.h>
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace rel;
+diff -u -r encfs-1.4.1.1/encfs/FileNode.cpp encfs-1.4.1.1.mod/encfs/FileNode.cpp
+--- encfs-1.4.1.1/encfs/FileNode.cpp	2008-01-05 15:39:12.000000000 -0700
++++ encfs-1.4.1.1.mod/encfs/FileNode.cpp	2008-03-28 03:30:51.000000000 -0700
+@@ -45,6 +45,8 @@
+ #include <rlog/rlog.h>
+ #include <rlog/Error.h>
+ 
++#include <cstring>
++
+ using namespace std;
+ using namespace rel;
+ using namespace rlog;
+diff -u -r encfs-1.4.1.1/encfs/NameIO.cpp encfs-1.4.1.1.mod/encfs/NameIO.cpp
+--- encfs-1.4.1.1/encfs/NameIO.cpp	2008-01-05 15:39:12.000000000 -0700
++++ encfs-1.4.1.1.mod/encfs/NameIO.cpp	2008-03-28 03:28:06.000000000 -0700
 @@ -29,6 +29,7 @@
  #include "BlockNameIO.h"
  #include "StreamNameIO.h"
@@ -18,8 +43,20 @@
  
  using namespace std;
  using namespace rel;
---- encfs/StreamNameIO.cpp~	2008-01-06 01:39:12.000000000 +0300
-+++ encfs/StreamNameIO.cpp	2008-03-25 22:27:01.000000000 +0300
+diff -u -r encfs-1.4.1.1/encfs/NullNameIO.cpp encfs-1.4.1.1.mod/encfs/NullNameIO.cpp
+--- encfs-1.4.1.1/encfs/NullNameIO.cpp	2008-01-05 15:39:12.000000000 -0700
++++ encfs-1.4.1.1.mod/encfs/NullNameIO.cpp	2008-03-28 03:16:31.000000000 -0700
+@@ -19,6 +19,7 @@
+ 
+ #include "Cipher.h"
+ #include "base64.h"
++#include <cstring>
+ 
+ using namespace rel;
+ using boost::shared_ptr;
+diff -u -r encfs-1.4.1.1/encfs/StreamNameIO.cpp encfs-1.4.1.1.mod/encfs/StreamNameIO.cpp
+--- encfs-1.4.1.1/encfs/StreamNameIO.cpp	2008-01-05 15:39:12.000000000 -0700
++++ encfs-1.4.1.1.mod/encfs/StreamNameIO.cpp	2008-03-28 03:28:06.000000000 -0700
 @@ -25,6 +25,8 @@
  
  #include "i18n.h"