[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 03/44: Merge tag 'upstream/2.1.26-69-g4c8e3f2'
Ondřej Surý
ondrej at debian.org
Sat Dec 31 13:07:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
ondrej pushed a commit to branch master
in repository cyrus-sasl2.
commit 7505b084afdaf88cb190595710198eec3eb54f27
Merge: b46f2d2 79110b9
Author: Ondřej Surý <ondrej at sury.org>
Date: Fri Jul 1 09:25:47 2016 +0200
Merge tag 'upstream/2.1.26-69-g4c8e3f2'
Upstream version 2.1.26-69-g4c8e3f2
Conflicts:
AUTHORS
ChangeLog
INSTALL
Makefile.am
Makefile.in
aclocal.m4
cmulocal/COPYING
cmulocal/c-fpic.m4
cmulocal/ucdsnmp.m4
config.h.in
config/config.guess
config/config.sub
config/ltconfig
config/ltmain.sh
configure
configure.ac
doc/Makefile.in
include/.gitignore
include/Makefile.in
include/sasl.h
java/CyrusSasl/Makefile.in
java/CyrusSasl/javasasl.h
java/Makefile.in
java/Test/Makefile.in
java/javax/Makefile.in
java/javax/security/Makefile.in
java/javax/security/auth/Makefile.in
java/javax/security/auth/callback/Makefile.in
lib/.gitignore
lib/Makefile.am
lib/Makefile.in
lib/client.c
lib/common.c
lib/config.c
lib/saslutil.c
libsasl2.pc.in
m4/bsd_sockets.m4
m4/c-attribute.m4
m4/cyrus.m4
m4/sasl2.m4
man/Makefile.in
plugins/.gitignore
plugins/Makefile.am
plugins/Makefile.in
plugins/NTMakefile
plugins/digestmd5.c
plugins/gs2.c
plugins/gssapi.c
plugins/ldapdb_init.c
plugins/otp.c
plugins/sasldb.c
plugins/scram.c
plugins/sql.c
pwcheck/Makefile.in
sample/Makefile.in
sample/client.c
sample/server.c
saslauthd/Makefile.in
saslauthd/aclocal.m4
saslauthd/auth_getpwent.c
saslauthd/auth_httpform.c
saslauthd/auth_rimap.c
saslauthd/auth_shadow.c
saslauthd/config/config.guess
saslauthd/config/config.sub
saslauthd/config/ltconfig
saslauthd/configure
saslauthd/configure.in
saslauthd/saslauthd.8
saslauthd/saslauthd.h.in
sasldb/.gitignore
sasldb/Makefile.in
utils/Makefile.in
utils/pluginviewer.c
win32/common.mak
.gitignore | 13 +
.indent.pro | 1 +
AUTHORS | 12 +-
ChangeLog | 4 +-
INSTALL | 302 -
Makefile.am | 3 +-
Makefile.in | 918 -
README.GS2 | 3 +
README.andrew | 130 +
README.ldapdb | 53 +
README.rpm | 6 +
aclocal.m4 | 977 -
autogen.sh | 37 +
cmulocal/COPYING | 39 -
cmulocal/README.andrew | 71 -
cmulocal/afs.m4 | 314 -
cmulocal/agentx.m4 | 46 -
cmulocal/arx.m4 | 155 -
cmulocal/ax_path_bdb.m4 | 566 -
cmulocal/c-fpic.m4 | 35 -
cmulocal/clamav.m4 | 35 -
cmulocal/com_err.m4 | 28 -
cmulocal/com_err_link.m4 | 157 -
cmulocal/db.m4 | 46 -
cmulocal/find-func-no-libs.m4 | 9 -
cmulocal/find-func-no-libs2.m4 | 61 -
cmulocal/find-func.m4 | 9 -
cmulocal/heimdal.m4 | 197 -
cmulocal/init_automake.m4 | 8 -
cmulocal/kafs.m4 | 167 -
cmulocal/kerberos_v4.m4 | 285 -
cmulocal/kerberos_v5.m4 | 185 -
cmulocal/libXau.m4 | 147 -
cmulocal/libcyrus.m4 | 155 -
cmulocal/libloguse.m4 | 103 -
cmulocal/libnet.m4 | 192 -
cmulocal/libpcap.m4 | 142 -
cmulocal/librestrict.m4 | 102 -
cmulocal/libssl.m4 | 153 -
cmulocal/libtoolhack.m4 | 33 -
cmulocal/libwrap.m4 | 30 -
cmulocal/mips-abi.m4 | 93 -
cmulocal/nadine.m4 | 164 -
cmulocal/nana.m4 | 27 -
cmulocal/opendkim.m4 | 71 -
cmulocal/pthreads.m4 | 23 -
cmulocal/sasl.m4 | 94 -
cmulocal/sql.m4 | 221 -
cmulocal/tcl.m4 | 160 -
cmulocal/telnet.m4 | 180 -
cmulocal/ucdsnmp.m4 | 72 -
cmulocal/util.m4 | 73 -
cmulocal/zephyr.m4 | 155 -
cmulocal/zlib.m4 | 39 -
config.h.in | 622 -
config/.gitignore | 4 +
config/config.guess | 1516 --
config/config.sub | 1764 --
config/depcomp | 423 -
config/install-sh | 276 -
config/kerberos_v4.m4 | 153 -
config/libtool.m4 | 430 -
config/ltconfig | 3150 ---
config/ltmain.sh | 4059 ----
config/missing | 336 -
config/mkinstalldirs | 111 -
configure | 20241 -------------------
configure.in => configure.ac | 202 +-
contrib/README | 5 +
contrib/change-sasldb2-realm.py | 65 +
contrib/cyrus-sasl-1.5.24-ltdl.patches | 340 +
contrib/cyrus-sasl-2.1-upgrade.h | 254 +
contrib/cyrus-sasl-libltdl | 69 +
contrib/pwcheck-pam.patch | 317 +
contrib/saslauthd-unix.pl | 63 +
contrib/securid.patches | 151 +
contrib/stripplus_canonuser.patch | 315 +
contrib/tclsasl/README | 7 +
contrib/tclsasl/doc/tclsasl.html | 1576 ++
contrib/tclsasl/doc/tclsasl.xml | 1003 +
{sasldb => contrib/tclsasl/tcl}/Makefile.am | 43 +-
contrib/tclsasl/tcl/tclsasl.c | 3011 +++
contrib/tclsasl/tcl/test.tcl | 580 +
contrib/tclsasl/tclsasl.patch | 265 +
dlcompat-20010505/APPLE_LICENSE | 372 +
dlcompat-20010505/ChangeLog | 20 +
dlcompat-20010505/Makefile | 63 +
dlcompat-20010505/README | 71 +
dlcompat-20010505/dlfcn.h | 57 +
dlcompat-20010505/dlopen.c | 516 +
doc/Makefile.in | 496 -
doc/draft-burdis-cat-srp-sasl-xx.txt | 2858 +++
doc/draft-ietf-sasl-anon-xx.txt | 507 +
doc/draft-ietf-sasl-crammd5-xx.txt | 434 +
doc/draft-ietf-sasl-gssapi-xx.txt | 841 +
doc/draft-ietf-sasl-plain-xx.txt | 507 +
doc/draft-ietf-sasl-rfc2222bis-xx.txt | 1320 ++
doc/draft-ietf-sasl-rfc2831bis-xx.txt | 2340 +++
doc/draft-ietf-sasl-saslprep-xx.txt | 339 +
doc/draft-murchison-sasl-login-xx.txt | 396 +
doc/draft-newman-sasl-c-api-xx.txt | 1681 ++
doc/draft-newman-sasl-passdss-xx.txt | 1122 +
doc/options.html | 26 +
doc/os390.html | 56 +
doc/rfc1321.txt | 1179 ++
doc/rfc1939.txt | 1291 ++
doc/rfc2104.txt | 619 +
doc/rfc2195.txt | 283 +
doc/rfc2222.txt | 899 +
doc/rfc2243.txt | 563 +
doc/rfc2245.txt | 283 +
doc/rfc2289.txt | 1403 ++
doc/rfc2444.txt | 395 +
doc/rfc2595.txt | 843 +
doc/rfc2831.txt | 1515 ++
doc/rfc2945.txt | 451 +
doc/rfc3174.txt | 1235 ++
include/.gitignore | 8 +
include/Makefile.am | 15 +-
include/Makefile.in | 653 -
include/md5global.h | 38 -
include/sasl.h | 5 +
java/CyrusSasl/Makefile.am | 2 +-
java/CyrusSasl/Makefile.in | 665 -
java/CyrusSasl/javasasl.h | 324 -
java/Makefile.in | 635 -
java/Test/Makefile.in | 434 -
java/doc/draft-weltman-java-sasl-02.txt | 1444 ++
java/javax/Makefile.in | 650 -
java/javax/security/Makefile.in | 650 -
java/javax/security/auth/Makefile.in | 650 -
java/javax/security/auth/callback/Makefile.in | 496 -
lib/.gitignore | 6 +
lib/Makefile.am | 22 +-
lib/Makefile.in | 705 -
lib/checkpw.c | 16 +-
lib/client.c | 19 +-
lib/common.c | 13 +-
lib/config.c | 4 +-
lib/saslutil.c | 4 +-
lib/server.c | 2 +-
libsasl2.pc.in | 6 +-
m4/ax_prog_cc_for_build.m4 | 125 +
{cmulocal => m4}/berkdb.m4 | 0
{cmulocal => m4}/bsd_sockets.m4 | 22 +-
{cmulocal => m4}/c-attribute.m4 | 9 +-
{cmulocal => m4}/common.m4 | 2 -
{cmulocal => m4}/cyrus.m4 | 1 -
{cmulocal => m4}/ipv6.m4 | 0
{saslauthd/config => m4}/kerberos_v4.m4 | 8 +-
{cmulocal => m4}/openldap.m4 | 1 -
{cmulocal => m4}/openssl.m4 | 4 +-
{config => m4}/plain.m4 | 0
{cmulocal => m4}/sasl2.m4 | 27 +-
{config => m4}/sasldb.m4 | 21 +-
.../TicketKeeper/TicketKeeperMenuStateProtocol.h | 1 +
man/Makefile.in | 547 -
plugins/.gitignore | 6 +
plugins/Makefile.am | 34 +-
plugins/Makefile.in | 818 -
plugins/NTMakefile | 21 +-
plugins/anonymous_init.c | 43 -
plugins/crammd5_init.c | 43 -
plugins/digestmd5.c | 39 +-
plugins/digestmd5_init.c | 43 -
plugins/gs2.c | 2 +-
plugins/gs2_init.c | 43 -
plugins/gssapi.c | 273 +-
plugins/gssapiv2_init.c | 43 -
plugins/kerberos4_init.c | 43 -
plugins/ldapdb.c | 1 +
plugins/ldapdb_init.c | 39 -
plugins/login_init.c | 43 -
plugins/ntlm.c | 115 +-
plugins/ntlm_init.c | 43 -
plugins/otp.c | 152 +-
plugins/otp_init.c | 43 -
plugins/passdss_init.c | 43 -
plugins/plain_init.c | 43 -
plugins/plugin_common.c | 10 +-
plugins/sasldb.c | 2 +-
plugins/sasldb_init.c | 38 -
plugins/scram.c | 61 +-
plugins/scram_init.c | 43 -
plugins/securid.c | 916 +
plugins/sql.c | 102 +-
plugins/sql_init.c | 38 -
plugins/srp_init.c | 43 -
pwcheck/Makefile.am | 2 +-
pwcheck/Makefile.in | 591 -
pwcheck/pwcheck_getpwnam.c | 3 +-
pwcheck/pwcheck_getspnam.c | 4 +-
sample/Makefile.am | 3 +-
sample/Makefile.in | 607 -
sample/client.c | 14 +-
sample/server.c | 20 +-
saslauthd/.gitignore | 11 +
saslauthd/AUTHORS | 23 -
saslauthd/INSTALL | 3 -
saslauthd/Makefile.am | 13 +-
saslauthd/Makefile.in | 729 -
saslauthd/NEWS | 3 -
saslauthd/README | 4 -
saslauthd/README.cache | 252 +
saslauthd/README.ipc | 84 +
saslauthd/aclocal.m4 | 962 -
saslauthd/auth_getpwent.c | 5 +-
saslauthd/auth_httpform.c | 59 +-
saslauthd/auth_krb5.c | 25 +-
saslauthd/auth_ldap.c | 6 -
saslauthd/auth_rimap.c | 14 +-
saslauthd/auth_shadow.c | 17 +-
saslauthd/cache.c | 2 +-
saslauthd/cache.h | 2 +-
saslauthd/cfile.c | 1 -
saslauthd/config/config.guess | 1516 --
saslauthd/config/config.sub | 1764 --
saslauthd/config/depcomp | 423 -
saslauthd/config/install-sh | 276 -
saslauthd/config/libtool.m4 | 430 -
saslauthd/config/ltconfig | 3150 ---
saslauthd/config/ltmain.sh | 4053 ----
saslauthd/config/missing | 336 -
saslauthd/config/mkinstalldirs | 111 -
saslauthd/config/plain.m4 | 32 -
saslauthd/config/sasldb.m4 | 156 -
saslauthd/configure | 15983 ---------------
saslauthd/configure.in | 340 -
saslauthd/ipc_unix.c | 2 +-
saslauthd/krbtf.c | 3 +-
saslauthd/lak.c | 11 +-
saslauthd/mechanisms.h | 2 +-
saslauthd/saslauthd-main.c | 2 -
saslauthd/saslauthd-main.h | 3 +-
saslauthd/saslauthd.8 | 191 -
saslauthd/saslauthd.h.in | 343 -
saslauthd/testsaslauthd.8 | 16 +
saslauthd/testsaslauthd.c | 10 +-
saslauthd/utils.h | 3 +-
sasldb/.gitignore | 6 +
sasldb/Makefile.am | 17 +-
sasldb/Makefile.in | 599 -
sasldb/db_lmdb.c | 498 +
sasldb/sasldb.h | 10 +-
utils/.gitignore | 14 +
utils/Makefile.am | 2 +-
utils/Makefile.in | 859 -
utils/dbconverter-2.c | 2 +-
utils/pluginviewer.c | 10 +-
utils/sasldbconverter2.8 | 61 +
utils/sasldblistusers.c | 4 +
utils/saslpasswd.c | 5 +-
utils/sasltestsuite.8 | 22 +
win32/common.mak | 16 +-
win32/include/config.h | 2 +-
255 files changed, 37209 insertions(+), 82626 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cyrus-sasl2/cyrus-sasl2.git
More information about the Pkg-cyrus-sasl2-commits
mailing list