JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #43068 from yegortimoshenko/qdigidoc

Browse Source 
libdigidoc, libdigidocpp, qdigidoc updates
This commit is contained in:
Yegor Timoshenko 2018-08-11 13:13:22 +03:00 committed by GitHub
commit 501607e0ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 115 additions and 3580 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/libdigidoc/default.nix
View File

@ -2,22 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.10.1.1212"; version = "3.10.4";
name = "libdigidoc-${version}"; name = "libdigidoc-${version}";
src = fetchurl { src = fetchurl {
url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidoc/libdigidoc_3.10.1.1212.orig.tar.xz"; url = "https://github.com/open-eid/libdigidoc/releases/download/v${version}/libdigidoc-${version}.tar.gz";
sha256 = "ad5e0603aea2e02977f17318cc93a53c3a19a815e57b2347d97136d11c110807"; sha256 = "0w5wsaj2a5wss1r9j39bfsrkp3xz0w3v1gnr190v6k7l74l453w1";
}; };
unpackPhase = '' nativeBuildInputs = [ cmake ];
mkdir src
tar xf $src -C src buildInputs = [ openssl pcsclite opensc libxml2 ];
cd src
'';
buildInputs = [ cmake openssl pcsclite opensc libxml2 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library for creating DigiDoc signature files"; description = "Library for creating DigiDoc signature files";
homepage = http://www.id.ee/; homepage = http://www.id.ee/;

24
pkgs/development/libraries/libdigidocpp/default.nix
View File

@ -1,26 +1,22 @@
{ stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl { stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl
, xercesc, xml-security-c, pkgconfig, xsd, zlib, vim }: , xercesc, xml-security-c, pkgconfig, xsd, zlib, xalanc, xxd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.13.6";
version = "3.13.3.1365";
name = "libdigidocpp-${version}"; name = "libdigidocpp-${version}";
src = fetchurl { src = fetchurl {
url = "https://installer.id.ee/media/ubuntu/pool/main/libd/libdigidocpp/libdigidocpp_3.13.3.1365.orig.tar.xz"; url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz";
sha256 = "1xmvjh5xzspm6ja8hz6bzblwly7yn2jni2m6kx8ny9g65zjrj2iw"; sha256 = "1sdrj7664737k3kbnj2xrnilnx5ifj8hg42z8pxagb0j81x0pnqj";
}; };
unpackPhase = '' nativeBuildInputs = [ cmake pkgconfig xxd ];
mkdir src
tar xf $src -C src buildInputs = [
cd src libdigidoc minizip pcsclite opensc openssl xercesc
''; xml-security-c xsd zlib xalanc
];
buildInputs = [ cmake libdigidoc minizip pcsclite opensc openssl xercesc
xml-security-c pkgconfig xsd zlib vim
];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library for creating DigiDoc signature files"; description = "Library for creating DigiDoc signature files";
homepage = http://www.id.ee/; homepage = http://www.id.ee/;

3309
pkgs/tools/security/qdigidoc/certs.patch
View File

File diff suppressed because one or more lines are too long

61
pkgs/tools/security/qdigidoc/default.nix
View File

@ -1,43 +1,54 @@
{ stdenv, fetchurl, cmake, ccid, qttools, qttranslations, pkgconfig, pcsclite { stdenv, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig
, hicolor-icon-theme, libdigidocpp, opensc, shared-mime-info, openldap , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations }:
, gettext, desktop-file-utils, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "3.12.0.1442";
name = "qdigidoc-${version}"; name = "qdigidoc-${version}";
version = "3.13.6";
src = fetchurl { src = fetchgit {
url = "https://installer.id.ee/media/ubuntu/pool/main/q/qdigidoc/qdigidoc_3.12.0.1442.orig.tar.xz"; url = "https://github.com/open-eid/qdigidoc";
sha256 = "1a7nsi28q57ic99hrb6x83qlvpqvzvk6acbfl6ncny2j4yaxa4jl"; rev = "v${version}";
sha256 = "1qq9fgvkc7fi37ly3kgxksrm4m5rxk9k5s5cig8z0cszsfk6h9lx";
fetchSubmodules = true;
}; };
patches = [ ./certs.patch ./glibc-2_26.patch ]; tsl = fetchurl {
url = "https://ec.europa.eu/information_society/policy/esignature/trusted-list/tl-mp.xml";
sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14";
};
unpackPhase = '' nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkgconfig ];
mkdir src
tar xf $src -C src postPatch = ''
cd src substituteInPlace client/CMakeLists.txt \
--replace $\{TSL_URL} file://${tsl}
''; '';
patches = [
# https://github.com/open-eid/qdigidoc/pull/163
./qt511.patch
];
buildInputs = [
libdigidocpp
opensc
openldap
openssl
pcsclite
qtbase
qttranslations
];
postInstall = '' postInstall = ''
wrapProgram $out/bin/qdigidocclient \ wrapProgram $out/bin/qdigidocclient \
--prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/ --prefix LD_LIBRARY_PATH : ${opensc}/lib/pkcs11/
''; '';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake ccid qttools pcsclite qttranslations
hicolor-icon-theme libdigidocpp opensc shared-mime-info
openldap gettext desktop-file-utils makeWrapper
];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Qt based UI application for verifying and signing digital signatures"; description = "Qt-based UI for signing and verifying DigiDoc documents";
homepage = http://www.id.ee/; homepage = https://www.id.ee/;
license = licenses.lgpl2; license = licenses.lgpl21Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.jagajaga ]; maintainers = with maintainers; [ yegortimoshenko ];
}; };
} }

