From db022333e1218c96ce3f4597abf21c5f79e48e72 Mon Sep 17 00:00:00 2001 From: Bandie Date: Mon, 3 Dec 2018 00:06:19 +0100 Subject: [PATCH] Changelog, new vesion 0.3.0, include version in programs --- ChangeLog | 3 ++- README.md | 2 +- configure.ac | 2 +- src/pam_panic_config/Makefile.am | 3 ++- src/pam_panic_config/pam_panic_config.prebuild.sh | 4 ++-- src/pam_panic_pw/Makefile.am | 2 +- src/pam_panic_pw/pam_panic_pw.c | 4 ++++ 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20254c9..df91171 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,9 @@ -## [0.2.6] +## [0.3.0] - pam_panic_config, a configuration generator - Translations for pam_panic_config - Timeouts when typing wrong passwords - Strict mode: Choose if you want to be locked out if the configuration is corrupt +- Added translations: nl, pl ## [0.2.5] - MBR support diff --git a/README.md b/README.md index 343e9bb..76f8bad 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ sudo apt-get install pampanic ### From sources You will need GCC or similar, as well as the PAM headers. Some distributions package the PAM headers as `libpam0g-dev`. -Also you need `autoconf` and `gettext`. Some also need `autopoint`. +Also you need `dialog`, `autoconf` and `gettext`. Some also need `autopoint`. To compile and install it, do the following within the project's root directory: diff --git a/configure.ac b/configure.ac index 9496d89..a3f3ab1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_INIT( [pam_panic], - [0.2.6], + [0.3.0], [https://github.com/pampanic/pam_panic/issues], [pam_panic]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/src/pam_panic_config/Makefile.am b/src/pam_panic_config/Makefile.am index d6a66e1..1f4cb04 100644 --- a/src/pam_panic_config/Makefile.am +++ b/src/pam_panic_config/Makefile.am @@ -2,7 +2,8 @@ SUBDIRS = applications icons/48x48 icons/64x64 icons/scalable bin_SCRIPTS = pam_panic_config %: %.prebuild.sh - { sldr=$$(echo "$(SECUREDIR)" | $(SED) 's/\//\\\//g'); bdr=$$(echo "$(bindir)" | $(SED) 's/\//\\\//g'); $(SED) "s/__SECURELIBDIR__/$$sldr/;s/__PAMPANICPW__/$$bdr\/pam_panic_pw/" $< > $@ ; } + make clean-local + { sldr=$$(echo "$(SECUREDIR)" | $(SED) 's/\//\\\//g'); bdr=$$(echo "$(bindir)" | $(SED) 's/\//\\\//g'); version=$$(echo $(VERSION)); $(SED) "s/__SECURELIBDIR__/$$sldr/;s/__PAMPANICPW__/$$bdr\/pam_panic_pw/;s/__VERSION__/$$version/" $< > $@ ; } chmod +x $@ clean-local: diff --git a/src/pam_panic_config/pam_panic_config.prebuild.sh b/src/pam_panic_config/pam_panic_config.prebuild.sh index 58f1a4f..d05e22a 100644 --- a/src/pam_panic_config/pam_panic_config.prebuild.sh +++ b/src/pam_panic_config/pam_panic_config.prebuild.sh @@ -11,7 +11,7 @@ LHBU="$HOME/LUKSHeaderBackup" # Set on build time SECUREDIR="__SECURELIBDIR__" PAMPANICPW="__PAMPANICPW__" - +VERSION="__VERSION__" # Localization N_(){ @@ -20,7 +20,7 @@ N_(){ NOT_BUILT=$(N_ "ERROR: Bash script was not built correctly.") RUN_AS_ROOT=$(N_ "Please run this script as root or use sudo.") -BACKTITLE=$(N_ "pam_panic's Configuration Generator.") +BACKTITLE="$(N_ "pam_panic's Configuration Generator.") Version $VERSION" BYE=$(N_ "Bye! :)") OK=$(N_ "OK") CANCEL=$(N_ "Cancel") diff --git a/src/pam_panic_pw/Makefile.am b/src/pam_panic_pw/Makefile.am index 4f9c323..f7a52e0 100644 --- a/src/pam_panic_pw/Makefile.am +++ b/src/pam_panic_pw/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = man -AM_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' +AM_CPPFLAGS = -DLOCALEDIR='"$(localedir)"' -DVERSION='"$(VERSION)"' bin_PROGRAMS = pam_panic_pw pam_panic_pw_SOURCES = pam_panic_pw.c pam_panic_pw.h diff --git a/src/pam_panic_pw/pam_panic_pw.c b/src/pam_panic_pw/pam_panic_pw.c index 6e12782..4c6f282 100644 --- a/src/pam_panic_pw/pam_panic_pw.c +++ b/src/pam_panic_pw/pam_panic_pw.c @@ -23,6 +23,7 @@ LICENSE : GNU-GPLv3 #define _(String) gettext(String) #define FMODE 0644 #define DMODE 0755 +#ifdef VERSION int writePasswords(char pw[][256], char* pwfile){ @@ -89,6 +90,8 @@ int main(void){ printf(_("Please run this program under root. Write access to %s is mandatory.\n"), PPASSFILE); return 1; } + printf("pam_panic_pw %s\n", VERSION); + for(int j=0; j<2; j++){ seed[0] = time(&t); @@ -124,3 +127,4 @@ int main(void){ return writePasswords(pw, PPASSFILE); } #endif +#endif