diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-02-26 16:48:01 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-02-26 16:48:01 +0100 |
| commit | faae49c640ee2d308d40bc5867d6ecbd80ac0fc1 (patch) | |
| tree | d49a49f6c8142a1762a339a99396421a127cc146 /debian/patches | |
| download | truecrypt-faae49c640ee2d308d40bc5867d6ecbd80ac0fc1.tar.gz truecrypt-faae49c640ee2d308d40bc5867d6ecbd80ac0fc1.tar.bz2 truecrypt-faae49c640ee2d308d40bc5867d6ecbd80ac0fc1.zip | |
initial packaging based on http://www.unchartedbackwaters.co.uk/pyblosxom/static/truecrypt_debian_packaging
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/000-opencryptoki-2.2.8.patch | 47 | ||||
| -rw-r--r-- | debian/patches/001-user-guide-location.patch | 13 | ||||
| -rw-r--r-- | debian/patches/002-build-flags.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
4 files changed, 79 insertions, 0 deletions
diff --git a/debian/patches/000-opencryptoki-2.2.8.patch b/debian/patches/000-opencryptoki-2.2.8.patch new file mode 100644 index 0000000..93b19e2 --- /dev/null +++ b/debian/patches/000-opencryptoki-2.2.8.patch @@ -0,0 +1,47 @@ +Description: Build against libopencryptoki 2.2.28 +Author: Francis Russell <francis@unchartedbackwaters.co.uk> +--- a/Common/SecurityToken.cpp 2009-11-08 01:24:41.000000000 +0000 ++++ b/Common/SecurityToken.cpp 2009-11-08 01:29:30.000000000 +0000 +@@ -657,9 +657,15 @@ + TC_TOKEN_ERR (CKR_CRYPTOKI_ALREADY_INITIALIZED) + TC_TOKEN_ERR (CKR_MUTEX_BAD) + TC_TOKEN_ERR (CKR_MUTEX_NOT_LOCKED) ++ ++ /* ++ These error codes do not exist in PKCS#11 v2.11. ++ Removing them simply causes the error description strings to be returned as hex. ++ + TC_TOKEN_ERR (CKR_NEW_PIN_MODE) + TC_TOKEN_ERR (CKR_NEXT_OTP) + TC_TOKEN_ERR (CKR_FUNCTION_REJECTED) ++ */ + + #undef TC_TOKEN_ERR + }; +--- a/Common/SecurityToken.h 2009-11-08 01:24:41.000000000 +0000 ++++ b/Common/SecurityToken.h 2009-11-08 01:27:01.000000000 +0000 +@@ -19,6 +19,15 @@ + #ifndef NULL_PTR + # define NULL_PTR 0 + #endif ++ ++#ifndef CK_TRUE ++# define CK_TRUE TRUE ++#endif ++ ++#ifndef CK_FALSE ++# define CK_FALSE FALSE ++#endif ++ + #define CK_PTR * + #define CK_CALLBACK_FUNCTION(RET_TYPE, NAME) RET_TYPE (* NAME) + +@@ -40,7 +49,7 @@ + # define CK_DECLARE_FUNCTION(RET_TYPE, NAME) RET_TYPE NAME + # define CK_DECLARE_FUNCTION_POINTER(RET_TYPE, NAME) RET_TYPE (* NAME) + +-# include <pkcs11.h> ++# include <opencryptoki/pkcs11.h> + + #endif // !TC_WINDOWS + diff --git a/debian/patches/001-user-guide-location.patch b/debian/patches/001-user-guide-location.patch new file mode 100644 index 0000000..38af4ff --- /dev/null +++ b/debian/patches/001-user-guide-location.patch @@ -0,0 +1,13 @@ +Description: rename user guide (not white spaces in filename) +Author: Francis Russell <francis@unchartedbackwaters.co.uk> +--- a/Main/GraphicUserInterface.cpp 2013-01-13 23:15:11.109850819 +0000 ++++ b/Main/GraphicUserInterface.cpp 2013-01-13 23:15:25.184237643 +0000 +@@ -1085,7 +1085,7 @@ + #elif defined (TC_MACOSX) + docPath += L"/../Resources/TrueCrypt User Guide.pdf"; + #elif defined (TC_UNIX) +- docPath = L"/usr/share/truecrypt/doc/TrueCrypt User Guide.pdf"; ++ docPath = L"/usr/share/doc/truecrypt/user_guide.pdf"; + #else + # error TC_RESOURCE_DIR undefined + #endif diff --git a/debian/patches/002-build-flags.patch b/debian/patches/002-build-flags.patch new file mode 100644 index 0000000..ee7d233 --- /dev/null +++ b/debian/patches/002-build-flags.patch @@ -0,0 +1,16 @@ +Description: Fill build flags directly in Makefile +Author: Francis Russell <francis@unchartedbackwaters.co.uk> +--- a/Makefile 2012-02-07 10:36:48.000000000 +0000 ++++ b/Makefile 2013-01-13 23:19:51.593631914 +0000 +@@ -50,6 +50,11 @@ + export WXCONFIG_CXXFLAGS := + WX_ROOT ?= .. + ++CPPFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS) ++CFLAGS+=$(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS) ++CXXFLAGS+=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS) ++LFLAGS+=$(shell dpkg-buildflags --get LDFLAGS) ++ + + export TC_BUILD_CONFIG := Release + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ae33e1f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +000-opencryptoki-2.2.8.patch +001-user-guide-location.patch +002-build-flags.patch |