diffstat for libpwquality-1.2.3 libpwquality-1.3.0 ABOUT-NLS | 2019 +++++++++++++++++++----------------- AUTHORS | 4 ChangeLog | 12 Makefile.am | 3 Makefile.in | 362 +++--- NEWS | 9 aclocal.m4 | 745 ++++++++----- ar-lib | 270 ++++ compile | 347 ++++++ config.guess | 346 ++---- config.h.in | 8 config.rpath | 228 ++-- config.sub | 127 +- configure | 1532 +++++++++++++++++++++------ configure.ac | 169 +++ configure.in | 163 -- debian/changelog | 21 debian/control | 7 debian/control.in | 4 debian/patches/git_stack_over.patch | 13 debian/patches/series | 1 debian/python-pwquality.install | 2 debian/rules | 2 doc/Makefile.in | 284 ++--- doc/man/Makefile.am | 19 doc/man/Makefile.in | 216 ++- doc/man/pam_pwquality.8 | 670 +++++------ doc/man/pam_pwquality.8.pod | 309 +++++ doc/man/pwmake.1 | 131 +- doc/man/pwmake.1.pod | 48 doc/man/pwquality.3 | 201 +++ doc/man/pwquality.3.pod | 133 ++ doc/man/pwquality.conf.5 | 223 ++- doc/man/pwquality.conf.5.pod | 123 ++ doc/man/pwscore.1 | 129 +- doc/man/pwscore.1.pod | 51 libpwquality.spec | 58 - libpwquality.spec.in | 56 ltmain.sh | 93 - m4/gettext.m4 | 458 ++------ m4/iconv.m4 | 223 +++ m4/intlmacosx.m4 | 56 m4/lib-ld.m4 | 87 - m4/lib-link.m4 | 303 ++++- m4/lib-prefix.m4 | 91 + m4/libtool.m4 | 277 +++- m4/ltoptions.m4 | 19 m4/ltversion.m4 | 10 m4/nls.m4 | 13 m4/po.m4 | 58 - m4/progtest.m4 | 31 po/ChangeLog | 5 po/LINGUAS | 1 po/Makefile.in.in | 92 + po/Rules-quot | 4 po/ar.gmo |binary po/ar.po | 9 po/as.gmo |binary po/as.po | 7 po/bg.gmo |binary po/bg.po | 13 po/bn_IN.gmo |binary po/bn_IN.po | 106 - po/ca.gmo |binary po/ca.po | 13 po/cs.gmo |binary po/cs.po | 15 po/da.gmo |binary po/da.po | 4 po/de.gmo |binary po/de.po | 7 po/es.gmo |binary po/es.po | 51 po/eu.gmo |binary po/eu.po | 9 po/fi.gmo |binary po/fi.po | 17 po/fr.gmo |binary po/fr.po | 7 po/gu.gmo |binary po/gu.po | 104 - po/he.gmo |binary po/he.po | 9 po/hi.gmo |binary po/hi.po | 107 - po/hu.gmo |binary po/hu.po | 4 po/it.gmo |binary po/it.po | 14 po/ja.gmo |binary po/ja.po | 7 po/kk.gmo |binary po/kk.po | 9 po/km.gmo |binary po/km.po | 13 po/kn.gmo |binary po/kn.po | 105 - po/ko.gmo |binary po/ko.po | 103 - po/libpwquality.pot | 4 po/ml.gmo |binary po/ml.po | 105 - po/mr.gmo |binary po/mr.po | 115 +- po/mr_IN.gmo |binary po/mr_IN.po | 4 po/ms.gmo |binary po/ms.po | 256 ---- po/nb.gmo |binary po/nb.po | 13 po/nl.gmo |binary po/nl.po | 19 po/or.gmo |binary po/or.po | 107 - po/pa.gmo |binary po/pa.po | 89 - po/pl.gmo |binary po/pl.po | 15 po/pt.gmo |binary po/pt.po | 17 po/pt_BR.gmo |binary po/pt_BR.po | 106 + po/ru.gmo |binary po/ru.po | 7 po/si.gmo |binary po/si.po | 11 po/sk.gmo |binary po/sk.po | 15 po/sr.gmo |binary po/sr.po | 17 po/sr@latin.gmo |binary po/sr@latin.po | 17 po/sv.gmo |binary po/sv.po | 13 po/ta.gmo |binary po/ta.po | 110 + po/te.gmo |binary po/te.po | 108 - po/tr.gmo |binary po/tr.po | 13 po/uk.gmo |binary po/uk.po | 13 po/vi.gmo |binary po/vi.po | 9 po/zh_CN.gmo |binary po/zh_CN.po | 7 po/zh_TW.gmo |binary po/zh_TW.po | 7 po/zu.gmo |binary po/zu.po | 9 python/Makefile.am | 9 python/Makefile.in | 219 +-- python/pwquality.c | 92 + python/setup.py | 2 python/setup.py.in | 72 + src/Makefile.am | 8 src/Makefile.in | 326 +++-- src/check.c | 16 src/pwqprivate.h | 18 src/pwquality.conf | 12 src/pwquality.h | 6 src/pwquality.pc | 2 src/settings.c | 110 + 163 files changed, 8780 insertions(+), 4917 deletions(-) diff -Nru libpwquality-1.2.3/ABOUT-NLS libpwquality-1.3.0/ABOUT-NLS --- libpwquality-1.2.3/ABOUT-NLS 2012-11-07 13:07:15.000000000 +0000 +++ libpwquality-1.3.0/ABOUT-NLS 2014-08-06 12:39:16.000000000 +0000 @@ -18,35 +18,7 @@ available translations. They tell how people wanting to contribute and work on translations can contact the appropriate team. - When reporting bugs in the `intl/' directory or bugs which may be -related to internationalization, you should tell about the version of -`gettext' which is used. The information can be found in the -`intl/VERSION' file, in internationalized packages. - -1.1 Quick configuration advice -============================== - -If you want to exploit the full power of internationalization, you -should configure it using - - ./configure --with-included-gettext - -to force usage of internationalizing routines provided within this -package, despite the existence of internationalizing capabilities in the -operating system where this package is being installed. So far, only -the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias, message inheritance, automatic -charset conversion or plural form handling) as the implementation here. -It is also not possible to offer this additional functionality on top -of a `catgets' implementation. Future versions of GNU `gettext' will -very likely convey even more functionality. So it might be a good idea -to change to GNU `gettext' as soon as possible. - - So you need _not_ provide this option if you are using GNU libc 2 or -you have installed a recent copy of the GNU gettext package with the -included `libintl'. - -1.2 INSTALL Matters +1.1 INSTALL Matters =================== Some packages are "localizable" when properly installed; the programs @@ -56,36 +28,19 @@ By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: +provides the GNU `gettext' functions. Installers may use special +options at configuration time for changing the default behaviour. The +command: - ./configure --with-included-gettext ./configure --disable-nls -will, respectively, bypass any pre-existing `gettext' to use the -internationalizing routines provided within this package, or else, -_totally_ disable translation of messages. +will _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will -probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use - - ./configure --with-included-gettext - -to prevent auto-detection. - - The configuration process will not test for the `catgets' function -and therefore it will not be used. The reason is that even an -emulation of `gettext' on top of `catgets' could not provide all the -extensions of the GNU `gettext' library. +probably detect the previously built and installed `libintl' library +and will decide to use it. If not, you may have to to use the +`--with-libintl-prefix' option to tell `configure' where to look for it. Internationalized packages usually have many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless @@ -96,13 +51,16 @@ `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -1.3 Using This Package +1.2 Using This Package ====================== As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's +`LL_CC' combination. If you happen to have the `LC_ALL' or some other +`LC_xxx' environment variables set, you should unset them before +setting `LANG', otherwise the setting of `LANG' will not have the +desired effect. Here `LL' is an ISO 639 two-letter language code, and +`CC' is an ISO 3166 two-letter country code. For example, let's suppose that you speak German and live in Germany. At the shell prompt, merely execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). @@ -145,7 +103,7 @@ to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. -1.4 Translating Teams +1.3 Translating Teams ===================== For the Free Translation Project to be a success, we need interested @@ -153,8 +111,7 @@ able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. +`http://translationproject.org/', in the "Teams" area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. @@ -168,911 +125,1125 @@ _actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. +get started, please write to `coordinator@translationproject.org' to +reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing -the terminology in use. Proven linguistic skill are praised more than -programming skill, here. +the terminology in use. Proven linguistic skills are praised more than +programming skills, here. -1.5 Available Packages +1.4 Available Packages ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of July -2006. The matrix shows, in regard of each package, for which languages +matrix shows the current state of internationalization, as of June +2010. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo - +----------------------------------------------------+ - GNUnet | [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] | - bash | [] [] [] | - batchelor | [] | - bfd | | - bibshelf | [] | - binutils | [] | - bison | [] [] | - bison-runtime | [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] | - findutils | [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] [] [] | - gip | [] | - gliv | [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | () () [] | - gnucash-glossary | [] () | - gnuedu | | - gnulib | [] [] [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | [] [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-filemanager | | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-package | | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | () () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] | - gretl | | - gsasl | | - gss | | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | [] () | - gtkam | [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] [] | - iso_3166 | [] [] | - iso_3166_1 | [] [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] | - iso_4217 | [] | - iso_639 | [] [] | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - keytouch | | - keytouch-editor | | - keytouch-keyboa... | | - latrine | () | - ld | [] | - leafpad | [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | | - libiconv | [] [] | - libidn | [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] | - make | [] [] | - man-db | [] () [] [] | - minicom | [] [] [] | - mysecretdiary | [] [] | - nano | [] [] () [] | - nano_1_0 | [] () [] [] | - opcodes | [] | - parted | | - pilot-qof | [] | - psmisc | [] | - pwdutils | | - python | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - silky | | - skencil | [] () | - sketch | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] | - xchat | [] [] [] [] [] | - xkeyboard-config | | - xpad | [] [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB eo - 11 0 1 2 8 21 1 42 43 2 62 99 18 1 16 16 - - es et eu fa fi fr ga gl gu he hi hr hu id is it + Ready PO files af am an ar as ast az be be@latin bg bn_IN bs ca +--------------------------------------------------+ - GNUnet | | - a2ps | [] [] [] () | + a2ps | [] [] | aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnucash-glossary | [] [] | - gnuedu | [] | - gnulib | [] [] [] [] [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] [] [] | - gpe-filemanager | [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] | - gpsdrive | () () [] () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] [] | - gsasl | [] | - gss | [] | - gst-plugins | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] [] | - impost | [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] | - iso_3166_1 | [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] [] | - ld | [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] [] [] | - libgpg-error | | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] | - libiconv | [] | - libidn | [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] [] | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | () | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] () [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | | - silky | [] | - skencil | [] [] | - sketch | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] [] | - texinfo | [] [] | - textutils | [] [] [] [] [] | - tin | [] () | - tp-robot | [] [] [] [] | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 89 21 16 2 41 119 61 14 1 8 1 6 61 30 0 53 - - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - +--------------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - batchelor | [] [] | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | bfd | | - bibshelf | [] | + bibshelf | [] | binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | cflow | | - clisp | [] | - console-tools | | - coreutils | [] | + clisp | | + coreutils | [] [] | cpio | | - cpplib | [] | - cryptonit | [] | - darkstat | [] [] | - dialog | [] [] | - diffutils | [] [] [] | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | doodle | | - e2fsprogs | [] | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | [] | - flex | [] [] | - fslint | [] [] | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | gas | | - gawk | [] [] | - gbiff | [] | - gcal | | + gawk | [] [] | + gcal | [] | gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] | + gettext-tools | [] [] | + gip | [] | + gjay | | + gliv | [] | + glunarclock | [] [] | gnubiff | | - gnucash | () () | - gnucash-glossary | [] | + gnucash | [] | gnuedu | | - gnulib | [] [] [] [] | + gnulib | | + gnunet | | gnunet-gtk | | gnutls | | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | [] | - gpe-edit | [] [] | - gpe-filemanager | [] | - gpe-go | [] [] | - gpe-login | [] [] | - gpe-ownerinfo | [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] | - gpe-today | [] | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + gpe-calendar | | + gpe-clock | [] | + gpe-conf | | + gpe-contacts | | + gpe-edit | | + gpe-filemanager | | + gpe-go | | + gpe-login | | + gpe-ownerinfo | [] | + gpe-package | | + gpe-sketchbook | | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] | + gpe-today | [] | gpe-todo | | - gphoto2 | [] [] | - gprof | | - gpsdrive | () () () | - gramadoir | () | - grep | [] [] [] | - gretl | | - gsasl | [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | [] [] | + gsasl | | gss | | - gst-plugins | [] | - gst-plugins-base | | - gst-plugins-good | [] | - gstreamer | [] | - gtick | [] | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | gutenprint | | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_1 | [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] | - jpilot | () () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | + hello | [] | + help2man | | + hylafax | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] | + iso_639_3 | | + jwhois | | + kbd | | + keytouch | [] | keytouch-editor | | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] [] [] | - libexif | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | libextractor | | - libgpewidget | [] | + libgnutls | | + libgpewidget | | libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | | - libidn | [] [] | - lifelines | [] | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | lilypond | | - lingoteach | [] | - lynx | [] [] | - m4 | [] [] | + linkdr | [] | + lordsawar | | + lprng | | + lynx | [] | + m4 | | + mailfromd | | mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - psmisc | [] [] [] | + make | | + man-db | | + man-db-manpages | | + minicom | | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | pwdutils | | - python | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | shishi | | - silky | [] | skencil | | - sketch | | solfege | | + solfege-manual | | soundtracker | | - sp | () | - stardict | [] [] | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | + sp | | + sysstat | | + tar | [] | + texinfo | | tin | | - tp-robot | [] | - tuxpaint | [] | unicode-han-tra... | | unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | + util-linux-ng | [] | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] | +--------------------------------------------------+ - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - 40 24 2 1 1 3 1 2 3 21 0 15 1 101 5 3 + af am an ar as ast az be be@latin bg bn_IN bs ca + 6 0 1 2 3 19 1 10 3 28 3 1 38 + + crh cs da de el en en_GB en_ZA eo es et eu fa + +-------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] | + bfd | [] | + bibshelf | [] [] [] | + binutils | [] | + bison | [] [] | + bison-runtime | [] [] [] [] | + bluez-pin | [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] [] [] | + cflow | [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | | + cppi | | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] | + flex | [] [] | + freedink | [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] | + gjay | [] | + gliv | [] [] [] | + glunarclock | [] [] | + gnubiff | () | + gnucash | [] () () () () | + gnuedu | [] [] | + gnulib | [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] () [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] | + grub | [] [] | + gsasl | [] | + gss | | + gst-plugins-bad | [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] () [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] [] [] | + help2man | [] | + hylafax | [] [] | + idutils | [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] [] [] [] () [] [] [] () | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] | + iso_639 | [] [] [] [] () [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | [] [] [] [] [] | + keytouch | [] [] | + keytouch-editor | [] [] | + keytouch-keyboa... | [] | + klavaro | [] [] [] [] | + latrine | [] () | + ld | [] [] | + leafpad | [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] | + linkdr | [] [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] [] | + man-db | | + man-db-manpages | | + minicom | [] [] [] [] | + mkisofs | | + myserver | | + nano | [] [] [] | + opcodes | [] [] | + parted | [] [] | + pies | | + popt | [] [] [] [] [] | + psmisc | [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] | + rosegarden | () () () | + rpm | [] [] [] | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | | + skencil | [] () [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] | + wyslij-po | | + xchat | [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | + +-------------------------------------------------+ + crh cs da de el en en_GB en_ZA eo es et eu fa + 5 64 105 117 18 1 8 0 28 89 18 19 0 + + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + +----------------------------------------------------+ + a2ps | [] [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] [] | + bibshelf | [] [] [] [] [] | + binutils | [] [] [] | + bison | [] [] [] [] | + bison-runtime | [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] | + buzztard | [] | + cflow | [] [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] [] | + cppi | [] [] | + cpplib | [] [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] [] | + gjay | [] | + gliv | [] () | + glunarclock | [] [] [] [] | + gnubiff | () [] () | + gnucash | () () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] | + gpe-beam | [] [] [] [] | + gpe-bluetooth | [] [] [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] [] [] | + gpe-sketchbook | [] [] [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] | + gpe-todo | [] [] [] | + gphoto2 | [] [] [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] [] [] | + gsasl | [] [] [] [] [] | + gss | [] [] [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] [] | + hello | [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] | + iso_3166 | [] () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] [] | + iso_4217 | [] () [] [] [] [] | + iso_639 | [] () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] [] | + keytouch-editor | [] [] [] [] [] | + keytouch-keyboa... | [] [] [] [] [] | + klavaro | [] [] | + latrine | [] [] [] | + ld | [] [] [] [] | + leafpad | [] [] [] [] [] [] [] () | + libc | [] [] [] [] [] | + libexif | [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] [] | + linkdr | [] [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] [] | + mkisofs | [] [] [] [] | + myserver | | + nano | [] [] [] [] [] [] | + opcodes | [] [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] [] | + psmisc | [] [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () () () () | + rpm | [] [] | + rush | | + sarg | [] | + screem | [] [] | + scrollkeeper | [] [] [] [] | + sed | [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] [] | + tar | [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | [] | + wget | [] [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +----------------------------------------------------+ + fi fr ga gl gu he hi hr hu hy id is it ja ka kn + 105 121 53 20 4 8 3 5 53 2 120 5 84 67 0 4 - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +------------------------------------------------------+ - GNUnet | | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - darkstat | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] [] [] [] | - gas | | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gimp-print | [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () | - gnucash | () [] | - gnucash-glossary | [] [] [] | - gnuedu | | - gnulib | [] [] [] [] [] | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] [] [] [] [] [] [] [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] [] | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] | - gretl | [] | - gsasl | [] [] | - gss | [] [] [] | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] | - gst-plugins-good | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] [] [] | - gtkam | [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] | - indent | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] | - iso_3166_1 | [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] [] [] [] | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] | - libgpg-error | [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] [] | - make | [] [] [] [] | - man-db | [] [] | - minicom | [] [] [] [] [] | - mysecretdiary | [] [] [] [] | - nano | [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | [] | - psmisc | [] [] | - pwdutils | [] [] | - python | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - silky | [] | - skencil | [] [] [] | - sketch | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - stardict | [] [] [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] | - tin | () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] | - xpad | [] [] [] | - +------------------------------------------------------+ - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 2 3 58 31 53 5 76 72 5 42 48 12 51 130 2 + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + +-----------------------------------------------+ + a2ps | [] | + aegis | | + ant-phone | | + anubis | [] [] | + aspell | [] | + bash | | + bfd | | + bibshelf | [] [] | + binutils | | + bison | [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] | + cpio | | + cppi | | + cpplib | | + cryptsetup | | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] | + dink | | + doodle | | + e2fsprogs | | + enscript | | + exif | [] | + fetchmail | | + findutils | | + flex | | + freedink | [] | + gas | | + gawk | | + gcal | | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] | + gettext-tools | [] | + gip | [] [] | + gjay | | + gliv | | + glunarclock | [] | + gnubiff | | + gnucash | () () () () | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gold | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | | + gsasl | | + gss | | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | | + gtick | | + gtkam | [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | | + hello | [] [] [] | + help2man | | + hylafax | | + idutils | | + indent | | + iso_15924 | [] [] | + iso_3166 | [] [] () [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] | + iso_639 | [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | [] | + ld | | + leafpad | [] [] [] | + libc | [] | + libexif | | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | | + libidn | | + lifelines | | + liferea | | + lilypond | | + linkdr | | + lordsawar | | + lprng | | + lynx | | + m4 | | + mailfromd | | + mailutils | | + make | [] | + man-db | | + man-db-manpages | | + minicom | [] | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | [] [] [] | + psmisc | | + pspp | | + pwdutils | | + radius | | + recode | | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] | + sed | | + sharutils | | + shishi | | + skencil | | + solfege | [] | + solfege-manual | | + soundtracker | | + sp | | + sysstat | [] | + tar | [] | + texinfo | [] | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +-----------------------------------------------+ + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + 20 5 10 1 13 48 4 2 2 4 24 10 20 3 1 + + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + +---------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] | + bfd | [] | + bibshelf | [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] () | + buzztard | [] [] | + cflow | [] | + clisp | [] [] | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] | + cryptsetup | [] | + dfarc | [] | + dialog | [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] [] | + dink | () | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + exif | [] [] [] () [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] [] | + freedink | [] [] | + gas | | + gawk | [] [] [] [] | + gcal | | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] | + gnubiff | [] () | + gnucash | [] () () () | + gnuedu | [] | + gnulib | [] [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] [] | + gold | | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] [] | + gphoto2 | [] [] [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] | + hello | [] [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] [] [] [] | + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | | + leafpad | [] [] [] [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] | + lifelines | [] [] | + liferea | [] [] [] [] [] () () [] | + lilypond | [] | + linkdr | [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] [] [] | + man-db-manpages | [] [] [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + pies | [] | + popt | [] [] [] [] | + psmisc | [] [] [] | + pspp | [] [] | + pwdutils | [] | + radius | [] [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () | + rpm | [] [] [] | + rush | [] [] | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] [] [] [] | + solfege-manual | [] [] [] | + soundtracker | [] | + sp | | + sysstat | [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | [] | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +---------------------------------------------------+ + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + 135 10 4 7 105 1 29 62 47 91 3 54 46 9 37 - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW +---------------------------------------------------+ - GNUnet | [] | 2 - a2ps | [] [] [] | 19 - aegis | | 0 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 14 - bash | [] | 11 - batchelor | [] [] | 9 - bfd | | 1 - bibshelf | [] | 7 - binutils | [] [] [] | 9 - bison | [] [] [] | 19 - bison-runtime | [] [] [] | 16 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 4 - clisp | | 6 - console-tools | [] [] | 5 - coreutils | [] [] | 17 - cpio | [] [] [] | 9 - cpplib | [] [] [] [] | 11 - cryptonit | | 5 - darkstat | [] () () | 15 - dialog | [] [] [] [] [] | 30 - diffutils | [] [] [] [] | 28 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - error | [] [] [] [] | 18 - fetchmail | [] [] | 12 - fileutils | [] [] [] | 18 - findutils | [] [] [] | 17 - flex | [] [] | 15 - fslint | [] | 9 - gas | [] | 3 - gawk | [] [] | 15 - gbiff | [] | 5 - gcal | [] | 5 - gcc | [] [] [] | 6 - gettext-examples | [] [] [] [] [] [] | 26 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 19 - gimp-print | [] [] | 12 - gip | [] [] | 12 - gliv | [] [] | 8 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 15 - gnubiff | [] | 1 - gnucash | () | 2 - gnucash-glossary | [] [] | 9 - gnuedu | [] | 2 - gnulib | [] [] [] [] [] | 28 - gnunet-gtk | | 1 - gnutls | | 2 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] [] [] [] | 19 - gpe-clock | [] [] [] [] | 20 - gpe-conf | [] [] | 14 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] | 19 - gpe-filemanager | [] | 5 - gpe-go | [] [] | 14 - gpe-login | [] [] [] [] [] | 20 - gpe-ownerinfo | [] [] [] [] | 20 - gpe-package | [] | 5 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] | 19 - gpe-taskmanager | [] [] [] | 19 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 20 - gpe-todo | [] | 6 - gphoto2 | [] [] [] [] | 20 - gprof | [] [] | 11 - gpsdrive | | 4 - gramadoir | [] | 7 - grep | [] [] [] [] | 33 - gretl | | 4 - gsasl | [] [] | 6 - gss | [] | 5 - gst-plugins | [] [] [] | 15 - gst-plugins-base | [] [] [] | 9 - gst-plugins-good | [] [] [] | 18 - gstreamer | [] [] [] | 17 - gtick | [] | 11 - gtkam | [] | 13 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 26 - gutenprint | | 3 - hello | [] [] [] [] [] | 39 - id-utils | [] [] | 14 - impost | [] | 4 - indent | [] [] [] [] | 25 - iso_3166 | [] [] [] | 15 - iso_3166_1 | [] [] | 20 - iso_3166_2 | | 2 - iso_3166_3 | [] [] | 9 - iso_4217 | [] [] | 14 - iso_639 | [] | 14 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] | 12 - keytouch | [] | 4 - keytouch-editor | | 2 - keytouch-keyboa... | | 2 - latrine | [] [] | 8 - ld | [] [] [] [] | 8 - leafpad | [] [] [] [] | 23 - libc | [] [] [] | 23 - libexif | [] | 4 - libextractor | [] | 5 - libgpewidget | [] [] [] | 19 - libgpg-error | [] | 4 - libgphoto2 | [] | 8 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] | 4 - libidn | [] [] | 10 - lifelines | | 4 - lilypond | | 2 - lingoteach | [] | 6 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailutils | [] | 8 - make | [] [] [] | 20 - man-db | [] | 6 - minicom | [] | 14 - mysecretdiary | [] [] | 12 - nano | [] [] | 15 - nano_1_0 | [] [] [] | 18 - opcodes | [] [] | 10 - parted | [] [] [] | 10 - pilot-qof | [] | 3 - psmisc | [] | 10 - pwdutils | [] | 3 - python | | 0 - qof | [] | 2 - radius | [] | 6 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 14 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] | 22 - sh-utils | [] | 15 - shared-mime-info | [] [] [] [] | 23 - sharutils | [] [] [] | 23 - shishi | | 1 - silky | [] | 4 - skencil | [] | 7 - sketch | | 6 - solfege | | 2 - soundtracker | [] [] | 9 - sp | [] | 3 - stardict | [] [] [] [] | 11 - system-tools-ba... | [] [] [] [] [] [] [] | 37 - tar | [] [] [] [] | 19 - texinfo | [] [] [] | 15 - textutils | [] [] [] | 17 - tin | | 1 - tp-robot | [] [] [] | 10 - tuxpaint | [] [] [] | 16 + a2ps | [] [] [] [] [] | 27 + aegis | [] | 9 + ant-phone | [] [] [] [] | 9 + anubis | [] [] [] [] | 15 + aspell | [] [] [] | 20 + bash | [] [] [] | 12 + bfd | [] | 6 + bibshelf | [] [] [] | 16 + binutils | [] [] | 8 + bison | [] [] | 12 + bison-runtime | [] [] [] [] [] [] | 29 + bluez-pin | [] [] [] [] [] [] [] [] | 37 + bombono-dvd | [] | 4 + buzztard | [] | 7 + cflow | [] [] [] | 9 + clisp | | 10 + coreutils | [] [] [] [] | 22 + cpio | [] [] [] [] [] [] | 13 + cppi | [] [] | 5 + cpplib | [] [] [] [] [] [] | 14 + cryptsetup | [] [] | 7 + dfarc | [] | 9 + dialog | [] [] [] [] [] [] [] | 30 + dico | [] | 2 + diffutils | [] [] [] [] [] [] | 30 + dink | | 4 + doodle | [] [] | 7 + e2fsprogs | [] [] [] | 11 + enscript | [] [] [] [] | 17 + exif | [] [] [] | 16 + fetchmail | [] [] [] | 17 + findutils | [] [] [] [] [] | 20 + flex | [] [] [] [] | 15 + freedink | [] | 10 + gas | [] | 4 + gawk | [] [] [] [] | 18 + gcal | [] [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] [] | 34 + gettext-runtime | [] [] [] [] [] [] [] | 29 + gettext-tools | [] [] [] [] [] [] | 22 + gip | [] [] [] [] | 22 + gjay | [] | 3 + gliv | [] [] [] | 14 + glunarclock | [] [] [] [] [] | 19 + gnubiff | [] [] | 4 + gnucash | () [] () [] () | 10 + gnuedu | [] [] | 7 + gnulib | [] [] [] [] | 16 + gnunet | [] | 1 + gnunet-gtk | [] [] [] | 5 + gnutls | [] [] [] | 10 + gold | [] | 4 + gpe-aerial | [] [] [] | 18 + gpe-beam | [] [] [] | 19 + gpe-bluetooth | [] [] [] | 13 + gpe-calendar | [] [] [] [] | 12 + gpe-clock | [] [] [] [] [] | 28 + gpe-conf | [] [] [] [] | 20 + gpe-contacts | [] [] [] | 17 + gpe-edit | [] [] [] | 12 + gpe-filemanager | [] [] [] [] | 16 + gpe-go | [] [] [] [] [] | 25 + gpe-login | [] [] [] | 11 + gpe-ownerinfo | [] [] [] [] [] | 25 + gpe-package | [] [] [] | 13 + gpe-sketchbook | [] [] [] | 20 + gpe-su | [] [] [] [] [] | 30 + gpe-taskmanager | [] [] [] [] [] | 29 + gpe-timesheet | [] [] [] [] [] | 25 + gpe-today | [] [] [] [] [] [] | 30 + gpe-todo | [] [] [] [] | 17 + gphoto2 | [] [] [] [] [] | 24 + gprof | [] [] [] | 15 + gpsdrive | [] [] [] | 11 + gramadoir | [] [] [] | 11 + grep | [] [] [] | 10 + grub | [] [] [] | 14 + gsasl | [] [] [] [] | 14 + gss | [] [] [] | 11 + gst-plugins-bad | [] [] [] [] | 26 + gst-plugins-base | [] [] [] [] [] | 24 + gst-plugins-good | [] [] [] [] | 24 + gst-plugins-ugly | [] [] [] [] [] | 29 + gstreamer | [] [] [] [] | 22 + gtick | [] [] [] | 13 + gtkam | [] [] [] | 20 + gtkorphan | [] [] [] | 14 + gtkspell | [] [] [] [] [] [] [] [] [] | 45 + gutenprint | [] | 10 + hello | [] [] [] [] [] [] | 21 + help2man | [] [] | 7 + hylafax | [] | 5 + idutils | [] [] [] [] | 17 + indent | [] [] [] [] [] [] | 30 + iso_15924 | () [] () [] [] | 16 + iso_3166 | [] [] () [] [] () [] [] [] () | 53 + iso_3166_2 | () [] () [] | 9 + iso_4217 | [] () [] [] () [] [] | 26 + iso_639 | [] [] [] () [] () [] [] [] [] | 38 + iso_639_3 | [] () | 8 + jwhois | [] [] [] [] [] | 16 + kbd | [] [] [] [] [] | 15 + keytouch | [] [] [] | 16 + keytouch-editor | [] [] [] | 14 + keytouch-keyboa... | [] [] [] | 14 + klavaro | [] | 11 + latrine | [] [] [] | 10 + ld | [] [] [] [] | 11 + leafpad | [] [] [] [] [] [] | 33 + libc | [] [] [] [] [] | 21 + libexif | [] () | 7 + libextractor | [] | 1 + libgnutls | [] [] [] | 9 + libgpewidget | [] [] [] | 14 + libgpg-error | [] [] [] | 9 + libgphoto2 | [] [] | 8 + libgphoto2_port | [] [] [] [] | 14 + libgsasl | [] [] [] | 13 + libiconv | [] [] [] [] | 21 + libidn | () [] [] | 11 + lifelines | [] | 4 + liferea | [] [] [] | 21 + lilypond | [] | 7 + linkdr | [] [] [] [] [] | 17 + lordsawar | | 1 + lprng | [] | 3 + lynx | [] [] [] [] | 17 + m4 | [] [] [] [] | 19 + mailfromd | [] [] | 3 + mailutils | [] | 5 + make | [] [] [] [] | 21 + man-db | [] [] [] | 8 + man-db-manpages | | 4 + minicom | [] [] | 16 + mkisofs | [] [] | 9 + myserver | | 0 + nano | [] [] [] [] | 21 + opcodes | [] [] [] | 11 + parted | [] [] [] [] [] | 15 + pies | [] [] | 3 + popt | [] [] [] [] [] [] | 27 + psmisc | [] [] | 11 + pspp | | 4 + pwdutils | [] [] | 6 + radius | [] [] | 9 + recode | [] [] [] [] | 28 + rosegarden | () | 0 + rpm | [] [] [] | 11 + rush | [] [] | 4 + sarg | | 1 + screem | [] | 3 + scrollkeeper | [] [] [] [] [] | 27 + sed | [] [] [] [] [] | 30 + sharutils | [] [] [] [] [] | 22 + shishi | [] | 3 + skencil | [] [] | 7 + solfege | [] [] [] [] | 16 + solfege-manual | [] | 8 + soundtracker | [] [] [] | 9 + sp | [] | 3 + sysstat | [] [] | 15 + tar | [] [] [] [] [] [] | 23 + texinfo | [] [] [] [] [] | 17 + tin | | 4 unicode-han-tra... | | 0 unicode-transla... | | 2 - util-linux | [] [] [] | 20 - vorbis-tools | [] [] | 11 - wastesedge | | 1 - wdiff | [] [] | 22 - wget | [] [] [] | 19 - xchat | [] [] [] [] | 28 - xkeyboard-config | [] [] [] [] | 11 - xpad | [] [] [] | 14 + util-linux-ng | [] [] [] [] | 20 + vice | () () | 1 + vmm | [] | 4 + vorbis-tools | [] | 6 + wastesedge | | 2 + wdiff | [] [] | 7 + wget | [] [] [] [] [] | 26 + wyslij-po | [] [] | 8 + xchat | [] [] [] [] [] [] | 36 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | 63 + xkeyboard-config | [] [] [] | 22 +---------------------------------------------------+ - 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 172 domains 0 1 1 78 39 0 135 13 1 50 3 54 0 2054 + 85 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 178 domains 119 1 3 3 0 10 65 51 155 17 98 7 41 2618 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1085,12 +1256,12 @@ lag between the mere existence a PO file and its wide availability in a distribution. - If July 2006 seems to be old, you may fetch a more recent copy of + If June 2010 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. +`http://translationproject.org/extra/matrix.html'. -1.6 Using `gettext' in new packages +1.5 Using `gettext' in new packages =================================== If you are writing a freely available program and want to @@ -1106,6 +1277,6 @@ Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. +`coordinator@translationproject.org' to make the `.pot' files available +to the translation teams. diff -Nru libpwquality-1.2.3/AUTHORS libpwquality-1.3.0/AUTHORS --- libpwquality-1.2.3/AUTHORS 2011-07-26 14:14:30.000000000 +0000 +++ libpwquality-1.3.0/AUTHORS 2014-08-06 12:47:44.000000000 +0000 @@ -8,3 +8,7 @@ Authors of the pwquality library: Tomáš Mráz + +Python3 port of the python module: + +Bohuslav Kabrda diff -Nru libpwquality-1.2.3/ChangeLog libpwquality-1.3.0/ChangeLog --- libpwquality-1.2.3/ChangeLog 2011-09-16 12:21:24.000000000 +0000 +++ libpwquality-1.3.0/ChangeLog 2014-08-06 12:39:17.000000000 +0000 @@ -1,3 +1,15 @@ +2014-08-06 gettextize + + * m4/gettext.m4: Upgrade to gettext-0.18.2. + * m4/iconv.m4: Upgrade to gettext-0.18.2. + * m4/lib-ld.m4: Upgrade to gettext-0.18.2. + * m4/lib-link.m4: Upgrade to gettext-0.18.2. + * m4/lib-prefix.m4: Upgrade to gettext-0.18.2. + * m4/nls.m4: Upgrade to gettext-0.18.2. + * m4/po.m4: Upgrade to gettext-0.18.2. + * m4/progtest.m4: Upgrade to gettext-0.18.2. + * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.18.2. + 2011-09-16 gettextize * m4/gettext.m4: New file, from gettext-0.18.1. diff -Nru libpwquality-1.2.3/Makefile.am libpwquality-1.3.0/Makefile.am --- libpwquality-1.2.3/Makefile.am 2012-05-28 06:41:51.000000000 +0000 +++ libpwquality-1.3.0/Makefile.am 2014-08-06 14:46:43.000000000 +0000 @@ -21,3 +21,6 @@ tag: Makefile hg tag libpwquality-@PACKAGE_VERSION@ + +force-tag: Makefile + hg tag -f libpwquality-@PACKAGE_VERSION@ diff -Nru libpwquality-1.2.3/Makefile.in libpwquality-1.3.0/Makefile.in --- libpwquality-1.2.3/Makefile.in 2013-09-12 11:14:15.000000000 +0000 +++ libpwquality-1.3.0/Makefile.in 2015-07-23 11:45:55.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,23 +20,51 @@ # Copyright (c) 2011 Tomas Mraz # VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -58,20 +85,21 @@ host_triplet = @host@ @BUILD_PYTHON_BINDINGS_TRUE@am__append_1 = python subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/libpwquality.spec.in $(top_srcdir)/configure \ - ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS config.guess \ - config.rpath config.sub depcomp install-sh ltmain.sh missing +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/libpwquality.spec.in ABOUT-NLS \ + COPYING ar-lib compile config.guess config.rpath config.sub \ + depcomp install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -80,15 +108,28 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = libpwquality.spec CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -96,11 +137,33 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = po src doc python DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -111,6 +174,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -138,12 +202,14 @@ reldir="$$dir2" GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_TARGETS = dist-bzip2 distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -166,6 +232,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -214,6 +281,7 @@ PWQUALITY_LT_AGE = @PWQUALITY_LT_AGE@ PWQUALITY_LT_CURRENT = @PWQUALITY_LT_CURRENT@ PWQUALITY_LT_REVISION = @PWQUALITY_LT_REVISION@ +PYTHONBINARY = @PYTHONBINARY@ PYTHONREV = @PYTHONREV@ PYTHONSITEDIR = @PYTHONSITEDIR@ RANLIB = @RANLIB@ @@ -227,6 +295,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -325,8 +394,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -351,22 +420,25 @@ -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -381,57 +453,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -447,12 +474,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -464,15 +486,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -481,9 +499,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) @case `sed 15q $(srcdir)/NEWS` in \ @@ -557,39 +597,41 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -600,8 +642,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -613,18 +653,19 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -647,7 +688,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -783,29 +824,32 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean distclean-generic distclean-hdr \ - distclean-libtool distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ + dist-xz dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am tag: Makefile hg tag libpwquality-@PACKAGE_VERSION@ +force-tag: Makefile + hg tag -f libpwquality-@PACKAGE_VERSION@ + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru libpwquality-1.2.3/NEWS libpwquality-1.3.0/NEWS --- libpwquality-1.2.3/NEWS 2013-09-12 11:13:32.000000000 +0000 +++ libpwquality-1.3.0/NEWS 2015-07-23 11:44:38.000000000 +0000 @@ -1,5 +1,14 @@ libpwquality NEWS -- history of user-visible changes. +Release 1.3.0 +* Change the defaults for credits, difok, and minlen +* Make the cracklib check optional but on by default +* Add implicit support for parsing .d/*.conf files +* Add libpwquality API manual page + +Release 1.2.4 +* Add Python3 module subpackage + Release 1.2.3 * Fix problem with parsing the pam_pwquality options patch by Vladimir Sorokin. diff -Nru libpwquality-1.2.3/aclocal.m4 libpwquality-1.3.0/aclocal.m4 --- libpwquality-1.2.3/aclocal.m4 2013-09-12 11:14:15.000000000 +0000 +++ libpwquality-1.3.0/aclocal.m4 2015-07-23 11:45:55.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,33 +11,31 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, [m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.6], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +51,82 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.6])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_AR([ACT-IF-FAIL]) +# ------------------------- +# Try to determine the archiver interface, and trigger the ar-lib wrapper +# if it is needed. If the detection of archiver interface fails, run +# ACT-IF-FAIL (default is to abort configure with a proper error message). +AC_DEFUN([AM_PROG_AR], +[AC_BEFORE([$0], [LT_INIT])dnl +AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([ar-lib])dnl +AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) +: ${AR=ar} + +AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], + [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + AC_TRY_EVAL([am_ar_try]) + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + ]) + AC_LANG_POP([C])]) + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + m4_default([$1], + [AC_MSG_ERROR([could not determine $AR interface])]) + ;; +esac +AC_SUBST([AR])dnl +]) + # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -90,7 +145,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -116,22 +171,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -150,16 +202,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -169,7 +219,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -182,12 +232,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -195,8 +246,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -236,16 +287,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -254,8 +305,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -263,7 +314,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -311,7 +362,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -321,9 +372,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -338,20 +393,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -364,7 +417,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -376,21 +429,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -408,7 +459,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -418,18 +469,21 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -442,7 +496,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -471,31 +525,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -506,34 +569,78 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -555,15 +662,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -577,16 +681,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -602,14 +704,12 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -627,7 +727,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -654,15 +754,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -670,11 +767,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -687,54 +783,22 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -744,7 +808,7 @@ # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -758,24 +822,82 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -786,32 +908,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -821,46 +951,118 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -874,18 +1076,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -895,82 +1095,121 @@ # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([m4/gettext.m4]) m4_include([m4/iconv.m4]) +m4_include([m4/intlmacosx.m4]) m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) diff -Nru libpwquality-1.2.3/ar-lib libpwquality-1.3.0/ar-lib --- libpwquality-1.2.3/ar-lib 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/ar-lib 2014-09-10 11:57:56.000000000 +0000 @@ -0,0 +1,270 @@ +#! /bin/sh +# Wrapper for Microsoft lib.exe + +me=ar-lib +scriptversion=2012-03-01.08; # UTC + +# Copyright (C) 2010-2013 Free Software Foundation, Inc. +# Written by Peter Rosin . +# +# 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 2, 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 . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + + +# func_error message +func_error () +{ + echo "$me: $1" 1>&2 + exit 1 +} + +file_conv= + +# func_file_conv build_file +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv in + mingw) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_at_file at_file operation archive +# Iterate over all members in AT_FILE performing OPERATION on ARCHIVE +# for each of them. +# When interpreting the content of the @FILE, do NOT use func_file_conv, +# since the user would need to supply preconverted file names to +# binutils ar, at least for MinGW. +func_at_file () +{ + operation=$2 + archive=$3 + at_file_contents=`cat "$1"` + eval set x "$at_file_contents" + shift + + for member + do + $AR -NOLOGO $operation:"$member" "$archive" || exit $? + done +} + +case $1 in + '') + func_error "no command. Try '$0 --help' for more information." + ;; + -h | --h*) + cat <. +# +# 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 2, 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 . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru libpwquality-1.2.3/config.guess libpwquality-1.3.0/config.guess --- libpwquality-1.2.3/config.guess 2012-09-18 02:52:38.000000000 +0000 +++ libpwquality-1.3.0/config.guess 2014-09-10 11:57:56.000000000 +0000 @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2014-03-23' # This file 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 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,10 +820,13 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -852,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,31 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1297,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,157 +1371,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 < header file. */ diff -Nru libpwquality-1.2.3/config.rpath libpwquality-1.3.0/config.rpath --- libpwquality-1.2.3/config.rpath 2012-11-07 13:07:15.000000000 +0000 +++ libpwquality-1.3.0/config.rpath 2014-08-06 12:39:16.000000000 +0000 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2006 Free Software Foundation, Inc. +# Copyright 1996-2013 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit , 1996 # @@ -25,7 +25,7 @@ # known workaround is to choose shorter directory names for the build # directory and/or the installation directory. -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a shrext=.so @@ -47,7 +47,7 @@ done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -57,14 +57,7 @@ aix*) wl='-Wl,' ;; - darwin*) - case $cc_basename in - xlc*) - wl='-Wl,' - ;; - esac - ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -72,24 +65,37 @@ irix5* | irix6* | nonstopux*) wl='-Wl,' ;; - newsos6) - ;; - linux*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) wl='-Wl,' ;; - pgcc | pgf77 | pgf90) + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) + wl='-Wl,' + ;; + nagfor*) + wl='-Wl,-Wl,,' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) wl='-Wl,' ;; ccc*) wl='-Wl,' ;; + xl* | bgxl* | bgf* | mpixl*) + wl='-Wl,' + ;; como) wl='-lopt=' ;; *) case `$CC -V 2>&1 | sed 5q` in + *Sun\ F* | *Sun*Fortran*) + wl= + ;; *Sun\ C*) wl='-Wl,' ;; @@ -97,22 +103,36 @@ ;; esac ;; + newsos6) + ;; + *nto* | *qnx*) + ;; osf3* | osf4* | osf5*) wl='-Wl,' ;; - sco3.2v5*) + rdos*) ;; solaris*) - wl='-Wl,' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + wl='-Qoption ld ' + ;; + *) + wl='-Wl,' + ;; + esac ;; sunos4*) wl='-Qoption ld ' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) wl='-Wl,' ;; sysv4*MP*) ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + wl='-Wl,' + ;; unicos*) wl='-Wl,' ;; @@ -121,7 +141,7 @@ esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -129,7 +149,7 @@ hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -155,22 +175,21 @@ # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we cannot use - # them. - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; beos*) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -179,7 +198,7 @@ ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -189,11 +208,13 @@ ld_shlibs=no fi ;; - interix3*) + haiku*) + ;; + interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - linux*) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -251,7 +272,7 @@ hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -261,7 +282,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -280,7 +301,7 @@ strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -316,14 +337,18 @@ fi ;; amigaos*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no + case "$host_cpu" in + powerpc) + ;; + m68k) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -333,24 +358,15 @@ ;; darwin* | rhapsody*) hardcode_direct=no - if test "$GCC" = yes ; then + if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then : else - case $cc_basename in - xlc*) - ;; - *) - ld_shlibs=no - ;; - esac + ld_shlibs=no fi ;; dgux*) hardcode_libdir_flag_spec='-L$libdir' ;; - freebsd1*) - ld_shlibs=no - ;; freebsd2.2*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -359,7 +375,7 @@ hardcode_direct=yes hardcode_minus_L=yes ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; @@ -411,19 +427,25 @@ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' hardcode_libdir_separator=: ;; + *nto* | *qnx*) + ;; openbsd*) - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; os2*) @@ -471,7 +493,7 @@ ld_shlibs=yes fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ;; sysv5* | sco3.2v5* | sco5v6*) hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' @@ -487,34 +509,58 @@ fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. +# Unlike libtool.m4, here we don't care about _all_ names of the library, but +# only about the one the linker finds when passed -lNAME. This is the last +# element of library_names_spec in libtool.m4, or possibly two of them if the +# linker has special search rules. +library_names_spec= # the last element of library_names_spec in libtool.m4 libname_spec='lib$name' case "$host_os" in aix3*) + library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) + library_names_spec='$libname$shrext' ;; amigaos*) + case "$host_cpu" in + powerpc*) + library_names_spec='$libname$shrext' ;; + m68k) + library_names_spec='$libname.a' ;; + esac ;; beos*) + library_names_spec='$libname$shrext' ;; bsdi[45]*) + library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' ;; darwin* | rhapsody*) shrext=.dylib + library_names_spec='$libname$shrext' ;; dgux*) - ;; - freebsd1*) - ;; - kfreebsd*-gnu) + library_names_spec='$libname$shrext' ;; freebsd* | dragonfly*) + case "$host_os" in + freebsd[123]*) + library_names_spec='$libname$shrext$versuffix' ;; + *) + library_names_spec='$libname$shrext' ;; + esac ;; gnu*) + library_names_spec='$libname$shrext' + ;; + haiku*) + library_names_spec='$libname$shrext' ;; hpux9* | hpux10* | hpux11*) case $host_cpu in @@ -528,10 +574,13 @@ shrext=.sl ;; esac + library_names_spec='$libname$shrext' ;; - interix3*) + interix[3-9]*) + library_names_spec='$libname$shrext' ;; irix5* | irix6* | nonstopux*) + library_names_spec='$libname$shrext' case "$host_os" in irix5* | nonstopux*) libsuff= shlibsuff= @@ -548,41 +597,62 @@ ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux*) + linux* | k*bsd*-gnu | kopensolaris*-gnu) + library_names_spec='$libname$shrext' ;; knetbsd*-gnu) + library_names_spec='$libname$shrext' ;; netbsd*) + library_names_spec='$libname$shrext' ;; newsos6) + library_names_spec='$libname$shrext' ;; - nto-qnx*) + *nto* | *qnx*) + library_names_spec='$libname$shrext' ;; openbsd*) + library_names_spec='$libname$shrext$versuffix' ;; os2*) libname_spec='$name' shrext=.dll + library_names_spec='$libname.a' ;; osf3* | osf4* | osf5*) + library_names_spec='$libname$shrext' + ;; + rdos*) ;; solaris*) + library_names_spec='$libname$shrext' ;; sunos4*) + library_names_spec='$libname$shrext$versuffix' ;; sysv4 | sysv4.3*) + library_names_spec='$libname$shrext' ;; sysv4*MP*) + library_names_spec='$libname$shrext' ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + library_names_spec='$libname$shrext' + ;; + tpf*) + library_names_spec='$libname$shrext' ;; uts4*) + library_names_spec='$libname$shrext' ;; esac sed_quote_subst='s/\(["`$\\]\)/\\\1/g' escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` shlibext=`echo "$shrext" | sed -e 's,^\.,,'` +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <. @@ -26,11 +20,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +218,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,10 +252,12 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -264,10 +265,11 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -281,20 +283,22 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -322,7 +326,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -364,13 +368,13 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -379,11 +383,13 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -397,18 +403,22 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -782,11 +792,15 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -814,6 +828,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -822,7 +840,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -998,7 +1016,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1013,7 +1031,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1340,29 +1362,29 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1486,9 +1508,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1537,6 +1556,12 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff -Nru libpwquality-1.2.3/configure libpwquality-1.3.0/configure --- libpwquality-1.2.3/configure 2013-09-12 11:14:16.000000000 +0000 +++ libpwquality-1.3.0/configure 2015-07-23 11:45:56.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpwquality 1.2.3. +# Generated by GNU Autoconf 2.69 for libpwquality 1.3.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libpwquality' PACKAGE_TARNAME='libpwquality' -PACKAGE_VERSION='1.2.3' -PACKAGE_STRING='libpwquality 1.2.3' +PACKAGE_VERSION='1.3.0' +PACKAGE_STRING='libpwquality 1.3.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -628,6 +628,7 @@ # include #endif" +gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -635,6 +636,7 @@ LIBCRACK PYTHONSITEDIR PYTHONREV +PYTHONBINARY BUILD_PYTHON_BINDINGS_FALSE BUILD_PYTHON_BINDINGS_TRUE SCONFIGDIR @@ -651,6 +653,7 @@ LTLIBICONV LIBICONV INTL_MACOSX_LIBS +XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 XGETTEXT @@ -658,6 +661,7 @@ MSGFMT_015 GMSGFMT MSGFMT +GETTEXT_MACRO_VERSION USE_NLS OTOOL64 OTOOL @@ -666,8 +670,6 @@ DSYMUTIL MANIFEST_TOOL RANLIB -ac_ct_AR -AR DLLTOOL OBJDUMP NM @@ -678,6 +680,8 @@ SED LIBTOOL LN_S +ac_ct_AR +AR EGREP GREP CPP @@ -709,6 +713,10 @@ build_vendor build_cpu build +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -773,6 +781,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_shared enable_static @@ -790,6 +799,7 @@ with_securedir with_sconfigdir enable_python_bindings +with_python_binary with_python_rev with_pythonsitedir with_randomdev @@ -1343,7 +1353,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpwquality 1.2.3 to adapt to many kinds of systems. +\`configure' configures libpwquality 1.3.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1413,7 +1423,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpwquality 1.2.3:";; + short | recursive ) echo "Configuration of libpwquality 1.3.0:";; esac cat <<\_ACEOF @@ -1421,8 +1431,12 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1440,12 +1454,12 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-gnu-ld assume the C compiler uses GNU ld default=no + --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib @@ -1453,7 +1467,8 @@ --with-securedir=DIR path to location of PAMs [default=$libdir/security] --with-sconfigdir=DIR path to PAM conf files [default=$sysconfdir/security] - --with-pythonrev=2.7 version of python for which modules should be built + --with-python-binary=python3 python binary name with which modules should be built + --with-python-rev=2.7 version of python for which modules should be built --with-pythonsitedir=DIR directory of the python site packages [default=$libdir/python$PYTHONREV/site-packages] --with-randomdev=(|yes) use specified random device instead of /dev/urandom @@ -1534,7 +1549,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpwquality configure 1.2.3 +libpwquality configure 1.3.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1899,7 +1914,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpwquality $as_me 1.2.3, which was +It was created by libpwquality $as_me 1.3.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2179,6 +2194,7 @@ >$cache_file fi +gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2249,7 +2265,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.11' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2375,9 +2391,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2388,32 +2401,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2425,6 +2446,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2447,12 +2478,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2464,10 +2495,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2606,12 +2637,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2694,6 +2719,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2716,7 +2780,7 @@ # Define the identity of the package. PACKAGE='libpwquality' - VERSION='1.2.3' + VERSION='1.3.0' cat >>confdefs.h <<_ACEOF @@ -2744,12 +2808,22 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -2757,6 +2831,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -2861,7 +2977,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3694,6 +3810,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -3705,8 +3880,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -3741,16 +3916,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3759,8 +3934,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -3768,7 +3943,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4281,6 +4456,177 @@ $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h +if test -n "$ac_tool_prefix"; then + for ac_prog in ar lib "link -lib" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar lib "link -lib" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + +: ${AR=ar} + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5 +$as_echo_n "checking the archiver ($AR) interface... " >&6; } +if ${am_cv_ar_interface+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int some_variable = 0; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=ar + else + am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 + (eval $am_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + am_cv_ar_interface=lib + else + am_cv_ar_interface=unknown + fi + fi + rm -f conftest.lib libconftest.a + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 +$as_echo "$am_cv_ar_interface" >&6; } + +case $am_cv_ar_interface in +ar) + ;; +lib) + # Microsoft lib, so override with the ar-lib wrapper script. + # FIXME: It is wrong to rewrite AR. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__AR in this case, + # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something + # similar. + AR="$am_aux_dir/ar-lib $AR" + ;; +unknown) + as_fn_error $? "could not determine $AR interface" "$LINENO" 5 + ;; +esac + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4820,6 +5166,65 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4831,8 +5236,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4867,16 +5272,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4885,8 +5290,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -4894,7 +5299,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4968,8 +5373,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -5602,6 +6007,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5641,7 +6051,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -6070,7 +6480,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6710,13 +7120,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6863,6 +7273,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -7151,7 +7562,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7169,7 +7580,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7188,7 +7602,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -7251,7 +7668,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -7262,7 +7679,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7902,7 +8332,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7913,6 +8349,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7945,6 +8382,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -7966,7 +8404,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -8104,7 +8544,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -8182,6 +8637,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8641,7 +9100,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8732,18 +9193,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -9105,7 +9581,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -9355,8 +9830,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9735,6 +10209,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -9780,6 +10255,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -9808,10 +10284,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9824,7 +10296,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9863,7 +10335,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10487,11 +10958,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10581,7 +11047,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10590,7 +11056,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10655,7 +11121,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10794,7 +11260,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10802,10 +11268,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10813,7 +11275,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10831,7 +11293,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10851,17 +11313,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10922,7 +11385,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10938,7 +11401,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -10975,9 +11438,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11063,7 +11526,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -11132,7 +11595,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11157,7 +11620,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11181,7 +11644,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -11212,7 +11675,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -11222,7 +11685,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -12004,6 +12467,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -12043,20 +12508,22 @@ + GETTEXT_MACRO_VERSION=0.18 + + # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -12171,15 +12638,14 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -12249,15 +12715,14 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -12318,6 +12783,9 @@ test -n "$localedir" || localedir='${datadir}/locale' + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + + ac_config_commands="$ac_config_commands po-directories" @@ -12338,6 +12806,7 @@ prefix="$acl_save_prefix" + # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes @@ -12348,21 +12817,21 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 -$as_echo_n "checking for ld used by GCC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -12372,12 +12841,12 @@ esac case $ac_prog in # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) + [\\/]* | ?:[\\/]*) re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -12401,23 +12870,26 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 &6 else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. + # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &5 @@ -12468,12 +12942,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then : enableval=$enable_rpath; : @@ -12483,23 +12959,71 @@ - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if ${gl_cv_solaris_64bit+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _LP64 +sixtyfour bits +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + + + + @@ -12544,6 +13068,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -12552,6 +13080,8 @@ LIBICONV= LTLIBICONV= INCICONV= + LIBICONV_PREFIX= + HAVE_LIBICONV= rpathdirs= ltrpathdirs= names_already_handled= @@ -12569,7 +13099,7 @@ done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -12585,22 +13115,52 @@ found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBICONV; do @@ -12616,21 +13176,44 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi ;; esac if test "X$found_dir" != "X"; then @@ -12641,7 +13224,9 @@ if test "X$found_dir" != "X"; then LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else haveit= @@ -12654,10 +13239,10 @@ if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" haveit= for x in $rpathdirs; do @@ -12689,7 +13274,7 @@ if test -z "$haveit"; then LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" @@ -12708,6 +13293,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -12756,9 +13351,11 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -12858,21 +13455,21 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" done @@ -12901,6 +13498,19 @@ + + + + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : @@ -12983,45 +13593,71 @@ LTLIBINTL= POSUB= + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no - - - + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION +#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) +#endif +typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if ${gt_cv_func_gnugettext1_libc+:} false; then : +if eval \${$gt_func_gnugettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; + int main () { + bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libc=yes + eval "$gt_func_gnugettext_libc=yes" else - gt_cv_func_gnugettext1_libc=no + eval "$gt_func_gnugettext_libc=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5 -$as_echo "$gt_cv_func_gnugettext1_libc" >&6; } +eval ac_res=\$$gt_func_gnugettext_libc + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then @@ -13062,14 +13698,16 @@ am_cv_lib_iconv=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include #include + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -13084,14 +13722,16 @@ LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include #include + int main () { iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd); ; return 0; } @@ -13109,6 +13749,148 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 $as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + if test "$cross_compiling" = yes; then : + + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +int main () +{ + int result = 0; + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + const char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + result |= 16; + return result; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +else + am_cv_func_iconv_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LIBS="$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then $as_echo "#define HAVE_ICONV 1" >>confdefs.h @@ -13130,6 +13912,10 @@ + + + + use_additional=yes acl_save_prefix="$prefix" @@ -13166,6 +13952,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -13174,6 +13964,8 @@ LIBINTL= LTLIBINTL= INCINTL= + LIBINTL_PREFIX= + HAVE_LIBINTL= rpathdirs= ltrpathdirs= names_already_handled= @@ -13191,7 +13983,7 @@ done if test -z "$already_handled"; then names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -13207,22 +13999,52 @@ found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIBINTL; do @@ -13238,21 +14060,44 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi ;; esac if test "X$found_dir" != "X"; then @@ -13263,7 +14108,9 @@ if test "X$found_dir" != "X"; then LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -13276,10 +14123,10 @@ if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" haveit= for x in $rpathdirs; do @@ -13311,7 +14158,7 @@ if test -z "$haveit"; then LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" @@ -13330,6 +14177,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -13378,9 +14235,11 @@ case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -13480,21 +14339,21 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" done @@ -13506,9 +14365,14 @@ done fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if ${gt_cv_func_gnugettext1_libintl+:} false; then : +if eval \${$gt_func_gnugettext_libintl+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -13517,53 +14381,63 @@ LIBS="$LIBS $LIBINTL" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias (const char *); + int main () { + bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libintl=yes + eval "$gt_func_gnugettext_libintl=yes" else - gt_cv_func_gnugettext1_libintl=no + eval "$gt_func_gnugettext_libintl=no" fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + #include +$gt_revision_test_code extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif const char *_nl_expand_alias (const char *); + int main () { + bindtextdomain ("", ""); -return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("") +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext1_libintl=yes + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" fi rm -f core conftest.err conftest.$ac_objext \ @@ -13572,12 +14446,13 @@ CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5 -$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } +eval ac_res=\$$gt_func_gnugettext_libintl + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes @@ -13615,7 +14490,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 $as_echo_n "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -13630,7 +14505,7 @@ if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 $as_echo_n "checking how to link with libintl... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 @@ -13865,6 +14740,16 @@ +# Check whether --with-python-binary was given. +if test "${with_python_binary+set}" = set; then : + withval=$with_python_binary; PYTHONBINARY=$withval +else + PYTHONBINARY=python +fi + + + + # Check whether --with-python-rev was given. if test "${with_python_rev+set}" = set; then : withval=$with_python_rev; PYTHONREV=$withval @@ -13872,7 +14757,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking python version" >&5 $as_echo_n "checking python version... " >&6; } - PYTHONREV=`python -c 'import sys;print "%s.%s" % (sys.version_info[0], sys.version_info[1])'` + PYTHONREV=`$PYTHONBINARY -c "import sys;sys.stdout.write('%s.%s' % (sys.version_info[0], sys.version_info[1]))"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHONREV" >&5 $as_echo "$PYTHONREV" >&6; } @@ -13886,8 +14771,8 @@ withval=$with_pythonsitedir; PYTHONSITEDIR=$withval else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking python version" >&5 -$as_echo_n "checking python version... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking python site directory" >&5 +$as_echo_n "checking python site directory... " >&6; } PYTHONSITEDIR=$libdir/python$PYTHONREV/site-packages { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHONSITEDIR" >&5 $as_echo "$PYTHONSITEDIR" >&6; } @@ -14194,7 +15079,7 @@ esac -ac_config_files="$ac_config_files Makefile libpwquality.spec src/Makefile src/pwquality.pc po/Makefile.in python/Makefile doc/Makefile doc/man/Makefile" +ac_config_files="$ac_config_files Makefile libpwquality.spec src/Makefile src/pwquality.pc po/Makefile.in python/Makefile doc/Makefile doc/man/Makefile python/setup.py" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14305,6 +15190,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -14735,7 +15628,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpwquality $as_me 1.2.3, which was +This file was extended by libpwquality $as_me 1.3.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14801,7 +15694,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpwquality config.status 1.2.3 +libpwquality config.status 1.3.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -14938,6 +15831,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -15020,7 +15914,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -15076,6 +15969,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -15126,7 +16020,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -15226,6 +16119,7 @@ "python/Makefile") CONFIG_FILES="$CONFIG_FILES python/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;; + "python/setup.py") CONFIG_FILES="$CONFIG_FILES python/setup.py" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -15822,7 +16716,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -15835,7 +16729,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -15869,21 +16763,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -15937,8 +16829,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -15992,6 +16884,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -16293,10 +17188,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -16557,7 +17448,7 @@ case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -16573,7 +17464,8 @@ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -16584,12 +17476,12 @@ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES diff -Nru libpwquality-1.2.3/configure.ac libpwquality-1.3.0/configure.ac --- libpwquality-1.2.3/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/configure.ac 2015-07-23 11:41:14.000000000 +0000 @@ -0,0 +1,169 @@ +dnl Process this file with autoconf to produce a configure script. +AC_INIT([libpwquality], [1.3.0]) +AC_CONFIG_HEADERS([config.h]) +AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip -Wall]) +AC_PREREQ(2.61) +AC_CONFIG_MACRO_DIR([m4]) +AC_CANONICAL_HOST + +dnl We don't build with srcdir != builddir at present; the Python +dnl bindings fail +echo \#buildapi-variable-no-builddir > /dev/null + +dnl LT Version numbers, remember to change them *before* a release. +dnl (Interfaces removed: CURRENT++, AGE=0, REVISION=0) +dnl (Interfaces added: CURRENT++, AGE++, REVISION=0) +dnl (No interfaces changed: REVISION++) +PWQUALITY_LT_CURRENT=1 +PWQUALITY_LT_AGE=0 +PWQUALITY_LT_REVISION=2 + +AC_SUBST(PACKAGE) +AC_SUBST(VERSION) +AC_SUBST(PWQUALITY_LT_CURRENT) +AC_SUBST(PWQUALITY_LT_AGE) +AC_SUBST(PWQUALITY_LT_REVISION) + +dnl Checks for programs. +AC_USE_SYSTEM_EXTENSIONS +AM_PROG_AR +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_LIBTOOL + +dnl and some hacks to use /etc +test "${prefix}" = "NONE" && prefix="/usr" +if test ${prefix} = '/usr' +then +dnl If we use /usr as prefix, use /etc for config files + if test ${sysconfdir} = '${prefix}/etc' + then + sysconfdir="/etc" + fi +dnl If we use /usr as prefix, use /usr/share/man for manual pages + if test ${mandir} = '${prefix}/man' + then + mandir='${prefix}/share/man' + fi +fi + +dnl Localization support +AM_GNU_GETTEXT_VERSION([0.18.2]) +AM_GNU_GETTEXT([external]) +AH_BOTTOM([#ifdef ENABLE_NLS +#include +#define _(msgid) dgettext(PACKAGE, msgid) +#define N_(msgid) msgid +#else +#define _(msgid) (msgid) +#define N_(msgid) msgid +#endif /* ENABLE_NLS */]) + +dnl Library version scripts + +dnl For some systems we know that we have ld_version scripts. +dnl Use it then as default. +have_ld_version_script=no +case "${host}" in + *-*-linux*) + have_ld_version_script=yes + ;; + *-*-gnu*) + have_ld_version_script=yes + ;; +esac + +AC_ARG_ENABLE([ld-version-script], + AC_HELP_STRING([--enable-ld-version-script], + [enable/disable use of linker version script. + (default is system dependent)]), + [have_ld_version_script=$enableval], + [ : ] ) +AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") + +dnl PAM support +PAM_LIBS= +AC_ARG_ENABLE([pam], + AS_HELP_STRING([--enable-pam],[build PAM module @<:@default=check@:>@]), + [], + [enable_pam=check]) +if test "$enable_pam" != "no"; then + if test "$enable_pam" = "check"; then + AC_CHECK_LIB([pam], [pam_start], [enable_pam=yes], [enable_pam=no]) + else + fail=0 + AC_CHECK_LIB([pam], [pam_start], [], [fail=1]) + test $fail = 1 && + AC_MSG_ERROR([You must install the PAM development package in order to compile libpwquality]) + fi +fi + +if test "$enable_pam" = "yes"; then + PAM_LIBS="${PAM_LIBS} -lpam" +fi +AC_SUBST(PAM_LIBS) +AM_CONDITIONAL(HAVE_PAM, test "$enable_pam" = "yes") + +dnl options and defaults +AC_ARG_WITH(securedir, + AS_HELP_STRING([--with-securedir=DIR],[path to location of PAMs @<:@default=$libdir/security@:>@]), + SECUREDIR=$withval, SECUREDIR=$libdir/security) +AC_SUBST(SECUREDIR) + +AC_ARG_WITH(sconfigdir, + AS_HELP_STRING([--with-sconfigdir=DIR],[path to PAM conf files @<:@default=$sysconfdir/security@:>@]), + SCONFIGDIR=$enableval, SCONFIGDIR=$sysconfdir/security) +AC_SUBST(SCONFIGDIR) + +AC_ARG_ENABLE([python-bindings], + AC_HELP_STRING([--enable-python-bindings], + [enable Python bindings (default: yes)]), + [enable_python_bindings=$enableval], + enable_python_bindings=yes) +AM_CONDITIONAL(BUILD_PYTHON_BINDINGS, test x"$enable_python_bindings" = xyes) + +AC_ARG_WITH(python-binary, + [ --with-python-binary=python3 python binary name with which modules should be built], + PYTHONBINARY=$withval, [PYTHONBINARY=python]) +AC_SUBST(PYTHONBINARY) + +AC_ARG_WITH(python-rev, + [ --with-python-rev=2.7 version of python for which modules should be built], + PYTHONREV=$withval,[ + AC_MSG_CHECKING([python version]) + [PYTHONREV=`$PYTHONBINARY -c "import sys;sys.stdout.write('%s.%s' % (sys.version_info[0], sys.version_info[1]))"`] + AC_MSG_RESULT($PYTHONREV) + ]) +AC_SUBST(PYTHONREV) + +AC_ARG_WITH(pythonsitedir, + [ --with-pythonsitedir=DIR directory of the python site packages @<:@default=$libdir/python$PYTHONREV/site-packages@:>@], + PYTHONSITEDIR=$withval,[ + AC_MSG_CHECKING([python site directory]) + [PYTHONSITEDIR=$libdir/python$PYTHONREV/site-packages] + AC_MSG_RESULT($PYTHONSITEDIR) + ]) +AC_SUBST(PYTHONSITEDIR) + +AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(|yes)],[use specified random device instead of /dev/urandom]), opt_randomdev=$withval) +if test "$opt_randomdev" = yes -o -z "$opt_randomdev"; then + opt_randomdev="/dev/urandom" +fi +AC_DEFINE_UNQUOTED(CONF_PATH_RANDOMDEV, "$opt_randomdev", [Random device path.]) + +dnl Check for cracklib +AC_CHECK_HEADERS([crack.h], + AC_CHECK_LIB([crack], [FascistCheck], LIBCRACK="-lcrack", LIBCRACK="")) +if test x$LIBCRACK = x ; then + AC_MSG_ERROR([No or unusable cracklib library]) +fi +AC_SUBST([LIBCRACK]) + +dnl Checks for typedefs, structures, and compiler characteristics. +AC_C_BIGENDIAN + +dnl Files to be created from when we run configure +AC_CONFIG_FILES([Makefile libpwquality.spec src/Makefile src/pwquality.pc po/Makefile.in python/Makefile + doc/Makefile doc/man/Makefile python/setup.py]) +AC_OUTPUT diff -Nru libpwquality-1.2.3/configure.in libpwquality-1.3.0/configure.in --- libpwquality-1.2.3/configure.in 2013-09-12 11:11:00.000000000 +0000 +++ libpwquality-1.3.0/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT([libpwquality], [1.2.3]) -AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip -Wall]) -AC_PREREQ(2.61) -AC_CONFIG_MACRO_DIR([m4]) -AC_CANONICAL_HOST - -dnl We don't build with srcdir != builddir at present; the Python -dnl bindings fail -echo \#buildapi-variable-no-builddir > /dev/null - -dnl LT Version numbers, remember to change them *before* a release. -dnl (Interfaces removed: CURRENT++, AGE=0, REVISION=0) -dnl (Interfaces added: CURRENT++, AGE++, REVISION=0) -dnl (No interfaces changed: REVISION++) -PWQUALITY_LT_CURRENT=1 -PWQUALITY_LT_AGE=0 -PWQUALITY_LT_REVISION=2 - -AC_SUBST(PACKAGE) -AC_SUBST(VERSION) -AC_SUBST(PWQUALITY_LT_CURRENT) -AC_SUBST(PWQUALITY_LT_AGE) -AC_SUBST(PWQUALITY_LT_REVISION) - -dnl Checks for programs. -AC_USE_SYSTEM_EXTENSIONS -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_LIBTOOL - -dnl and some hacks to use /etc -test "${prefix}" = "NONE" && prefix="/usr" -if test ${prefix} = '/usr' -then -dnl If we use /usr as prefix, use /etc for config files - if test ${sysconfdir} = '${prefix}/etc' - then - sysconfdir="/etc" - fi -dnl If we use /usr as prefix, use /usr/share/man for manual pages - if test ${mandir} = '${prefix}/man' - then - mandir='${prefix}/share/man' - fi -fi - -dnl Localization support -AM_GNU_GETTEXT_VERSION([0.15]) -AM_GNU_GETTEXT([external]) -AH_BOTTOM([#ifdef ENABLE_NLS -#include -#define _(msgid) dgettext(PACKAGE, msgid) -#define N_(msgid) msgid -#else -#define _(msgid) (msgid) -#define N_(msgid) msgid -#endif /* ENABLE_NLS */]) - -dnl Library version scripts - -dnl For some systems we know that we have ld_version scripts. -dnl Use it then as default. -have_ld_version_script=no -case "${host}" in - *-*-linux*) - have_ld_version_script=yes - ;; - *-*-gnu*) - have_ld_version_script=yes - ;; -esac - -AC_ARG_ENABLE([ld-version-script], - AC_HELP_STRING([--enable-ld-version-script], - [enable/disable use of linker version script. - (default is system dependent)]), - [have_ld_version_script=$enableval], - [ : ] ) -AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") - -dnl PAM support -PAM_LIBS= -AC_ARG_ENABLE([pam], - AS_HELP_STRING([--enable-pam],[build PAM module @<:@default=check@:>@]), - [], - [enable_pam=check]) -if test "$enable_pam" != "no"; then - if test "$enable_pam" = "check"; then - AC_CHECK_LIB([pam], [pam_start], [enable_pam=yes], [enable_pam=no]) - else - fail=0 - AC_CHECK_LIB([pam], [pam_start], [], [fail=1]) - test $fail = 1 && - AC_MSG_ERROR([You must install the PAM development package in order to compile libpwquality]) - fi -fi - -if test "$enable_pam" = "yes"; then - PAM_LIBS="${PAM_LIBS} -lpam" -fi -AC_SUBST(PAM_LIBS) -AM_CONDITIONAL(HAVE_PAM, test "$enable_pam" = "yes") - -dnl options and defaults -AC_ARG_WITH(securedir, - AS_HELP_STRING([--with-securedir=DIR],[path to location of PAMs @<:@default=$libdir/security@:>@]), - SECUREDIR=$withval, SECUREDIR=$libdir/security) -AC_SUBST(SECUREDIR) - -AC_ARG_WITH(sconfigdir, - AS_HELP_STRING([--with-sconfigdir=DIR],[path to PAM conf files @<:@default=$sysconfdir/security@:>@]), - SCONFIGDIR=$enableval, SCONFIGDIR=$sysconfdir/security) -AC_SUBST(SCONFIGDIR) - -AC_ARG_ENABLE([python-bindings], - AC_HELP_STRING([--enable-python-bindings], - [enable Python bindings (default: yes)]), - [enable_python_bindings=$enableval], - enable_python_bindings=yes) -AM_CONDITIONAL(BUILD_PYTHON_BINDINGS, test x"$enable_python_bindings" = xyes) - -AC_ARG_WITH(python-rev, - [ --with-pythonrev=2.7 version of python for which modules should be built], - PYTHONREV=$withval,[ - AC_MSG_CHECKING([python version]) - [PYTHONREV=`python -c 'import sys;print "%s.%s" % (sys.version_info[0], sys.version_info[1])'`] - AC_MSG_RESULT($PYTHONREV) - ]) -AC_SUBST(PYTHONREV) - -AC_ARG_WITH(pythonsitedir, - [ --with-pythonsitedir=DIR directory of the python site packages @<:@default=$libdir/python$PYTHONREV/site-packages@:>@], - PYTHONSITEDIR=$withval,[ - AC_MSG_CHECKING([python version]) - [PYTHONSITEDIR=$libdir/python$PYTHONREV/site-packages] - AC_MSG_RESULT($PYTHONSITEDIR) - ]) -AC_SUBST(PYTHONSITEDIR) - -AC_ARG_WITH([randomdev], AS_HELP_STRING([--with-randomdev=(|yes)],[use specified random device instead of /dev/urandom]), opt_randomdev=$withval) -if test "$opt_randomdev" = yes -o -z "$opt_randomdev"; then - opt_randomdev="/dev/urandom" -fi -AC_DEFINE_UNQUOTED(CONF_PATH_RANDOMDEV, "$opt_randomdev", [Random device path.]) - -dnl Check for cracklib -AC_CHECK_HEADERS([crack.h], - AC_CHECK_LIB([crack], [FascistCheck], LIBCRACK="-lcrack", LIBCRACK="")) -if test x$LIBCRACK = x ; then - AC_MSG_ERROR([No or unusable cracklib library]) -fi -AC_SUBST([LIBCRACK]) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_BIGENDIAN - -dnl Files to be created from when we run configure -AC_CONFIG_FILES([Makefile libpwquality.spec src/Makefile src/pwquality.pc po/Makefile.in python/Makefile - doc/Makefile doc/man/Makefile]) -AC_OUTPUT diff -Nru libpwquality-1.2.3/debian/changelog libpwquality-1.3.0/debian/changelog --- libpwquality-1.2.3/debian/changelog 2013-09-21 12:35:28.000000000 +0000 +++ libpwquality-1.3.0/debian/changelog 2015-10-26 16:52:51.000000000 +0000 @@ -1,3 +1,24 @@ +libpwquality (1.3.0-0ubuntu1) xenial; urgency=medium + + * New upstream version + * debian/patches/git_stack_over.patch: + - include upstream fix for a stack overflow issue + + -- Sebastien Bacher Mon, 26 Oct 2015 17:44:38 +0100 + +libpwquality (1.2.3-1ubuntu2) vivid; urgency=medium + + * No change rebuild to get translations imported in launchpad + (lp: #1391024) + + -- Sebastien Bacher Fri, 06 Feb 2015 15:08:24 +0100 + +libpwquality (1.2.3-1ubuntu1) trusty; urgency=medium + + * Build using dh-autoreconf. + + -- Matthias Klose Sun, 22 Dec 2013 13:06:19 +0100 + libpwquality (1.2.3-1) unstable; urgency=low * New upstream release. diff -Nru libpwquality-1.2.3/debian/control libpwquality-1.3.0/debian/control --- libpwquality-1.2.3/debian/control 2013-09-21 12:36:18.000000000 +0000 +++ libpwquality-1.3.0/debian/control 2015-10-26 17:07:40.000000000 +0000 @@ -2,13 +2,14 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: libpwquality Section: devel Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Iain Lane , Michael Biebl +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Iain Lane , Debian GNOME Maintainers , Iain Lane , Michael Biebl Build-Depends: debhelper (>= 9), + dh-autoreconf, libcrack2-dev, libpam0g-dev, python-all-dev (>= 2.6.6-3~), diff -Nru libpwquality-1.2.3/debian/control.in libpwquality-1.3.0/debian/control.in --- libpwquality-1.2.3/debian/control.in 2013-08-22 21:58:17.000000000 +0000 +++ libpwquality-1.3.0/debian/control.in 2015-10-26 16:43:57.000000000 +0000 @@ -1,9 +1,11 @@ Source: libpwquality Section: devel Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Iain Lane , @GNOME_TEAM@ Build-Depends: debhelper (>= 9), + dh-autoreconf, libcrack2-dev, libpam0g-dev, python-all-dev (>= 2.6.6-3~), diff -Nru libpwquality-1.2.3/debian/patches/git_stack_over.patch libpwquality-1.3.0/debian/patches/git_stack_over.patch --- libpwquality-1.2.3/debian/patches/git_stack_over.patch 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/debian/patches/git_stack_over.patch 2015-10-26 16:52:11.000000000 +0000 @@ -0,0 +1,13 @@ +Fix possible stack overflow in pwquality_generate() with data from /dev/urandom. +diff -r bb4952bec17e -r a4696cd7cd24 src/generate.c +--- a/src/generate.c Thu Jul 23 14:11:30 2015 +0200 ++++ b/src/generate.c Mon Aug 24 16:20:08 2015 +0200 +@@ -100,7 +100,7 @@ + int + pwquality_generate(pwquality_settings_t *pwq, int entropy_bits, char **password) + { +- char entropy[PWQ_MAX_ENTROPY_BITS/8 + 1]; ++ char entropy[(PWQ_MAX_ENTROPY_BITS+PWQ_MAX_ENTROPY_BITS/9)/8 + 2]; + char *tmp; + int maxlen; + int try = 0; diff -Nru libpwquality-1.2.3/debian/patches/series libpwquality-1.3.0/debian/patches/series --- libpwquality-1.2.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/debian/patches/series 2015-10-26 16:52:30.000000000 +0000 @@ -0,0 +1 @@ +git_stack_over.patch diff -Nru libpwquality-1.2.3/debian/python-pwquality.install libpwquality-1.3.0/debian/python-pwquality.install --- libpwquality-1.2.3/debian/python-pwquality.install 2013-05-11 01:13:52.000000000 +0000 +++ libpwquality-1.3.0/debian/python-pwquality.install 2015-10-26 16:47:16.000000000 +0000 @@ -1 +1 @@ -usr/lib/python*/dist-packages/* +usr/lib/python*/site-packages/* diff -Nru libpwquality-1.2.3/debian/rules libpwquality-1.3.0/debian/rules --- libpwquality-1.2.3/debian/rules 2013-06-29 17:20:13.000000000 +0000 +++ libpwquality-1.3.0/debian/rules 2015-10-26 16:43:57.000000000 +0000 @@ -20,4 +20,4 @@ --with-pythonsitedir=/usr/lib/$(PYVER)/dist-packages/ %: - dh $@ --with python2 + dh $@ --with python2,autoreconf diff -Nru libpwquality-1.2.3/doc/Makefile.in libpwquality-1.3.0/doc/Makefile.in --- libpwquality-1.2.3/doc/Makefile.in 2013-09-12 11:14:15.000000000 +0000 +++ libpwquality-1.3.0/doc/Makefile.in 2015-07-23 11:45:56.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,31 +78,44 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -83,9 +123,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -117,6 +177,7 @@ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -139,6 +200,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -187,6 +249,7 @@ PWQUALITY_LT_AGE = @PWQUALITY_LT_AGE@ PWQUALITY_LT_CURRENT = @PWQUALITY_LT_CURRENT@ PWQUALITY_LT_REVISION = @PWQUALITY_LT_REVISION@ +PYTHONBINARY = @PYTHONBINARY@ PYTHONREV = @PYTHONREV@ PYTHONSITEDIR = @PYTHONSITEDIR@ RANLIB = @RANLIB@ @@ -200,6 +263,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -294,22 +358,25 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -324,57 +391,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -390,12 +412,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -407,15 +424,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -424,6 +437,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -584,22 +612,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru libpwquality-1.2.3/doc/man/Makefile.am libpwquality-1.3.0/doc/man/Makefile.am --- libpwquality-1.2.3/doc/man/Makefile.am 2012-06-13 12:36:29.000000000 +0000 +++ libpwquality-1.3.0/doc/man/Makefile.am 2015-07-22 16:10:52.000000000 +0000 @@ -1,5 +1,22 @@ -dist_man_MANS = pwmake.1 pwscore.1 pwquality.conf.5 +dist_man_MANS = pwmake.1 pwscore.1 pwquality.conf.5 pwquality.3 if HAVE_PAM dist_man_MANS += pam_pwquality.8 endif + +EXTRA_DIST=pam_pwquality.8.pod pwmake.1.pod pwscore.1.pod pwquality.conf.5.pod pwquality.3.pod + +%.8: %.8.pod + bash -c 'declare -u ucname=$*; pod2man --utf8 --name="$$ucname" --section=8 --center="Linux-PAM Manual" --release="Red Hat, Inc." $< $@' + +%.1: %.1.pod + bash -c 'declare -u ucname=$*; pod2man --utf8 --name="$$ucname" --section=1 --center="General Commands Manual" --release="Red Hat, Inc." $< $@' + +%.5: %.5.pod + bash -c 'declare -u ucname=$*; pod2man --utf8 --name="$$ucname" --section=5 --center="File Formats Manual" --release="Red Hat, Inc." $< $@' + +%.3: %.3.pod + bash -c 'declare -u ucname=$*; pod2man --utf8 --name="$$ucname" --section=5 --center="Libpwquality API Manual" --release="Red Hat, Inc." $< $@' + +manclean: + rm *.8 *.1 *.5 *.3 diff -Nru libpwquality-1.2.3/doc/man/Makefile.in libpwquality-1.3.0/doc/man/Makefile.in --- libpwquality-1.2.3/doc/man/Makefile.in 2013-09-12 11:14:15.000000000 +0000 +++ libpwquality-1.3.0/doc/man/Makefile.in 2015-07-23 11:45:56.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,23 +79,35 @@ host_triplet = @host@ @HAVE_PAM_TRUE@am__append_1 = pam_pwquality.8 subdir = doc/man -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -104,15 +143,18 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man8dir)" +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" \ + "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" +man3dir = $(mandir)/man3 man5dir = $(mandir)/man5 man8dir = $(mandir)/man8 NROFF = nroff MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -135,6 +177,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -183,6 +226,7 @@ PWQUALITY_LT_AGE = @PWQUALITY_LT_AGE@ PWQUALITY_LT_CURRENT = @PWQUALITY_LT_CURRENT@ PWQUALITY_LT_REVISION = @PWQUALITY_LT_REVISION@ +PYTHONBINARY = @PYTHONBINARY@ PYTHONREV = @PYTHONREV@ PYTHONSITEDIR = @PYTHONSITEDIR@ RANLIB = @RANLIB@ @@ -196,6 +240,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -248,7 +293,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -dist_man_MANS = pwmake.1 pwscore.1 pwquality.conf.5 $(am__append_1) +dist_man_MANS = pwmake.1 pwscore.1 pwquality.conf.5 pwquality.3 \ + $(am__append_1) +EXTRA_DIST = pam_pwquality.8.pod pwmake.1.pod pwscore.1.pod pwquality.conf.5.pod pwquality.3.pod all: all-am .SUFFIXES: @@ -331,6 +378,49 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +install-man3: $(dist_man_MANS) + @$(NORMAL_INSTALL) + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man3dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.3[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \ + done; } + +uninstall-man3: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man3dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.3[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir) install-man5: $(dist_man_MANS) @$(NORMAL_INSTALL) @list1=''; \ @@ -417,27 +507,14 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -471,7 +548,7 @@ check: check-am all-am: Makefile $(MANS) installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -540,7 +617,7 @@ install-info-am: -install-man: install-man1 install-man5 install-man8 +install-man: install-man1 install-man3 install-man5 install-man8 install-pdf: install-pdf-am @@ -570,23 +647,40 @@ uninstall-am: uninstall-man -uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8 +uninstall-man: uninstall-man1 uninstall-man3 uninstall-man5 \ + uninstall-man8 .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-man5 install-man8 install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-man uninstall-man1 uninstall-man5 uninstall-man8 + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-man3 install-man5 install-man8 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am uninstall-man uninstall-man1 \ + uninstall-man3 uninstall-man5 uninstall-man8 + + +%.8: %.8.pod + bash -c 'declare -u ucname=$*; pod2man --utf8 --name="$$ucname" --section=8 --center="Linux-PAM Manual" --release="Red Hat, Inc." $< $@' + +%.1: %.1.pod + bash -c 'declare -u ucname=$*; pod2man --utf8 --name="$$ucname" --section=1 --center="General Commands Manual" --release="Red Hat, Inc." $< $@' + +%.5: %.5.pod + bash -c 'declare -u ucname=$*; pod2man --utf8 --name="$$ucname" --section=5 --center="File Formats Manual" --release="Red Hat, Inc." $< $@' + +%.3: %.3.pod + bash -c 'declare -u ucname=$*; pod2man --utf8 --name="$$ucname" --section=5 --center="Libpwquality API Manual" --release="Red Hat, Inc." $< $@' +manclean: + rm *.8 *.1 *.5 *.3 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libpwquality-1.2.3/doc/man/pam_pwquality.8 libpwquality-1.3.0/doc/man/pam_pwquality.8 --- libpwquality-1.2.3/doc/man/pam_pwquality.8 2013-01-03 10:05:19.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pam_pwquality.8 2015-07-22 14:41:25.000000000 +0000 @@ -1,405 +1,339 @@ +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +. ds C` +. ds C' +'br\} +.\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' -.de FN -\fI\|\\$1\|\fP +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. -.TH PAM_PWQUALITY 8 "10 Nov 2011" "Red Hat, Inc." -.SH NAME +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" ======================================================================== +.\" +.IX Title "PAM_PWQUALITY 8" +.TH PAM_PWQUALITY 8 "2015-07-22" "Red Hat, Inc." "Linux-PAM Manual" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" pam_pwquality \- PAM module to perform password quality checking -.SH SYNOPSIS -\fBpam_pwquality\&.so\fR [\fI\&.\&.\&.\fR] -.SH DESCRIPTION -.PP -This module can be plugged into the -\fIpassword\fR -stack of a given service to provide some plug\-in strength\-checking -for passwords\&. The code was originally based on pam_cracklib module -and the module is backwards compatible with its options\&. +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +\&\fBpam_pwquality.so\fR [\fI...\fR] +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +This module can be plugged into the \fBpassword\fR stack of a given service +to provide some plug-in strength-checking for passwords. +The code was originally based on pam_cracklib module and the module is +backwards compatible with its options. .PP The action of this module is to prompt the user for a password and check its strength against a system dictionary and a set of rules for identifying -poor choices\&. +poor choices. .PP The first action is to prompt for a single password, check its strength and then, if it is considered strong, prompt for the password a second time -(to verify that it was typed correctly on the first occasion)\&. All being +(to verify that it was typed correctly on the first occasion). All being well, the password is passed on to subsequent modules to be installed as the -new authentication token\&. +new authentication token. .PP -The strength checks works in the following manner: at first the -\fBCracklib\fR -routine is called to check if the password is part of a dictionary; if this -is not the case an additional set of strength checks is done\&. These checks -are: -.PP -Palindrome -.RS 4 +The checks for strength are: +.IP "Palindrome" 4 +.IX Item "Palindrome" Is the new password a palindrome? -.RE -.PP -Case Change Only -.RS 4 +.IP "Case Change Only" 4 +.IX Item "Case Change Only" Is the new password the the old one with only a change of case? -.RE -.PP -Similar -.RS 4 +.IP "Similar" 4 +.IX Item "Similar" Is the new password too much like the old one? This is primarily controlled -by one argument, -\fBdifok\fR -which is a number of character changes (inserts, removals, or replacements) -between the old and new password that are enough to accept the new -password\&. This defaults to 5 changes\&. -.RE -.PP -Simple -.RS 4 +by one argument, \fBdifok\fR which is a number of character changes (inserts, +removals, or replacements) between the old and new password that are enough +to accept the new password. +.IP "Simple" 4 +.IX Item "Simple" Is the new password too small? This is controlled by 6 arguments -\fBminlen\fR, -\fBmaxclassrepeat\fR, -\fBdcredit\fR, -\fBucredit\fR, -\fBlcredit\fR, and -\fBocredit\fR\&. See the section on the arguments for the details of how -these work and there defaults\&. -.RE -.PP -Rotated -.RS 4 +\&\fBminlen\fR, \fBmaxclassrepeat\fR, \fBdcredit\fR, \fBucredit\fR, \fBlcredit\fR, +and \fBocredit\fR. See the section on the arguments for the details of how +these work and there defaults. +.IP "Rotated" 4 +.IX Item "Rotated" Is the new password a rotated version of the old password? -.RE -.PP -Same consecutive characters -.RS 4 -Optional check for same consecutive characters\&. -.RE -.PP -Too long monotonic character sequence -.RS 4 -Optional check for too long monotonic character sequence\&. -.RE -.PP -Contains user name -.RS 4 -Optional check whether the password contains the user\*(Aqs name in some form\&. -.RE +.IP "Same consecutive characters" 4 +.IX Item "Same consecutive characters" +Optional check for same consecutive characters. +.IP "Too long monotonic character sequence" 4 +.IX Item "Too long monotonic character sequence" +Optional check for too long monotonic character sequence. +.IP "Contains user name" 4 +.IX Item "Contains user name" +Optional check whether the password contains the user's name in some form. +.IP "Dictionary check" 4 +.IX Item "Dictionary check" +The \fICracklib\fR routine is called to check if the password is part of +a dictionary. .PP These checks are configurable either by use of the module arguments -or by modifying the \fB/etc/security/pwquality.conf\fR configuration file. -.PD -.SH OPTIONS -.PP -\fBdebug\fR -.RS 4 -This option makes the module write information to -\fBsyslog\fR(3) +or by modifying the \fI/etc/security/pwquality.conf\fR configuration file. The +module arguments override the settings in the configuration file. +.SH "OPTIONS" +.IX Header "OPTIONS" +.IP "\fBdebug\fR" 4 +.IX Item "debug" +This option makes the module write information to \fIsyslog\fR\|(3) indicating the behavior of the module (this option does not write password -information to the log file)\&. -.RE -.PP -\fBauthtok_type=\fR\fB\fIXXX\fR\fR -.RS 4 +information to the log file). +.IP "\fBauthtok_type=\fR\fI\s-1XXX\s0\fR" 4 +.IX Item "authtok_type=XXX" The default action is for the module to use the following prompts when -requesting passwords: "New UNIX password: " and -"Retype UNIX password: "\&. The example word -\fIUNIX\fR -can be replaced with this option, by default it is empty\&. -.RE -.PP -\fBretry=\fR\fB\fIN\fR\fR -.RS 4 -Prompt user at most -\fIN\fR -times before returning with error\&. The default is -\fI1\fR\&. -.RE -.PP -\fBdifok=\fR\fB\fIN\fR\fR -.RS 4 -This argument will change the default of -\fI5\fR -for the number of changes in the new password from the old password\&. -.RE -.PP -\fBminlen=\fR\fB\fIN\fR\fR -.RS 4 +requesting passwords: \f(CW"New UNIX password: "\fR and +\&\f(CW"Retype UNIX password: "\fR. The example word +\&\fI\s-1UNIX\s0\fR can be replaced with this option, by default it is empty. +.IP "\fBretry=\fR\fIN\fR" 4 +.IX Item "retry=N" +Prompt user at most \fIN\fR times before returning with error. The default is +\&\fI1\fR. +.IP "\fBdifok=\fR\fIN\fR" 4 +.IX Item "difok=N" +This argument will change the default of \fI1\fR for the number of changes in +the new password from the old password. +.IP "\fBminlen=\fR\fIN\fR" 4 +.IX Item "minlen=N" The minimum acceptable size for the new password (plus one if credits are not -disabled which is the default)\&. In addition to the number of characters in +disabled which is the default). In addition to the number of characters in the new password, credit (of +1 in length) is given for each different kind -of character (\fIother\fR, -\fIupper\fR, -\fIlower\fR -and -\fIdigit\fR)\&. The default for this parameter is -\fI9\fR -\&. Note that there is a pair of length limits also in -\fICracklib\fR, -which is used for dictionary checking, a "way too short" limit of 4 which -is hard coded in and a build time defined limit (6) that will be checked -without reference to \fBminlen\fR\&. -.RE -.PP -\fBdcredit=\fR\fB\fIN\fR\fR -.RS 4 -(N >= 0) This is the maximum credit for having digits in the new password\&. -If you have less than or -\fIN\fR -digits, each digit will count +1 towards meeting the current -\fBminlen\fR -value\&. The default for -\fBdcredit\fR -is 1 which is the recommended value for -\fBminlen\fR -less than 10\&. -.sp +of character (\fIother\fR, \fIupper\fR, \fIlower\fR and \fIdigit\fR). The default for this +parameter is \fI8\fR. Note that there is a pair of length limits also in +\&\fICracklib\fR, which is used for dictionary checking, a \*(L"way too short\*(R" limit +of \fI4\fR which is hard coded in and a build time defined limit (\fI6\fR) that will +be checked without reference to \fBminlen\fR. +.IP "\fBdcredit=\fR\fIN\fR" 4 +.IX Item "dcredit=N" +(N >= 0) This is the maximum credit for having digits in the new password. +If you have less than or \fIN\fR digits, each digit will count +1 towards meeting +the current \fBminlen\fR value. The default for \fBdcredit\fR is \fI0\fR +which means there is no bonus for digits in password. +.Sp (N < 0) This is the minimum number of digits that must be met for a new -password\&. -.RE -.PP -\fBucredit=\fR\fB\fIN\fR\fR -.RS 4 -(N >= 0) This is the maximum credit for having upper case letters in the -new password\&. If you have less than or -\fIN\fR -upper case letters each letter will count +1 towards meeting the current -\fBminlen\fR -value\&. The default for -\fBucredit\fR -is -\fI1\fR -which is the recommended value for -\fBminlen\fR -less than 10\&. -.sp -(N < 0) This is the minimum number of upper case letters that must be met -for a new password\&. -.RE -.PP -\fBlcredit=\fR\fB\fIN\fR\fR -.RS 4 -(N >= 0) This is the maximum credit for having lower case letters in the -new password\&. If you have less than or -\fIN\fR -lower case letters, each letter will count +1 towards meeting the current -\fBminlen\fR -value\&. The default for -\fBlcredit\fR -is 1 which is the recommended value for -\fBminlen\fR -less than 10\&. -.sp -(N < 0) This is the minimum number of lower case letters that must be met -for a new password\&. -.RE -.PP -\fBocredit=\fR\fB\fIN\fR\fR -.RS 4 -(N >= 0) This is the maximum credit for having other characters in the new -password\&. If you have less than or -\fIN\fR -other characters, each character will count +1 towards meeting the current -\fBminlen\fR -value\&. The default for -\fBocredit\fR -is 1 which is the recommended value for -\fBminlen\fR -less than 10\&. -.sp -(N < 0) This is the minimum number of other characters that must be met for -a new password\&. -.RE -.PP -\fBminclass=\fR\fB\fIN\fR\fR -.RS 4 -The minimum number of required classes of characters for the new password\&. -The default number is zero\&. The four classes are digits, upper and lower -letters and other characters\&. The difference to the -\fBcredit\fR -check is that a specific class if of characters is not required\&. Instead -\fIN\fR -out of four of the classes are required\&. -.RE -.PP -\fBmaxrepeat=\fR\fB\fIN\fR\fR -.RS 4 -Reject passwords which contain more than N same consecutive characters\&. -The default is 0 which means that this check is disabled\&. -.RE -.PP -\fBmaxsequence=\fR\fB\fIN\fR\fR -.RS 4 -Reject passwords which contain monotonic character sequences longer than N\&. -The default is 0 which means that this check is disabled\&. -Examples of such sequence are \*(Aq12345\*(Aq or \*(Aqfedcb\*(Aq\&. Note that +password. +.IP "\fBucredit=\fR\fIN\fR" 4 +.IX Item "ucredit=N" +(N >= 0) This is the maximum credit for having upper case letters in the new password. +If you have less than or \fIN\fR upper case letters, each upper case letter will count +1 towards meeting +the current \fBminlen\fR value. The default for \fBucredit\fR is \fI0\fR +which means there is no bonus for upper case letters in password. +.Sp +(N < 0) This is the minimum number of upper case letters that must be met for a new +password. +.IP "\fBlcredit=\fR\fIN\fR" 4 +.IX Item "lcredit=N" +(N >= 0) This is the maximum credit for having lower case letters in the new password. +If you have less than or \fIN\fR lower case letters, each lower case letter will count +1 towards meeting +the current \fBminlen\fR value. The default for \fBlcredit\fR is \fI0\fR +which means there is no bonus for lower case letters in password. +.Sp +(N < 0) This is the minimum number of lower case letters that must be met for a new +password. +.IP "\fBocredit=\fR\fIN\fR" 4 +.IX Item "ocredit=N" +(N >= 0) This is the maximum credit for having other characters in the new password. +If you have less than or \fIN\fR other characters, each other character will count +1 towards meeting +the current \fBminlen\fR value. The default for \fBocredit\fR is \fI0\fR +which means there is no bonus for other characters in password. +.Sp +(N < 0) This is the minimum number of other characters that must be met for a new +password. +.IP "\fBminclass=\fR\fIN\fR" 4 +.IX Item "minclass=N" +The minimum number of required classes of characters for the new password. +The four classes are digits, upper and lower letters and other characters. +The difference to the \fBcredit\fR check is that a specific class if of +characters is not required. Instead \fIN\fR out of four of the classes are +required. By default the check is disabled. +.IP "\fBmaxrepeat=\fR\fIN\fR" 4 +.IX Item "maxrepeat=N" +Reject passwords which contain more than \fIN\fR same consecutive characters. +The default is 0 which means that this check is disabled. +.IP "\fBmaxsequence=\fR\fIN\fR" 4 +.IX Item "maxsequence=N" +Reject passwords which contain monotonic character sequences longer than \fIN\fR. +The default is 0 which means that this check is disabled. +Examples of such sequence are '12345' or 'fedcb'. Note that most such passwords will not pass the simplicity check unless the sequence -is only a minor part of the password\&. -.RE -.PP -\fBmaxclassrepeat=\fR\fB\fIN\fR\fR -.RS 4 -Reject passwords which contain more than N consecutive characters of the -same class\&. -The default is 0 which means that this check is disabled\&. -.RE -.PP -\fBgecoscheck=\fR\fB\fIN\fR\fR -.RS 4 +is only a minor part of the password. +.IP "\fBmaxclassrepeat=\fR\fIN\fR" 4 +.IX Item "maxclassrepeat=N" +Reject passwords which contain more than \fIN\fR consecutive characters of the +same class. The default is 0 which means that this check is disabled. +.IP "\fBgecoscheck=\fR\fIN\fR" 4 +.IX Item "gecoscheck=N" If nonzero, check whether the individual words longer than 3 characters -from the -\fBpasswd GECOS\fR -field of the user are contained in the new password\&. -The default is 0 which means that this check is disabled\&. -.RE -.PP -\fBbadwords=\fR\fB\fI\fR\fR -.RS 4 +from the \fIpasswd\fR\|(5) \s-1GECOS\s0 field of the user are contained in the new +password. The default is 0 which means that this check is disabled. +.IP "\fBdictcheck=\fR\fIN\fR" 4 +.IX Item "dictcheck=N" +If nonzero, check whether the password (with possible modifications) +matches a word in a dictionary. Currently the dictionary check is performed +using the \fIcracklib\fR library. The default is 1 which means that this check +is enabled. +.IP "\fBbadwords=\fR\fI\fR" 4 +.IX Item "badwords=" The words more than 3 characters long from this space separated list are -individually searched for and forbidden in the new password\&. -By default the list is empty which means that this check is disabled\&. -.RE -.PP -\fBenforce_for_root\fR -.RS 4 +individually searched for and forbidden in the new password. +By default the list is empty which means that this check is disabled. +.IP "\fBdictpath=\fR\fI/path/to/dict\fR" 4 +.IX Item "dictpath=/path/to/dict" +This options allows for specification of non-default path to the cracklib +dictionaries. +.IP "\fBenforce_for_root\fR" 4 +.IX Item "enforce_for_root" The module will return error on failed check even if the user changing the -password is root\&. This option is off by default which means that just +password is root. This option is off by default which means that just the message about the failed check is printed but root can change -the password anyway\&. Note that root is not asked for an old password -so the checks that compare the old and new password are not performed\&. -.RE -.PP -\fBlocal_users_only\fR -.RS 4 +the password anyway. Note that root is not asked for an old password +so the checks that compare the old and new password are not performed. +.IP "\fBlocal_users_only\fR" 4 +.IX Item "local_users_only" The module will not test the password quality for users that are not present -in the \fI/etc/passwd\fR file\&. The module still asks for the password so -the following modules in the stack can use the \fBuse_authtok\fR option\&. -This option is off by default\&. -.RE -.PP -\fBuse_authtok\fR -.RS 4 -This argument is used to -\fIforce\fR -the module to not prompt the user for a new password but use the one -provided by the previously stacked -\fIpassword\fR -module\&. -.RE -.PP -\fBdictpath=\fR\fB\fI/path/to/dict\fR\fR -.RS 4 -Path to the cracklib dictionaries\&. -.RE - -.PD +in the \fI/etc/passwd\fR file. The module still asks for the password so +the following modules in the stack can use the \fBuse_authtok\fR option. +This option is off by default. +.IP "\fBuse_authtok\fR" 4 +.IX Item "use_authtok" +This argument is used to \fIforce\fR the module to not prompt the user for +a new password but use the one provided by the previously stacked +\&\fBpassword\fR module. .SH "MODULE TYPES PROVIDED" -.PP -Only the -\fBpassword\fR -module type is provided\&. - -.PD +.IX Header "MODULE TYPES PROVIDED" +Only the \fBpassword\fR module type is provided. .SH "RETURN VALUES" -.PP -.PP -PAM_SUCCESS -.RS 4 -The new password passes all checks\&. -.RE -.PP -PAM_AUTHTOK_ERR -.RS 4 +.IX Header "RETURN VALUES" +.IP "\s-1PAM_SUCCESS\s0" 4 +.IX Item "PAM_SUCCESS" +The new password passes all checks. +.IP "\s-1PAM_AUTHTOK_ERR\s0" 4 +.IX Item "PAM_AUTHTOK_ERR" No new password was entered, the username could not be determined or the -new password fails the strength checks\&. -.RE -.PP -PAM_AUTHTOK_RECOVERY_ERR -.RS 4 +new password fails the strength checks. +.IP "\s-1PAM_AUTHTOK_RECOVERY_ERR\s0" 4 +.IX Item "PAM_AUTHTOK_RECOVERY_ERR" The old password was not supplied by a previous stacked module or got not -requested from the user\&. The first error can happen if -\fBuse_authtok\fR -is specified\&. -.RE -.PP -PAM_SERVICE_ERR -.RS 4 -A internal error occurred\&. -.RE +requested from the user. The first error can happen if \fBuse_authtok\fR +is specified. +.IP "\s-1PAM_SERVICE_ERR\s0" 4 +.IX Item "PAM_SERVICE_ERR" +A internal error occurred. .SH "EXAMPLES" -.PP -For an example of the use of this module, we show how it may be stacked with the password component of -\fBpam_unix\fR(8) -.sp -.if n \{\ -.RS 4 -.\} -.nf -# -# These lines stack two password type modules\&. In this example the -# user is given 3 opportunities to enter a strong password\&. The -# "use_authtok" argument ensures that the pam_unix module does not -# prompt for a password, but instead uses the one provided by -# pam_pwquality\&. -# -passwd password required pam_pwquality\&.so retry=3 -passwd password required pam_unix\&.so use_authtok - -.fi -.if n \{\ -.RE -.\} -.PP -Another example (in the -/etc/pam\&.d/passwd -format) is for the case that you want to use md5 password encryption: -.sp -.if n \{\ -.RS 4 -.\} -.nf -#%PAM\-1\&.0 -# -# These lines allow a md5 systems to support passwords of at least 14 -# bytes with extra credit of 2 for digits and 2 for others the new -# password must have at least three bytes that are not present in the -# old password -# -password required pam_pwquality\&.so \e - difok=3 minlen=15 dcredit= 2 ocredit=2 -password required pam_unix\&.so use_authtok nullok md5 - -.fi -.if n \{\ -.RE -.\} -.PP -And here is another example in case you don\'t want to use credits: -.sp -.if n \{\ -.RS 4 -.\} -.nf -#%PAM\-1\&.0 -# -# These lines require the user to select a password with a minimum -# length of 8 and with at least 1 digit number, 1 upper case letter, -# and 1 other character -# -password required pam_pwquality\&.so \e - dcredit=\-1 ucredit=\-1 ocredit=\-1 lcredit=0 minlen=8 -password required pam_unix\&.so use_authtok nullok md5 -.fi -.if n \{\ -.RE -.\} -.sp -.PD +.IX Header "EXAMPLES" +For an example of the use of this module, we show how it may be stacked +with the password component of \fIpam_unix\fR\|(8). +.PP +.Vb 9 +\& # +\& # These lines stack two password type modules. In this example the +\& # user is given 3 opportunities to enter a strong password. The +\& # "use_authtok" argument ensures that the pam_unix module does not +\& # prompt for a password, but instead uses the one provided by +\& # pam_pwquality. +\& # +\& password required pam_pwquality.so retry=3 +\& password required pam_unix.so use_authtok +.Ve +.PP +Another example is for the case that you want to use sha256 password +encryption: +.PP +.Vb 9 +\& # +\& # These lines allow modern systems to support passwords of at least 14 +\& # bytes with extra credit of 2 for digits and 2 for others the new +\& # password must have at least three bytes that are not present in the +\& # old password +\& # +\& password required pam_pwquality.so \e +\& difok=3 minlen=15 dcredit=2 ocredit=2 +\& password required pam_unix.so use_authtok nullok sha256 +.Ve +.PP +And here is another example in case you don't want to use credits: +.PP +.Vb 8 +\& # +\& # These lines require the user to select a password with a minimum +\& # length of 8 and with at least 1 digit number, 1 upper case letter, +\& # and 1 other character +\& # +\& password required pam_pwquality.so \e +\& dcredit=\-1 ucredit=\-1 ocredit=\-1 lcredit=0 minlen=8 +\& password required pam_unix.so use_authtok nullok sha256 +.Ve .SH "SEE ALSO" -pwscore(1), pwquality.conf(5), pam_pwquality(8), -pam.conf(5), PAM(8) - -.SH AUTHORS -.nf -Tomas Mraz -Original author of pam_cracklib module Cristian Gafton -.fi +.IX Header "SEE ALSO" +\&\fIpwscore\fR\|(1), \fIpwquality.conf\fR\|(5), \fIpam_pwquality\fR\|(8), +\&\fIpam.conf\fR\|(5), \s-1\fIPAM\s0\fR\|(8) +.SH "AUTHORS" +.IX Header "AUTHORS" +Tomas Mraz +.PP +Original author of \fBpam_cracklib\fR module Cristian Gafton diff -Nru libpwquality-1.2.3/doc/man/pam_pwquality.8.pod libpwquality-1.3.0/doc/man/pam_pwquality.8.pod --- libpwquality-1.2.3/doc/man/pam_pwquality.8.pod 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pam_pwquality.8.pod 2015-07-22 13:57:59.000000000 +0000 @@ -0,0 +1,309 @@ +=pod + +=head1 NAME + +pam_pwquality - PAM module to perform password quality checking + +=head1 SYNOPSIS + +B [I<...>] + +=head1 DESCRIPTION + +This module can be plugged into the B stack of a given service +to provide some plug-in strength-checking for passwords. +The code was originally based on pam_cracklib module and the module is +backwards compatible with its options. + +The action of this module is to prompt the user for a password and check +its strength against a system dictionary and a set of rules for identifying +poor choices. + +The first action is to prompt for a single password, check its strength +and then, if it is considered strong, prompt for the password a second time +(to verify that it was typed correctly on the first occasion). All being +well, the password is passed on to subsequent modules to be installed as the +new authentication token. + +The checks for strength are: + +=over 4 + +=item Palindrome + +Is the new password a palindrome? + +=item Case Change Only + +Is the new password the the old one with only a change of case? + +=item Similar + +Is the new password too much like the old one? This is primarily controlled +by one argument, B which is a number of character changes (inserts, +removals, or replacements) between the old and new password that are enough +to accept the new password. + +=item Simple + +Is the new password too small? This is controlled by 6 arguments +B, B, B, B, B, +and B. See the section on the arguments for the details of how +these work and there defaults. + +=item Rotated + +Is the new password a rotated version of the old password? + +=item Same consecutive characters + +Optional check for same consecutive characters. + +=item Too long monotonic character sequence + +Optional check for too long monotonic character sequence. + +=item Contains user name + +Optional check whether the password contains the user's name in some form. + +=item Dictionary check + +The I routine is called to check if the password is part of +a dictionary. + +=back + +These checks are configurable either by use of the module arguments +or by modifying the F configuration file. The +module arguments override the settings in the configuration file. + +=head1 OPTIONS + +=over 4 + +=item B + +This option makes the module write information to L +indicating the behavior of the module (this option does not write password +information to the log file). + +=item BI + +The default action is for the module to use the following prompts when +requesting passwords: C<"New UNIX password: "> and +C<"Retype UNIX password: ">. The example word +I can be replaced with this option, by default it is empty. + +=item BI + +Prompt user at most I times before returning with error. The default is +I<1>. + +=item BI + +This argument will change the default of I<1> for the number of changes in +the new password from the old password. + +=item BI + +The minimum acceptable size for the new password (plus one if credits are not +disabled which is the default). In addition to the number of characters in +the new password, credit (of +1 in length) is given for each different kind +of character (I, I, I and I). The default for this +parameter is I<8>. Note that there is a pair of length limits also in +I, which is used for dictionary checking, a "way too short" limit +of I<4> which is hard coded in and a build time defined limit (I<6>) that will +be checked without reference to B. + +=item BI + +(N >= 0) This is the maximum credit for having digits in the new password. +If you have less than or I digits, each digit will count +1 towards meeting +the current B value. The default for B is I<0> +which means there is no bonus for digits in password. + +(N < 0) This is the minimum number of digits that must be met for a new +password. + +=item BI + +(N >= 0) This is the maximum credit for having upper case letters in the new password. +If you have less than or I upper case letters, each upper case letter will count +1 towards meeting +the current B value. The default for B is I<0> +which means there is no bonus for upper case letters in password. + +(N < 0) This is the minimum number of upper case letters that must be met for a new +password. + +=item BI + +(N >= 0) This is the maximum credit for having lower case letters in the new password. +If you have less than or I lower case letters, each lower case letter will count +1 towards meeting +the current B value. The default for B is I<0> +which means there is no bonus for lower case letters in password. + +(N < 0) This is the minimum number of lower case letters that must be met for a new +password. + +=item BI + +(N >= 0) This is the maximum credit for having other characters in the new password. +If you have less than or I other characters, each other character will count +1 towards meeting +the current B value. The default for B is I<0> +which means there is no bonus for other characters in password. + +(N < 0) This is the minimum number of other characters that must be met for a new +password. + +=item BI + +The minimum number of required classes of characters for the new password. +The four classes are digits, upper and lower letters and other characters. +The difference to the B check is that a specific class if of +characters is not required. Instead I out of four of the classes are +required. By default the check is disabled. + +=item BI + +Reject passwords which contain more than I same consecutive characters. +The default is 0 which means that this check is disabled. + +=item BI + +Reject passwords which contain monotonic character sequences longer than I. +The default is 0 which means that this check is disabled. +Examples of such sequence are '12345' or 'fedcb'. Note that +most such passwords will not pass the simplicity check unless the sequence +is only a minor part of the password. + +=item BI + +Reject passwords which contain more than I consecutive characters of the +same class. The default is 0 which means that this check is disabled. + +=item BI + +If nonzero, check whether the individual words longer than 3 characters +from the L GECOS field of the user are contained in the new +password. The default is 0 which means that this check is disabled. + +=item BI + +If nonzero, check whether the password (with possible modifications) +matches a word in a dictionary. Currently the dictionary check is performed +using the I library. The default is 1 which means that this check +is enabled. + +=item BI<< >> + +The words more than 3 characters long from this space separated list are +individually searched for and forbidden in the new password. +By default the list is empty which means that this check is disabled. + +=item BI + +This options allows for specification of non-default path to the cracklib +dictionaries. + +=item B + +The module will return error on failed check even if the user changing the +password is root. This option is off by default which means that just +the message about the failed check is printed but root can change +the password anyway. Note that root is not asked for an old password +so the checks that compare the old and new password are not performed. + +=item B + +The module will not test the password quality for users that are not present +in the F file. The module still asks for the password so +the following modules in the stack can use the B option. +This option is off by default. + +=item B + +This argument is used to I the module to not prompt the user for +a new password but use the one provided by the previously stacked +B module. + +=back + +=head1 MODULE TYPES PROVIDED + +Only the B module type is provided. + +=head1 RETURN VALUES + +=over 4 + +=item PAM_SUCCESS + +The new password passes all checks. + +=item PAM_AUTHTOK_ERR + +No new password was entered, the username could not be determined or the +new password fails the strength checks. + +=item PAM_AUTHTOK_RECOVERY_ERR + +The old password was not supplied by a previous stacked module or got not +requested from the user. The first error can happen if B +is specified. + +=item PAM_SERVICE_ERR + +A internal error occurred. + +=back + +=head1 EXAMPLES + +For an example of the use of this module, we show how it may be stacked +with the password component of L. + + # + # These lines stack two password type modules. In this example the + # user is given 3 opportunities to enter a strong password. The + # "use_authtok" argument ensures that the pam_unix module does not + # prompt for a password, but instead uses the one provided by + # pam_pwquality. + # + password required pam_pwquality.so retry=3 + password required pam_unix.so use_authtok + +Another example is for the case that you want to use sha256 password +encryption: + + # + # These lines allow modern systems to support passwords of at least 14 + # bytes with extra credit of 2 for digits and 2 for others the new + # password must have at least three bytes that are not present in the + # old password + # + password required pam_pwquality.so \ + difok=3 minlen=15 dcredit=2 ocredit=2 + password required pam_unix.so use_authtok nullok sha256 + +And here is another example in case you don't want to use credits: + + # + # These lines require the user to select a password with a minimum + # length of 8 and with at least 1 digit number, 1 upper case letter, + # and 1 other character + # + password required pam_pwquality.so \ + dcredit=-1 ucredit=-1 ocredit=-1 lcredit=0 minlen=8 + password required pam_unix.so use_authtok nullok sha256 + +=head1 SEE ALSO + +L, L, L, +L, L + +=head1 AUTHORS + +Tomas Mraz + +Original author of B module Cristian Gafton diff -Nru libpwquality-1.2.3/doc/man/pwmake.1 libpwquality-1.3.0/doc/man/pwmake.1 --- libpwquality-1.2.3/doc/man/pwmake.1 2011-11-10 13:43:44.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pwmake.1 2015-07-22 14:41:25.000000000 +0000 @@ -1,45 +1,116 @@ -.de FN -\fI\|\\$1\|\fP +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp .. -.TH PWMAKE 1 "10 Nov 2011" "Red Hat, Inc." -.SH NAME +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +. ds C` +. ds C' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" ======================================================================== +.\" +.IX Title "PWMAKE 1" +.TH PWMAKE 1 "2015-07-22" "Red Hat, Inc." "General Commands Manual" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" pwmake \- simple tool for generating random relatively easily pronounceable passwords -.SH SYNOPSIS -\fBpwmake\fR -.SH DESCRIPTION -\fBpwmake\fR is a simple configurable tool for generating random and relatively +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +\&\fBpwmake\fR \fI\fR +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +\&\fBpwmake\fR is a simple configurable tool for generating random and relatively easily pronounceable passwords. The tool allows you to specify the number of entropy bits that are used to generate the password. - -The entropy is pulled from \fB/dev/urandom\fR. - -The minimum number of bits is \fB56\fR which is usable for passwords on +.PP +The entropy is pulled from \fI/dev/urandom\fR. +.PP +The minimum number of bits is \fI56\fR which is usable for passwords on systems/services where brute force attacks are of very limited rate of tries. -The \fB64\fR bits should be adequate for applications where the attacker +The \fI64\fR bits should be adequate for applications where the attacker does not have direct access to the password hash file. For situations where the attacker might obtain the direct access to the password hash or the -password is used as an encryption key \fB80\fR to \fB128\fR bits should be +password is used as an encryption key \fI80\fR to \fI128\fR bits should be used depending on your level of paranoia. - -.PD -.SH OPTIONS +.SH "OPTIONS" +.IX Header "OPTIONS" The first and only argument is the number of bits of entropy used to generate the password. - -.SH FILES -\fB/etc/security/pwquality.conf\fR - The configuration file for the libpwquality +.SH "FILES" +.IX Header "FILES" +\&\fI/etc/security/pwquality.conf\fR \- The configuration file for the libpwquality library. - -.PD .SH "RETURN CODES" -\fBpwmake\fR returns 0 on success, non zero on error. - -.PD +.IX Header "RETURN CODES" +\&\fBpwmake\fR returns 0 on success, non zero on error. .SH "SEE ALSO" -pwscore(1), pam_pwquality(8) - -.SH AUTHORS -.nf +.IX Header "SEE ALSO" +\&\fIpwscore\fR\|(1), \fIpam_pwquality\fR\|(8) +.SH "AUTHORS" +.IX Header "AUTHORS" Tomas Mraz -.fi diff -Nru libpwquality-1.2.3/doc/man/pwmake.1.pod libpwquality-1.3.0/doc/man/pwmake.1.pod --- libpwquality-1.2.3/doc/man/pwmake.1.pod 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pwmake.1.pod 2015-07-22 13:57:24.000000000 +0000 @@ -0,0 +1,48 @@ +=pod + +=head1 NAME + +B - simple tool for generating random relatively easily pronounceable +passwords + +=head1 SYNOPSIS + +B I<< >> + +=head1 DESCRIPTION + +B is a simple configurable tool for generating random and relatively +easily pronounceable passwords. The tool allows you to specify the number of +entropy bits that are used to generate the password. + +The entropy is pulled from F. + +The minimum number of bits is I<56> which is usable for passwords on +systems/services where brute force attacks are of very limited rate of tries. +The I<64> bits should be adequate for applications where the attacker +does not have direct access to the password hash file. For situations where +the attacker might obtain the direct access to the password hash or the +password is used as an encryption key I<80> to I<128> bits should be +used depending on your level of paranoia. + +=head1 OPTIONS + +The first and only argument is the number of bits of entropy used to generate +the password. + +=head1 FILES + +F - The configuration file for the libpwquality +library. + +=head1 RETURN CODES + +B returns 0 on success, non zero on error. + +=head1 SEE ALSO + +L, L + +=head1 AUTHORS + +Tomas Mraz diff -Nru libpwquality-1.2.3/doc/man/pwquality.3 libpwquality-1.3.0/doc/man/pwquality.3 --- libpwquality-1.2.3/doc/man/pwquality.3 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pwquality.3 2015-07-22 16:53:23.000000000 +0000 @@ -0,0 +1,201 @@ +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +. ds C` +. ds C' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" ======================================================================== +.\" +.IX Title "PWQUALITY 5" +.TH PWQUALITY 5 "2015-07-22" "Red Hat, Inc." "Libpwquality API Manual" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" +pwquality \- Documentation of the libpwquality API +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +.Vb 1 +\& #include +\& +\& pwquality_settings_t *pwquality_default_settings(void); +\& void pwquality_free_settings(pwquality_settings_t *pwq); +\& +\& int pwquality_read_config(pwquality_settings_t *pwq, const char *cfgfile, +\& void **auxerror); +\& +\& int pwquality_set_option(pwquality_settings_t *pwq, const char *option); +\& int pwquality_set_int_value(pwquality_settings_t *pwq, int setting, int value); +\& int pwquality_set_str_value(pwquality_settings_t *pwq, int setting, +\& const char *value); +\& int pwquality_get_int_value(pwquality_settings_t *pwq, int setting, int *value); +\& int pwquality_get_str_value(pwquality_settings_t *pwq, int setting, const char **value); +\& +\& int pwquality_generate(pwquality_settings_t *pwq, int entropy_bits, +\& char **password); +\& +\& int pwquality_check(pwquality_settings_t *pwq, const char *password, +\& const char *oldpassword, const char *user, void **auxerror); +\& +\& const char *pwquality_strerror(char *buf, size_t len, int errcode, void *auxerror); +.Ve +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +Function \fI\fIpwquality_default_settings()\fI\fR allocates and returns default pwquality settings +to be used in other library calls. The allocated opaque structure has to be freed +with the \fI\fIpwquality_free_settings()\fI\fR call. +.PP +The \fI\fIpwquality_read_config()\fI\fR parses the configuration file (if \fBcfgfile\fR is \s-1NULL\s0 +then the default one). If \fBauxerror\fR is not \s-1NULL\s0 it also possibly returns auxiliary +error information that must be passed into \fI\fIpwquality_strerror()\fI\fR function. +.IP "\fBNew in 1.3.0:\fR" 4 +.IX Item "New in 1.3.0:" +The library first tries to parse all \fI*.conf\fR configuration files from +\&\fI.d\fR directory if it exists. Order of parsing determines what values will +be in effect \- the latest wins. +.PP +Function \fI\fIpwquality_set_option()\fI\fR is useful for setting the options as configured +on a pam module command line in form of =. +.PP +Getter and setter functions for the individual integer and string setting values are: +\&\fI\fIpwquality_set_int_value()\fI\fR, \fI\fIpwquality_set_str_value()\fI\fR, +\&\fI\fIpwquality_get_int_value()\fI\fR, and \fI\fIpwquality_get_str_value()\fI\fR. In case of the +string getter the caller must copy the string before another calls that can +manipulate the \fBpwq\fR settings object. +.PP +The \fI\fIpwquality_generate()\fI\fR function generates a random password of \fBentropy_bits\fR entropy +and check it according to the settings. The \fB*password\fR is allocated on heap by the +library. +.PP +The \fI\fIpwquality_check()\fI\fR function checks the \fBpassword\fR according to the settings. It +returns either score <0\-100>, negative error number, and possibly also auxiliary error +information that must be passed into \fI\fIpwquality_strerror()\fI\fR function. +The \fBoldpassword\fR is optional and can be \s-1NULL.\s0 +The \fBuser\fR is used for checking the \fBpassword\fR against the user name +and potentially other \fIpasswd\fR\|(5) information and can be \s-1NULL.\s0 +The \fBauxerror\fR can be \s-1NULL \-\s0 in that case the auxiliary error information +is not returned. +However if it is non-NULL not passing the returned \fB*auxerror\fR into +\&\fI\fIpwquality_strerror()\fI\fR can lead to memory leaks. +The score depends on value of the setting \fB\s-1PWQ_SETTING_MIN_LENGTH\s0\fR. If it is +set higher, the score for the same passwords will be lower. +.PP +Function \fI\fIpwquality_strerror()\fI\fR translates the \fBerrcode\fR and \fBauxerror\fR auxiliary +data into localized text message. If \fBbuf\fR is \s-1NULL\s0 the function uses an internal static +buffer which makes the function non-reentrant in that case. The returned pointer is not +guaranteed to point to the \fBbuf\fR. +.SH "RETURN VALUES" +.IX Header "RETURN VALUES" +In general the functions which return \fBint\fR return 0 as success value and negative values +as concrete \fB\s-1PWQ_ERROR\s0\fR error code. \fI\fIpwquality_strerror()\fI\fR does not allocate data +and so it cannot fail. +.PP +The returned positive or zero score from \fI\fIpwquality_check()\fI\fR should not be used for +rejection of passwords, it should be used only as approximate indicator of entropy present +in the password with values such as 0\-30 being low, 30\-60 medium, and 60\-100 high. +.SH "EXAMPLE" +.IX Header "EXAMPLE" +Typical use of the libpwquality \s-1API:\s0 +.PP +.Vb 1 +\& #include +\& +\& ... +\& +\& pwquality_settings_t *pwq; +\& int rv; +\& void *auxerror; +\& char buf[1024]; +\& +\& pwq = pwquality_default_settings(); +\& if (pwq == NULL) { +\& fprintf(stderr, "Error: %s\en", pwquality_strerror(buf, sizeof(buf), PWQ_ERROR_MEM_ALLOC, NULL)); +\& return \-1; +\& } +\& +\& if ((rv=pwquality_read_config(pwq, NULL, &auxerror)) != 0) { +\& pwquality_free_settings(pwq); +\& fprintf(stderr, "Error: %s\en", pwquality_strerror(buf, sizeof(buf), rv, auxerror)); +\& return \-1; +\& } +\& +\& rv = pwquality_check(pwq, buf, NULL, user, &auxerror); +\& pwquality_free_settings(pwq); +\& +\& if (rv >= 0) { +\& fprintf(stderr, "Password entropy score is: %d\en", rv); +\& } else { +\& fprintf(stderr, "Password is rejected with error: %s\en", pwquality_strerror(buf, sizeof(buf), rv, auxerror)); +\& } +.Ve +.SH "SEE ALSO" +.IX Header "SEE ALSO" +\&\fIpwquality.conf\fR\|(5) +.SH "AUTHORS" +.IX Header "AUTHORS" +Tomas Mraz diff -Nru libpwquality-1.2.3/doc/man/pwquality.3.pod libpwquality-1.3.0/doc/man/pwquality.3.pod --- libpwquality-1.2.3/doc/man/pwquality.3.pod 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pwquality.3.pod 2015-07-22 16:51:34.000000000 +0000 @@ -0,0 +1,133 @@ +=pod + +=head1 NAME + +pwquality - Documentation of the libpwquality API + +=head1 SYNOPSIS + + #include + + pwquality_settings_t *pwquality_default_settings(void); + void pwquality_free_settings(pwquality_settings_t *pwq); + + int pwquality_read_config(pwquality_settings_t *pwq, const char *cfgfile, + void **auxerror); + + int pwquality_set_option(pwquality_settings_t *pwq, const char *option); + int pwquality_set_int_value(pwquality_settings_t *pwq, int setting, int value); + int pwquality_set_str_value(pwquality_settings_t *pwq, int setting, + const char *value); + int pwquality_get_int_value(pwquality_settings_t *pwq, int setting, int *value); + int pwquality_get_str_value(pwquality_settings_t *pwq, int setting, const char **value); + + int pwquality_generate(pwquality_settings_t *pwq, int entropy_bits, + char **password); + + int pwquality_check(pwquality_settings_t *pwq, const char *password, + const char *oldpassword, const char *user, void **auxerror); + + const char *pwquality_strerror(char *buf, size_t len, int errcode, void *auxerror); + +=head1 DESCRIPTION + +Function I allocates and returns default pwquality settings +to be used in other library calls. The allocated opaque structure has to be freed +with the I call. + +The I parses the configuration file (if B is NULL +then the default one). If B is not NULL it also possibly returns auxiliary +error information that must be passed into I function. + +=over 4 + +=item B + +The library first tries to parse all F<*.conf> configuration files from +F<< .d >> directory if it exists. Order of parsing determines what values will +be in effect - the latest wins. + +=back + +Function I is useful for setting the options as configured +on a pam module command line in form of =. + +Getter and setter functions for the individual integer and string setting values are: +I, I, +I, and I. In case of the +string getter the caller must copy the string before another calls that can +manipulate the B settings object. + +The I function generates a random password of B entropy +and check it according to the settings. The B<*password> is allocated on heap by the +library. + +The I function checks the B according to the settings. It +returns either score <0-100>, negative error number, and possibly also auxiliary error +information that must be passed into I function. +The B is optional and can be NULL. +The B is used for checking the B against the user name +and potentially other L information and can be NULL. +The B can be NULL - in that case the auxiliary error information +is not returned. +However if it is non-NULL not passing the returned B<*auxerror> into +I can lead to memory leaks. +The score depends on value of the setting B. If it is +set higher, the score for the same passwords will be lower. + +Function I translates the B and B auxiliary +data into localized text message. If B is NULL the function uses an internal static +buffer which makes the function non-reentrant in that case. The returned pointer is not +guaranteed to point to the B. + +=head1 RETURN VALUES + +In general the functions which return B return 0 as success value and negative values +as concrete B error code. I does not allocate data +and so it cannot fail. + +The returned positive or zero score from I should not be used for +rejection of passwords, it should be used only as approximate indicator of entropy present +in the password with values such as 0-30 being low, 30-60 medium, and 60-100 high. + +=head1 EXAMPLE + +Typical use of the libpwquality API: + + #include + + ... + + pwquality_settings_t *pwq; + int rv; + void *auxerror; + char buf[1024]; + + pwq = pwquality_default_settings(); + if (pwq == NULL) { + fprintf(stderr, "Error: %s\n", pwquality_strerror(buf, sizeof(buf), PWQ_ERROR_MEM_ALLOC, NULL)); + return -1; + } + + if ((rv=pwquality_read_config(pwq, NULL, &auxerror)) != 0) { + pwquality_free_settings(pwq); + fprintf(stderr, "Error: %s\n", pwquality_strerror(buf, sizeof(buf), rv, auxerror)); + return -1; + } + + rv = pwquality_check(pwq, buf, NULL, user, &auxerror); + pwquality_free_settings(pwq); + + if (rv >= 0) { + fprintf(stderr, "Password entropy score is: %d\n", rv); + } else { + fprintf(stderr, "Password is rejected with error: %s\n", pwquality_strerror(buf, sizeof(buf), rv, auxerror)); + } + +=head1 SEE ALSO + +L + +=head1 AUTHORS + +Tomas Mraz diff -Nru libpwquality-1.2.3/doc/man/pwquality.conf.5 libpwquality-1.3.0/doc/man/pwquality.conf.5 --- libpwquality-1.2.3/doc/man/pwquality.conf.5 2013-01-03 10:04:20.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pwquality.conf.5 2015-07-22 14:41:25.000000000 +0000 @@ -1,122 +1,175 @@ +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +. ds C` +. ds C' +'br\} +.\" .\" Escape single quotes in literal strings from groff's Unicode transform. .ie \n(.g .ds Aq \(aq .el .ds Aq ' -.de FN -\fI\|\\$1\|\fP +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" .. -.TH PWQUALITY.CONF 5 "10 Nov 2011" "Red Hat, Inc." -.SH NAME +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" ======================================================================== +.\" +.IX Title "PWQUALITY.CONF 5" +.TH PWQUALITY.CONF 5 "2015-07-22" "Red Hat, Inc." "File Formats Manual" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" pwquality.conf \- configuration for the libpwquality library -.SH SYNOPSIS -\fB/etc/security/pwquality.conf\fR -.SH DESCRIPTION -\fBpwquality.conf\fR provides a way to configure the default password +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +\&\fI/etc/security/pwquality.conf\fR +.PP +\&\fI/etc/security/pwquality.conf.d/*.conf\fR +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +\&\fBpwquality.conf\fR provides a way to configure the default password quality requirements for the system passwords. This file is read by the libpwquality library and utilities that use this library for checking and generating passwords. - +.PP The file has a very simple \fIname = value\fR format with possible comments -starting with \fB#\fR character. The whitespace at the beginning of line, end -of line, and around the \fB=\fR sign is ignored. - -.PD -.SH OPTIONS -The possible options in the file are: -.RS 4 +starting with \f(CW\*(C`#\*(C'\fR character. The whitespace at the beginning of line, end +of line, and around the \f(CW\*(C`=\*(C'\fR sign is ignored. .PP -\fBdifok\fR -.RS 4 +The libpwquality library also first reads all \fI*.conf\fR files from the +\&\fI/etc/security/pwquality.conf.d\fR directory in \s-1ASCII\s0 sorted order. The +values of the same settings are overriden in the order the files are parsed. +.SH "OPTIONS" +.IX Header "OPTIONS" +The possible options in the file are: +.IP "\fBdifok\fR" 4 +.IX Item "difok" Number of characters in the new password that must not be present in the -old password. (default 5) -.RE -.PP -\fBminlen\fR -.RS 4 +old password. (default 1) +.IP "\fBminlen\fR" 4 +.IX Item "minlen" Minimum acceptable size for the new password (plus one if credits are not -disabled which is the default). (See \fIpam_pwquality(8)\fR.) -Cannot be set to lower value than 6. (default 9) -.RE -.PP -\fBdcredit\fR -.RS 4 +disabled which is the default). (See \fIpam_pwquality\fR\|(8).) +Cannot be set to lower value than 6. (default 8) +.IP "\fBdcredit\fR" 4 +.IX Item "dcredit" The maximum credit for having digits in the new password. If less than 0 -it is the minimum number of digits in the new password. (default 1) -.RE -.PP -\fBucredit\fR -.RS 4 +it is the minimum number of digits in the new password. (default 0) +.IP "\fBucredit\fR" 4 +.IX Item "ucredit" The maximum credit for having uppercase characters in the new password. If less than 0 it is the minimum number of uppercase characters in the new -password. (default 1) -.RE -.PP -\fBlcredit\fR -.RS 4 +password. (default 0) +.IP "\fBlcredit\fR" 4 +.IX Item "lcredit" The maximum credit for having lowercase characters in the new password. If less than 0 it is the minimum number of lowercase characters in the new -password. (default 1) -.RE -.PP -\fBocredit\fR -.RS 4 +password. (default 0) +.IP "\fBocredit\fR" 4 +.IX Item "ocredit" The maximum credit for having other characters in the new password. If less than 0 it is the minimum number of other characters in the new -password. (default 1) -.RE -.PP -\fBminclass\fR -.RS 4 +password. (default 0) +.IP "\fBminclass\fR" 4 +.IX Item "minclass" The minimum number of required classes of characters for the new password (digits, uppercase, lowercase, others). (default 0) -.RE -.PP -\fBmaxrepeat\fR -.RS 4 +.IP "\fBmaxrepeat\fR" 4 +.IX Item "maxrepeat" The maximum number of allowed same consecutive characters in the new password. The check is disabled if the value is 0. (default 0) -.RE -.PP -\fBmaxsequence\fR -.RS 4 +.IP "\fBmaxsequence\fR" 4 +.IX Item "maxsequence" The maximum length of monotonic character sequences in the new password. -Examples of such sequence are \*(Aq12345\*(Aq or \*(Aqfedcb\*(Aq\&. Note +Examples of such sequence are '12345' or 'fedcb'. Note that most such passwords will not pass the simplicity check unless the sequence is only a minor part of the password. -The check is disabled if the value is 0. (default 0) -.RE -.PP -\fBmaxclassrepeat\fR -.RS 4 +The check is disabled if the value is 0. (default 0) +.IP "\fBmaxclassrepeat\fR" 4 +.IX Item "maxclassrepeat" The maximum number of allowed consecutive characters of the same class in the new password. The check is disabled if the value is 0. (default 0) -.RE -.PP -\fBgecoscheck\fR -.RS 4 -If nonzero, check whether the words longer than 3 characters from the GECOS -field of the user's passwd entry are contained in the new password. +.IP "\fBgecoscheck\fR" 4 +.IX Item "gecoscheck" +If nonzero, check whether the words longer than 3 characters from the \fI\s-1GECOS\s0\fR +field of the user's \fIpasswd\fR\|(5) entry are contained in the new password. The check is disabled if the value is 0. (default 0) -.RE -.PP -\fBbadwords\fR -.RS 4 +.IP "\fBdictcheck\fR" 4 +.IX Item "dictcheck" +If nonzero, check whether the password (with possible modifications) +matches a word in a dictionary. Currently the dictionary check is performed +using the cracklib library. (default 1) +.IP "\fBbadwords\fR" 4 +.IX Item "badwords" Space separated list of words that must not be contained in the password. These are additional words to the cracklib dictionary check. This setting can be also used by applications to emulate the gecos check for user accounts that are not created yet. -.RE -.PP -\fBdictpath\fR -.RS 4 +.IP "\fBdictpath\fR" 4 +.IX Item "dictpath" Path to the cracklib dictionaries. Default is to use the cracklib default. -.RE - -.PD .SH "SEE ALSO" -pwscore(1), pwmake(1), pam_pwquality(8) - -.SH AUTHORS -.nf +.IX Header "SEE ALSO" +\&\fIpwscore\fR\|(1), \fIpwmake\fR\|(1), \fIpam_pwquality\fR\|(8) +.SH "AUTHORS" +.IX Header "AUTHORS" Tomas Mraz -.fi diff -Nru libpwquality-1.2.3/doc/man/pwquality.conf.5.pod libpwquality-1.3.0/doc/man/pwquality.conf.5.pod --- libpwquality-1.2.3/doc/man/pwquality.conf.5.pod 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pwquality.conf.5.pod 2015-07-22 14:36:13.000000000 +0000 @@ -0,0 +1,123 @@ +=pod + +=head1 NAME + +pwquality.conf - configuration for the libpwquality library + +=head1 SYNOPSIS + +F + +F + +=head1 DESCRIPTION + +B provides a way to configure the default password +quality requirements for the system passwords. This file is read by the +libpwquality library and utilities that use this library for checking +and generating passwords. + +The file has a very simple I format with possible comments +starting with C<#> character. The whitespace at the beginning of line, end +of line, and around the C<=> sign is ignored. + +The libpwquality library also first reads all F<*.conf> files from the +F directory in ASCII sorted order. The +values of the same settings are overriden in the order the files are parsed. + +=head1 OPTIONS + +The possible options in the file are: + +=over 4 + +=item B + +Number of characters in the new password that must not be present in the +old password. (default 1) + +=item B + +Minimum acceptable size for the new password (plus one if credits are not +disabled which is the default). (See L.) +Cannot be set to lower value than 6. (default 8) + +=item B + +The maximum credit for having digits in the new password. If less than 0 +it is the minimum number of digits in the new password. (default 0) + +=item B + +The maximum credit for having uppercase characters in the new password. +If less than 0 it is the minimum number of uppercase characters in the new +password. (default 0) + +=item B + +The maximum credit for having lowercase characters in the new password. +If less than 0 it is the minimum number of lowercase characters in the new +password. (default 0) + +=item B + +The maximum credit for having other characters in the new password. +If less than 0 it is the minimum number of other characters in the new +password. (default 0) + +=item B + +The minimum number of required classes of characters for the new +password (digits, uppercase, lowercase, others). (default 0) + +=item B + +The maximum number of allowed same consecutive characters in the new password. +The check is disabled if the value is 0. (default 0) + +=item B + +The maximum length of monotonic character sequences in the new password. +Examples of such sequence are '12345' or 'fedcb'. Note +that most such passwords will not pass the simplicity check unless +the sequence is only a minor part of the password. +The check is disabled if the value is 0. (default 0) + +=item B + +The maximum number of allowed consecutive characters of the same class in the +new password. +The check is disabled if the value is 0. (default 0) + +=item B + +If nonzero, check whether the words longer than 3 characters from the I +field of the user's L entry are contained in the new password. +The check is disabled if the value is 0. (default 0) + +=item B + +If nonzero, check whether the password (with possible modifications) +matches a word in a dictionary. Currently the dictionary check is performed +using the cracklib library. (default 1) + +=item B + +Space separated list of words that must not be contained in the password. These +are additional words to the cracklib dictionary check. This setting can be +also used by applications to emulate the gecos check for user accounts that are +not created yet. + +=item B + +Path to the cracklib dictionaries. Default is to use the cracklib default. + +=back + +=head1 SEE ALSO + +L, L, L + +=head1 AUTHORS + +Tomas Mraz diff -Nru libpwquality-1.2.3/doc/man/pwscore.1 libpwquality-1.3.0/doc/man/pwscore.1 --- libpwquality-1.2.3/doc/man/pwscore.1 2012-05-23 19:20:04.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pwscore.1 2015-07-22 14:41:25.000000000 +0000 @@ -1,48 +1,119 @@ -.de FN -\fI\|\\$1\|\fP +.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29) +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp .. -.TH PWSCORE 1 "10 Nov 2011" "Red Hat, Inc." -.SH NAME +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. \*(C+ will +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff, +.\" nothing in troff, for use with C<>. +.tr \(*W- +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +. ds C` +. ds C' +'br\} +.\" +.\" Escape single quotes in literal strings from groff's Unicode transform. +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.\" +.\" Avoid warning from groff about undefined register 'F'. +.de IX +.. +.nr rF 0 +.if \n(.g .if rF .nr rF 1 +.if (\n(rF:(\n(.g==0)) \{ +. if \nF \{ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. if !\nF==2 \{ +. nr % 0 +. nr F 2 +. \} +. \} +.\} +.rr rF +.\" ======================================================================== +.\" +.IX Title "PWSCORE 1" +.TH PWSCORE 1 "2015-07-22" "Red Hat, Inc." "General Commands Manual" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.if n .ad l +.nh +.SH "NAME" pwscore \- simple configurable tool for checking quality of a password -.SH SYNOPSIS -\fBpwscore\fR [user] -.SH DESCRIPTION -\fBpwscore\fR is a simple tool for checking quality of a password. The password +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +\&\fBpwscore\fR [\fIuser\fR] +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +\&\fBpwscore\fR is a simple tool for checking quality of a password. The password is read from stdin. - +.PP The tool uses the \fBlibpwquality\fR library to perform configurable checks for minimum length, dictionary checking against cracklib dictionaries, and other checks. - +.PP It either reports an error if the password fails any of the checks, or it -prints out the password quality score as an integer value between \fB0\fR and -\fB100\fR. - +prints out the password quality score as an integer value between \fI0\fR and +\&\fI100\fR. +.PP The password quality score is relative to the \fBminlen\fR setting in the configuration file. But in general values below 50 can be treated as moderate quality and above it fairly strong quality. Any password that passes the quality checks (especially the mandatory cracklib check) should withstand dictionary attacks and scores above 50 with the default minlen setting even fast brute force attacks. - -.PD -.SH OPTIONS +.SH "OPTIONS" +.IX Header "OPTIONS" The first and only optional argument is the user name that is used to check the similarity of the password to the username. - -.SH FILES -\fB/etc/security/pwquality.conf\fR - The configuration file for the libpwquality +.SH "FILES" +.IX Header "FILES" +\&\fI/etc/security/pwquality.conf\fR \- The configuration file for the libpwquality library. - -.PD .SH "RETURN CODES" -\fBpwscore\fR returns 0 on success, non zero on error. - -.PD +.IX Header "RETURN CODES" +\&\fBpwscore\fR returns 0 on success, non zero on error. .SH "SEE ALSO" -pwscore(1), pwquality.conf(5), pam_pwquality(8) - -.SH AUTHORS -.nf +.IX Header "SEE ALSO" +\&\fIpwscore\fR\|(1), \fIpwquality.conf\fR\|(5), \fIpam_pwquality\fR\|(8) +.SH "AUTHORS" +.IX Header "AUTHORS" Tomas Mraz -.fi diff -Nru libpwquality-1.2.3/doc/man/pwscore.1.pod libpwquality-1.3.0/doc/man/pwscore.1.pod --- libpwquality-1.2.3/doc/man/pwscore.1.pod 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/doc/man/pwscore.1.pod 2015-07-22 14:21:19.000000000 +0000 @@ -0,0 +1,51 @@ +=pod + +=head1 NAME + +pwscore - simple configurable tool for checking quality of a password + +=head1 SYNOPSIS + +B [I] + +=head1 DESCRIPTION + +B is a simple tool for checking quality of a password. The password +is read from stdin. + +The tool uses the B library to perform configurable checks +for minimum length, dictionary checking against cracklib dictionaries, +and other checks. + +It either reports an error if the password fails any of the checks, or it +prints out the password quality score as an integer value between I<0> and +I<100>. + +The password quality score is relative to the B setting in the +configuration file. But in general values below 50 can be treated as moderate +quality and above it fairly strong quality. Any password that passes the quality +checks (especially the mandatory cracklib check) should withstand dictionary +attacks and scores above 50 with the default minlen setting even fast brute +force attacks. + +=head1 OPTIONS + +The first and only optional argument is the user name that is used to check +the similarity of the password to the username. + +=head1 FILES + +F - The configuration file for the libpwquality +library. + +=head1 RETURN CODES + +B returns 0 on success, non zero on error. + +=head1 SEE ALSO + +L, L, L + +=head1 AUTHORS + +Tomas Mraz diff -Nru libpwquality-1.2.3/libpwquality.spec libpwquality-1.3.0/libpwquality.spec --- libpwquality-1.2.3/libpwquality.spec 2013-09-12 11:24:11.000000000 +0000 +++ libpwquality-1.3.0/libpwquality.spec 2015-07-23 11:55:11.000000000 +0000 @@ -1,6 +1,6 @@ Summary: A library for password generation and password quality checking Name: libpwquality -Version: 1.2.3 +Version: 1.3.0 Release: 1%{?dist} # The package is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. @@ -18,11 +18,12 @@ BuildRequires: gettext BuildRequires: pam-devel BuildRequires: python2-devel +BuildRequires: python3-devel URL: http://libpwquality.fedorahosted.org/ # we don't want to provide private python extension libs -%define __provides_exclude_from ^%{python_sitearch}/.*\.so$. +%define __provides_exclude_from ^(%{python_sitearch}|%{python3_sitearch})/.*\.so$. %description This is a library for password quality checks and generation @@ -52,20 +53,49 @@ for easy password quality checking and generation of random pronounceable passwords from Python applications. +%package -n python3-pwquality +Group: Development/Libraries +Summary: Python bindings for the libpwquality library +Requires: libpwquality%{?_isa} = %{version}-%{release} + +%description -n python3-pwquality +This is pwquality Python module that provides Python bindings +for the libpwquality library. These bindings can be used +for easy password quality checking and generation of random +pronounceable passwords from Python applications. + %prep %setup -q +rm -rf %{py3dir} +cp -a . %{py3dir} + %build %configure \ --with-securedir=%{_moduledir} \ --with-pythonsitedir=%{python_sitearch} \ + --with-python-binary=%{__python2} \ --disable-static make %{?_smp_mflags} +pushd %{py3dir} +%configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ + --with-python-binary=%{__python3} \ + --disable-static + +make %{?_smp_mflags} +popd + %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +pushd %{py3dir} +make -C python install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +popd + %if "%{_pwqlibdir}" != "%{_libdir}" pushd $RPM_BUILD_ROOT%{_libdir} mv libpwquality.so.* $RPM_BUILD_ROOT%{_pwqlibdir} @@ -75,6 +105,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_moduledir}/*.la +mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d + %find_lang libpwquality %check @@ -86,12 +118,15 @@ %files -f libpwquality.lang %defattr(-,root,root,-) -%doc COPYING README NEWS AUTHORS +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc README NEWS AUTHORS %{_bindir}/pwmake %{_bindir}/pwscore %{_moduledir}/pam_pwquality.so %{_pwqlibdir}/libpwquality.so.* %config(noreplace) %{_secconfdir}/pwquality.conf +%{_secconfdir}/pwquality.conf.d %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* @@ -101,12 +136,29 @@ %{_includedir}/pwquality.h %{_libdir}/libpwquality.so %{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/* %files -n python-pwquality %defattr(-,root,root,-) %{python_sitearch}/pwquality.so +%{python_sitearch}/*.egg-info + +%files -n python3-pwquality +%defattr(-,root,root,-) +%{python3_sitearch}/*.so +%{python3_sitearch}/*.egg-info %changelog +* Thu Jul 23 2015 Tomáš Mráz 1.3.0-1 +- Change the defaults for credits, difok, and minlen +- Make the cracklib check optional but on by default +- Add implicit support for parsing .d/*.conf files +- Add libpwquality API manual page + +* Wed Aug 6 2014 Tomáš Mráz 1.2.4-1 +- fix license handling (by Tom Callaway) +- add Python3 module subpackage + * Thu Sep 12 2013 Tomáš Mráz 1.2.3-1 - fix problem with parsing the pam_pwquality options patch by Vladimir Sorokin. diff -Nru libpwquality-1.2.3/libpwquality.spec.in libpwquality-1.3.0/libpwquality.spec.in --- libpwquality-1.2.3/libpwquality.spec.in 2013-09-12 11:22:42.000000000 +0000 +++ libpwquality-1.3.0/libpwquality.spec.in 2015-07-23 11:55:03.000000000 +0000 @@ -18,11 +18,12 @@ BuildRequires: gettext BuildRequires: pam-devel BuildRequires: python2-devel +BuildRequires: python3-devel URL: http://libpwquality.fedorahosted.org/ # we don't want to provide private python extension libs -%define __provides_exclude_from ^%{python_sitearch}/.*\.so$. +%define __provides_exclude_from ^(%{python_sitearch}|%{python3_sitearch})/.*\.so$. %description This is a library for password quality checks and generation @@ -52,20 +53,49 @@ for easy password quality checking and generation of random pronounceable passwords from Python applications. +%package -n python3-pwquality +Group: Development/Libraries +Summary: Python bindings for the libpwquality library +Requires: libpwquality%{?_isa} = %{version}-%{release} + +%description -n python3-pwquality +This is pwquality Python module that provides Python bindings +for the libpwquality library. These bindings can be used +for easy password quality checking and generation of random +pronounceable passwords from Python applications. + %prep %setup -q +rm -rf %{py3dir} +cp -a . %{py3dir} + %build %configure \ --with-securedir=%{_moduledir} \ --with-pythonsitedir=%{python_sitearch} \ + --with-python-binary=%{__python2} \ --disable-static make %{?_smp_mflags} +pushd %{py3dir} +%configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ + --with-python-binary=%{__python3} \ + --disable-static + +make %{?_smp_mflags} +popd + %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +pushd %{py3dir} +make -C python install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +popd + %if "%{_pwqlibdir}" != "%{_libdir}" pushd $RPM_BUILD_ROOT%{_libdir} mv libpwquality.so.* $RPM_BUILD_ROOT%{_pwqlibdir} @@ -75,6 +105,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_moduledir}/*.la +mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d + %find_lang libpwquality %check @@ -86,12 +118,15 @@ %files -f libpwquality.lang %defattr(-,root,root,-) -%doc COPYING README NEWS AUTHORS +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc README NEWS AUTHORS %{_bindir}/pwmake %{_bindir}/pwscore %{_moduledir}/pam_pwquality.so %{_pwqlibdir}/libpwquality.so.* %config(noreplace) %{_secconfdir}/pwquality.conf +%{_secconfdir}/pwquality.conf.d %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* @@ -101,12 +136,29 @@ %{_includedir}/pwquality.h %{_libdir}/libpwquality.so %{_libdir}/pkgconfig/*.pc +%{_mandir}/man3/* %files -n python-pwquality %defattr(-,root,root,-) %{python_sitearch}/pwquality.so +%{python_sitearch}/*.egg-info + +%files -n python3-pwquality +%defattr(-,root,root,-) +%{python3_sitearch}/*.so +%{python3_sitearch}/*.egg-info %changelog +* Thu Jul 23 2015 Tomáš Mráz 1.3.0-1 +- Change the defaults for credits, difok, and minlen +- Make the cracklib check optional but on by default +- Add implicit support for parsing .d/*.conf files +- Add libpwquality API manual page + +* Wed Aug 6 2014 Tomáš Mráz 1.2.4-1 +- fix license handling (by Tom Callaway) +- add Python3 module subpackage + * Thu Sep 12 2013 Tomáš Mráz 1.2.3-1 - fix problem with parsing the pam_pwquality options patch by Vladimir Sorokin. diff -Nru libpwquality-1.2.3/ltmain.sh libpwquality-1.3.0/ltmain.sh --- libpwquality-1.2.3/ltmain.sh 2013-09-12 11:10:31.000000000 +0000 +++ libpwquality-1.3.0/ltmain.sh 2015-04-08 08:44:04.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8058,11 +8078,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru libpwquality-1.2.3/m4/gettext.m4 libpwquality-1.3.0/m4/gettext.m4 --- libpwquality-1.2.3/m4/gettext.m4 2012-11-07 13:11:58.000000000 +0000 +++ libpwquality-1.3.0/m4/gettext.m4 2014-08-06 12:39:16.000000000 +0000 @@ -1,5 +1,5 @@ -# gettext.m4 serial 53 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# gettext.m4 serial 66 (gettext-0.18.2) +dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2005. +dnl Bruno Haible , 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. @@ -35,7 +35,7 @@ dnl 'need-formatstring-macros', then GNU gettext implementations that don't dnl support the ISO C 99 formatstring macros will be ignored. dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. +dnl the value '$(top_builddir)/intl/' is used. dnl dnl The result of the configuration is one of three cases: dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled @@ -60,11 +60,18 @@ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) - define([gt_included_intl], ifelse([$1], [external], [no], [yes])) + define([gt_included_intl], + ifelse([$1], [external], + ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), + [yes])) define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) + gt_NEEDS_INIT + AM_GNU_GETTEXT_NEED([$2]) AC_REQUIRE([AM_PO_SUBDIRS])dnl ifelse(gt_included_intl, yes, [ @@ -78,7 +85,7 @@ dnl Sometimes libintl requires libiconv, so first search for libiconv. dnl Ideally we would do this search only after the dnl if test "$USE_NLS" = "yes"; then - dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT dnl the configure script would need to contain the same shell code dnl again, outside any 'if'. There are two solutions: @@ -90,7 +97,7 @@ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) ]) - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. + dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. gt_INTL_MACOSX dnl Set USE_NLS. @@ -104,16 +111,25 @@ LTLIBINTL= POSUB= + dnl Add a version number to the cache macros. + case " $gt_needs " in + *" need-formatstring-macros "*) gt_api_version=3 ;; + *" need-ngettext "*) gt_api_version=2 ;; + *) gt_api_version=1 ;; + esac + gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" + gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" + dnl If we use NLS figure out what method if test "$USE_NLS" = "yes"; then gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then @@ -122,26 +138,41 @@ dnl to use. If GNU gettext is available we use this. Else we have dnl to fall back to GNU NLS library. - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1))) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION + if test $gt_api_version -ge 3; then + gt_revision_test_code=' +#ifndef __GNU_GETTEXT_SUPPORTED_REVISION #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) #endif +changequote(,)dnl typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) +changequote([,])dnl +' + else + gt_revision_test_code= + fi + if test $gt_api_version -ge 2; then + gt_expression_test_code=' + * ngettext ("", "", 0)' + else + gt_expression_test_code= + fi + + AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings + ]])], + [eval "$gt_func_gnugettext_libc=yes"], + [eval "$gt_func_gnugettext_libc=no"])]) - if test "$gt_cv_func_gnugettext_libc" != "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then dnl Sometimes libintl requires libiconv, so first search for libiconv. ifelse(gt_included_intl, yes, , [ AM_ICONV_LINK @@ -152,49 +183,53 @@ dnl even if libiconv doesn't exist. AC_LIB_LINKFLAGS_BODY([intl]) AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, + [$gt_func_gnugettext_libintl], [gt_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $INCINTL" gt_save_LIBS="$LIBS" LIBS="$LIBS $LIBINTL" dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], + [eval "$gt_func_gnugettext_libintl=yes"], + [eval "$gt_func_gnugettext_libintl=no"]) dnl Now see whether libintl exists and depends on libiconv. - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -]ifelse([$2], [need-formatstring-macros], -[[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -]], [])[extern int _nl_msg_cat_cntr; + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +$gt_revision_test_code +extern int _nl_msg_cat_cntr; extern #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes - ]) +const char *_nl_expand_alias (const char *); + ]], + [[ +bindtextdomain ("", ""); +return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") + ]])], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + eval "$gt_func_gnugettext_libintl=yes" + ]) fi CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS"]) @@ -204,8 +239,8 @@ dnl use it. But if this macro is used in GNU gettext, and GNU dnl gettext is already preinstalled in libintl, we update this dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ + || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes @@ -252,7 +287,7 @@ if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -265,7 +300,7 @@ if test "$USE_NLS" = "yes"; then AC_MSG_CHECKING([where the gettext function comes from]) if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then gt_source="external libintl" else gt_source="libc" @@ -279,16 +314,16 @@ if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then AC_MSG_CHECKING([how to link with libintl]) AC_MSG_RESULT([$LIBINTL]) AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -304,9 +339,9 @@ fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) + AC_SUBST([BUILD_INCLUDED_LIBINTL]) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -314,316 +349,51 @@ dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share - AC_SUBST(DATADIRNAME) + AC_SUBST([DATADIRNAME]) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) + AC_SUBST([INSTOBJEXT]) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat - AC_SUBST(GENCAT) + AC_SUBST([GENCAT]) dnl For backward compatibility. Some Makefiles may be using this. INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi - AC_SUBST(INTLOBJS) + AC_SUBST([INTLOBJS]) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) -]) - - -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], -[ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([gt_GLIBC2])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([gl_VISIBILITY])dnl - AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl - AC_REQUIRE([bh_C_SIGNED])dnl - AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl - AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl - AC_REQUIRE([gt_TYPE_WCHAR_T])dnl - AC_REQUIRE([gt_TYPE_WINT_T])dnl - AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) - AC_REQUIRE([gt_TYPE_INTMAX_T]) - AC_REQUIRE([gt_PRINTF_POSIX]) - AC_REQUIRE([gl_GLIBC21])dnl - AC_REQUIRE([gl_XSIZE])dnl - AC_REQUIRE([gt_INTL_MACOSX])dnl - - AC_CHECK_TYPE([ptrdiff_t], , - [AC_DEFINE([ptrdiff_t], [long], - [Define as the type of the result of subtracting two pointers, if the system doesn't define it.]) - ]) - AC_CHECK_HEADERS([stddef.h stdlib.h string.h]) - AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen]) - - dnl Use the _snprintf function only if it is declared (because on NetBSD it - dnl is defined as a weak alias of snprintf; we prefer to use the latter). - gt_CHECK_DECL(_snprintf, [#include ]) - gt_CHECK_DECL(_snwprintf, [#include ]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(getc_unlocked, [#include ]) - - case $gt_cv_func_printf_posix in - *yes) HAVE_POSIX_PRINTF=1 ;; - *) HAVE_POSIX_PRINTF=0 ;; - esac - AC_SUBST([HAVE_POSIX_PRINTF]) - if test "$ac_cv_func_asprintf" = yes; then - HAVE_ASPRINTF=1 - else - HAVE_ASPRINTF=0 - fi - AC_SUBST([HAVE_ASPRINTF]) - if test "$ac_cv_func_snprintf" = yes; then - HAVE_SNPRINTF=1 - else - HAVE_SNPRINTF=0 - fi - AC_SUBST([HAVE_SNPRINTF]) - if test "$ac_cv_func_wprintf" = yes; then - HAVE_WPRINTF=1 - else - HAVE_WPRINTF=0 - fi - AC_SUBST([HAVE_WPRINTF]) - - AM_LANGINFO_CODESET - gt_LC_MESSAGES - - dnl Compilation on mingw and Cygwin needs special Makefile rules, because - dnl 1. when we install a shared library, we must arrange to export - dnl auxiliary pointer variables for every exported variable, - dnl 2. when we install a shared library and a static library simultaneously, - dnl the include file specifies __declspec(dllimport) and therefore we - dnl must arrange to define the auxiliary pointer variables for the - dnl exported variables _also_ in the static library. - if test "$enable_shared" = yes; then - case "$host_os" in - cygwin*) is_woe32dll=yes ;; - *) is_woe32dll=no ;; - esac - else - is_woe32dll=no - fi - WOE32DLL=$is_woe32dll - AC_SUBST([WOE32DLL]) - - dnl Rename some macros and functions used for locking. - AH_BOTTOM([ -#define __libc_lock_t gl_lock_t -#define __libc_lock_define gl_lock_define -#define __libc_lock_define_initialized gl_lock_define_initialized -#define __libc_lock_init gl_lock_init -#define __libc_lock_lock gl_lock_lock -#define __libc_lock_unlock gl_lock_unlock -#define __libc_lock_recursive_t gl_recursive_lock_t -#define __libc_lock_define_recursive gl_recursive_lock_define -#define __libc_lock_define_initialized_recursive gl_recursive_lock_define_initialized -#define __libc_lock_init_recursive gl_recursive_lock_init -#define __libc_lock_lock_recursive gl_recursive_lock_lock -#define __libc_lock_unlock_recursive gl_recursive_lock_unlock -#define glthread_in_use libintl_thread_in_use -#define glthread_lock_init libintl_lock_init -#define glthread_lock_lock libintl_lock_lock -#define glthread_lock_unlock libintl_lock_unlock -#define glthread_lock_destroy libintl_lock_destroy -#define glthread_rwlock_init libintl_rwlock_init -#define glthread_rwlock_rdlock libintl_rwlock_rdlock -#define glthread_rwlock_wrlock libintl_rwlock_wrlock -#define glthread_rwlock_unlock libintl_rwlock_unlock -#define glthread_rwlock_destroy libintl_rwlock_destroy -#define glthread_recursive_lock_init libintl_recursive_lock_init -#define glthread_recursive_lock_lock libintl_recursive_lock_lock -#define glthread_recursive_lock_unlock libintl_recursive_lock_unlock -#define glthread_recursive_lock_destroy libintl_recursive_lock_destroy -#define glthread_once libintl_once -#define glthread_once_call libintl_once_call -#define glthread_once_singlethreaded libintl_once_singlethreaded -]) -]) - - -dnl Checks for the core files of the intl subdirectory: -dnl dcigettext.c -dnl eval-plural.h -dnl explodename.c -dnl finddomain.c -dnl gettextP.h -dnl gmo.h -dnl hash-string.h hash-string.c -dnl l10nflist.c -dnl libgnuintl.h.in (except the *printf stuff) -dnl loadinfo.h -dnl loadmsgcat.c -dnl localealias.c -dnl log.c -dnl plural-exp.h plural-exp.c -dnl plural.y -dnl Used by libglocale. -AC_DEFUN([gt_INTL_SUBDIR_CORE], -[ - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([gt_INTDIV0])dnl - AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl - AC_REQUIRE([gl_HEADER_INTTYPES_H])dnl - AC_REQUIRE([gt_INTTYPES_PRI])dnl - AC_REQUIRE([gl_LOCK])dnl - - AC_TRY_LINK( - [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }], - [], - [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1, - [Define to 1 if the compiler understands __builtin_expect.])]) - - AC_CHECK_HEADERS([argz.h limits.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \ - stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \ - argz_next __fsetlocking]) - - dnl Use the *_unlocked functions only if they are declared. - dnl (because some of them were defined without being declared in Solaris - dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built - dnl on Solaris 2.5.1 to run on Solaris 2.6). - dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13. - gt_CHECK_DECL(feof_unlocked, [#include ]) - gt_CHECK_DECL(fgets_unlocked, [#include ]) - - AM_ICONV - - dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined, - dnl and a _NL_LOCALE_NAME macro always. - AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name, - [AC_TRY_LINK([#include -#include ], - [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));], - gt_cv_nl_locale_name=yes, - gt_cv_nl_locale_name=no) - ]) - if test $gt_cv_nl_locale_name = yes; then - AC_DEFINE(HAVE_NL_LOCALE_NAME, 1, - [Define if you have and it defines the NL_LOCALE_NAME macro if _GNU_SOURCE is defined.]) - fi - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], +dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. +m4_define([gt_NEEDS_INIT], [ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) + m4_divert_text([DEFAULTS], [gt_needs=]) + m4_define([gt_NEEDS_INIT], []) ]) -dnl gt_CHECK_DECL(FUNC, INCLUDES) -dnl Check whether a function is declared. -AC_DEFUN([gt_CHECK_DECL], +dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) +AC_DEFUN([AM_GNU_GETTEXT_NEED], [ - AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1, - [AC_TRY_COMPILE([$2], [ -#ifndef $1 - char *p = (char *) $1; -#endif -], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)]) - if test $ac_cv_have_decl_$1 = yes; then - gt_value=1 - else - gt_value=0 - fi - AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value], - [Define to 1 if you have the declaration of `$1', and to 0 if you don't.]) + m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) ]) diff -Nru libpwquality-1.2.3/m4/iconv.m4 libpwquality-1.3.0/m4/iconv.m4 --- libpwquality-1.2.3/m4/iconv.m4 2012-11-07 13:11:58.000000000 +0000 +++ libpwquality-1.3.0/m4/iconv.m4 2014-08-06 12:39:16.000000000 +0000 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +# iconv.m4 serial 18 (gettext-0.18.2) +dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,6 +21,7 @@ [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable GNU libiconv installed). + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. @@ -29,34 +30,170 @@ dnl Add $INCICONV to CPPFLAGS before performing the following checks, dnl because if the user has installed libiconv and not disabled its use dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed. am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include + ]], + [[iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);]])], + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11, + dnl Solaris 10. + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +int main () +{ + int result = 0; + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 1; + iconv_close (cd_utf8_to_88591); + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + result |= 2; + iconv_close (cd_ascii_to_88591); + } + } + /* Test against AIX 6.1..7.1 bug: Buffer overrun. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304"; + static char buf[2] = { (char)0xDE, (char)0xAD }; + const char *inptr = input; + size_t inbytesleft = 1; + char *outptr = buf; + size_t outbytesleft = 1; + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD) + result |= 4; + iconv_close (cd_88591_to_utf8); + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + result |= 8; + iconv_close (cd_88591_to_utf8); + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + result |= 16; + return result; +}]])], + [am_cv_func_iconv_works=yes], + [am_cv_func_iconv_works=no], + [ +changequote(,)dnl + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +changequote([,])dnl + ]) + LIBS="$am_save_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE([HAVE_ICONV], [1], + [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then AC_MSG_CHECKING([how to link with libiconv]) @@ -68,34 +205,64 @@ LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) -AC_DEFUN([AM_ICONV], +dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to +dnl avoid warnings like +dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required". +dnl This is tricky because of the way 'aclocal' is implemented: +dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN. +dnl Otherwise aclocal's initial scan pass would miss the macro definition. +dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions. +dnl Otherwise aclocal would emit many "Use of uninitialized value $1" +dnl warnings. +m4_define([gl_iconv_AC_DEFUN], + m4_version_prereq([2.64], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [m4_ifdef([gl_00GNULIB], + [[AC_DEFUN_ONCE( + [$1], [$2])]], + [[AC_DEFUN( + [$1], [$2])]])])) +gl_iconv_AC_DEFUN([AM_ICONV], [ AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ + AC_CACHE_VAL([am_cv_proto_iconv], [ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ #include #include extern #ifdef __cplusplus "C" #endif -#if defined(__STDC__) || defined(__cplusplus) +#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); #else size_t iconv(); #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + ]], + [[]])], + [am_cv_proto_iconv_arg1=""], + [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + AC_MSG_RESULT([ + $am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) + dnl Also substitute ICONV_CONST in the gnulib generated . + m4_ifdef([gl_ICONV_H_DEFAULTS], + [AC_REQUIRE([gl_ICONV_H_DEFAULTS]) + if test -n "$am_cv_proto_iconv_arg1"; then + ICONV_CONST="const" + fi + ]) fi ]) diff -Nru libpwquality-1.2.3/m4/intlmacosx.m4 libpwquality-1.3.0/m4/intlmacosx.m4 --- libpwquality-1.2.3/m4/intlmacosx.m4 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/m4/intlmacosx.m4 2015-04-08 08:44:04.000000000 +0000 @@ -0,0 +1,56 @@ +# intlmacosx.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on Mac OS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in Mac OS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFPreferencesCopyAppValue(NULL, NULL)]])], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in Mac OS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[CFLocaleCopyCurrent();]])], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) diff -Nru libpwquality-1.2.3/m4/lib-ld.m4 libpwquality-1.3.0/m4/lib-ld.m4 --- libpwquality-1.2.3/m4/lib-ld.m4 2012-11-07 13:11:58.000000000 +0000 +++ libpwquality-1.3.0/m4/lib-ld.m4 2014-08-06 12:39:16.000000000 +0000 @@ -1,50 +1,56 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 6 +dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. +dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid +dnl collision with libtool.m4. -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], +[# I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi + ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) + AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -54,12 +60,12 @@ esac case $ac_prog in # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + [[\\/]]* | ?:[[\\/]]*) + re_direlt='/[[^/]][[^/]]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'` + while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -77,33 +83,36 @@ else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(acl_cv_path_LD, +AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do + IFS="$acl_save_ifs" test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then acl_cv_path_LD="$ac_dir/$ac_prog" # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. + # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in + case `"$acl_cv_path_LD" -v 2>&1 = 1.10 to complain if config.rpath is missing. @@ -101,7 +130,7 @@ AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh . ./conftest.sh @@ -109,35 +138,66 @@ acl_cv_rpath=done ]) wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -150,6 +210,10 @@ else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi ]) @@ -158,6 +222,10 @@ LIB[]NAME= LTLIB[]NAME= INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= rpathdirs= ltrpathdirs= names_already_handled= @@ -177,7 +245,7 @@ names_already_handled="$names_already_handled $name" dnl See if it was already located by an earlier AC_LIB_LINKFLAGS dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'` eval value=\"\$HAVE_LIB$uppername\" if test -n "$value"; then if test "$value" = yes; then @@ -197,22 +265,55 @@ found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + dir="$additional_libdir" + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi fi if test "X$found_dir" = "X"; then for x in $LDFLAGS $LTLIB[]NAME; do @@ -220,21 +321,46 @@ case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + found_so="$dir/$libname$shrext" + else + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done fi fi fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" + fi + fi ;; esac if test "X$found_dir" != "X"; then @@ -249,7 +375,9 @@ dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -268,12 +396,12 @@ ltrpathdirs="$ltrpathdirs $found_dir" fi dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then dnl Using DIR/libNAME.so during linking hardcodes DIR into the dnl resulting binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then dnl Use an explicit option to hardcode DIR into the resulting dnl binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" @@ -304,13 +432,13 @@ if test -z "$haveit"; then LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then dnl FIXME: Not sure whether we should use dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" dnl here. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH dnl here, because this doesn't fit in flags passed to the dnl compiler. So give up. No hardcoding. This affects only dnl very old systems. @@ -337,6 +465,16 @@ case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -397,9 +535,11 @@ dnl 3. if it's already present in $LDFLAGS or the already dnl constructed $LIBNAME, dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -498,18 +638,18 @@ done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user must dnl pass all path elements in one option. We can arrange that for a dnl single library, but not when more than one $LIBNAMEs are used. alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else @@ -517,7 +657,7 @@ for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done @@ -530,6 +670,11 @@ LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) ]) dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, @@ -566,7 +711,7 @@ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) $1= if test "$enable_rpath" != no; then - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then dnl Use an explicit option to hardcode directories into the resulting dnl binary. rpathdirs= @@ -575,7 +720,8 @@ if test -n "$next"; then dir="$next" dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= @@ -584,7 +730,8 @@ -L) next=yes ;; -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= ;; @@ -600,16 +747,16 @@ done else dnl The linker is used for linking directly. - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user dnl must pass all path elements in one option. alldirs= for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="$flag" else @@ -617,7 +764,7 @@ for dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="${$1}${$1:+ }$flag" done diff -Nru libpwquality-1.2.3/m4/lib-prefix.m4 libpwquality-1.3.0/m4/lib-prefix.m4 --- libpwquality-1.2.3/m4/lib-prefix.m4 2012-11-07 13:11:58.000000000 +0000 +++ libpwquality-1.3.0/m4/lib-prefix.m4 2014-08-06 12:39:16.000000000 +0000 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -153,33 +153,72 @@ prefix="$acl_save_prefix" ]) -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl . + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff -Nru libpwquality-1.2.3/m4/libtool.m4 libpwquality-1.3.0/m4/libtool.m4 --- libpwquality-1.2.3/m4/libtool.m4 2013-09-12 11:10:31.000000000 +0000 +++ libpwquality-1.3.0/m4/libtool.m4 2015-04-08 08:44:04.000000000 +0000 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1268,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1282,7 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1301,7 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1330,14 +1380,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1477,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1663,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1707,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2253,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2262,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2327,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2466,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2474,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2481,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2499,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,17 +2519,18 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2526,7 +2591,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2542,7 +2607,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2579,9 +2644,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2648,7 +2713,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2717,7 +2782,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2742,7 +2807,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2766,7 +2831,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2797,7 +2862,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2807,7 +2872,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3229,7 +3294,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3649,6 +3714,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4233,7 +4299,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4325,18 +4393,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4496,7 +4579,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4521,7 +4606,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4772,8 +4856,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5068,6 +5151,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5114,10 +5198,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5130,7 +5210,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5169,7 +5249,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5611,9 +5690,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5771,7 +5847,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6141,7 +6216,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6902,12 +6977,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7104,7 +7185,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7237,7 +7317,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7424,6 +7503,77 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7493,6 +7643,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff -Nru libpwquality-1.2.3/m4/ltoptions.m4 libpwquality-1.3.0/m4/ltoptions.m4 --- libpwquality-1.2.3/m4/ltoptions.m4 2013-09-12 11:10:31.000000000 +0000 +++ libpwquality-1.3.0/m4/ltoptions.m4 2015-04-08 08:44:04.000000000 +0000 @@ -326,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -Nru libpwquality-1.2.3/m4/ltversion.m4 libpwquality-1.3.0/m4/ltversion.m4 --- libpwquality-1.2.3/m4/ltversion.m4 2013-09-12 11:10:32.000000000 +0000 +++ libpwquality-1.3.0/m4/ltversion.m4 2015-04-08 08:44:04.000000000 +0000 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru libpwquality-1.2.3/m4/nls.m4 libpwquality-1.3.0/m4/nls.m4 --- libpwquality-1.2.3/m4/nls.m4 2012-11-07 13:11:58.000000000 +0000 +++ libpwquality-1.3.0/m4/nls.m4 2014-08-06 12:39:16.000000000 +0000 @@ -1,5 +1,6 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,15 +18,15 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) diff -Nru libpwquality-1.2.3/m4/po.m4 libpwquality-1.3.0/m4/po.m4 --- libpwquality-1.2.3/m4/po.m4 2012-11-07 13:11:58.000000000 +0000 +++ libpwquality-1.3.0/m4/po.m4 2014-08-06 12:39:16.000000000 +0000 @@ -1,5 +1,5 @@ -# po.m4 serial 13 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# po.m4 serial 20 (gettext-0.18.2) +dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,16 +17,20 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.60]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake + AC_REQUIRE([AC_PROG_MKDIR_P])dnl AC_REQUIRE([AM_NLS])dnl + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -37,7 +41,7 @@ [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) dnl Test whether it is GNU msgfmt >= 0.15. changequote(,)dnl @@ -84,6 +88,10 @@ test -n "$localedir" || localedir='${datadir}/locale' AC_SUBST([localedir]) + dnl Support for AM_XGETTEXT_OPTION. + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) + AC_CONFIG_COMMANDS([po-directories], [[ for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" @@ -94,7 +102,7 @@ case "$ac_file" in */Makefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -110,7 +118,8 @@ if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then rm -f "$ac_dir/POTFILES" test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + gt_tab=`printf '\t'` + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" POMAKEFILEDEPS="POTFILES.in" # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend # on $ac_dir but don't depend on user-specified configuration @@ -121,12 +130,12 @@ test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" fi ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" else # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' fi # Compute POFILES @@ -218,7 +227,7 @@ changequote(,)dnl # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'` ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` # In autoconf-2.13 it is called $ac_given_srcdir. # In autoconf-2.50 it is called $srcdir. @@ -246,6 +255,7 @@ fi # A sed script that extracts the value of VARIABLE from a Makefile. + tab=`printf '\t'` sed_x_variable=' # Test if the hold space is empty. x @@ -253,9 +263,9 @@ x ta # Yes it was empty. Look if we have the expected variable definition. -/^[ ]*VARIABLE[ ]*=/{ +/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{ # Seen the first line of the variable definition. - s/^[ ]*VARIABLE[ ]*=// + s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=// ba } bd @@ -307,7 +317,7 @@ sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'` ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"` fi - # Hide the ALL_LINGUAS assigment from automake < 1.5. + # Hide the ALL_LINGUAS assignment from automake < 1.5. eval 'ALL_LINGUAS''=$ALL_LINGUAS_' # Compute POFILES # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) @@ -397,14 +407,15 @@ fi sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp" + tab=`printf '\t'` if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then # Add dependencies that cannot be formulated as a simple suffix rule. for lang in $ALL_LINGUAS; do frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` cat >> "$ac_file.tmp" <> "$ac_file.tmp" <, 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -27,15 +27,14 @@ # Prepare PATH_SEPARATOR. # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which + # contains only /bin. Note that ksh looks also at the FPATH variable, + # so we have to set that as well for the test. + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \ + || PATH_SEPARATOR=';' + } fi # Find out how to test for executable files. Don't use a zero-byte file, @@ -55,7 +54,7 @@ # Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, +AC_CACHE_VAL([ac_cv_path_$1], [case "[$]$1" in [[\\/]]* | ?:[[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. @@ -84,9 +83,9 @@ esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + AC_MSG_RESULT([$][$1]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff -Nru libpwquality-1.2.3/po/ChangeLog libpwquality-1.3.0/po/ChangeLog --- libpwquality-1.2.3/po/ChangeLog 2011-09-16 12:21:23.000000000 +0000 +++ libpwquality-1.3.0/po/ChangeLog 2014-08-06 12:39:16.000000000 +0000 @@ -1,3 +1,8 @@ +2014-08-06 gettextize + + * Makefile.in.in: Upgrade to gettext-0.18.2. + * Rules-quot: Upgrade to gettext-0.18.2. + 2011-09-16 gettextize * Makefile.in.in: Upgrade to gettext-0.18.1. diff -Nru libpwquality-1.2.3/po/LINGUAS libpwquality-1.3.0/po/LINGUAS --- libpwquality-1.2.3/po/LINGUAS 2013-09-12 10:51:13.000000000 +0000 +++ libpwquality-1.3.0/po/LINGUAS 2013-11-29 13:47:34.000000000 +0000 @@ -23,7 +23,6 @@ ml mr mr_IN -ms nb nl or diff -Nru libpwquality-1.2.3/po/Makefile.in.in libpwquality-1.3.0/po/Makefile.in.in --- libpwquality-1.2.3/po/Makefile.in.in 2012-11-07 13:07:15.000000000 +0000 +++ libpwquality-1.3.0/po/Makefile.in.in 2014-08-06 12:39:16.000000000 +0000 @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -8,7 +8,8 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.15 +# Origin: gettext-0.18.2 +GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -30,7 +31,17 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ + +# We use $(mkdir_p). +# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as +# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, +# @install_sh@ does not start with $(SHELL), so we add it. +# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined +# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake +# versions, $(mkinstalldirs) and $(install_sh) are unused. mkinstalldirs = $(SHELL) @install_sh@ -d +install_sh = $(SHELL) @install_sh@ +MKDIR_P = @MKDIR_P@ mkdir_p = @mkdir_p@ GMSGFMT_ = @GMSGFMT@ @@ -77,8 +88,8 @@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ @@ -90,6 +101,13 @@ all-yes: stamp-po all-no: +# Ensure that the gettext macros and this Makefile.in.in are in sync. +CHECK_MACRO_VERSION = \ + test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ + exit 1; \ + } + # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because # we don't want to bother translators with empty POT files). We assume that @@ -105,6 +123,7 @@ # $(POFILES) has been designed to not touch files that don't need to be # changed. stamp-po: $(srcdir)/$(DOMAIN).pot + @$(CHECK_MACRO_VERSION) test ! -f $(srcdir)/$(DOMAIN).pot || \ test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) @test ! -f $(srcdir)/$(DOMAIN).pot || { \ @@ -119,17 +138,43 @@ # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. +# The determination of whether the package xyz is a GNU one is based on the +# heuristic whether some file in the top level directory mentions "GNU xyz". +# If GNU 'find' is available, we avoid grepping through monster files. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ + LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \ + else \ + LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ + fi; \ + } | grep -v 'libtool:' >/dev/null; then \ + package_gnu='GNU '; \ + else \ + package_gnu=''; \ + fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ else \ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ fi; \ - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ - --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --msgid-bugs-address="$$msgid_bugs_address" + case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + *) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --package-name="$${package_gnu}@PACKAGE@" \ + --package-version='@VERSION@' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + esac test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ @@ -157,8 +202,15 @@ @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ else \ $(MAKE) $${lang}.po-create; \ fi @@ -181,7 +233,6 @@ fi install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -233,7 +284,6 @@ fi installdirs-data-no: installdirs-data-yes: - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -359,9 +409,15 @@ tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ @@ -382,9 +438,13 @@ update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff -Nru libpwquality-1.2.3/po/Rules-quot libpwquality-1.3.0/po/Rules-quot --- libpwquality-1.2.3/po/Rules-quot 2012-11-07 13:07:15.000000000 +0000 +++ libpwquality-1.3.0/po/Rules-quot 2014-08-06 12:39:16.000000000 +0000 @@ -14,13 +14,13 @@ .insert-header.po-update-en: @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ + if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ tmpdir=`pwd`; \ echo "$$lang:"; \ ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/ar.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/ar.gmo differ diff -Nru libpwquality-1.2.3/po/ar.po libpwquality-1.3.0/po/ar.po --- libpwquality-1.2.3/po/ar.po 2012-12-20 09:03:54.000000000 +0000 +++ libpwquality-1.3.0/po/ar.po 2015-07-23 11:45:58.000000000 +0000 @@ -7,16 +7,17 @@ msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Arabic (http://www.transifex.com/projects/p/libpwquality/" +"language/ar/)\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n" +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/as.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/as.gmo differ diff -Nru libpwquality-1.2.3/po/as.po libpwquality-1.3.0/po/as.po --- libpwquality-1.2.3/po/as.po 2013-09-12 11:14:48.000000000 +0000 +++ libpwquality-1.3.0/po/as.po 2015-07-23 11:45:58.000000000 +0000 @@ -8,10 +8,10 @@ # ngoswami , 2013 msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2013-09-04 13:29+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-09-04 09:29-0400\n" "Last-Translator: ngoswami \n" "Language-Team: Assamese (http://www.transifex.com/projects/p/libpwquality/" "language/as/)\n" @@ -20,6 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/bg.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/bg.gmo differ diff -Nru libpwquality-1.2.3/po/bg.po libpwquality-1.3.0/po/bg.po --- libpwquality-1.2.3/po/bg.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/bg.po 2015-07-23 11:45:58.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Boris Yakimov , 2012. -# Valentin Laskov , 2012. +# Boris Yakimov , 2012 +# Valentin Laskov , 2012 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Bulgarian (http://www.transifex.com/projects/p/libpwquality/" +"language/bg/)\n" "Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/bn_IN.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/bn_IN.gmo differ diff -Nru libpwquality-1.2.3/po/bn_IN.po libpwquality-1.3.0/po/bn_IN.po --- libpwquality-1.2.3/po/bn_IN.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/bn_IN.po 2015-07-23 11:45:58.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Runa Bhattacharjee , 2009. -# Runa Bhattacharjee , 2007, 2008. +# Runa Bhattacharjee , 2009 +# runab , 2007-2008 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-29 13:41+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/" +"libpwquality/language/bn_IN/)\n" "Language: bn_IN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format @@ -41,22 +42,22 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "ব্যবহার: %s [user]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " কম্যান্ড স্ট্যান্ডার্ড থেকে স্কোর করতে হবে এমন পাসওয়ার্ডটি পড়ে।\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "ত্রুটি: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "যে পাসওয়ার্ডটি স্কোর করতে হবে তা প্রাপ্ত করা গেল না" #: src/pwscore.c:73 #, c-format @@ -64,135 +65,137 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"পাসওয়ার্ড গুণমান যাচাই সম্ভব হয়নি:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "ব্যবহার: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "সেটিং করার সময়ে মেমরি বরাদ্দ সমস্যা" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "মেমরি বরাদ্দ করতে সমস্যা" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "পুরোনো পাসওয়ার্ডটির অনুরূপ" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "পাসওয়ার্ডটি বিপরীতক্রমেও একই" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "শুধুমাত্র বড় বা ছোট হাতের অক্ষরের ক্ষেত্রে পাসওয়ার্ড অালাদা হয়" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "পাসওয়ার্ডটি পুরনোটির প্রায় একই" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "পাসওয়ার্ডটির মধ্যে কোনো না কোনো রূপে ব্যবহারকারী নাম অন্তর্ভুক্ত রয়েছে" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "পাসওয়ার্ডের মধ্যে ব্যবহারকারীর প্রকৃত নামের শব্দ কোনো না কোনো ভাবে রয়েছে" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "পাসওয়ার্ডটির মধ্যে কোনো না কোনো ভাবে পরিত্যাক্ত শব্দ রয়েছে" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "পাসওয়ার্ডটি %ldটির কম অক্ষর বিশিষ্ট" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "পাসওয়ার্ডটিতে খুবই কম অক্ষর রয়েছে" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "পাসওয়ার্ডটিতে %ldটির কম বড় হাতের অক্ষর রয়েছে" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "পাসওয়ার্ডটিতে খুবই কম বড় হাতের অক্ষর রয়েছে" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "পাসওয়ার্ডটিতে %ldটির কম ছোট হাতের অক্ষর রয়েছে" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "পাসওয়ার্ডটিতে খুবই কম ছোট হাতের অক্ষর রয়েছে" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "পাসওয়ার্ডটিতে %ldটির কম বর্ণসাংখ্যিক নয় এমন অক্ষর রয়েছে" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "পাসওয়ার্ডটিতে খুবই কম বর্ণসাংখ্যিক নয় এমন অক্ষর রয়েছে" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "পাসওয়ার্ডটি %ld অক্ষরের থেকে ছোট" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "পাসওয়ার্ডটি অতিমাত্রায় ছোট" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "পুরনো পাসওয়ার্ডটিই ঘুরিয়ে দেওয়া হয়েছে" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "পাসওয়ার্ডটিতে %ldটির কম অক্ষর শ্রেণী রয়েছে" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "পাসওয়ার্ডটিতে পর্যাপ্ত অক্ষর শ্রেণী উপস্থিত নেই" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "পাসওয়ার্ডটিতে ক্রমান্বয়ে %ldটির বেশি একই অক্ষর রয়েছে" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "পাসওয়ার্ডটিতে একই অক্ষর অত্যাধিক বার ক্রমাগত ব্যবহার করা হয়েছে" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "পাসওয়ার্ডটিতে ক্রমান্বয়ে %ldটির বেশি একই শ্রেণীর অক্ষর রয়েছে" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "পাসওয়ার্ডটিতে একই শ্রেণীর অক্ষর অত্যাধিক বার ক্রমাগত ব্যবহার করা হয়েছে" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "পাসওয়ার্ডটিতে %ld অক্ষরের বেশি দীর্ধ একঘেয়ে ক্রম রয়েছে" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "পাসওয়ার্ডটিতে একঘেয়ে অক্ষরের অতিমাত্রায় দীর্ধ ক্রম রয়েছে" #: src/error.c:107 msgid "No password supplied" @@ -200,57 +203,58 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "RNG ডিভাইস থেকে অনির্দিষ্ট নম্বর প্রাপ্ত করা যায় না" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" msgstr "" +"পাসওয়ার্ড প্রস্তুত করা যায়নি - সেটিং করার ক্ষেত্রে প্রয়োজনীয় এনট্রপি অতিমাত্রায় কম" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "পাসওয়ার্ডের অভিধান যাচাই করা যায়নি" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "অজানা সেটিং" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "সেটিং-এর খারাপ পূর্ণসংখ্যা মান" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "খারাপ পূর্ণসংখ্যা মান" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "সেটিং %s পূর্ণসংখ্যা ধরনের নয়" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "সেটিং পূর্ণসংখ্যা ধরনের নয়" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "সেটিং %s স্ট্রিং ধরনের নয়" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "সেটিং স্ট্রিং ধরনের নয়" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "কনফিগারেশন ফাইল খোলা যায়নি" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "কনফিগারেশন ফাইলটি ভুল ভাবে গঠিত" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "গুরুতর সমস্যা" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/ca.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/ca.gmo differ diff -Nru libpwquality-1.2.3/po/ca.po libpwquality-1.3.0/po/ca.po --- libpwquality-1.2.3/po/ca.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/ca.po 2015-07-23 11:45:58.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Albert Carabasa Giribet , 2009. -# Xavier Queralt Mateu , 2008. +# Albert Carabasa Giribet , 2009 +# xqueralt , 2008 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Catalan (http://www.transifex.com/projects/p/libpwquality/" +"language/ca/)\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/cs.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/cs.gmo differ diff -Nru libpwquality-1.2.3/po/cs.po libpwquality-1.3.0/po/cs.po --- libpwquality-1.2.3/po/cs.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/cs.po 2015-07-23 11:45:58.000000000 +0000 @@ -3,22 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Klara Cihlarova , 2005, 2006. -# Tomáš Mráz , 2011. -# Tomas Mraz , 2005, 2008, 2009, 2011. +# Klara Cihlarova , 2005, 2006 +# Tomáš Mráz , 2011 +# Tomas Mraz , 2005, 2008, 2009, 2011 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:05+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Czech (http://www.transifex.com/projects/p/libpwquality/" +"language/cs/)\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/da.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/da.gmo differ diff -Nru libpwquality-1.2.3/po/da.po libpwquality-1.3.0/po/da.po --- libpwquality-1.2.3/po/da.po 2013-06-19 15:42:01.000000000 +0000 +++ libpwquality-1.3.0/po/da.po 2015-07-23 11:45:58.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2013-04-02 21:24+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Kris Thomsen \n" "Language-Team: Danish (http://www.transifex.com/projects/p/libpwquality/" "language/da/)\n" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/de.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/de.gmo differ diff -Nru libpwquality-1.2.3/po/de.po libpwquality-1.3.0/po/de.po --- libpwquality-1.2.3/po/de.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/de.po 2015-07-23 11:45:58.000000000 +0000 @@ -7,10 +7,10 @@ # Roman Spirgi , 2012. msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-07-20 19:43+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2012-07-20 03:43-0400\n" "Last-Translator: Roman Spirgi \n" "Language-Team: LANGUAGE \n" "Language: de\n" @@ -18,6 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/es.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/es.gmo differ diff -Nru libpwquality-1.2.3/po/es.po libpwquality-1.3.0/po/es.po --- libpwquality-1.2.3/po/es.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/es.po 2015-07-23 11:45:58.000000000 +0000 @@ -3,34 +3,36 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Claudio Rodrigo Pereyra Diaz , 2011. -# Daniel Cabrera , 2009, 2011. -# Domingo Becker , 2008. -# Héctor Daniel Cabrera , 2009. -# Manuel Ospina , 2007. +# Adolfo Jayme Barrientos, 2015 +# Claudio Rodrigo Pereyra Diaz , 2011 +# Daniel Cabrera , 2009,2011 +# beckerde , 2008 +# Héctor Daniel Cabrera , 2009 +# Manuel Ospina , 2007 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-07-16 15:46+0000\n" -"Last-Translator: Daniel Cabrera \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2015-02-01 00:56+0000\n" +"Last-Translator: Adolfo Jayme Barrientos\n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/libpwquality/" +"language/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format msgid "New %s%spassword: " -msgstr "Nueva %s%scontraseña: " +msgstr "Contraseña%s%snueva: " #: src/pam_pwquality.c:27 #, c-format msgid "Retype new %s%spassword: " -msgstr "Vuelva a escribir la nueva %s%scontraseña: " +msgstr "Escriba la contraseña %s%sde nuevo: " #: src/pam_pwquality.c:28 msgid "Sorry, passwords do not match." @@ -44,16 +46,15 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "Utilización: %s [usuario]\n" +msgstr "Uso: %s [usuario]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" msgstr "" -" El comando lee una contraseña desde la entrada estándar para ser " -"almacenada.\n" -"\n" +" La orden lee la contraseña que se valorará a partir de la entrada " +"estándar.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format @@ -62,7 +63,7 @@ #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "No se pudo obtener una contraseña para almacenar" +msgstr "No se pudo obtener la contraseña que se valorará" #: src/pwscore.c:73 #, c-format @@ -70,21 +71,21 @@ "Password quality check failed:\n" " %s\n" msgstr "" -"Falló la verificación de la calidad de la contraseña:\n" +"Falló la comprobación de calidad de la contraseña:\n" " %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "Utilización: %s \n" +msgstr "Uso: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "Error de alojamiento de memoria cuando se definía" +msgstr "Ocurrió un error de asignación de memoria al establecer" #: src/error.c:35 msgid "Memory allocation error" -msgstr "Error de alojamiento de memoria" +msgstr "Error al asignar memoria" #: src/error.c:37 msgid "The password is the same as the old one" @@ -96,7 +97,7 @@ #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "La contraseña es diferente sólo respecto a mayúsculas y minúsculas" +msgstr "La contraseña difiere únicamente en el uso de mayúsculas y minúsculas" #: src/error.c:43 msgid "The password is too similar to the old one" @@ -159,11 +160,11 @@ #: src/error.c:79 msgid "The password is too short" -msgstr "La contraseña es demasiado pequeña" +msgstr "La contraseña es demasiado breve" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "La contraseña es solo para cambiar la anterior" +msgstr "La contraseña es la anterior, pero al revés" #: src/error.c:84 #, c-format @@ -272,7 +273,7 @@ #: src/error.c:151 msgid "Fatal failure" -msgstr "Error fatal" +msgstr "Fallo crítico" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/eu.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/eu.gmo differ diff -Nru libpwquality-1.2.3/po/eu.po libpwquality-1.3.0/po/eu.po --- libpwquality-1.2.3/po/eu.po 2012-12-20 09:04:42.000000000 +0000 +++ libpwquality-1.3.0/po/eu.po 2015-07-23 11:45:58.000000000 +0000 @@ -3,15 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# , 2012. +# Hey_neken , 2012 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-11-16 09:41+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Hey_neken \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Basque (http://www.transifex.com/projects/p/libpwquality/" +"language/eu/)\n" "Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/fi.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/fi.gmo differ diff -Nru libpwquality-1.2.3/po/fi.po libpwquality-1.3.0/po/fi.po --- libpwquality-1.2.3/po/fi.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/fi.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,23 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ilkka Pirskanen , 2005. -# Janne Ahlskog , 2006. -# Jyri Palokangas , 2006. -# Ville-Pekka Vainio , 2012. +# Ilkka Pirskanen , 2005 +# Janne Ahlskog , 2006 +# Jyri Palokangas , 2006 +# Ville-Pekka Vainio , 2012 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Finnish (http://www.transifex.com/projects/p/libpwquality/" +"language/fi/)\n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/fr.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/fr.gmo differ diff -Nru libpwquality-1.2.3/po/fr.po libpwquality-1.3.0/po/fr.po --- libpwquality-1.2.3/po/fr.po 2013-06-19 15:42:01.000000000 +0000 +++ libpwquality-1.3.0/po/fr.po 2015-07-23 11:45:59.000000000 +0000 @@ -11,10 +11,10 @@ # Martin-Gomez Pablo , 2008 msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2013-04-16 19:15+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-04-16 03:15-0400\n" "Last-Translator: Jérôme Fenal \n" "Language-Team: French (http://www.transifex.com/projects/p/libpwquality/" "language/fr/)\n" @@ -23,6 +23,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/gu.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/gu.gmo differ diff -Nru libpwquality-1.2.3/po/gu.po libpwquality-1.3.0/po/gu.po --- libpwquality-1.2.3/po/gu.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/gu.po 2015-07-23 11:45:59.000000000 +0000 @@ -5,19 +5,21 @@ # Translators: # Ankit Patel , 2007, 2008. # Sweta Kothari , 2009, 2010. +# swkothar , 2013. #zanata msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" -"Last-Translator: Tomáš Mráz \n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-09-24 02:22-0400\n" +"Last-Translator: swkothar \n" "Language-Team: LANGUAGE \n" "Language: gu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format @@ -41,22 +43,22 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "વપરાશ: %s [user]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " આદેશ એ મૂળભૂત ઇનપુટમાંથી સ્કોર કરવા માટે પાસવર્ડને વાંચે છે.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "ભૂલ: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "સ્કોર કરવા માટે પાસવર્ડને પ્રાપ્ત કરી શક્યા નહિં" #: src/pwscore.c:73 #, c-format @@ -64,135 +66,137 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"પાસવર્ડ ગુણવત્તા ચકાસણી નિષ્ફળ:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "વપરાશ: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "મેમરી ફાળવણી ભૂલ જ્યારે સુયોજિત કરી રહ્યા હોય" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "મેમરી ફાળવણી ભૂલ" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "પાસવર્ડ જૂનાં જેવો જ છે" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "પાસવર્ડ પેલીન્ડ્રોમ છે" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "પાસવર્ડ ફક્ત કેસ સાથે અલગ પડે છે" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "પાસવર્ડ જૂનાં જેવો જ છે" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "પાસવર્ડ વપરાશકર્તા નામને અમુક રૂપમાં સમાવે છે" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "પાસવર્ડ અમુક રૂપમાં વપરાશકર્તાનાં સાચા નામમાંથી શબ્દોને સમાવે છે" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "પાસવર્ડ અમુક રૂપમાં પ્રતિબંધિત શબ્દોને સમાવે છે" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "પાસવર્ડ %ld આંકડા કરતા ઓછાને સમાવે છે" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "પાસવર્ડ થોડા આંકડાને સમાવે છે" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "પાસવર્ડ %ld મોટા અક્ષર કરતા ઓછાને સમાવે છે" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "પાસવર્ડ થોડા મોટા અક્ષરોને સમાવે છે" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "પાસવર્ડ %ld નાનાં અક્ષરો કરતા ઓછાને સમાવે છે" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "પાસવર્ડ થોડા નાનાં અક્ષરોને સમાવે છે" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "પાસવર્ડ %ld બિન-આલ્ફાન્યૂમેરિક અક્ષરો કરતા ઓછાને સમાવે છે" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "પાસવર્ડ બહુ ઓછા બિન-આલ્ફાન્યૂમેરિક અક્ષરોને સમાવે છે" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "પાસવર્ડ %ld અક્ષરો કરતા ટૂંકો છે" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "પાસવર્ડ ઘણો ટૂંકો છે" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "પાસવર્ડ જૂનાં એકને ફેરવે છે" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "પાસવર્ડ એ %ld અક્ષર વર્ગો કરતા ઓછાને સમાવે છે" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "પાસવર્ડ એ પૂરતા અક્ષર વર્ગોને સમાવતુ નથી" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "પાસવર્ડ વારંવાર સરખા %ld અક્ષરો કરતા વધારેને સમાવે છે " #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "પાસવર્ડ વારંવાર ઘણા સરખા અક્ષરોને સમાવે છે" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "પાસવર્ડ વારંવાર એજ વર્ગનાં %ld અક્ષરો કરતા વધારેને સમાવે છે" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "પાસવર્ડ વારંવાર એજ વર્ગનાં ઘણા અક્ષરોને સમાવે છે" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "પાસવર્ડ એ %ld અક્ષરો કરતા લાંબી મોનોટોનિક ક્રમને સમાવે છે" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "પાસવર્ડ એ ઘણા લાંબા મોનોટોનિક અક્ષર ક્રમ ને સમાવે છે" #: src/error.c:107 msgid "No password supplied" @@ -200,57 +204,57 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "RNG ઉપકરણમાંથી ગમેતે સંખ્યાને પ્રાપ્ત કરી શકાતી નથી" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" -msgstr "" +msgstr "પાસવર્ડ નિર્માણ નિષ્ફળ - જરૂરી એન્ટ્રોપી સુયોજન માટે ઓછી છે" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "પાસવર્ડ એ શબ્દકોષ ચકાસણીને નિષ્ફળ કરે છે" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "અજ્ઞાત સુયોજન" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "સુયોજનની ખરાબ પૂર્ણાંક કિંમત" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "ખરાબ પૂર્ણાંક કિંમત" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "સુયોજન %s એ પૂર્ણાંક પ્રકાર નથી" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "સુયોજન પૂર્ણાંક પ્રકાર નથી" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "સુયોજન %s શબ્દમાળા પ્રકાર નથી" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "સુયોજન શબ્દમાળા પ્રકાર નથી" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "રૂપરેખાંકન ફાઇલને ખોલવાનું નિષ્ફળ" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "રૂપરેખાંકન ફાઇલ મેલફોર્મ થયેલ છે" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "ફેટલ નિષ્ફળતા" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/he.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/he.gmo differ diff -Nru libpwquality-1.2.3/po/he.po libpwquality-1.3.0/po/he.po --- libpwquality-1.2.3/po/he.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/he.po 2015-07-23 11:45:59.000000000 +0000 @@ -7,15 +7,16 @@ msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Hebrew (http://www.transifex.com/projects/p/libpwquality/" +"language/he/)\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/hi.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/hi.gmo differ diff -Nru libpwquality-1.2.3/po/hi.po libpwquality-1.3.0/po/hi.po --- libpwquality-1.2.3/po/hi.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/hi.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Rajesh Ranjan , 2009. -# Rajesh Ranjan , 2007. +# Rajesh Ranjan , 2009 +# Rajesh Ranjan , 2007 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-29 13:46+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Hindi (http://www.transifex.com/projects/p/libpwquality/" +"language/hi/)\n" "Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format @@ -41,22 +42,22 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "प्रयोग: %s [user]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " मानक इनपुट से स्कोर किए जाने के लिए कूटशब्द को कमांड पढ़ता है.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "त्रुटि: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "स्कोर किए जाने के लिए कूटशब्द पा नहीं सका" #: src/pwscore.c:73 #, c-format @@ -64,135 +65,137 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"कूटशब्द गुणवत्ता जाँच विफल:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "प्रयोग: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "सेटिंग किए जाने के दौरान स्मृति आबंटन त्रुटि" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "स्मृति आबंटन त्रुटि" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "कूटशब्द पुराने की तरह है" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "कूटशब्द विलोमपद है" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "कूटशब्द केवल केस परिवर्तन से अंतर होता है" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "कूटशब्द पुराने की तरह ही है" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "कूटशब्द किसी तरह से उपयोक्ता नाम को ही समाहित करता है" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "कूटशब्द में उपयोक्ता के वास्तविक नाम को ही किसी रूप में रखा गया है" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "कूटशब्द में कुछ मना किए गए शब्द ही किसी रूप में हैं" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "कूटशब्द में %ld अंक से कम समाहित हैं" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "कूटशब्द में बहुत कम अंक शामिल हैं" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "कूटशब्द में %ld अपरकेस अक्षर से कम हैं" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "कूटशब्द में बहुत ही कम अपरकेस अक्षर शामिल हैं" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "कूटशब्द में %ld लोअरकेस अक्षर से कम हैं" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "कूटशब्द में बहुत ही कम लोअरकेस अक्षर शामिल हैं" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "कूटशब्द में %ld से कम गैर वर्णांकिक वर्ण हैं" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "कूटशब्द में बहुत ही कम गैर वर्णांकिक वर्ण शामिल हैं" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "कूटशब्द %ld वर्ण से कम है" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "कूटशब्द बहुत छोटा है" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "कूटशब्द पुराने को ही बदलकर लिखा गया है" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "कूटशब्द %ld वर्ण वर्ग से कम है" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "कूटशब्द में पर्याप्त वर्ण वर्ग नहीं" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "कूटशब्द में %ld से अधिक समान वर्ण लगातार समाहित हैं" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "कूटशब्द कई समान वर्ण लगातार समाहित करता है" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "कूटशब्द में %ld से अधिक समान वर्ग के वर्ण लगातार समाहित करता है" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "कूटशब्द समान वर्ग के कई समान वर्ण लगातार समाहित करता है" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "कूटशब्द में %ld वर्ण से बड़ा मोनोटोनिक शृंखला समाहित करता है" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "कूटशब्द में काफी बड़ा मोनोटोनिक वर्ण शृंखला है" #: src/error.c:107 msgid "No password supplied" @@ -200,57 +203,57 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "RNG युक्ति से यादृच्छिक संख्या नहीं समाहित कर सकता है" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" -msgstr "" +msgstr "कूटशब्द जनन विफल - सेटिंग के लिए जरूरी एंट्रोपी काफी कम" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "कूटशब्द शब्दकोश जाँच में विफल" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "अनजान सेटिंग" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "सेटिंग का गलत पूर्णांक मान" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "गलत पूर्णांक मान" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "सेटिंग %s पूर्णांक प्रकार नहीं है" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "सेटिंग पूर्णांक प्रकार नहीं है" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "सेटिंग %s स्ट्रिंग प्रकार नहीं है" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "सेटिंग स्ट्रिंग प्रकार नहीं है" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "विन्यास फ़ाइल खोलना विफल" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "विन्यास फ़ाइल विरूपित है" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "गंभीर विफलता" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/hu.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/hu.gmo differ diff -Nru libpwquality-1.2.3/po/hu.po libpwquality-1.3.0/po/hu.po --- libpwquality-1.2.3/po/hu.po 2013-06-19 15:42:01.000000000 +0000 +++ libpwquality-1.3.0/po/hu.po 2015-07-23 11:45:59.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2013-01-08 15:31+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Zoltan Hoppár \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/libpwquality/" "language/hu/)\n" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/it.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/it.gmo differ diff -Nru libpwquality-1.2.3/po/it.po libpwquality-1.3.0/po/it.po --- libpwquality-1.2.3/po/it.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/it.po 2015-07-23 11:45:59.000000000 +0000 @@ -8,19 +8,21 @@ # mario_santagiuliana , 2009. # Mauro Gaggiotti , 2012. # Novell Language , 2007. +# fvalen , 2013. #zanata msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" -"Last-Translator: Tomáš Mráz \n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-09-23 09:59-0400\n" +"Last-Translator: fvalen \n" "Language-Team: LANGUAGE \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format @@ -197,11 +199,11 @@ #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "La password contiene una sequenza uniforme più lunga di %ld caratteri" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "La password contiene una sequenza di caratteri uniformi troppo lunga " #: src/error.c:107 msgid "No password supplied" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/ja.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/ja.gmo differ diff -Nru libpwquality-1.2.3/po/ja.po libpwquality-1.3.0/po/ja.po --- libpwquality-1.2.3/po/ja.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/ja.po 2015-07-23 11:45:59.000000000 +0000 @@ -9,10 +9,10 @@ # Tomoyuki KATO , 2012. msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-07-29 06:09+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2012-07-29 02:09-0400\n" "Last-Translator: Tomoyuki KATO \n" "Language-Team: LANGUAGE \n" "Language: ja\n" @@ -20,6 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/kk.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/kk.gmo differ diff -Nru libpwquality-1.2.3/po/kk.po libpwquality-1.3.0/po/kk.po --- libpwquality-1.2.3/po/kk.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/kk.po 2015-07-23 11:45:59.000000000 +0000 @@ -7,15 +7,16 @@ msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Kazakh (http://www.transifex.com/projects/p/libpwquality/" +"language/kk/)\n" "Language: kk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/km.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/km.gmo differ diff -Nru libpwquality-1.2.3/po/km.po libpwquality-1.3.0/po/km.po --- libpwquality-1.2.3/po/km.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/km.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Khoem Sokhem , 2006. -# Leang Chumsoben , 2006. +# Khoem Sokhem , 2006 +# Leang Chumsoben , 2006 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Khmer (http://www.transifex.com/projects/p/libpwquality/" +"language/km/)\n" "Language: km\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/kn.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/kn.gmo differ diff -Nru libpwquality-1.2.3/po/kn.po libpwquality-1.3.0/po/kn.po --- libpwquality-1.2.3/po/kn.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/kn.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Shankar Prasad , 2007, 2008, 2009. +# shankar , 2007-2009 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-29 13:46+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Kannada (http://www.transifex.com/projects/p/libpwquality/" +"language/kn/)\n" "Language: kn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: src/pam_pwquality.c:25 #, c-format @@ -40,22 +41,22 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "ಬಳಕೆ: %s [ಬಳಕೆದಾರ]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " ಗುಪ್ತಪದವನ್ನು ಶಿಷ್ಟವಾದ ಇನ್‌ಪುಟ್‌ನಿಂದ ಸ್ಕೋರ್ ಮಾಡಿರುವಂತೆ ಓದುತ್ತದೆ.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "ದೋಷ: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "ಸ್ಕೋರ್ ಮಾಡಬೇಕಿರುವ ಗುಪ್ತಪದವನ್ನು ಪಡೆಯಲಾಗಿಲ್ಲ" #: src/pwscore.c:73 #, c-format @@ -63,135 +64,137 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"ಗುಪ್ತಪದದ ಗುಣಮಟ್ಟದ ಪರಿಶೀಲನೆ ವಿಫಲಗೊಂಡಿದೆ:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "ಬಳಕೆ: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "ಇದನ್ನು ಹೊಂದಿಸುವಾಗ ಮೆಮೊರಿ ನಿಯೋಜನಾ ದೋಷ" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "ಮೆಮೊರಿ ನಿಯೋಜನಾ ದೋಷ" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಹಳೆಯದರಂತೆಯೆ ಇದೆ" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಒಂದು ಪ್ಯಾಲಿಂಡ್ರೋಮ್ ಆಗಿದೆ" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "ಗುಪ್ತಪದದಲ್ಲಿ ಕೇಸ್‌ ಬದಲಾವಣೆ ಮಾತ್ರ ಇದೆ" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಹಳೆಯದಕ್ಕೆ ಬಹಳವಾಗಿ ಹೋಲುತ್ತದೆ" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಬಳಕೆದಾರ ಹೆಸರಿನ ಒಂದು ರೂಪವನ್ನು ಹೊಂದಿದೆ" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಬಳಕೆದಾರರ ನಿಜವಾದ ಹೆಸರಿನ ಒಂದು ರೂಪದ ಪದಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ನಿಶೇಧಿತ ಹೆಸರಿನ ಒಂದು ರೂಪವನ್ನು ಹೊಂದಿದೆ" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಕ್ಕಿಂತ ಕಡಿಮೆ ಅಂಕಿಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಕೇವಲ ಕೆಲವೇ ಅಂಕಿಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಕ್ಕಿಂತ ಕಡಿಮೆ ಅಪ್ಪರ್-ಕೇಸ್ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ತುಂಬಾ ಕಡಿಮೆ ಲೋಯರ್-ಕೇಸ್ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಕ್ಕಿಂತ ಕಡಿಮೆ ಲೋಯರ್-ಕೇಸ್ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಅತ್ಯಂತ ಕಡಿಮೆ ಲೋಯರ್-ಕೇಸ್ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಕ್ಕಿಂತ ಕಡಿಮೆ ಅಕ್ಷರ-ಅಂಕೀಯವಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಅತಿಕಡಿಮೆ ಅಕ್ಷರ-ಅಂಕೀಯವಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಅಕ್ಷರಗಳಿಗಿಂತ ಚಿಕ್ಕದಾಗಿದೆ" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಬಹಳ ಚಿಕ್ಕದಾಗಿದೆ" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "ಹಳೆಯ ಗುಪ್ತಪದವನ್ನು ಕೇವಲ ತಿರುವುಮುರುವು ಮಾಡಲಾಗಿದೆ" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಕ್ಕಿಂತ ಕಡಿಮೆ ಅಕ್ಷರ ವರ್ಗಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಸಾಕಷ್ಟು ಅಕ್ಷರ ವರ್ಗಗಳನ್ನು ಹೊಂದಿಲ್ಲ" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಗಿಂತ ಹೆಚ್ಚಿನ ಒಂದೇ ರೀತಿಯ ಅನುಕ್ರಮವಾದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಬಹಳಷ್ಟು ಒಂದೇ ರೀತಿಯ ಅನುಕ್ರಮ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಗಿಂತ ಹೆಚ್ಚಿನ ಒಂದೇ ವರ್ಗದ ಅನುಕ್ರಮವಾದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಒಂದೇ ವರ್ಗದ ಅನುಕ್ರಮವಾದ ಬಹಳಷ್ಟು ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿದೆ" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "ಗುಪ್ತಪದವು %ld ಅಕ್ಷರಗಳಿಗಿಂತ ಉದ್ದನೆಯ ಏಕಶೈಲಿಯ ಅಕ್ಷರ ಅನುಕ್ರಮವನ್ನು ಹೊಂದಿದೆ" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಬಹಳ ಉದ್ದನೆಯ ಒಂದು ಏಕಶೈಲಿಯ ಅಕ್ಷರ ಅನುಕ್ರಮವನ್ನು ಹೊಂದಿದೆ" #: src/error.c:107 msgid "No password supplied" @@ -199,57 +202,59 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "RNG ಸಾಧನಕ್ಕಾಗಿ ಮನಸ್ಸಿಗೆ ಬಂದ ಸಂಖ್ಯೆಯನ್ನು ತೆಗೆದುಕೊಳ್ಳಲಾಗಿಲ್ಲ" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" msgstr "" +"ಗುಪ್ತಪದವನ್ನು ಉತ್ಪಾದಿಸುವಿಕೆಯು ವಿಫಲಗೊಂಡಿದೆ - ಸಿದ್ಧತೆಗಳಿಗಾಗಿ ಅಗತ್ಯವಿರುವ ಎಂಟ್ರೋಪಿಯು " +"ಬಹಳ ಕೆಳಮಟ್ಟದಲ್ಲಿದೆ" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "ಗುಪ್ತಪದವು ಶಬ್ಧಕೋಶದ ಪರಿಶೀಲಯಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "ಗೊತ್ತಿರದ ಸಿದ್ಧತೆ" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "ಸಿದ್ಧತೆಯ ತಪ್ಪು ಪೂರ್ಣಾಂಕ ಮೌಲ್ಯ" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "ತಪ್ಪು ಪೂರ್ಣಾಂಕ ಮೌಲ್ಯ" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "%s ಸಿದ್ಧತೆಯು ಒಂದು ಪೂರ್ಣಾಂಕದ ಬಗೆಯಾಗಿಲ್ಲ" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "ಸಿದ್ಧತೆಯು ಒಂದು ಪೂರ್ಣಾಂಕದ ಬಗೆಯಾಗಿಲ್ಲ" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "%s ಸಿದ್ಧತೆಯು ಒಂದು ವಾಕ್ಯಾಂಶದ ಬಗೆಯಾಗಿಲ್ಲ" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "ಸಿದ್ಧತೆಯು ಒಂದು ವಾಕ್ಯಾಂಶದ ಬಗೆಯಾಗಿಲ್ಲ" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "ಸಂರಚನಾ ಕಡತವನ್ನು ತೆರೆಯುವಲ್ಲಿ ವಿಫಲಗೊಂಡಿದೆ" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "ಸಂರಚನಾ ಕಡತವು ತಪ್ಪಾಗಿದೆ" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "ಮಾರಕ ವಿಫಲತೆ" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/ko.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/ko.gmo differ diff -Nru libpwquality-1.2.3/po/ko.po libpwquality-1.3.0/po/ko.po --- libpwquality-1.2.3/po/ko.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/ko.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Eunju Kim , 2007, 2009. +# eukim , 2007,2009 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-29 13:46+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Korean (http://www.transifex.com/projects/p/libpwquality/" +"language/ko/)\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: src/pam_pwquality.c:25 #, c-format @@ -40,22 +41,22 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "사용법: %s [user]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " 이 명령은 표준 입력에서 득점할 암호를 읽습니다.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "오류: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "득점할 암호를 얻을 수 없습니다" #: src/pwscore.c:73 #, c-format @@ -63,114 +64,117 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"암호 수준 검사에 실패했습니다:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "사용법: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "설정시 메모리 할당 오류" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "메모리 할당 오류" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "암호가 이전 암호와 동일함" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "암호가 앞뒤 어느쪽에서 읽어도 같은 문맥임" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "암호는 대소 문자 변경만으로 다릅니다" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "암호가 이전 암호와 너무 유사합니다" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "암호에 어떤 형식으로 사용자 이름이 포함되어 있습니다 " #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" msgstr "" +"암호에는 어떤 형식으로 사용자의 실제 이름에서의 단어가 포함되어 있습니다" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "암호에는 어떤 형식으로 금지된 단어가 포함되어 있습니다" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "암호에는 %ld개 미만의 숫자가 포함되어 있습니다" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "암호에 숫자의 개수가 부족합니다" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "암호에는 %ld개 미만의 대문자가 포함되어 있습니다" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "암호에 대문자의 개수가 부족합니다" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "암호에는 %ld개 미만의 소문자가 포함되어 있습니다" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "암호에 소문자 개수가 부족합니다" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "암호에는 영숫자가 아닌 %ld개 미만의 문자가 포함되어 있습니다" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "암호에는 너무 적은 영숫자가 아닌 문자가 포함되어 있습니다" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "암호는 %ld 개의 문자 보다 짧습니다" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "암호가 너무 짧습니다" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "암호가 이전 암호를 회전 적용하였습니다" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "암호에는 %ld 미만의 문자 클래스가 포함되어 있습니다" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "암호에는 충분한 문자 클래스가 포함되어 있지 않습니다" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "암호에는 %ld개 이상의 동일한 문자가 연속적으로 포함되어 있습니다" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "암호에는 너무 많은 동일한 문자가 연속적으로 포함되어 있습니다" #: src/error.c:96 #, c-format @@ -178,20 +182,21 @@ "The password contains more than %ld characters of the same class " "consecutively" msgstr "" +"암호에는 %ld개 이상의 동일한 클래스 문자가 연속적으로 포함되어 있습니다" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "암호에는 너무 많은 동일한 클래스 문자가 연속적으로 포함되어 있습니다" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "암호에 %ld자를 초과하는 단조로운 문자열이 포함되어 있습니다." #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "암호에 너무 단조로운 문자열이 포함되어 있습니다." #: src/error.c:107 msgid "No password supplied" @@ -199,57 +204,57 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "RNG 장치에서 임의의 숫자를 가져올 수 없습니다" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" -msgstr "" +msgstr "암호 생성에 실패했습니다 - 설정에 필요한 엔트로피가 너무 작습니다 " #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "암호는 사전 검사에 실패했습니다 " #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "알 수 없는 설정 " #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "설정에 대해 잘못된 정수 값 " #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "잘못된 정수값 " #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "설정 %s은 정수 유형이 아닙니다 " #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "설정이 정수 유형이 아닙니다 " #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "설정 %s은 문자열 유형이 아닙니다 " #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "설정은 문자열 유형이 아닙니다 " #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "설정 파일 열기에 실패했습니다 " #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "설정 파일이 잘못되었습니다 " #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "치명적인 오류가 발생했습니다" #: src/error.c:153 msgid "Unknown error" diff -Nru libpwquality-1.2.3/po/libpwquality.pot libpwquality-1.3.0/po/libpwquality.pot --- libpwquality-1.2.3/po/libpwquality.pot 2012-12-20 09:03:54.000000000 +0000 +++ libpwquality-1.3.0/po/libpwquality.pot 2015-07-23 11:45:58.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: libpwquality 1.3.0\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/ml.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/ml.gmo differ diff -Nru libpwquality-1.2.3/po/ml.po libpwquality-1.3.0/po/ml.po --- libpwquality-1.2.3/po/ml.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/ml.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ani Peter , 2007. +# Ani Peter , 2007 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-29 13:46+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Malayalam (http://www.transifex.com/projects/p/libpwquality/" +"language/ml/)\n" "Language: ml\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format @@ -40,22 +41,22 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "ഉപയോഗിയ്ക്കേണ്ട വിധം: %s [user]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " സാധാരണ ഇന്‍പുട്ടില്‍ നിന്നും ലഭ്യമാക്കുവാനുള്ള രഹസ്യവാക്ക് കമാന്‍ഡ് ലഭ്യമാക്കുന്നു.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "പിശക്: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "രഹസ്യവാക്ക് ലഭ്യമാക്കുവാനായില്ല" #: src/pwscore.c:73 #, c-format @@ -63,135 +64,137 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"രഹസ്യവാക്കിന്റെ നിലവാര പരിശോധന പരാജയപ്പെട്ടു:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "ഉപയോഗിയ്ക്കേണ്ട വിധം: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "സജ്ജമാക്കുമ്പോള്‍ മെമ്മറി അനുവദിയ്ക്കുന്നതിലുള്ള പിശക്" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "മെമ്മറി അനുവദിയ്ക്കുന്നതില്‍ പിശക്" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "രഹസ്യവാക്ക് പഴയതു് പോലെ തന്നെ" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "രഹ്യവാക്ക് പാലിന്‍ഡ്രോമാകുന്നു" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "അക്ഷരങ്ങളുടെ വലിപ്പം മാറുമ്പോള്‍ മാത്രം രഹസ്യവാക്ക് മാറുന്നു" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "രഹസ്യവാക്കിനു് പഴയതുമായി വളരെ സാമ്യമുണ്ടു്" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ ഉപയോക്തൃനാമമുണ്ടു്" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "ഉപയോക്താവിന്റെ യഥാര്‍ത്ഥ പേരു് രഹസ്യവാക്കിലുണ്ടു്" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ ഉപയോഗിയ്ക്കുവാന്‍ പാടില്ലാത്ത വാക്കുകളുണ്ടു്" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "%ld അക്കങ്ങളേക്കാള്‍ കുറവാണു് രഹസ്യവാക്ക്" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ വളരെ കുറവു് അക്കങ്ങള്‍" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ %ld-നേക്കാള്‍ വലിയ അക്ഷരങ്ങളുണ്ടു്" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ വളരെ കുറവു് വലിയ അക്ഷരങ്ങള്‍" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ %ld-നേക്കാള്‍ ചെറിയ അക്ഷരങ്ങളുണ്ടു്" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ വളരെ കുറവു് ചെറിയ അക്ഷരങ്ങളുണ്ടു്" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ %ld-നേക്കാള്‍ കുറഞ്ഞ ആല്‍ഫാന്യൂമറിക്കു് അക്ഷരങ്ങളുണ്ടു്" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ വളരെ‍ കുറഞ്ഞ ആല്‍ഫാന്യൂമറിക്കു് അക്ഷരങ്ങളുണ്ടു്" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "രഹസ്യവാക്ക് %ld അക്ഷരങ്ങളേക്കാള്‍ കുറവാണു്" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "രഹസ്യവാക്ക് വളരെ ചെറുതാണു്" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "പഴയ രഹസ്യവാക്ക് തിരിച്ചിട്ടിരിയ്ക്കുന്നു" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ %ld-നേക്കാള്‍ കുറഞ്ഞ അക്ഷര ക്ലാസ്സുകള്‍" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "മതിയായ ക്യാരക്ടര്‍ ക്ലാസ്സുകള്‍ രഹസ്യവാക്കില്‍ ലഭ്യമല്ല" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ %ld-നേക്കാള്‍ കൂടുതല്‍ അടുത്തടുത്തുള്ള ഒരേ അക്ഷരങ്ങള്‍" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "രഹസ്യവാക്കില്‍ അടുത്തടുത്തു് ഒരേ അക്ഷരങ്ങള്‍ ഒരുപാടുണ്ടു്." #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "%ld-ത്തേക്കാള്‍ ഒരേ തരത്തിലുള്ള അനവധി അക്ഷരങ്ങള്‍ അടുത്തടുത്തു് രഹസ്യവാക്കിലുണ്ടു്" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "ഒരേ തരത്തിലുള്ള അനവധി അക്ഷരങ്ങള്‍ അടുത്തടുത്തു് രഹസ്യവാക്കിലുണ്ടു്" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "%ld-നേക്കാള്‍‍ നീളമുള്ള ഒരേ തലത്തിലുള്ള അക്ഷരങ്ങള്‍ രഹസ്യവാക്കിലുണ്ടു്" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "ഒരേ തലത്തിലുള്ള അക്ഷര ക്രമം രഹസ്യവാക്കില്‍ വളരെ നീളമുള്ളതു്" #: src/error.c:107 msgid "No password supplied" @@ -199,57 +202,57 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "ആര്‍എന്‍ജി ഡിവൈസില്‍ നിന്നും അക്കങ്ങള്‍ ലഭ്യമാക്കുവാന്‍ സാധ്യമല്ല" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" -msgstr "" +msgstr "രഹസ്യവാക്ക് തയ്യാറാക്കുന്നതില്‍ പരാജയം - സജ്ജീകരണങ്ങള്‍ക്കു് ആവശ്യമായ എന്‍ട്രോപ്പി വളരെ കുറവു്" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "നിഘണ്ടു പരിശോധനയില്‍ രഹസ്യവാക്ക് പരാജയപ്പെട്ടു" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "അപരിചിതമായ സജ്ജീകരണം" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "സജ്ജീകരണത്തിനു് തെറ്റായ ഇന്റിജര്‍ മൂല്ല്യം" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "തെറ്റായ ഇന്റിജര്‍ മൂല്ല്യം" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "%s സജ്ജീകരണം ഇന്റിജര്‍ തരമല്ല" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "സജ്ജീകരണം ഇന്റിജര്‍ തരമല്ല" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "%s സജ്ജീകരണം സ്ട്രിങ് തരമല്ല" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "സജ്ജീകരണം സ്ട്രിങ് തരമല്ല" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "ക്രമീകരണ ഫയല്‍ തുറക്കുന്നതില്‍ പരാജയപ്പെട്ടു" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "ക്രമീകരണ ഫയലില്‍ തകരാര്‍" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "സാരമായ പരാജയം" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/mr.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/mr.gmo differ diff -Nru libpwquality-1.2.3/po/mr.po libpwquality-1.3.0/po/mr.po --- libpwquality-1.2.3/po/mr.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/mr.po 2015-07-23 11:45:59.000000000 +0000 @@ -4,58 +4,60 @@ # # Translators: # Sandeep Shedmake , 2008, 2009. +# Sandeep Shedmake , 2008, 2009, 2013. msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" -"Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-09-23 12:14-0400\n" +"Last-Translator: Sandeep Shedmake \n" +"Language-Team: Marathi \n" "Language: mr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format msgid "New %s%spassword: " -msgstr "नवीन गुप्तशब्द %s%sp: " +msgstr "नवीन पासवर्ड %s%sp: " #: src/pam_pwquality.c:27 #, c-format msgid "Retype new %s%spassword: " -msgstr "नवीन गुप्तशब्द %s%sp पुन्हा टाइप करा: " +msgstr "नवीन पासवर्ड %s%sp पुन्हा टाइप करा: " #: src/pam_pwquality.c:28 msgid "Sorry, passwords do not match." -msgstr "माफ करा, गुप्तशब्द जुळत नाही." +msgstr "माफ करा, पासवर्ड जुळत नाही." #: src/pam_pwquality.c:241 #, c-format msgid "BAD PASSWORD: %s" -msgstr "अयोग्य गुप्तशब्द: %s" +msgstr "अयोग्य पासवर्ड: %s" #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "वापर: %s [वापरकर्ता]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " स्टँडर्ड इंपुटपासून आदेश स्कोरजोगी पासवर्ड वाचतो.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "त्रुटी: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "स्कोरजोगी पासवर्ड प्राप्त करणे अशक्य" #: src/pwscore.c:73 #, c-format @@ -63,193 +65,196 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"पासवर्ड दर्जा तपासणी अपयशी:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "वापर: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "सेट करताना मेमरि वाटप त्रुटी" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "मेमरि वाटप त्रुटी" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "पासवर्ड जुण्या प्रमाणेच आहे" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "पासवर्ड पॅलिंड्रोम आहे" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "पासवर्ड फक्त आकार बदलसह भिन्न आहे" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "पासवर्ड जुण्याप्रमाणेच आहे" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "पासवर्डमध्ये वापरकर्ता नाव ठराविक स्वरूपात समाविष्टीत आहे" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" msgstr "" +"पासवर्डमध्ये वापरकर्ताच्या वास्तविक नावातील ठराविक स्वरूपात काही शब्द समाविष्टीत आहे" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "पासवर्डमध्ये मनाई केलेले शब्द ठराविक स्वरूपात समाविष्टीत आहे" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "पासवर्डमध्ये %ld पेक्षा कमी अंक आहेत" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "पासवर्डमध्ये खूपच कमी अंक आहेत" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "पासवर्डमध्ये %ld पेक्षा कमी अप्परकेस अक्षरे समाविष्टीत आहे" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "पासवर्डमध्ये खूपच कमी अप्परकेस अक्षरे समाविष्टीत आहे" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "पासवर्डमध्ये %ld पेक्षा कमी लोवरकेस अक्षरे समाविष्टीत आहे" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "पासवर्डमध्ये खूपच कमी लोवरकेस अक्षरे समाविष्टीत आहे" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "पासवर्डमध्ये %ld पेक्षा कमी नॉन-अल्फन्युमेरिक अक्षरे समाविष्टीत आहे" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "पासवर्डमध्ये खूपच कमी नॉन-अल्फन्युमेरिक अक्षरे समाविष्टीत आहे" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "पासवर्ड %ld अक्षरांपेक्षा छोटे आहे" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "पासवर्ड खूपच छोटे आहे" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "पासवर्ड जुण्या प्रमाणेच बदललेले आहे" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "पासवर्डमध्ये %ld पेक्षा कमी कॅरेक्टर क्लासेस समाविष्टीत आहे" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "पासवर्डमध्ये अतिरीक्त कॅरेक्टर क्लासेस समाविष्टीत नाही" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "पासवर्डमध्ये %ld पेक्षा जास्त अक्षरे सलग समाविष्टीत आहे" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "पासवर्डमध्ये खूप जास्त समान अक्षरे सलग समाविष्टीत आहे" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "पासवर्डमध्ये एकाच वर्गाचे %ld पेक्षा जास्त अक्षरे सलग समाविष्टीत आहे" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "पासवर्डमध्ये एकाच वर्गाचे एकापेक्षा जास्त अक्षरे सलग समाविष्टीत आहे" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "पासवर्डमध्ये %ld पेक्षा मोठे मोनोटोनिक अनुक्रम समाविष्टीत आहे" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "पासवर्डमध्ये मोनोटोनिक अनुक्रमपेक्षा जास्त अक्षरे समाविष्टीत आहे" #: src/error.c:107 msgid "No password supplied" -msgstr "गुप्तशब्द दिलेला नाही" +msgstr "पासवर्ड दिलेला नाही" #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "RNG साधनापासून विनाक्रम क्रमांक प्राप्त करणे अशक्य" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" -msgstr "" +msgstr "पासवर्ड निर्माण अपयशी - सेटिंग्जकरिता आवश्यक एंट्रोपी खूपच कमी आहे" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "पासवर्ड शब्दकोश तपासणीमध्ये अपयशी ठरतो" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "अपरिचीत सेटिंग" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "सेटिंगचे अयोग्य इंटिजर मूल्य" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "अयोग्य इंटिजर मूल्य" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "सेटिंग %s इंटिजर प्रकार नाही" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "सेटिंग इंटिजर प्रकार नाही" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "सेटिंग %s इंटिजर प्रकार नाही" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "सेटिंग स्ट्रिंग प्रकार नाही" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "संरचना फाइल उघडणे अपयशी" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "संरचना फाइल सदोषीत आहे" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "घातक अपयश" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/mr_IN.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/mr_IN.gmo differ diff -Nru libpwquality-1.2.3/po/mr_IN.po libpwquality-1.3.0/po/mr_IN.po --- libpwquality-1.2.3/po/mr_IN.po 2013-09-12 11:14:48.000000000 +0000 +++ libpwquality-1.3.0/po/mr_IN.po 2015-07-23 11:45:59.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2013-08-23 07:35+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" "Language-Team: Marathi (India) (http://www.transifex.com/projects/p/" "libpwquality/language/mr_IN/)\n" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/ms.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/ms.gmo differ diff -Nru libpwquality-1.2.3/po/ms.po libpwquality-1.3.0/po/ms.po --- libpwquality-1.2.3/po/ms.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/ms.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,256 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR libpwquality project -# This file is distributed under the same license as the PACKAGE package. -# -# Translators: -# Sharuzzaman Ahmat Raslan , 2008. -msgid "" -msgstr "" -"Project-Id-Version: PWQuality library\n" -"Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2011-11-30 12:15+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: ms\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" - -#: src/pam_pwquality.c:25 -#, c-format -msgid "New %s%spassword: " -msgstr "" - -#: src/pam_pwquality.c:27 -#, c-format -msgid "Retype new %s%spassword: " -msgstr "" - -#: src/pam_pwquality.c:28 -msgid "Sorry, passwords do not match." -msgstr "" - -#: src/pam_pwquality.c:241 -#, c-format -msgid "BAD PASSWORD: %s" -msgstr "" - -#: src/pwscore.c:22 -#, c-format -msgid "Usage: %s [user]\n" -msgstr "" - -#: src/pwscore.c:23 -#, c-format -msgid "" -" The command reads the password to be scored from the standard input.\n" -msgstr "" - -#: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 -#, c-format -msgid "Error: %s\n" -msgstr "" - -#: src/pwscore.c:51 -msgid "Could not obtain the password to be scored" -msgstr "" - -#: src/pwscore.c:73 -#, c-format -msgid "" -"Password quality check failed:\n" -" %s\n" -msgstr "" - -#: src/pwmake.c:22 -#, c-format -msgid "Usage: %s \n" -msgstr "" - -#: src/error.c:31 -msgid "Memory allocation error when setting" -msgstr "" - -#: src/error.c:35 -msgid "Memory allocation error" -msgstr "" - -#: src/error.c:37 -msgid "The password is the same as the old one" -msgstr "" - -#: src/error.c:39 -msgid "The password is a palindrome" -msgstr "" - -#: src/error.c:41 -msgid "The password differs with case changes only" -msgstr "" - -#: src/error.c:43 -msgid "The password is too similar to the old one" -msgstr "" - -#: src/error.c:45 -msgid "The password contains the user name in some form" -msgstr "" - -#: src/error.c:47 -msgid "The password contains words from the real name of the user in some form" -msgstr "" - -#: src/error.c:49 -msgid "The password contains forbidden words in some form" -msgstr "" - -#: src/error.c:52 -#, c-format -msgid "The password contains less than %ld digits" -msgstr "" - -#: src/error.c:55 -msgid "The password contains too few digits" -msgstr "" - -#: src/error.c:58 -#, c-format -msgid "The password contains less than %ld uppercase letters" -msgstr "" - -#: src/error.c:61 -msgid "The password contains too few uppercase letters" -msgstr "" - -#: src/error.c:64 -#, c-format -msgid "The password contains less than %ld lowercase letters" -msgstr "" - -#: src/error.c:67 -msgid "The password contains too few lowercase letters" -msgstr "" - -#: src/error.c:70 -#, c-format -msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" - -#: src/error.c:73 -msgid "The password contains too few non-alphanumeric characters" -msgstr "" - -#: src/error.c:76 -#, c-format -msgid "The password is shorter than %ld characters" -msgstr "" - -#: src/error.c:79 -msgid "The password is too short" -msgstr "" - -#: src/error.c:81 -msgid "The password is just rotated old one" -msgstr "" - -#: src/error.c:84 -#, c-format -msgid "The password contains less than %ld character classes" -msgstr "" - -#: src/error.c:87 -msgid "The password does not contain enough character classes" -msgstr "" - -#: src/error.c:90 -#, c-format -msgid "The password contains more than %ld same characters consecutively" -msgstr "" - -#: src/error.c:93 -msgid "The password contains too many same characters consecutively" -msgstr "" - -#: src/error.c:96 -#, c-format -msgid "" -"The password contains more than %ld characters of the same class " -"consecutively" -msgstr "" - -#: src/error.c:99 -msgid "" -"The password contains too many characters of the same class consecutively" -msgstr "" - -#: src/error.c:102 -#, c-format -msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" - -#: src/error.c:105 -msgid "The password contains too long of a monotonic character sequence" -msgstr "" - -#: src/error.c:107 -msgid "No password supplied" -msgstr "" - -#: src/error.c:109 -msgid "Cannot obtain random numbers from the RNG device" -msgstr "" - -#: src/error.c:111 -msgid "Password generation failed - required entropy too low for settings" -msgstr "" - -#: src/error.c:114 src/error.c:117 -msgid "The password fails the dictionary check" -msgstr "" - -#: src/error.c:120 src/error.c:124 -msgid "Unknown setting" -msgstr "" - -#: src/error.c:127 -msgid "Bad integer value of setting" -msgstr "" - -#: src/error.c:131 -msgid "Bad integer value" -msgstr "" - -#: src/error.c:134 -#, c-format -msgid "Setting %s is not of integer type" -msgstr "" - -#: src/error.c:138 -msgid "Setting is not of integer type" -msgstr "" - -#: src/error.c:141 -#, c-format -msgid "Setting %s is not of string type" -msgstr "" - -#: src/error.c:145 -msgid "Setting is not of string type" -msgstr "" - -#: src/error.c:147 -msgid "Opening the configuration file failed" -msgstr "" - -#: src/error.c:149 -msgid "The configuration file is malformed" -msgstr "" - -#: src/error.c:151 -msgid "Fatal failure" -msgstr "" - -#: src/error.c:153 -msgid "Unknown error" -msgstr "" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/nb.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/nb.gmo differ diff -Nru libpwquality-1.2.3/po/nb.po libpwquality-1.3.0/po/nb.po --- libpwquality-1.2.3/po/nb.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/nb.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Kjartan Maraas , 2008. -# Olav Pettershagen , 2005, 2006. +# Kjartan Maraas , 2008 +# Olav Pettershagen , 2005, 2006 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/" +"libpwquality/language/nb/)\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/nl.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/nl.gmo differ diff -Nru libpwquality-1.2.3/po/nl.po libpwquality-1.3.0/po/nl.po --- libpwquality-1.2.3/po/nl.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/nl.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,24 +3,25 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Geert Warrink , 2010, 2011. -# Peter van Egdom , 2008. -# R.E. van der Luit , 2009. -# R.F. Pels , 2005. -# Rinse de Vries , 2005, 2006. +# Geert Warrink , 2010, 2011 +# Peter van Egdom , 2008 +# Richard E. van der Luit , 2009 +# R.F. Pels , 2005 +# Rinse de Vries , 2005, 2006 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/libpwquality/" +"language/nl/)\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/or.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/or.gmo differ diff -Nru libpwquality-1.2.3/po/or.po libpwquality-1.3.0/po/or.po --- libpwquality-1.2.3/po/or.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/or.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Manoj Kumar Giri , 2008, 2009. -# Subhransu Behera , 2007. +# Manoj Kumar Giri , 2008-2009,2013 +# Subhransu Behera , 2007 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-29 13:46+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Oriya (http://www.transifex.com/projects/p/libpwquality/" +"language/or/)\n" "Language: or\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format @@ -41,22 +42,22 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "ବ୍ଯବହାର: %s [user]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " ଏହି ନିର୍ଦ୍ଦେଶଟି ପାଇବାକୁ ଥିବା ପ୍ରବେଶ ସଂକେତକୁ ମାନକ ନିବେଶରୁ ପଢ଼ିଥାଏ।\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "ତୃଟି: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "ପାଇବା ପାଇଁ ପ୍ରବେଶ ସଂକେତ ପାଇଲା ନାହିଁ" #: src/pwscore.c:73 #, c-format @@ -64,135 +65,137 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"ପ୍ରବେଶ ସଂକେତ ଗୁଣବତ୍ତା ଯାଞ୍ଚ ବିଫଳ ହୋଇଛି:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "ବ୍ୟବହାର: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "ବ୍ୟବସ୍ଥା କରିବା ସମୟରେ ସ୍ମୃତିସ୍ଥାନ ବଣ୍ଟନ ତୃଟି" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "ସ୍ମୃତିସ୍ଥାନ ବଣ୍ଟନ ତ୍ରୁଟି" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତଟି ପୁରୁଣା ସହିତ ସମାନ" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "ଏହି ପ୍ରବେଶ ସଂକେତଟି ଏକ ବିଲୋମପଦ ଅଟେ" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତ କେବଳ ଅକ୍ଷର ପ୍ରକାର ପରିବର୍ତ୍ତନରେ ଭିନ୍ନ ହୋଇଥାଏ" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "ଏହି ପ୍ରବେଶ ସଂକେତଟି ପୁରୁଣା ସହିତ ସାଦୃଶ" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "ଏହି ପ୍ରବେଶ ସଂକେତରେ ବ୍ୟବହାରକାରୀଙ୍କ ନାମ ସମାନ ଆକାରରେ ଅଛି" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "ଏହି ପ୍ରବେଶ ସଂକେତରେ ବ୍ୟବହାରକାରୀର ପ୍ରକୃତ ନାମକୁ କୌଣସି ପ୍ରକାରରେ ଧାରଣ କରିଥାଏ" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତଟି କିଛି ମାତ୍ରାରେ ବାରଣ ହୋଇଥିବା ଶବ୍ଦଗୁଡ଼ିକୁ ଧାରଣ କରିଥାଏ" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତଟି %ld ରୁ କମ ଅଙ୍କ ଧାରଣ କରିଅଛି" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତଟି କିଛି କମ ଅଙ୍କ ଧାରଣ କରିଛି" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତରେ %ld ରୁ କମ ବଡ଼ ଅକ୍ଷର ଧାରଣ କରିଥାଏ" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତଟି ବହୁତ କମ ବଡ଼ ଅକ୍ଷର ଧାରଣ କରିଥାଏ" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "ଏହି ପ୍ରବେଶ ସଂକେତରେ %ld ରୁ କମ ଛୋଟ ଅକ୍ଷର ଅଛି" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "ଏହି ପ୍ରବେଶ ସଂକେତରେ ଅଳ୍ପ କିଛି ଛୋଟ ଅକ୍ଷର ଅଛି" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "ଏହି ପ୍ରବେଶ ସଂକେତରେ %ld ରୁ କମ ଅକ୍ଷର କିମ୍ବା ସଂଖ୍ୟା ନଥିବା ବର୍ଣ୍ଣ ଅଛି" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "ଏହି ପ୍ରବେଶ ସଂକେତରେ ଅଳ୍ପ କିଛି ଅକ୍ଷର କିମ୍ବା ସଂଖ୍ୟା ନଥିବା ବର୍ଣ୍ଣ ଅଛି" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତଟି %ld ଅକ୍ଷରରୁ ଛୋଟ ଅଟେ" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "ପ୍ରବେଶ ସଙ୍କେତଟି ଅତି ଛୋଟ ଅଟେ" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତଟି ପୁରୁଣାଟିକୁ ଘୁରାଇଥାଏ" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତରେ %ld ରୁ କମ ଛୋଟ ଅକ୍ଷର ଅଛି" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତରେ ଯଥେଷ୍ଟ ଅକ୍ଷର ଶ୍ରେଣୀ ନାହିଁ" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତରେ %ld ରୁ ଅଧିକ ସମାନ ଅକ୍ଷର ପାଖାପାଖି ଅଛି" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତ ଅତ୍ୟଧିକ ସମାନ ଅକ୍ଷରକୁ ପାଖାପାଖି ଧାରଣ କରିଥାଏ" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତରେ %ld ରୁ ଅଧିକ ସମାନ ଶ୍ରେଣୀର ଅକ୍ଷର ପାଖାପାଖି ଥାଏ" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତରେ ଅତ୍ୟଧିକ ସମାନ ଶ୍ରେଣୀର ଅକ୍ଷର ପାଖାପାଖି ଥାଏ" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତରେ %ld ରୁ ଅଧିକ ଏକାପ୍ରକାର କ୍ରମ ପାଖାପାଖି ଥାଏ" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତ ଅତ୍ୟଧିକ ବଡ଼ ଏକା ପ୍ରକାରର ଅକ୍ଷର କ୍ରମଧାରଣ କରିଥାଏ" #: src/error.c:107 msgid "No password supplied" @@ -200,57 +203,57 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "ମନଇଚ୍ଛା ସଂଖ୍ୟାଗୁଡ଼ିକୁ RNG ଉପକରଣରୁ ଧାରଣ କରିପାରିବ ନାହିଁ" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତ ସୃଷ୍ଟି ବିଫଳ ହୋଇଛି - ବିନ୍ୟାସ ପାଇଁ ଅତି କମ ଏଣ୍ଟ୍ରପି ଆବଶ୍ୟକ ହୋଇଥାଏ" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତ ଅଭିଧାନ ଯାଞ୍ଚକୁ ବିଫଳ କରିଥାଏ" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "ଅଜଣା ସଂରଚନା" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "ସଂରଚନା ପାଇଁ ଖରାପ ଗଣନ ସଂଖ୍ୟା ମୂଲ୍ୟ" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "ଖରାପ ଗଣନ ସଂଖ୍ୟା ମୂଲ୍ୟ" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "ସଂରଚନା %s ଟି ଗଣନ ସଂଖ୍ୟା ପ୍ରକାରର ନୁହଁ" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "ସଂରଚନାଟି ଗଣନ ସଂଖ୍ୟା ପ୍ରକାରର ନୁହଁ" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "ସଂରଚନା %s ଟି ବାକ୍ୟ ପ୍ରକାରର ନୁହଁ" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "ସଂରଚନାଟି ବାକ୍ୟ ପ୍ରକାରର ନୁହଁ" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "ସଂରଚନା ଫାଇଲକୁ ଖୋଲିବା ବିଫଳ ହୋଇଛି" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "ସଂରଚନା ଫାଇଲଟି ତୃଟିଯୁକ୍ତ ଅଟେ" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "ଗୁରୁତର ବିଫଳତା" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/pa.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/pa.gmo differ diff -Nru libpwquality-1.2.3/po/pa.po libpwquality-1.3.0/po/pa.po --- libpwquality-1.2.3/po/pa.po 2013-09-12 11:14:48.000000000 +0000 +++ libpwquality-1.3.0/po/pa.po 2015-07-23 11:45:59.000000000 +0000 @@ -8,10 +8,10 @@ # Jaswinder Singh , 2009 msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2013-09-10 13:37+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-09-16 02:37-0400\n" "Last-Translator: asaini \n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/" "libpwquality/language/pa/)\n" @@ -20,6 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format @@ -29,11 +30,11 @@ #: src/pam_pwquality.c:27 #, c-format msgid "Retype new %s%spassword: " -msgstr "ਨਵਾਂ %s%sਗੁਪਤ-ਸ਼ਬਦ ਮੁੜ-ਲਿਖੋ: " +msgstr "ਨਵਾਂ %s%s ਗੁਪਤ-ਸ਼ਬਦ ਮੁੜ-ਲਿਖੋ: " #: src/pam_pwquality.c:28 msgid "Sorry, passwords do not match." -msgstr "ਮਾਫ ਕਰਨਾ ਗੁਪਤ-ਸ਼ਬਦ ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ।" +msgstr "ਮਾਫ ਕਰਨਾ ਗੁਪਤ-ਸ਼ਬਦ ਮੇਲ ਨਹੀਂ ਖਾਂਦੇ।" #: src/pam_pwquality.c:241 #, c-format @@ -49,7 +50,7 @@ #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr "ਕਮਾਂਡ ਪ੍ਰਮਾਣਿਤ ਇਨਪੁਟ ਤੋਂ ਭਰਿਆ ਜਾਣ ਵਾਲਾ ਗੁਪਤ-ਸ਼ਬਦ ਪੜ੍ਹਦੀ ਹੈ।\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format @@ -58,7 +59,7 @@ #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "ਭਰਿਆ ਜਾਣ ਵਾਲਾ ਗੁਪਤ-ਸ਼ਬਦ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" #: src/pwscore.c:73 #, c-format @@ -92,111 +93,111 @@ #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਸਿਰਫ਼ ਅੱਖਰ-ਆਕਾਰ ਬਦਲਣ ਨਾਲ ਵੀ ਵੱਖਰਾ ਹੋ ਜਾਂਦਾ ਹੈ" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਪੁਰਾਣੇ ਵਾਲੇ ਨਾਲ ਬਹੁਤ ਜਿਆਦਾ ਮਿਲਦਾ-ਜੁਲਦਾ ਹੈ" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਕਿਸੇ ਰੂਪ ਵਿੱਚ ਯੂਜ਼ਰ ਨਾਂ ਵੀ ਸਮਾਇਆ ਹੋਇਆ ਹੈ" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਯੂਜ਼ਰ ਦੇ ਅਸਲ ਨਾਮ ਦੇ ਸ਼ਬਦ ਕਿਸੇ ਰੂਪ ਵਿੱਚ ਸਮਾਏ ਹਨ" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਪਾਬੰਦੀਸ਼ੁਦਾ ਸ਼ਬਦ ਕਿਸੇ ਰੂਪ ਵਿੱਚ ਸਮਾਏ ਹਨ" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ %ld ਤੋਂ ਘੱਟ ਅੱਖਰ ਹਨ" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਬਹੁਤ ਹੀ ਜਿਆਦਾ ਘੱਟ ਅੱਖਰ ਹਨ" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ %ld ਤੋਂ ਘੱਟ ਵੱਡ-ਆਕਾਰੀ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਬਹੁਤ ਹੀ ਘੱਟ ਵੱਡ-ਆਕਾਰੀ ਅੱਖਰ ਹਨ" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ %ld ਛੋਟੇ ਆਕਾਰ ਅੱਖਰਾਂ ਨਾਲੋਂ ਘੱਟ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਬਹੁਤ ਹੀ ਘੱਟ ਛੋਟੇ ਆਕਾਰ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ %ld ਨਾਲੋਂ ਘੱਟ ਗੈਰ-ਅੱਖਰ-ਅੰਕ ਅੱਖਰ ਸ਼ਾਮਿਲ ਹਨ" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਬਹੁਤ ਹੀ ਜਿਆਦਾ ਘੱਟ ਗੈਰ ਅੱਖਰ-ਅੰਕ ਅੱਖਰ ਸ਼੍ਮਿਲ ਹਨ" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "ਗੁਪਜ-ਸ਼ਬਦ %ld ਅੱਖਰਾਂ ਨਾਲੋਂ ਛੋਟਾ ਹੈ" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਬਹੁਤ ਹੀ ਛੋਟਾ ਹੈ" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਨੇ ਪੁਰਾਣੇ ਵਾਲੇ ਨੂੰ ਬਦਲ ਦਿੱਤਾ ਹੈ" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ %ld ਅੱਖਰ ਵਰਗਾਂ ਨਾਲੋਂ ਘੱਟ ਸ਼ਾਨਿਲ ਹਨ" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਕਾਫੀ ਅੱਖਰ ਵਰਗ ਨਹੀਂ ਹਨ" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ %ld ਤੋਂ ਵੱਧ ਸਮਾਨ ਅੱਖਰ ਤਰਤੀਬ ਵਿੱਚ ਲੱਗੇ ਹਨ" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਬਹੁਤ ਹੀ ਜਿਆਦਾ ਸਮਾਨ ਅੱਖਰ ਤਰਤੀਬਵਾਰ ਲੱਗੋ ਹਨ" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਇੱਕ ਹੀ ਵਰਗ ਦੇ %ld ਤੋਂ ਵੱਧ ਅੱਖਰ ਤਰਤੀਬਵਾਰ ਸਮਾਏ ਹਨ" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਇੱਕ ਹੀ ਵਰਗ ਦੇ ਬਹੁਤ ਜਿਆਦਾ ਅੱਖਰ ਤਰਤੀਬਵਾਰ ਸਮਾਏ ਹਨ" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ %ld ਅੱਖਰਾਂ ਤੋਂ ਵੱਧ ਇਕਸੁਰ ਤਰਤੀਬ ਸਮਾਈ ਹੈ" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਵਿੱਚ ਬਹੁਤ ਹੀ ਲੰਬੀ ਇਕਸੁਰ ਅੱਖਰ ਤਰਤੀਬ ਸਮਾਈ ਹੈ" #: src/error.c:107 msgid "No password supplied" @@ -204,57 +205,57 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr " RNG ਯੰਤਰ ਲਈ ਬੇਤਰਤੀਬ ਅੰਕ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਪੈਦਾ ਕਰਨਾ ਅਸਫਲ ਹੋਇਆ - ਲੋੜੀਂਦੀ ਐਨਟਰੌਪੀ ਸੈਟਿੰਗਾਂ ਲਈ ਬਹੁਤ ਥੋੜੀ ਹੈ" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "ਗੁਪਤ-ਸ਼ਬਦ ਦੀ ਸ਼ਬਦ-ਕੋਸ਼ ਜਾਂਚ ਅਸਫਲ ਹੋਈ" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "ਅਣਪਛਾਤੀ ਸੈਟਿੰਗ" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "ਸੈਟਿੰਗ ਦਾ ਮਾੜਾ ਪੂਰਨ ਅੰਕ ਮੁੱਲ" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "ਮਾੜਾ ਪੂਰਨ ਅੰਕ ਮੁੱਲ" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "ਸੈਟਿੰਗ %s ਪੂਰਨ ਅੰਕ ਕਿਸਮ ਦੀ ਨਹੀਂ ਹੈ" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "ਸੈਟਿੰਗ ਪੂਰਨ ਅੰਕ ਕਿਸਮ ਦੀ ਨਹੀਂ ਹੈ" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "ਸੈਟਿੰਗ %s ਸਤਰ੍ਹ ਕਿਸਮ ਦੀ ਨਹੀਂ ਹੈ" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "ਸੈਟਿੰਗ ਸਤਰ੍ਹ ਕਿਸਮ ਦੀ ਨਹੀਂ ਹੈ" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "ਸੰਰਚਨਾ ਫ਼ਈਲ ਨੂੰ ਖੋਲ੍ਹਣਾ ਅਸਫਲ ਹੋਇਆ" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "ਸੰਰਚਨਾ ਫ਼ਾਈਲ ਗਲਤ ਬਣਤਰ ਵਾਲੀ ਹੈ" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "ਘਾਤਕ ਅਸਫਲਤਾ" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/pl.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/pl.gmo differ diff -Nru libpwquality-1.2.3/po/pl.po libpwquality-1.3.0/po/pl.po --- libpwquality-1.2.3/po/pl.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/pl.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,23 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Piotr Drąg , 2008, 2012. -# Stanisław Małolepszy , 2006. -# Wojciech Kapusta , 2006. +# Piotr Drąg , 2008, 2012 +# Stanisław Małolepszy , 2006 +# Wojciech Kapusta , 2006 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 15:32+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Polish (http://www.transifex.com/projects/p/libpwquality/" +"language/pl/)\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2)\n" +"|| n%100>=20) ? 1 : 2);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/pt.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/pt.gmo differ diff -Nru libpwquality-1.2.3/po/pt.po libpwquality-1.3.0/po/pt.po --- libpwquality-1.2.3/po/pt.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/pt.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,23 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Antonio Cardoso Martins , 2005, 2006. -# , 2012. -# Rui Gouveia , 2009. -# Rui Gouveia , 2012. +# Antonio Cardoso Martins , 2005, 2006 +# manuelmarque , 2012 +# Rui Gouveia , 2009 +# Rui Gouveia , 2012 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/libpwquality/" +"language/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/pt_BR.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/pt_BR.gmo differ diff -Nru libpwquality-1.2.3/po/pt_BR.po libpwquality-1.3.0/po/pt_BR.po --- libpwquality-1.2.3/po/pt_BR.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/pt_BR.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,22 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Diego Búrigo Zacarão , 2008. -# Glaucia Cintra , 2007. -# Taylon Silmer , 2008, 2009. +# Diego Búrigo Zacarão , 2008 +# Glaucia Freitas , 2007 +# Taylon Silmer , 2008-2009 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-29 13:46+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" +"libpwquality/language/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: src/pam_pwquality.c:25 #, c-format @@ -42,22 +43,23 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "Uso: %s [usuário]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" msgstr "" +" O comando lê a senha a ser marcada a partir da entrada padrão.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "Erro: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "Não foi possível obter a senha a ser marcada" #: src/pwscore.c:73 #, c-format @@ -65,114 +67,116 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"Teste de qualidade da senha falhou:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "Uso: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "Erro de alocação de memória ao configurar" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "Erro de alocação de memória" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "A senha é igual à antiga" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "A senha é um palíndromo" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "A senha difere nas mudanças apenas de maiúsculas/minúsculas" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "A senha é muito semelhante à antiga" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "A senha contém o nome de usuário em algum formulário" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "A senha contém palavras de um nome real de usuário no mesmo formato" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "A senha contém palavras proibidas de alguma forma" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "A senha contém menos do que %ld dígitos" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "A senha contém muito poucos digitos" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "A senha contém menos do que %ld letras maiúsculas" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "A senha contém muito poucas letras maiúsculas" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "A senha contém menos do que %ld letras minúsculas" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "A senha contém muito poucas letras minusculas" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "A senha contém menos do que %ld caracteres não alfanuméricos" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "A senha contém muito poucos caracteres não alfanuméricos" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "A senha é menor do que %ld caracteres" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "A senha é muito curta" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "A senha é apenas roteada à antiga" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "A senha contém menos do que %ld classes de caracteres" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "A senha não contém classes de caracteres suficientes" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "A senha contém mais do que %ld caracteres iguais consecutivamente" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "A senha contém muitos caracteres igual consecutivamente" #: src/error.c:96 #, c-format @@ -180,20 +184,22 @@ "The password contains more than %ld characters of the same class " "consecutively" msgstr "" +"A senha contém mais do que %ld caracteres da mesma classe consecutivamente" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "A senha contém muitos caracteres da mesma classe consecutivamente" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" msgstr "" +"A senha contém uma sequência monotônica mais longa do que %ld caracteres" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "A senha contém uma sequência de caracteres monotônica muito longa" #: src/error.c:107 msgid "No password supplied" @@ -201,57 +207,59 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "Não foi possível obter números aleatórios a partir do dispositivo RNG" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" msgstr "" +"A geração de senha falhou - foi requerida um aentropia muito baixa para a " +"configuração" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "A senha não passa pela verificação do dicionário" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "Configuração desconhecida" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "Valor inteiro ruim de configuração" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "Valor inteiro ruim" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "Configuração %s não é um tipo inteiro" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "Configuração não é de tipo inteiro" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "Configuração %s não é um tipo de faixa" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "Configuração não é de tipo de faixa" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "Falha ao abrir arquivo de configuração" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "O arquivo de configuração é inválido" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "Falha Fatal" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/ru.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/ru.gmo differ diff -Nru libpwquality-1.2.3/po/ru.po libpwquality-1.3.0/po/ru.po --- libpwquality-1.2.3/po/ru.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/ru.po 2015-07-23 11:45:59.000000000 +0000 @@ -9,10 +9,10 @@ # Сергей Батурин , 2012. msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-08-30 12:13+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2012-08-29 08:13-0400\n" "Last-Translator: triplepointfive \n" "Language-Team: LANGUAGE \n" "Language: ru\n" @@ -21,6 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/si.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/si.gmo differ diff -Nru libpwquality-1.2.3/po/si.po libpwquality-1.3.0/po/si.po --- libpwquality-1.2.3/po/si.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/si.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,20 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Danishka Navin , 2007. +# Danishka Navin , 2007 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Sinhala (http://www.transifex.com/projects/p/libpwquality/" +"language/si/)\n" "Language: si\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/sk.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/sk.gmo differ diff -Nru libpwquality-1.2.3/po/sk.po libpwquality-1.3.0/po/sk.po --- libpwquality-1.2.3/po/sk.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/sk.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,22 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Dominik , 2012. -# Ondrej Šulek , 2008. -# Pavol Šimo , 2009. +# Dominik , 2012 +# feonsu , 2008 +# Pavol Šimo , 2009 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/libpwquality/" +"language/sk/)\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/sr.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/sr.gmo differ diff -Nru libpwquality-1.2.3/po/sr.po libpwquality-1.3.0/po/sr.po --- libpwquality-1.2.3/po/sr.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/sr.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,24 +3,25 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Marko Uskokovic , 2007, 2008. -# Miloš Komarčević , 2008. -# Nikola Pajtić , 2008. -# Sandra Gucul-Milojevic , 2008. +# Marko Uskokovic , 2007, 2008 +# Miloš Komarčević , 2008 +# Nikola Pajtić , 2008 +# Sandra Gucul-Milojevic , 2008 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Serbian (http://www.transifex.com/projects/p/libpwquality/" +"language/sr/)\n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/sr@latin.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/sr@latin.gmo differ diff -Nru libpwquality-1.2.3/po/sr@latin.po libpwquality-1.3.0/po/sr@latin.po --- libpwquality-1.2.3/po/sr@latin.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/sr@latin.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,24 +3,25 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Marko Uskokovic , 2007, 2008. -# Miloš Komarčević , 2008. -# Nikola Pajtić , 2008. -# Sandra Gucul-Milojevic , 2008. +# Marko Uskokovic , 2007, 2008 +# Miloš Komarčević , 2008 +# Nikola Pajtić , 2008 +# Sandra Gucul-Milojevic , 2008 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/" +"libpwquality/language/sr@latin/)\n" "Language: sr@latin\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/sv.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/sv.gmo differ diff -Nru libpwquality-1.2.3/po/sv.po libpwquality-1.3.0/po/sv.po --- libpwquality-1.2.3/po/sv.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/sv.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Christer Andersson , 2007. -# Daniel Nylander , 2009, 2010. +# Christer Andersson , 2007 +# Daniel Nylander , 2009, 2010 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/libpwquality/" +"language/sv/)\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/ta.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/ta.gmo differ diff -Nru libpwquality-1.2.3/po/ta.po libpwquality-1.3.0/po/ta.po --- libpwquality-1.2.3/po/ta.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/ta.po 2015-07-23 11:45:59.000000000 +0000 @@ -5,19 +5,23 @@ # Translators: # I felix , 2007. # I. Felix , 2009. +# I felix , 2007 +# I. Felix , 2009 msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" -"Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-09-19 06:51-0400\n" +"Last-Translator: Shantha kumar \n" +"Language-Team: Tamil (http://www.transifex.com/projects/p/libpwquality/" +"language/ta/)\n" "Language: ta\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format @@ -41,22 +45,24 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "பயன்பாடு: %s [user]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" msgstr "" +" கட்டளையானது தரநிலையான உள்ளீட்டிலிருந்து மதிப்பீடு வழங்க வேண்டிய கடவுச்சொல்லை " +"வாசிக்கும்.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "பிழை: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "மதிப்பீடு செய்யப்பட வேண்டிய கடவுச்சொல்லைப் பெற முடியவில்லை" #: src/pwscore.c:73 #, c-format @@ -64,135 +70,137 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"கடவுச்சொல் தர சோதனை தோல்வியடைந்தது:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "பயன்பாடு: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "அமைக்கும் போது நினைவக ஒதுக்கீட்டுப் பிழை ஏற்பட்டது" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "நினைவக ஒதுக்கீட்டுப் பிழை" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "இந்தக் கடவுச்சொல் பழைய கடவுச்சொல்லே ஆகும்." #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "கடவுச்சொல் இரு திசை சம உச்சரிப்புச் சொல்லாக (பாலின்ட்ரோம்) உள்ளது" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "கடவுச்சொல் பேரெழுத்து வகையில் மட்டுமே வேறுபடுகிறது" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "கடவுச்சொல் பழைய கடவுச்சொல்லுடன் மிக ஒத்ததாக உள்ளது" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "கடவுச்சொல்லில் ஏதோ ஒரு வடிவத்தில் பயனர் பெயர் உள்ளது" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "கடவுச்சொல்லில் ஏதோ வடிவத்தில் பயனரின் உண்மையான பெயரைச் சேர்ந்த சொற்கள் உள்ளன" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "கடவுச்சொல்லில் ஏதோ ஒரு வடிவத்தில் தடை செய்யப்பட்ட சொற்கள் உள்ளன" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "கடவுச்சொல்லில் %ld க்குக் குறைவான இலக்கங்கள் உள்ளன" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "கடவுச்சொல்லில் மிகக் குறைந்த இலக்கங்கள் உள்ளன" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "கடவுச்சொல்லில் %ld க்கும் குறைவான பெரிய எழுத்துகள் உள்ளன" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "கடவுச்சொல்லில் மிகக் குறைந்த பெரிய எழுத்துக்கள் உள்ளன" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "கடவுச்சொல்லில் %ld க்குக் குறைவான சிறிய எழுத்துகள் உள்ளன" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "கடவுச்சொல்லில் மிகக் குறைந்த சிறிய எழுத்துக்கள் உள்ளன" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "கடவுச்சொல்லில் %ld க்கும் குறைவான எண் எழுத்தல்லாத எழுத்துகள் உள்ளன" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "கடவுச்சொல்லில் எண் எழுத்தல்லாத எழுத்துக்கள் மிகக் குறைவாக உள்ளன" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "கடவுச்சொல் %ld எழுத்துகளுக்கு குறைவாக உள்ளது" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "கடவுச்சொல் மிகவும் சிறியதாக உள்ளது" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "கடவுச்சொல் பழைய கடவுச்சொல்லையே சுழல் முறையில் பயன்படுத்திய ஒன்றாக உள்ளது" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "கடவுச்சொல்லில் %ld க்கும் குறைவான எழுத்து வகைகள் உள்ளன" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "கடவுச்சொல்லில் தேவையான எழுத்து வகைகள் இல்லை" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "கடவுச்சொல்லில் %ld க்கும் அதிகமான முறை ஒரே எழுத்துகள் தொடர்ச்சியாக உள்ளன" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "கடவுச்சொல்லில் தொடர்ச்சியாக ஒரே எழுத்துகள் அதிகம் உள்ளன" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "கடவுச்சொல்லில் தொடர்ச்சியாக ஒரே வகையைச் சேர்ந்த %ld எழுத்துகள் உள்ளன" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "கடவுச்சொல்லில் தொடர்ச்சியாக ஒரே வகையைச் சேர்ந்த எழுத்துகள் அதிகம் உள்ளன" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "கடவுச்சொல்லில் %ld க்கும் அதிக எழுத்துகள் நீளமுள்ள மோனோடோனிக் வரிசை உள்ளது" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "கடவுச்சொல்லில் மிக அதிக நீளமுள்ள மோனோடோனிக் எழுத்து வரிசை உள்ளது" #: src/error.c:107 msgid "No password supplied" @@ -200,57 +208,59 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "RNG சாதனத்திலிருந்து எழுந்தமானமான எண்களைப் பெற முடியவில்லை" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" msgstr "" +"கடவுச்சொல் உருவாக்கம் தோல்வியடைந்தது - தேவையான என்ட்ராபி இந்த அமைவுகளுக்கு மிகக் " +"குறைவாக உள்ளது" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "கடவுச்சொல் அகராதி சோதனையில் தோல்வியடைந்தது" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "தெரியாத அமைவு" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "அமைவின் தவறான முழு எண் மதிப்பு" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "தவறான முழு எண் மதிப்பு" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "அமைவு %s முழு எண் வகையானதல்ல" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "அமைவு முழு எண் வகையானதல்ல" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "அமைவு %s சர வகையானதல்ல" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "அமைவு சர வகையானதல்ல" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "அமைவாக்கக் கோப்பினைத் திறத்தல் தோல்வியடைந்தது" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "அமைவாக்கக் கோப்பு தவறாக வடிவமைக்கப்பட்டுள்ளது" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "பெரும் தோல்வி" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/te.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/te.gmo differ diff -Nru libpwquality-1.2.3/po/te.po libpwquality-1.3.0/po/te.po --- libpwquality-1.2.3/po/te.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/te.po 2015-07-23 11:45:59.000000000 +0000 @@ -4,19 +4,21 @@ # # Translators: # Krishna Babu K , 2008, 2009. +# Krishnababu Krothapalli , 2008, 2009, 2013. msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" -"Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-09-16 08:16-0400\n" +"Last-Translator: Krishnababu Krothapalli \n" +"Language-Team: American English \n" "Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format @@ -40,22 +42,22 @@ #: src/pwscore.c:22 #, c-format msgid "Usage: %s [user]\n" -msgstr "" +msgstr "వాడుక: %s [user]\n" #: src/pwscore.c:23 #, c-format msgid "" " The command reads the password to be scored from the standard input.\n" -msgstr "" +msgstr " ప్రామాణిక ఇన్పుట్ నుండి స్కోర్‌చేయవలసిన సంకేతపదంను ఆ ఆదేశం చదువును.\n" #: src/pwscore.c:51 src/pwscore.c:59 src/pwscore.c:65 #, c-format msgid "Error: %s\n" -msgstr "" +msgstr "దోషం: %s\n" #: src/pwscore.c:51 msgid "Could not obtain the password to be scored" -msgstr "" +msgstr "స్కోర్‌చేయవలసిన సంకేతపదం పొందలేక పోయింది" #: src/pwscore.c:73 #, c-format @@ -63,135 +65,137 @@ "Password quality check failed:\n" " %s\n" msgstr "" +"సంకేతపదం నాణ్యత పరిశీలన విఫలమైంది:\n" +" %s\n" #: src/pwmake.c:22 #, c-format msgid "Usage: %s \n" -msgstr "" +msgstr "వాడుక: %s \n" #: src/error.c:31 msgid "Memory allocation error when setting" -msgstr "" +msgstr "అమర్చునప్పుడు మెమొరీ కేటాయింపు దోషం" #: src/error.c:35 msgid "Memory allocation error" -msgstr "" +msgstr "మెమొరీ కేటాయింపు దోషం" #: src/error.c:37 msgid "The password is the same as the old one" -msgstr "" +msgstr "ఆ సంకేతపదం పాత దాని వలెనే వుంది" #: src/error.c:39 msgid "The password is a palindrome" -msgstr "" +msgstr "సంకేతపదం పాలిన్డ్రోమ్" #: src/error.c:41 msgid "The password differs with case changes only" -msgstr "" +msgstr "అక్షరబడి మార్చిన మాత్రమే సంకేతపదం విభేదించును" #: src/error.c:43 msgid "The password is too similar to the old one" -msgstr "" +msgstr "సంకేతపదం పాత దానితో దగ్గరి పోలిక కలిగివుంది" #: src/error.c:45 msgid "The password contains the user name in some form" -msgstr "" +msgstr "సంకేతపదం వాడుకరి పేరును కలిగివుంది" #: src/error.c:47 msgid "The password contains words from the real name of the user in some form" -msgstr "" +msgstr "సంకేతపదం వాడుకరి యొక్క వాస్తవపేరు నందలి పదాలను కలిగివుంది" #: src/error.c:49 msgid "The password contains forbidden words in some form" -msgstr "" +msgstr "సంకేతపదం వాడదగని పదాలను కలిగివుంది" #: src/error.c:52 #, c-format msgid "The password contains less than %ld digits" -msgstr "" +msgstr "సంకేతపదం %ld అంకెలకన్నా తక్కువ కలిగివుంది" #: src/error.c:55 msgid "The password contains too few digits" -msgstr "" +msgstr "సంకేతపదం మరీ తక్కువ అంకెలను కలిగివుంది" #: src/error.c:58 #, c-format msgid "The password contains less than %ld uppercase letters" -msgstr "" +msgstr "సంకేతపదం పెద్దబడి అక్షరాలు %ld కన్నా తక్కువ వున్నాయి" #: src/error.c:61 msgid "The password contains too few uppercase letters" -msgstr "" +msgstr "సంకేతపదం మరీ తక్కువ పెద్దబడి అక్షరాలు కలిగివుంది" #: src/error.c:64 #, c-format msgid "The password contains less than %ld lowercase letters" -msgstr "" +msgstr "సంకేతపదం చిన్నబడి అక్షరాలు %ld కన్నా తక్కువ వున్నాయి" #: src/error.c:67 msgid "The password contains too few lowercase letters" -msgstr "" +msgstr "సంకేతపదం మరీ తక్కువ చిన్నబడి అక్షరాలు కలిగివుంది" #: src/error.c:70 #, c-format msgid "The password contains less than %ld non-alphanumeric characters" -msgstr "" +msgstr "సంకేతపదం సంఖ్యాఅక్షరం-కాని అక్షరాలు %ld కన్నా తక్కువ వున్నాయి" #: src/error.c:73 msgid "The password contains too few non-alphanumeric characters" -msgstr "" +msgstr "సంకేతపదం మరీ తక్కువ సంఖ్యాఅక్షరం-కాని అక్షరాలు కలిగివుంది" #: src/error.c:76 #, c-format msgid "The password is shorter than %ld characters" -msgstr "" +msgstr "సంకేతపదం %ld అక్షరాల కన్నా పొట్టిగావుంది" #: src/error.c:79 msgid "The password is too short" -msgstr "" +msgstr "సంకేతపదం మరీ పొట్టిది" #: src/error.c:81 msgid "The password is just rotated old one" -msgstr "" +msgstr "సంకేతపదం పాత దానినే తిప్పివుంచింది" #: src/error.c:84 #, c-format msgid "The password contains less than %ld character classes" -msgstr "" +msgstr "సంకేతపదం అక్షర తరగతులు %ld కన్నా తక్కువ వున్నాయి" #: src/error.c:87 msgid "The password does not contain enough character classes" -msgstr "" +msgstr "సంకేతపదం తగినన్ని అక్షర తరగతులను కలిగిలేదు" #: src/error.c:90 #, c-format msgid "The password contains more than %ld same characters consecutively" -msgstr "" +msgstr "సంకేతపదం వొకే వరుస అక్షరాలను %ld కన్నా యెక్కువ కలిగివుంది" #: src/error.c:93 msgid "The password contains too many same characters consecutively" -msgstr "" +msgstr "సంకేతపదం వొకే వరుస అక్షరాలను చాలా కలిగివుంది" #: src/error.c:96 #, c-format msgid "" "The password contains more than %ld characters of the same class " "consecutively" -msgstr "" +msgstr "సంకేతపదం వొకే తరగతికి చేందిన అక్షరాలు వరుసగా %ld అక్షరాలకన్నా యెక్కువగా వున్నాయి" #: src/error.c:99 msgid "" "The password contains too many characters of the same class consecutively" -msgstr "" +msgstr "సంకేతపదం చాలా వొకే తరగతికి చెందిన అక్షరాలను వరుసగా కలిగివుంది" #: src/error.c:102 #, c-format msgid "The password contains monotonic sequence longer than %ld characters" -msgstr "" +msgstr "సంకేతపదం మోనోటోనిక్ వరుసక్రమం %ld అక్షరాలకన్నా పొడవైనది" #: src/error.c:105 msgid "The password contains too long of a monotonic character sequence" -msgstr "" +msgstr "సంకేతపదం మోనోటోనిక్ అక్షర వరుస మరీ పొడవైనది" #: src/error.c:107 msgid "No password supplied" @@ -199,57 +203,57 @@ #: src/error.c:109 msgid "Cannot obtain random numbers from the RNG device" -msgstr "" +msgstr "RNG పరికరం నుండి యాదృశ్చిక సంఖ్యలను పొందలేదు" #: src/error.c:111 msgid "Password generation failed - required entropy too low for settings" -msgstr "" +msgstr "సంకేతపదం జనియింపచేయుట విఫలమైంది - అమరికలకు కావలసిన ఎంట్రోపీ మరీ తక్కువగావుంది" #: src/error.c:114 src/error.c:117 msgid "The password fails the dictionary check" -msgstr "" +msgstr "సంకేతపదం నిఘంటువు పరిశీలనకు విఫలమైంది" #: src/error.c:120 src/error.c:124 msgid "Unknown setting" -msgstr "" +msgstr "తెలియని అమరిక" #: src/error.c:127 msgid "Bad integer value of setting" -msgstr "" +msgstr "అమరిక కు తగని పూర్ణాంకం విలువ" #: src/error.c:131 msgid "Bad integer value" -msgstr "" +msgstr "తగని పూర్ణాంకం విలువ" #: src/error.c:134 #, c-format msgid "Setting %s is not of integer type" -msgstr "" +msgstr "అమరిక %s పూర్ణాంకం రకం కాదు" #: src/error.c:138 msgid "Setting is not of integer type" -msgstr "" +msgstr "అమరిక పూర్ణాంకం రకమైనది కాదు" #: src/error.c:141 #, c-format msgid "Setting %s is not of string type" -msgstr "" +msgstr "అమరిక %s స్ట్రింగ్ రకం కాదు" #: src/error.c:145 msgid "Setting is not of string type" -msgstr "" +msgstr "అమరిక స్ట్రింగ్ రకం కాదు" #: src/error.c:147 msgid "Opening the configuration file failed" -msgstr "" +msgstr "ఆకృతీకరణ ఫైలును తెరుచుటకు విఫలమైంది" #: src/error.c:149 msgid "The configuration file is malformed" -msgstr "" +msgstr "ఆకృతీకరణ ఫైలు తప్పుగా వ్యవహరిస్తోంది" #: src/error.c:151 msgid "Fatal failure" -msgstr "" +msgstr "తీవ్ర వైఫల్యం" #: src/error.c:153 msgid "Unknown error" Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/tr.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/tr.gmo differ diff -Nru libpwquality-1.2.3/po/tr.po libpwquality-1.3.0/po/tr.po --- libpwquality-1.2.3/po/tr.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/tr.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,21 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Bahadır Kandemir , 2010. -# Koray Löker , 2006. +# Bahadır Kandemir , 2010 +# Koray Löker , 2006 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/libpwquality/" +"language/tr/)\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/uk.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/uk.gmo differ diff -Nru libpwquality-1.2.3/po/uk.po libpwquality-1.3.0/po/uk.po --- libpwquality-1.2.3/po/uk.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/uk.po 2015-07-23 11:45:59.000000000 +0000 @@ -3,22 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ivan Petrouchtchak , 2006. -# Yuri Chornoivan , 2010, 2011, 2012. +# Ivan Petrouchtchak , 2006 +# Yuri Chornoivan , 2010, 2011, 2012 msgid "" msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-07-23 14:53+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Yuri Chornoivan \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/libpwquality/" +"language/uk/)\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/vi.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/vi.gmo differ diff -Nru libpwquality-1.2.3/po/vi.po libpwquality-1.3.0/po/vi.po --- libpwquality-1.2.3/po/vi.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/vi.po 2015-07-23 11:45:59.000000000 +0000 @@ -7,15 +7,16 @@ msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Vietnamese (http://www.transifex.com/projects/p/libpwquality/" +"language/vi/)\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/zh_CN.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/zh_CN.gmo differ diff -Nru libpwquality-1.2.3/po/zh_CN.po libpwquality-1.3.0/po/zh_CN.po --- libpwquality-1.2.3/po/zh_CN.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/zh_CN.po 2015-07-23 11:45:59.000000000 +0000 @@ -11,10 +11,10 @@ # Xi HUANG , 2007. msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-07-23 14:14+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2012-07-23 10:14-0400\n" "Last-Translator: Alick Zhao \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -22,6 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/zh_TW.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/zh_TW.gmo differ diff -Nru libpwquality-1.2.3/po/zh_TW.po libpwquality-1.3.0/po/zh_TW.po --- libpwquality-1.2.3/po/zh_TW.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/zh_TW.po 2015-07-23 11:45:59.000000000 +0000 @@ -7,10 +7,10 @@ # Terry Chuang , 2008, 2009. msgid "" msgstr "" -"Project-Id-Version: PWQuality library\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-11-02 16:32+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2012-11-02 12:32-0400\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: LANGUAGE \n" "Language: zh_TW\n" @@ -18,6 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Zanata 3.1.2\n" #: src/pam_pwquality.c:25 #, c-format Binary files /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/0cs0LR_Z0g/libpwquality-1.2.3/po/zu.gmo and /tmp/derivs-cmp-srcpkg-Apertis-_iw4g4zi/l4b0rd8UTO/libpwquality-1.3.0/po/zu.gmo differ diff -Nru libpwquality-1.2.3/po/zu.po libpwquality-1.3.0/po/zu.po --- libpwquality-1.2.3/po/zu.po 2012-12-20 09:03:55.000000000 +0000 +++ libpwquality-1.3.0/po/zu.po 2015-07-23 11:45:59.000000000 +0000 @@ -7,15 +7,16 @@ msgstr "" "Project-Id-Version: PWQuality library\n" "Report-Msgid-Bugs-To: http://fedorahosted.org/libpwquality\n" -"POT-Creation-Date: 2012-12-20 10:03+0100\n" -"PO-Revision-Date: 2012-06-29 09:04+0000\n" +"POT-Creation-Date: 2015-07-23 13:45+0200\n" +"PO-Revision-Date: 2013-11-20 10:42+0000\n" "Last-Translator: Tomáš Mráz \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Zulu (http://www.transifex.com/projects/p/libpwquality/" +"language/zu/)\n" "Language: zu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pam_pwquality.c:25 #, c-format diff -Nru libpwquality-1.2.3/python/Makefile.am libpwquality-1.3.0/python/Makefile.am --- libpwquality-1.2.3/python/Makefile.am 2012-12-14 17:46:46.000000000 +0000 +++ libpwquality-1.3.0/python/Makefile.am 2014-08-06 14:37:30.000000000 +0000 @@ -6,11 +6,12 @@ pythonincdir = $(includedir)/python@PYTHONREV@ pythonsitedir = @PYTHONSITEDIR@ -CLEANFILES = *~ constants.c pwquality.so +CLEANFILES = *~ constants.c *.so EXTRA_DIST = pwquality.c setup.py -pythonsite_SCRIPTS = pwquality.so +all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=. -pwquality.so: ../src/pwquality.h pwquality.c setup.py - CFLAGS="${CFLAGS} -fno-strict-aliasing" python setup.py build --build-lib=. +install-exec-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} diff -Nru libpwquality-1.2.3/python/Makefile.in libpwquality-1.3.0/python/Makefile.in --- libpwquality-1.2.3/python/Makefile.in 2013-09-12 11:14:15.000000000 +0000 +++ libpwquality-1.3.0/python/Makefile.in 2015-07-23 11:45:56.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,25 +18,52 @@ # Copyright (c) 2011 Red Hat, Inc. # Copyright (c) 2011 Tomas Mraz # - VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -57,51 +83,35 @@ build_triplet = @build@ host_triplet = @host@ subdir = python -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/setup.py.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = setup.py CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(pythonsitedir)" -SCRIPTS = $(pythonsite_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -109,9 +119,11 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -134,6 +146,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -182,6 +195,7 @@ PWQUALITY_LT_AGE = @PWQUALITY_LT_AGE@ PWQUALITY_LT_CURRENT = @PWQUALITY_LT_CURRENT@ PWQUALITY_LT_REVISION = @PWQUALITY_LT_REVISION@ +PYTHONBINARY = @PYTHONBINARY@ PYTHONREV = @PYTHONREV@ PYTHONSITEDIR = @PYTHONSITEDIR@ RANLIB = @RANLIB@ @@ -195,6 +209,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -249,9 +264,8 @@ top_srcdir = @top_srcdir@ pythonincdir = $(includedir)/python@PYTHONREV@ pythonsitedir = @PYTHONSITEDIR@ -CLEANFILES = *~ constants.c pwquality.so +CLEANFILES = *~ constants.c *.so EXTRA_DIST = pwquality.c setup.py -pythonsite_SCRIPTS = pwquality.so all: all-am .SUFFIXES: @@ -285,52 +299,19 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-pythonsiteSCRIPTS: $(pythonsite_SCRIPTS) - @$(NORMAL_INSTALL) - @list='$(pythonsite_SCRIPTS)'; test -n "$(pythonsitedir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pythonsitedir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pythonsitedir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n' \ - -e 'h;s|.*|.|' \ - -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) { files[d] = files[d] " " $$1; \ - if (++n[d] == $(am__install_max)) { \ - print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ - else { print "f", d "/" $$4, $$1 } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pythonsitedir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pythonsitedir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-pythonsiteSCRIPTS: - @$(NORMAL_UNINSTALL) - @list='$(pythonsite_SCRIPTS)'; test -n "$(pythonsitedir)" || exit 0; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 's,.*/,,;$(transform)'`; \ - dir='$(DESTDIR)$(pythonsitedir)'; $(am__uninstall_files_from_dir) +setup.py: $(top_builddir)/config.status $(srcdir)/setup.py.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -365,11 +346,8 @@ done check-am: all-am check: check-am -all-am: Makefile $(SCRIPTS) +all-am: Makefile all-local installdirs: - for dir in "$(DESTDIR)$(pythonsitedir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -421,13 +399,13 @@ info-am: -install-data-am: install-pythonsiteSCRIPTS +install-data-am: install-dvi: install-dvi-am install-dvi-am: -install-exec-am: +install-exec-am: install-exec-local install-html: install-html-am @@ -465,26 +443,29 @@ ps-am: -uninstall-am: uninstall-pythonsiteSCRIPTS +uninstall-am: .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am \ - install-pythonsiteSCRIPTS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-pythonsiteSCRIPTS +.PHONY: all all-am all-local check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-local install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +all-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py build --build-lib=. -pwquality.so: ../src/pwquality.h pwquality.c setup.py - CFLAGS="${CFLAGS} -fno-strict-aliasing" python setup.py build --build-lib=. +install-exec-local: + CFLAGS="${CFLAGS} -fno-strict-aliasing" @PYTHONBINARY@ setup.py install --prefix=${DESTDIR}${prefix} # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libpwquality-1.2.3/python/pwquality.c libpwquality-1.3.0/python/pwquality.c --- libpwquality-1.2.3/python/pwquality.c 2012-08-07 10:18:46.000000000 +0000 +++ libpwquality-1.3.0/python/pwquality.c 2015-07-16 11:43:43.000000000 +0000 @@ -1,8 +1,8 @@ /* * libpwquality Python bindings * - * Copyright (c) Red Hat, Inc, 2011 - * Copyright (c) Tomas Mraz , 2011 + * Copyright (c) Red Hat, Inc, 2011,2014 + * Copyright (c) Tomas Mraz , 2011,2014 * * See the end of the file for the License Information */ @@ -10,6 +10,15 @@ #include #include "pwquality.h" +#if PY_MAJOR_VERSION >= 3 +#define IS_PY3K +#define PWQLong_FromLong PyLong_FromLong +#define PWQLong_AsLong PyLong_AsLong +#else +#define PWQLong_FromLong PyInt_FromLong +#define PWQLong_AsLong PyInt_AsLong +#endif + static PyObject *PWQError; typedef struct { @@ -117,6 +126,11 @@ "Match words from the passwd GECOS field if available", (void *)PWQ_SETTING_GECOS_CHECK }, + { "dictcheck", + (getter)pwqsettings_getint, (setter)pwqsettings_setint, + "Perform the dictionary check", + (void *)PWQ_SETTING_DICT_CHECK + }, { "badwords", (getter)pwqsettings_getstr, (setter)pwqsettings_setstr, "List of words more than 3 characters long that are forbidden", @@ -132,8 +146,7 @@ static PyTypeObject pwqsettings_type = { - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ + PyVarObject_HEAD_INIT(NULL, 0) "pwquality.PWQSettings", /* tp_name */ sizeof(PWQSettings), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -223,7 +236,7 @@ pwqsettings_dealloc(PWQSettings *self) { pwquality_free_settings(self->pwq); - self->ob_type->tp_free((PyObject *)self); + Py_TYPE(self)->tp_free((PyObject *)self); } static PyObject * @@ -235,7 +248,7 @@ if ((rc = pwquality_get_int_value(self->pwq, (int)(ssize_t)setting, &value)) < 0) { return pwqerror(rc, NULL); } - return PyInt_FromLong((long)value); + return PWQLong_FromLong((long)value); } static int @@ -244,7 +257,7 @@ long l; int rc; - l = PyInt_AsLong(value); + l = PWQLong_AsLong(value); if (PyErr_Occurred() == NULL) { if ((rc = pwquality_set_int_value(self->pwq, (int)(ssize_t)setting, (int)l)) < 0) { @@ -269,19 +282,36 @@ Py_INCREF(Py_None); return Py_None; } +#ifdef IS_PY3K + return PyUnicode_FromString(value); +#else return PyString_FromString(value); +#endif } static int pwqsettings_setstr(PWQSettings *self, PyObject *value, void *setting) { - const char *s; + const char *s = NULL; int rc; - if (value == (PyObject *)Py_None) - s = NULL; - else + if (value != (PyObject *)Py_None) { +#ifdef IS_PY3K + if (PyUnicode_Check(value)) { + PyObject *value_as_bytes = PyUnicode_AsUTF8String(value); + if (!value_as_bytes) + return -1; + s = PyBytes_AsString(value_as_bytes); + Py_DECREF(value_as_bytes); + if (!s) + return -1; + } else { + PyErr_SetString(PyExc_TypeError, "expected unicode string"); + } +#else s = PyString_AsString(value); +#endif + } if (PyErr_Occurred() == NULL) { if ((rc = pwquality_set_str_value(self->pwq, @@ -339,7 +369,11 @@ return pwqerror(rc, NULL); } +#ifdef IS_PY3K + passobj = PyUnicode_FromString(password); +#else passobj = PyString_FromString(password); +#endif free(password); return passobj; } @@ -360,21 +394,46 @@ return pwqerror(rc, auxerror); } - return PyInt_FromLong((long)rc); + return PWQLong_FromLong((long)rc); } +#ifdef IS_PY3K +static struct PyModuleDef pwqualitydef = { + PyModuleDef_HEAD_INIT, + "pwquality", + "Libpwquality wrapper module", + -1, + pwquality_methods, + NULL, + NULL, + NULL, + NULL, +}; + +#define INITERROR return NULL + +PyObject * +PyInit_pwquality(void) +#else +#define INITERROR return + PyMODINIT_FUNC initpwquality(void) +#endif { PyObject *module; if (PyType_Ready(&pwqsettings_type) < 0) - return; + INITERROR; +#ifdef IS_PY3K + module = PyModule_Create(&pwqualitydef); +#else module = Py_InitModule3("pwquality", pwquality_methods, "Libpwquality wrapper module"); +#endif if (module == NULL) - return; + INITERROR; PWQError = PyErr_NewExceptionWithDoc("pwquality.PWQError", "Standard exception thrown from PWQSettings method calls\n\n" @@ -382,7 +441,7 @@ NULL, NULL); if (PWQError == NULL) { Py_DECREF(module); - return; + INITERROR; } Py_INCREF(PWQError); PyModule_AddObject(module, "PWQError", PWQError); @@ -391,6 +450,9 @@ PyModule_AddObject(module, "PWQSettings", (PyObject *)&pwqsettings_type); #include "constants.c" +#ifdef IS_PY3K + return module; +#endif } /* diff -Nru libpwquality-1.2.3/python/setup.py libpwquality-1.3.0/python/setup.py --- libpwquality-1.2.3/python/setup.py 2012-08-07 10:17:58.000000000 +0000 +++ libpwquality-1.3.0/python/setup.py 2015-07-23 11:45:58.000000000 +0000 @@ -29,7 +29,7 @@ setup( name = 'pwquality', - version = '0.9.1', + version = '1.3.0', description = 'Python bindings for the libpwquality library for password quality checking', author = 'Tomáš Mráz', author_email = 'tm@t8m.info', diff -Nru libpwquality-1.2.3/python/setup.py.in libpwquality-1.3.0/python/setup.py.in --- libpwquality-1.2.3/python/setup.py.in 1970-01-01 00:00:00.000000000 +0000 +++ libpwquality-1.3.0/python/setup.py.in 2014-08-06 12:45:55.000000000 +0000 @@ -0,0 +1,72 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# +# See the end of the file for Copyright and License Information +# + +from distutils.core import setup, Extension +from distutils.command.build_ext import build_ext as _build_ext + +class build_ext(_build_ext): + def genconstants(self, headerfile, outputfile): + hf = open(headerfile, 'r') + of = open(outputfile, 'w') + of.write('/* This file is generated during build time from pwquality.h */\n\n') + for line in hf: + if line.startswith('#define PWQ_'): + s = line.split() + of.write('PyModule_AddIntConstant(module, "%s", %s);\n' % (s[1], s[2])) + + def run(self): + self.genconstants('../src/pwquality.h', 'constants.c') + _build_ext.run(self) + +pwqmodule = Extension('pwquality', + sources = ['pwquality.c'], + include_dirs = ['../src'], + library_dirs = ['../src/.libs'], + libraries = ['pwquality']) + +setup( + name = 'pwquality', + version = '@VERSION@', + description = 'Python bindings for the libpwquality library for password quality checking', + author = 'Tomáš Mráz', + author_email = 'tm@t8m.info', + url = 'http://fedorahosted.org/libpwquality', + license = 'BSD or GPLv2+', + ext_modules = [pwqmodule], + cmdclass = {'build_ext': build_ext} +) + +# Copyright (c) Red Hat, Inc, 2011 +# Copyright (c) Tomas Mraz , 2011 +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, and the entire permission notice in its entirety, +# including the disclaimer of warranties. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote +# products derived from this software without specific prior +# written permission. +# +# ALTERNATIVELY, this product may be distributed under the terms of +# the GNU General Public License version 2 or later, in which case the +# provisions of the GPL are required INSTEAD OF the above restrictions. +# +# THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, +# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +# OF THE POSSIBILITY OF SUCH DAMAGE. diff -Nru libpwquality-1.2.3/src/Makefile.am libpwquality-1.3.0/src/Makefile.am --- libpwquality-1.2.3/src/Makefile.am 2012-06-13 12:52:41.000000000 +0000 +++ libpwquality-1.3.0/src/Makefile.am 2014-03-13 09:56:41.000000000 +0000 @@ -25,13 +25,13 @@ libpwquality_la_LDFLAGS = -no-undefined $(libpwquality_version_script) \ -version-info @PWQUALITY_LT_CURRENT@:@PWQUALITY_LT_REVISION@:@PWQUALITY_LT_AGE@ -libpwquality_la_LIBADD = @LIBCRACK@ +libpwquality_la_LIBADD = $(LIBCRACK) $(LIBINTL) libpwquality_la_SOURCES = generate.c check.c settings.c error.c if HAVE_PAM pam_pwquality_la_LDFLAGS = -no-undefined -avoid-version -module - pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@ + pam_pwquality_la_LIBADD = libpwquality.la $(PAM_LIBS) $(LIBINTL) pam_pwquality_la_SOURCES = pam_pwquality.c else pam_pwquality_la_LDFLAGS = @@ -41,11 +41,11 @@ pwscore_SOURCES = pwscore.c -pwscore_LDADD = libpwquality.la +pwscore_LDADD = libpwquality.la $(LIBINTL) pwmake_SOURCES = pwmake.c -pwmake_LDADD = libpwquality.la +pwmake_LDADD = libpwquality.la $(LIBINTL) lib_LTLIBRARIES = libpwquality.la diff -Nru libpwquality-1.2.3/src/Makefile.in libpwquality-1.3.0/src/Makefile.in --- libpwquality-1.2.3/src/Makefile.in 2013-09-12 11:14:15.000000000 +0000 +++ libpwquality-1.3.0/src/Makefile.in 2015-07-23 11:45:56.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -25,23 +24,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -62,18 +89,18 @@ host_triplet = @host@ bin_PROGRAMS = pwscore$(EXEEXT) pwmake$(EXEEXT) subdir = src -DIST_COMMON = $(include_HEADERS) $(noinst_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/pwquality.pc.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/pwquality.pc.in $(top_srcdir)/depcomp \ + $(include_HEADERS) $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/configure.in + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -111,40 +138,70 @@ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(secureconfdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(securelib_LTLIBRARIES) -libpwquality_la_DEPENDENCIES = +am__DEPENDENCIES_1 = +libpwquality_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_libpwquality_la_OBJECTS = generate.lo check.lo settings.lo error.lo libpwquality_la_OBJECTS = $(am_libpwquality_la_OBJECTS) -libpwquality_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libpwquality_la_LDFLAGS) $(LDFLAGS) -o $@ -@HAVE_PAM_TRUE@pam_pwquality_la_DEPENDENCIES = libpwquality.la +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +libpwquality_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libpwquality_la_LDFLAGS) $(LDFLAGS) \ + -o $@ +@HAVE_PAM_TRUE@pam_pwquality_la_DEPENDENCIES = libpwquality.la \ +@HAVE_PAM_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__pam_pwquality_la_SOURCES_DIST = pam_pwquality.c @HAVE_PAM_TRUE@am_pam_pwquality_la_OBJECTS = pam_pwquality.lo pam_pwquality_la_OBJECTS = $(am_pam_pwquality_la_OBJECTS) -pam_pwquality_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(pam_pwquality_la_LDFLAGS) $(LDFLAGS) -o $@ +pam_pwquality_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(pam_pwquality_la_LDFLAGS) $(LDFLAGS) \ + -o $@ @HAVE_PAM_TRUE@am_pam_pwquality_la_rpath = -rpath $(securelibdir) PROGRAMS = $(bin_PROGRAMS) am_pwmake_OBJECTS = pwmake.$(OBJEXT) pwmake_OBJECTS = $(am_pwmake_OBJECTS) -pwmake_DEPENDENCIES = libpwquality.la +pwmake_DEPENDENCIES = libpwquality.la $(am__DEPENDENCIES_1) am_pwscore_OBJECTS = pwscore.$(OBJEXT) pwscore_OBJECTS = $(am_pwscore_OBJECTS) -pwscore_DEPENDENCIES = libpwquality.la +pwscore_DEPENDENCIES = libpwquality.la $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libpwquality_la_SOURCES) $(pam_pwquality_la_SOURCES) \ $(pwmake_SOURCES) $(pwscore_SOURCES) DIST_SOURCES = $(libpwquality_la_SOURCES) \ @@ -157,11 +214,29 @@ esac DATA = $(pkgconfig_DATA) $(secureconf_DATA) HEADERS = $(include_HEADERS) $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -184,6 +259,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -232,6 +308,7 @@ PWQUALITY_LT_AGE = @PWQUALITY_LT_AGE@ PWQUALITY_LT_CURRENT = @PWQUALITY_LT_CURRENT@ PWQUALITY_LT_REVISION = @PWQUALITY_LT_REVISION@ +PYTHONBINARY = @PYTHONBINARY@ PYTHONREV = @PYTHONREV@ PYTHONSITEDIR = @PYTHONSITEDIR@ RANLIB = @RANLIB@ @@ -245,6 +322,7 @@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -308,18 +386,18 @@ libpwquality_la_LDFLAGS = -no-undefined $(libpwquality_version_script) \ -version-info @PWQUALITY_LT_CURRENT@:@PWQUALITY_LT_REVISION@:@PWQUALITY_LT_AGE@ -libpwquality_la_LIBADD = @LIBCRACK@ +libpwquality_la_LIBADD = $(LIBCRACK) $(LIBINTL) libpwquality_la_SOURCES = generate.c check.c settings.c error.c @HAVE_PAM_FALSE@pam_pwquality_la_LDFLAGS = @HAVE_PAM_TRUE@pam_pwquality_la_LDFLAGS = -no-undefined -avoid-version -module @HAVE_PAM_FALSE@pam_pwquality_la_LIBADD = -@HAVE_PAM_TRUE@pam_pwquality_la_LIBADD = libpwquality.la @PAM_LIBS@ +@HAVE_PAM_TRUE@pam_pwquality_la_LIBADD = libpwquality.la $(PAM_LIBS) $(LIBINTL) @HAVE_PAM_FALSE@pam_pwquality_la_SOURCES = @HAVE_PAM_TRUE@pam_pwquality_la_SOURCES = pam_pwquality.c pwscore_SOURCES = pwscore.c -pwscore_LDADD = libpwquality.la +pwscore_LDADD = libpwquality.la $(LIBINTL) pwmake_SOURCES = pwmake.c -pwmake_LDADD = libpwquality.la +pwmake_LDADD = libpwquality.la $(LIBINTL) lib_LTLIBRARIES = libpwquality.la @HAVE_PAM_FALSE@securelib_LTLIBRARIES = @HAVE_PAM_TRUE@securelib_LTLIBRARIES = pam_pwquality.la @@ -362,6 +440,7 @@ $(am__aclocal_m4_deps): pwquality.pc: $(top_builddir)/config.status $(srcdir)/pwquality.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -388,12 +467,15 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \ @@ -420,16 +502,20 @@ clean-securelibLTLIBRARIES: -test -z "$(securelib_LTLIBRARIES)" || rm -f $(securelib_LTLIBRARIES) - @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(securelib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libpwquality.la: $(libpwquality_la_OBJECTS) $(libpwquality_la_DEPENDENCIES) $(EXTRA_libpwquality_la_DEPENDENCIES) - $(libpwquality_la_LINK) -rpath $(libdir) $(libpwquality_la_OBJECTS) $(libpwquality_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libpwquality_la_LINK) -rpath $(libdir) $(libpwquality_la_OBJECTS) $(libpwquality_la_LIBADD) $(LIBS) + pam_pwquality.la: $(pam_pwquality_la_OBJECTS) $(pam_pwquality_la_DEPENDENCIES) $(EXTRA_pam_pwquality_la_DEPENDENCIES) - $(pam_pwquality_la_LINK) $(am_pam_pwquality_la_rpath) $(pam_pwquality_la_OBJECTS) $(pam_pwquality_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(pam_pwquality_la_LINK) $(am_pam_pwquality_la_rpath) $(pam_pwquality_la_OBJECTS) $(pam_pwquality_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -439,10 +525,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -463,7 +551,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -476,12 +565,14 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + pwmake$(EXEEXT): $(pwmake_OBJECTS) $(pwmake_DEPENDENCIES) $(EXTRA_pwmake_DEPENDENCIES) @rm -f pwmake$(EXEEXT) - $(LINK) $(pwmake_OBJECTS) $(pwmake_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(pwmake_OBJECTS) $(pwmake_LDADD) $(LIBS) + pwscore$(EXEEXT): $(pwscore_OBJECTS) $(pwscore_DEPENDENCIES) $(EXTRA_pwscore_DEPENDENCIES) @rm -f pwscore$(EXEEXT) - $(LINK) $(pwscore_OBJECTS) $(pwscore_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(pwscore_OBJECTS) $(pwscore_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -498,25 +589,25 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/settings.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -587,26 +678,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -618,15 +698,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -635,6 +711,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -785,21 +876,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-securelibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-includeHEADERS install-info \ - install-info-am install-libLTLIBRARIES install-man install-pdf \ - install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-securelibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-includeHEADERS install-info install-info-am \ + install-libLTLIBRARIES install-man install-pdf install-pdf-am \ + install-pkgconfigDATA install-ps install-ps-am \ install-secureconfDATA install-securelibLTLIBRARIES \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-includeHEADERS \ uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \ uninstall-secureconfDATA uninstall-securelibLTLIBRARIES diff -Nru libpwquality-1.2.3/src/check.c libpwquality-1.3.0/src/check.c --- libpwquality-1.2.3/src/check.c 2013-07-04 17:05:27.000000000 +0000 +++ libpwquality-1.3.0/src/check.c 2015-07-16 11:52:06.000000000 +0000 @@ -669,11 +669,13 @@ if (score != 0) return score; - msg = FascistCheck(password, pwq->dict_path); - if (msg) { - if (auxerror) - *auxerror = (void *)msg; - return PWQ_ERROR_CRACKLIB_CHECK; + if (pwq->dict_check) { + msg = FascistCheck(password, pwq->dict_path); + if (msg) { + if (auxerror) + *auxerror = (void *)msg; + return PWQ_ERROR_CRACKLIB_CHECK; + } } score = password_score(pwq, password); @@ -684,8 +686,8 @@ /* * Copyright (c) Cristian Gafton , 1996. * All rights reserved - * Copyright (c) Red Hat, Inc, 2011 - * Copyright (c) Tomas Mraz , 2011 + * Copyright (c) Red Hat, Inc, 2011, 2015 + * Copyright (c) Tomas Mraz , 2011, 2015 * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff -Nru libpwquality-1.2.3/src/pwqprivate.h libpwquality-1.3.0/src/pwqprivate.h --- libpwquality-1.2.3/src/pwqprivate.h 2012-08-07 10:21:11.000000000 +0000 +++ libpwquality-1.3.0/src/pwqprivate.h 2015-07-16 11:41:05.000000000 +0000 @@ -1,8 +1,8 @@ /* * libpwquality internal header * - * Copyright (c) Red Hat, Inc, 2011 - * Copyright (c) Tomas Mraz , 2011 + * Copyright (c) Red Hat, Inc, 2011,2015 + * Copyright (c) Tomas Mraz , 2011, 2015 * * See the end of the file for the License Information */ @@ -24,6 +24,7 @@ int max_class_repeat; int max_sequence; int gecos_check; + int dict_check; char *bad_words; char *dict_path; }; @@ -34,12 +35,13 @@ int type; }; -#define PWQ_DEFAULT_DIFF_OK 5 -#define PWQ_DEFAULT_MIN_LENGTH 9 -#define PWQ_DEFAULT_DIG_CREDIT 1 -#define PWQ_DEFAULT_UP_CREDIT 1 -#define PWQ_DEFAULT_LOW_CREDIT 1 -#define PWQ_DEFAULT_OTH_CREDIT 1 +#define PWQ_DEFAULT_DIFF_OK 1 +#define PWQ_DEFAULT_MIN_LENGTH 8 +#define PWQ_DEFAULT_DIG_CREDIT 0 +#define PWQ_DEFAULT_UP_CREDIT 0 +#define PWQ_DEFAULT_LOW_CREDIT 0 +#define PWQ_DEFAULT_OTH_CREDIT 0 +#define PWQ_DEFAULT_DICT_CHECK 1 #define PWQ_TYPE_INT 1 #define PWQ_TYPE_STR 2 diff -Nru libpwquality-1.2.3/src/pwquality.conf libpwquality-1.3.0/src/pwquality.conf --- libpwquality-1.2.3/src/pwquality.conf 2011-12-06 19:16:48.000000000 +0000 +++ libpwquality-1.3.0/src/pwquality.conf 2015-07-16 11:00:37.000000000 +0000 @@ -3,31 +3,31 @@ # # Number of characters in the new password that must not be present in the # old password. -# difok = 5 +# difok = 1 # # Minimum acceptable size for the new password (plus one if # credits are not disabled which is the default). (See pam_cracklib manual.) # Cannot be set to lower value than 6. -# minlen = 9 +# minlen = 8 # # The maximum credit for having digits in the new password. If less than 0 # it is the minimum number of digits in the new password. -# dcredit = 1 +# dcredit = 0 # # The maximum credit for having uppercase characters in the new password. # If less than 0 it is the minimum number of uppercase characters in the new # password. -# ucredit = 1 +# ucredit = 0 # # The maximum credit for having lowercase characters in the new password. # If less than 0 it is the minimum number of lowercase characters in the new # password. -# lcredit = 1 +# lcredit = 0 # # The maximum credit for having other characters in the new password. # If less than 0 it is the minimum number of other characters in the new # password. -# ocredit = 1 +# ocredit = 0 # # The minimum number of required classes of characters for the new # password (digits, uppercase, lowercase, others). diff -Nru libpwquality-1.2.3/src/pwquality.h libpwquality-1.3.0/src/pwquality.h --- libpwquality-1.2.3/src/pwquality.h 2012-11-07 13:16:03.000000000 +0000 +++ libpwquality-1.3.0/src/pwquality.h 2015-07-17 15:01:42.000000000 +0000 @@ -27,6 +27,7 @@ #define PWQ_SETTING_GECOS_CHECK 12 #define PWQ_SETTING_BAD_WORDS 13 #define PWQ_SETTING_MAX_SEQUENCE 14 +#define PWQ_SETTING_DICT_CHECK 15 #define PWQ_MAX_ENTROPY_BITS 256 #define PWQ_MIN_ENTROPY_BITS 56 @@ -76,7 +77,10 @@ /* Parse the configuration file (if cfgfile is NULL then the default one). * If auxerror is not NULL it also possibly returns auxiliary error information - * that must be passed into pwquality_strerror() function. */ + * that must be passed into pwquality_strerror() function. + * New in 1.3.0: First tries to parse all *.conf configuration files from + * .d directory if it exists. Order of parsing determines what + values will be in effect - the latest wins. */ int pwquality_read_config(pwquality_settings_t *pwq, const char *cfgfile, void **auxerror); diff -Nru libpwquality-1.2.3/src/pwquality.pc libpwquality-1.3.0/src/pwquality.pc --- libpwquality-1.2.3/src/pwquality.pc 2013-09-12 11:14:19.000000000 +0000 +++ libpwquality-1.3.0/src/pwquality.pc 2015-07-23 11:45:58.000000000 +0000 @@ -1,5 +1,5 @@ Name: pwquality Description: Password quality checker -Version: 1.2.3 +Version: 1.3.0 Libs: -lpwquality Libs.private: -lcrack diff -Nru libpwquality-1.2.3/src/settings.c libpwquality-1.3.0/src/settings.c --- libpwquality-1.2.3/src/settings.c 2013-09-12 10:48:34.000000000 +0000 +++ libpwquality-1.3.0/src/settings.c 2015-07-17 14:57:30.000000000 +0000 @@ -12,6 +12,7 @@ #include #include #include +#include #include "pwquality.h" #include "pwqprivate.h" @@ -32,6 +33,7 @@ pwq->up_credit = PWQ_DEFAULT_UP_CREDIT; pwq->low_credit = PWQ_DEFAULT_LOW_CREDIT; pwq->oth_credit = PWQ_DEFAULT_OTH_CREDIT; + pwq->dict_check = PWQ_DEFAULT_DICT_CHECK; return pwq; } @@ -59,6 +61,7 @@ { "maxclassrepeat", PWQ_SETTING_MAX_CLASS_REPEAT, PWQ_TYPE_INT}, { "maxsequence", PWQ_SETTING_MAX_SEQUENCE, PWQ_TYPE_INT}, { "gecoscheck", PWQ_SETTING_GECOS_CHECK, PWQ_TYPE_INT}, + { "dictcheck", PWQ_SETTING_DICT_CHECK, PWQ_TYPE_INT}, { "badwords", PWQ_SETTING_BAD_WORDS, PWQ_TYPE_STR}, { "dictpath", PWQ_SETTING_DICT_PATH, PWQ_TYPE_STR} }; @@ -97,19 +100,14 @@ #define PWQSETTINGS_MAX_LINELEN 1023 -/* parse the configuration file (if NULL then the default one) */ +/* parse a single configuration file*/ int -pwquality_read_config(pwquality_settings_t *pwq, const char *cfgfile, void **auxerror) +read_config_file(pwquality_settings_t *pwq, const char *cfgfile, void **auxerror) { FILE *f; char linebuf[PWQSETTINGS_MAX_LINELEN+1]; int rv = 0; - if (auxerror) - *auxerror = NULL; - if (cfgfile == NULL) - cfgfile = PWQUALITY_DEFAULT_CFGFILE; - f = fopen(cfgfile, "r"); if (f == NULL) { /* ignore non-existent default config file */ @@ -150,9 +148,11 @@ if (*ptr == '\0') continue; + eq = 0; name = ptr; while (*ptr != '\0') { - if (isspace(*ptr)) { + if (isspace(*ptr) || *ptr == '=') { + eq = *ptr == '='; *ptr = '\0'; ++ptr; break; @@ -160,7 +160,6 @@ ++ptr; } - eq = 0; while (*ptr != '\0') { if (*ptr != '=' || eq) { if (!isspace(*ptr)) { @@ -183,6 +182,86 @@ return rv; } +static int +filter_conf(const struct dirent *d) +{ + const char *p; + + if ((p = strstr(d->d_name, ".conf")) == NULL) + return 0; + + if (p[5] != '\0') + return 0; + + return 1; +} + +static int +comp_func(const struct dirent **a, const struct dirent **b) +{ + return strcmp ((*a)->d_name, (*b)->d_name); +} + +/* parse the configuration file (if NULL then the default one) */ +int +pwquality_read_config(pwquality_settings_t *pwq, const char *cfgfile, void **auxerror) +{ + char *dirname; + struct dirent **namelist; + int n; + int i; + int rv = 0; + + if (auxerror) + *auxerror = NULL; + if (cfgfile == NULL) + cfgfile = PWQUALITY_DEFAULT_CFGFILE; + + /* read "*.conf" files from ".d" directory first */ + + if (asprintf(&dirname, "%s.d", cfgfile) < 0) + return PWQ_ERROR_MEM_ALLOC; + + /* we do not care about scandir races here so we use scandir */ + n = scandir(dirname, &namelist, filter_conf, comp_func); + + if (n < 0) { + namelist = NULL; + + if (errno == ENOMEM) { + free(dirname); + return PWQ_ERROR_MEM_ALLOC; + } /* other errors are ignored */ + } + + for (i = 0; i < n; i++) { + char *subcfg; + + if (rv) { + free(namelist[i]); + continue; + } + + if (asprintf(&subcfg, "%s/%s", dirname, namelist[i]->d_name) < 0) + rv = PWQ_ERROR_MEM_ALLOC; + else { + rv = read_config_file(pwq, subcfg, auxerror); + if (rv == PWQ_ERROR_CFGFILE_OPEN) + rv = 0; /* ignore, this one does not modify auxerror */ + free(subcfg); + } + + free(namelist[i]); + } + free(dirname); + free(namelist); + + if (rv) + return rv; + + return read_config_file(pwq, cfgfile, auxerror); +} + /* useful for setting the options as configured on a pam module * command line in form of = */ int @@ -251,6 +330,9 @@ case PWQ_SETTING_GECOS_CHECK: pwq->gecos_check = value; break; + case PWQ_SETTING_DICT_CHECK: + pwq->dict_check = value; + break; default: return PWQ_ERROR_NON_INT_SETTING; } @@ -322,9 +404,15 @@ case PWQ_SETTING_MAX_CLASS_REPEAT: *value = pwq->max_class_repeat; break; + case PWQ_SETTING_MAX_SEQUENCE: + *value = pwq->max_sequence; + break; case PWQ_SETTING_GECOS_CHECK: *value = pwq->gecos_check; break; + case PWQ_SETTING_DICT_CHECK: + *value = pwq->dict_check; + break; default: return PWQ_ERROR_NON_INT_SETTING; } @@ -349,8 +437,8 @@ } /* - * Copyright (c) Red Hat, Inc, 2011 - * Copyright (c) Tomas Mraz , 2011 + * Copyright (c) Red Hat, Inc, 2011, 2015 + * Copyright (c) Tomas Mraz , 2011, 2015 * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions