From b6480d1f1071e7736638249a10942fab262fc0c4 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Tue, 29 Sep 2020 10:03:35 +0200 Subject: [PATCH] Drop makefile build support. Add basic cmake build instructions. Add a README file. Some cosmetics. Signed-off-by: gregory guy (cherry picked from commit 6851937dc142ee360fa0c84be439a41f01c6b45d) --- .gitmodules | 3 --- CMakeLists.txt | 2 +- INSTALL | 23 +++++++++++++++++++++++ Makefile | 22 ---------------------- README | 30 ++++++++++++++++++++++++++++++ admin | 1 - build_ckpasswd | 5 ----- src/Makefile | 25 ------------------------- 8 files changed, 54 insertions(+), 57 deletions(-) create mode 100644 INSTALL delete mode 100755 Makefile create mode 100644 README delete mode 160000 admin delete mode 100755 build_ckpasswd delete mode 100644 src/Makefile 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 0469e12..206b668 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} ) diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..f8c2a23 --- /dev/null +++ b/INSTALL @@ -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 9259b90..0000000 --- a/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -FPACKAGE = smartcardauth -VERSION = 1.0 - -build: - -clean: - -install: - sed -i "s#scriptor#scriptor_standalone#g" scriptor_standalone.pl - /usr/bin/pp -a /usr/lib/perl5/Chipcard -a /usr/lib/perl5/Chipcard -o scriptor_standalone scriptor_standalone.pl - rm scriptor_standalone.pl - mv scriptor_standalone usr/bin/scriptor_standalone - - ./build_ckpasswd - - mkdir -p $(DESTDIR)/usr - cp -Rp src/ckpasswd usr/bin/smartauthckpasswd - cp -Rp src/smartauthmon usr/bin/smartauthmon - cp -Rp usr/* $(DESTDIR)/usr/ - - mkdir -p $(DESTDIR)/etc - cp -Rp etc/* $(DESTDIR)/etc/ diff --git a/README b/README new file mode 100644 index 0000000..32fa007 --- /dev/null +++ b/README @@ -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 index 3013c1e..0000000 --- a/admin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3013c1e653e37c03ef987eb4efd1ebb68a64ad33 diff --git a/build_ckpasswd b/build_ckpasswd deleted file mode 100755 index b354c1f..0000000 --- a/build_ckpasswd +++ /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 4addb1c..0000000 --- a/src/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -all: ckpasswd.o xmalloc.o messages.o ckpass.o ckpasswd smartauthmon - -ckpass.o: ckpass.c - gcc ckpass.c -c - -ckpasswd.o: ckpasswd.c - gcc ckpasswd.c -c - -xmalloc.o: xmalloc.c - gcc xmalloc.c -c - -messages.o: messages.c - gcc messages.c -c - -smartauthmon.o: smartauthmon.cpp - g++ -I/usr/include/tqt -I/usr/include/qt3 -I/usr/include/tqt3 smartauthmon.cpp -c - -ckpasswd: ckpasswd.o - gcc ckpasswd.o xmalloc.o messages.o -o ckpasswd -lpam -lcrypt - -smartauthmon: smartauthmon.o ckpass.o - gcc smartauthmon.o ckpass.o xmalloc.o messages.o -o smartauthmon -ltqt -lpam -lcrypt -ltqt-mt -lstdc++ - -clean: - rm -f ckpasswd.o xmalloc.o messages.o ckpasswd