Author: leigh123linux Update of /cvs/nonfree/rpms/realcrypt/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27402 Modified Files: realcrypt-6.3a-rebranding.patch realcrypt.spec Log Message: * Fri Feb 12 2010 leigh scott <leigh123linux(a)googlemail.com&gt; - 6.3a-2 - fix rebranding patch so truecrypt name isn't displayed by "mount -l" realcrypt-6.3a-rebranding.patch: Core/Unix/CoreUnix.h | 2 Driver/Fuse/FuseService.h | 2 truecrypt-6.3a-source/Common/Language.xml | 588 ++++++------ truecrypt-6.3a-source/Common/Tcdefs.h | 10 truecrypt-6.3a-source/Core/Unix/CoreUnix.cpp | 8 truecrypt-6.3a-source/Core/Unix/Linux/CoreLinux.cpp | 4 truecrypt-6.3a-source/Main/Application.h | 2 truecrypt-6.3a-source/Main/Forms/AboutDialog.cpp | 4 truecrypt-6.3a-source/Main/Forms/Forms.cpp | 10 truecrypt-6.3a-source/Main/Forms/Forms.h | 12 truecrypt-6.3a-source/Main/Forms/MainFrame.cpp | 2 truecrypt-6.3a-source/Main/Forms/MainFrame.h | 2 truecrypt-6.3a-source/Main/Forms/TrueCrypt.fbp | 30 truecrypt-6.3a-source/Main/Forms/VolumeCreationWizard.cpp | 2 truecrypt-6.3a-source/Main/Forms/VolumePropertiesDialog.cpp | 2 truecrypt-6.3a-source/Main/GraphicUserInterface.cpp | 51 - truecrypt-6.3a-source/Main/LanguageStrings.cpp | 18 truecrypt-6.3a-source/Main/UserInterface.cpp | 36 truecrypt-6.3a-source/Makefile | 2 19 files changed, 374 insertions(+), 413 deletions(-) Index: realcrypt-6.3a-rebranding.patch =================================================================== RCS file: /cvs/nonfree/rpms/realcrypt/devel/realcrypt-6.3a-rebranding.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- realcrypt-6.3a-rebranding.patch 12 Feb 2010 02:28:24 -0000 1.1 +++ realcrypt-6.3a-rebranding.patch 12 Feb 2010 14:31:12 -0000 1.2 @@ -1152,6 +1152,28 @@ } uint64 CoreUnix::GetDeviceSize (const DevicePath &devicePath) const +--- truecrypt-6.3a-source.orig/Core/Unix/CoreUnix.h 2009-11-22 15:09:54.000000000 +0000 ++++ truecrypt-6.3a-source/Core/Unix/CoreUnix.h 2010-02-12 13:05:48.000000000 +0000 +@@ -50,7 +50,7 @@ namespace TrueCrypt + virtual void DismountNativeVolume (shared_ptr <VolumeInfo> mountedVolume) const { throw NotApplicable (SRC_POS); } + virtual bool FilesystemSupportsUnixPermissions (const DevicePath &devicePath) const; + virtual string GetDefaultMountPointPrefix () const; +- virtual string GetFuseMountDirPrefix () const { return ".truecrypt_aux_mnt"; } ++ virtual string GetFuseMountDirPrefix () const { return ".realcrypt_aux_mnt"; } + virtual MountedFilesystemList GetMountedFilesystems (const DevicePath &devicePath = DevicePath(), const DirectoryPath &mountPoint = DirectoryPath()) const = 0; + virtual uid_t GetRealUserId () const; + virtual gid_t GetRealGroupId () const; +--- truecrypt-6.3a-source.orig/Driver/Fuse/FuseService.h 2010-02-12 13:34:11.000000000 +0000 ++++ truecrypt-6.3a-source/Driver/Fuse/FuseService.h 2010-02-12 13:41:28.000000000 +0000 +@@ -43,7 +43,7 @@ namespace TrueCrypt + static int ExceptionToErrorCode (); + static const char *GetControlPath () { return "/control"; } + static const char *GetVolumeImagePath (); +- static string GetDeviceType () { return "truecrypt"; } ++ static string GetDeviceType () { return "realcrypt"; } + static uid_t GetGroupId () { return GroupId; } + static uid_t GetUserId () { return UserId; } + static shared_ptr <Buffer> GetVolumeInfo (); diff -Naur truecrypt-6.3a-source.orig//Core/Unix/Linux/CoreLinux.cpp truecrypt-6.3a-source/Core/Unix/Linux/CoreLinux.cpp --- truecrypt-6.3a-source.orig//Core/Unix/Linux/CoreLinux.cpp 2010-02-08 21:42:29.000000000 +0100 +++ truecrypt-6.3a-source/Core/Unix/Linux/CoreLinux.cpp 2010-02-08 21:50:51.000000000 +0100 Index: realcrypt.spec =================================================================== RCS file: /cvs/nonfree/rpms/realcrypt/devel/realcrypt.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- realcrypt.spec 12 Feb 2010 02:51:33 -0000 1.9 +++ realcrypt.spec 12 Feb 2010 14:31:12 -0000 1.10 @@ -3,7 +3,7 @@ Name: realcrypt Summary: Cross platform disk encryption software Version: 6.3a -Release: 1%{?dist} +Release: 2%{?dist} License: TrueCrypt License Version 2.8 Group: Applications/File URL: http://www.truecrypt.org/ @@ -144,6 +144,9 @@ %changelog +* Fri Feb 12 2010 leigh scott <leigh123linux(a)googlemail.com&gt; - 6.3a-2 +- fix rebranding patch so truecrypt name isn't displayed by "mount -l" + * Fri Feb 12 2010 leigh scott <leigh123linux(a)googlemail.com&gt; - 6.3a-1 - update to 6.3a - combined rebranding patch (by Axel Köllhofer)