/srv/hg/libpwquality: Do usrmove.
by admin@fedoraproject.org
changeset d5b371d36610 in /srv/hg/libpwquality
details: http://hg.fedorahosted.org/hg/srv/hg/libpwquality?cmd=changeset;node=d5b3...
summary: Do usrmove.
diffstat:
libpwquality.spec.in | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diffs (46 lines):
diff -r c40789762487 -r d5b371d36610 libpwquality.spec.in
--- a/libpwquality.spec.in Mon Jul 08 15:04:18 2013 +0200
+++ b/libpwquality.spec.in Thu Jul 11 10:10:19 2013 +0200
@@ -8,7 +8,8 @@
Group: System Environment/Base
Source0: http://fedorahosted.org/releases/l/i/libpwquality/libpwquality-%{version}...
-%global _moduledir /%{_lib}/security
+%global _pwqlibdir %{_libdir}
+%global _moduledir %{_libdir}/security
%global _secconfdir %{_sysconfdir}/security
Requires: cracklib-dicts >= 2.8
@@ -56,7 +57,7 @@
%build
%configure \
- --with-securedir=/%{_lib}/security \
+ --with-securedir=%{_moduledir} \
--with-pythonsitedir=%{python_sitearch} \
--disable-static
@@ -65,10 +66,12 @@
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+%if "%{_pwqlibdir}" != "%{_libdir}"
pushd $RPM_BUILD_ROOT%{_libdir}
-mv libpwquality.so.* $RPM_BUILD_ROOT/%{_lib}/
-ln -sf ../../%{_lib}/libpwquality.so.*.* libpwquality.so
+mv libpwquality.so.* $RPM_BUILD_ROOT%{_pwqlibdir}
+ln -sf %{_pwqlibdir}/libpwquality.so.*.* libpwquality.so
popd
+%endif
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_moduledir}/*.la
@@ -87,7 +90,7 @@
%{_bindir}/pwmake
%{_bindir}/pwscore
%{_moduledir}/pam_pwquality.so
-/%{_lib}/libpwquality.so.*
+%{_pwqlibdir}/libpwquality.so.*
%config(noreplace) %{_secconfdir}/pwquality.conf
%{_mandir}/man1/*
%{_mandir}/man5/*
10 years, 9 months
/srv/hg/libpwquality: Just reformatted translation files.
by admin@fedoraproject.org
changeset c40789762487 in /srv/hg/libpwquality
details: http://hg.fedorahosted.org/hg/srv/hg/libpwquality?cmd=changeset;node=c407...
summary: Just reformatted translation files.
diffstat:
po/da.po | 41 ++++++++++++++++++++++-----------------
po/fr.po | 65 +++++++++++++++++++++++++++++++++++++++------------------------
po/hu.po | 45 +++++++++++++++++++++++++------------------
3 files changed, 89 insertions(+), 62 deletions(-)
diffs (400 lines):
diff -r fd72263c7f70 -r c40789762487 po/da.po
--- a/po/da.po Mon Jul 08 14:50:03 2013 +0200
+++ b/po/da.po Mon Jul 08 15:04:18 2013 +0200
@@ -1,38 +1,39 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR libpwquality project
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Kris Thomsen <lakristho(a)gmail.com>, 2009,2013
msgid ""
msgstr ""
"Project-Id-Version: PWQuality library\n"
"Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2012-06-29 11:02+0200\n"
+"POT-Creation-Date: 2012-12-20 10:03+0100\n"
"PO-Revision-Date: 2013-04-02 21:24+0000\n"
"Last-Translator: Kris Thomsen <lakristho(a)gmail.com>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/libpwquality/language/da/)\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/libpwquality/"
+"language/da/)\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/pam_pwquality.c:22
+#: src/pam_pwquality.c:25
#, c-format
msgid "New %s%spassword: "
msgstr "Ny %s%sadgangskode: "
-#: src/pam_pwquality.c:24
+#: src/pam_pwquality.c:27
#, c-format
msgid "Retype new %s%spassword: "
msgstr "Genindtast ny %s%sadgangskode: "
-#: src/pam_pwquality.c:25
+#: src/pam_pwquality.c:28
msgid "Sorry, passwords do not match."
msgstr "Adgangskoderne stemmer ikke overens."
-#: src/pam_pwquality.c:181
+#: src/pam_pwquality.c:241
#, c-format
msgid "BAD PASSWORD: %s"
msgstr "DÅRLIG ADGANGSKODE: %s"
@@ -45,11 +46,10 @@
#: src/pwscore.c:23
#, c-format
msgid ""
-" The command reads the password to be scored from the standard "
-"input.\n"
+" The command reads the password to be scored from the standard input.\n"
msgstr "Kommandoen læser adgangskoden, som hentes fra standard-inputtet.\n"
-#: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:64
+#: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65
#, c-format
msgid "Error: %s\n"
msgstr "Fejl: %s\n"
@@ -58,12 +58,14 @@
msgid "Could not obtain the password to be scored"
msgstr "Kunne ikke opfange adgangskoden, som skulle vurderes"
-#: src/pwscore.c:71
+#: src/pwscore.c:73
#, c-format
msgid ""
"Password quality check failed:\n"
" %s\n"
-msgstr "Kvalitetstjek af adgangskode mislykkedes:\n%s\n"
+msgstr ""
+"Kvalitetstjek af adgangskode mislykkedes:\n"
+"%s\n"
#: src/pwmake.c:22
#, c-format
@@ -99,9 +101,9 @@
msgstr "Adgangskoden indeholder på den ene eller den anden måde brugernavnet"
#: src/error.c:47
-msgid ""
-"The password contains words from the real name of the user in some form"
-msgstr "Adgangskoden indeholder ord fra brugerens rigtige navn i en eller anden form"
+msgid "The password contains words from the real name of the user in some form"
+msgstr ""
+"Adgangskoden indeholder ord fra brugerens rigtige navn i en eller anden form"
#: src/error.c:49
msgid "The password contains forbidden words in some form"
@@ -179,7 +181,8 @@
msgid ""
"The password contains more than %ld characters of the same class "
"consecutively"
-msgstr "Adgangskoden indeholder mere end %ld tegn af samme klasse efter hinanden"
+msgstr ""
+"Adgangskoden indeholder mere end %ld tegn af samme klasse efter hinanden"
#: src/error.c:99
msgid ""
@@ -205,7 +208,9 @@
#: src/error.c:111
msgid "Password generation failed - required entropy too low for settings"
-msgstr "Generering af adgangskode mislykkedes - påkrævet entropi for lav til indstillinger"
+msgstr ""
+"Generering af adgangskode mislykkedes - påkrævet entropi for lav til "
+"indstillinger"
#: src/error.c:114 src/error.c:117
msgid "The password fails the dictionary check"
diff -r fd72263c7f70 -r c40789762487 po/fr.po
--- a/po/fr.po Mon Jul 08 14:50:03 2013 +0200
+++ b/po/fr.po Mon Jul 08 15:04:18 2013 +0200
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR libpwquality project
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# mrtomlinux <thomas.canniot(a)mrtomlinux.org>, 2008
# Charles-Antoine Couret <cacouret(a)wanadoo.fr>, 2009
@@ -13,31 +13,32 @@
msgstr ""
"Project-Id-Version: PWQuality library\n"
"Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2012-06-29 11:02+0200\n"
+"POT-Creation-Date: 2012-12-20 10:03+0100\n"
"PO-Revision-Date: 2013-04-16 19:15+0000\n"
"Last-Translator: Jérôme Fenal <jfenal(a)gmail.com>\n"
-"Language-Team: French (http://www.transifex.com/projects/p/libpwquality/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/projects/p/libpwquality/"
+"language/fr/)\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/pam_pwquality.c:22
+#: src/pam_pwquality.c:25
#, c-format
msgid "New %s%spassword: "
msgstr "Nouveau %s%smot de passe : "
-#: src/pam_pwquality.c:24
+#: src/pam_pwquality.c:27
#, c-format
msgid "Retype new %s%spassword: "
msgstr "Retapez le nouveau %s%smot de passe : "
-#: src/pam_pwquality.c:25
+#: src/pam_pwquality.c:28
msgid "Sorry, passwords do not match."
msgstr "Désolé, les mots de passe ne correspondent pas."
-#: src/pam_pwquality.c:181
+#: src/pam_pwquality.c:241
#, c-format
msgid "BAD PASSWORD: %s"
msgstr "MOT DE PASSE INCORRECT : %s"
@@ -50,11 +51,12 @@
#: src/pwscore.c:23
#, c-format
msgid ""
-" The command reads the password to be scored from the standard "
-"input.\n"
-msgstr " La commande lit le mot de passe à noter à partir de l'entrée standard.\n"
+" The command reads the password to be scored from the standard input.\n"
+msgstr ""
+" La commande lit le mot de passe à noter à partir de l'entrée "
+"standard.\n"
-#: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:64
+#: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65
#, c-format
msgid "Error: %s\n"
msgstr "Erreur : %s\n"
@@ -63,12 +65,14 @@
msgid "Could not obtain the password to be scored"
msgstr "Impossible d'obtenir le mot de passe à noter"
-#: src/pwscore.c:71
+#: src/pwscore.c:73
#, c-format
msgid ""
"Password quality check failed:\n"
" %s\n"
-msgstr "Échec de la vérification de la qualité du mot de passe :\n %s\n"
+msgstr ""
+"Échec de la vérification de la qualité du mot de passe :\n"
+" %s\n"
#: src/pwmake.c:22
#, c-format
@@ -104,13 +108,15 @@
msgstr "Le mot de passe contient le nom d'utilisateur sous une forme"
#: src/error.c:47
-msgid ""
-"The password contains words from the real name of the user in some form"
-msgstr "Le mot de passe contient des mots appartenant au nom réel de l'utilisateur sous une forme ou une autre"
+msgid "The password contains words from the real name of the user in some form"
+msgstr ""
+"Le mot de passe contient des mots appartenant au nom réel de l'utilisateur "
+"sous une forme ou une autre"
#: src/error.c:49
msgid "The password contains forbidden words in some form"
-msgstr "Le mot de passe contient des mots interdits sous une forme ou une autre"
+msgstr ""
+"Le mot de passe contient des mots interdits sous une forme ou une autre"
#: src/error.c:52
#, c-format
@@ -173,7 +179,8 @@
#: src/error.c:90
#, c-format
msgid "The password contains more than %ld same characters consecutively"
-msgstr "Le mot de passe contient plus de %ld caractères similaires consécutifs "
+msgstr ""
+"Le mot de passe contient plus de %ld caractères similaires consécutifs "
#: src/error.c:93
msgid "The password contains too many same characters consecutively"
@@ -184,21 +191,26 @@
msgid ""
"The password contains more than %ld characters of the same class "
"consecutively"
-msgstr " Le mot de passe contient plus de %ld caractères consécutifs de la même classe"
+msgstr ""
+" Le mot de passe contient plus de %ld caractères consécutifs de la même "
+"classe"
#: src/error.c:99
msgid ""
"The password contains too many characters of the same class consecutively"
-msgstr "Le mot de passe contient trop de caractères consécutifs de la même classe"
+msgstr ""
+"Le mot de passe contient trop de caractères consécutifs de la même classe"
#: src/error.c:102
#, c-format
msgid "The password contains monotonic sequence longer than %ld characters"
-msgstr "Le mot de passe contient une séquence monotone de plus de %ld caractères"
+msgstr ""
+"Le mot de passe contient une séquence monotone de plus de %ld caractères"
#: src/error.c:105
msgid "The password contains too long of a monotonic character sequence"
-msgstr "Le mot de passe contient une séquence monotone trop longue de caractères"
+msgstr ""
+"Le mot de passe contient une séquence monotone trop longue de caractères"
#: src/error.c:107
msgid "No password supplied"
@@ -206,11 +218,14 @@
#: src/error.c:109
msgid "Cannot obtain random numbers from the RNG device"
-msgstr "Impossible d'obtenir des nombres au hasard à partir du périphérique RNG"
+msgstr ""
+"Impossible d'obtenir des nombres au hasard à partir du périphérique RNG"
#: src/error.c:111
msgid "Password generation failed - required entropy too low for settings"
-msgstr "Échec de génération de mot de passe - l'entropie nécessaire est trop faible pour les paramètres"
+msgstr ""
+"Échec de génération de mot de passe - l'entropie nécessaire est trop faible "
+"pour les paramètres"
#: src/error.c:114 src/error.c:117
msgid "The password fails the dictionary check"
diff -r fd72263c7f70 -r c40789762487 po/hu.po
--- a/po/hu.po Mon Jul 08 14:50:03 2013 +0200
+++ b/po/hu.po Mon Jul 08 15:04:18 2013 +0200
@@ -1,7 +1,7 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR libpwquality project
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# Translators:
# Kalman Kemenczy <kkemenczy(a)novell.com>, 2006, 2007
# Keresztes Ákos <xsak(a)c2.hu>, 2006
@@ -11,31 +11,32 @@
msgstr ""
"Project-Id-Version: PWQuality library\n"
"Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n"
-"POT-Creation-Date: 2012-06-29 11:02+0200\n"
+"POT-Creation-Date: 2012-12-20 10:03+0100\n"
"PO-Revision-Date: 2013-01-08 15:31+0000\n"
"Last-Translator: Zoltan Hoppár <hopparz(a)gmail.com>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/libpwquality/language/hu/)\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/libpwquality/"
+"language/hu/)\n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/pam_pwquality.c:22
+#: src/pam_pwquality.c:25
#, c-format
msgid "New %s%spassword: "
msgstr "Új %s%sjelszó: "
-#: src/pam_pwquality.c:24
+#: src/pam_pwquality.c:27
#, c-format
msgid "Retype new %s%spassword: "
msgstr "Ismételje meg az új %s%sjelszavát: "
-#: src/pam_pwquality.c:25
+#: src/pam_pwquality.c:28
msgid "Sorry, passwords do not match."
msgstr "Sajnálom, de a jelszavak nem egyeznek."
-#: src/pam_pwquality.c:181
+#: src/pam_pwquality.c:241
#, c-format
msgid "BAD PASSWORD: %s"
msgstr "ROSSZ JELSZÓ: %s"
@@ -48,11 +49,12 @@
#: src/pwscore.c:23
#, c-format
msgid ""
-" The command reads the password to be scored from the standard "
-"input.\n"
-msgstr " A parancs kiolvassa a jelszavát hogy pontozhassa a szabványos bemenetről.\n"
+" The command reads the password to be scored from the standard input.\n"
+msgstr ""
+" A parancs kiolvassa a jelszavát hogy pontozhassa a szabványos "
+"bemenetről.\n"
-#: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:64
+#: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65
#, c-format
msgid "Error: %s\n"
msgstr "Hiba: %s\n"
@@ -61,12 +63,14 @@
msgid "Could not obtain the password to be scored"
msgstr "Nem elérhető a jelszó a minősítéshez"
-#: src/pwscore.c:71
+#: src/pwscore.c:73
#, c-format
msgid ""
"Password quality check failed:\n"
" %s\n"
-msgstr "Jelszó minőségi ellenőrzés meghiúsult:\n%s\n"
+msgstr ""
+"Jelszó minőségi ellenőrzés meghiúsult:\n"
+"%s\n"
#: src/pwmake.c:22
#, c-format
@@ -102,9 +106,10 @@
msgstr "A jelszó tartalmazza a felhasználói nevét valamilyen formában"
#: src/error.c:47
-msgid ""
-"The password contains words from the real name of the user in some form"
-msgstr "A jelszó szavakat tartalmaz a felhasználó valódi neve alapján bizonyos formában"
+msgid "The password contains words from the real name of the user in some form"
+msgstr ""
+"A jelszó szavakat tartalmaz a felhasználó valódi neve alapján bizonyos "
+"formában"
#: src/error.c:49
msgid "The password contains forbidden words in some form"
@@ -182,7 +187,8 @@
msgid ""
"The password contains more than %ld characters of the same class "
"consecutively"
-msgstr "A jelszó több mint %ld ugyanolyan osztályú ismétlődő karaktert tartalmaz "
+msgstr ""
+"A jelszó több mint %ld ugyanolyan osztályú ismétlődő karaktert tartalmaz "
#: src/error.c:99
msgid ""
@@ -208,7 +214,8 @@
#: src/error.c:111
msgid "Password generation failed - required entropy too low for settings"
-msgstr "Jelszó generálás sikertelen - a szükséges entrópia túl kevés a beállításokhoz"
+msgstr ""
+"Jelszó generálás sikertelen - a szükséges entrópia túl kevés a beállításokhoz"
#: src/error.c:114 src/error.c:117
msgid "The password fails the dictionary check"
10 years, 9 months
/srv/hg/libpwquality: Treat empty user or old password as NULL.
by admin@fedoraproject.org
changeset fd72263c7f70 in /srv/hg/libpwquality
details: http://hg.fedorahosted.org/hg/srv/hg/libpwquality?cmd=changeset;node=fd72...
summary: Treat empty user or old password as NULL.
diffstat:
src/check.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r e8035cfc9647 -r fd72263c7f70 src/check.c
--- a/src/check.c Wed Jun 19 17:41:41 2013 +0200
+++ b/src/check.c Mon Jul 08 14:50:03 2013 +0200
@@ -654,6 +654,12 @@
return PWQ_ERROR_EMPTY_PASSWORD;
}
+ if (user && *user == '\0')
+ user = NULL;
+
+ if (oldpassword && *oldpassword == '\0')
+ oldpassword = NULL;
+
if (oldpassword && strcmp(oldpassword, password) == 0) {
return PWQ_ERROR_SAME_PASSWORD;
}
10 years, 9 months