From d5165ae303b12353ef6748408d9614d9397b38d1 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Fri, 4 Feb 2022 10:16:21 +0200 Subject: [PATCH] Update NEWS and THANKS files Build the ChangeLog file using plain git, without auxiliary awk formatter. --- Makefile.am | 53 +++++++++++++++++++----------------- NEWS | 16 +++++++++-- THANKS | 3 +++ configure.ac | 2 +- git2chg.awk | 76 ---------------------------------------------------- 5 files changed, 47 insertions(+), 103 deletions(-) delete mode 100644 git2chg.awk diff --git a/Makefile.am b/Makefile.am index 743d789..f64685c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,18 +1,18 @@ -# This file is part of pam-modules. -# Copyright (C) 2001-2022 Sergey Poznyakoff -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . +## This file is part of pam-modules. +## Copyright (C) 2001-2022 Sergey Poznyakoff +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 3, or (at your option) +## any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License along +## with this program. If not, see . ACLOCAL_AMFLAGS = -I m4 -I imprimatur @@ -51,16 +51,21 @@ EXTRA_DIST=ChangeLog.svn # Name of the previous ChangeLog file. prev_change_log = ChangeLog.svn # Start Git ChangeLog from this date. -gen_start_date = 2012-05-13 +gen_start_date = 2012-05-14 .PHONY: ChangeLog ChangeLog: - $(AM_V_GEN)if test -d .git; then \ - git log --pretty='format:%ct %an <%ae>%n%n%s%n%n%b%n' | \ - awk -f $(top_srcdir)/git2chg.awk \ - -vsince="$(gen_start_date)" -vappend="$(prev_change_log)" \ - > ChangeLog.tmp; \ - cmp ChangeLog ChangeLog.tmp > /dev/null 2>&1 || \ - mv ChangeLog.tmp ChangeLog; \ - rm -f ChangeLog.tmp; \ + $(AM_V_GEN)if test -d .git; then \ + (git log --pretty='format:%ad %cn <%ae>%n%n%w(72,8,8)%s%n%n%b' \ + --date=short --since=$(gen_start_date); \ + echo ""; \ + cat ChangeLog.svn; \ + echo ""; \ + echo "Local Variables:"; \ + echo "mode: change-log"; \ + echo "version-control: never"; \ + echo "buffer-read-only: t"; \ + echo "End:"; \ + echo ""; \ + sed -n -e '2,/^$$/s/^##//p' Makefile.am) > ChangeLog; \ fi diff --git a/NEWS b/NEWS index a98924c..61b7de4 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,19 @@ -pam-modules -- history of user-visible changes. 2021-08-11 +pam-modules -- history of user-visible changes. 2022-02-04 See the end of file for copying conditions. Please send pam-modules bug reports to + +Version 2.4.90 (git) + +* pam_fshadow: skip-password option + +Based on the proposal of Mirsad Goran Todorovac, the new option +skip-password instructs pam_fshadow to check whether the user +being authenticated is present in the passwd and/or shadow files, +without verifying his password. This way pam_fshadow can be used as +an auxiliary module in the stack, actual authentication being +performed by one of the modules before it. + Version 2.4.1, 2021-08-11 @@ -39,7 +51,7 @@ This module checks if the current hostname and the name of the user trying to log in are mentioned in a triple of the specified NIS netgroup. -* The ldappubkey utility imporoved. +* The ldappubkey utility improved. The PublicKeyAttribute setting accepts a whitespace-separated list of attribute names. diff --git a/THANKS b/THANKS index e69de29..72c72ba 100644 --- a/THANKS +++ b/THANKS @@ -0,0 +1,3 @@ +pam-modules THANKS file + +Mirsad Goran Todorovac diff --git a/configure.ac b/configure.ac index 96d0cb5..0557343 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ(2.63) -AC_INIT(pam-modules, 2.4.1, bug-pam-modules@gnu.org.ua) +AC_INIT(pam-modules, 2.4.90, bug-pam-modules@gnu.org.ua) AC_CONFIG_SRCDIR(pam_fshadow/pam_fshadow.c) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/git2chg.awk b/git2chg.awk deleted file mode 100644 index c25ff30..0000000 --- a/git2chg.awk +++ /dev/null @@ -1,76 +0,0 @@ -# This file is part of grecs -# Copyright (C) 2007-2022 Sergey Poznyakoff -# -# Grecs is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# Grecs is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Grecs. If not, see . - -BEGIN { - if (since) - split(since,since_a,"-") -} - -function timeok(t, a) { - if (!since) - return 1 - split(t,a,"-") - if (a[1] < since_a[1]) - return 0 - if (a[1] >= since_a[1]) - return 1 - if (a[2] < since_a[2]) - return 0 - if (a[2] >= since_a[2]) - return 1 - return a[3] >= since_a[3] -} - -/^[0-9]+ .* +<[^>]+>/ { - s = strftime("%F", $1) - if (!timeok(s)) - exit - sub(/^[0-9]+ +/,"") - if (s == datestr && author == $0) - next - datestr = s - author = $0 - if (runlen) { runlen = 0; print "" } - printf("%s %s\n", datestr, author) - next -} -/^Signed-off-by:/ { next } -/^git-svn-id:/ { next } -/^$/ { next } -NF==0 { - runlen++ - next -} -{ if (runlen) { runlen = 0; print "" } - print "\t" $0 } - -END { - if (append) { - print "" - while ((getline < append) > 0) { - if (match($0, /^Local *Variables:/)) - break - print - } - } - print "\f" - # Make sure Emacs won't recognize this line: - print "Local", "Variables:" - print "mode: change-log" - print "version-control: never" - print "buffer-read-only: t" - print "End:" -}