diff options
| author | gregory guy <gregory-tde@laposte.net> | 2020-09-29 10:03:35 +0200 |
|---|---|---|
| committer | gregory guy <gregory-tde@laposte.net> | 2020-09-29 10:03:35 +0200 |
| commit | 6851937dc142ee360fa0c84be439a41f01c6b45d (patch) | |
| tree | 5df2242da820850bf7f9d476726114948102bd37 | |
| parent | e378672008a5cbe55ed08d348721523cad7ee1a6 (diff) | |
| download | smartcardauth-6851937d.tar.gz smartcardauth-6851937d.zip | |
Drop makefile build support.
Add basic cmake build instructions.
Add a README file.
Some cosmetics.
Signed-off-by: gregory guy <gregory-tde@laposte.net>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | INSTALL | 23 | ||||
| -rwxr-xr-x | Makefile | 13 | ||||
| -rw-r--r-- | README | 30 | ||||
| m--------- | admin | 0 | ||||
| -rwxr-xr-x | build_cardpincheck | 5 | ||||
| -rw-r--r-- | src/Makefile | 12 |
8 files changed, 54 insertions, 34 deletions
diff --git a/.gitmodules b/.gitmodules index d817995..ce2e35a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "admin"] - path = admin - url = https://scm.trinitydesktop.org/scm/git/tde-common-admin [submodule "cmake"] path = cmake url = https://scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 91d6c5d..8f19ad2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ tde_setup_paths( ) ##### optional stuff -option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) @@ -0,0 +1,23 @@ +Basic Installation +================== + +smartcardauth relies on cmake to build. + +Here are suggested default options: + + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DWITH_ALL_OPTIONS="ON" + + +Requirements: +============= + +- gnutls +- openssl +- libpkcs11-helper diff --git a/Makefile b/Makefile deleted file mode 100755 index a4c7261..0000000 --- a/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -FPACKAGE = smartcardauth -VERSION = 2.0 - -build: - -clean: - -install: - ./build_cardpincheck - - mkdir -p $(DESTDIR)/usr - cp -Rp src/cardpincheck usr/bin/cardpincheck - cp -Rp usr/* $(DESTDIR)/usr/ @@ -0,0 +1,30 @@ + + smartcardauth - a SmartCard Login and LUKS Decrypt Setup Utility for TDE. + + +Smartcardauth will allow you to set up your computer to accept a +SmartCard as an authentication source. It is designed to work with any +OpenSC-supported, ISO 7816-4,-8 compliant, PKCS#11 enabled smartcard. + +Examples of such cards are: + - The OpenPGP card (ISO ISO 7816-4,-8 compliant) + + +FEATURES: +========= + +* support encrypted LUKS partition +* automatic login, lock, and unlock + + + +CONTRIBUTING +============== + +If you wish to contribute to smartcardauth, you might do so: + +- TDE Gitea Workspace (TGW) collaboration tool. + https://mirror.git.trinitydesktop.org/gitea + +- TDE Weblate Translation Workspace (TWTW) collaboration tool. + https://mirror.git.trinitydesktop.org/weblate diff --git a/admin b/admin deleted file mode 160000 -Subproject 80eb8bffc7c3b5cbf5ab51b4d7877d0cdaad45e diff --git a/build_cardpincheck b/build_cardpincheck deleted file mode 100755 index b354c1f..0000000 --- a/build_cardpincheck +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -cd src/ -make -cd .. diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index 70d8383..0000000 --- a/src/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -LDFLAGS=-ldl -lpthread -lgnutls -lcrypto -lpkcs11-helper - -all: cardpincheck.o cardpincheck - -cardpincheck.o: cardpincheck.c - $(CC) cardpincheck.c -c - -cardpincheck: cardpincheck.o - $(CC) cardpincheck.o -o cardpincheck $(LDFLAGS) - -clean: - rm -f cardpincheck.o cardpincheck |