221
pkgs/tools/security/qdigidoc/glibc-2_26.patch
View File

@ -1,221 +0,0 @@
diff --git a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
index b20a68b..38f1375 100644
--- a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+++ b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
@@ -36,19 +36,19 @@ namespace google_breakpad {
// Minidump defines register structures which are different from the raw
// structures which we get from the kernel. These are platform specific
-// functions to juggle the ucontext and user structures into minidump format.
+// functions to juggle the ucontext_t and user structures into minidump format.
#if defined(__i386__)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[REG_ESP];
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[REG_EIP];
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct _libc_fpstate* fp) {
const greg_t* regs = uc->uc_mcontext.gregs;
@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
#elif defined(__x86_64)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[REG_RSP];
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[REG_RIP];
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct _libc_fpstate* fpregs) {
const greg_t* regs = uc->uc_mcontext.gregs;
@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
#elif defined(__ARM_EABI__)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.arm_sp;
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.arm_pc;
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
out->context_flags = MD_CONTEXT_ARM_FULL;
out->iregs[0] = uc->uc_mcontext.arm_r0;
@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
#elif defined(__aarch64__)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.sp;
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.pc;
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct fpsimd_context* fpregs) {
out->context_flags = MD_CONTEXT_ARM64_FULL;
@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
#elif defined(__mips__)
-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
}
-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
return uc->uc_mcontext.pc;
}
-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
out->context_flags = MD_CONTEXT_MIPS_FULL;
for (int i = 0; i < MD_CONTEXT_MIPS_GPR_COUNT; ++i)
diff --git a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
index b6e77b4..2de80b7 100644
--- a/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+++ b/common/google-breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
@@ -39,23 +39,23 @@
namespace google_breakpad {
-// Wraps platform-dependent implementations of accessors to ucontext structs.
+// Wraps platform-dependent implementations of accessors to ucontext_t structs.
struct UContextReader {
- static uintptr_t GetStackPointer(const struct ucontext* uc);
+ static uintptr_t GetStackPointer(const ucontext_t* uc);
- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
+ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
- // Juggle a arch-specific ucontext into a minidump format
+ // Juggle a arch-specific ucontext_t into a minidump format
// out: the minidump structure
// info: the collection of register structures.
#if defined(__i386__) || defined(__x86_64)
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct _libc_fpstate* fp);
#elif defined(__aarch64__)
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
const struct fpsimd_context* fpregs);
#else
- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
#endif
};
diff --git a/common/google-breakpad/src/client/linux/handler/exception_handler.cc b/common/google-breakpad/src/client/linux/handler/exception_handler.cc
index 3e2d196..b6d02ef 100644
--- a/common/google-breakpad/src/client/linux/handler/exception_handler.cc
+++ b/common/google-breakpad/src/client/linux/handler/exception_handler.cc
@@ -404,9 +404,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
// Fill in all the holes in the struct to make Valgrind happy.
memset(&context, 0, sizeof(context));
memcpy(&context.siginfo, info, sizeof(siginfo_t));
- memcpy(&context.context, uc, sizeof(struct ucontext));
+ memcpy(&context.context, uc, sizeof(ucontext_t));
#if defined(__aarch64__)
- struct ucontext *uc_ptr = (struct ucontext*)uc;
+ ucontext_t* uc_ptr = (ucontext_t*)uc;
struct fpsimd_context *fp_ptr =
(struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
if (fp_ptr->head.magic == FPSIMD_MAGIC) {
@@ -414,9 +414,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) {
}
#elif !defined(__ARM_EABI__) && !defined(__mips__)
// FP state is not part of user ABI on ARM Linux.
- // In case of MIPS Linux FP state is already part of struct ucontext
+ // In case of MIPS Linux FP state is already part of ucontext_t
// and 'float_state' is not a member of CrashContext.
- struct ucontext *uc_ptr = (struct ucontext*)uc;
+ ucontext_t* uc_ptr = (ucontext_t*)uc;
if (uc_ptr->uc_mcontext.fpregs) {
memcpy(&context.float_state,
uc_ptr->uc_mcontext.fpregs,
@@ -440,7 +440,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
// ExceptionHandler::HandleSignal().
siginfo.si_code = SI_USER;
siginfo.si_pid = getpid();
- struct ucontext context;
+ ucontext_t context;
getcontext(&context);
return HandleSignal(sig, &siginfo, &context);
}
diff --git a/common/google-breakpad/src/client/linux/handler/exception_handler.h b/common/google-breakpad/src/client/linux/handler/exception_handler.h
index 591c310..42f4055 100644
--- a/common/google-breakpad/src/client/linux/handler/exception_handler.h
+++ b/common/google-breakpad/src/client/linux/handler/exception_handler.h
@@ -191,11 +191,11 @@ class ExceptionHandler {
struct CrashContext {
siginfo_t siginfo;
pid_t tid; // the crashing thread.
- struct ucontext context;
+ ucontext_t context;
#if !defined(__ARM_EABI__) && !defined(__mips__)
// #ifdef this out because FP state is not part of user ABI for Linux ARM.
- // In case of MIPS Linux FP state is already part of struct
- // ucontext so 'float_state' is not required.
+ // In case of MIPS Linux FP state is already part of ucontext_t so
+ // 'float_state' is not required.
fpstate_t float_state;
#endif
};
diff --git a/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc
index 494e2a2..c00436b 100644
--- a/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+++ b/common/google-breakpad/src/client/linux/microdump_writer/microdump_writer.cc
@@ -328,7 +328,7 @@ class MicrodumpWriter {
void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
- const struct ucontext* const ucontext_;
+ const ucontext_t* const ucontext_;
#if !defined(__ARM_EABI__) && !defined(__mips__)
const google_breakpad::fpstate_t* const float_state_;
#endif
diff --git a/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
index 8406ffe..7e6fe52 100644
--- a/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+++ b/common/google-breakpad/src/client/linux/minidump_writer/minidump_writer.cc
@@ -1221,7 +1221,7 @@ class MinidumpWriter {
const int fd_; // File descriptor where the minidum should be written.
const char* path_; // Path to the file where the minidum should be written.
- const struct ucontext* const ucontext_; // also from the signal handler
+ const ucontext_t* const ucontext_; // also from the signal handler
#if !defined(__ARM_EABI__) && !defined(__mips__)
const google_breakpad::fpstate_t* const float_state_; // ditto
#endif

62
pkgs/tools/security/qdigidoc/qt511.patch Normal file
View File

@ -0,0 +1,62 @@
diff --git a/client/Application.cpp b/client/Application.cpp
index fce9eee..cec84ae 100644
--- a/client/Application.cpp
+++ b/client/Application.cpp
@@ -54,6 +54,7 @@
#include <QtGui/QFileOpenEvent>
#include <QtNetwork/QNetworkProxy>
#include <QtNetwork/QSslConfiguration>
+#include <QtWidgets/QAction>
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QProgressBar>
#include <QtWidgets/QProgressDialog>
diff --git a/client/MainWindow.cpp b/client/MainWindow.cpp
index 06d561e..b4aa0d5 100644
--- a/client/MainWindow.cpp
+++ b/client/MainWindow.cpp
@@ -44,6 +44,8 @@
#include <QtPrintSupport/QPrinter>
#include <QtPrintSupport/QPrinterInfo>
#include <QtPrintSupport/QPrintPreviewDialog>
+#include <QtWidgets/QActionGroup>
+#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QCompleter>
#include <QtWidgets/QMessageBox>
diff --git a/client/MainWindow.h b/client/MainWindow.h
index b9515dd..661418a 100644
--- a/client/MainWindow.h
+++ b/client/MainWindow.h
@@ -24,6 +24,7 @@
#include <QtCore/QStringList>
class DigiDoc;
+class QActionGroup;
class QPrinter;
class MainWindow: public QWidget, private Ui::MainWindow
diff --git a/crypto/MainWindow.cpp b/crypto/MainWindow.cpp
index c3d3115..f12d984 100644
--- a/crypto/MainWindow.cpp
+++ b/crypto/MainWindow.cpp
@@ -35,6 +35,8 @@
#include <QtGui/QDesktopServices>
#include <QtGui/QDragEnterEvent>
#include <QtNetwork/QSslKey>
+#include <QtWidgets/QActionGroup>
+#include <QtWidgets/QButtonGroup>
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QProgressBar>
#include <QtWidgets/QProgressDialog>
diff --git a/crypto/MainWindow.h b/crypto/MainWindow.h
index 16dbec4..01ec99f 100644
--- a/crypto/MainWindow.h
+++ b/crypto/MainWindow.h
@@ -21,6 +21,7 @@
#include "ui_MainWindow.h"
+class QActionGroup;
class CKey;
class CryptoDoc;