[linux-pam] build: raise gettext version requirement
by Dmitry V. Levin
commit 58d2da7160a477a5f5654be08bb36cc475eb75d7
Author: Dmitry V. Levin <ldv(a)altlinux.org>
Date: Tue Jan 6 22:29:11 2015 +0000
build: raise gettext version requirement
Raise gettext requirement to the latest oldstable version 0.18.3.
This fixes the following automake warning:
configure.ac:581: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged.
configure.ac:581: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
configure.ac:581: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.
* configure.ac (AM_GNU_GETTEXT_VERSION): Raise from 0.15 to 0.18.3.
* po/Makevars: Update from gettext-0.18.3.
configure.ac | 2 +-
po/Makevars | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cbe5d71..47d254b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -577,7 +577,7 @@ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_docu != xno)
AM_CONDITIONAL(ENABLE_GENERATE_PDF, test ! -z "$FO2PDF")
-AM_GNU_GETTEXT_VERSION([0.15])
+AM_GNU_GETTEXT_VERSION([0.18.3])
AM_GNU_GETTEXT([external])
AC_CHECK_FUNCS(dngettext)
diff --git a/po/Makevars b/po/Makevars
index c152efd..2e0a6ca 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -39,3 +39,15 @@ MSGID_BUGS_ADDRESS = http://sourceforge.net/projects/pam
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context. Possible values are "yes" and "no". Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
9 years, 3 months
[linux-pam] build: adjust automake warning flags
by Dmitry V. Levin
commit 6e1fcb85760a7530ee78af09f16ef22e0bd371fc
Author: Ronny Chevalier <chevalier.ronny(a)gmail.com>
Date: Thu Dec 11 16:14:42 2014 +0100
build: adjust automake warning flags
Enable all automake warning flags except for the portability issues,
since non portable features are used among the makefiles.
* configure.ac (AM_INIT_AUTOMAKE): Add -Wall -Wno-portability.
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6797e2f..cbe5d71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT([Linux-PAM], [1.1.8], , [Linux-PAM])
AC_CONFIG_SRCDIR([conf/pam_conv1/pam_conv_y.y])
AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([-Wall -Wno-portability])
AC_PREREQ([2.61])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
9 years, 3 months
[linux-pam] build: rename configure.in to configure.ac
by Dmitry V. Levin
commit 7fbf54d6f4b67ed7bac04d801174ecfaa538c1a0
Author: Dmitry V. Levin <ldv(a)altlinux.org>
Date: Tue Jan 6 21:13:54 2015 +0000
build: rename configure.in to configure.ac
This fixes the following automake warning:
aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in'
* configure.in: Rename to configure.ac.
configure.in => configure.ac | 0
1 files changed, 0 insertions(+), 0 deletions(-)
---
diff --git a/configure.in b/configure.ac
similarity index 100%
rename from configure.in
rename to configure.ac
9 years, 3 months
[linux-pam] Remove unmodified GNU gettext files installed by autopoint
by Dmitry V. Levin
commit 8b70f8feffcdc239511cb150bec43c173678b288
Author: Dmitry V. Levin <ldv(a)altlinux.org>
Date: Tue Jan 6 22:58:27 2015 +0000
Remove unmodified GNU gettext files installed by autopoint
These files are part of GNU gettext; we have not modified them, they are
installed by autopoint which is called by autoreconf, so they had to be
removed from this repository along with ABOUT-NLS, config.rpath, and
mkinstalldirs files that were removed by commit
Linux-PAM-1_1_5-7-g542ec8b.
* po/Makefile.in.in: Remove.
* po/Rules-quot: Likewise.
* po/boldquot.sed: Likewise.
* po/en(a)boldquot.header: Likewise.
* po/en(a)quot.header: Likewise.
* po/insert-header.sin: Likewise.
* po/quot.sed: Likewise.
* po/remove-potcdate.sin: Likewise.
* po/.gitignore: Ignore these files.
po/.gitignore | 10 +-
po/Makefile.in.in | 393 ------------------------------------------------
po/Rules-quot | 47 ------
po/boldquot.sed | 10 --
po/en(a)boldquot.header | 25 ---
po/en(a)quot.header | 22 ---
po/insert-header.sin | 23 ---
po/quot.sed | 6 -
po/remove-potcdate.sin | 19 ---
9 files changed, 9 insertions(+), 546 deletions(-)
---
diff --git a/po/.gitignore b/po/.gitignore
index 15407cd..7309e90 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,5 +1,13 @@
+*.gmo
+Makefile.in.in
Makevars.template
POTFILES
-*.gmo
+Rules-quot
+boldquot.sed
+en(a)boldquot.header
+en(a)quot.header
+insert-header.sin
+quot.sed
remove-potcdate.sed
+remove-potcdate.sin
stamp-po
9 years, 3 months
[linux-pam] Update .gitignore
by Dmitry V. Levin
commit 2643450b562249e6d732eb05eb2abdf7ce69e0aa
Author: Ronny Chevalier <chevalier.ronny(a)gmail.com>
Date: Thu Dec 11 16:14:43 2014 +0100
Update .gitignore
* .gitignore: Ignore *.log and *.trs files.
.gitignore | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f881729..e843e76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,9 +6,11 @@
*.fo
*.la
*.lo
+*.log
*.o
*.pdf
*.so
+*.trs
*~
.deps/
.libs/
9 years, 3 months
[linux-pam] libpam: Only print "Password change aborted" when it's true.
by Tomáš Mráz
commit c1023edd3d2e9dcd83a7822f1830a69f51101334
Author: Luke Shumaker <lukeshu(a)sbcglobal.net>
Date: Mon Dec 22 15:46:43 2014 -0500
libpam: Only print "Password change aborted" when it's true.
pam_get_authtok() may be used any time that a password needs to be entered,
unlike pam_get_authtok_{no,}verify(), which may only be used when
changing a password; yet when the user aborts, it prints "Password change
aborted." whether or not that was the operation being performed.
This bug was non-obvious because none of the modules distributed with
Linux-PAM use it for anything but changing passwords; pam_unix has its
own utility function that it uses instead. As an example, the
nss-pam-ldapd package uses it in pam_sm_authenticate().
libpam/pam_get_authtok.c (pam_get_authtok_internal): check that the
password is trying to be changed before printing a message about the
password change being aborted.
libpam/pam_get_authtok.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/libpam/pam_get_authtok.c b/libpam/pam_get_authtok.c
index 31bb162..663f1f3 100644
--- a/libpam/pam_get_authtok.c
+++ b/libpam/pam_get_authtok.c
@@ -151,8 +151,9 @@ pam_get_authtok_internal (pam_handle_t *pamh, int item,
if (retval != PAM_SUCCESS || resp[0] == NULL ||
(chpass > 1 && resp[1] == NULL))
{
- /* We want to abort the password change */
- pam_error (pamh, _("Password change aborted."));
+ /* We want to abort */
+ if (chpass)
+ pam_error (pamh, _("Password change aborted."));
return PAM_AUTHTOK_ERR;
}
9 years, 3 months