| 1 |
dragonheart 08/05/04 00:48:33 |
| 2 |
|
| 3 |
Added: encfs-1.3.2.1-gcc-4.3.patch |
| 4 |
Log: |
| 5 |
gcc-4.3 bug fix as per bug #216227 |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sys-fs/encfs/files/encfs-1.3.2.1-gcc-4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/encfs/files/encfs-1.3.2.1-gcc-4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/encfs/files/encfs-1.3.2.1-gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: encfs-1.3.2.1-gcc-4.3.patch |
| 15 |
=================================================================== |
| 16 |
--- encfs/BlockFileIO.cpp |
| 17 |
+++ encfs/BlockFileIO.cpp |
| 18 |
@@ -20,6 +20,7 @@ |
| 19 |
#include "MemoryPool.h" |
| 20 |
|
| 21 |
#include <rlog/rlog.h> |
| 22 |
+#include <cstring> |
| 23 |
|
| 24 |
#include "i18n.h" |
| 25 |
|
| 26 |
--- encfs/BlockNameIO.cpp |
| 27 |
+++ encfs/BlockNameIO.cpp |
| 28 |
@@ -23,6 +23,7 @@ |
| 29 |
#include <rlog/rlog.h> |
| 30 |
#include <rlog/Error.h> |
| 31 |
#include <rlog/RLogChannel.h> |
| 32 |
+#include <cstring> |
| 33 |
|
| 34 |
#include "i18n.h" |
| 35 |
|
| 36 |
--- encfs/CipherFileIO.cpp |
| 37 |
+++ encfs/CipherFileIO.cpp |
| 38 |
@@ -23,7 +23,7 @@ |
| 39 |
#include <rlog/rlog.h> |
| 40 |
|
| 41 |
#include <fcntl.h> |
| 42 |
-#include <errno.h> |
| 43 |
+#include <cerrno> |
| 44 |
|
| 45 |
/* |
| 46 |
- Version 2:0 adds support for a per-file initialization vector with a |
| 47 |
--- encfs/CipherV3.cpp |
| 48 |
+++ encfs/CipherV3.cpp |
| 49 |
@@ -22,7 +22,7 @@ |
| 50 |
|
| 51 |
#include "../config.h" |
| 52 |
|
| 53 |
-#include <string.h> |
| 54 |
+#include <cstring> |
| 55 |
|
| 56 |
#define NO_DES |
| 57 |
|
| 58 |
--- encfs/Config.cpp |
| 59 |
+++ encfs/Config.cpp |
| 60 |
@@ -23,6 +23,7 @@ |
| 61 |
#include <sys/stat.h> |
| 62 |
#include <fcntl.h> |
| 63 |
#include <unistd.h> |
| 64 |
+#include <cstring> |
| 65 |
|
| 66 |
|
| 67 |
using namespace std; |
| 68 |
--- encfs/ConfigVar.cpp |
| 69 |
+++ encfs/ConfigVar.cpp |
| 70 |
@@ -17,6 +17,7 @@ |
| 71 |
|
| 72 |
#include "ConfigVar.h" |
| 73 |
#include <rlog/rlog.h> |
| 74 |
+#include <cstring> |
| 75 |
|
| 76 |
using namespace rlog; |
| 77 |
|
| 78 |
--- encfs/DirNode.cpp |
| 79 |
+++ encfs/DirNode.cpp |
| 80 |
@@ -22,9 +22,10 @@ |
| 81 |
|
| 82 |
#include <sys/stat.h> |
| 83 |
#include <sys/types.h> |
| 84 |
-#include <errno.h> |
| 85 |
-#include <stdio.h> |
| 86 |
-#include <stdlib.h> |
| 87 |
+#include <cerrno> |
| 88 |
+#include <cstring> |
| 89 |
+#include <cstdio> |
| 90 |
+#include <cstdlib> |
| 91 |
#include <pthread.h> |
| 92 |
#include <unistd.h> |
| 93 |
#ifdef linux |
| 94 |
--- encfs/FileNode.cpp |
| 95 |
+++ encfs/FileNode.cpp |
| 96 |
@@ -19,7 +19,8 @@ |
| 97 |
// of sys/stat.h or other system headers (to be safe) |
| 98 |
#include "encfs.h" |
| 99 |
|
| 100 |
-#include <errno.h> |
| 101 |
+#include <cstring> |
| 102 |
+#include <cerrno> |
| 103 |
#include <sys/stat.h> |
| 104 |
#include <sys/types.h> |
| 105 |
#include <fcntl.h> |
| 106 |
--- encfs/FileUtils.cpp |
| 107 |
+++ encfs/FileUtils.cpp |
| 108 |
@@ -45,9 +45,10 @@ |
| 109 |
#include <fcntl.h> |
| 110 |
#include <unistd.h> |
| 111 |
#include <ctype.h> |
| 112 |
-#include <stdio.h> |
| 113 |
-#include <stdlib.h> |
| 114 |
-#include <errno.h> |
| 115 |
+#include <cstdio> |
| 116 |
+#include <cstdlib> |
| 117 |
+#include <cerrno> |
| 118 |
+#include <cstring> |
| 119 |
|
| 120 |
#include <iostream> |
| 121 |
#include <sstream> |
| 122 |
--- encfs/MACFileIO.cpp |
| 123 |
+++ encfs/MACFileIO.cpp |
| 124 |
@@ -22,6 +22,7 @@ |
| 125 |
#include <rlog/rlog.h> |
| 126 |
#include <rlog/Error.h> |
| 127 |
#include <rlog/RLogChannel.h> |
| 128 |
+#include <cstring> |
| 129 |
|
| 130 |
#include "i18n.h" |
| 131 |
|
| 132 |
--- encfs/MACFileIOCompat.cpp |
| 133 |
+++ encfs/MACFileIOCompat.cpp |
| 134 |
@@ -21,6 +21,7 @@ |
| 135 |
|
| 136 |
#include <rlog/rlog.h> |
| 137 |
#include <rlog/Error.h> |
| 138 |
+#include <cstring> |
| 139 |
|
| 140 |
#include "i18n.h" |
| 141 |
|
| 142 |
--- encfs/MemoryPool.cpp |
| 143 |
+++ encfs/MemoryPool.cpp |
| 144 |
@@ -19,8 +19,8 @@ |
| 145 |
#include "MemoryPool.h" |
| 146 |
#include <rlog/rlog.h> |
| 147 |
|
| 148 |
-#include <stdlib.h> |
| 149 |
-#include <string.h> |
| 150 |
+#include <cstdlib> |
| 151 |
+#include <cstring> |
| 152 |
|
| 153 |
#include "config.h" |
| 154 |
#include <pthread.h> |
| 155 |
--- encfs/NameIO.cpp |
| 156 |
+++ encfs/NameIO.cpp |
| 157 |
@@ -26,6 +26,7 @@ |
| 158 |
// for static build. Need to reference the modules which are registered at |
| 159 |
// run-time, to ensure that the linker doesn't optimize them away. |
| 160 |
#include <iostream> |
| 161 |
+#include <cstring> |
| 162 |
#include "BlockNameIO.h" |
| 163 |
#include "StreamNameIO.h" |
| 164 |
#include "NullNameIO.h" |
| 165 |
--- encfs/NullCipher.cpp |
| 166 |
+++ encfs/NullCipher.cpp |
| 167 |
@@ -21,6 +21,7 @@ |
| 168 |
#include "Interface.h" |
| 169 |
|
| 170 |
#include <rlog/rlog.h> |
| 171 |
+#include <cstring> |
| 172 |
|
| 173 |
using namespace std; |
| 174 |
using namespace rel; |
| 175 |
--- encfs/NullNameIO.cpp |
| 176 |
+++ encfs/NullNameIO.cpp |
| 177 |
@@ -19,6 +19,7 @@ |
| 178 |
|
| 179 |
#include "Cipher.h" |
| 180 |
#include "base64.h" |
| 181 |
+#include <cstring> |
| 182 |
|
| 183 |
using namespace rel; |
| 184 |
|
| 185 |
--- encfs/OpaqueValue.cpp |
| 186 |
+++ encfs/OpaqueValue.cpp |
| 187 |
@@ -20,7 +20,7 @@ |
| 188 |
#include "PtrImpl.h" |
| 189 |
#include <rlog/rlog.h> |
| 190 |
|
| 191 |
-#include <stdlib.h> |
| 192 |
+#include <cstdlib> |
| 193 |
|
| 194 |
using namespace std; |
| 195 |
using namespace rel; |
| 196 |
--- encfs/Ptr.cpp |
| 197 |
+++ encfs/Ptr.cpp |
| 198 |
@@ -20,7 +20,7 @@ |
| 199 |
|
| 200 |
#include "Ptr.h" |
| 201 |
|
| 202 |
-#include <stdlib.h> |
| 203 |
+#include <cstdlib> |
| 204 |
|
| 205 |
using namespace rel; |
| 206 |
|
| 207 |
--- encfs/RawFileIO.cpp |
| 208 |
+++ encfs/RawFileIO.cpp |
| 209 |
@@ -28,7 +28,8 @@ |
| 210 |
#include <sys/stat.h> |
| 211 |
#include <fcntl.h> |
| 212 |
|
| 213 |
-#include <errno.h> |
| 214 |
+#include <cerrno> |
| 215 |
+#include <cstring> |
| 216 |
|
| 217 |
using namespace std; |
| 218 |
|
| 219 |
--- encfs/SSL_Cipher.cpp |
| 220 |
+++ encfs/SSL_Cipher.cpp |
| 221 |
@@ -31,7 +31,7 @@ |
| 222 |
#include "MemoryPool.h" |
| 223 |
#include "Mutex.h" |
| 224 |
|
| 225 |
-#include <string.h> |
| 226 |
+#include <cstring> |
| 227 |
|
| 228 |
#include <sys/mman.h> |
| 229 |
|
| 230 |
--- encfs/StreamNameIO.cpp |
| 231 |
+++ encfs/StreamNameIO.cpp |
| 232 |
@@ -22,6 +22,7 @@ |
| 233 |
|
| 234 |
#include <rlog/rlog.h> |
| 235 |
#include <rlog/Error.h> |
| 236 |
+#include <cstring> |
| 237 |
|
| 238 |
#include "i18n.h" |
| 239 |
|
| 240 |
--- encfs/encfs.cpp |
| 241 |
+++ encfs/encfs.cpp |
| 242 |
@@ -17,12 +17,12 @@ |
| 243 |
|
| 244 |
#include "encfs.h" |
| 245 |
|
| 246 |
-#include <stdio.h> |
| 247 |
-#include <string.h> |
| 248 |
+#include <cstdio> |
| 249 |
+#include <cstring> |
| 250 |
#include <unistd.h> |
| 251 |
#include <fcntl.h> |
| 252 |
#include <dirent.h> |
| 253 |
-#include <errno.h> |
| 254 |
+#include <cerrno> |
| 255 |
#include <sys/statvfs.h> |
| 256 |
|
| 257 |
#include <sys/types.h> |
| 258 |
--- encfs/encfs.h |
| 259 |
+++ encfs/encfs.h |
| 260 |
@@ -28,7 +28,7 @@ |
| 261 |
#endif |
| 262 |
|
| 263 |
#ifndef linux |
| 264 |
-#include <errno.h> |
| 265 |
+#include <cerrno> |
| 266 |
|
| 267 |
static __inline int setfsuid(uid_t uid) |
| 268 |
{ |
| 269 |
--- encfs/main.cpp |
| 270 |
+++ encfs/main.cpp |
| 271 |
@@ -25,10 +25,10 @@ |
| 272 |
#include <sstream> |
| 273 |
|
| 274 |
#include <assert.h> |
| 275 |
-#include <stdio.h> |
| 276 |
+#include <cstdio> |
| 277 |
#include <unistd.h> |
| 278 |
#include <sys/time.h> |
| 279 |
-#include <errno.h> |
| 280 |
+#include <cerrno> |
| 281 |
|
| 282 |
#include <getopt.h> |
| 283 |
|
| 284 |
--- encfs/readpassphrase.cpp |
| 285 |
+++ encfs/readpassphrase.cpp |
| 286 |
@@ -36,14 +36,14 @@ |
| 287 |
#ifndef HAVE_READPASSPHRASE |
| 288 |
|
| 289 |
#include <signal.h> |
| 290 |
-#include <stdio.h> |
| 291 |
-#include <errno.h> |
| 292 |
+#include <cstdio> |
| 293 |
+#include <cerrno> |
| 294 |
#include <sys/types.h> |
| 295 |
#include <sys/stat.h> |
| 296 |
#include <fcntl.h> |
| 297 |
#include <unistd.h> |
| 298 |
#include <paths.h> |
| 299 |
-#include <string.h> |
| 300 |
+#include <cstring> |
| 301 |
#include <ctype.h> |
| 302 |
|
| 303 |
#include <termios.h> |
| 304 |
--- encfs/test.cpp |
| 305 |
+++ encfs/test.cpp |
| 306 |
@@ -22,7 +22,7 @@ |
| 307 |
|
| 308 |
#include <iostream> |
| 309 |
|
| 310 |
-#include <stdlib.h> |
| 311 |
+#include <cstdlib> |
| 312 |
|
| 313 |
#include "Cipher.h" |
| 314 |
#include "DirNode.h" |
| 315 |
--- intl/autosprintf.cpp |
| 316 |
+++ intl/autosprintf.cpp |
| 317 |
@@ -17,7 +17,7 @@ |
| 318 |
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
| 319 |
USA. */ |
| 320 |
|
| 321 |
-/* Tell glibc's <stdio.h> to provide a prototype for vasprintf(). |
| 322 |
+/* Tell glibc's <cstdio> to provide a prototype for vasprintf(). |
| 323 |
This must come before <config.h> because <config.h> may include |
| 324 |
<features.h>, and once <features.h> has been included, it's too late. */ |
| 325 |
#ifndef _GNU_SOURCE |
| 326 |
@@ -28,10 +28,10 @@ |
| 327 |
#include "autosprintf.h" |
| 328 |
|
| 329 |
#include <stdarg.h> |
| 330 |
-#include <stdlib.h> |
| 331 |
-#include <string.h> |
| 332 |
+#include <cstdlib> |
| 333 |
+#include <cstring> |
| 334 |
//#include "lib-asprintf.h" |
| 335 |
-#include <stdio.h> |
| 336 |
+#include <cstdio> |
| 337 |
|
| 338 |
namespace gnu |
| 339 |
{ |
| 340 |
|
| 341 |
|
| 342 |
|
| 343 |
-- |
| 344 |
gentoo-commits@l.g.o mailing list |
Archives