Skip to content

Commit

Permalink
Changelog, new vesion 0.3.0, include version in programs
Browse files Browse the repository at this point in the history
  • Loading branch information
Bandie committed Dec 2, 2018
1 parent dfe784f commit db02233
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 7 deletions.
3 changes: 2 additions & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion 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])
Expand Down
3 changes: 2 additions & 1 deletion src/pam_panic_config/Makefile.am
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions src/pam_panic_config/pam_panic_config.prebuild.sh
Expand Up @@ -11,7 +11,7 @@ LHBU="$HOME/LUKSHeaderBackup"
# Set on build time
SECUREDIR="__SECURELIBDIR__"
PAMPANICPW="__PAMPANICPW__"

VERSION="__VERSION__"

# Localization
N_(){
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
4 changes: 4 additions & 0 deletions src/pam_panic_pw/pam_panic_pw.c
Expand Up @@ -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){

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -124,3 +127,4 @@ int main(void){
return writePasswords(pw, PPASSFILE);
}
#endif
#endif

0 comments on commit db02233

Please sign in to comment.